Skip to content

Commit 8c6c56d

Browse files
topperctstellar
authored andcommitted
[X86] Don't crash on instruction prefetch intrinsics without PREFETCHI support.
Instead of failing to select during isel, drop the intrinsic in lowering. Fixes PR62839. Reviewed By: pengfei Differential Revision: https://reviews.llvm.org/D151050 (cherry picked from commit 022aefa)
1 parent 5729e63 commit 8c6c56d

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

llvm/lib/Target/X86/X86ISelLowering.cpp

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ X86TargetLowering::X86TargetLowering(const X86TargetMachine &TM,
499499
}
500500

501501
if (Subtarget.hasSSEPrefetch() || Subtarget.hasThreeDNow())
502-
setOperationAction(ISD::PREFETCH , MVT::Other, Legal);
502+
setOperationAction(ISD::PREFETCH , MVT::Other, Custom);
503503

504504
setOperationAction(ISD::ATOMIC_FENCE , MVT::Other, Custom);
505505

@@ -33093,6 +33093,18 @@ static SDValue LowerCVTPS2PH(SDValue Op, SelectionDAG &DAG) {
3309333093
return DAG.getNode(ISD::CONCAT_VECTORS, dl, VT, Lo, Hi);
3309433094
}
3309533095

33096+
static SDValue LowerPREFETCH(SDValue Op, const X86Subtarget &Subtarget,
33097+
SelectionDAG &DAG) {
33098+
unsigned IsData = cast<ConstantSDNode>(Op.getOperand(4))->getZExtValue();
33099+
33100+
// We don't support non-data prefetch without PREFETCHI.
33101+
// Just preserve the chain.
33102+
if (!IsData && !Subtarget.hasPREFETCHI())
33103+
return Op.getOperand(0);
33104+
33105+
return Op;
33106+
}
33107+
3309633108
static StringRef getInstrStrFromOpNo(const SmallVectorImpl<StringRef> &AsmStrs,
3309733109
unsigned OpNo) {
3309833110
const APInt Operand(32, OpNo);
@@ -33294,6 +33306,7 @@ SDValue X86TargetLowering::LowerOperation(SDValue Op, SelectionDAG &DAG) const {
3329433306
case ISD::GC_TRANSITION_END: return LowerGC_TRANSITION(Op, DAG);
3329533307
case ISD::ADDRSPACECAST: return LowerADDRSPACECAST(Op, DAG);
3329633308
case X86ISD::CVTPS2PH: return LowerCVTPS2PH(Op, DAG);
33309+
case ISD::PREFETCH: return LowerPREFETCH(Op, Subtarget, DAG);
3329733310
}
3329833311
}
3329933312

llvm/test/CodeGen/X86/prefetchi.ll

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
22
; RUN: llc < %s -mtriple=x86_64-- -mattr=+prefetchi | FileCheck %s
3+
; RUN: llc < %s -mtriple=x86_64-- | FileCheck %s --check-prefix=NOPREFETCHI
34

45
define dso_local void @t(ptr %ptr) nounwind {
56
; CHECK-LABEL: t:
@@ -9,6 +10,10 @@ define dso_local void @t(ptr %ptr) nounwind {
910
; CHECK-NEXT: prefetchit1 t(%rip)
1011
; CHECK-NEXT: prefetchit0 ext(%rip)
1112
; CHECK-NEXT: retq
13+
;
14+
; NOPREFETCHI-LABEL: t:
15+
; NOPREFETCHI: # %bb.0: # %entry
16+
; NOPREFETCHI-NEXT: retq
1217
entry:
1318
tail call void @llvm.prefetch(ptr %ptr, i32 0, i32 2, i32 0)
1419
tail call void @llvm.prefetch(ptr %ptr, i32 0, i32 3, i32 0)

0 commit comments

Comments
 (0)