Author: Craig Topper Date: 2023-11-17T16:44:24-08:00 New Revision: d5ab48e583c843393a86a4e166007688baeb1263
URL: https://github.com/llvm/llvm-project/commit/d5ab48e583c843393a86a4e166007688baeb1263 DIFF: https://github.com/llvm/llvm-project/commit/d5ab48e583c843393a86a4e166007688baeb1263.diff LOG: [AArch64] Simplify legalizer info for G_JUMP_TABLE and G_BRJT. (#71962) Remove s64 as a valid type for G_JUMP_TABLE since I think it is always a pointer? Replace custom predicate for G_BRJT with a legalFor that checks 2 types. Added: Modified: llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp llvm/test/CodeGen/AArch64/GlobalISel/legalizer-info-validation.mir Removed: ################################################################################ diff --git a/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp b/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp index b197b416228bd21..000fd648595222b 100644 --- a/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp +++ b/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp @@ -930,11 +930,9 @@ AArch64LegalizerInfo::AArch64LegalizerInfo(const AArch64Subtarget &ST) getActionDefinitionsBuilder(G_CONCAT_VECTORS) .legalFor({{v4s32, v2s32}, {v8s16, v4s16}, {v16s8, v8s8}}); - getActionDefinitionsBuilder(G_JUMP_TABLE).legalFor({{p0}, {s64}}); + getActionDefinitionsBuilder(G_JUMP_TABLE).legalFor({p0}); - getActionDefinitionsBuilder(G_BRJT).legalIf([=](const LegalityQuery &Query) { - return Query.Types[0] == p0 && Query.Types[1] == s64; - }); + getActionDefinitionsBuilder(G_BRJT).legalFor({{p0, s64}}); getActionDefinitionsBuilder({G_DYN_STACKALLOC, G_STACKSAVE, diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/legalizer-info-validation.mir b/llvm/test/CodeGen/AArch64/GlobalISel/legalizer-info-validation.mir index 2ea8cff5961b9b2..4fa6cd087988128 100644 --- a/llvm/test/CodeGen/AArch64/GlobalISel/legalizer-info-validation.mir +++ b/llvm/test/CodeGen/AArch64/GlobalISel/legalizer-info-validation.mir @@ -597,8 +597,8 @@ # DEBUG-NEXT: .. type index coverage check SKIPPED: no rules defined # DEBUG-NEXT: .. imm index coverage check SKIPPED: no rules defined # DEBUG-NEXT: G_BRJT (opcode {{[0-9]+}}): 2 type indices -# DEBUG-NEXT: .. type index coverage check SKIPPED: user-defined predicate detected -# DEBUG-NEXT: .. imm index coverage check SKIPPED: user-defined predicate detected +# DEBUG-NEXT: .. the first uncovered type index: 2, OK +# DEBUG-NEXT: .. the first uncovered imm index: 0, OK # DEBUG-NEXT: G_INSERT_VECTOR_ELT (opcode {{[0-9]+}}): 3 type indices, 0 imm indices # DEBUG-NEXT: .. type index coverage check SKIPPED: user-defined predicate detected # DEBUG-NEXT: .. imm index coverage check SKIPPED: user-defined predicate detected _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
