Skip to content

Commit 7dbd266

Browse files
aemersontstellar
authored andcommittedMay 10, 2024·
[AArc64][GlobalISel] Fix legalizer assert for G_INSERT_VECTOR_ELT
We should moreElements <3 x s1> to <4 x s1> before we try to widen the element, otherwise we end up with a <3 x s21> nonsense type. (cherry picked from commit a01e9ce) Test has been changed from original commit due to a fallback in a G_BITCAST. Added abort=2 so we can see partial legalization and check no crash.
1 parent d9a7e51 commit 7dbd266

File tree

2 files changed

+69
-1
lines changed

2 files changed

+69
-1
lines changed
 

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

+1
Original file line numberDiff line numberDiff line change
@@ -877,6 +877,7 @@ AArch64LegalizerInfo::AArch64LegalizerInfo(const AArch64Subtarget &ST)
877877

878878
getActionDefinitionsBuilder(G_INSERT_VECTOR_ELT)
879879
.legalIf(typeInSet(0, {v16s8, v8s8, v8s16, v4s16, v4s32, v2s32, v2s64}))
880+
.moreElementsToNextPow2(0)
880881
.widenVectorEltsToVectorMinSize(0, 64);
881882

882883
getActionDefinitionsBuilder(G_BUILD_VECTOR)

‎llvm/test/CodeGen/AArch64/GlobalISel/legalize-insert-vector-elt.mir

