Skip to content

Commit b406c7a

Browse files
committed
[LV] Don't crash when combining partial with inloop reductions.
1 parent 8889377 commit b406c7a

File tree

2 files changed

+67
-1
lines changed

2 files changed

+67
-1
lines changed

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8636,7 +8636,7 @@ void LoopVectorizationPlanner::adjustRecipesForReductions(
86368636
"must be a select recipe");
86378637
IndexOfFirstOperand = 1;
86388638
} else {
8639-
assert((MinVF.isScalar() || isa<VPWidenRecipe>(CurrentLink)) &&
8639+
assert((MinVF.isScalar() || isa<VPWidenRecipe, VPPartialReductionRecipe>(CurrentLink)) &&
86408640
"Expected to replace a VPWidenSC");
86418641
IndexOfFirstOperand = 0;
86428642
}
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals none --version 6
2+
; RUN: opt -p loop-vectorize -prefer-inloop-reductions -mcpu=apple-m1 -force-vector-interleave=1 -S %s | FileCheck %s
3+
4+
target triple = "arm64-apple-macosx"
5+
6+
define i64 @partial_reduction_inloop(ptr %src, i64 %n) {
7+
; CHECK-LABEL: define i64 @partial_reduction_inloop(
8+
; CHECK-SAME: ptr [[SRC:%.*]], i64 [[N:%.*]]) #[[ATTR0:[0-9]+]] {
9+
; CHECK-NEXT: [[ENTRY:.*]]:
10+
; CHECK-NEXT: [[TMP0:%.*]] = add i64 [[N]], 1
11+
; CHECK-NEXT: [[MIN_ITERS_CHECK:%.*]] = icmp ult i64 [[TMP0]], 4
12+
; CHECK-NEXT: br i1 [[MIN_ITERS_CHECK]], label %[[SCALAR_PH:.*]], label %[[VECTOR_PH:.*]]
13+
; CHECK: [[VECTOR_PH]]:
14+
; CHECK-NEXT: [[N_MOD_VF10:%.*]] = urem i64 [[TMP0]], 4
15+
; CHECK-NEXT: [[N_VEC11:%.*]] = sub i64 [[TMP0]], [[N_MOD_VF10]]
16+
; CHECK-NEXT: br label %[[VECTOR_BODY:.*]]
17+
; CHECK: [[VECTOR_BODY]]:
18+
; CHECK-NEXT: [[INDEX12:%.*]] = phi i64 [ 0, %[[VECTOR_PH]] ], [ [[INDEX_NEXT15:%.*]], %[[VECTOR_BODY]] ]
19+
; CHECK-NEXT: [[VEC_PHI13:%.*]] = phi i64 [ 0, %[[VECTOR_PH]] ], [ [[TMP21:%.*]], %[[VECTOR_BODY]] ]
20+
; CHECK-NEXT: [[TMP18:%.*]] = getelementptr i32, ptr [[SRC]], i64 [[INDEX12]]
21+
; CHECK-NEXT: [[WIDE_LOAD14:%.*]] = load <4 x i32>, ptr [[TMP18]], align 4
22+
; CHECK-NEXT: [[TMP19:%.*]] = zext <4 x i32> [[WIDE_LOAD14]] to <4 x i64>
23+
; CHECK-NEXT: [[TMP20:%.*]] = call i64 @llvm.vector.reduce.add.v4i64(<4 x i64> [[TMP19]])
24+
; CHECK-NEXT: [[TMP21]] = add i64 [[VEC_PHI13]], [[TMP20]]
25+
; CHECK-NEXT: [[INDEX_NEXT15]] = add nuw i64 [[INDEX12]], 4
26+
; CHECK-NEXT: [[TMP22:%.*]] = icmp eq i64 [[INDEX_NEXT15]], [[N_VEC11]]
27+
; CHECK-NEXT: br i1 [[TMP22]], label %[[MIDDLE_BLOCK:.*]], label %[[VECTOR_BODY]], !llvm.loop [[LOOP0:![0-9]+]]
28+
; CHECK: [[MIDDLE_BLOCK]]:
29+
; CHECK-NEXT: [[CMP_N16:%.*]] = icmp eq i64 [[TMP0]], [[N_VEC11]]
30+
; CHECK-NEXT: br i1 [[CMP_N16]], label %[[EXIT:.*]], label %[[SCALAR_PH]]
31+
; CHECK: [[SCALAR_PH]]:
32+
; CHECK-NEXT: [[BC_RESUME_VAL:%.*]] = phi i64 [ [[N_VEC11]], %[[MIDDLE_BLOCK]] ], [ 0, %[[ENTRY]] ]
33+
; CHECK-NEXT: [[BC_MERGE_RDX:%.*]] = phi i64 [ [[TMP21]], %[[MIDDLE_BLOCK]] ], [ 0, %[[ENTRY]] ]
34+
; CHECK-NEXT: br label %[[LOOP:.*]]
35+
; CHECK: [[LOOP]]:
36+
; CHECK-NEXT: [[IV:%.*]] = phi i64 [ [[BC_RESUME_VAL]], %[[SCALAR_PH]] ], [ [[IV_NEXT:%.*]], %[[LOOP]] ]
37+
; CHECK-NEXT: [[RED:%.*]] = phi i64 [ [[BC_MERGE_RDX]], %[[SCALAR_PH]] ], [ [[RED_NEXT:%.*]], %[[LOOP]] ]
38+
; CHECK-NEXT: [[GEP_SRC:%.*]] = getelementptr i32, ptr [[SRC]], i64 [[IV]]
39+
; CHECK-NEXT: [[L:%.*]] = load i32, ptr [[GEP_SRC]], align 4
40+
; CHECK-NEXT: [[L_EXT:%.*]] = zext i32 [[L]] to i64
41+
; CHECK-NEXT: [[RED_NEXT]] = add i64 [[RED]], [[L_EXT]]
42+
; CHECK-NEXT: [[IV_NEXT]] = add i64 [[IV]], 1
43+
; CHECK-NEXT: [[EC:%.*]] = icmp eq i64 [[IV]], [[N]]
44+
; CHECK-NEXT: br i1 [[EC]], label %[[EXIT]], label %[[LOOP]], !llvm.loop [[LOOP3:![0-9]+]]
45+
; CHECK: [[EXIT]]:
46+
; CHECK-NEXT: [[RED_NEXT_LCSSA:%.*]] = phi i64 [ [[RED_NEXT]], %[[LOOP]] ], [ [[TMP21]], %[[MIDDLE_BLOCK]] ]
47+
; CHECK-NEXT: ret i64 [[RED_NEXT_LCSSA]]
48+
;
49+
entry:
50+
br label %loop
51+
52+
loop:
53+
%iv = phi i64 [ 0, %entry ], [ %iv.next, %loop ]
54+
%red = phi i64 [ 0, %entry ], [ %red.next, %loop ]
55+
%gep.src = getelementptr i32, ptr %src, i64 %iv
56+
%l = load i32, ptr %gep.src, align 4
57+
%l.ext = zext i32 %l to i64
58+
%red.next = add i64 %red, %l.ext
59+
%iv.next = add i64 %iv, 1
60+
%ec = icmp eq i64 %iv, %n
61+
br i1 %ec, label %exit, label %loop
62+
63+
exit:
64+
ret i64 %red.next
65+
}
66+

0 commit comments

Comments
 (0)