From 798e9c7f461e0ba4c7e478f2c8cd48a554171494 Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Mon, 13 Jan 2025 15:31:26 +0000 Subject: [PATCH 1/3] LICM: pre-commit tests for samesign-getMatching --- llvm/test/Transforms/LICM/min_max.ll | 60 ++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/llvm/test/Transforms/LICM/min_max.ll b/llvm/test/Transforms/LICM/min_max.ll index c2bf0a7f20cc1..c16b595864677 100644 --- a/llvm/test/Transforms/LICM/min_max.ll +++ b/llvm/test/Transforms/LICM/min_max.ll @@ -242,6 +242,36 @@ exit: ret i32 %iv } +define i32 @test_sgt_samesign(i32 %start, i32 %inv_1, i32 %inv_2) { +; CHECK-LABEL: @test_sgt_samesign( +; CHECK-NEXT: entry: +; CHECK-NEXT: br label [[LOOP:%.*]] +; CHECK: loop: +; CHECK-NEXT: [[IV:%.*]] = phi i32 [ [[START:%.*]], [[ENTRY:%.*]] ], [ [[IV_NEXT:%.*]], [[LOOP]] ] +; CHECK-NEXT: [[CMP_1:%.*]] = icmp samesign ugt i32 [[IV]], [[INV_1:%.*]] +; CHECK-NEXT: [[CMP_2:%.*]] = icmp sgt i32 [[IV]], [[INV_2:%.*]] +; CHECK-NEXT: [[LOOP_COND:%.*]] = and i1 [[CMP_1]], [[CMP_2]] +; CHECK-NEXT: [[IV_NEXT]] = add i32 [[IV]], 1 +; CHECK-NEXT: br i1 [[LOOP_COND]], label [[LOOP]], label [[EXIT:%.*]] +; CHECK: exit: +; CHECK-NEXT: [[IV_LCSSA:%.*]] = phi i32 [ [[IV]], [[LOOP]] ] +; CHECK-NEXT: ret i32 [[IV_LCSSA]] +; +entry: + br label %loop + +loop: + %iv = phi i32 [%start, %entry], [%iv.next, %loop] + %cmp_1 = icmp samesign ugt i32 %iv, %inv_1 + %cmp_2 = icmp sgt i32 %iv, %inv_2 + %loop_cond = and i1 %cmp_1, %cmp_2 + %iv.next = add i32 %iv, 1 + br i1 %loop_cond, label %loop, label %exit + +exit: + ret i32 %iv +} + ; turn to %iv >=s smax(inv_1, inv_2) and hoist it out of loop. define i32 @test_sge(i32 %start, i32 %inv_1, i32 %inv_2) { ; CHECK-LABEL: @test_sge( @@ -272,6 +302,36 @@ exit: ret i32 %iv } +define i32 @test_sge_samesign(i32 %start, i32 %inv_1, i32 %inv_2) { +; CHECK-LABEL: @test_sge_samesign( +; CHECK-NEXT: entry: +; CHECK-NEXT: br label [[LOOP:%.*]] +; CHECK: loop: +; CHECK-NEXT: [[IV:%.*]] = phi i32 [ [[START:%.*]], [[ENTRY:%.*]] ], [ [[IV_NEXT:%.*]], [[LOOP]] ] +; CHECK-NEXT: [[CMP_1:%.*]] = icmp sge i32 [[IV]], [[INV_1:%.*]] +; CHECK-NEXT: [[CMP_2:%.*]] = icmp samesign uge i32 [[IV]], [[INV_2:%.*]] +; CHECK-NEXT: [[LOOP_COND:%.*]] = and i1 [[CMP_1]], [[CMP_2]] +; CHECK-NEXT: [[IV_NEXT]] = add i32 [[IV]], 1 +; CHECK-NEXT: br i1 [[LOOP_COND]], label [[LOOP]], label [[EXIT:%.*]] +; CHECK: exit: +; CHECK-NEXT: [[IV_LCSSA:%.*]] = phi i32 [ [[IV]], [[LOOP]] ] +; CHECK-NEXT: ret i32 [[IV_LCSSA]] +; +entry: + br label %loop + +loop: + %iv = phi i32 [%start, %entry], [%iv.next, %loop] + %cmp_1 = icmp sge i32 %iv, %inv_1 + %cmp_2 = icmp samesign uge i32 %iv, %inv_2 + %loop_cond = and i1 %cmp_1, %cmp_2 + %iv.next = add i32 %iv, 1 + br i1 %loop_cond, label %loop, label %exit + +exit: + ret i32 %iv +} + ; Turn OR to AND and handle accordingly. define i32 @test_ult_inv(i32 %start, i32 %inv_1, i32 %inv_2) { ; CHECK-LABEL: @test_ult_inv( From 85de9492d71e1b9a7d33a7870e24cbc1751ebe01 Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Mon, 13 Jan 2025 15:33:31 +0000 Subject: [PATCH 2/3] LICM: teach hoistMinMax about samesign Follow up on 4a0d53a (PatternMatch: migrate to CmpPredicate) to get rid of one of the FIXMEs it introduced by replacing a predicate comparison with CmpPredicate::getMatching. --- llvm/lib/Transforms/Scalar/LICM.cpp | 8 ++++---- llvm/test/Transforms/LICM/min_max.ll | 12 +++++------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/llvm/lib/Transforms/Scalar/LICM.cpp b/llvm/lib/Transforms/Scalar/LICM.cpp index a5d5eecb1ebf8..575c44f63af13 100644 --- a/llvm/lib/Transforms/Scalar/LICM.cpp +++ b/llvm/lib/Transforms/Scalar/LICM.cpp @@ -2453,8 +2453,8 @@ static bool hoistMinMax(Instruction &I, Loop &L, ICFLoopSafetyInfo &SafetyInfo, if (!MatchICmpAgainstInvariant(Cond1, P1, LHS1, RHS1) || !MatchICmpAgainstInvariant(Cond2, P2, LHS2, RHS2)) return false; - // FIXME: Use CmpPredicate::getMatching here. - if (P1 != static_cast(P2) || LHS1 != LHS2) + auto MatchingPred = CmpPredicate::getMatching(P1, P2); + if (!MatchingPred || LHS1 != LHS2) return false; // Everything is fine, we can do the transform. @@ -2462,7 +2462,7 @@ static bool hoistMinMax(Instruction &I, Loop &L, ICFLoopSafetyInfo &SafetyInfo, assert( (UseMin || ICmpInst::isGT(P1) || ICmpInst::isGE(P1)) && "Relational predicate is either less (or equal) or greater (or equal)!"); - Intrinsic::ID id = ICmpInst::isSigned(P1) + Intrinsic::ID id = ICmpInst::isSigned(*MatchingPred) ? (UseMin ? Intrinsic::smin : Intrinsic::smax) : (UseMin ? Intrinsic::umin : Intrinsic::umax); auto *Preheader = L.getLoopPreheader(); @@ -2479,7 +2479,7 @@ static bool hoistMinMax(Instruction &I, Loop &L, ICFLoopSafetyInfo &SafetyInfo, (ICmpInst::isSigned(P1) ? "s" : "u") + (UseMin ? "min" : "max")); Builder.SetInsertPoint(&I); - ICmpInst::Predicate P = P1; + ICmpInst::Predicate P = *MatchingPred; if (Inverse) P = ICmpInst::getInversePredicate(P); Value *NewCond = Builder.CreateICmp(P, LHS1, NewRHS); diff --git a/llvm/test/Transforms/LICM/min_max.ll b/llvm/test/Transforms/LICM/min_max.ll index c16b595864677..4c55f7a29c7fe 100644 --- a/llvm/test/Transforms/LICM/min_max.ll +++ b/llvm/test/Transforms/LICM/min_max.ll @@ -245,12 +245,11 @@ exit: define i32 @test_sgt_samesign(i32 %start, i32 %inv_1, i32 %inv_2) { ; CHECK-LABEL: @test_sgt_samesign( ; CHECK-NEXT: entry: +; CHECK-NEXT: [[INVARIANT_UMAX:%.*]] = call i32 @llvm.smax.i32(i32 [[INV_1:%.*]], i32 [[INV_2:%.*]]) ; CHECK-NEXT: br label [[LOOP:%.*]] ; CHECK: loop: ; CHECK-NEXT: [[IV:%.*]] = phi i32 [ [[START:%.*]], [[ENTRY:%.*]] ], [ [[IV_NEXT:%.*]], [[LOOP]] ] -; CHECK-NEXT: [[CMP_1:%.*]] = icmp samesign ugt i32 [[IV]], [[INV_1:%.*]] -; CHECK-NEXT: [[CMP_2:%.*]] = icmp sgt i32 [[IV]], [[INV_2:%.*]] -; CHECK-NEXT: [[LOOP_COND:%.*]] = and i1 [[CMP_1]], [[CMP_2]] +; CHECK-NEXT: [[LOOP_COND:%.*]] = icmp sgt i32 [[IV]], [[INVARIANT_UMAX]] ; CHECK-NEXT: [[IV_NEXT]] = add i32 [[IV]], 1 ; CHECK-NEXT: br i1 [[LOOP_COND]], label [[LOOP]], label [[EXIT:%.*]] ; CHECK: exit: @@ -305,14 +304,13 @@ exit: define i32 @test_sge_samesign(i32 %start, i32 %inv_1, i32 %inv_2) { ; CHECK-LABEL: @test_sge_samesign( ; CHECK-NEXT: entry: +; CHECK-NEXT: [[INV_1:%.*]] = call i32 @llvm.smax.i32(i32 [[INV_3:%.*]], i32 [[INV_2:%.*]]) ; CHECK-NEXT: br label [[LOOP:%.*]] ; CHECK: loop: ; CHECK-NEXT: [[IV:%.*]] = phi i32 [ [[START:%.*]], [[ENTRY:%.*]] ], [ [[IV_NEXT:%.*]], [[LOOP]] ] -; CHECK-NEXT: [[CMP_1:%.*]] = icmp sge i32 [[IV]], [[INV_1:%.*]] -; CHECK-NEXT: [[CMP_2:%.*]] = icmp samesign uge i32 [[IV]], [[INV_2:%.*]] -; CHECK-NEXT: [[LOOP_COND:%.*]] = and i1 [[CMP_1]], [[CMP_2]] +; CHECK-NEXT: [[CMP_1:%.*]] = icmp sge i32 [[IV]], [[INV_1]] ; CHECK-NEXT: [[IV_NEXT]] = add i32 [[IV]], 1 -; CHECK-NEXT: br i1 [[LOOP_COND]], label [[LOOP]], label [[EXIT:%.*]] +; CHECK-NEXT: br i1 [[CMP_1]], label [[LOOP]], label [[EXIT:%.*]] ; CHECK: exit: ; CHECK-NEXT: [[IV_LCSSA:%.*]] = phi i32 [ [[IV]], [[LOOP]] ] ; CHECK-NEXT: ret i32 [[IV_LCSSA]] From 94ecfb0a62c4ff4afbc9872084b2cbd2d66ea51e Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Mon, 13 Jan 2025 16:09:58 +0000 Subject: [PATCH 3/3] LICM: address review --- llvm/lib/Transforms/Scalar/LICM.cpp | 12 +++++++----- llvm/test/Transforms/LICM/min_max.ll | 10 +++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/llvm/lib/Transforms/Scalar/LICM.cpp b/llvm/lib/Transforms/Scalar/LICM.cpp index 575c44f63af13..0bab01904406e 100644 --- a/llvm/lib/Transforms/Scalar/LICM.cpp +++ b/llvm/lib/Transforms/Scalar/LICM.cpp @@ -2458,9 +2458,10 @@ static bool hoistMinMax(Instruction &I, Loop &L, ICFLoopSafetyInfo &SafetyInfo, return false; // Everything is fine, we can do the transform. - bool UseMin = ICmpInst::isLT(P1) || ICmpInst::isLE(P1); + bool UseMin = ICmpInst::isLT(*MatchingPred) || ICmpInst::isLE(*MatchingPred); assert( - (UseMin || ICmpInst::isGT(P1) || ICmpInst::isGE(P1)) && + (UseMin || ICmpInst::isGT(*MatchingPred) || + ICmpInst::isGE(*MatchingPred)) && "Relational predicate is either less (or equal) or greater (or equal)!"); Intrinsic::ID id = ICmpInst::isSigned(*MatchingPred) ? (UseMin ? Intrinsic::smin : Intrinsic::smax) @@ -2475,9 +2476,10 @@ static bool hoistMinMax(Instruction &I, Loop &L, ICFLoopSafetyInfo &SafetyInfo, if (isa(I)) RHS2 = Builder.CreateFreeze(RHS2, RHS2->getName() + ".fr"); Value *NewRHS = Builder.CreateBinaryIntrinsic( - id, RHS1, RHS2, nullptr, StringRef("invariant.") + - (ICmpInst::isSigned(P1) ? "s" : "u") + - (UseMin ? "min" : "max")); + id, RHS1, RHS2, nullptr, + StringRef("invariant.") + + (ICmpInst::isSigned(*MatchingPred) ? "s" : "u") + + (UseMin ? "min" : "max")); Builder.SetInsertPoint(&I); ICmpInst::Predicate P = *MatchingPred; if (Inverse) diff --git a/llvm/test/Transforms/LICM/min_max.ll b/llvm/test/Transforms/LICM/min_max.ll index 4c55f7a29c7fe..04f309b785ebc 100644 --- a/llvm/test/Transforms/LICM/min_max.ll +++ b/llvm/test/Transforms/LICM/min_max.ll @@ -245,11 +245,11 @@ exit: define i32 @test_sgt_samesign(i32 %start, i32 %inv_1, i32 %inv_2) { ; CHECK-LABEL: @test_sgt_samesign( ; CHECK-NEXT: entry: -; CHECK-NEXT: [[INVARIANT_UMAX:%.*]] = call i32 @llvm.smax.i32(i32 [[INV_1:%.*]], i32 [[INV_2:%.*]]) +; CHECK-NEXT: [[INVARIANT_SMAX:%.*]] = call i32 @llvm.smax.i32(i32 [[INV_1:%.*]], i32 [[INV_2:%.*]]) ; CHECK-NEXT: br label [[LOOP:%.*]] ; CHECK: loop: ; CHECK-NEXT: [[IV:%.*]] = phi i32 [ [[START:%.*]], [[ENTRY:%.*]] ], [ [[IV_NEXT:%.*]], [[LOOP]] ] -; CHECK-NEXT: [[LOOP_COND:%.*]] = icmp sgt i32 [[IV]], [[INVARIANT_UMAX]] +; CHECK-NEXT: [[LOOP_COND:%.*]] = icmp sgt i32 [[IV]], [[INVARIANT_SMAX]] ; CHECK-NEXT: [[IV_NEXT]] = add i32 [[IV]], 1 ; CHECK-NEXT: br i1 [[LOOP_COND]], label [[LOOP]], label [[EXIT:%.*]] ; CHECK: exit: @@ -304,13 +304,13 @@ exit: define i32 @test_sge_samesign(i32 %start, i32 %inv_1, i32 %inv_2) { ; CHECK-LABEL: @test_sge_samesign( ; CHECK-NEXT: entry: -; CHECK-NEXT: [[INV_1:%.*]] = call i32 @llvm.smax.i32(i32 [[INV_3:%.*]], i32 [[INV_2:%.*]]) +; CHECK-NEXT: [[INVARIANT_SMAX:%.*]] = call i32 @llvm.smax.i32(i32 [[INV_1:%.*]], i32 [[INV_2:%.*]]) ; CHECK-NEXT: br label [[LOOP:%.*]] ; CHECK: loop: ; CHECK-NEXT: [[IV:%.*]] = phi i32 [ [[START:%.*]], [[ENTRY:%.*]] ], [ [[IV_NEXT:%.*]], [[LOOP]] ] -; CHECK-NEXT: [[CMP_1:%.*]] = icmp sge i32 [[IV]], [[INV_1]] +; CHECK-NEXT: [[LOOP_COND:%.*]] = icmp sge i32 [[IV]], [[INVARIANT_SMAX]] ; CHECK-NEXT: [[IV_NEXT]] = add i32 [[IV]], 1 -; CHECK-NEXT: br i1 [[CMP_1]], label [[LOOP]], label [[EXIT:%.*]] +; CHECK-NEXT: br i1 [[LOOP_COND]], label [[LOOP]], label [[EXIT:%.*]] ; CHECK: exit: ; CHECK-NEXT: [[IV_LCSSA:%.*]] = phi i32 [ [[IV]], [[LOOP]] ] ; CHECK-NEXT: ret i32 [[IV_LCSSA]]