maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[X86] Update some of the getMachineNode calls from X86ISelDAGToDAG to also include a VT for a EFLAGS result. 

This makes the nodes consistent with how they would be emitted from the isel
table.

llvm-svn: 356870
This commit is contained in:
Craig Topper 2019-03-25 07:22:18 +00:00
parent 1cc01c3228
commit a17287f084
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
View File

@ -3167,14 +3167,14 @@ MachineSDNode *X86DAGToDAGISel::matchBEXTRFromAndImm(SDNode *Node) {
SDValue Tmp0, Tmp1, Tmp2, Tmp3, Tmp4; SDValue Tmp0, Tmp1, Tmp2, Tmp3, Tmp4;
if (tryFoldLoad(Node, N0.getNode(), Input, Tmp0, Tmp1, Tmp2, Tmp3, Tmp4)) { if (tryFoldLoad(Node, N0.getNode(), Input, Tmp0, Tmp1, Tmp2, Tmp3, Tmp4)) {
SDValue Ops[] = { Tmp0, Tmp1, Tmp2, Tmp3, Tmp4, New, Input.getOperand(0) }; SDValue Ops[] = { Tmp0, Tmp1, Tmp2, Tmp3, Tmp4, New, Input.getOperand(0) };
SDVTList VTs = CurDAG->getVTList(NVT, MVT::Other); SDVTList VTs = CurDAG->getVTList(NVT, MVT::i32, MVT::Other);
NewNode = CurDAG->getMachineNode(MOpc, dl, VTs, Ops); NewNode = CurDAG->getMachineNode(MOpc, dl, VTs, Ops);
// Update the chain. // Update the chain.
ReplaceUses(Input.getValue(1), SDValue(NewNode, 1)); ReplaceUses(Input.getValue(1), SDValue(NewNode, 2));
// Record the mem-refs // Record the mem-refs
CurDAG->setNodeMemRefs(NewNode, {cast<LoadSDNode>(Input)->getMemOperand()}); CurDAG->setNodeMemRefs(NewNode, {cast<LoadSDNode>(Input)->getMemOperand()});
} else { } else {
NewNode = CurDAG->getMachineNode(ROpc, dl, NVT, Input, New); NewNode = CurDAG->getMachineNode(ROpc, dl, NVT, MVT::i32, Input, New);
} }
return NewNode; return NewNode;
@ -3563,12 +3563,13 @@ void X86DAGToDAGISel::Select(SDNode *Node) {
// Emit the smaller op and the shift. // Emit the smaller op and the shift.
// Even though we shrink the constant, the VT should match the operation VT. // Even though we shrink the constant, the VT should match the operation VT.
SDValue NewCst = CurDAG->getTargetConstant(Val >> ShlVal, dl, NVT); SDValue NewCst = CurDAG->getTargetConstant(Val >> ShlVal, dl, NVT);
SDNode *New = CurDAG->getMachineNode(Op, dl, NVT, N0->getOperand(0),NewCst); SDNode *New = CurDAG->getMachineNode(Op, dl, NVT, MVT::i32,
N0->getOperand(0), NewCst);
if (ShlVal == 1) if (ShlVal == 1)
CurDAG->SelectNodeTo(Node, AddOp, NVT, SDValue(New, 0), CurDAG->SelectNodeTo(Node, AddOp, NVT, MVT::i32, SDValue(New, 0),
SDValue(New, 0)); SDValue(New, 0));
else else
CurDAG->SelectNodeTo(Node, ShlOp, NVT, SDValue(New, 0), CurDAG->SelectNodeTo(Node, ShlOp, NVT, MVT::i32, SDValue(New, 0),
getI8Imm(ShlVal, dl)); getI8Imm(ShlVal, dl));
return; return;
} }
@ -3969,7 +3970,7 @@ void X86DAGToDAGISel::Select(SDNode *Node) {
unsigned TrailingZeros = countTrailingZeros(Mask); unsigned TrailingZeros = countTrailingZeros(Mask);
SDValue Imm = CurDAG->getTargetConstant(TrailingZeros, dl, MVT::i64); SDValue Imm = CurDAG->getTargetConstant(TrailingZeros, dl, MVT::i64);
SDValue Shift = SDValue Shift =
SDValue(CurDAG->getMachineNode(X86::SHR64ri, dl, MVT::i64, SDValue(CurDAG->getMachineNode(X86::SHR64ri, dl, MVT::i64, MVT::i32,
N0.getOperand(0), Imm), 0); N0.getOperand(0), Imm), 0);
MachineSDNode *Test = CurDAG->getMachineNode(X86::TEST64rr, dl, MachineSDNode *Test = CurDAG->getMachineNode(X86::TEST64rr, dl,
MVT::i32, Shift, Shift); MVT::i32, Shift, Shift);
@ -3980,7 +3981,7 @@ void X86DAGToDAGISel::Select(SDNode *Node) {
unsigned LeadingZeros = countLeadingZeros(Mask); unsigned LeadingZeros = countLeadingZeros(Mask);
SDValue Imm = CurDAG->getTargetConstant(LeadingZeros, dl, MVT::i64); SDValue Imm = CurDAG->getTargetConstant(LeadingZeros, dl, MVT::i64);
SDValue Shift = SDValue Shift =
SDValue(CurDAG->getMachineNode(X86::SHL64ri, dl, MVT::i64, SDValue(CurDAG->getMachineNode(X86::SHL64ri, dl, MVT::i64, MVT::i32,
N0.getOperand(0), Imm), 0); N0.getOperand(0), Imm), 0);
MachineSDNode *Test = CurDAG->getMachineNode(X86::TEST64rr, dl, MachineSDNode *Test = CurDAG->getMachineNode(X86::TEST64rr, dl,
MVT::i32, Shift, Shift); MVT::i32, Shift, Shift);