[llvm] ac946e6 - [SCEV] Re-organize tests requiring remainder predicates.
Florian Hahn via llvm-commits
llvm-commits at lists.llvm.org
Fri Sep 27 13:04:41 PDT 2024
Author: Florian Hahn
Date: 2024-09-27T21:03:52+01:00
New Revision: ac946e615c625fcc7c370fac8bdbff24bfa3c9e8
URL: https://github.com/llvm/llvm-project/commit/ac946e615c625fcc7c370fac8bdbff24bfa3c9e8
DIFF: https://github.com/llvm/llvm-project/commit/ac946e615c625fcc7c370fac8bdbff24bfa3c9e8.diff
LOG: [SCEV] Re-organize tests requiring remainder predicates.
Also adds additional test coverage in
Analysis/ScalarEvolution/trip-count-urem.ll
Extra test coverage is for https://github.com/llvm/llvm-project/pull/108777.
Added:
llvm/test/Analysis/ScalarEvolution/predicated-max-backedge-taken-count-guard-info.ll
llvm/test/Analysis/ScalarEvolution/trip-count-urem.ll
Modified:
llvm/test/Analysis/ScalarEvolution/max-backedge-taken-count-guard-info.ll
Removed:
################################################################################
diff --git a/llvm/test/Analysis/ScalarEvolution/max-backedge-taken-count-guard-info.ll b/llvm/test/Analysis/ScalarEvolution/max-backedge-taken-count-guard-info.ll
index 59e40bfd114337..124d895e5aef50 100644
--- a/llvm/test/Analysis/ScalarEvolution/max-backedge-taken-count-guard-info.ll
+++ b/llvm/test/Analysis/ScalarEvolution/max-backedge-taken-count-guard-info.ll
@@ -1568,86 +1568,6 @@ exit:
ret i32 0
}
-
-define i32 @ptr_induction_ult_2(ptr %a, ptr %b) {
-; CHECK-LABEL: 'ptr_induction_ult_2'
-; CHECK-NEXT: Classifying expressions for: @ptr_induction_ult_2
-; CHECK-NEXT: %ptr.iv = phi ptr [ %ptr.iv.next, %loop ], [ %a, %entry ]
-; CHECK-NEXT: --> {%a,+,4}<%loop> U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %loop: Computable }
-; CHECK-NEXT: %ptr.iv.next = getelementptr i32, ptr %ptr.iv, i64 1
-; CHECK-NEXT: --> {(4 + %a),+,4}<%loop> U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %loop: Computable }
-; CHECK-NEXT: Determining loop execution counts for: @ptr_induction_ult_2
-; CHECK-NEXT: Loop %loop: Unpredictable backedge-taken count.
-; CHECK-NEXT: Loop %loop: Unpredictable constant max backedge-taken count.
-; CHECK-NEXT: Loop %loop: Unpredictable symbolic max backedge-taken count.
-;
-entry:
- %cmp.6 = icmp ult ptr %a, %b
- br i1 %cmp.6, label %loop, label %exit
-
-loop:
- %ptr.iv = phi ptr [ %ptr.iv.next, %loop ], [ %a, %entry ]
- %ptr.iv.next = getelementptr i32, ptr %ptr.iv, i64 1
- %exitcond = icmp eq ptr %ptr.iv, %b
- br i1 %exitcond, label %exit, label %loop
-
-exit:
- ret i32 0
-}
-
-define i32 @ptr_induction_ult_3_step_6(ptr %a, ptr %b) {
-; CHECK-LABEL: 'ptr_induction_ult_3_step_6'
-; CHECK-NEXT: Classifying expressions for: @ptr_induction_ult_3_step_6
-; CHECK-NEXT: %ptr.iv = phi ptr [ %ptr.iv.next, %loop ], [ %a, %entry ]
-; CHECK-NEXT: --> {%a,+,6}<%loop> U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %loop: Computable }
-; CHECK-NEXT: %ptr.iv.next = getelementptr i8, ptr %ptr.iv, i64 6
-; CHECK-NEXT: --> {(6 + %a),+,6}<%loop> U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %loop: Computable }
-; CHECK-NEXT: Determining loop execution counts for: @ptr_induction_ult_3_step_6
-; CHECK-NEXT: Loop %loop: Unpredictable backedge-taken count.
-; CHECK-NEXT: Loop %loop: Unpredictable constant max backedge-taken count.
-; CHECK-NEXT: Loop %loop: Unpredictable symbolic max backedge-taken count.
-;
-entry:
- %cmp.6 = icmp ult ptr %a, %b
- br i1 %cmp.6, label %loop, label %exit
-
-loop:
- %ptr.iv = phi ptr [ %ptr.iv.next, %loop ], [ %a, %entry ]
- %ptr.iv.next = getelementptr i8, ptr %ptr.iv, i64 6
- %exitcond = icmp eq ptr %ptr.iv, %b
- br i1 %exitcond, label %exit, label %loop
-
-exit:
- ret i32 0
-}
-
-define i32 @ptr_induction_ult_3_step_7(ptr %a, ptr %b) {
-; CHECK-LABEL: 'ptr_induction_ult_3_step_7'
-; CHECK-NEXT: Classifying expressions for: @ptr_induction_ult_3_step_7
-; CHECK-NEXT: %ptr.iv = phi ptr [ %ptr.iv.next, %loop ], [ %a, %entry ]
-; CHECK-NEXT: --> {%a,+,7}<%loop> U: full-set S: full-set Exits: ((-1 * (ptrtoint ptr %a to i64)) + (ptrtoint ptr %b to i64) + %a) LoopDispositions: { %loop: Computable }
-; CHECK-NEXT: %ptr.iv.next = getelementptr i8, ptr %ptr.iv, i64 7
-; CHECK-NEXT: --> {(7 + %a),+,7}<%loop> U: full-set S: full-set Exits: (7 + (-1 * (ptrtoint ptr %a to i64)) + (ptrtoint ptr %b to i64) + %a) LoopDispositions: { %loop: Computable }
-; CHECK-NEXT: Determining loop execution counts for: @ptr_induction_ult_3_step_7
-; CHECK-NEXT: Loop %loop: backedge-taken count is ((7905747460161236407 * (ptrtoint ptr %b to i64)) + (-7905747460161236407 * (ptrtoint ptr %a to i64)))
-; CHECK-NEXT: Loop %loop: constant max backedge-taken count is i64 -1
-; CHECK-NEXT: Loop %loop: symbolic max backedge-taken count is ((7905747460161236407 * (ptrtoint ptr %b to i64)) + (-7905747460161236407 * (ptrtoint ptr %a to i64)))
-; CHECK-NEXT: Loop %loop: Trip multiple is 1
-;
-entry:
- %cmp.6 = icmp ult ptr %a, %b
- br i1 %cmp.6, label %loop, label %exit
-
-loop:
- %ptr.iv = phi ptr [ %ptr.iv.next, %loop ], [ %a, %entry ]
- %ptr.iv.next = getelementptr i8, ptr %ptr.iv, i64 7
- %exitcond = icmp eq ptr %ptr.iv, %b
- br i1 %exitcond, label %exit, label %loop
-
-exit:
- ret i32 0
-}
-
define void @ptr_induction_eq_1(ptr %a, ptr %b) {
; CHECK-LABEL: 'ptr_induction_eq_1'
; CHECK-NEXT: Classifying expressions for: @ptr_induction_eq_1
@@ -1705,47 +1625,6 @@ exit:
ret void
}
-; TODO: It feels like we should be able to calculate the symbolic max
-; exit count for the loop.inc block here, in the same way as
-; ptr_induction_eq_1. The problem seems to be in howFarToZero when the
-; ControlsOnlyExit is set to false.
-define void @ptr_induction_early_exit_eq_1(ptr %a, ptr %b, ptr %c) {
-; CHECK-LABEL: 'ptr_induction_early_exit_eq_1'
-; CHECK-NEXT: Classifying expressions for: @ptr_induction_early_exit_eq_1
-; CHECK-NEXT: %ptr.iv = phi ptr [ %ptr.iv.next, %loop.inc ], [ %a, %entry ]
-; CHECK-NEXT: --> {%a,+,8}<nuw><%loop> U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %loop: Computable }
-; CHECK-NEXT: %ld1 = load ptr, ptr %ptr.iv, align 8
-; CHECK-NEXT: --> %ld1 U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %loop: Variant }
-; CHECK-NEXT: %ptr.iv.next = getelementptr inbounds i8, ptr %ptr.iv, i64 8
-; CHECK-NEXT: --> {(8 + %a),+,8}<nw><%loop> U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %loop: Computable }
-; CHECK-NEXT: Determining loop execution counts for: @ptr_induction_early_exit_eq_1
-; CHECK-NEXT: Loop %loop: <multiple exits> Unpredictable backedge-taken count.
-; CHECK-NEXT: exit count for loop: ***COULDNOTCOMPUTE***
-; CHECK-NEXT: exit count for loop.inc: ***COULDNOTCOMPUTE***
-; CHECK-NEXT: Loop %loop: Unpredictable constant max backedge-taken count.
-; CHECK-NEXT: Loop %loop: Unpredictable symbolic max backedge-taken count.
-; CHECK-NEXT: symbolic max exit count for loop: ***COULDNOTCOMPUTE***
-; CHECK-NEXT: symbolic max exit count for loop.inc: ***COULDNOTCOMPUTE***
-;
-entry:
- %cmp = icmp eq ptr %a, %b
- br i1 %cmp, label %exit, label %loop
-
-loop:
- %ptr.iv = phi ptr [ %ptr.iv.next, %loop.inc ], [ %a, %entry ]
- %ld1 = load ptr, ptr %ptr.iv, align 8
- %earlyexitcond = icmp eq ptr %ld1, %c
- br i1 %earlyexitcond, label %exit, label %loop.inc
-
-loop.inc:
- %ptr.iv.next = getelementptr inbounds i8, ptr %ptr.iv, i64 8
- %exitcond = icmp eq ptr %ptr.iv.next, %b
- br i1 %exitcond, label %exit, label %loop
-
-exit:
- ret void
-}
-
define void @ptr_induction_early_exit_eq_2(ptr %a, i64 %n, ptr %c) {
; CHECK-LABEL: 'ptr_induction_early_exit_eq_2'
; CHECK-NEXT: Classifying expressions for: @ptr_induction_early_exit_eq_2
@@ -1786,7 +1665,6 @@ exit:
ret void
}
-
define void @gep_addrec_nw(ptr %a) {
; CHECK-LABEL: 'gep_addrec_nw'
; CHECK-NEXT: Classifying expressions for: @gep_addrec_nw
diff --git a/llvm/test/Analysis/ScalarEvolution/predicated-max-backedge-taken-count-guard-info.ll b/llvm/test/Analysis/ScalarEvolution/predicated-max-backedge-taken-count-guard-info.ll
new file mode 100644
index 00000000000000..ba3a5b4cfb3ae8
--- /dev/null
+++ b/llvm/test/Analysis/ScalarEvolution/predicated-max-backedge-taken-count-guard-info.ll
@@ -0,0 +1,101 @@
+; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py UTC_ARGS: --version 5
+; RUN: opt -passes='print<scalar-evolution>' -scalar-evolution-classify-expressions=0 -disable-output %s 2>&1 | FileCheck %s
+
+define i32 @ptr_induction_ult(ptr %a, ptr %b) {
+; CHECK-LABEL: 'ptr_induction_ult'
+; CHECK-NEXT: Determining loop execution counts for: @ptr_induction_ult
+; CHECK-NEXT: Loop %loop: Unpredictable backedge-taken count.
+; CHECK-NEXT: Loop %loop: Unpredictable constant max backedge-taken count.
+; CHECK-NEXT: Loop %loop: Unpredictable symbolic max backedge-taken count.
+;
+entry:
+ %cmp.6 = icmp ult ptr %a, %b
+ br i1 %cmp.6, label %loop, label %exit
+
+loop:
+ %ptr.iv = phi ptr [ %ptr.iv.next, %loop ], [ %a, %entry ]
+ %ptr.iv.next = getelementptr i32, ptr %ptr.iv, i64 1
+ %exitcond = icmp eq ptr %ptr.iv, %b
+ br i1 %exitcond, label %exit, label %loop
+
+exit:
+ ret i32 0
+}
+
+define i32 @ptr_induction_ult_3_step_6(ptr %a, ptr %b) {
+; CHECK-LABEL: 'ptr_induction_ult_3_step_6'
+; CHECK-NEXT: Determining loop execution counts for: @ptr_induction_ult_3_step_6
+; CHECK-NEXT: Loop %loop: Unpredictable backedge-taken count.
+; CHECK-NEXT: Loop %loop: Unpredictable constant max backedge-taken count.
+; CHECK-NEXT: Loop %loop: Unpredictable symbolic max backedge-taken count.
+;
+entry:
+ %cmp.6 = icmp ult ptr %a, %b
+ br i1 %cmp.6, label %loop, label %exit
+
+loop:
+ %ptr.iv = phi ptr [ %ptr.iv.next, %loop ], [ %a, %entry ]
+ %ptr.iv.next = getelementptr i8, ptr %ptr.iv, i64 6
+ %exitcond = icmp eq ptr %ptr.iv, %b
+ br i1 %exitcond, label %exit, label %loop
+
+exit:
+ ret i32 0
+}
+
+define i32 @ptr_induction_ult_3_step_7(ptr %a, ptr %b) {
+; CHECK-LABEL: 'ptr_induction_ult_3_step_7'
+; CHECK-NEXT: Determining loop execution counts for: @ptr_induction_ult_3_step_7
+; CHECK-NEXT: Loop %loop: backedge-taken count is ((7905747460161236407 * (ptrtoint ptr %b to i64)) + (-7905747460161236407 * (ptrtoint ptr %a to i64)))
+; CHECK-NEXT: Loop %loop: constant max backedge-taken count is i64 -1
+; CHECK-NEXT: Loop %loop: symbolic max backedge-taken count is ((7905747460161236407 * (ptrtoint ptr %b to i64)) + (-7905747460161236407 * (ptrtoint ptr %a to i64)))
+; CHECK-NEXT: Loop %loop: Trip multiple is 1
+;
+entry:
+ %cmp.6 = icmp ult ptr %a, %b
+ br i1 %cmp.6, label %loop, label %exit
+
+loop:
+ %ptr.iv = phi ptr [ %ptr.iv.next, %loop ], [ %a, %entry ]
+ %ptr.iv.next = getelementptr i8, ptr %ptr.iv, i64 7
+ %exitcond = icmp eq ptr %ptr.iv, %b
+ br i1 %exitcond, label %exit, label %loop
+
+exit:
+ ret i32 0
+}
+
+; %a and %b may not have the same alignment, so the loop may only via the early
+; exit when %ptr.iv > %b. The predicated exit count for the latch can be
+; computed by adding a predicate.
+define void @ptr_induction_early_exit_eq_1(ptr %a, ptr %b, ptr %c) {
+; CHECK-LABEL: 'ptr_induction_early_exit_eq_1'
+; CHECK-NEXT: Determining loop execution counts for: @ptr_induction_early_exit_eq_1
+; CHECK-NEXT: Loop %loop: <multiple exits> Unpredictable backedge-taken count.
+; CHECK-NEXT: exit count for loop: ***COULDNOTCOMPUTE***
+; CHECK-NEXT: exit count for loop.inc: ***COULDNOTCOMPUTE***
+; CHECK-NEXT: Loop %loop: Unpredictable constant max backedge-taken count.
+; CHECK-NEXT: Loop %loop: Unpredictable symbolic max backedge-taken count.
+; CHECK-NEXT: symbolic max exit count for loop: ***COULDNOTCOMPUTE***
+; CHECK-NEXT: symbolic max exit count for loop.inc: ***COULDNOTCOMPUTE***
+;
+entry:
+ %cmp = icmp eq ptr %a, %b
+ br i1 %cmp, label %exit, label %loop
+
+loop:
+ %ptr.iv = phi ptr [ %ptr.iv.next, %loop.inc ], [ %a, %entry ]
+ %ld1 = load ptr, ptr %ptr.iv, align 8
+ %earlyexitcond = icmp eq ptr %ld1, %c
+ br i1 %earlyexitcond, label %exit, label %loop.inc
+
+loop.inc:
+ %ptr.iv.next = getelementptr inbounds i8, ptr %ptr.iv, i64 8
+ %exitcond = icmp eq ptr %ptr.iv.next, %b
+ br i1 %exitcond, label %exit, label %loop
+
+exit:
+ ret void
+}
+
+
diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count-urem.ll b/llvm/test/Analysis/ScalarEvolution/trip-count-urem.ll
new file mode 100644
index 00000000000000..928d9accf35e7d
--- /dev/null
+++ b/llvm/test/Analysis/ScalarEvolution/trip-count-urem.ll
@@ -0,0 +1,28 @@
+; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py
+; RUN: opt -passes='print<scalar-evolution>' -scalar-evolution-classify-expressions=0 -disable-output %s 2>&1 | FileCheck %s
+
+declare void @foo()
+
+define void @test_trip_count_expr_contains_urem(i32 %N) {
+; CHECK-LABEL: 'test_trip_count_expr_contains_urem'
+; CHECK-NEXT: Determining loop execution counts for: @test_trip_count_expr_contains_urem
+; CHECK-NEXT: Loop %loop: Unpredictable backedge-taken count.
+; CHECK-NEXT: Loop %loop: Unpredictable constant max backedge-taken count.
+; CHECK-NEXT: Loop %loop: Unpredictable symbolic max backedge-taken count.
+;
+entry:
+ %n.rnd.up = add i32 %N, 1
+ %n.mod.vf = urem i32 %n.rnd.up, 16
+ %n.vec = sub i32 %n.rnd.up, %n.mod.vf
+ br label %loop
+
+loop:
+ %index = phi i32 [ 0, %entry ], [ %index.next, %loop ]
+ %index.next = add i32 %index, 16
+ call void @foo()
+ %ec = icmp eq i32 %index, %n.vec
+ br i1 %ec, label %exit, label %loop
+
+exit:
+ ret void
+}
More information about the llvm-commits
mailing list