resolve comments

Author: XinWang10

llvm/lib/Target/X86/X86InstrCMovSetCC.td

@@ -45,22 +45,21 @@ let Predicates = [HasCMOV, HasCF, HasNDD, In64BitMode] in
                   (ins t.RegClass:$src1, t.RegClass:$src2, ccode:$cond),
                   "cfcmov${cond}", binop_ndd_args, []>, UseEFLAGS, NDD<1>, NF;
 }
-let SchedRW = [WriteCMOV.Folded, WriteCMOV.ReadAfterFold] in {
-let Predicates = [HasCMOV, HasCF, In64BitMode] in {
-  let mayLoad = 1 in
+let SchedRW = [WriteCMOV, ReadDefault, ReadDefault, ReadDefault, ReadDefault, ReadDefault] in {
+  let Predicates = [HasCMOV, HasCF, In64BitMode], mayLoad = 1 in
     def rm : ITy<0x40, MRMSrcMemCC, t, (outs t.RegClass:$dst),
                  (ins t.MemOperand:$src1, ccode:$cond),
                  "cfcmov${cond}", unaryop_ndd_args, []>, UseEFLAGS, EVEX, T_MAP4;
-  let mayStore = 1 in
-    def mr : ITy<0x40, MRMDestMemCC, t, (outs t.MemOperand:$dst),
-                 (ins t.RegClass:$src1, ccode:$cond),
-                 "cfcmov${cond}", unaryop_ndd_args, []>, UseEFLAGS, NF;
-}
-let Predicates = [HasCMOV, HasCF, HasNDD, In64BitMode], mayLoad = 1 in
-  def rm_ND : ITy<0x40, MRMSrcMemCC, t, (outs t.RegClass:$dst),
-                  (ins t.RegClass:$src1, t.MemOperand:$src2, ccode:$cond),
-                  "cfcmov${cond}", binop_ndd_args, []>, UseEFLAGS, NDD<1>, NF;
+  let Predicates = [HasCMOV, HasCF, HasNDD, In64BitMode], mayLoad = 1 in
+    def rm_ND : ITy<0x40, MRMSrcMemCC, t, (outs t.RegClass:$dst),
+                    (ins t.RegClass:$src1, t.MemOperand:$src2, ccode:$cond),
+                    "cfcmov${cond}", binop_ndd_args, []>, UseEFLAGS, NDD<1>, NF;
 }
+let SchedRW = [ReadDefault, ReadDefault, ReadDefault, ReadDefault, ReadDefault, WriteCMOV],
+    Predicates = [HasCMOV, HasCF, In64BitMode], mayStore = 1 in
+  def mr : ITy<0x40, MRMDestMemCC, t, (outs t.MemOperand:$dst),
+                (ins t.RegClass:$src1, ccode:$cond),
+                "cfcmov${cond}", unaryop_ndd_args, []>, UseEFLAGS, NF;
 }
 
 let isCodeGenOnly = 1, ForceDisassemble = 1 in {

llvm/test/MC/Disassembler/X86/apx/reverse-encoding.txt

@@ -433,6 +433,14 @@
 
 ## cfcmov
 
+# ATT:   cfcmovbew	%r16w, %r17w
+# INTEL: cfcmovbe	r17w, r16w
+0x62,0xec,0x7d,0x0c,0x46,0xc1
+
+# ATT:   cfcmovbel	%r16d, %r17d
+# INTEL: cfcmovbe	r17d, r16d
+0x62,0xec,0x7c,0x0c,0x46,0xc1
+
 # ATT:   cfcmovbeq	%r16, %r17
 # INTEL: cfcmovbe	r17, r16
 0x62,0xec,0xfc,0x0c,0x46,0xc1