[llvm-commits] [llvm] r113720 - in /llvm/trunk: lib/Transforms/InstCombine/InstCombineAndOrXor.cpp test/CodeGen/ARM/fast-isel.ll test/Transforms/InstCombine/and-or-inversion.ll test/Transforms/InstCombine/cast.ll test/Transforms/InstCombine/or.ll test/Transforms/InstCombine/xor2.ll
Eric Christopher
echristo at apple.com
Sat Sep 11 23:09:23 PDT 2010
Author: echristo
Date: Sun Sep 12 01:09:23 2010
New Revision: 113720
URL: http://llvm.org/viewvc/llvm-project?rev=113720&view=rev
Log:
Revert 113679, it was causing an infinite loop in a testcase that I've sent
on to Owen.
Removed:
llvm/trunk/test/Transforms/InstCombine/and-or-inversion.ll
Modified:
llvm/trunk/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
llvm/trunk/test/CodeGen/ARM/fast-isel.ll
llvm/trunk/test/Transforms/InstCombine/cast.ll
llvm/trunk/test/Transforms/InstCombine/or.ll
llvm/trunk/test/Transforms/InstCombine/xor2.ll
Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp?rev=113720&r1=113719&r2=113720&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp (original)
+++ llvm/trunk/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp Sun Sep 12 01:09:23 2010
@@ -207,26 +207,12 @@
}
break;
case Instruction::Or:
- if (Op->hasOneUse()){
- if (Together != OpRHS) {
- // (X | C1) & C2 --> (X | (C1&C2)) & C2
- Value *Or = Builder->CreateOr(X, Together);
- Or->takeName(Op);
- return BinaryOperator::CreateAnd(Or, AndRHS);
- }
-
- ConstantInt *TogetherCI = dyn_cast<ConstantInt>(Together);
- if (TogetherCI && !TogetherCI->isZero()){
- // (X | C1) & C2 --> (X & (C2^(C1&C2))) | C1
- // NOTE: This reduces the number of bits set in the & mask, which
- // can expose opportunities for store narrowing.
- Together = ConstantExpr::getXor(AndRHS, Together);
- Value *And = Builder->CreateAnd(X, Together);
- And->takeName(Op);
- return BinaryOperator::CreateOr(And, OpRHS);
- }
+ if (Op->hasOneUse() && Together != OpRHS) {
+ // (X | C1) & C2 --> (X | (C1&C2)) & C2
+ Value *Or = Builder->CreateOr(X, Together);
+ Or->takeName(Op);
+ return BinaryOperator::CreateAnd(Or, AndRHS);
}
-
break;
case Instruction::Add:
if (Op->hasOneUse()) {
@@ -1957,17 +1943,6 @@
}
}
- // Note: If we've gotten to the point of visiting the outer OR, then the
- // inner one couldn't be simplified. If it was a constant, then it won't
- // be simplified by a later pass either, so we try swapping the inner/outer
- // ORs in the hopes that we'll be able to simplify it this way.
- // (X|C) | V --> (X|V) | C
- if (Op0->hasOneUse() && match(Op0, m_Or(m_Value(A), m_ConstantInt(C1)))) {
- Value *Inner = Builder->CreateOr(Op0, Op1);
- Inner->takeName(Op0);
- return BinaryOperator::CreateOr(Inner, C1);
- }
-
return Changed ? &I : 0;
}
Modified: llvm/trunk/test/CodeGen/ARM/fast-isel.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/fast-isel.ll?rev=113720&r1=113719&r2=113720&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/fast-isel.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/fast-isel.ll Sun Sep 12 01:09:23 2010
@@ -15,6 +15,22 @@
ret i32 %add
}
+define float @fp_ops(float %a, float %b) nounwind {
+entry:
+ %a.addr = alloca float, align 4
+ %b.addr = alloca float, align 4
+ store float %a, float* %a.addr
+ store float %b, float* %b.addr
+ %tmp = load float* %a.addr
+ %tmp1 = load float* %b.addr
+ %mul = fmul float %tmp, %tmp1
+ %tmp2 = load float* %b.addr
+ %tmp3 = load float* %a.addr
+ %mul2 = fmul float %tmp2, %tmp3
+ %add = fadd float %mul, %mul2
+ ret float %mul
+}
+
define i32* @foo(i32* %p, i32* %q, i32** %z) nounwind {
entry:
%r = load i32* %p
Removed: llvm/trunk/test/Transforms/InstCombine/and-or-inversion.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/and-or-inversion.ll?rev=113719&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/and-or-inversion.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/and-or-inversion.ll (removed)
@@ -1,13 +0,0 @@
-; RUN: opt -S -instcombine < %s | FileCheck %s
-; <rdar://problem/8285027>
-
-; CHECK: @func
-define i32 @func(i32 %a) nounwind ssp align 2 {
-entry:
-; CHECK: and i32 %a, -256
- %0 = or i32 %a, 8
-; CHECK: or i32 %0, 8
- %1 = and i32 %0, -248
- ret i32 %1
-; CHECK: }
-}
Modified: llvm/trunk/test/Transforms/InstCombine/cast.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/cast.ll?rev=113720&r1=113719&r2=113720&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/cast.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/cast.ll Sun Sep 12 01:09:23 2010
@@ -437,8 +437,8 @@
ret i64 %E
; CHECK: @test47
; CHECK-NEXT: %B = sext i8 %A to i64
-; CHECK-NEXT: %C = and i64 %B, 4294967253
-; CHECK-NEXT: %E = or i64 %C, 42
+; CHECK-NEXT: %C = or i64 %B, 42
+; CHECK-NEXT: %E = and i64 %C, 4294967295
; CHECK-NEXT: ret i64 %E
}
@@ -508,8 +508,8 @@
ret i32 %E
; CHECK: @test52
; CHECK-NEXT: %B = trunc i64 %A to i32
-; CHECK-NEXT: %C = and i32 %B, 7224
-; CHECK-NEXT: %D = or i32 %C, 32962
+; CHECK-NEXT: %C = or i32 %B, 32962
+; CHECK-NEXT: %D = and i32 %C, 40186
; CHECK-NEXT: ret i32 %D
}
@@ -521,8 +521,8 @@
ret i64 %E
; CHECK: @test53
; CHECK-NEXT: %B = zext i32 %A to i64
-; CHECK-NEXT: %C = and i64 %B, 7224
-; CHECK-NEXT: %D = or i64 %C, 32962
+; CHECK-NEXT: %C = or i64 %B, 32962
+; CHECK-NEXT: %D = and i64 %C, 40186
; CHECK-NEXT: ret i64 %D
}
@@ -534,8 +534,8 @@
ret i32 %E
; CHECK: @test54
; CHECK-NEXT: %B = trunc i64 %A to i32
-; CHECK-NEXT: %C = and i32 %B, 7224
-; CHECK-NEXT: %D = or i32 %C, -32574
+; CHECK-NEXT: %C = or i32 %B, -32574
+; CHECK-NEXT: %D = and i32 %C, -25350
; CHECK-NEXT: ret i32 %D
}
@@ -547,8 +547,8 @@
ret i64 %E
; CHECK: @test55
; CHECK-NEXT: %B = zext i32 %A to i64
-; CHECK-NEXT: %C = and i64 %B, 7224
-; CHECK-NEXT: %D = or i64 %C, -32574
+; CHECK-NEXT: %C = or i64 %B, -32574
+; CHECK-NEXT: %D = and i64 %C, -25350
; CHECK-NEXT: ret i64 %D
}
@@ -584,8 +584,8 @@
; CHECK: @test58
; CHECK-NEXT: %C = lshr i64 %A, 8
-; CHECK-NEXT: %D = and i64 %C, 16777087
-; CHECK-NEXT: %E = or i64 %D, 128
+; CHECK-NEXT: %D = or i64 %C, 128
+; CHECK-NEXT: %E = and i64 %D, 16777215
; CHECK-NEXT: ret i64 %E
}
Modified: llvm/trunk/test/Transforms/InstCombine/or.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/or.ll?rev=113720&r1=113719&r2=113720&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/or.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/or.ll Sun Sep 12 01:09:23 2010
@@ -316,8 +316,8 @@
%E = or i32 %D, %C
ret i32 %E
; CHECK: @test30
-; CHECK: %D = and i32 %A, -58312
-; CHECK: %E = or i32 %D, 32962
+; CHECK: %B = or i32 %A, 32962
+; CHECK: %E = and i32 %B, -25350
; CHECK: ret i32 %E
}
@@ -332,8 +332,8 @@
%F = or i64 %D, %E
ret i64 %F
; CHECK: @test31
-; CHECK-NEXT: %E1 = and i64 %A, 4294908984
-; CHECK-NEXT: %F = or i64 %E1, 32962
+; CHECK-NEXT: %bitfield = or i64 %A, 32962
+; CHECK-NEXT: %F = and i64 %bitfield, 4294941946
; CHECK-NEXT: ret i64 %F
}
@@ -367,12 +367,3 @@
; CHECK-NEXT: or i32 %X, %Y
; CHECK-NEXT: ret
}
-
-define i32 @test35(i32 %a, i32 %b) {
- %1 = or i32 %a, 1135
- %2 = or i32 %1, %b
- ret i32 %2
- ; CHECK: @test35
- ; CHECK-NEXT: or i32 %a, %b
- ; CHECK-NEXT: or i32 %1, 1135
-}
Modified: llvm/trunk/test/Transforms/InstCombine/xor2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/xor2.ll?rev=113720&r1=113719&r2=113720&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/xor2.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/xor2.ll Sun Sep 12 01:09:23 2010
@@ -34,7 +34,7 @@
define i32 @test3(i32 %tmp1) {
; CHECK: @test3
; CHECK-NEXT: and i32 %tmp1, 32
-; CHECK-NEXT: or i32 %ovm, 8
+; CHECK-NEXT: or i32 %tmp, 8
; CHECK-NEXT: ret i32
%ovm = or i32 %tmp1, 145
%ov31 = and i32 %ovm, 177
More information about the llvm-commits
mailing list