!fixup remove assert; rename test; only legal for rv32; remove fixme

Author: michaelmaitland

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

@@ -85,12 +85,13 @@ RISCVLegalizerInfo::RISCVLegalizerInfo(const RISCVSubtarget &ST)
   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;
-    getActionDefinitionsBuilder(Op)
-        .legalIf([=, &ST](const LegalityQuery &Query) -> bool {
-          return ST.hasStdExtD() && typeIs(LitTyIdx, s32)(Query) &&
-                 typeIs(BigTyIdx, s64)(Query);
-        })
-        .widenScalarToNextPow2(LitTyIdx, XLen)
+    auto &MergeUnmergeActions = getActionDefinitionsBuilder(Op);
+    if (XLen == 32 && ST.hasStdExtD()) {
+      LLT IdxZeroTy = G_MERGE_VALUES ? s64 : s32;
+      LLT IdxOneTy = G_MERGE_VALUES ? s32 : s64;
+      MergeUnmergeActions.legalFor({IdxZeroTy, IdxOneTy});
+    }
+    MergeUnmergeActions.widenScalarToNextPow2(LitTyIdx, XLen)
         .widenScalarToNextPow2(BigTyIdx, XLen)
         .clampScalar(LitTyIdx, sXLen, sXLen)
         .clampScalar(BigTyIdx, sXLen, sXLen);

llvm/lib/Target/RISCV/GISel/RISCVRegisterBankInfo.cpp

@@ -425,12 +425,9 @@ RISCVRegisterBankInfo::getInstrMapping(const MachineInstr &MI) const {
   }
   case TargetOpcode::G_MERGE_VALUES: {
     // Use FPR64 for s64 merge on rv32.
-    assert(MI.getNumOperands() == 3 && "Unsupported G_MERGE_VALUES");
     LLT Ty = MRI.getType(MI.getOperand(0).getReg());
     if (GPRSize == 32 && Ty.getSizeInBits() == 64) {
       assert(MF.getSubtarget<RISCVSubtarget>().hasStdExtD());
-      // FIXME: OpdsMapping[0, 1] should probably visit their uses to determine
-      // if GPRValueMapping or FPRValueMapping
       OpdsMapping[0] = getFPValueMapping(Ty.getSizeInBits());
       OpdsMapping[1] = GPRValueMapping;
       OpdsMapping[2] = GPRValueMapping;
@@ -439,12 +436,9 @@ RISCVRegisterBankInfo::getInstrMapping(const MachineInstr &MI) const {
   }
   case TargetOpcode::G_UNMERGE_VALUES: {
     // Use FPR64 for s64 unmerge on rv32.
-    assert(MI.getNumOperands() == 3 && "Unsupported G_UNMERGE_VALUES");
     LLT Ty = MRI.getType(MI.getOperand(2).getReg());
     if (GPRSize == 32 && Ty.getSizeInBits() == 64) {
       assert(MF.getSubtarget<RISCVSubtarget>().hasStdExtD());
-      // FIXME: OpdsMapping[0, 1] should probably visit their uses to determine
-      // if GPRValueMapping or FPRValueMapping
       OpdsMapping[0] = GPRValueMapping;
       OpdsMapping[1] = GPRValueMapping;
       OpdsMapping[2] = getFPValueMapping(Ty.getSizeInBits());