Skip to content

Commit 36d47f8

Browse files
committed
[AArch64][GlobalISel] Legalize ptr vector freeze and implicit defs.
They can be treated the same as other s64 operations.
1 parent 50209e9 commit 36d47f8

File tree

3 files changed

+42
-27
lines changed

3 files changed

+42
-27
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ AArch64LegalizerInfo::AArch64LegalizerInfo(const AArch64Subtarget &ST)
103103
.clampNumElements(0, v8s8, v16s8)
104104
.clampNumElements(0, v4s16, v8s16)
105105
.clampNumElements(0, v2s32, v4s32)
106-
.clampNumElements(0, v2s64, v2s64);
106+
.clampMaxNumElements(0, s64, 2)
107+
.clampMaxNumElements(0, p0, 2);
107108

108109
getActionDefinitionsBuilder(G_PHI)
109110
.legalFor({p0, s16, s32, s64})

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -400,10 +400,9 @@ body: |
400400
; CHECK-LABEL: name: test_eve_v4p0
401401
; CHECK: liveins: $x0
402402
; CHECK-NEXT: {{ $}}
403-
; CHECK-NEXT: %vec:_(<4 x p0>) = G_IMPLICIT_DEF
403+
; CHECK-NEXT: [[DEF:%[0-9]+]]:_(<2 x p0>) = G_IMPLICIT_DEF
404404
; CHECK-NEXT: %idx:_(s64) = G_CONSTANT i64 1
405-
; CHECK-NEXT: [[UV:%[0-9]+]]:_(<2 x p0>), [[UV1:%[0-9]+]]:_(<2 x p0>) = G_UNMERGE_VALUES %vec(<4 x p0>)
406-
; CHECK-NEXT: %eve:_(p0) = G_EXTRACT_VECTOR_ELT [[UV]](<2 x p0>), %idx(s64)
405+
; CHECK-NEXT: %eve:_(p0) = G_EXTRACT_VECTOR_ELT [[DEF]](<2 x p0>), %idx(s64)
407406
; CHECK-NEXT: $x0 = COPY %eve(p0)
408407
; CHECK-NEXT: RET_ReallyLR
409408
%vec:_(<4 x p0>) = G_IMPLICIT_DEF
@@ -490,15 +489,14 @@ body: |
490489
; CHECK-LABEL: name: test_eve_v4p0_unknown_idx
491490
; CHECK: liveins: $x0
492491
; CHECK-NEXT: {{ $}}
493-
; CHECK-NEXT: %vec:_(<4 x p0>) = G_IMPLICIT_DEF
492+
; CHECK-NEXT: [[DEF:%[0-9]+]]:_(<2 x p0>) = G_IMPLICIT_DEF
494493
; CHECK-NEXT: %idx:_(s64) = COPY $x0
495494
; CHECK-NEXT: [[FRAME_INDEX:%[0-9]+]]:_(p0) = G_FRAME_INDEX %stack.0
496-
; CHECK-NEXT: [[UV:%[0-9]+]]:_(<2 x p0>), [[UV1:%[0-9]+]]:_(<2 x p0>) = G_UNMERGE_VALUES %vec(<4 x p0>)
497-
; CHECK-NEXT: [[BITCAST:%[0-9]+]]:_(<2 x s64>) = G_BITCAST [[UV]](<2 x p0>)
495+
; CHECK-NEXT: [[BITCAST:%[0-9]+]]:_(<2 x s64>) = G_BITCAST [[DEF]](<2 x p0>)
498496
; CHECK-NEXT: G_STORE [[BITCAST]](<2 x s64>), [[FRAME_INDEX]](p0) :: (store (<2 x s64>) into %stack.0, align 32)
499497
; CHECK-NEXT: [[C:%[0-9]+]]:_(s64) = G_CONSTANT i64 16
500498
; CHECK-NEXT: [[PTR_ADD:%[0-9]+]]:_(p0) = G_PTR_ADD [[FRAME_INDEX]], [[C]](s64)
501-
; CHECK-NEXT: [[BITCAST1:%[0-9]+]]:_(<2 x s64>) = G_BITCAST [[UV1]](<2 x p0>)
499+
; CHECK-NEXT: [[BITCAST1:%[0-9]+]]:_(<2 x s64>) = G_BITCAST [[DEF]](<2 x p0>)
502500
; CHECK-NEXT: G_STORE [[BITCAST1]](<2 x s64>), [[PTR_ADD]](p0) :: (store (<2 x s64>) into %stack.0 + 16, basealign 32)
503501
; CHECK-NEXT: [[C1:%[0-9]+]]:_(s64) = G_CONSTANT i64 3
504502
; CHECK-NEXT: [[AND:%[0-9]+]]:_(s64) = G_AND %idx, [[C1]]

llvm/test/CodeGen/AArch64/freeze.ll

