Skip to content

Commit b106c80

Browse files
committed
Merge remote-tracking branch 'origin/main' into vplan-materialize-constant-vector-tc
2 parents 4618886 + e5f5813 commit b106c80

File tree

3 files changed

+527
-311
lines changed

3 files changed

+527
-311
lines changed

llvm/test/Transforms/LoopVectorize/AArch64/check-prof-info.ll

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ target triple = "aarch64-unknown-linux-gnu"
1010

1111
; We expect the branch weight computations after vectorisation to use
1212
; vscale=2 for neoverse-v1 and vscale=1 for neoverse-v2.
13-
define void @_Z3foov() {
13+
define void @_Z3foov(i64 %n) {
1414
; CHECK-V1-IC1-LABEL: define void @_Z3foov(
15-
; CHECK-V1-IC1-SAME: ) #[[ATTR0:[0-9]+]] {
15+
; CHECK-V1-IC1-SAME: i64 [[N:%.*]]) #[[ATTR0:[0-9]+]] {
1616
; CHECK-V1-IC1: [[ENTRY:.*:]]
1717
; CHECK-V1-IC1: br i1 [[MIN_ITERS_CHECK:%.*]], label %[[SCALAR_PH:.*]], label %[[VECTOR_PH:.*]], !prof [[PROF0:![0-9]+]]
1818
; CHECK-V1-IC1: [[VECTOR_PH]]:
@@ -28,35 +28,45 @@ define void @_Z3foov() {
2828
; CHECK-V1-IC1: [[FOR_COND_CLEANUP]]:
2929
;
3030
; CHECK-V2-IC1-LABEL: define void @_Z3foov(
31-
; CHECK-V2-IC1-SAME: ) #[[ATTR0:[0-9]+]] {
31+
; CHECK-V2-IC1-SAME: i64 [[N:%.*]]) #[[ATTR0:[0-9]+]] {
3232
; CHECK-V2-IC1: [[ENTRY:.*:]]
33-
; CHECK-V2-IC1: br i1 false, label %[[SCALAR_PH:.*]], label %[[VECTOR_PH:.*]], !prof [[PROF0:![0-9]+]]
33+
; CHECK-V2-IC1: br i1 [[MIN_ITERS_CHECK:%.*]], label %[[SCALAR_PH:.*]], label %[[VECTOR_PH:.*]], !prof [[PROF0:![0-9]+]]
3434
; CHECK-V2-IC1: [[VECTOR_PH]]:
3535
; CHECK-V2-IC1: br label %[[VECTOR_BODY:.*]]
3636
; CHECK-V2-IC1: [[VECTOR_BODY]]:
3737
; CHECK-V2-IC1: br i1 [[TMP4:%.*]], label %[[MIDDLE_BLOCK:.*]], label %[[VECTOR_BODY]], !prof [[PROF1:![0-9]+]], !llvm.loop [[LOOP2:![0-9]+]]
3838
; CHECK-V2-IC1: [[MIDDLE_BLOCK]]:
39-
; CHECK-V2-IC1: br label %[[FOR_COND_CLEANUP:.*]]
39+
; CHECK-V2-IC1: br i1 [[CMP_N:%.*]], label %[[FOR_COND_CLEANUP:.*]], label %[[SCALAR_PH]], !prof [[PROF5:![0-9]+]]
4040
; CHECK-V2-IC1: [[SCALAR_PH]]:
4141
; CHECK-V2-IC1: br label %[[FOR_BODY:.*]]
4242
; CHECK-V2-IC1: [[FOR_BODY]]:
4343
; CHECK-V2-IC1: br i1 [[EXITCOND:%.*]], label %[[FOR_COND_CLEANUP]], label %[[FOR_BODY]], !prof [[PROF5:![0-9]+]], !llvm.loop [[LOOP6:![0-9]+]]
4444
; CHECK-V2-IC1: [[FOR_COND_CLEANUP]]:
4545
;
4646
; CHECK-V2-IC4-LABEL: define void @_Z3foov(
47-
; CHECK-V2-IC4-SAME: ) #[[ATTR0:[0-9]+]] {
47+
; CHECK-V2-IC4-SAME: i64 [[N:%.*]]) #[[ATTR0:[0-9]+]] {
4848
; CHECK-V2-IC4: [[VEC_EPILOG_VECTOR_BODY1:.*:]]
49-
; CHECK-V2-IC4: br i1 false, label %[[SCALAR_PH:.*]], label %[[VECTOR_PH:.*]], !prof [[PROF0:![0-9]+]]
49+
; CHECK-V2-IC4: br i1 [[MIN_ITERS_CHECK:%.*]], label %[[VEC_EPILOG_SCALAR_PH:.*]], label %[[VECTOR_MAIN_LOOP_ITER_CHECK:.*]], !prof [[PROF0:![0-9]+]]
50+
; CHECK-V2-IC4: [[VECTOR_MAIN_LOOP_ITER_CHECK]]:
51+
; CHECK-V2-IC4: br i1 [[MIN_ITERS_CHECK1:%.*]], label %[[VEC_EPILOG_PH:.*]], label %[[VECTOR_PH:.*]], !prof [[PROF0]]
5052
; CHECK-V2-IC4: [[VECTOR_PH]]:
5153
; CHECK-V2-IC4: br label %[[VECTOR_BODY:.*]]
5254
; CHECK-V2-IC4: [[VECTOR_BODY]]:
5355
; CHECK-V2-IC4: br i1 [[TMP10:%.*]], label %[[MIDDLE_BLOCK:.*]], label %[[VECTOR_BODY]], !prof [[PROF1:![0-9]+]], !llvm.loop [[LOOP2:![0-9]+]]
5456
; CHECK-V2-IC4: [[MIDDLE_BLOCK]]:
55-
; CHECK-V2-IC4: br label %[[FOR_COND_CLEANUP:.*]]
56-
; CHECK-V2-IC4: [[SCALAR_PH]]:
57+
; CHECK-V2-IC4: br i1 [[CMP_N:%.*]], label %[[FOR_COND_CLEANUP:.*]], label %[[VEC_EPILOG_ITER_CHECK:.*]], !prof [[PROF5:![0-9]+]]
58+
; CHECK-V2-IC4: [[VEC_EPILOG_ITER_CHECK]]:
59+
; CHECK-V2-IC4: br i1 [[MIN_EPILOG_ITERS_CHECK:%.*]], label %[[VEC_EPILOG_SCALAR_PH]], label %[[VEC_EPILOG_PH]], !prof [[PROF6:![0-9]+]]
60+
; CHECK-V2-IC4: [[VEC_EPILOG_PH]]:
61+
; CHECK-V2-IC4: br label %[[VEC_EPILOG_VECTOR_BODY:.*]]
62+
; CHECK-V2-IC4: [[VEC_EPILOG_VECTOR_BODY]]:
63+
; CHECK-V2-IC4: br i1 [[TMP15:%.*]], label %[[VEC_EPILOG_MIDDLE_BLOCK:.*]], label %[[VEC_EPILOG_VECTOR_BODY]], !llvm.loop [[LOOP7:![0-9]+]]
64+
; CHECK-V2-IC4: [[VEC_EPILOG_MIDDLE_BLOCK]]:
65+
; CHECK-V2-IC4: br i1 [[CMP_N10:%.*]], label %[[FOR_COND_CLEANUP]], label %[[VEC_EPILOG_SCALAR_PH]], !prof [[PROF8:![0-9]+]]
66+
; CHECK-V2-IC4: [[VEC_EPILOG_SCALAR_PH]]:
5767
; CHECK-V2-IC4: br label %[[FOR_BODY:.*]]
5868
; CHECK-V2-IC4: [[FOR_BODY]]:
59-
; CHECK-V2-IC4: br i1 [[EXITCOND:%.*]], label %[[FOR_COND_CLEANUP]], label %[[FOR_BODY]], !prof [[PROF5:![0-9]+]], !llvm.loop [[LOOP6:![0-9]+]]
69+
; CHECK-V2-IC4: br i1 [[EXITCOND:%.*]], label %[[FOR_COND_CLEANUP]], label %[[FOR_BODY]], !prof [[PROF9:![0-9]+]], !llvm.loop [[LOOP10:![0-9]+]]
6070
; CHECK-V2-IC4: [[FOR_COND_CLEANUP]]:
6171
;
6272
entry:
@@ -69,7 +79,7 @@ for.body: ; preds = %for.body, %entry
6979
%arrayidx2 = getelementptr inbounds [1024 x i32], ptr @a, i64 0, i64 %iv
7080
store i32 %load, ptr %arrayidx2, align 4
7181
%iv.next = add nuw nsw i64 %iv, 1
72-
%exitcond = icmp eq i64 %iv.next, 1024
82+
%exitcond = icmp eq i64 %iv.next, %n
7383
br i1 %exitcond, label %for.cond.cleanup, label %for.body, !prof !0
7484

