[llvm] 58d8344 - Revert "[RISCV][NFC] Use SchedTernary for VPseudoVWMAC_VV_VF_BF"

[Michael Maitland via llvm-commits]

Author: Michael Maitland
Date: 2023-08-14T10:55:28-07:00
New Revision: 58d8344aa9ef801ccf58b7c68fca4634096251e4

URL: https://github.com/llvm/llvm-project/commit/58d8344aa9ef801ccf58b7c68fca4634096251e4
DIFF: https://github.com/llvm/llvm-project/commit/58d8344aa9ef801ccf58b7c68fca4634096251e4.diff

LOG: Revert "[RISCV][NFC] Use SchedTernary for VPseudoVWMAC_VV_VF_BF"

This reverts commit 6da6911489c4d4622145f2d865e1c924bfd9e729.

This commit failed to build.

Added: 
    

Modified: 
    llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td b/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td
index 656f506b6f32fa..f16ae08e5931ec 100644
--- a/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td
+++ b/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td
@@ -3296,17 +3296,25 @@ multiclass VPseudoVWMAC_VV_VF_RM {
 multiclass VPseudoVWMAC_VV_VF_BF_RM {
   foreach m = MxListFW in {
     defvar mx = m.MX;
+    defvar WriteVFWMulAddV_MX = !cast<SchedWrite>("WriteVFWMulAddV_" # mx);
+    defvar ReadVFWMulAddV_MX = !cast<SchedRead>("ReadVFWMulAddV_" # mx);
+    // FIXME: should use SchedTernary
     defm "" : VPseudoTernaryW_VV_RM<m>,
-              SchedTernary<"WriteVFWMulAddV", "ReadVFWMullAddV",
-                           "ReadVFWMullAddV", "ReadVFWMullAddV", mx>;
+              Sched<[WriteVFWMulAddV_MX, ReadVFWMulAddV_MX,
+                     ReadVFWMulAddV_MX, ReadVFWMulAddV_MX, ReadVMask]>;
   }
 
   foreach f = BFPListW in {
     foreach m = f.MxListFW in {
       defvar mx = m.MX;
+      defvar WriteVFWMulAddF_MX = !cast<SchedWrite>("WriteVFWMulAddF_" # mx);
+      defvar ReadVFWMulAddV_MX = !cast<SchedRead>("ReadVFWMulAddV_" # mx);
+      defvar ReadVFWMulAddF_MX = !cast<SchedRead>("ReadVFWMulAddF_" # mx);
+
+      // FIXME: should use SchedTernary
       defm "" : VPseudoTernaryW_VF_RM<m, f>,
-                SchedTernary<"WriteVFWMulAddF", "ReadVFWMulAddV",
-                             "ReadVFWMulAddF", "ReadVFWMulAddV", mx>;
+                Sched<[WriteVFWMulAddF_MX, ReadVFWMulAddV_MX,
+                       ReadVFWMulAddF_MX, ReadVFWMulAddV_MX, ReadVMask]>;
     }
   }
 }