From 7db6ebf3d7fe935b4384fb0e6bad04e92fcf2a92 Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Wed, 15 Jan 2025 16:16:53 +0000 Subject: [PATCH 1/3] SCEV/test: cover implied-via-addition Since cf2e828 (SCEV: regen some tests with UTC) had the side-effect of moving an implied-via-addition test into IndVarSimplify, implication via addition is no longer covered in the SCEV tests. Fix this by writing fresh tests and checking backedge-taken output from SCEV. --- .../ScalarEvolution/implied-via-addition.ll | 111 ++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 llvm/test/Analysis/ScalarEvolution/implied-via-addition.ll diff --git a/llvm/test/Analysis/ScalarEvolution/implied-via-addition.ll b/llvm/test/Analysis/ScalarEvolution/implied-via-addition.ll new file mode 100644 index 0000000000000..cd349e34b679b --- /dev/null +++ b/llvm/test/Analysis/ScalarEvolution/implied-via-addition.ll @@ -0,0 +1,111 @@ +; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py UTC_ARGS: --version 5 +; RUN: opt < %s -disable-output -passes="print" \ +; RUN: -scalar-evolution-classify-expressions=0 2>&1 | FileCheck %s + +define void @implied1(i32 %n) { +; Prove that (n > 1) ===> (n - 1 > 0). +; CHECK-LABEL: 'implied1' +; CHECK-NEXT: Determining loop execution counts for: @implied1 +; CHECK-NEXT: Loop %header: backedge-taken count is (-2 + %n) +; CHECK-NEXT: Loop %header: constant max backedge-taken count is i32 2147483646 +; CHECK-NEXT: Loop %header: symbolic max backedge-taken count is (-2 + %n) +; CHECK-NEXT: Loop %header: Trip multiple is 1 +; +entry: + %cmp1 = icmp sgt i32 %n, 1 + %n.minus.1 = sub nsw i32 %n, 1 + call void(i1, ...) @llvm.experimental.guard(i1 %cmp1) [ "deopt"() ] + br label %header + +header: + %indvar = phi i32 [ %indvar.next, %header ], [ 0, %entry ] + %indvar.next = add i32 %indvar, 1 + %exitcond = icmp sgt i32 %n.minus.1, %indvar.next + br i1 %exitcond, label %header, label %exit + +exit: + ret void +} + +define void @implied1_neg(i32 %n) { +; Prove that (n > 0) =\=> (n - 1 > 0). +; CHECK-LABEL: 'implied1_neg' +; CHECK-NEXT: Determining loop execution counts for: @implied1_neg +; CHECK-NEXT: Loop %header: backedge-taken count is (-1 + (1 smax (-1 + %n))) +; CHECK-NEXT: Loop %header: constant max backedge-taken count is i32 2147483646 +; CHECK-NEXT: Loop %header: symbolic max backedge-taken count is (-1 + (1 smax (-1 + %n))) +; CHECK-NEXT: Loop %header: Trip multiple is 1 +; +entry: + %cmp1 = icmp sgt i32 %n, 0 + %n.minus.1 = sub nsw i32 %n, 1 + call void(i1, ...) @llvm.experimental.guard(i1 %cmp1) [ "deopt"() ] + br label %header + +header: + %indvar = phi i32 [ %indvar.next, %header ], [ 0, %entry ] + %indvar.next = add i32 %indvar, 1 + %exitcond = icmp sgt i32 %n.minus.1, %indvar.next + br i1 %exitcond, label %header, label %exit + +exit: + ret void +} + +define void @implied2(i32 %n) { +; Prove that (n >= -1) ===> (n + 1 >= 0). +; CHECK-LABEL: 'implied2' +; CHECK-NEXT: Determining loop execution counts for: @implied2 +; CHECK-NEXT: Loop %header: backedge-taken count is (zext i32 (1 + %n) to i64) +; CHECK-NEXT: Loop %header: constant max backedge-taken count is i64 4294967295 +; CHECK-NEXT: Loop %header: symbolic max backedge-taken count is (zext i32 (1 + %n) to i64) +; CHECK-NEXT: Loop %header: Trip multiple is 1 +; +entry: + %cmp1 = icmp uge i32 %n, -1 + %n.1 = add nuw i32 %n, 1 + call void(i1, ...) @llvm.experimental.guard(i1 %cmp1) [ "deopt"() ] + br label %header + +header: + %indvar = phi i32 [ %indvar.next, %header ], [ 0, %entry ] + %indvar.next = add i32 %indvar, 1 + %exitcond = icmp uge i32 %n.1, %indvar.next + br i1 %exitcond, label %header, label %exit + +exit: + ret void +} + +define void @implied2_neg(i32 %n) { +; Prove that (n >= -1) =\=> (n - 1 >= 0). +; CHECK-LABEL: 'implied2_neg' +; CHECK-NEXT: Determining loop execution counts for: @implied2_neg +; CHECK-NEXT: Loop %header: Unpredictable backedge-taken count. +; CHECK-NEXT: Loop %header: Unpredictable constant max backedge-taken count. +; CHECK-NEXT: Loop %header: Unpredictable symbolic max backedge-taken count. +; CHECK-NEXT: Loop %header: Predicated backedge-taken count is (-1 + (1 smax (1 + (sext i32 (-1 + %n) to i64)))) +; CHECK-NEXT: Predicates: +; CHECK-NEXT: {1,+,1}<%header> Added Flags: +; CHECK-NEXT: Loop %header: Predicated constant max backedge-taken count is i64 2147483647 +; CHECK-NEXT: Predicates: +; CHECK-NEXT: {1,+,1}<%header> Added Flags: +; CHECK-NEXT: Loop %header: Predicated symbolic max backedge-taken count is (-1 + (1 smax (1 + (sext i32 (-1 + %n) to i64)))) +; CHECK-NEXT: Predicates: +; CHECK-NEXT: {1,+,1}<%header> Added Flags: +; +entry: + %cmp1 = icmp uge i32 %n, -1 + %n.minus.1 = sub nuw nsw i32 %n, 1 + call void(i1, ...) @llvm.experimental.guard(i1 %cmp1) [ "deopt"() ] + br label %header + +header: + %indvar = phi i32 [ %indvar.next, %header ], [ 0, %entry ] + %indvar.next = add i32 %indvar, 1 + %exitcond = icmp sge i32 %n.minus.1, %indvar.next + br i1 %exitcond, label %header, label %exit + +exit: + ret void +} From 846a440e9cb040e9dde87204939385e2c80d6c10 Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Wed, 15 Jan 2025 18:46:03 +0000 Subject: [PATCH 2/3] SCEV/test: use llvm.assume --- .../ScalarEvolution/implied-via-addition.ll | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/llvm/test/Analysis/ScalarEvolution/implied-via-addition.ll b/llvm/test/Analysis/ScalarEvolution/implied-via-addition.ll index cd349e34b679b..d38636620f16d 100644 --- a/llvm/test/Analysis/ScalarEvolution/implied-via-addition.ll +++ b/llvm/test/Analysis/ScalarEvolution/implied-via-addition.ll @@ -7,14 +7,14 @@ define void @implied1(i32 %n) { ; CHECK-LABEL: 'implied1' ; CHECK-NEXT: Determining loop execution counts for: @implied1 ; CHECK-NEXT: Loop %header: backedge-taken count is (-2 + %n) -; CHECK-NEXT: Loop %header: constant max backedge-taken count is i32 2147483646 +; CHECK-NEXT: Loop %header: constant max backedge-taken count is i32 2147483645 ; CHECK-NEXT: Loop %header: symbolic max backedge-taken count is (-2 + %n) ; CHECK-NEXT: Loop %header: Trip multiple is 1 ; entry: %cmp1 = icmp sgt i32 %n, 1 %n.minus.1 = sub nsw i32 %n, 1 - call void(i1, ...) @llvm.experimental.guard(i1 %cmp1) [ "deopt"() ] + call void @llvm.assume(i1 %cmp1) br label %header header: @@ -31,15 +31,15 @@ define void @implied1_neg(i32 %n) { ; Prove that (n > 0) =\=> (n - 1 > 0). ; CHECK-LABEL: 'implied1_neg' ; CHECK-NEXT: Determining loop execution counts for: @implied1_neg -; CHECK-NEXT: Loop %header: backedge-taken count is (-1 + (1 smax (-1 + %n))) -; CHECK-NEXT: Loop %header: constant max backedge-taken count is i32 2147483646 -; CHECK-NEXT: Loop %header: symbolic max backedge-taken count is (-1 + (1 smax (-1 + %n))) +; CHECK-NEXT: Loop %header: backedge-taken count is (-1 + (1 smax (-1 + %n))) +; CHECK-NEXT: Loop %header: constant max backedge-taken count is i32 2147483645 +; CHECK-NEXT: Loop %header: symbolic max backedge-taken count is (-1 + (1 smax (-1 + %n))) ; CHECK-NEXT: Loop %header: Trip multiple is 1 ; entry: %cmp1 = icmp sgt i32 %n, 0 %n.minus.1 = sub nsw i32 %n, 1 - call void(i1, ...) @llvm.experimental.guard(i1 %cmp1) [ "deopt"() ] + call void @llvm.assume(i1 %cmp1) br label %header header: @@ -56,15 +56,23 @@ define void @implied2(i32 %n) { ; Prove that (n >= -1) ===> (n + 1 >= 0). ; CHECK-LABEL: 'implied2' ; CHECK-NEXT: Determining loop execution counts for: @implied2 -; CHECK-NEXT: Loop %header: backedge-taken count is (zext i32 (1 + %n) to i64) -; CHECK-NEXT: Loop %header: constant max backedge-taken count is i64 4294967295 -; CHECK-NEXT: Loop %header: symbolic max backedge-taken count is (zext i32 (1 + %n) to i64) -; CHECK-NEXT: Loop %header: Trip multiple is 1 +; CHECK-NEXT: Loop %header: Unpredictable backedge-taken count. +; CHECK-NEXT: Loop %header: Unpredictable constant max backedge-taken count. +; CHECK-NEXT: Loop %header: Unpredictable symbolic max backedge-taken count. +; CHECK-NEXT: Loop %header: Predicated backedge-taken count is (1 + (zext i32 %n to i64)) +; CHECK-NEXT: Predicates: +; CHECK-NEXT: {1,+,1}<%header> Added Flags: +; CHECK-NEXT: Loop %header: Predicated constant max backedge-taken count is i64 4294967296 +; CHECK-NEXT: Predicates: +; CHECK-NEXT: {1,+,1}<%header> Added Flags: +; CHECK-NEXT: Loop %header: Predicated symbolic max backedge-taken count is (1 + (zext i32 %n to i64)) +; CHECK-NEXT: Predicates: +; CHECK-NEXT: {1,+,1}<%header> Added Flags: ; entry: %cmp1 = icmp uge i32 %n, -1 %n.1 = add nuw i32 %n, 1 - call void(i1, ...) @llvm.experimental.guard(i1 %cmp1) [ "deopt"() ] + call void @llvm.assume(i1 %cmp1) br label %header header: @@ -81,23 +89,15 @@ define void @implied2_neg(i32 %n) { ; Prove that (n >= -1) =\=> (n - 1 >= 0). ; CHECK-LABEL: 'implied2_neg' ; CHECK-NEXT: Determining loop execution counts for: @implied2_neg -; CHECK-NEXT: Loop %header: Unpredictable backedge-taken count. -; CHECK-NEXT: Loop %header: Unpredictable constant max backedge-taken count. -; CHECK-NEXT: Loop %header: Unpredictable symbolic max backedge-taken count. -; CHECK-NEXT: Loop %header: Predicated backedge-taken count is (-1 + (1 smax (1 + (sext i32 (-1 + %n) to i64)))) -; CHECK-NEXT: Predicates: -; CHECK-NEXT: {1,+,1}<%header> Added Flags: -; CHECK-NEXT: Loop %header: Predicated constant max backedge-taken count is i64 2147483647 -; CHECK-NEXT: Predicates: -; CHECK-NEXT: {1,+,1}<%header> Added Flags: -; CHECK-NEXT: Loop %header: Predicated symbolic max backedge-taken count is (-1 + (1 smax (1 + (sext i32 (-1 + %n) to i64)))) -; CHECK-NEXT: Predicates: -; CHECK-NEXT: {1,+,1}<%header> Added Flags: +; CHECK-NEXT: Loop %header: backedge-taken count is (-1 + (1 smax %n)) +; CHECK-NEXT: Loop %header: constant max backedge-taken count is i32 2147483646 +; CHECK-NEXT: Loop %header: symbolic max backedge-taken count is (-1 + (1 smax %n)) +; CHECK-NEXT: Loop %header: Trip multiple is 1 ; entry: %cmp1 = icmp uge i32 %n, -1 %n.minus.1 = sub nuw nsw i32 %n, 1 - call void(i1, ...) @llvm.experimental.guard(i1 %cmp1) [ "deopt"() ] + call void @llvm.assume(i1 %cmp1) br label %header header: From a614b6001ffa62e839aa204a27ea6db2db1c3aad Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Fri, 17 Jan 2025 10:35:59 +0000 Subject: [PATCH 3/3] SCEV/test: fix nit --- .../test/Analysis/ScalarEvolution/implied-via-addition.ll | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/llvm/test/Analysis/ScalarEvolution/implied-via-addition.ll b/llvm/test/Analysis/ScalarEvolution/implied-via-addition.ll index d38636620f16d..7ab6221d0da53 100644 --- a/llvm/test/Analysis/ScalarEvolution/implied-via-addition.ll +++ b/llvm/test/Analysis/ScalarEvolution/implied-via-addition.ll @@ -3,7 +3,7 @@ ; RUN: -scalar-evolution-classify-expressions=0 2>&1 | FileCheck %s define void @implied1(i32 %n) { -; Prove that (n > 1) ===> (n - 1 > 0). +; Prove that (n s> 1) ===> (n - 1 s> 0). ; CHECK-LABEL: 'implied1' ; CHECK-NEXT: Determining loop execution counts for: @implied1 ; CHECK-NEXT: Loop %header: backedge-taken count is (-2 + %n) @@ -28,7 +28,7 @@ exit: } define void @implied1_neg(i32 %n) { -; Prove that (n > 0) =\=> (n - 1 > 0). +; Prove that (n s> 0) =\=> (n - 1 s> 0). ; CHECK-LABEL: 'implied1_neg' ; CHECK-NEXT: Determining loop execution counts for: @implied1_neg ; CHECK-NEXT: Loop %header: backedge-taken count is (-1 + (1 smax (-1 + %n))) @@ -53,7 +53,7 @@ exit: } define void @implied2(i32 %n) { -; Prove that (n >= -1) ===> (n + 1 >= 0). +; Prove that (n u>= -1) ===> (n + 1 u>= 0). ; CHECK-LABEL: 'implied2' ; CHECK-NEXT: Determining loop execution counts for: @implied2 ; CHECK-NEXT: Loop %header: Unpredictable backedge-taken count. @@ -86,7 +86,7 @@ exit: } define void @implied2_neg(i32 %n) { -; Prove that (n >= -1) =\=> (n - 1 >= 0). +; Prove that (n u>= -1) =\=> (n - 1 s>= 0). ; CHECK-LABEL: 'implied2_neg' ; CHECK-NEXT: Determining loop execution counts for: @implied2_neg ; CHECK-NEXT: Loop %header: backedge-taken count is (-1 + (1 smax %n))