Skip to content

Commit d415f87

Browse files
committed
[AArch64][GlobalISel] Basic add_sat and sub_sat vector handling.
This tries to fill in the basic vector handling for sadd_sat/uadd_sat and ssub_sat/usub_sat. It just handles the basics, marking legal types and clamping illegally sized vectors to legal ones.
1 parent d91bb2f commit d415f87

File tree

8 files changed

+813
-377
lines changed

8 files changed

+813
-377
lines changed

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,9 +1103,6 @@ AArch64LegalizerInfo::AArch64LegalizerInfo(const AArch64Subtarget &ST)
11031103
.scalarize(1)
11041104
.lower();
11051105

1106-
getActionDefinitionsBuilder({G_UADDSAT, G_USUBSAT})
1107-
.lowerIf([=](const LegalityQuery &Q) { return Q.Types[0].isScalar(); });
1108-
11091106
getActionDefinitionsBuilder({G_FSHL, G_FSHR})
11101107
.customFor({{s32, s32}, {s32, s64}, {s64, s64}})
11111108
.lower();
@@ -1153,8 +1150,14 @@ AArch64LegalizerInfo::AArch64LegalizerInfo(const AArch64Subtarget &ST)
11531150
.minScalarEltSameAsIf(always, 1, 0)
11541151
.maxScalarEltSameAsIf(always, 1, 0);
11551152

1156-
// TODO: Vector types.
1157-
getActionDefinitionsBuilder({G_SADDSAT, G_SSUBSAT}).lowerIf(isScalar(0));
1153+
getActionDefinitionsBuilder({G_UADDSAT, G_SADDSAT, G_USUBSAT, G_SSUBSAT})
1154+
.legalFor({v2s64, v2s32, v4s32, v4s16, v8s16, v8s8, v16s8})
1155+
.clampNumElements(0, v8s8, v16s8)
1156+
.clampNumElements(0, v4s16, v8s16)
1157+
.clampNumElements(0, v2s32, v4s32)
1158+
.clampMaxNumElements(0, s64, 2)
1159+
.moreElementsToNextPow2(0)
1160+
.lowerIf(isScalar(0));
11581161

11591162
// TODO: Libcall support for s128.
11601163
// TODO: s16 should be legal with full FP16 support.

llvm/test/CodeGen/AArch64/GlobalISel/legalizer-info-validation.mir

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,7 @@
392392
# DEBUG-NEXT: .. type index coverage check SKIPPED: user-defined predicate detected
393393
# DEBUG-NEXT: .. imm index coverage check SKIPPED: user-defined predicate detected
394394
# DEBUG-NEXT: G_SADDSAT (opcode {{[0-9]+}}): 1 type index, 0 imm indices
395+
# DEBUG-NEXT: .. opcode {{[0-9]+}} is aliased to {{[0-9]+}}
395396
# DEBUG-NEXT: .. type index coverage check SKIPPED: user-defined predicate detected
396397
# DEBUG-NEXT: .. imm index coverage check SKIPPED: user-defined predicate detected
397398
# DEBUG-NEXT: G_USUBSAT (opcode {{[0-9]+}}): 1 type index, 0 imm indices

llvm/test/CodeGen/AArch64/sadd_sat.ll

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

5-
; CHECK-GI: warning: Instruction selection used fallback path for vec
6-
75
declare i4 @llvm.sadd.sat.i4(i4, i4)
86
declare i8 @llvm.sadd.sat.i8(i8, i8)
97
declare i16 @llvm.sadd.sat.i16(i16, i16)

0 commit comments

Comments
 (0)