Lines changed: 35 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
; RUN: llc -mtriple=aarch64-unknown-linux-gnu -global-isel -global-isel-abort=2 2>&1 < %s | FileCheck %s --check-prefixes=CHECK,CHECK-GI
44

55
; CHECK-GI: warning: Instruction selection used fallback path for freeze_v2i8
6-
; CHECK-GI-NEXT: warning: Instruction selection used fallback path for freeze_v3p0
7-
; CHECK-GI-NEXT: warning: Instruction selection used fallback path for freeze_v4p0
86

97
%struct.T = type { i32, i32 }
108

@@ -294,29 +292,47 @@ define <2 x ptr> @freeze_v2p0() {
294292
}
295293

296294
define <3 x ptr> @freeze_v3p0() {
297-
; CHECK-LABEL: freeze_v3p0:
298-
; CHECK: // %bb.0:
299-
; CHECK-NEXT: mov w8, #4 // =0x4
300-
; CHECK-NEXT: dup v2.2d, x8
301-
; CHECK-NEXT: add v0.2d, v0.2d, v2.2d
302-
; CHECK-NEXT: add d2, d0, d2
303-
; CHECK-NEXT: ext v1.16b, v0.16b, v0.16b, #8
304-
; CHECK-NEXT: // kill: def $d0 killed $d0 killed $q0
305-
; CHECK-NEXT: // kill: def $d1 killed $d1 killed $q1
306-
; CHECK-NEXT: ret
295+
; CHECK-SD-LABEL: freeze_v3p0:
296+
; CHECK-SD: // %bb.0:
297+
; CHECK-SD-NEXT: mov w8, #4 // =0x4
298+
; CHECK-SD-NEXT: dup v2.2d, x8
299+
; CHECK-SD-NEXT: add v0.2d, v0.2d, v2.2d
300+
; CHECK-SD-NEXT: add d2, d0, d2
301+
; CHECK-SD-NEXT: ext v1.16b, v0.16b, v0.16b, #8
302+
; CHECK-SD-NEXT: // kill: def $d0 killed $d0 killed $q0
303+
; CHECK-SD-NEXT: // kill: def $d1 killed $d1 killed $q1
304+
; CHECK-SD-NEXT: ret
305+
;
306+
; CHECK-GI-LABEL: freeze_v3p0:
307+
; CHECK-GI: // %bb.0:
308+
; CHECK-GI-NEXT: adrp x8, .LCPI22_0
309+
; CHECK-GI-NEXT: ldr q0, [x8, :lo12:.LCPI22_0]
310+
; CHECK-GI-NEXT: add x8, x8, #4
311+
; CHECK-GI-NEXT: fmov d2, x8
312+
; CHECK-GI-NEXT: add v0.2d, v0.2d, v0.2d
313+
; CHECK-GI-NEXT: mov d1, v0.d[1]
314+
; CHECK-GI-NEXT: ret
307315
%y1 = freeze <3 x ptr> undef
308316
%t1 = getelementptr i32, <3 x ptr> %y1, i32 1
309317
ret <3 x ptr> %t1
310318
}
311319

312320
define <4 x ptr> @freeze_v4p0() {
313-
; CHECK-LABEL: freeze_v4p0:
314-
; CHECK: // %bb.0:
315-
; CHECK-NEXT: mov w8, #4 // =0x4
316-
; CHECK-NEXT: dup v0.2d, x8
317-
; CHECK-NEXT: add v0.2d, v0.2d, v0.2d
318-
; CHECK-NEXT: mov v1.16b, v0.16b
319-
; CHECK-NEXT: ret
321+
; CHECK-SD-LABEL: freeze_v4p0:
322+
; CHECK-SD: // %bb.0:
323+
; CHECK-SD-NEXT: mov w8, #4 // =0x4
324+
; CHECK-SD-NEXT: dup v0.2d, x8
325+
; CHECK-SD-NEXT: add v0.2d, v0.2d, v0.2d
326+
; CHECK-SD-NEXT: mov v1.16b, v0.16b
327+
; CHECK-SD-NEXT: ret
328+
;
329+
; CHECK-GI-LABEL: freeze_v4p0:
330+
; CHECK-GI: // %bb.0:
331+
; CHECK-GI-NEXT: adrp x8, .LCPI23_0
332+
; CHECK-GI-NEXT: ldr q0, [x8, :lo12:.LCPI23_0]
333+
; CHECK-GI-NEXT: add v0.2d, v0.2d, v0.2d
334+
; CHECK-GI-NEXT: mov v1.16b, v0.16b
335+
; CHECK-GI-NEXT: ret
320336
%y1 = freeze <4 x ptr> undef
321337
%t1 = getelementptr i32, <4 x ptr> %y1, i32 1
322338
ret <4 x ptr> %t1

0 commit comments

Comments
 (0)