[llvm] ebac599 - [SimpleLoopUnswitch] Skip trivial selects in guards conditions unswitch candidates
Dmitry Makogon via llvm-commits
llvm-commits at lists.llvm.org
Mon Nov 7 23:05:33 PST 2022
Author: Dmitry Makogon
Date: 2022-11-08T13:29:27+07:00
New Revision: ebac59999f926339f08936c050890c3364b5f130
URL: https://github.com/llvm/llvm-project/commit/ebac59999f926339f08936c050890c3364b5f130
DIFF: https://github.com/llvm/llvm-project/commit/ebac59999f926339f08936c050890c3364b5f130.diff
LOG: [SimpleLoopUnswitch] Skip trivial selects in guards conditions unswitch candidates
We do this for conditional branches, but not for guards for some reason.
Fixes pr58666.
Differential Revision: https://reviews.llvm.org/D137249
Added:
Modified:
llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp
llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-skip-selects-in-guards.ll
Removed:
################################################################################
diff --git a/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp b/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp
index a434394f2cdac..f7ecc47947151 100644
--- a/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp
+++ b/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp
@@ -2767,7 +2767,8 @@ static bool collectUnswitchCandidates(
if (CollectGuards)
for (auto &I : *BB)
if (isGuard(&I)) {
- auto *Cond = cast<IntrinsicInst>(&I)->getArgOperand(0);
+ auto *Cond =
+ skipTrivialSelect(cast<IntrinsicInst>(&I)->getArgOperand(0));
// TODO: Support AND, OR conditions and partial unswitching.
if (!isa<Constant>(Cond) && L.isLoopInvariant(Cond))
UnswitchCandidates.push_back({&I, {Cond}});
diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-skip-selects-in-guards.ll b/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-skip-selects-in-guards.ll
index 7f8862e160a02..91dd181b0a98a 100644
--- a/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-skip-selects-in-guards.ll
+++ b/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-skip-selects-in-guards.ll
@@ -1,3 +1,4 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
; RUN: opt -passes='loop(simple-loop-unswitch<nontrivial>),verify<loops>' -S < %s | FileCheck %s
; RUN: opt -passes='loop-mssa(simple-loop-unswitch<nontrivial>),verify<loops>' -S < %s | FileCheck %s
; RUN: opt -simple-loop-unswitch -enable-nontrivial-unswitch -verify-memoryssa -S < %s | FileCheck %s
@@ -7,9 +8,40 @@ declare void @llvm.experimental.guard(i1, ...)
declare void @widget()
; REQUIRES: asserts
-; XFAIL: *
define void @foo(ptr addrspace(1) %arg, i64 %arg1) personality ptr @pluto {
+; CHECK-LABEL: @foo(
+; CHECK-NEXT: bb:
+; CHECK-NEXT: [[TMP:%.*]] = icmp slt i32 poison, 570
+; CHECK-NEXT: [[TMP2:%.*]] = select i1 [[TMP]], i1 true, i1 false
+; CHECK-NEXT: br i1 [[TMP]], label [[BB_SPLIT_US:%.*]], label [[BB_SPLIT:%.*]]
+; CHECK: bb.split.us:
+; CHECK-NEXT: br label [[BB3_US:%.*]]
+; CHECK: bb3.us:
+; CHECK-NEXT: br label [[GUARDED_US:%.*]]
+; CHECK: bb4.us:
+; CHECK-NEXT: invoke void @widget()
+; CHECK-NEXT: to label [[BB6_US:%.*]] unwind label [[BB7_SPLIT_US:%.*]]
+; CHECK: bb6.us:
+; CHECK-NEXT: invoke void @widget()
+; CHECK-NEXT: to label [[BB3_US]] unwind label [[BB7_SPLIT_US]]
+; CHECK: guarded.us:
+; CHECK-NEXT: invoke void @widget()
+; CHECK-NEXT: to label [[BB4_US:%.*]] unwind label [[BB7_SPLIT_US]]
+; CHECK: bb7.split.us:
+; CHECK-NEXT: [[TMP8_US:%.*]] = landingpad { ptr, i32 }
+; CHECK-NEXT: cleanup
+; CHECK-NEXT: br label [[BB7:%.*]]
+; CHECK: bb.split:
+; CHECK-NEXT: br label [[BB3:%.*]]
+; CHECK: bb3:
+; CHECK-NEXT: br label [[DEOPT:%.*]]
+; CHECK: deopt:
+; CHECK-NEXT: call void (i1, ...) @llvm.experimental.guard(i1 false, i32 7) [ "deopt"() ]
+; CHECK-NEXT: unreachable
+; CHECK: bb7:
+; CHECK-NEXT: ret void
+;
bb:
%tmp = icmp slt i32 poison, 570
%tmp2 = select i1 %tmp, i1 true, i1 false
@@ -18,19 +50,19 @@ bb:
bb3: ; preds = %bb6, %bb
call void (i1, ...) @llvm.experimental.guard(i1 %tmp2, i32 7) [ "deopt"() ]
invoke void @widget()
- to label %bb4 unwind label %bb7
+ to label %bb4 unwind label %bb7
bb4: ; preds = %bb3
invoke void @widget()
- to label %bb6 unwind label %bb7
+ to label %bb6 unwind label %bb7
bb6: ; preds = %bb4
invoke void @widget()
- to label %bb3 unwind label %bb7
+ to label %bb3 unwind label %bb7
bb7: ; preds = %bb6, %bb4, %bb3
%tmp8 = landingpad { ptr, i32 }
- cleanup
+ cleanup
ret void
}
More information about the llvm-commits
mailing list