[llvm] [RISCV][GISEL] Fix legalization for G_MERGE/UNMERGE_VALUES (PR #75619)

[Michael Maitland via llvm-commits]

https://github.com/michaelmaitland updated https://github.com/llvm/llvm-project/pull/75619

>From 011f4d6650c4ed920735924ef6b6fd9f2e09e73a Mon Sep 17 00:00:00 2001
From: Michael Maitland <michaeltmaitland at gmail.com>
Date: Fri, 15 Dec 2023 07:42:39 -0800
Subject: [PATCH] [RISCV][GISEL] Fix legalization for G_MERGE/UNMERGE_VALUES

The legalFor check did not work as expected. Use legalIf instead. Also
do some simplification by removing IdxZeroTy and IdxOneTy.
---
 llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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)