Skip to content

Commit 884c03e

Browse files
[LV] Return Invalid from getLegacyCost when instruction cost forced. (llvm#154543)
LoopVectorizationCostModel::expectedCost will only override the cost returned by getInstructionCost when valid. This patch ensures we do the same in VPCostContext::getLegacyCost, avoiding the "VPlan cost model and legacy cost model disagreed" assert in the included test.
1 parent 5ae126e commit 884c03e

File tree

2 files changed

+67
-9
lines changed

2 files changed

+67
-9
lines changed

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6784,9 +6784,10 @@ void LoopVectorizationPlanner::plan(ElementCount UserVF, unsigned UserIC) {
67846784

67856785
InstructionCost VPCostContext::getLegacyCost(Instruction *UI,
67866786
ElementCount VF) const {
6787-
if (ForceTargetInstructionCost.getNumOccurrences())
6788-
return InstructionCost(ForceTargetInstructionCost.getNumOccurrences());
6789-
return CM.getInstructionCost(UI, VF);
6787+
InstructionCost Cost = CM.getInstructionCost(UI, VF);
6788+
if (Cost.isValid() && ForceTargetInstructionCost.getNumOccurrences())
6789+
return InstructionCost(ForceTargetInstructionCost);
6790+
return Cost;
67906791
}
67916792

67926793
bool VPCostContext::isLegacyUniformAfterVectorization(Instruction *I,

llvm/test/Transforms/LoopVectorize/AArch64/force-target-instruction-cost.ll

Lines changed: 63 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
2-
; RUN: opt -p loop-vectorize -force-target-instruction-cost=1 -S %s | FileCheck %s
2+
; RUN: opt -p loop-vectorize -force-target-instruction-cost=10 -S %s | FileCheck %s
33

44
target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128-Fn32"
55
target triple = "arm64-apple-macosx14.0.0"
@@ -65,19 +65,17 @@ define void @test_iv_cost(ptr %ptr.start, i8 %a, i64 %b) {
6565
; CHECK-NEXT: [[MIN_ITERS_CHECK:%.*]] = icmp ult i64 [[START]], 4
6666
; CHECK-NEXT: br i1 [[MIN_ITERS_CHECK]], label %[[VEC_EPILOG_SCALAR_PH:.*]], label %[[VECTOR_MAIN_LOOP_ITER_CHECK:.*]]
6767
; CHECK: [[VECTOR_MAIN_LOOP_ITER_CHECK]]:
68-
; CHECK-NEXT: [[MIN_ITERS_CHECK1:%.*]] = icmp ult i64 [[START]], 32
68+
; CHECK-NEXT: [[MIN_ITERS_CHECK1:%.*]] = icmp ult i64 [[START]], 16
6969
; CHECK-NEXT: br i1 [[MIN_ITERS_CHECK1]], label %[[VEC_EPILOG_PH:.*]], label %[[VECTOR_PH:.*]]
7070
; CHECK: [[VECTOR_PH]]:
71-
; CHECK-NEXT: [[N_MOD_VF:%.*]] = urem i64 [[START]], 32
71+
; CHECK-NEXT: [[N_MOD_VF:%.*]] = urem i64 [[START]], 16
7272
; CHECK-NEXT: [[N_VEC:%.*]] = sub i64 [[START]], [[N_MOD_VF]]
7373
; CHECK-NEXT: br label %[[VECTOR_BODY:.*]]
7474
; CHECK: [[VECTOR_BODY]]:
7575
; CHECK-NEXT: [[INDEX:%.*]] = phi i64 [ 0, %[[VECTOR_PH]] ], [ [[INDEX_NEXT:%.*]], %[[VECTOR_BODY]] ]
7676
; CHECK-NEXT: [[NEXT_GEP1:%.*]] = getelementptr i8, ptr [[PTR_START]], i64 [[INDEX]]
77-
; CHECK-NEXT: [[TMP3:%.*]] = getelementptr i8, ptr [[NEXT_GEP1]], i32 16
7877
; CHECK-NEXT: store <16 x i8> zeroinitializer, ptr [[NEXT_GEP1]], align 1
79-
; CHECK-NEXT: store <16 x i8> zeroinitializer, ptr [[TMP3]], align 1
80-
; CHECK-NEXT: [[INDEX_NEXT]] = add nuw i64 [[INDEX]], 32
78+
; CHECK-NEXT: [[INDEX_NEXT]] = add nuw i64 [[INDEX]], 16
8179
; CHECK-NEXT: [[TMP4:%.*]] = icmp eq i64 [[INDEX_NEXT]], [[N_VEC]]
8280
; CHECK-NEXT: br i1 [[TMP4]], label %[[MIDDLE_BLOCK:.*]], label %[[VECTOR_BODY]], !llvm.loop [[LOOP4:![0-9]+]]
8381
; CHECK: [[MIDDLE_BLOCK]]:
@@ -366,6 +364,63 @@ exit:
366364
ret void
367365
}
368366

367+
define void @invalid_legacy_cost(i64 %N, ptr %x) #0 {
368+
; CHECK-LABEL: define void @invalid_legacy_cost(
369+
; CHECK-SAME: i64 [[N:%.*]], ptr [[X:%.*]]) #[[ATTR0:[0-9]+]] {
370+
; CHECK-NEXT: [[ENTRY:.*]]:
371+
; CHECK-NEXT: [[TMP0:%.*]] = add i64 [[N]], 1
372+
; CHECK-NEXT: [[MIN_ITERS_CHECK:%.*]] = icmp ult i64 [[TMP0]], 2
373+
; CHECK-NEXT: br i1 [[MIN_ITERS_CHECK]], label %[[SCALAR_PH:.*]], label %[[VECTOR_PH:.*]]
374+
; CHECK: [[VECTOR_PH]]:
375+
; CHECK-NEXT: [[N_MOD_VF:%.*]] = urem i64 [[TMP0]], 2
376+
; CHECK-NEXT: [[N_VEC:%.*]] = sub i64 [[TMP0]], [[N_MOD_VF]]
377+
; CHECK-NEXT: br label %[[VECTOR_BODY:.*]]
378+
; CHECK: [[VECTOR_BODY]]:
379+
; CHECK-NEXT: [[INDEX:%.*]] = phi i64 [ 0, %[[VECTOR_PH]] ], [ [[INDEX_NEXT:%.*]], %[[VECTOR_BODY]] ]
380+
; CHECK-NEXT: [[TMP5:%.*]] = alloca i8, i64 0, align 16
381+
; CHECK-NEXT: [[TMP6:%.*]] = alloca i8, i64 0, align 16
382+
; CHECK-NEXT: [[TMP7:%.*]] = insertelement <2 x ptr> poison, ptr [[TMP5]], i32 0
383+
; CHECK-NEXT: [[TMP8:%.*]] = insertelement <2 x ptr> [[TMP7]], ptr [[TMP6]], i32 1
384+
; CHECK-NEXT: [[TMP9:%.*]] = getelementptr ptr, ptr [[X]], i64 [[INDEX]]
385+
; CHECK-NEXT: store <2 x ptr> [[TMP8]], ptr [[TMP9]], align 8
386+
; CHECK-NEXT: [[INDEX_NEXT]] = add nuw i64 [[INDEX]], 2
387+
; CHECK-NEXT: [[TMP11:%.*]] = icmp eq i64 [[INDEX_NEXT]], [[N_VEC]]
388+
; CHECK-NEXT: br i1 [[TMP11]], label %[[MIDDLE_BLOCK:.*]], label %[[VECTOR_BODY]], !llvm.loop [[LOOP23:![0-9]+]]
389+
; CHECK: [[MIDDLE_BLOCK]]:
390+
; CHECK-NEXT: [[CMP_N:%.*]] = icmp eq i64 [[TMP0]], [[N_VEC]]
391+
; CHECK-NEXT: br i1 [[CMP_N]], label %[[FOR_END:.*]], label %[[SCALAR_PH]]
392+
; CHECK: [[SCALAR_PH]]:
393+
; CHECK-NEXT: [[BC_RESUME_VAL:%.*]] = phi i64 [ [[N_VEC]], %[[MIDDLE_BLOCK]] ], [ 0, %[[ENTRY]] ]
394+
; CHECK-NEXT: br label %[[FOR_BODY:.*]]
395+
; CHECK: [[FOR_BODY]]:
396+
; CHECK-NEXT: [[IV:%.*]] = phi i64 [ [[BC_RESUME_VAL]], %[[SCALAR_PH]] ], [ [[IV_NEXT:%.*]], %[[FOR_BODY]] ]
397+
; CHECK-NEXT: [[TMP12:%.*]] = alloca i8, i64 0, align 16
398+
; CHECK-NEXT: [[ARRAYIDX:%.*]] = getelementptr ptr, ptr [[X]], i64 [[IV]]
399+
; CHECK-NEXT: store ptr [[TMP12]], ptr [[ARRAYIDX]], align 8
400+
; CHECK-NEXT: [[IV_NEXT]] = add i64 [[IV]], 1
401+
; CHECK-NEXT: [[EXITCOND_NOT:%.*]] = icmp eq i64 [[IV]], [[N]]
402+
; CHECK-NEXT: br i1 [[EXITCOND_NOT]], label %[[FOR_END]], label %[[FOR_BODY]], !llvm.loop [[LOOP24:![0-9]+]]
403+
; CHECK: [[FOR_END]]:
404+
; CHECK-NEXT: ret void
405+
;
406+
entry:
407+
br label %for.body
408+
409+
for.body:
410+
%iv = phi i64 [ 0, %entry ], [ %iv.next, %for.body ]
411+
%0 = alloca i8, i64 0, align 16
412+
%arrayidx = getelementptr ptr, ptr %x, i64 %iv
413+
store ptr %0, ptr %arrayidx, align 8
414+
%iv.next = add i64 %iv, 1
415+
%exitcond.not = icmp eq i64 %iv, %N
416+
br i1 %exitcond.not, label %for.end, label %for.body
417+
418+
for.end:
419+
ret void
420+
}
421+
422+
attributes #0 = { "target-features"="+neon,+sve" vscale_range(1,16) }
423+
369424
declare void @llvm.assume(i1 noundef)
370425
declare i64 @llvm.umin.i64(i64, i64)
371426
;.
@@ -392,4 +447,6 @@ declare i64 @llvm.umin.i64(i64, i64)
392447
; CHECK: [[META20]] = !{[[META13]]}
393448
; CHECK: [[LOOP21]] = distinct !{[[LOOP21]], [[META1]], [[META2]]}
394449
; CHECK: [[LOOP22]] = distinct !{[[LOOP22]], [[META1]]}
450+
; CHECK: [[LOOP23]] = distinct !{[[LOOP23]], [[META1]], [[META2]]}
451+
; CHECK: [[LOOP24]] = distinct !{[[LOOP24]], [[META2]], [[META1]]}
395452
;.

0 commit comments

Comments
 (0)