diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2012-01-11 18:36:12 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2012-01-11 18:36:12 +0000 |
| commit | 3212a342692b23c666f529715ca8daa2b731644b (patch) | |
| tree | 76f1be0d1b4e2026b28cf89720dd5576991b10e1 | |
| parent | 39ba639f9d38f69a9a010b736a9e56f660749786 (diff) | |
| download | bcm5719-llvm-3212a342692b23c666f529715ca8daa2b731644b.tar.gz bcm5719-llvm-3212a342692b23c666f529715ca8daa2b731644b.zip | |
Revert r147945 which disabled an addressing mode transformation. I had
hoped this would revive one of the llvm-gcc selfhost build bots, but it
didn't so it doesn't appear that my transform is the culprit.
If anyone else is seeing failures, please let me know!
llvm-svn: 147957
| -rw-r--r-- | llvm/lib/Target/X86/X86ISelDAGToDAG.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/CodeGen/X86/fold-and-shift.ll | 20 |
2 files changed, 10 insertions, 14 deletions
diff --git a/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp b/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp index b155f742d64..441267a2a4d 100644 --- a/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp +++ b/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp @@ -847,10 +847,6 @@ static bool FoldMaskAndShiftToScale(SelectionDAG &DAG, SDValue N, uint64_t Mask, SDValue Shift, SDValue X, X86ISelAddressMode &AM) { - // FIXME!! Hack to disable this and see if it is responsible for a miscompile - // on llvm-gcc's selfhost. - return true; - if (Shift.getOpcode() != ISD::SRL || !Shift.hasOneUse() || !isa<ConstantSDNode>(Shift.getOperand(1))) return true; diff --git a/llvm/test/CodeGen/X86/fold-and-shift.ll b/llvm/test/CodeGen/X86/fold-and-shift.ll index 816ab97e31b..93baa0e0eee 100644 --- a/llvm/test/CodeGen/X86/fold-and-shift.ll +++ b/llvm/test/CodeGen/X86/fold-and-shift.ll @@ -39,11 +39,11 @@ define i32 @t3(i16* %i.ptr, i32* %arr) { ; To make matters worse, because of the two-phase zext of %i and their reuse in ; the function, the DAG can get confusing trying to re-use both of them and ; prevent easy analysis of the mask in order to match this. -; BROKEN: t3: -; BROKEN-NOT: and -; BROKEN: shrl -; BROKEN: addl (%{{...}},%{{...}},4), -; BROKEN: ret +; CHECK: t3: +; CHECK-NOT: and +; CHECK: shrl +; CHECK: addl (%{{...}},%{{...}},4), +; CHECK: ret entry: %i = load i16* %i.ptr @@ -58,11 +58,11 @@ entry: define i32 @t4(i16* %i.ptr, i32* %arr) { ; A version of @t3 that has more zero extends and more re-use of intermediate ; values. This exercise slightly different bits of canonicalization. -; BROKEN: t4: -; BROKEN-NOT: and -; BROKEN: shrl -; BROKEN: addl (%{{...}},%{{...}},4), -; BROKEN: ret +; CHECK: t4: +; CHECK-NOT: and +; CHECK: shrl +; CHECK: addl (%{{...}},%{{...}},4), +; CHECK: ret entry: %i = load i16* %i.ptr |
