Skip to content

Commit b34a073

Browse files
committed
[LV] Align legacy cost model for gather/scatter w/ uniform addr.
This patch check if the addr is uniform in legacy cost model to align vplan-based cost model after llvm#150371. This patch fixes llvm-test-suite assertion due to cost model misaligned after llvm#149955 under RISCV. I've tested this patch (on top of llvm#149955) on the llvm-test-suite locally with crached options `rva23u64`, `rva23u64_zvl1024b` and build successfully.
1 parent 3160047 commit b34a073

File tree

2 files changed

+195
-2
lines changed

2 files changed

+195
-2
lines changed

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5256,8 +5256,11 @@ LoopVectorizationCostModel::getGatherScatterCost(Instruction *I,
52565256
Type *ValTy = getLoadStoreType(I);
52575257
auto *VectorTy = cast<VectorType>(toVectorTy(ValTy, VF));
52585258
const Align Alignment = getLoadStoreAlignment(I);
5259-
const Value *Ptr = getLoadStorePointerOperand(I);
5260-
Type *PtrTy = toVectorTy(Ptr->getType(), VF);
5259+
Value *Ptr = getLoadStorePointerOperand(I);
5260+
Type *PtrTy = Ptr->getType();
5261+
5262+
if (!Legal->isUniform(Ptr, VF))
5263+
PtrTy = toVectorTy(PtrTy, VF);
52615264

52625265
return TTI.getAddressComputationCost(PtrTy, nullptr, nullptr, CostKind) +
52635266
TTI.getGatherScatterOpCost(I->getOpcode(), VectorTy, Ptr,
Lines changed: 190 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
2+
; RUN: opt < %s -passes=loop-vectorize -mtriple riscv64 -mattr=+rva23u64 -S | FileCheck %s -check-prefixes=CHECK,RVA23
3+
; RUN: opt < %s -passes=loop-vectorize -mtriple riscv64 -mattr=+rva23u64,+zvl1024b -S | FileCheck %s -check-prefixes=CHECK,RVA23ZVL1024B
4+
5+
define i32 @getNeighborBoxes(ptr %boxes, i32 %iBox, ptr %nbrBoxes) {
6+
; CHECK-LABEL: @getNeighborBoxes(
7+
; CHECK-NEXT: entry:
8+
; CHECK-NEXT: [[TMP0:%.*]] = sext i32 [[IBOX:%.*]] to i64
9+
; CHECK-NEXT: [[TMP1:%.*]] = add nsw i64 [[TMP0]], 1
10+
; CHECK-NEXT: [[SMAX2:%.*]] = call i64 @llvm.smax.i64(i64 [[TMP1]], i64 0)
11+
; CHECK-NEXT: [[TMP2:%.*]] = trunc i64 [[SMAX2]] to i32
12+
; CHECK-NEXT: [[TMP3:%.*]] = add nuw i32 [[TMP2]], 1
13+
; CHECK-NEXT: br i1 false, label [[SCALAR_PH:%.*]], label [[VECTOR_SCEVCHECK:%.*]]
14+
; CHECK: vector.scevcheck:
15+
; CHECK-NEXT: [[TMP4:%.*]] = sext i32 [[IBOX]] to i64
16+
; CHECK-NEXT: [[TMP5:%.*]] = add nsw i64 [[TMP4]], 1
17+
; CHECK-NEXT: [[SMAX:%.*]] = call i64 @llvm.smax.i64(i64 [[TMP5]], i64 0)
18+
; CHECK-NEXT: [[TMP6:%.*]] = trunc i64 [[SMAX]] to i32
19+
; CHECK-NEXT: [[TMP7:%.*]] = icmp slt i32 [[TMP6]], 0
20+
; CHECK-NEXT: [[TMP8:%.*]] = icmp ugt i64 [[SMAX]], 4294967295
21+
; CHECK-NEXT: [[TMP9:%.*]] = or i1 [[TMP7]], [[TMP8]]
22+
; CHECK-NEXT: br i1 [[TMP9]], label [[SCALAR_PH]], label [[VECTOR_MEMCHECK:%.*]]
23+
; CHECK: vector.memcheck:
24+
; CHECK-NEXT: [[SCEVGEP:%.*]] = getelementptr i8, ptr [[NBRBOXES:%.*]], i64 4
25+
; CHECK-NEXT: [[SCEVGEP1:%.*]] = getelementptr i8, ptr [[BOXES:%.*]], i64 4
26+
; CHECK-NEXT: [[BOUND0:%.*]] = icmp ult ptr [[NBRBOXES]], [[SCEVGEP1]]
27+
; CHECK-NEXT: [[BOUND1:%.*]] = icmp ult ptr [[BOXES]], [[SCEVGEP]]
28+
; CHECK-NEXT: [[FOUND_CONFLICT:%.*]] = and i1 [[BOUND0]], [[BOUND1]]
29+
; CHECK-NEXT: br i1 [[FOUND_CONFLICT]], label [[SCALAR_PH]], label [[VECTOR_PH:%.*]]
30+
; CHECK: vector.ph:
31+
; CHECK-NEXT: [[BROADCAST_SPLATINSERT:%.*]] = insertelement <vscale x 4 x ptr> poison, ptr [[BOXES]], i64 0
32+
; CHECK-NEXT: [[BROADCAST_SPLAT:%.*]] = shufflevector <vscale x 4 x ptr> [[BROADCAST_SPLATINSERT]], <vscale x 4 x ptr> poison, <vscale x 4 x i32> zeroinitializer
33+
; CHECK-NEXT: [[BROADCAST_SPLATINSERT3:%.*]] = insertelement <vscale x 4 x ptr> poison, ptr [[NBRBOXES]], i64 0
34+
; CHECK-NEXT: [[BROADCAST_SPLAT4:%.*]] = shufflevector <vscale x 4 x ptr> [[BROADCAST_SPLATINSERT3]], <vscale x 4 x ptr> poison, <vscale x 4 x i32> zeroinitializer
35+
; CHECK-NEXT: br label [[VECTOR_BODY:%.*]]
36+
; CHECK: vector.body:
37+
; CHECK-NEXT: [[AVL:%.*]] = phi i32 [ [[TMP3]], [[VECTOR_PH]] ], [ [[AVL_NEXT:%.*]], [[VECTOR_BODY]] ]
38+
; CHECK-NEXT: [[TMP10:%.*]] = call i32 @llvm.experimental.get.vector.length.i32(i32 [[AVL]], i32 4, i1 true)
39+
; CHECK-NEXT: [[BROADCAST_SPLATINSERT5:%.*]] = insertelement <vscale x 4 x i32> poison, i32 [[TMP10]], i64 0
40+
; CHECK-NEXT: [[BROADCAST_SPLAT6:%.*]] = shufflevector <vscale x 4 x i32> [[BROADCAST_SPLATINSERT5]], <vscale x 4 x i32> poison, <vscale x 4 x i32> zeroinitializer
41+
; CHECK-NEXT: [[TMP11:%.*]] = call <vscale x 4 x i32> @llvm.stepvector.nxv4i32()
42+
; CHECK-NEXT: [[TMP12:%.*]] = icmp ult <vscale x 4 x i32> [[TMP11]], [[BROADCAST_SPLAT6]]
43+
; CHECK-NEXT: [[TMP13:%.*]] = select <vscale x 4 x i1> [[TMP12]], <vscale x 4 x i1> splat (i1 true), <vscale x 4 x i1> zeroinitializer
44+
; CHECK-NEXT: [[WIDE_MASKED_GATHER:%.*]] = call <vscale x 4 x i32> @llvm.vp.gather.nxv4i32.nxv4p0(<vscale x 4 x ptr> align 4 [[BROADCAST_SPLAT]], <vscale x 4 x i1> splat (i1 true), i32 [[TMP10]]), !alias.scope [[META0:![0-9]+]]
45+
; CHECK-NEXT: [[TMP14:%.*]] = select <vscale x 4 x i1> [[TMP12]], <vscale x 4 x i1> zeroinitializer, <vscale x 4 x i1> zeroinitializer
46+
; CHECK-NEXT: [[TMP15:%.*]] = or <vscale x 4 x i1> [[TMP13]], [[TMP14]]
47+
; CHECK-NEXT: [[PREDPHI:%.*]] = select <vscale x 4 x i1> [[TMP14]], <vscale x 4 x i32> zeroinitializer, <vscale x 4 x i32> [[WIDE_MASKED_GATHER]]
48+
; CHECK-NEXT: call void @llvm.vp.scatter.nxv4i32.nxv4p0(<vscale x 4 x i32> [[PREDPHI]], <vscale x 4 x ptr> align 4 [[BROADCAST_SPLAT4]], <vscale x 4 x i1> [[TMP15]], i32 [[TMP10]]), !alias.scope [[META3:![0-9]+]], !noalias [[META0]]
49+
; CHECK-NEXT: [[AVL_NEXT]] = sub nuw i32 [[AVL]], [[TMP10]]
50+
; CHECK-NEXT: [[TMP16:%.*]] = icmp eq i32 [[AVL_NEXT]], 0
51+
; CHECK-NEXT: br i1 [[TMP16]], label [[MIDDLE_BLOCK:%.*]], label [[VECTOR_BODY]], !llvm.loop [[LOOP5:![0-9]+]]
52+
; CHECK: middle.block:
53+
; CHECK-NEXT: br label [[EXIT:%.*]]
54+
; CHECK: scalar.ph:
55+
; CHECK-NEXT: [[BC_RESUME_VAL:%.*]] = phi i32 [ 0, [[ENTRY:%.*]] ], [ 0, [[VECTOR_SCEVCHECK]] ], [ 0, [[VECTOR_MEMCHECK]] ]
56+
; CHECK-NEXT: br label [[LOOP:%.*]]
57+
; CHECK: loop:
58+
; CHECK-NEXT: [[IV:%.*]] = phi i32 [ [[BC_RESUME_VAL]], [[SCALAR_PH]] ], [ [[IV_NEXT:%.*]], [[LOOP_EXIT:%.*]] ]
59+
; CHECK-NEXT: br i1 false, label [[EXIT_CRIT_EDGE:%.*]], label [[IF:%.*]]
60+
; CHECK: exit_crit_edge:
61+
; CHECK-NEXT: br label [[LOOP_EXIT]]
62+
; CHECK: if:
63+
; CHECK-NEXT: [[TMP17:%.*]] = load i32, ptr [[BOXES]], align 4
64+
; CHECK-NEXT: br label [[LOOP_EXIT]]
65+
; CHECK: loop.exit:
66+
; CHECK-NEXT: [[IBOX_0_I:%.*]] = phi i32 [ [[TMP17]], [[IF]] ], [ 0, [[EXIT_CRIT_EDGE]] ]
67+
; CHECK-NEXT: store i32 [[IBOX_0_I]], ptr [[NBRBOXES]], align 4
68+
; CHECK-NEXT: [[IV_NEXT]] = add i32 [[IV]], 1
69+
; CHECK-NEXT: [[EXITCOND:%.*]] = icmp sgt i32 [[IV]], [[IBOX]]
70+
; CHECK-NEXT: br i1 [[EXITCOND]], label [[EXIT]], label [[LOOP]], !llvm.loop [[LOOP9:![0-9]+]]
71+
; CHECK: exit:
72+
; CHECK-NEXT: ret i32 0
73+
;
74+
entry:
75+
br label %loop
76+
77+
loop:
78+
%iv = phi i32 [ 0, %entry ], [ %iv.next, %loop.exit ]
79+
br i1 false, label %exit_crit_edge, label %if
80+
81+
exit_crit_edge:
82+
br label %loop.exit
83+
84+
if:
85+
%0 = load i32, ptr %boxes, align 4
86+
br label %loop.exit
87+
88+
loop.exit:
89+
%iBox.0.i = phi i32 [ %0, %if ], [ 0, %exit_crit_edge ]
90+
store i32 %iBox.0.i, ptr %nbrBoxes, align 4
91+
%iv.next = add i32 %iv, 1
92+
%exitcond = icmp sgt i32 %iv, %iBox
93+
br i1 %exitcond, label %exit, label %loop
94+
95+
exit:
96+
ret i32 0
97+
}
98+
99+
define void @_Z9BM_MemCmpILi7E12LessThanZero5FirstEvRN9benchmark5StateE() {
100+
; RVA23-LABEL: @_Z9BM_MemCmpILi7E12LessThanZero5FirstEvRN9benchmark5StateE(
101+
; RVA23-NEXT: entry:
102+
; RVA23-NEXT: br i1 false, label [[SCALAR_PH:%.*]], label [[VECTOR_PH:%.*]]
103+
; RVA23: vector.ph:
104+
; RVA23-NEXT: [[TMP0:%.*]] = call <vscale x 16 x i64> @llvm.stepvector.nxv16i64()
105+
; RVA23-NEXT: [[TMP1:%.*]] = mul <vscale x 16 x i64> [[TMP0]], splat (i64 1)
106+
; RVA23-NEXT: [[INDUCTION:%.*]] = add <vscale x 16 x i64> zeroinitializer, [[TMP1]]
107+
; RVA23-NEXT: br label [[VECTOR_BODY:%.*]]
108+
; RVA23: vector.body:
109+
; RVA23-NEXT: [[VEC_IND:%.*]] = phi <vscale x 16 x i64> [ [[INDUCTION]], [[VECTOR_PH]] ], [ [[VEC_IND_NEXT:%.*]], [[VECTOR_BODY]] ]
110+
; RVA23-NEXT: [[AVL:%.*]] = phi i64 [ 586, [[VECTOR_PH]] ], [ [[AVL_NEXT:%.*]], [[VECTOR_BODY]] ]
111+
; RVA23-NEXT: [[TMP2:%.*]] = call i32 @llvm.experimental.get.vector.length.i64(i64 [[AVL]], i32 16, i1 true)
112+
; RVA23-NEXT: [[TMP3:%.*]] = zext i32 [[TMP2]] to i64
113+
; RVA23-NEXT: [[BROADCAST_SPLATINSERT:%.*]] = insertelement <vscale x 16 x i64> poison, i64 [[TMP3]], i64 0
114+
; RVA23-NEXT: [[BROADCAST_SPLAT:%.*]] = shufflevector <vscale x 16 x i64> [[BROADCAST_SPLATINSERT]], <vscale x 16 x i64> poison, <vscale x 16 x i32> zeroinitializer
115+
; RVA23-NEXT: [[TMP4:%.*]] = mul <vscale x 16 x i64> [[VEC_IND]], splat (i64 7)
116+
; RVA23-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr null, <vscale x 16 x i64> [[TMP4]]
117+
; RVA23-NEXT: call void @llvm.vp.scatter.nxv16i8.nxv16p0(<vscale x 16 x i8> zeroinitializer, <vscale x 16 x ptr> align 1 [[TMP5]], <vscale x 16 x i1> splat (i1 true), i32 [[TMP2]])
118+
; RVA23-NEXT: [[TMP6:%.*]] = zext i32 [[TMP2]] to i64
119+
; RVA23-NEXT: [[AVL_NEXT]] = sub nuw i64 [[AVL]], [[TMP6]]
120+
; RVA23-NEXT: [[VEC_IND_NEXT]] = add <vscale x 16 x i64> [[VEC_IND]], [[BROADCAST_SPLAT]]
121+
; RVA23-NEXT: [[TMP7:%.*]] = icmp eq i64 [[AVL_NEXT]], 0
122+
; RVA23-NEXT: br i1 [[TMP7]], label [[MIDDLE_BLOCK:%.*]], label [[VECTOR_BODY]], !llvm.loop [[LOOP10:![0-9]+]]
123+
; RVA23: middle.block:
124+
; RVA23-NEXT: br label [[EXIT:%.*]]
125+
; RVA23: scalar.ph:
126+
; RVA23-NEXT: br label [[LOOP:%.*]]
127+
; RVA23: loop:
128+
; RVA23-NEXT: [[IV:%.*]] = phi i64 [ 0, [[SCALAR_PH]] ], [ [[IV_NEXT:%.*]], [[LOOP]] ]
129+
; RVA23-NEXT: [[TMP8:%.*]] = mul i64 [[IV]], 7
130+
; RVA23-NEXT: [[ADD_PTR:%.*]] = getelementptr i8, ptr null, i64 [[TMP8]]
131+
; RVA23-NEXT: store i8 0, ptr [[ADD_PTR]], align 1
132+
; RVA23-NEXT: [[IV_NEXT]] = add i64 [[IV]], 1
133+
; RVA23-NEXT: [[EXITCOND:%.*]] = icmp eq i64 [[IV]], 585
134+
; RVA23-NEXT: br i1 [[EXITCOND]], label [[EXIT]], label [[LOOP]], !llvm.loop [[LOOP11:![0-9]+]]
135+
; RVA23: exit:
136+
; RVA23-NEXT: ret void
137+
;
138+
; RVA23ZVL1024B-LABEL: @_Z9BM_MemCmpILi7E12LessThanZero5FirstEvRN9benchmark5StateE(
139+
; RVA23ZVL1024B-NEXT: entry:
140+
; RVA23ZVL1024B-NEXT: br i1 false, label [[SCALAR_PH:%.*]], label [[VECTOR_PH:%.*]]
141+
; RVA23ZVL1024B: vector.ph:
142+
; RVA23ZVL1024B-NEXT: [[TMP0:%.*]] = call <vscale x 2 x i64> @llvm.stepvector.nxv2i64()
143+
; RVA23ZVL1024B-NEXT: [[TMP1:%.*]] = mul <vscale x 2 x i64> [[TMP0]], splat (i64 1)
144+
; RVA23ZVL1024B-NEXT: [[INDUCTION:%.*]] = add <vscale x 2 x i64> zeroinitializer, [[TMP1]]
145+
; RVA23ZVL1024B-NEXT: br label [[VECTOR_BODY:%.*]]
146+
; RVA23ZVL1024B: vector.body:
147+
; RVA23ZVL1024B-NEXT: [[VEC_IND:%.*]] = phi <vscale x 2 x i64> [ [[INDUCTION]], [[VECTOR_PH]] ], [ [[VEC_IND_NEXT:%.*]], [[VECTOR_BODY]] ]
148+
; RVA23ZVL1024B-NEXT: [[AVL:%.*]] = phi i64 [ 586, [[VECTOR_PH]] ], [ [[AVL_NEXT:%.*]], [[VECTOR_BODY]] ]
149+
; RVA23ZVL1024B-NEXT: [[TMP2:%.*]] = call i32 @llvm.experimental.get.vector.length.i64(i64 [[AVL]], i32 2, i1 true)
150+
; RVA23ZVL1024B-NEXT: [[TMP3:%.*]] = zext i32 [[TMP2]] to i64
151+
; RVA23ZVL1024B-NEXT: [[BROADCAST_SPLATINSERT:%.*]] = insertelement <vscale x 2 x i64> poison, i64 [[TMP3]], i64 0
152+
; RVA23ZVL1024B-NEXT: [[BROADCAST_SPLAT:%.*]] = shufflevector <vscale x 2 x i64> [[BROADCAST_SPLATINSERT]], <vscale x 2 x i64> poison, <vscale x 2 x i32> zeroinitializer
153+
; RVA23ZVL1024B-NEXT: [[TMP4:%.*]] = mul <vscale x 2 x i64> [[VEC_IND]], splat (i64 7)
154+
; RVA23ZVL1024B-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr null, <vscale x 2 x i64> [[TMP4]]
155+
; RVA23ZVL1024B-NEXT: call void @llvm.vp.scatter.nxv2i8.nxv2p0(<vscale x 2 x i8> zeroinitializer, <vscale x 2 x ptr> align 1 [[TMP5]], <vscale x 2 x i1> splat (i1 true), i32 [[TMP2]])
156+
; RVA23ZVL1024B-NEXT: [[TMP6:%.*]] = zext i32 [[TMP2]] to i64
157+
; RVA23ZVL1024B-NEXT: [[AVL_NEXT]] = sub nuw i64 [[AVL]], [[TMP6]]
158+
; RVA23ZVL1024B-NEXT: [[VEC_IND_NEXT]] = add <vscale x 2 x i64> [[VEC_IND]], [[BROADCAST_SPLAT]]
159+
; RVA23ZVL1024B-NEXT: [[TMP7:%.*]] = icmp eq i64 [[AVL_NEXT]], 0
160+
; RVA23ZVL1024B-NEXT: br i1 [[TMP7]], label [[MIDDLE_BLOCK:%.*]], label [[VECTOR_BODY]], !llvm.loop [[LOOP10:![0-9]+]]
161+
; RVA23ZVL1024B: middle.block:
162+
; RVA23ZVL1024B-NEXT: br label [[EXIT:%.*]]
163+
; RVA23ZVL1024B: scalar.ph:
164+
; RVA23ZVL1024B-NEXT: br label [[LOOP:%.*]]
165+
; RVA23ZVL1024B: loop:
166+
; RVA23ZVL1024B-NEXT: [[IV:%.*]] = phi i64 [ 0, [[SCALAR_PH]] ], [ [[IV_NEXT:%.*]], [[LOOP]] ]
167+
; RVA23ZVL1024B-NEXT: [[TMP8:%.*]] = mul i64 [[IV]], 7
168+
; RVA23ZVL1024B-NEXT: [[ADD_PTR:%.*]] = getelementptr i8, ptr null, i64 [[TMP8]]
169+
; RVA23ZVL1024B-NEXT: store i8 0, ptr [[ADD_PTR]], align 1
170+
; RVA23ZVL1024B-NEXT: [[IV_NEXT]] = add i64 [[IV]], 1
171+
; RVA23ZVL1024B-NEXT: [[EXITCOND:%.*]] = icmp eq i64 [[IV]], 585
172+
; RVA23ZVL1024B-NEXT: br i1 [[EXITCOND]], label [[EXIT]], label [[LOOP]], !llvm.loop [[LOOP11:![0-9]+]]
173+
; RVA23ZVL1024B: exit:
174+
; RVA23ZVL1024B-NEXT: ret void
175+
;
176+
entry:
177+
br label %loop
178+
179+
loop:
180+
%iv = phi i64 [ 0, %entry ], [ %iv.next, %loop ]
181+
%0 = mul i64 %iv, 7
182+
%add.ptr = getelementptr i8, ptr null, i64 %0
183+
store i8 0, ptr %add.ptr, align 1
184+
%iv.next = add i64 %iv, 1
185+
%exitcond = icmp eq i64 %iv, 585
186+
br i1 %exitcond, label %exit, label %loop
187+
188+
exit:
189+
ret void
190+
}

0 commit comments

Comments
 (0)