resolve comments

Author: XinWang10

llvm/lib/Target/X86/X86InstrMisc.td

@@ -1115,13 +1115,13 @@ let Predicates = [HasMOVBE, HasEGPR, In64BitMode] in {
 }
 
 multiclass Movberr<X86TypeInfo t> {
-  def rr_EVEX : ITy<0x61, MRMDestReg, t, (outs t.RegClass:$dst),
-                    (ins t.RegClass:$src1), "movbe", unaryop_ndd_args,
-                    [(set t.RegClass:$dst, (bswap t.RegClass:$src1))]>,
-                EVEX, T_MAP4;
-  def rr_EVEX_REV : ITy<0x60, MRMSrcReg, t, (outs t.RegClass:$dst),
-                        (ins t.RegClass:$src1), "movbe", unaryop_ndd_args, []>,
-                    EVEX, T_MAP4, DisassembleOnly;
+  def rr : ITy<0x61, MRMDestReg, t, (outs t.RegClass:$dst),
+               (ins t.RegClass:$src1), "movbe", unaryop_ndd_args,
+               [(set t.RegClass:$dst, (bswap t.RegClass:$src1))]>,
+           EVEX, T_MAP4;
+  def rr_REV : ITy<0x60, MRMSrcReg, t, (outs t.RegClass:$dst),
+                   (ins t.RegClass:$src1), "movbe", unaryop_ndd_args, []>,
+               EVEX, T_MAP4, DisassembleOnly;
 }
 let SchedRW = [WriteALU], Predicates = [HasMOVBE, HasNDD, In64BitMode] in {
   defm MOVBE16 : Movberr<Xi16>, PD;

llvm/lib/Target/X86/X86InstrRAOINT.td

@@ -25,18 +25,18 @@ def X86rao_xor  : SDNode<"X86ISD::AXOR", SDTRAOBinaryArith,
 def X86rao_and  : SDNode<"X86ISD::AAND", SDTRAOBinaryArith,
                          [SDNPHasChain, SDNPMayStore, SDNPMemOperand]>;
 
-multiclass RAOINT_BASE<string OpcodeStr, string Suffix = ""> {
+multiclass RAOINT_BASE<string m, string suffix = ""> {
   let Predicates = [HasRAOINT] in
-    def 32mr#Suffix : I<0xfc, MRMDestMem, (outs), (ins i32mem:$dst, GR32:$src),
-                        !strconcat("a", OpcodeStr, "{l}\t{$src, $dst|$dst, $src}"),
-                        [(!cast<SDNode>("X86rao_" # OpcodeStr) addr:$dst, GR32:$src)]>,
-                      Sched<[WriteALURMW]>;
+    def 32mr#suffix : I<0xfc, MRMDestMem, (outs), (ins i32mem:$src1, GR32:$src2),
+                        !strconcat("a", m, "{l}\t", binop_args),
+                        [(!cast<SDNode>("X86rao_" # m) addr:$src1, GR32:$src2)]>,
+                      NoCD8, Sched<[WriteALURMW]>;
 
   let Predicates = [HasRAOINT, In64BitMode] in
-    def 64mr#Suffix : I<0xfc, MRMDestMem, (outs), (ins i64mem:$dst, GR64:$src),
-                        !strconcat("a", OpcodeStr, "{q}\t{$src, $dst|$dst, $src}"),
-                        [(!cast<SDNode>("X86rao_" # OpcodeStr) addr:$dst, GR64:$src)]>,
-                      Sched<[WriteALURMW]>, REX_W;
+    def 64mr#suffix : I<0xfc, MRMDestMem, (outs), (ins i64mem:$src1, GR64:$src2),
+                        !strconcat("a", m, "{q}\t", binop_args),
+                        [(!cast<SDNode>("X86rao_" # m) addr:$src1, GR64:$src2)]>,
+                      NoCD8, Sched<[WriteALURMW]>, REX_W;
 }
 
 let Predicates = [HasRAOINT, NoEGPR] in {
@@ -47,8 +47,8 @@ defm AXOR : RAOINT_BASE<"xor">, T8, XS;
 }
 
 let Predicates = [HasRAOINT, HasEGPR, In64BitMode] in {
-defm AADD : RAOINT_BASE<"add", "_EVEX">, EVEX, NoCD8, T_MAP4;
-defm AAND : RAOINT_BASE<"and", "_EVEX">, EVEX, NoCD8, T_MAP4, PD;
-defm AOR  : RAOINT_BASE<"or", "_EVEX">, EVEX, NoCD8, T_MAP4, XD;
-defm AXOR : RAOINT_BASE<"xor", "_EVEX">, EVEX, NoCD8, T_MAP4, XS;
+defm AADD : RAOINT_BASE<"add", "_EVEX">, EVEX, T_MAP4;
+defm AAND : RAOINT_BASE<"and", "_EVEX">, EVEX, T_MAP4, PD;
+defm AOR  : RAOINT_BASE<"or", "_EVEX">,  EVEX, T_MAP4, XD;
+defm AXOR : RAOINT_BASE<"xor", "_EVEX">, EVEX, T_MAP4, XS;
 }

llvm/test/TableGen/x86-fold-tables.inc

@@ -421,9 +421,9 @@ static const X86FoldTableEntry Table0[] = {
   {X86::MOV8rr_NOREX, X86::MOV8mr_NOREX, TB_FOLDED_STORE|TB_NO_REVERSE},
   {X86::MOVAPDrr, X86::MOVAPDmr, TB_FOLDED_STORE|TB_NO_REVERSE|TB_ALIGN_16},
   {X86::MOVAPSrr, X86::MOVAPSmr, TB_FOLDED_STORE|TB_NO_REVERSE|TB_ALIGN_16},
-  {X86::MOVBE16rr_EVEX, X86::MOVBE16mr_EVEX, TB_FOLDED_STORE},
-  {X86::MOVBE32rr_EVEX, X86::MOVBE32mr_EVEX, TB_FOLDED_STORE},
-  {X86::MOVBE64rr_EVEX, X86::MOVBE64mr_EVEX, TB_FOLDED_STORE},
+  {X86::MOVBE16rr, X86::MOVBE16mr_EVEX, TB_FOLDED_STORE},
+  {X86::MOVBE32rr, X86::MOVBE32mr_EVEX, TB_FOLDED_STORE},
+  {X86::MOVBE64rr, X86::MOVBE64mr_EVEX, TB_FOLDED_STORE},
   {X86::MOVDI2SSrr, X86::MOV32mr, TB_FOLDED_STORE|TB_NO_REVERSE},
   {X86::MOVDQArr, X86::MOVDQAmr, TB_FOLDED_STORE|TB_ALIGN_16},
   {X86::MOVDQUrr, X86::MOVDQUmr, TB_FOLDED_STORE},
@@ -775,9 +775,9 @@ static const X86FoldTableEntry Table1[] = {
   {X86::MOV8rr, X86::MOV8rm, 0},
   {X86::MOVAPDrr, X86::MOVAPDrm, TB_ALIGN_16},
   {X86::MOVAPSrr, X86::MOVAPSrm, TB_ALIGN_16},
-  {X86::MOVBE16rr_EVEX, X86::MOVBE16rm_EVEX, 0},
-  {X86::MOVBE32rr_EVEX, X86::MOVBE32rm_EVEX, 0},
-  {X86::MOVBE64rr_EVEX, X86::MOVBE64rm_EVEX, 0},
+  {X86::MOVBE16rr, X86::MOVBE16rm_EVEX, 0},
+  {X86::MOVBE32rr, X86::MOVBE32rm_EVEX, 0},
+  {X86::MOVBE64rr, X86::MOVBE64rm_EVEX, 0},
   {X86::MOVDDUPrr, X86::MOVDDUPrm, TB_NO_REVERSE},
   {X86::MOVDI2PDIrr, X86::MOVDI2PDIrm, 0},
   {X86::MOVDI2SSrr, X86::MOVSSrm_alt, 0},