+68-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
2-
# RUN: llc -mtriple=aarch64-linux-gnu -O0 -run-pass=legalizer %s -o - -global-isel-abort=1 | FileCheck %s
2+
# RUN: llc -mtriple=aarch64-linux-gnu -O0 -run-pass=legalizer %s -o - -global-isel-abort=2 | FileCheck %s
33
---
44
name: pr63826_v2s16
55
body: |
@@ -216,3 +216,70 @@ body: |
216216
$q0 = COPY %2(<2 x s64>)
217217
RET_ReallyLR
218218
...
219+
---
220+
name: v3s8_crash
221+
body: |
222+
; CHECK-LABEL: name: v3s8_crash
223+
; CHECK: bb.0:
224+
; CHECK-NEXT: successors: %bb.1(0x80000000)
225+
; CHECK-NEXT: liveins: $w1, $w2, $w3, $x0
226+
; CHECK-NEXT: {{ $}}
227+
; CHECK-NEXT: [[COPY:%[0-9]+]]:_(p0) = COPY $x0
228+
; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(s32) = COPY $w1
229+
; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(s32) = COPY $w2
230+
; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(s32) = COPY $w3
231+
; CHECK-NEXT: [[BUILD_VECTOR:%[0-9]+]]:_(<3 x s32>) = G_BUILD_VECTOR [[COPY1]](s32), [[COPY2]](s32), [[COPY3]](s32)
232+
; CHECK-NEXT: [[TRUNC:%[0-9]+]]:_(<3 x s8>) = G_TRUNC [[BUILD_VECTOR]](<3 x s32>)
233+
; CHECK-NEXT: [[C:%[0-9]+]]:_(s64) = G_CONSTANT i64 0
234+
; CHECK-NEXT: [[DEF:%[0-9]+]]:_(s8) = G_IMPLICIT_DEF
235+
; CHECK-NEXT: [[C1:%[0-9]+]]:_(s8) = G_CONSTANT i8 0
236+
; CHECK-NEXT: [[BUILD_VECTOR1:%[0-9]+]]:_(<3 x s8>) = G_BUILD_VECTOR [[C1]](s8), [[DEF]](s8), [[DEF]](s8)
237+
; CHECK-NEXT: {{ $}}
238+
; CHECK-NEXT: bb.1:
239+
; CHECK-NEXT: successors: %bb.1(0x80000000)
240+
; CHECK-NEXT: {{ $}}
241+
; CHECK-NEXT: [[C2:%[0-9]+]]:_(s64) = G_CONSTANT i64 0
242+
; CHECK-NEXT: [[C3:%[0-9]+]]:_(s8) = G_CONSTANT i8 0
243+
; CHECK-NEXT: [[IVEC:%[0-9]+]]:_(<3 x s8>) = G_INSERT_VECTOR_ELT [[TRUNC]], [[C3]](s8), [[C2]](s64)
244+
; CHECK-NEXT: [[SHUF:%[0-9]+]]:_(<12 x s8>) = G_SHUFFLE_VECTOR [[IVEC]](<3 x s8>), [[BUILD_VECTOR1]], shufflemask(0, 3, 3, 3, 1, 3, 3, 3, 2, 3, 3, 3)
245+
; CHECK-NEXT: [[BITCAST:%[0-9]+]]:_(<3 x s32>) = G_BITCAST [[SHUF]](<12 x s8>)
246+
; CHECK-NEXT: [[UV:%[0-9]+]]:_(s32), [[UV1:%[0-9]+]]:_(s32), [[UV2:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[BITCAST]](<3 x s32>)
247+
; CHECK-NEXT: [[DEF1:%[0-9]+]]:_(s32) = G_IMPLICIT_DEF
248+
; CHECK-NEXT: [[BUILD_VECTOR2:%[0-9]+]]:_(<4 x s32>) = G_BUILD_VECTOR [[UV]](s32), [[UV1]](s32), [[UV2]](s32), [[DEF1]](s32)
249+
; CHECK-NEXT: [[UITOFP:%[0-9]+]]:_(<4 x s32>) = G_UITOFP [[BUILD_VECTOR2]](<4 x s32>)
250+
; CHECK-NEXT: [[UV3:%[0-9]+]]:_(s32), [[UV4:%[0-9]+]]:_(s32), [[UV5:%[0-9]+]]:_(s32), [[UV6:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[UITOFP]](<4 x s32>)
251+
; CHECK-NEXT: [[BUILD_VECTOR3:%[0-9]+]]:_(<3 x s32>) = G_BUILD_VECTOR [[UV3]](s32), [[UV4]](s32), [[UV5]](s32)
252+
; CHECK-NEXT: [[UV7:%[0-9]+]]:_(s32), [[UV8:%[0-9]+]]:_(s32), [[UV9:%[0-9]+]]:_(s32) = G_UNMERGE_VALUES [[BUILD_VECTOR3]](<3 x s32>)
253+
; CHECK-NEXT: G_STORE [[UV7]](s32), [[COPY]](p0) :: (store (s32), align 16)
254+
; CHECK-NEXT: [[C4:%[0-9]+]]:_(s64) = G_CONSTANT i64 4
255+
; CHECK-NEXT: [[PTR_ADD:%[0-9]+]]:_(p0) = G_PTR_ADD [[COPY]], [[C4]](s64)
256+
; CHECK-NEXT: G_STORE [[UV8]](s32), [[PTR_ADD]](p0) :: (store (s32) into unknown-address + 4)
257+
; CHECK-NEXT: [[C5:%[0-9]+]]:_(s64) = G_CONSTANT i64 8
258+
; CHECK-NEXT: [[PTR_ADD1:%[0-9]+]]:_(p0) = G_PTR_ADD [[COPY]], [[C5]](s64)
259+
; CHECK-NEXT: G_STORE [[UV9]](s32), [[PTR_ADD1]](p0) :: (store (s32) into unknown-address + 8, align 8)
260+
; CHECK-NEXT: G_BR %bb.1
261+
bb.1:
262+
liveins: $w1, $w2, $w3, $x0
263+
264+
%0:_(p0) = COPY $x0
265+
%2:_(s32) = COPY $w1
266+
%3:_(s32) = COPY $w2
267+
%4:_(s32) = COPY $w3
268+
%5:_(<3 x s32>) = G_BUILD_VECTOR %2(s32), %3(s32), %4(s32)
269+
%1:_(<3 x s8>) = G_TRUNC %5(<3 x s32>)
270+
%8:_(s64) = G_CONSTANT i64 0
271+
%11:_(s8) = G_IMPLICIT_DEF
272+
%7:_(s8) = G_CONSTANT i8 0
273+
%10:_(<3 x s8>) = G_BUILD_VECTOR %7(s8), %11(s8), %11(s8)
274+
275+
bb.2:
276+
%14:_(s64) = G_CONSTANT i64 0
277+
%15:_(s8) = G_CONSTANT i8 0
278+
%6:_(<3 x s8>) = G_INSERT_VECTOR_ELT %1, %15(s8), %14(s64)
279+
%9:_(<12 x s8>) = G_SHUFFLE_VECTOR %6(<3 x s8>), %10, shufflemask(0, 3, 3, 3, 1, 3, 3, 3, 2, 3, 3, 3)
280+
%12:_(<3 x s32>) = G_BITCAST %9(<12 x s8>)
281+
%13:_(<3 x s32>) = G_UITOFP %12(<3 x s32>)
282+
G_STORE %13(<3 x s32>), %0(p0) :: (store (<3 x s32>))
283+
G_BR %bb.2
284+
285+
...

0 commit comments

Comments
 (0)
Please sign in to comment.