Skip to content

Commit a54bf6c

Browse files
tschuetttschuett
committed
[GlobalIsel] Pust cast through build vector
Credits: llvm#100563
1 parent 7616145 commit a54bf6c

File tree

16 files changed

+1491
-937
lines changed

16 files changed

+1491
-937
lines changed

‎llvm/include/llvm/CodeGen/GlobalISel/CombinerHelper.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -900,6 +900,9 @@ class CombinerHelper {
900900
bool matchExtOfExt(const MachineInstr &FirstMI, const MachineInstr &SecondMI,
901901
BuildFnTy &MatchInfo);
902902

903+
bool matchCastOfBuildVector(const MachineInstr &CastMI,
904+
const MachineInstr &BVMI, BuildFnTy &MatchInfo);
905+
903906
private:
904907
/// Checks for legality of an indexed variant of \p LdSt.
905908
bool isIndexedLoadStoreLegal(GLoadStore &LdSt) const;

‎llvm/include/llvm/Target/GlobalISel/Combine.td

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1857,6 +1857,18 @@ def anyext_of_anyext : ext_of_ext_opcodes<G_ANYEXT, G_ANYEXT>;
18571857
def anyext_of_zext : ext_of_ext_opcodes<G_ANYEXT, G_ZEXT>;
18581858
def anyext_of_sext : ext_of_ext_opcodes<G_ANYEXT, G_SEXT>;
18591859

1860+
// Push cast through build vector.
1861+
class buildvector_of_opcode<Instruction castOpcode> : GICombineRule <
1862+
(defs root:$root, build_fn_matchinfo:$matchinfo),
1863+
(match (G_BUILD_VECTOR $bv, GIVariadic<>:$unused):$Build,
1864+
(castOpcode $root, $bv):$Cast,
1865+
[{ return Helper.matchCastOfBuildVector(*${Cast}, *${Build}, ${matchinfo}); }]),
1866+
(apply [{ Helper.applyBuildFn(*${Cast}, ${matchinfo}); }])>;
1867+
1868+
def buildvector_of_zext : buildvector_of_opcode<G_ZEXT>;
1869+
def buildvector_of_anyext : buildvector_of_opcode<G_ANYEXT>;
1870+
def buildvector_of_truncate : buildvector_of_opcode<G_TRUNC>;
1871+
18601872
def cast_combines: GICombineGroup<[
18611873
truncate_of_zext,
18621874
truncate_of_sext,
@@ -1870,7 +1882,10 @@ def cast_combines: GICombineGroup<[
18701882
sext_of_anyext,
18711883
anyext_of_anyext,
18721884
anyext_of_zext,
1873-
anyext_of_sext
1885+
anyext_of_sext,
1886+
buildvector_of_zext,
1887+
buildvector_of_anyext,
1888+
buildvector_of_truncate
18741889
]>;
18751890

18761891

‎llvm/lib/CodeGen/GlobalISel/CombinerHelperCasts.cpp

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,3 +273,42 @@ bool CombinerHelper::matchExtOfExt(const MachineInstr &FirstMI,
273273

274274
return false;
275275
}
276+
277+
bool CombinerHelper::matchCastOfBuildVector(const MachineInstr &CastMI,
278+
const MachineInstr &BVMI,
279+
BuildFnTy &MatchInfo) {
280+
const GExtOrTruncOp *Cast = cast<GExtOrTruncOp>(&CastMI);
281+
const GBuildVector *BV = cast<GBuildVector>(&BVMI);
282+
283+
if (!MRI.hasOneNonDBGUse(BV->getReg(0)))
284+
return false;
285+
286+
Register Dst = Cast->getReg(0);
287+
// The type of the new build vector.
288+
LLT DstTy = MRI.getType(Dst);
289+
// The scalar or element type of the new build vector.
290+
LLT ElemTy = DstTy.getScalarType();
291+
// The scalar or element type of the old build vector.
292+
LLT InputElemTy = MRI.getType(BV->getReg(0)).getScalarType();
293+
294+
// Check legality of new build vector, the scalar casts, and profitability of
295+
// the many casts.
296+
if (!isLegalOrBeforeLegalizer(
297+
{TargetOpcode::G_BUILD_VECTOR, {DstTy, ElemTy}}) ||
298+
!isLegalOrBeforeLegalizer({Cast->getOpcode(), {ElemTy, InputElemTy}}) ||
299+
!isCastFree(Cast->getOpcode(), ElemTy, InputElemTy))
300+
return false;
301+
302+
MatchInfo = [=](MachineIRBuilder &B) {
303+
SmallVector<Register> Casts;
304+
unsigned Elements = BV->getNumSources();
305+
for (unsigned I = 0; I < Elements; ++I)
306+
Casts.push_back(
307+
B.buildInstr(Cast->getOpcode(), {ElemTy}, {BV->getSourceReg(I)})
308+
.getReg(0));
309+
310+
B.buildBuildVector(Dst, Casts);
311+
};
312+
313+
return true;
314+
}

‎llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -953,6 +953,7 @@ AArch64LegalizerInfo::AArch64LegalizerInfo(const AArch64Subtarget &ST)
953953
.clampNumElements(0, v2s64, v2s64)
954954
.minScalarOrElt(0, s8)
955955
.widenVectorEltsToVectorMinSize(0, 64)
956+
.widenScalarOrEltToNextPow2(0)
956957
.minScalarSameAs(1, 0);
957958

958959
getActionDefinitionsBuilder(G_BUILD_VECTOR_TRUNC).lower();

‎llvm/test/CodeGen/AArch64/GlobalISel/combine-cast.mir

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,95 @@ body: |
129129
%res:_(<2 x s64>) = G_SELECT %cond(<2 x s32>), %bv, %bv2
130130
%small:_(<2 x s32>) = G_TRUNC %res(<2 x s64>)
131131
$x0 = COPY %small(<2 x s32>)
132+
...
133+
---
134+
name: test_combine_trunc_build_vector
135+
legalized: true
136+
body: |
137+
bb.1:
138+
; CHECK-PRE-LABEL: name: test_combine_trunc_build_vector
139+
; CHECK-PRE: %arg1:_(s64) = COPY $x0
140+
; CHECK-PRE-NEXT: %arg2:_(s64) = COPY $x0
141+
; CHECK-PRE-NEXT: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC %arg1(s64)
142+
; CHECK-PRE-NEXT: [[TRUNC1:%[0-9]+]]:_(s32) = G_TRUNC %arg2(s64)
143+
; CHECK-PRE-NEXT: %small:_(<2 x s32>) = G_BUILD_VECTOR [[TRUNC]](s32), [[TRUNC1]](s32)
144+
; CHECK-PRE-NEXT: $x0 = COPY %small(<2 x s32>)
145+
;
146+
; CHECK-POST-LABEL: name: test_combine_trunc_build_vector
147+
; CHECK-POST: %arg1:_(s64) = COPY $x0
148+
; CHECK-POST-NEXT: %arg2:_(s64) = COPY $x0
149+
; CHECK-POST-NEXT: %bv:_(<2 x s64>) = G_BUILD_VECTOR %arg1(s64), %arg2(s64)
150+
; CHECK-POST-NEXT: %small:_(<2 x s32>) = G_TRUNC %bv(<2 x s64>)
151+
; CHECK-POST-NEXT: $x0 = COPY %small(<2 x s32>)
152+
%arg1:_(s64) = COPY $x0
153+
%arg2:_(s64) = COPY $x0
154+
%bv:_(<2 x s64>) = G_BUILD_VECTOR %arg1(s64), %arg2(s64)
155+
%small:_(<2 x s32>) = G_TRUNC %bv(<2 x s64>)
156+
$x0 = COPY %small(<2 x s32>)
157+
...
158+
---
159+
name: test_combine_zext_build_vector
160+
legalized: true
161+
body: |
162+
bb.1:
163+
; CHECK-PRE-LABEL: name: test_combine_zext_build_vector
164+
; CHECK-PRE: %arg1:_(s32) = COPY $w0
165+
; CHECK-PRE-NEXT: %arg2:_(s32) = COPY $w0
166+
; CHECK-PRE-NEXT: [[ZEXT:%[0-9]+]]:_(s64) = G_ZEXT %arg1(s32)
167+
; CHECK-PRE-NEXT: [[ZEXT1:%[0-9]+]]:_(s64) = G_ZEXT %arg2(s32)
168+
; CHECK-PRE-NEXT: %large:_(<2 x s64>) = G_BUILD_VECTOR [[ZEXT]](s64), [[ZEXT1]](s64)
169+
; CHECK-PRE-NEXT: $q0 = COPY %large(<2 x s64>)
170+
;
171+
; CHECK-POST-LABEL: name: test_combine_zext_build_vector
172+
; CHECK-POST: %arg1:_(s32) = COPY $w0
173+
; CHECK-POST-NEXT: %arg2:_(s32) = COPY $w0
174+
; CHECK-POST-NEXT: %bv:_(<2 x s32>) = G_BUILD_VECTOR %arg1(s32), %arg2(s32)
175+
; CHECK-POST-NEXT: %large:_(<2 x s64>) = G_ZEXT %bv(<2 x s32>)
176+
; CHECK-POST-NEXT: $q0 = COPY %large(<2 x s64>)
177+
%arg1:_(s32) = COPY $w0
178+
%arg2:_(s32) = COPY $w0
179+
%bv:_(<2 x s32>) = G_BUILD_VECTOR %arg1(s32), %arg2(s32)
180+
%large:_(<2 x s64>) = G_ZEXT %bv(<2 x s32>)
181+
$q0 = COPY %large(<2 x s64>)
182+
...
183+
---
184+
name: test_combine_anyext_build_vector
185+
legalized: true
186+
body: |
187+
bb.1:
188+
; CHECK-PRE-LABEL: name: test_combine_anyext_build_vector
189+
; CHECK-PRE: %arg1:_(s32) = COPY $w0
190+
; CHECK-PRE-NEXT: %arg2:_(s32) = COPY $w0
191+
; CHECK-PRE-NEXT: [[ANYEXT:%[0-9]+]]:_(s64) = G_ANYEXT %arg1(s32)
192+
; CHECK-PRE-NEXT: [[ANYEXT1:%[0-9]+]]:_(s64) = G_ANYEXT %arg2(s32)
193+
; CHECK-PRE-NEXT: %large:_(<2 x s64>) = G_BUILD_VECTOR [[ANYEXT]](s64), [[ANYEXT1]](s64)
194+
; CHECK-PRE-NEXT: $q0 = COPY %large(<2 x s64>)
195+
;
196+
; CHECK-POST-LABEL: name: test_combine_anyext_build_vector
197+
; CHECK-POST: %arg1:_(s32) = COPY $w0
198+
; CHECK-POST-NEXT: %arg2:_(s32) = COPY $w0
199+
; CHECK-POST-NEXT: %bv:_(<2 x s32>) = G_BUILD_VECTOR %arg1(s32), %arg2(s32)
200+
; CHECK-POST-NEXT: %large:_(<2 x s64>) = G_ANYEXT %bv(<2 x s32>)
201+
; CHECK-POST-NEXT: $q0 = COPY %large(<2 x s64>)
202+
%arg1:_(s32) = COPY $w0
203+
%arg2:_(s32) = COPY $w0
204+
%bv:_(<2 x s32>) = G_BUILD_VECTOR %arg1(s32), %arg2(s32)
205+
%large:_(<2 x s64>) = G_ANYEXT %bv(<2 x s32>)
206+
$q0 = COPY %large(<2 x s64>)
207+
...
208+
---
209+
name: test_combine_sext_build_vector
210+
legalized: true
211+
body: |
212+
bb.1:
213+
; CHECK-LABEL: name: test_combine_sext_build_vector
214+
; CHECK: %arg1:_(s32) = COPY $w0
215+
; CHECK-NEXT: %arg2:_(s32) = COPY $w0
216+
; CHECK-NEXT: %bv:_(<2 x s32>) = G_BUILD_VECTOR %arg1(s32), %arg2(s32)
217+
; CHECK-NEXT: %large:_(<2 x s64>) = G_SEXT %bv(<2 x s32>)
218+
; CHECK-NEXT: $q0 = COPY %large(<2 x s64>)
219+
%arg1:_(s32) = COPY $w0
220+
%arg2:_(s32) = COPY $w0
221+
%bv:_(<2 x s32>) = G_BUILD_VECTOR %arg1(s32), %arg2(s32)
222+
%large:_(<2 x s64>) = G_SEXT %bv(<2 x s32>)
223+
$q0 = COPY %large(<2 x s64>)

‎llvm/test/CodeGen/AArch64/GlobalISel/combine-extract-vec-elt.mir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ body: |
4949
; CHECK: liveins: $x0, $x1
5050
; CHECK-NEXT: {{ $}}
5151
; CHECK-NEXT: %arg1:_(s64) = COPY $x0
52-
; CHECK-NEXT: %extract:_(s32) = G_TRUNC %arg1(s64)
53-
; CHECK-NEXT: %zext:_(s64) = G_ZEXT %extract(s32)
52+
; CHECK-NEXT: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC %arg1(s64)
53+
; CHECK-NEXT: %zext:_(s64) = G_ZEXT [[TRUNC]](s32)
5454
; CHECK-NEXT: $x0 = COPY %zext(s64)
5555
; CHECK-NEXT: RET_ReallyLR implicit $x0
5656
%arg1:_(s64) = COPY $x0

‎llvm/test/CodeGen/AArch64/GlobalISel/combine-with-flags.mir

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,11 @@ body: |
6060
; CHECK-NEXT: {{ $}}
6161
; CHECK-NEXT: [[COPY:%[0-9]+]]:_(s32) = COPY $w0
6262
; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(s32) = COPY $w1
63-
; CHECK-NEXT: %bv0:_(<4 x s32>) = G_BUILD_VECTOR [[COPY]](s32), [[COPY1]](s32), [[COPY]](s32), [[COPY1]](s32)
64-
; CHECK-NEXT: $q0 = COPY %bv0(<4 x s32>)
63+
; CHECK-NEXT: [[TRUNC:%[0-9]+]]:_(s16) = G_TRUNC [[COPY]](s32)
64+
; CHECK-NEXT: [[TRUNC1:%[0-9]+]]:_(s16) = G_TRUNC [[COPY1]](s32)
65+
; CHECK-NEXT: %trunc:_(<4 x s16>) = G_BUILD_VECTOR [[TRUNC]](s16), [[TRUNC1]](s16), [[TRUNC]](s16), [[TRUNC1]](s16)
66+
; CHECK-NEXT: %zext:_(<4 x s32>) = G_ZEXT %trunc(<4 x s16>)
67+
; CHECK-NEXT: $q0 = COPY %zext(<4 x s32>)
6568
; CHECK-NEXT: RET_ReallyLR implicit $w0
6669
%0:_(s32) = COPY $w0
6770
%1:_(s32) = COPY $w1
@@ -165,8 +168,13 @@ body: |
165168
; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(s32) = COPY $w1
166169
; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(s32) = COPY $w2
167170
; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(s32) = COPY $w3
168-
; CHECK-NEXT: %bv0:_(<4 x s32>) = G_BUILD_VECTOR [[COPY]](s32), [[COPY1]](s32), [[COPY2]](s32), [[COPY3]](s32)
169-
; CHECK-NEXT: $q0 = COPY %bv0(<4 x s32>)
171+
; CHECK-NEXT: [[TRUNC:%[0-9]+]]:_(s16) = G_TRUNC [[COPY]](s32)
172+
; CHECK-NEXT: [[TRUNC1:%[0-9]+]]:_(s16) = G_TRUNC [[COPY1]](s32)
173+
; CHECK-NEXT: [[TRUNC2:%[0-9]+]]:_(s16) = G_TRUNC [[COPY2]](s32)
174+
; CHECK-NEXT: [[TRUNC3:%[0-9]+]]:_(s16) = G_TRUNC [[COPY3]](s32)
175+
; CHECK-NEXT: %t:_(<4 x s16>) = G_BUILD_VECTOR [[TRUNC]](s16), [[TRUNC1]](s16), [[TRUNC2]](s16), [[TRUNC3]](s16)
176+
; CHECK-NEXT: %s:_(<4 x s32>) = G_SEXT %t(<4 x s16>)
177+
; CHECK-NEXT: $q0 = COPY %s(<4 x s32>)
170178
%0:_(s32) = COPY $w0
171179
%1:_(s32) = COPY $w1
172180
%2:_(s32) = COPY $w2
@@ -188,8 +196,11 @@ body: |
188196
; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(s32) = COPY $w1
189197
; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(s32) = COPY $w2
190198
; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(s32) = COPY $w3
191-
; CHECK-NEXT: %bv0:_(<4 x s32>) = G_BUILD_VECTOR [[COPY]](s32), [[COPY1]](s32), [[COPY2]](s32), [[COPY3]](s32)
192-
; CHECK-NEXT: %t:_(<4 x s16>) = G_TRUNC %bv0(<4 x s32>)
199+
; CHECK-NEXT: [[TRUNC:%[0-9]+]]:_(s16) = G_TRUNC [[COPY]](s32)
200+
; CHECK-NEXT: [[TRUNC1:%[0-9]+]]:_(s16) = G_TRUNC [[COPY1]](s32)
201+
; CHECK-NEXT: [[TRUNC2:%[0-9]+]]:_(s16) = G_TRUNC [[COPY2]](s32)
202+
; CHECK-NEXT: [[TRUNC3:%[0-9]+]]:_(s16) = G_TRUNC [[COPY3]](s32)
203+
; CHECK-NEXT: %t:_(<4 x s16>) = G_BUILD_VECTOR [[TRUNC]](s16), [[TRUNC1]](s16), [[TRUNC2]](s16), [[TRUNC3]](s16)
193204
; CHECK-NEXT: %z:_(<4 x s32>) = G_ZEXT %t(<4 x s16>)
194205
; CHECK-NEXT: $q0 = COPY %z(<4 x s32>)
195206
%0:_(s32) = COPY $w0
@@ -213,8 +224,11 @@ body: |
213224
; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(s32) = COPY $w1
214225
; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(s32) = COPY $w2
215226
; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(s32) = COPY $w3
216-
; CHECK-NEXT: %bv0:_(<4 x s32>) = G_BUILD_VECTOR [[COPY]](s32), [[COPY1]](s32), [[COPY2]](s32), [[COPY3]](s32)
217-
; CHECK-NEXT: %t:_(<4 x s16>) = nsw G_TRUNC %bv0(<4 x s32>)
227+
; CHECK-NEXT: [[TRUNC:%[0-9]+]]:_(s16) = G_TRUNC [[COPY]](s32)
228+
; CHECK-NEXT: [[TRUNC1:%[0-9]+]]:_(s16) = G_TRUNC [[COPY1]](s32)
229+
; CHECK-NEXT: [[TRUNC2:%[0-9]+]]:_(s16) = G_TRUNC [[COPY2]](s32)
230+
; CHECK-NEXT: [[TRUNC3:%[0-9]+]]:_(s16) = G_TRUNC [[COPY3]](s32)
231+
; CHECK-NEXT: %t:_(<4 x s16>) = G_BUILD_VECTOR [[TRUNC]](s16), [[TRUNC1]](s16), [[TRUNC2]](s16), [[TRUNC3]](s16)
218232
; CHECK-NEXT: %z:_(<4 x s32>) = G_ZEXT %t(<4 x s16>)
219233
; CHECK-NEXT: $q0 = COPY %z(<4 x s32>)
220234
%0:_(s32) = COPY $w0
@@ -238,8 +252,13 @@ body: |
238252
; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(s32) = COPY $w1
239253
; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(s32) = COPY $w2
240254
; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(s32) = COPY $w3
241-
; CHECK-NEXT: %bv0:_(<4 x s32>) = G_BUILD_VECTOR [[COPY]](s32), [[COPY1]](s32), [[COPY2]](s32), [[COPY3]](s32)
242-
; CHECK-NEXT: $q0 = COPY %bv0(<4 x s32>)
255+
; CHECK-NEXT: [[TRUNC:%[0-9]+]]:_(s16) = G_TRUNC [[COPY]](s32)
256+
; CHECK-NEXT: [[TRUNC1:%[0-9]+]]:_(s16) = G_TRUNC [[COPY1]](s32)
257+
; CHECK-NEXT: [[TRUNC2:%[0-9]+]]:_(s16) = G_TRUNC [[COPY2]](s32)
258+
; CHECK-NEXT: [[TRUNC3:%[0-9]+]]:_(s16) = G_TRUNC [[COPY3]](s32)
259+
; CHECK-NEXT: %t:_(<4 x s16>) = G_BUILD_VECTOR [[TRUNC]](s16), [[TRUNC1]](s16), [[TRUNC2]](s16), [[TRUNC3]](s16)
260+
; CHECK-NEXT: %z:_(<4 x s32>) = G_ZEXT %t(<4 x s16>)
261+
; CHECK-NEXT: $q0 = COPY %z(<4 x s32>)
243262
%0:_(s32) = COPY $w0
244263
%1:_(s32) = COPY $w1
245264
%2:_(s32) = COPY $w2
@@ -259,8 +278,10 @@ body: |
259278
; CHECK-NEXT: {{ $}}
260279
; CHECK-NEXT: [[COPY:%[0-9]+]]:_(s64) = COPY $x0
261280
; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(s64) = COPY $x1
262-
; CHECK-NEXT: %bv0:_(<2 x s64>) = G_BUILD_VECTOR [[COPY]](s64), [[COPY1]](s64)
263-
; CHECK-NEXT: %z:_(<2 x s32>) = nuw G_TRUNC %bv0(<2 x s64>)
281+
; CHECK-NEXT: [[TRUNC:%[0-9]+]]:_(s16) = G_TRUNC [[COPY]](s64)
282+
; CHECK-NEXT: [[TRUNC1:%[0-9]+]]:_(s16) = G_TRUNC [[COPY1]](s64)
283+
; CHECK-NEXT: %t:_(<2 x s16>) = G_BUILD_VECTOR [[TRUNC]](s16), [[TRUNC1]](s16)
284+
; CHECK-NEXT: %z:_(<2 x s32>) = G_ZEXT %t(<2 x s16>)
264285
; CHECK-NEXT: $d0 = COPY %z(<2 x s32>)
265286
%0:_(s64) = COPY $x0
266287
%1:_(s64) = COPY $x1

0 commit comments

Comments
 (0)