[llvm] 7cfa4c4 - [RISCV][GISEL] Fix legalization for G_MERGE/UNMERGE_VALUES (#75619)

[via llvm-commits]

Author: Michael Maitland
Date: 2023-12-18T19:21:18-05:00
New Revision: 7cfa4c4601024eda800d041a88265a638239bc17

URL: https://github.com/llvm/llvm-project/commit/7cfa4c4601024eda800d041a88265a638239bc17
DIFF: https://github.com/llvm/llvm-project/commit/7cfa4c4601024eda800d041a88265a638239bc17.diff

LOG: [RISCV][GISEL] Fix legalization for G_MERGE/UNMERGE_VALUES (#75619)

    The legalFor check did not work as expected. Use legalIf instead. Also
    do some simplification by removing IdxZeroTy and IdxOneTy.

Added: 
    

Modified: 
    llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp b/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp
index dbbe335e190174..28ec999157c697 100644
--- a/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp
+++ b/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp
@@ -85,13 +85,12 @@ RISCVLegalizerInfo::RISCVLegalizerInfo(const RISCVSubtarget &ST)
 
   // Merge/Unmerge
   for (unsigned Op : {G_MERGE_VALUES, G_UNMERGE_VALUES}) {
-    unsigned BigTyIdx = (Op == G_MERGE_VALUES) ? 0 : 1;
-    unsigned LitTyIdx = (Op == G_MERGE_VALUES) ? 1 : 0;
     auto &MergeUnmergeActions = getActionDefinitionsBuilder(Op);
+    unsigned BigTyIdx = Op == G_MERGE_VALUES ? 0 : 1;
+    unsigned LitTyIdx = Op == G_MERGE_VALUES ? 1 : 0;
     if (XLen == 32 && ST.hasStdExtD()) {
-      LLT IdxZeroTy = (Op == G_MERGE_VALUES) ? s64 : s32;
-      LLT IdxOneTy = (Op == G_MERGE_VALUES) ? s32 : s64;
-      MergeUnmergeActions.legalFor({{IdxZeroTy, IdxOneTy}});
+      MergeUnmergeActions.legalIf(
+          all(typeIs(BigTyIdx, s64), typeIs(LitTyIdx, s32)));
     }
     MergeUnmergeActions.widenScalarToNextPow2(LitTyIdx, XLen)
         .widenScalarToNextPow2(BigTyIdx, XLen)