Skip to content

Commit 0a272d3

Browse files
committed
[LV] Use SCEV to analyze second operand for cost query.
Improve operand analysis using SCEV for cost purposes. This fixes a divergence between legacy and VPlan-based cost-modeling after 533e6bb. Fixes #106248.
1 parent 616f7d3 commit 0a272d3

File tree

2 files changed

+70
-0
lines changed

2 files changed

+70
-0
lines changed

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6529,6 +6529,10 @@ LoopVectorizationCostModel::getInstructionCost(Instruction *I,
65296529
// Certain instructions can be cheaper to vectorize if they have a constant
65306530
// second vector operand. One example of this are shifts on x86.
65316531
Value *Op2 = I->getOperand(1);
6532+
if (!isa<Constant>(Op2) && PSE.getSE()->isSCEVable(Op2->getType()) &&
6533+
isa<SCEVConstant>(PSE.getSCEV(Op2))) {
6534+
Op2 = cast<SCEVConstant>(PSE.getSCEV(Op2))->getValue();
6535+
}
65326536
auto Op2Info = TTI.getOperandInfo(Op2);
65336537
if (Op2Info.Kind == TargetTransformInfo::OK_AnyValue &&
65346538
Legal->isInvariant(Op2))
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: --version 5
2+
; RUN: opt -p loop-vectorize -S %s | FileCheck %s
3+
4+
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128"
5+
target triple = "x86_64-unknown-linux-gnu"
6+
7+
; Test case for https://github.com/llvm/llvm-project/issues/106248.
8+
define i64 @test_foldable_live_in_via_scev() {
9+
; CHECK-LABEL: define i64 @test_foldable_live_in_via_scev() {
10+
; CHECK-NEXT: [[ENTRY:.*]]:
11+
; CHECK-NEXT: [[CONV:%.*]] = zext i16 -6 to i64
12+
; CHECK-NEXT: [[ADD:%.*]] = add nsw i64 [[CONV]], -65528
13+
; CHECK-NEXT: br i1 false, label %[[SCALAR_PH:.*]], label %[[VECTOR_PH:.*]]
14+
; CHECK: [[VECTOR_PH]]:
15+
; CHECK-NEXT: br label %[[VECTOR_BODY:.*]]
16+
; CHECK: [[VECTOR_BODY]]:
17+
; CHECK-NEXT: [[INDEX:%.*]] = phi i32 [ 0, %[[VECTOR_PH]] ], [ [[INDEX_NEXT:%.*]], %[[VECTOR_BODY]] ]
18+
; CHECK-NEXT: [[VEC_PHI:%.*]] = phi <2 x i64> [ <i64 1, i64 1>, %[[VECTOR_PH]] ], [ [[TMP0:%.*]], %[[VECTOR_BODY]] ]
19+
; CHECK-NEXT: [[VEC_PHI1:%.*]] = phi <2 x i64> [ <i64 1, i64 1>, %[[VECTOR_PH]] ], [ [[TMP1:%.*]], %[[VECTOR_BODY]] ]
20+
; CHECK-NEXT: [[TMP0]] = mul <2 x i64> [[VEC_PHI]], <i64 2, i64 2>
21+
; CHECK-NEXT: [[TMP1]] = mul <2 x i64> [[VEC_PHI1]], <i64 2, i64 2>
22+
; CHECK-NEXT: [[INDEX_NEXT]] = add nuw i32 [[INDEX]], 4
23+
; CHECK-NEXT: [[TMP2:%.*]] = icmp eq i32 [[INDEX_NEXT]], 96
24+
; CHECK-NEXT: br i1 [[TMP2]], label %[[MIDDLE_BLOCK:.*]], label %[[VECTOR_BODY]], !llvm.loop [[LOOP0:![0-9]+]]
25+
; CHECK: [[MIDDLE_BLOCK]]:
26+
; CHECK-NEXT: [[BIN_RDX:%.*]] = mul <2 x i64> [[TMP1]], [[TMP0]]
27+
; CHECK-NEXT: [[TMP3:%.*]] = call i64 @llvm.vector.reduce.mul.v2i64(<2 x i64> [[BIN_RDX]])
28+
; CHECK-NEXT: br i1 false, label %[[EXIT:.*]], label %[[SCALAR_PH]]
29+
; CHECK: [[SCALAR_PH]]:
30+
; CHECK-NEXT: [[BC_RESUME_VAL:%.*]] = phi i32 [ 97, %[[MIDDLE_BLOCK]] ], [ 1, %[[ENTRY]] ]
31+
; CHECK-NEXT: [[BC_MERGE_RDX:%.*]] = phi i64 [ [[TMP3]], %[[MIDDLE_BLOCK]] ], [ 1, %[[ENTRY]] ]
32+
; CHECK-NEXT: br label %[[LOOP:.*]]
33+
; CHECK: [[LOOP]]:
34+
; CHECK-NEXT: [[IV:%.*]] = phi i32 [ [[BC_RESUME_VAL]], %[[SCALAR_PH]] ], [ [[IV_NEXT:%.*]], %[[LOOP]] ]
35+
; CHECK-NEXT: [[RED:%.*]] = phi i64 [ [[BC_MERGE_RDX]], %[[SCALAR_PH]] ], [ [[MUL:%.*]], %[[LOOP]] ]
36+
; CHECK-NEXT: [[MUL]] = mul nsw i64 [[RED]], [[ADD]]
37+
; CHECK-NEXT: [[IV_NEXT]] = add nsw i32 [[IV]], 1
38+
; CHECK-NEXT: [[EC:%.*]] = icmp eq i32 [[IV_NEXT]], 100
39+
; CHECK-NEXT: br i1 [[EC]], label %[[EXIT]], label %[[LOOP]], !llvm.loop [[LOOP3:![0-9]+]]
40+
; CHECK: [[EXIT]]:
41+
; CHECK-NEXT: [[RET:%.*]] = phi i64 [ [[MUL]], %[[LOOP]] ], [ [[TMP3]], %[[MIDDLE_BLOCK]] ]
42+
; CHECK-NEXT: ret i64 [[RET]]
43+
;
44+
entry:
45+
%conv = zext i16 -6 to i64
46+
%add = add nsw i64 %conv, -65528
47+
br label %loop
48+
49+
loop:
50+
%iv = phi i32 [ 1, %entry ], [ %iv.next, %loop ]
51+
%red = phi i64 [ 1, %entry ], [ %mul, %loop ]
52+
%mul = mul nsw i64 %red, %add
53+
%iv.next = add nsw i32 %iv, 1
54+
%ec = icmp eq i32 %iv.next, 100
55+
br i1 %ec, label %exit, label %loop
56+
57+
exit:
58+
%ret = phi i64 [ %mul, %loop ]
59+
ret i64 %ret
60+
}
61+
;.
62+
; CHECK: [[LOOP0]] = distinct !{[[LOOP0]], [[META1:![0-9]+]], [[META2:![0-9]+]]}
63+
; CHECK: [[META1]] = !{!"llvm.loop.isvectorized", i32 1}
64+
; CHECK: [[META2]] = !{!"llvm.loop.unroll.runtime.disable"}
65+
; CHECK: [[LOOP3]] = distinct !{[[LOOP3]], [[META2]], [[META1]]}
66+
;.

0 commit comments

Comments
 (0)