[PATCH] D59541: [InstSimplify] SimplifyICmpInst - icmp eq/ne %X, undef -> undef
Simon Pilgrim via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Tue Mar 19 05:03:29 PDT 2019
RKSimon created this revision.
RKSimon added reviewers: spatel, efriedma, nlopes, davide.
Herald added subscribers: jdoerfert, Prazek.
Herald added a project: LLVM.
As discussed on PR41125 and D59363 <https://reviews.llvm.org/D59363>, we have a mismatch between icmp eq/ne cases with an undef operand:
When the other operand is constant we fold to undef (handled in ConstantFoldCompareInstruction)
When the other operand is non-constant we fold to a bool constant based on isTrueWhenEqual (handled in SimplifyICmpInst).
Neither it really wrong, but this patch changes the logic in SimplifyICmpInst to consistently fold to undef.
The NewGVN test change is annoying (as with most heavily reduced tests) but AFAICT I have kept the purpose of the test based on rL291968 <https://reviews.llvm.org/rL291968>.
Repository:
rL LLVM
https://reviews.llvm.org/D59541
Files:
lib/Analysis/InstructionSimplify.cpp
test/Transforms/InstCombine/icmp.ll
test/Transforms/NewGVN/pr31613.ll
Index: test/Transforms/NewGVN/pr31613.ll
===================================================================
--- test/Transforms/NewGVN/pr31613.ll
+++ test/Transforms/NewGVN/pr31613.ll
@@ -71,32 +71,35 @@
declare void @c.d.p(i64, i8*)
-define void @e() {
+define void @e(i32 %a0, i32 %a1, %struct.a** %p2) {
; CHECK-LABEL: @e(
; CHECK-NEXT: [[F:%.*]] = alloca i32
-; CHECK-NEXT: store i32 undef, i32* [[F]], !g !0
+; CHECK-NEXT: store i32 [[A0:%.*]], i32* [[F]], !g !0
; CHECK-NEXT: br label [[H:%.*]]
; CHECK: h:
; CHECK-NEXT: call void @c.d.p(i64 8, i8* undef)
+; CHECK-NEXT: [[I:%.*]] = load i32, i32* [[F]]
; CHECK-NEXT: [[J:%.*]] = load i32, i32* null
-; CHECK-NEXT: br i1 true, label [[L:%.*]], label [[Q:%.*]]
+; CHECK-NEXT: [[K:%.*]] = icmp eq i32 [[I]], [[J]]
+; CHECK-NEXT: br i1 [[K]], label [[L:%.*]], label [[Q:%.*]]
; CHECK: l:
; CHECK-NEXT: br label [[R:%.*]]
; CHECK: q:
-; CHECK-NEXT: store i8 undef, i8* null
+; CHECK-NEXT: [[M:%.*]] = load %struct.a*, %struct.a** null
; CHECK-NEXT: br label [[R]]
; CHECK: r:
; CHECK-NEXT: switch i32 undef, label [[N:%.*]] [
; CHECK-NEXT: i32 0, label [[S:%.*]]
; CHECK-NEXT: ]
; CHECK: s:
+; CHECK-NEXT: store i32 [[A1:%.*]], i32* [[F]], !g !0
; CHECK-NEXT: br label [[H]]
; CHECK: n:
-; CHECK-NEXT: [[O:%.*]] = load %struct.a*, %struct.a** null
+; CHECK-NEXT: [[O:%.*]] = load %struct.a*, %struct.a** [[P2:%.*]]
; CHECK-NEXT: ret void
;
%f = alloca i32
- store i32 undef, i32* %f, !g !0
+ store i32 %a0, i32* %f, !g !0
br label %h
h: ; preds = %s, %0
@@ -120,11 +123,11 @@
]
s: ; preds = %r
- store i32 undef, i32* %f, !g !0
+ store i32 %a1, i32* %f, !g !0
br label %h
n: ; preds = %r
- %o = load %struct.a*, %struct.a** null
+ %o = load %struct.a*, %struct.a** %p2
%2 = bitcast %struct.a* %o to %struct.b*
ret void
}
Index: test/Transforms/InstCombine/icmp.ll
===================================================================
--- test/Transforms/InstCombine/icmp.ll
+++ test/Transforms/InstCombine/icmp.ll
@@ -69,14 +69,14 @@
; PR4837
define <2 x i1> @test5_eq(<2 x i64> %x) {
; CHECK-LABEL: @test5_eq(
-; CHECK-NEXT: ret <2 x i1> <i1 true, i1 true>
+; CHECK-NEXT: ret <2 x i1> undef
;
%V = icmp eq <2 x i64> %x, undef
ret <2 x i1> %V
}
define <2 x i1> @test5_ne(<2 x i64> %x) {
; CHECK-LABEL: @test5_ne(
-; CHECK-NEXT: ret <2 x i1> zeroinitializer
+; CHECK-NEXT: ret <2 x i1> undef
;
%V = icmp ne <2 x i64> %x, undef
ret <2 x i1> %V
Index: lib/Analysis/InstructionSimplify.cpp
===================================================================
--- lib/Analysis/InstructionSimplify.cpp
+++ lib/Analysis/InstructionSimplify.cpp
@@ -3048,6 +3048,14 @@
Type *ITy = GetCompareTy(LHS); // The return type.
+ // For EQ and NE, we can always pick a value for the undef to make the
+ // predicate pass or fail, so we can return undef.
+ // Also, if both operands are undef, we can return undef.
+ // Matches behavior in llvm::ConstantFoldCompareInstruction.
+ if (isa<UndefValue>(RHS) &&
+ (ICmpInst::isEquality(Pred) || isa<UndefValue>(LHS)))
+ return UndefValue::get(ITy);
+
// icmp X, X -> true/false
// icmp X, undef -> true/false because undef could be X.
if (LHS == RHS || isa<UndefValue>(RHS))
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D59541.191271.patch
Type: text/x-patch
Size: 3599 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190319/7b133927/attachment.bin>
More information about the llvm-commits
mailing list