resolve comments

Author: XinWang10

llvm/lib/Target/X86/X86InstrKL.td

@@ -78,14 +78,11 @@ multiclass Aesencdecwide<string suffix> {
   def AESDECWIDE256KL#suffix : I<0xD8, MRM3m, (outs), (ins opaquemem:$src), "aesdecwide256kl\t$src", []>, NoCD8, XS;
 }
 
-let SchedRW = [WriteSystem] in {
-  let Uses = [XMM0, XMM1, XMM2, XMM3, XMM4, XMM5, XMM6, XMM7],
-      Defs = [EFLAGS, XMM0, XMM1, XMM2, XMM3, XMM4, XMM5, XMM6, XMM7],
-      mayLoad = 1 in {
-    let Predicates = [HasWIDEKL, NoEGPR] in
-      defm "" : Aesencdecwide<"">, T8;
+let SchedRW = [WriteSystem], Uses = [XMM0, XMM1, XMM2, XMM3, XMM4, XMM5, XMM6, XMM7],
+    Defs = [EFLAGS, XMM0, XMM1, XMM2, XMM3, XMM4, XMM5, XMM6, XMM7], mayLoad = 1 in {
+  let Predicates = [HasWIDEKL, NoEGPR] in
+    defm "" : Aesencdecwide<"">, T8;
 
-    let Predicates = [HasWIDEKL, HasEGPR, In64BitMode] in
-      defm "" : Aesencdecwide<"_EVEX">, EVEX, T_MAP4;
-  }
+  let Predicates = [HasWIDEKL, HasEGPR, In64BitMode] in
+    defm "" : Aesencdecwide<"_EVEX">, EVEX, T_MAP4;
 } // SchedRW

llvm/lib/Target/X86/X86InstrMisc.td

@@ -1561,20 +1561,20 @@ multiclass Enqcmds<string suffix> {
   def ENQCMD32#suffix : I<0xF8, MRMSrcMem, (outs), (ins GR32:$dst, i512mem_GR32:$src),
                           "enqcmd\t{$src, $dst|$dst, $src}",
                           [(set EFLAGS, (X86enqcmd GR32:$dst, addr:$src))]>,
-                        NoCD8, XD, AdSize32, Requires<[HasENQCMD, NoEGPR]>;
+                        NoCD8, XD, AdSize32;
   def ENQCMD64#suffix : I<0xF8, MRMSrcMem, (outs), (ins GR64:$dst, i512mem_GR64:$src),
                           "enqcmd\t{$src, $dst|$dst, $src}",
                           [(set EFLAGS, (X86enqcmd GR64:$dst, addr:$src))]>,
-                        NoCD8, XD, AdSize64, Requires<[HasENQCMD, NoEGPR, In64BitMode]>;
+                        NoCD8, XD, AdSize64;
 
   def ENQCMDS32#suffix : I<0xF8, MRMSrcMem, (outs), (ins GR32:$dst, i512mem_GR32:$src),
                            "enqcmds\t{$src, $dst|$dst, $src}",
                            [(set EFLAGS, (X86enqcmds GR32:$dst, addr:$src))]>,
-                         NoCD8, XS, AdSize32, Requires<[HasENQCMD, NoEGPR]>;
+                         NoCD8, XS, AdSize32;
   def ENQCMDS64#suffix : I<0xF8, MRMSrcMem, (outs), (ins GR64:$dst, i512mem_GR64:$src),
                           "enqcmds\t{$src, $dst|$dst, $src}",
                           [(set EFLAGS, (X86enqcmds GR64:$dst, addr:$src))]>,
-                         NoCD8, XS, AdSize64, Requires<[HasENQCMD, NoEGPR, In64BitMode]>;
+                         NoCD8, XS, AdSize64;
 }
 
 let SchedRW = [WriteStore], Defs = [EFLAGS] in {
@@ -1587,9 +1587,8 @@ let SchedRW = [WriteStore], Defs = [EFLAGS] in {
                     [(set EFLAGS, (X86enqcmds GR16:$dst, addr:$src))]>,
                   T8, XS, AdSize16, Requires<[HasENQCMD, Not64BitMode]>;
 
-  defm "" : Enqcmds<"">, T8;
-  let Predicates = [HasENQCMD, HasEGPR, In64BitMode] in
-  defm "" : Enqcmds<"_EVEX">, EVEX, T_MAP4;
+  defm "" : Enqcmds<"">, T8, Requires<[HasENQCMD, NoEGPR]>;
+  defm "" : Enqcmds<"_EVEX">, EVEX, T_MAP4, Requires<[HasENQCMD, HasEGPR, In64BitMode]>;
 
 }
 

llvm/lib/Target/X86/X86InstrSystem.td

@@ -436,39 +436,35 @@ def WRMSRLIST : I<0x01, MRM_C6, (outs), (ins), "wrmsrlist", []>, TB, XS;
 def RDMSRLIST : I<0x01, MRM_C6, (outs), (ins), "rdmsrlist", []>, TB, XD;
 }
 
-multiclass Urdwrmsr_rr<string suffix> {
-  let mayLoad = 1 in
+multiclass Urdwrmsr<Map rrmap, string suffix> {
+  let mayLoad = 1 in {
+    let OpMap = rrmap in
     def URDMSRrr#suffix : I<0xf8, MRMSrcReg, (outs GR64:$dst), (ins GR64:$src),
                             "urdmsr\t{$src, $dst|$dst, $src}",
                             [(set GR64:$dst, (int_x86_urdmsr GR64:$src))]>, XD, NoCD8;
-  let mayStore = 1 in
-    def UWRMSRrr#suffix  : I<0xf8, MRMSrcReg, (outs), (ins GR64:$src1, GR64:$src2),
-                             "uwrmsr\t{$src2, $src1|$src1, $src2}",
-                             [(int_x86_uwrmsr GR64:$src1, GR64:$src2)]>, XS, NoCD8;
-}
-
-multiclass Urdwrmsr_ri<string suffix> {
-  let mayLoad = 1 in
     def URDMSRri#suffix  : Ii32<0xf8, MRM0r, (outs GR64:$dst), (ins i64i32imm:$imm),
                                 "urdmsr\t{$imm, $dst|$dst, $imm}",
                                 [(set GR64:$dst, (int_x86_urdmsr i64immSExt32_su:$imm))]>,
-                           T_MAP7, XD, NoCD8;
-  let mayStore = 1 in
+                           T_MAP7, VEX, XD, NoCD8;
+}
+  let mayStore = 1 in {
+    let OpMap = rrmap in
+    def UWRMSRrr#suffix  : I<0xf8, MRMSrcReg, (outs), (ins GR64:$src1, GR64:$src2),
+                             "uwrmsr\t{$src2, $src1|$src1, $src2}",
+                             [(int_x86_uwrmsr GR64:$src1, GR64:$src2)]>, XS, NoCD8;
     def UWRMSRir#suffix  : Ii32<0xf8, MRM0r, (outs), (ins GR64:$src, i64i32imm:$imm),
                                 "uwrmsr\t{$src, $imm|$imm, $src}",
                                 [(int_x86_uwrmsr i64immSExt32_su:$imm, GR64:$src)]>,
-                           T_MAP7, XS, NoCD8;
+                           T_MAP7, VEX, XS, NoCD8;
+  }
 }
 
-let Predicates = [HasUSERMSR, NoEGPR] in {
-  defm "" : Urdwrmsr_rr<"">, T8;
-  defm "" : Urdwrmsr_ri<"">, VEX;
-}
+let Predicates = [HasUSERMSR, NoEGPR] in
+  defm "" : Urdwrmsr<T8, "">;
+
+let Predicates = [HasUSERMSR, HasEGPR, In64BitMode] in
+  defm "" : Urdwrmsr<T_MAP4, "_EVEX">, EVEX;
 
-let Predicates = [HasUSERMSR, HasEGPR, In64BitMode], mayLoad = 1 in {
-  defm "" : Urdwrmsr_rr<"_EVEX">, EVEX, T_MAP4;
-  defm "" : Urdwrmsr_ri<"_EVEX">, EVEX;
-}
 let Defs = [RAX, RDX], Uses = [ECX] in
 def RDPMC : I<0x33, RawFrm, (outs), (ins), "rdpmc", []>, TB;