7585
for.cond.cleanup: ; preds = %for.body
@@ -99,6 +109,10 @@ for.cond.cleanup: ; preds = %for.body
99109
; CHECK-V2-IC4: [[LOOP2]] = distinct !{[[LOOP2]], [[META3:![0-9]+]], [[META4:![0-9]+]]}
100110
; CHECK-V2-IC4: [[META3]] = !{!"llvm.loop.isvectorized", i32 1}
101111
; CHECK-V2-IC4: [[META4]] = !{!"llvm.loop.unroll.runtime.disable"}
102-
; CHECK-V2-IC4: [[PROF5]] = !{!"branch_weights", i32 0, i32 0}
103-
; CHECK-V2-IC4: [[LOOP6]] = distinct !{[[LOOP6]], [[META4]], [[META3]]}
112+
; CHECK-V2-IC4: [[PROF5]] = !{!"branch_weights", i32 1, i32 15}
113+
; CHECK-V2-IC4: [[PROF6]] = !{!"branch_weights", i32 4, i32 0}
114+
; CHECK-V2-IC4: [[LOOP7]] = distinct !{[[LOOP7]], [[META3]], [[META4]]}
115+
; CHECK-V2-IC4: [[PROF8]] = !{!"branch_weights", i32 1, i32 3}
116+
; CHECK-V2-IC4: [[PROF9]] = !{!"branch_weights", i32 0, i32 0}
117+
; CHECK-V2-IC4: [[LOOP10]] = distinct !{[[LOOP10]], [[META4]], [[META3]]}
104118
;.

0 commit comments

Comments
 (0)