Skip to content

Commit 3b912e2

Browse files
committed
[LV] Bail out on loop-variant steps when rewriting SCEV exprs.
If the step is not loop-invariant, we cannot create a modified AddRec, as the start needs to be loop-invariant. Mark those cases as CannotAnalyze and bail out, to fix a crash.
1 parent cfe51db commit 3b912e2

File tree

2 files changed

+72
-0
lines changed

2 files changed

+72
-0
lines changed

llvm/lib/Analysis/LoopAccessAnalysis.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2569,6 +2569,10 @@ class SCEVAddRecForUniformityRewriter
25692569
// incrementing the start by Offset * step.
25702570
Type *Ty = Expr->getType();
25712571
auto *Step = Expr->getStepRecurrence(SE);
2572+
if (!SE.isLoopInvariant(Step, TheLoop)) {
2573+
CannotAnalyze = true;
2574+
return Expr;
2575+
}
25722576
auto *NewStep = SE.getMulExpr(Step, SE.getConstant(Ty, StepMultiplier));
25732577
auto *ScaledOffset = SE.getMulExpr(Step, SE.getConstant(Ty, Offset));
25742578
auto *NewStart = SE.getAddExpr(Expr->getStart(), ScaledOffset);

llvm/test/Transforms/LoopVectorize/uniform_across_vf_induction1.ll

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,3 +1212,71 @@ loop:
12121212
exit:
12131213
ret void
12141214
}
1215+
1216+
define void @test_step_is_not_invariant(ptr %A) {
1217+
; CHECK-LABEL: define void @test_step_is_not_invariant
1218+
; CHECK-SAME: (ptr [[A:%.*]]) {
1219+
; CHECK-NEXT: entry:
1220+
; CHECK-NEXT: br i1 false, label [[SCALAR_PH:%.*]], label [[VECTOR_PH:%.*]]
1221+
; CHECK: vector.ph:
1222+
; CHECK-NEXT: br label [[VECTOR_BODY:%.*]]
1223+
; CHECK: vector.body:
1224+
; CHECK-NEXT: [[OFFSET_IDX:%.*]] = phi i32 [ 0, [[VECTOR_PH]] ], [ [[INDEX_NEXT:%.*]], [[VECTOR_BODY]] ]
1225+
; CHECK-NEXT: [[VEC_IND:%.*]] = phi <2 x i32> [ <i32 0, i32 1>, [[VECTOR_PH]] ], [ [[VEC_IND_NEXT:%.*]], [[VECTOR_BODY]] ]
1226+
; CHECK-NEXT: [[TMP0:%.*]] = trunc i32 [[OFFSET_IDX]] to i16
1227+
; CHECK-NEXT: [[TMP1:%.*]] = add i16 [[TMP0]], 0
1228+
; CHECK-NEXT: [[TMP2:%.*]] = add i16 [[TMP0]], 1
1229+
; CHECK-NEXT: [[TMP3:%.*]] = mul nuw nsw <2 x i32> [[VEC_IND]], [[VEC_IND]]
1230+
; CHECK-NEXT: [[TMP4:%.*]] = trunc <2 x i32> [[TMP3]] to <2 x i16>
1231+
; CHECK-NEXT: [[TMP5:%.*]] = udiv <2 x i16> [[TMP4]], <i16 6, i16 6>
1232+
; CHECK-NEXT: [[TMP6:%.*]] = zext <2 x i16> [[TMP5]] to <2 x i64>
1233+
; CHECK-NEXT: [[TMP7:%.*]] = extractelement <2 x i64> [[TMP6]], i32 0
1234+
; CHECK-NEXT: [[TMP8:%.*]] = getelementptr inbounds i16, ptr [[A]], i64 [[TMP7]]
1235+
; CHECK-NEXT: [[TMP9:%.*]] = extractelement <2 x i64> [[TMP6]], i32 1
1236+
; CHECK-NEXT: [[TMP10:%.*]] = getelementptr inbounds i16, ptr [[A]], i64 [[TMP9]]
1237+
; CHECK-NEXT: store i16 [[TMP1]], ptr [[TMP8]], align 2
1238+
; CHECK-NEXT: store i16 [[TMP2]], ptr [[TMP10]], align 2
1239+
; CHECK-NEXT: [[INDEX_NEXT]] = add nuw i32 [[OFFSET_IDX]], 2
1240+
; CHECK-NEXT: [[VEC_IND_NEXT]] = add <2 x i32> [[VEC_IND]], <i32 2, i32 2>
1241+
; CHECK-NEXT: [[TMP11:%.*]] = icmp eq i32 [[INDEX_NEXT]], 56
1242+
; CHECK-NEXT: br i1 [[TMP11]], label [[MIDDLE_BLOCK:%.*]], label [[VECTOR_BODY]], !llvm.loop [[LOOP38:![0-9]+]]
1243+
; CHECK: middle.block:
1244+
; CHECK-NEXT: [[CMP_N:%.*]] = icmp eq i32 56, 56
1245+
; CHECK-NEXT: br i1 [[CMP_N]], label [[EXIT:%.*]], label [[SCALAR_PH]]
1246+
; CHECK: scalar.ph:
1247+
; CHECK-NEXT: [[BC_RESUME_VAL:%.*]] = phi i32 [ 56, [[MIDDLE_BLOCK]] ], [ 0, [[ENTRY:%.*]] ]
1248+
; CHECK-NEXT: br label [[LOOP:%.*]]
1249+
; CHECK: loop:
1250+
; CHECK-NEXT: [[IV:%.*]] = phi i32 [ [[BC_RESUME_VAL]], [[SCALAR_PH]] ], [ [[IV_NEXT:%.*]], [[LOOP]] ]
1251+
; CHECK-NEXT: [[MUL:%.*]] = mul nuw nsw i32 [[IV]], [[IV]]
1252+
; CHECK-NEXT: [[DIV_LHS_TRUNC:%.*]] = trunc i32 [[MUL]] to i16
1253+
; CHECK-NEXT: [[DIV5:%.*]] = udiv i16 [[DIV_LHS_TRUNC]], 6
1254+
; CHECK-NEXT: [[CONV:%.*]] = trunc i32 [[IV]] to i16
1255+
; CHECK-NEXT: [[IDXPROM:%.*]] = zext i16 [[DIV5]] to i64
1256+
; CHECK-NEXT: [[ARRAYIDX:%.*]] = getelementptr inbounds i16, ptr [[A]], i64 [[IDXPROM]]
1257+
; CHECK-NEXT: store i16 [[CONV]], ptr [[ARRAYIDX]], align 2
1258+
; CHECK-NEXT: [[IV_NEXT]] = add nuw nsw i32 [[IV]], 1
1259+
; CHECK-NEXT: [[EXITCOND_NOT:%.*]] = icmp eq i32 [[IV_NEXT]], 56
1260+
; CHECK-NEXT: br i1 [[EXITCOND_NOT]], label [[EXIT]], label [[LOOP]], !llvm.loop [[LOOP39:![0-9]+]]
1261+
; CHECK: exit:
1262+
; CHECK-NEXT: ret void
1263+
;
1264+
entry:
1265+
br label %loop
1266+
1267+
loop:
1268+
%iv = phi i32 [ 0, %entry ], [ %iv.next, %loop ]
1269+
%mul = mul nuw nsw i32 %iv, %iv
1270+
%div.lhs.trunc = trunc i32 %mul to i16
1271+
%div5 = udiv i16 %div.lhs.trunc, 6
1272+
%conv = trunc i32 %iv to i16
1273+
%idxprom = zext i16 %div5 to i64
1274+
%arrayidx = getelementptr inbounds i16, ptr %A, i64 %idxprom
1275+
store i16 %conv, ptr %arrayidx, align 2
1276+
%iv.next = add nuw nsw i32 %iv, 1
1277+
%exitcond.not = icmp eq i32 %iv.next, 56
1278+
br i1 %exitcond.not, label %exit, label %loop
1279+
1280+
exit:
1281+
ret void
1282+
}

0 commit comments

Comments
 (0)