diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2012-07-12 18:14:57 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2012-07-12 18:14:57 +0000 |
| commit | 4d0916788d95e848c0fa2743d09644c78285a905 (patch) | |
| tree | ee9fe5d81d5276ef9e3a7364f8d072c3e7b471f8 /llvm/lib | |
| parent | 9146984e73504f12013121edd60d45f9762b3271 (diff) | |
| download | bcm5719-llvm-4d0916788d95e848c0fa2743d09644c78285a905.tar.gz bcm5719-llvm-4d0916788d95e848c0fa2743d09644c78285a905.zip | |
Give the rdrand instructions a SideEffect flag and a chain so MachineCSE and MachineLICM don't touch it.
I already had the necessary things in place for IR-level passes but missed the machine passes.
llvm-svn: 160137
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Target/X86/X86ISelLowering.cpp | 6 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86InstrInfo.td | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp index c242aaa3daf..19cf5bf75a2 100644 --- a/llvm/lib/Target/X86/X86ISelLowering.cpp +++ b/llvm/lib/Target/X86/X86ISelLowering.cpp @@ -9823,8 +9823,8 @@ X86TargetLowering::LowerINTRINSIC_W_CHAIN(SDValue Op, SelectionDAG &DAG) const { case Intrinsic::x86_rdrand_32: case Intrinsic::x86_rdrand_64: { // Emit the node with the right value type. - SDValue Result = DAG.getNode(X86ISD::RDRAND, dl, - DAG.getVTList(Op->getValueType(0), MVT::Glue)); + SDVTList VTs = DAG.getVTList(Op->getValueType(0), MVT::Glue, MVT::Other); + SDValue Result = DAG.getNode(X86ISD::RDRAND, dl, VTs, Op.getOperand(0)); // If the value returned by RDRAND was valid (CF=1), return 1. Otherwise // return the value from Rand, which is always 0, casted to i32. @@ -9838,7 +9838,7 @@ X86TargetLowering::LowerINTRINSIC_W_CHAIN(SDValue Op, SelectionDAG &DAG) const { // Return { result, isValid, chain }. return DAG.getNode(ISD::MERGE_VALUES, dl, Op->getVTList(), Result, isValid, - Op.getOperand(0)); + SDValue(Result.getNode(), 2)); } } } diff --git a/llvm/lib/Target/X86/X86InstrInfo.td b/llvm/lib/Target/X86/X86InstrInfo.td index dc26d4c1dcb..2c4e393556b 100644 --- a/llvm/lib/Target/X86/X86InstrInfo.td +++ b/llvm/lib/Target/X86/X86InstrInfo.td @@ -139,7 +139,8 @@ def X86setcc_c : SDNode<"X86ISD::SETCC_CARRY", SDTX86SetCC_C>; def X86sahf : SDNode<"X86ISD::SAHF", SDTX86sahf>; -def X86rdrand : SDNode<"X86ISD::RDRAND", SDTX86rdrand>; +def X86rdrand : SDNode<"X86ISD::RDRAND", SDTX86rdrand, + [SDNPHasChain, SDNPSideEffect]>; def X86cas : SDNode<"X86ISD::LCMPXCHG_DAG", SDTX86cas, [SDNPHasChain, SDNPInGlue, SDNPOutGlue, SDNPMayStore, |
