Add check to ensure CCMP opcode is same

Author: fzou1

llvm/lib/Target/X86/X86InstrInfo.cpp

@@ -4961,12 +4961,10 @@ bool X86InstrInfo::isRedundantFlagInstr(const MachineInstr &FlagI,
   case X86::CCMP8ri: {
     // The CCMP instruction should not be optimized if the scc/dfv in it is not
     // same as the one in previous CCMP instruction.
-    unsigned Opcode = FlagI.getOpcode();
-    if (Opcode == X86::CCMP64ri32 || Opcode == X86::CCMP32ri ||
-        Opcode == X86::CCMP16ri || Opcode == X86::CCMP8ri)
-      if (OI.getOperand(2).getImm() != FlagI.getOperand(2).getImm() ||
-          (OI.getOperand(3).getImm() != FlagI.getOperand(3).getImm()))
-        return false;
+    if ((FlagI.getOpcode() != OI.getOpcode()) ||
+        (OI.getOperand(2).getImm() != FlagI.getOperand(2).getImm()) ||
+        (OI.getOperand(3).getImm() != FlagI.getOperand(3).getImm()))
+      return false;
     [[fallthrough]];
   }
   case X86::CMP64ri32:

llvm/test/CodeGen/X86/apx/optimize-compare-ccmp.mir

@@ -112,33 +112,6 @@ body: |
     $bl = SETCCr 2, implicit $eflags
 ...
 ---
-name: opt_redundant_flags_adjusted_imm_4
-body: |
-  bb.0:
-    ; CHECK-LABEL: name: opt_redundant_flags_adjusted_imm_4
-    ; CHECK: [[COPY:%[0-9]+]]:gr64 = COPY $rsi
-    ; CHECK-NEXT: CCMP64ri32 [[COPY]], 1, 2, 5, implicit-def $eflags, implicit $eflags
-    ; CHECK-NEXT: $cl = SETCCr 4, implicit $eflags
-    ; CHECK-NEXT: $bl = SETCCr 15, implicit $eflags
-    ; CHECK-NEXT: $bl = SETCCr 7, implicit $eflags
-    ; CHECK-NEXT: $bl = SETCCr 14, implicit $eflags
-    ; CHECK-NEXT: $bl = SETCCr 6, implicit $eflags
-    %0:gr64 = COPY $rsi
-    ; CCMP+SETCC   %0 == 1
-    CCMP64ri32 %0, 1, 2, 5, implicit-def $eflags, implicit $eflags
-    $cl = SETCCr 4, implicit $eflags
-    ; CMP+SETCC   %0 >= 2; CMP can be removed.
-    CMP64ri32 %0, 2, implicit-def $eflags
-    ; %0 >=s 2  -->  %0 >s 1
-    $bl = SETCCr 13, implicit $eflags
-    ; %0 >=u 2  -->  %0 >u 1
-    $bl = SETCCr 3, implicit $eflags
-    ; %0 <s 2  -->  %0 <=s 1
-    $bl = SETCCr 12, implicit $eflags
-    ; %0 <u 2  -->  %0 <=u 1
-    $bl = SETCCr 2, implicit $eflags
-...
----
 name: opt_redundant_flags_adjusted_imm_noopt_0
 body: |
   bb.0:
@@ -306,6 +279,34 @@ body: |
     $bl = SETCCr 2, implicit $eflags
 ...
 ---
+name: opt_redundant_flags_adjusted_imm_noopt_5
+body: |
+  bb.0:
+    ; CHECK-LABEL: name: opt_redundant_flags_adjusted_imm_noopt_5
+    ; CHECK: [[COPY:%[0-9]+]]:gr64 = COPY $rsi
+    ; CHECK-NEXT: CCMP64ri32 [[COPY]], 1, 2, 5, implicit-def $eflags, implicit $eflags
+    ; CHECK-NEXT: $cl = SETCCr 4, implicit $eflags
+    ; CHECK-NEXT: CMP64ri32 [[COPY]], 2, implicit-def $eflags
+    ; CHECK-NEXT: $bl = SETCCr 13, implicit $eflags
+    ; CHECK-NEXT: $bl = SETCCr 3, implicit $eflags
+    ; CHECK-NEXT: $bl = SETCCr 12, implicit $eflags
+    ; CHECK-NEXT: $bl = SETCCr 2, implicit $eflags
+    %0:gr64 = COPY $rsi
+    ; CCMP+SETCC   %0 == 1
+    CCMP64ri32 %0, 1, 2, 5, implicit-def $eflags, implicit $eflags
+    $cl = SETCCr 4, implicit $eflags
+    ; CMP+SETCC   %0 >= 2; CMP cannot be removed.
+    CMP64ri32 %0, 2, implicit-def $eflags
+    ; %0 >=s 2  -->  %0 >s 1
+    $bl = SETCCr 13, implicit $eflags
+    ; %0 >=u 2  -->  %0 >u 1
+    $bl = SETCCr 3, implicit $eflags
+    ; %0 <s 2  -->  %0 <=s 1
+    $bl = SETCCr 12, implicit $eflags
+    ; %0 <u 2  -->  %0 <=u 1
+    $bl = SETCCr 2, implicit $eflags
+...
+---
 name: opt_adjusted_imm_multiple_blocks
 body: |
   ; CHECK-LABEL: name: opt_adjusted_imm_multiple_blocks