From c4fd1981a74520aaa1731f8705360c2c87346f44 Mon Sep 17 00:00:00 2001
From: Craig Topper <craig.topper@sifive.com>
Date: Tue, 2 Feb 2021 10:32:14 -0800
Subject: [PATCH] [RISCV] Correct types in tablegen multiclasses found by
 D95874.

---
 llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td    | 40 +++++++++++-----------
 llvm/lib/Target/RISCV/RISCVInstrInfoVSDPatterns.td |  4 +--
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td b/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td
index c246055..2966c33 100644
--- a/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td
+++ b/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td
@@ -865,7 +865,7 @@ class VPseudoIStoreMask<VReg StClass, VReg IdxClass>:
 }
 
 class VPseudoBinaryMask<VReg RetClass,
-                        VReg Op1Class,
+                        RegisterClass Op1Class,
                         DAGOperand Op2Class,
                         string Constraint> :
         Pseudo<(outs GetVRegNoV0<RetClass>.R:$rd),
@@ -911,7 +911,7 @@ class VPseudoBinaryCarryIn<VReg RetClass,
 }
 
 class VPseudoTernaryNoMask<VReg RetClass,
-                           VReg Op1Class,
+                           RegisterClass Op1Class,
                            DAGOperand Op2Class,
                            string Constraint> :
         Pseudo<(outs RetClass:$rd),
@@ -1696,8 +1696,8 @@ multiclass VPseudoBinaryV_WV_WX_WI {
 }
 
 multiclass VPseudoTernary<VReg RetClass,
-                          VReg Op1Class,
-                          RegisterClass Op2Class,
+                          RegisterClass Op1Class,
+                          DAGOperand Op2Class,
                           LMULInfo MInfo,
                           string Constraint = ""> {
   let VLMul = MInfo.value in {
@@ -2147,8 +2147,8 @@ class VPatAMOWDMask<string intrinsic_name,
 
 multiclass VPatUSLoad<string intrinsic,
                       string inst,
-                      LLVMType type,
-                      LLVMType mask_type,
+                      ValueType type,
+                      ValueType mask_type,
                       int sew,
                       LMULInfo vlmul,
                       VReg reg_class>
@@ -2166,8 +2166,8 @@ multiclass VPatUSLoad<string intrinsic,
 }
 
 multiclass VPatUSLoadFF<string inst,
-                        LLVMType type,
-                        LLVMType mask_type,
+                        ValueType type,
+                        ValueType mask_type,
                         int sew,
                         LMULInfo vlmul,
                         VReg reg_class>
@@ -2184,8 +2184,8 @@ multiclass VPatUSLoadFF<string inst,
 
 multiclass VPatSLoad<string intrinsic,
                      string inst,
-                     LLVMType type,
-                     LLVMType mask_type,
+                     ValueType type,
+                     ValueType mask_type,
                      int sew,
                      LMULInfo vlmul,
                      VReg reg_class>
@@ -2204,9 +2204,9 @@ multiclass VPatSLoad<string intrinsic,
 
 multiclass VPatILoad<string intrinsic,
                      string inst,
-                     LLVMType type,
-                     LLVMType idx_type,
-                     LLVMType mask_type,
+                     ValueType type,
+                     ValueType idx_type,
+                     ValueType mask_type,
                      int sew,
                      LMULInfo vlmul,
                      LMULInfo idx_vlmul,
@@ -2229,8 +2229,8 @@ multiclass VPatILoad<string intrinsic,
 
 multiclass VPatUSStore<string intrinsic,
                        string inst,
-                       LLVMType type,
-                       LLVMType mask_type,
+                       ValueType type,
+                       ValueType mask_type,
                        int sew,
                        LMULInfo vlmul,
                        VReg reg_class>
@@ -2247,8 +2247,8 @@ multiclass VPatUSStore<string intrinsic,
 
 multiclass VPatSStore<string intrinsic,
                       string inst,
-                      LLVMType type,
-                      LLVMType mask_type,
+                      ValueType type,
+                      ValueType mask_type,
                       int sew,
                       LMULInfo vlmul,
                       VReg reg_class>
@@ -2265,9 +2265,9 @@ multiclass VPatSStore<string intrinsic,
 
 multiclass VPatIStore<string intrinsic,
                       string inst,
-                      LLVMType type,
-                      LLVMType idx_type,
-                      LLVMType mask_type,
+                      ValueType type,
+                      ValueType idx_type,
+                      ValueType mask_type,
                       int sew,
                       LMULInfo vlmul,
                       LMULInfo idx_vlmul,
diff --git a/llvm/lib/Target/RISCV/RISCVInstrInfoVSDPatterns.td b/llvm/lib/Target/RISCV/RISCVInstrInfoVSDPatterns.td
index babd9eb..0ffa022 100644
--- a/llvm/lib/Target/RISCV/RISCVInstrInfoVSDPatterns.td
+++ b/llvm/lib/Target/RISCV/RISCVInstrInfoVSDPatterns.td
@@ -45,8 +45,8 @@ class SwapHelper<dag Prefix, dag A, dag B, dag Suffix, bit swap> {
    dag Value = !con(Prefix, !if(swap, B, A), !if(swap, A, B), Suffix);
 }
 
-multiclass VPatUSLoadStoreSDNode<LLVMType type,
-                                 LLVMType mask_type,
+multiclass VPatUSLoadStoreSDNode<ValueType type,
+                                 ValueType mask_type,
                                  int sew,
                                  LMULInfo vlmul,
                                  OutPatFrag avl,
-- 
2.7.4