[SelectionDAG] Teach BaseIndexOffset::match to unwrap the base after looking through an add/or

We might find a target specific node that needs to be unwrapped after we look through an add/or. Otherwise we get inconsistent results if one pointer is just X86WrapperRIP and the other is (add X86WrapperRIP, C)

Differential Revision: https://reviews.llvm.org/D54818

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@347591 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Craig Topper 2018-11-26 20:16:33 +00:00
parent 57aee1be6f
commit 406f960c8c
2 changed files with 5 additions and 6 deletions

View File

@ -107,14 +107,14 @@ BaseIndexOffset BaseIndexOffset::match(const LSBaseSDNode *N,
if (auto *C = dyn_cast<ConstantSDNode>(Base->getOperand(1)))
if (DAG.MaskedValueIsZero(Base->getOperand(0), C->getAPIntValue())) {
Offset += C->getSExtValue();
Base = Base->getOperand(0);
Base = DAG.getTargetLoweringInfo().unwrapAddress(Base->getOperand(0));
continue;
}
break;
case ISD::ADD:
if (auto *C = dyn_cast<ConstantSDNode>(Base->getOperand(1))) {
Offset += C->getSExtValue();
Base = Base->getOperand(0);
Base = DAG.getTargetLoweringInfo().unwrapAddress(Base->getOperand(0));
continue;
}
break;
@ -130,7 +130,7 @@ BaseIndexOffset BaseIndexOffset::match(const LSBaseSDNode *N,
Offset -= Off;
else
Offset += Off;
Base = LSBase->getBasePtr();
Base = DAG.getTargetLoweringInfo().unwrapAddress(LSBase->getBasePtr());
continue;
}
break;

View File

@ -11,9 +11,8 @@
define void @foo2() {
; CHECK-LABEL: foo2:
; CHECK: # %bb.0: # %entry
; CHECK-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero
; CHECK-NEXT: movhpd {{.*#+}} xmm0 = xmm0[0],mem[0]
; CHECK-NEXT: movapd %xmm0, {{.*}}(%rip)
; CHECK-NEXT: movaps {{.*}}(%rip), %xmm0
; CHECK-NEXT: movaps %xmm0, {{.*}}(%rip)
; CHECK-NEXT: retq
entry:
%0 = load <2 x float>, <2 x float>* bitcast (float* getelementptr inbounds ([4 x float], [4 x float]* @f, i64 0, i64 2) to <2 x float>*), align 8