From: Simon Dardis <simon.dardis@mips.com>
Date: Tue, 13 Mar 2018 17:31:11 +0000 (+0000)
Subject: Revert "[mips] Guard traps for microMIPS correctly"
X-Git-Tag: llvmorg-7.0.0-rc1~10703
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e5f72dd5e1b14814c1fbb0a10cbf02222782e5bd;p=platform%2Fupstream%2Fllvm.git

Revert "[mips] Guard traps for microMIPS correctly"

This appears to have broken the expensive checks bot in
a strange fashion. Reverting until I can investigate.

This reverts r327409.

llvm-svn: 327427
---

diff --git a/llvm/lib/Target/Mips/MicroMipsInstrInfo.td b/llvm/lib/Target/Mips/MicroMipsInstrInfo.td
index ceb3183..fc215a3 100644
--- a/llvm/lib/Target/Mips/MicroMipsInstrInfo.td
+++ b/llvm/lib/Target/Mips/MicroMipsInstrInfo.td
@@ -961,36 +961,26 @@ let DecoderNamespace = "MicroMips", Predicates = [InMicroMips] in {
                    ISA_MIPS32R2;
   def DI_MM      : MMRel, DEI_FT<"di", GPR32Opnd, II_DI>, EI_FM_MM<0x11d>,
                    ISA_MIPS32R2;
-}
-let DecoderNamespace = "MicroMips" in {
+
   /// Trap Instructions
-  def TEQ_MM  : MMRel, TEQ_FT<"teq", GPR32Opnd, uimm4, II_TEQ>, TEQ_FM_MM<0x0>,
-                ISA_MICROMIPS;
-  def TGE_MM  : MMRel, TEQ_FT<"tge", GPR32Opnd, uimm4, II_TGE>, TEQ_FM_MM<0x08>,
-                ISA_MICROMIPS;
+  def TEQ_MM  : MMRel, TEQ_FT<"teq", GPR32Opnd, uimm4, II_TEQ>, TEQ_FM_MM<0x0>;
+  def TGE_MM  : MMRel, TEQ_FT<"tge", GPR32Opnd, uimm4, II_TGE>, TEQ_FM_MM<0x08>;
   def TGEU_MM : MMRel, TEQ_FT<"tgeu", GPR32Opnd, uimm4, II_TGEU>,
-                TEQ_FM_MM<0x10>, ISA_MICROMIPS;
-  def TLT_MM  : MMRel, TEQ_FT<"tlt", GPR32Opnd, uimm4, II_TLT>, TEQ_FM_MM<0x20>,
-                ISA_MICROMIPS;
+                TEQ_FM_MM<0x10>;
+  def TLT_MM  : MMRel, TEQ_FT<"tlt", GPR32Opnd, uimm4, II_TLT>, TEQ_FM_MM<0x20>;
   def TLTU_MM : MMRel, TEQ_FT<"tltu", GPR32Opnd, uimm4, II_TLTU>,
-                TEQ_FM_MM<0x28>, ISA_MICROMIPS;
-  def TNE_MM  : MMRel, TEQ_FT<"tne", GPR32Opnd, uimm4, II_TNE>, TEQ_FM_MM<0x30>,
-                ISA_MICROMIPS;
+                TEQ_FM_MM<0x28>;
+  def TNE_MM  : MMRel, TEQ_FT<"tne", GPR32Opnd, uimm4, II_TNE>, TEQ_FM_MM<0x30>;
 
-  def TEQI_MM  : MMRel, TEQI_FT<"teqi", GPR32Opnd, II_TEQI>, TEQI_FM_MM<0x0e>,
-                 ISA_MICROMIPS32_NOT_MIPS32R6;
-  def TGEI_MM  : MMRel, TEQI_FT<"tgei", GPR32Opnd, II_TGEI>, TEQI_FM_MM<0x09>,
-                 ISA_MICROMIPS32_NOT_MIPS32R6;
+  def TEQI_MM  : MMRel, TEQI_FT<"teqi", GPR32Opnd, II_TEQI>, TEQI_FM_MM<0x0e>;
+  def TGEI_MM  : MMRel, TEQI_FT<"tgei", GPR32Opnd, II_TGEI>, TEQI_FM_MM<0x09>;
   def TGEIU_MM : MMRel, TEQI_FT<"tgeiu", GPR32Opnd, II_TGEIU>,
-                 TEQI_FM_MM<0x0b>, ISA_MICROMIPS32_NOT_MIPS32R6;
-  def TLTI_MM  : MMRel, TEQI_FT<"tlti", GPR32Opnd, II_TLTI>, TEQI_FM_MM<0x08>,
-                 ISA_MICROMIPS32_NOT_MIPS32R6;
+                 TEQI_FM_MM<0x0b>;
+  def TLTI_MM  : MMRel, TEQI_FT<"tlti", GPR32Opnd, II_TLTI>, TEQI_FM_MM<0x08>;
   def TLTIU_MM : MMRel, TEQI_FT<"tltiu", GPR32Opnd, II_TTLTIU>,
-                 TEQI_FM_MM<0x0a>, ISA_MICROMIPS32_NOT_MIPS32R6;
-  def TNEI_MM  : MMRel, TEQI_FT<"tnei", GPR32Opnd, II_TNEI>, TEQI_FM_MM<0x0c>,
-                 ISA_MICROMIPS32_NOT_MIPS32R6;
-}
-let DecoderNamespace = "MicroMips", Predicates = [InMicroMips] in {
+                 TEQI_FM_MM<0x0a>;
+  def TNEI_MM  : MMRel, TEQI_FT<"tnei", GPR32Opnd, II_TNEI>, TEQI_FM_MM<0x0c>;
+
   /// Load-linked, Store-conditional
   def LL_MM : LLBaseMM<"ll", GPR32Opnd>, LL_FM_MM<0x3>;
   def SC_MM : SCBaseMM<"sc", GPR32Opnd>, LL_FM_MM<0xb>;
diff --git a/llvm/lib/Target/Mips/MipsInstrInfo.td b/llvm/lib/Target/Mips/MipsInstrInfo.td
index f92b57f..b8095051 100644
--- a/llvm/lib/Target/Mips/MipsInstrInfo.td
+++ b/llvm/lib/Target/Mips/MipsInstrInfo.td
@@ -2047,34 +2047,30 @@ let DecoderNamespace = "COP3_" in {
 }
 
 let AdditionalPredicates = [NotInMicroMips] in {
-  def TEQ : MMRel, TEQ_FT<"teq", GPR32Opnd, uimm10, II_TEQ>, TEQ_FM<0x34>,
-            ISA_MIPS2;
-  def TGE : MMRel, TEQ_FT<"tge", GPR32Opnd, uimm10, II_TGE>, TEQ_FM<0x30>,
-            ISA_MIPS2;
-  def TGEU : MMRel, TEQ_FT<"tgeu", GPR32Opnd, uimm10, II_TGEU>, TEQ_FM<0x31>,
-             ISA_MIPS2;
-  def TLT : MMRel, TEQ_FT<"tlt", GPR32Opnd, uimm10, II_TLT>, TEQ_FM<0x32>,
-            ISA_MIPS2;
-  def TLTU : MMRel, TEQ_FT<"tltu", GPR32Opnd, uimm10, II_TLTU>, TEQ_FM<0x33>,
-             ISA_MIPS2;
-  def TNE : MMRel, TEQ_FT<"tne", GPR32Opnd, uimm10, II_TNE>, TEQ_FM<0x36>,
-            ISA_MIPS2;
-
-  def TEQI : MMRel, TEQI_FT<"teqi", GPR32Opnd, II_TEQI>, TEQI_FM<0xc>,
-             ISA_MIPS2_NOT_32R6_64R6;
-  def TGEI : MMRel, TEQI_FT<"tgei", GPR32Opnd, II_TGEI>, TEQI_FM<0x8>,
-             ISA_MIPS2_NOT_32R6_64R6;
-  def TGEIU : MMRel, TEQI_FT<"tgeiu", GPR32Opnd, II_TGEIU>, TEQI_FM<0x9>,
-             ISA_MIPS2_NOT_32R6_64R6;
-  def TLTI : MMRel, TEQI_FT<"tlti", GPR32Opnd, II_TLTI>, TEQI_FM<0xa>,
-             ISA_MIPS2_NOT_32R6_64R6;
-  def TTLTIU : MMRel, TEQI_FT<"tltiu", GPR32Opnd, II_TTLTIU>, TEQI_FM<0xb>,
-             ISA_MIPS2_NOT_32R6_64R6;
-  def TNEI : MMRel, TEQI_FT<"tnei", GPR32Opnd, II_TNEI>, TEQI_FM<0xe>,
-             ISA_MIPS2_NOT_32R6_64R6;
-
-  def BREAK : MMRel, StdMMR6Rel, BRK_FT<"break">, BRK_FM<0xd>;
-  def SYSCALL : MMRel, SYS_FT<"syscall", uimm20, II_SYSCALL>, SYS_FM<0xc>;
+  def TEQ : MMRel, TEQ_FT<"teq", GPR32Opnd, uimm10, II_TEQ>, TEQ_FM<0x34>, ISA_MIPS2;
+  def TGE : MMRel, TEQ_FT<"tge", GPR32Opnd, uimm10, II_TGE>, TEQ_FM<0x30>, ISA_MIPS2;
+  def TGEU : MMRel, TEQ_FT<"tgeu", GPR32Opnd, uimm10, II_TGEU>, TEQ_FM<0x31>, ISA_MIPS2;
+  def TLT : MMRel, TEQ_FT<"tlt", GPR32Opnd, uimm10, II_TLT>, TEQ_FM<0x32>, ISA_MIPS2;
+  def TLTU : MMRel, TEQ_FT<"tltu", GPR32Opnd, uimm10, II_TLTU>, TEQ_FM<0x33>, ISA_MIPS2;
+  def TNE : MMRel, TEQ_FT<"tne", GPR32Opnd, uimm10, II_TNE>, TEQ_FM<0x36>, ISA_MIPS2;
+}
+
+def TEQI : MMRel, TEQI_FT<"teqi", GPR32Opnd, II_TEQI>, TEQI_FM<0xc>,
+           ISA_MIPS2_NOT_32R6_64R6;
+def TGEI : MMRel, TEQI_FT<"tgei", GPR32Opnd, II_TGEI>, TEQI_FM<0x8>,
+           ISA_MIPS2_NOT_32R6_64R6;
+def TGEIU : MMRel, TEQI_FT<"tgeiu", GPR32Opnd, II_TGEIU>, TEQI_FM<0x9>,
+           ISA_MIPS2_NOT_32R6_64R6;
+def TLTI : MMRel, TEQI_FT<"tlti", GPR32Opnd, II_TLTI>, TEQI_FM<0xa>,
+           ISA_MIPS2_NOT_32R6_64R6;
+def TTLTIU : MMRel, TEQI_FT<"tltiu", GPR32Opnd, II_TTLTIU>, TEQI_FM<0xb>,
+           ISA_MIPS2_NOT_32R6_64R6;
+def TNEI : MMRel, TEQI_FT<"tnei", GPR32Opnd, II_TNEI>, TEQI_FM<0xe>,
+           ISA_MIPS2_NOT_32R6_64R6;
+
+let AdditionalPredicates = [NotInMicroMips] in {
+def BREAK : MMRel, StdMMR6Rel, BRK_FT<"break">, BRK_FM<0xd>;
+def SYSCALL : MMRel, SYS_FT<"syscall", uimm20, II_SYSCALL>, SYS_FM<0xc>;
 }
 def TRAP : TrapBase<BREAK>;
 let AdditionalPredicates = [NotInMicroMips] in {
diff --git a/llvm/test/MC/Mips/micromips32r6/valid.s b/llvm/test/MC/Mips/micromips32r6/valid.s
index 26ed629..e56138e 100644
--- a/llvm/test/MC/Mips/micromips32r6/valid.s
+++ b/llvm/test/MC/Mips/micromips32r6/valid.s
@@ -268,29 +268,17 @@
   sll16 $3, $6, 8          # CHECK: sll16 $3, $6, 8     # encoding: [0x25,0xe0]
   srl16 $3, $6, 8          # CHECK: srl16 $3, $6, 8     # encoding: [0x25,0xe1]
   teq $8, $9               # CHECK: teq $8, $9          # encoding: [0x01,0x28,0x00,0x3c]
-                           # CHECK-NEXT:                # <MCInst #{{[0-9]+}} TEQ_MM 
   teq $5, $7, 15           # CHECK: teq $5, $7, 15      # encoding: [0x00,0xe5,0xf0,0x3c]
-                           # CHECK-NEXT:                # <MCInst #{{[0-9]+}} TEQ_MM 
   tge $7, $10              # CHECK: tge $7, $10         # encoding: [0x01,0x47,0x02,0x3c]
-                           # CHECK-NEXT:                # <MCInst #{{[0-9]+}} TGE_MM 
   tge $7, $19, 15          # CHECK: tge $7, $19, 15     # encoding: [0x02,0x67,0xf2,0x3c]
-                           # CHECK-NEXT:                # <MCInst #{{[0-9]+}} TGE_MM 
   tgeu $22, $gp            # CHECK: tgeu $22, $gp       # encoding: [0x03,0x96,0x04,0x3c]
-                           # CHECK-NEXT:                # <MCInst #{{[0-9]+}} TGEU_MM 
   tgeu $20, $14, 15        # CHECK: tgeu $20, $14, 15   # encoding: [0x01,0xd4,0xf4,0x3c]
-                           # CHECK-NEXT:                # <MCInst #{{[0-9]+}} TGEU_MM 
   tlt $15, $13             # CHECK: tlt $15, $13        # encoding: [0x01,0xaf,0x08,0x3c]
-                           # CHECK-NEXT:                # <MCInst #{{[0-9]+}} TLT_MM 
   tlt $2, $19, 15          # CHECK: tlt $2, $19, 15     # encoding: [0x02,0x62,0xf8,0x3c]
-                           # CHECK-NEXT:                # <MCInst #{{[0-9]+}} TLT_MM 
   tltu $11, $16            # CHECK: tltu $11, $16       # encoding: [0x02,0x0b,0x0a,0x3c]
-                           # CHECK-NEXT:                # <MCInst #{{[0-9]+}} TLTU_MM 
   tltu $16, $sp, 15        # CHECK: tltu $16, $sp, 15   # encoding: [0x03,0xb0,0xfa,0x3c]
-                           # CHECK-NEXT:                # <MCInst #{{[0-9]+}} TLTU_MM 
   tne $6, $17              # CHECK: tne $6, $17         # encoding: [0x02,0x26,0x0c,0x3c]
-                           # CHECK-NEXT:                # <MCInst #{{[0-9]+}} TNE_MM 
   tne $7, $8, 15           # CHECK: tne $7, $8, 15      # encoding: [0x01,0x07,0xfc,0x3c]
-                           # CHECK-NEXT:                # <MCInst #{{[0-9]+}} TNE_MM 
   break16 8                # CHECK: break16 8           # encoding: [0x46,0x1b]
   li16 $3, -1              # CHECK: li16 $3, -1         # encoding: [0xed,0xff]
   move16 $3, $5            # CHECK: move16 $3, $5       # encoding: [0x0c,0x65]
diff --git a/llvm/test/MC/Mips/mips2/valid.s b/llvm/test/MC/Mips/mips2/valid.s
index a13f448..da35138 100644
--- a/llvm/test/MC/Mips/mips2/valid.s
+++ b/llvm/test/MC/Mips/mips2/valid.s
@@ -179,63 +179,27 @@ a:
         syscall                        # CHECK: syscall                # encoding: [0x00,0x00,0x00,0x0c]
         syscall   256                  # CHECK: syscall 256            # encoding: [0x00,0x00,0x40,0x0c]
         teq       $0,$3                # CHECK: teq $zero, $3          # encoding: [0x00,0x03,0x00,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
         teq       $5,$7,620            # CHECK: teq $5, $7, 620        # encoding: [0x00,0xa7,0x9b,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
-        teqi      $s5,-17504           # CHECK: teqi  $21, -17504      # encoding: [0x06,0xac,0xbb,0xa0]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQI_MM
+        teqi      $s5,-17504
         tge       $7,$10               # CHECK: tge $7, $10            # encoding: [0x00,0xea,0x00,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
         tge       $5,$19,340           # CHECK: tge $5, $19, 340       # encoding: [0x00,0xb3,0x55,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
-        tgei      $s1,5025             # CHECK: tgei  $17, 5025        # encoding: [0x06,0x28,0x13,0xa1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEI_MM
-        tgeiu     $sp,-28621           # CHECK: tgeiu $sp, -28621      # encoding: [0x07,0xa9,0x90,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEIU_MM
+        tgei      $s1,5025
+        tgeiu     $sp,-28621
         tgeu      $22,$28              # CHECK: tgeu $22, $gp          # encoding: [0x02,0xdc,0x00,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tgeu      $20,$14,379          # CHECK: tgeu $20, $14, 379     # encoding: [0x02,0x8e,0x5e,0xf1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tlbp                           # CHECK: tlbp                   # encoding: [0x42,0x00,0x00,0x08]
         tlbr                           # CHECK: tlbr                   # encoding: [0x42,0x00,0x00,0x01]
         tlbwi                          # CHECK: tlbwi                  # encoding: [0x42,0x00,0x00,0x02]
         tlbwr                          # CHECK: tlbwr                  # encoding: [0x42,0x00,0x00,0x06]
         tlt       $15,$13              # CHECK: tlt $15, $13           # encoding: [0x01,0xed,0x00,0x32]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
         tlt       $2,$19,133           # CHECK: tlt $2, $19, 133       # encoding: [0x00,0x53,0x21,0x72]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
-        tlti      $14,-21059           # CHECK: tlti  $14, -21059      # encoding: [0x05,0xca,0xad,0xbd]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTI_MM
-        tltiu     $ra,-5076            # CHECK: tltiu $ra, -5076       # encoding: [0x07,0xeb,0xec,0x2c]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TTLTIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTIU_MM
+        tlti      $14,-21059
+        tltiu     $ra,-5076
         tltu      $11,$16              # CHECK: tltu $11, $16          # encoding: [0x01,0x70,0x00,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tltu      $16,$29,1016         # CHECK: tltu $16, $sp, 1016    # encoding: [0x02,0x1d,0xfe,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tne       $6,$17               # CHECK: tne $6, $17            # encoding: [0x00,0xd1,0x00,0x36]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
         tne       $7,$8,885            # CHECK: tne $7, $8, 885        # encoding: [0x00,0xe8,0xdd,0x76]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
-        tnei      $12,-29647           # CHECK: tnei  $12, -29647      # encoding: [0x05,0x8e,0x8c,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNEI_MM
+        tnei      $12,-29647
         trunc.w.d $f22,$f15            # CHECK: trunc.w.d $f22, $f14   # encoding: [0x46,0x20,0x75,0x8d]
         trunc.w.s $f28,$f30            # CHECK: trunc.w.s $f28, $f30   # encoding: [0x46,0x00,0xf7,0x0d]
         trunc.w.d $f4,$f6,$4           # CHECK: trunc.w.d $f4, $f6     # encoding: [0x46,0x20,0x31,0x0d]
diff --git a/llvm/test/MC/Mips/mips3/valid.s b/llvm/test/MC/Mips/mips3/valid.s
index 2fe2cf7..694952b 100644
--- a/llvm/test/MC/Mips/mips3/valid.s
+++ b/llvm/test/MC/Mips/mips3/valid.s
@@ -1,6 +1,6 @@
 # Instructions that are valid
 #
-# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -mcpu=mips3 -show-inst | FileCheck %s
+# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -mcpu=mips3 | FileCheck %s
 a:
         .set noat
         abs.d     $f7,$f25             # CHECK: encoding:
@@ -233,63 +233,27 @@ a:
         syscall                        # CHECK: syscall                # encoding: [0x00,0x00,0x00,0x0c]
         syscall   256                  # CHECK: syscall 256            # encoding: [0x00,0x00,0x40,0x0c]
         teq       $0,$3                # CHECK: teq $zero, $3          # encoding: [0x00,0x03,0x00,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
         teq       $5,$7,620            # CHECK: teq $5, $7, 620        # encoding: [0x00,0xa7,0x9b,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
-        teqi      $s5,-17504           # CHECK: teqi  $21, -17504      # encoding: [0x06,0xac,0xbb,0xa0]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQI_MM
+        teqi      $s5,-17504
         tge       $7,$10               # CHECK: tge $7, $10            # encoding: [0x00,0xea,0x00,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
         tge       $5,$19,340           # CHECK: tge $5, $19, 340       # encoding: [0x00,0xb3,0x55,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
-        tgei      $s1,5025             # CHECK: tgei  $17, 5025        # encoding: [0x06,0x28,0x13,0xa1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEI_MM
-        tgeiu     $sp,-28621           # CHECK: tgeiu $sp, -28621      # encoding: [0x07,0xa9,0x90,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEIU_MM
+        tgei      $s1,5025
+        tgeiu     $sp,-28621
         tgeu      $22,$28              # CHECK: tgeu $22, $gp          # encoding: [0x02,0xdc,0x00,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tgeu      $20,$14,379          # CHECK: tgeu $20, $14, 379     # encoding: [0x02,0x8e,0x5e,0xf1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tlbp                           # CHECK: tlbp                   # encoding: [0x42,0x00,0x00,0x08]
         tlbr                           # CHECK: tlbr                   # encoding: [0x42,0x00,0x00,0x01]
         tlbwi                          # CHECK: tlbwi                  # encoding: [0x42,0x00,0x00,0x02]
         tlbwr                          # CHECK: tlbwr                  # encoding: [0x42,0x00,0x00,0x06]
         tlt       $15,$13              # CHECK: tlt $15, $13           # encoding: [0x01,0xed,0x00,0x32]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
         tlt       $2,$19,133           # CHECK: tlt $2, $19, 133       # encoding: [0x00,0x53,0x21,0x72]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
-        tlti      $14,-21059           # CHECK: tlti  $14, -21059      # encoding: [0x05,0xca,0xad,0xbd]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTI_MM
-        tltiu     $ra,-5076            # CHECK: tltiu $ra, -5076       # encoding: [0x07,0xeb,0xec,0x2c]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TTLTIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTIU_MM
+        tlti      $14,-21059
+        tltiu     $ra,-5076
         tltu      $11,$16              # CHECK: tltu $11, $16          # encoding: [0x01,0x70,0x00,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tltu      $16,$29,1016         # CHECK: tltu $16, $sp, 1016    # encoding: [0x02,0x1d,0xfe,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tne       $6,$17               # CHECK: tne $6, $17            # encoding: [0x00,0xd1,0x00,0x36]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
         tne       $7,$8,885            # CHECK: tne $7, $8, 885        # encoding: [0x00,0xe8,0xdd,0x76]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
-        tnei      $12,-29647           # CHECK: tnei  $12, -29647      # encoding: [0x05,0x8e,0x8c,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNEI_MM
+        tnei      $12,-29647
         trunc.l.d $f23,$f23            # CHECK: trunc.l.d $f23, $f23   # encoding: [0x46,0x20,0xbd,0xc9]
         trunc.l.s $f28,$f31            # CHECK: trunc.l.s $f28, $f31   # encoding: [0x46,0x00,0xff,0x09]
         trunc.w.d $f22,$f15            # CHECK: trunc.w.d $f22, $f15   # encoding: [0x46,0x20,0x7d,0x8d]
diff --git a/llvm/test/MC/Mips/mips32/valid.s b/llvm/test/MC/Mips/mips32/valid.s
index c6b1de1..68d3776 100644
--- a/llvm/test/MC/Mips/mips32/valid.s
+++ b/llvm/test/MC/Mips/mips32/valid.s
@@ -236,63 +236,27 @@ a:
         syscall                        # CHECK: syscall                # encoding: [0x00,0x00,0x00,0x0c]
         syscall   256                  # CHECK: syscall 256            # encoding: [0x00,0x00,0x40,0x0c]
         teq       $0,$3                # CHECK: teq $zero, $3          # encoding: [0x00,0x03,0x00,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
         teq       $5,$7,620            # CHECK: teq $5, $7, 620        # encoding: [0x00,0xa7,0x9b,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
-        teqi      $s5,-17504           # CHECK: teqi  $21, -17504      # encoding: [0x06,0xac,0xbb,0xa0]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQI_MM
+        teqi      $s5,-17504
         tge       $7,$10               # CHECK: tge $7, $10            # encoding: [0x00,0xea,0x00,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
         tge       $5,$19,340           # CHECK: tge $5, $19, 340       # encoding: [0x00,0xb3,0x55,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
-        tgei      $s1,5025             # CHECK: tgei  $17, 5025        # encoding: [0x06,0x28,0x13,0xa1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEI_MM
-        tgeiu     $sp,-28621           # CHECK: tgeiu $sp, -28621      # encoding: [0x07,0xa9,0x90,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEIU_MM
+        tgei      $s1,5025
+        tgeiu     $sp,-28621
         tgeu      $22,$28              # CHECK: tgeu $22, $gp          # encoding: [0x02,0xdc,0x00,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tgeu      $20,$14,379          # CHECK: tgeu $20, $14, 379     # encoding: [0x02,0x8e,0x5e,0xf1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tlbp                           # CHECK: tlbp                   # encoding: [0x42,0x00,0x00,0x08]
         tlbr                           # CHECK: tlbr                   # encoding: [0x42,0x00,0x00,0x01]
         tlbwi                          # CHECK: tlbwi                  # encoding: [0x42,0x00,0x00,0x02]
         tlbwr                          # CHECK: tlbwr                  # encoding: [0x42,0x00,0x00,0x06]
         tlt       $15,$13              # CHECK: tlt $15, $13           # encoding: [0x01,0xed,0x00,0x32]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
         tlt       $2,$19,133           # CHECK: tlt $2, $19, 133       # encoding: [0x00,0x53,0x21,0x72]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
-        tlti      $14,-21059           # CHECK: tlti  $14, -21059      # encoding: [0x05,0xca,0xad,0xbd]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTI_MM
-        tltiu     $ra,-5076            # CHECK: tltiu $ra, -5076       # encoding: [0x07,0xeb,0xec,0x2c]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TTLTIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTIU_MM
+        tlti      $14,-21059
+        tltiu     $ra,-5076
         tltu      $11,$16              # CHECK: tltu $11, $16          # encoding: [0x01,0x70,0x00,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tltu      $16,$29,1016         # CHECK: tltu $16, $sp, 1016    # encoding: [0x02,0x1d,0xfe,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tne       $6,$17               # CHECK: tne $6, $17            # encoding: [0x00,0xd1,0x00,0x36]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
         tne       $7,$8,885            # CHECK: tne $7, $8, 885        # encoding: [0x00,0xe8,0xdd,0x76]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
-        tnei      $12,-29647           # CHECK: tnei  $12, -29647      # encoding: [0x05,0x8e,0x8c,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNEI_MM
+        tnei      $12,-29647
         trunc.w.d $f22,$f15            # CHECK: trunc.w.d $f22, $f14   # encoding: [0x46,0x20,0x75,0x8d]
         trunc.w.s $f28,$f30            # CHECK: trunc.w.s $f28, $f30   # encoding: [0x46,0x00,0xf7,0x0d]
         trunc.w.d $f4,$f6,$4           # CHECK: trunc.w.d $f4, $f6     # encoding: [0x46,0x20,0x31,0x0d]
diff --git a/llvm/test/MC/Mips/mips32r2/valid.s b/llvm/test/MC/Mips/mips32r2/valid.s
index ef4b658..0985d52 100644
--- a/llvm/test/MC/Mips/mips32r2/valid.s
+++ b/llvm/test/MC/Mips/mips32r2/valid.s
@@ -281,63 +281,27 @@ a:
         syscall                        # CHECK: syscall                # encoding: [0x00,0x00,0x00,0x0c]
         syscall   256                  # CHECK: syscall 256            # encoding: [0x00,0x00,0x40,0x0c]
         teq       $0,$3                # CHECK: teq $zero, $3          # encoding: [0x00,0x03,0x00,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
         teq       $5,$7,620            # CHECK: teq $5, $7, 620        # encoding: [0x00,0xa7,0x9b,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
-        teqi      $s5,-17504           # CHECK: teqi  $21, -17504      # encoding: [0x06,0xac,0xbb,0xa0]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQI_MM
+        teqi      $s5,-17504
         tge       $7,$10               # CHECK: tge $7, $10            # encoding: [0x00,0xea,0x00,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
         tge       $5,$19,340           # CHECK: tge $5, $19, 340       # encoding: [0x00,0xb3,0x55,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
-        tgei      $s1,5025             # CHECK: tgei  $17, 5025        # encoding: [0x06,0x28,0x13,0xa1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEI_MM
-        tgeiu     $sp,-28621           # CHECK: tgeiu $sp, -28621      # encoding: [0x07,0xa9,0x90,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEIU_MM
+        tgei      $s1,5025
+        tgeiu     $sp,-28621
         tgeu      $22,$28              # CHECK: tgeu $22, $gp          # encoding: [0x02,0xdc,0x00,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tgeu      $20,$14,379          # CHECK: tgeu $20, $14, 379     # encoding: [0x02,0x8e,0x5e,0xf1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tlbp                           # CHECK: tlbp                   # encoding: [0x42,0x00,0x00,0x08]
         tlbr                           # CHECK: tlbr                   # encoding: [0x42,0x00,0x00,0x01]
         tlbwi                          # CHECK: tlbwi                  # encoding: [0x42,0x00,0x00,0x02]
         tlbwr                          # CHECK: tlbwr                  # encoding: [0x42,0x00,0x00,0x06]
         tlt       $15,$13              # CHECK: tlt $15, $13           # encoding: [0x01,0xed,0x00,0x32]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
         tlt       $2,$19,133           # CHECK: tlt $2, $19, 133       # encoding: [0x00,0x53,0x21,0x72]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
-        tlti      $14,-21059           # CHECK: tlti  $14, -21059      # encoding: [0x05,0xca,0xad,0xbd]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTI_MM
-        tltiu     $ra,-5076            # CHECK: tltiu $ra, -5076       # encoding: [0x07,0xeb,0xec,0x2c]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TTLTIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTIU_MM
+        tlti      $14,-21059
+        tltiu     $ra,-5076
         tltu      $11,$16              # CHECK: tltu $11, $16          # encoding: [0x01,0x70,0x00,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tltu      $16,$29,1016         # CHECK: tltu $16, $sp, 1016    # encoding: [0x02,0x1d,0xfe,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tne       $6,$17               # CHECK: tne $6, $17            # encoding: [0x00,0xd1,0x00,0x36]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
         tne       $7,$8,885            # CHECK: tne $7, $8, 885        # encoding: [0x00,0xe8,0xdd,0x76]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
-        tnei      $12,-29647           # CHECK: tnei  $12, -29647      # encoding: [0x05,0x8e,0x8c,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNEI_MM
+        tnei      $12,-29647
         trunc.w.d $f22,$f15            # CHECK: trunc.w.d $f22, $f14   # encoding: [0x46,0x20,0x75,0x8d]
         trunc.w.s $f28,$f30            # CHECK: trunc.w.s $f28, $f30   # encoding: [0x46,0x00,0xf7,0x0d]
         trunc.w.d $f4,$f6,$4           # CHECK: trunc.w.d $f4, $f6     # encoding: [0x46,0x20,0x31,0x0d]
diff --git a/llvm/test/MC/Mips/mips32r3/valid.s b/llvm/test/MC/Mips/mips32r3/valid.s
index 201835c..02061c4 100644
--- a/llvm/test/MC/Mips/mips32r3/valid.s
+++ b/llvm/test/MC/Mips/mips32r3/valid.s
@@ -281,63 +281,27 @@ a:
         syscall                        # CHECK: syscall                # encoding: [0x00,0x00,0x00,0x0c]
         syscall   256                  # CHECK: syscall 256            # encoding: [0x00,0x00,0x40,0x0c]
         teq       $0,$3                # CHECK: teq $zero, $3          # encoding: [0x00,0x03,0x00,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
         teq       $5,$7,620            # CHECK: teq $5, $7, 620        # encoding: [0x00,0xa7,0x9b,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
-        teqi      $s5,-17504           # CHECK: teqi  $21, -17504      # encoding: [0x06,0xac,0xbb,0xa0]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQI_MM
+        teqi      $s5,-17504
         tge       $7,$10               # CHECK: tge $7, $10            # encoding: [0x00,0xea,0x00,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
         tge       $5,$19,340           # CHECK: tge $5, $19, 340       # encoding: [0x00,0xb3,0x55,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
-        tgei      $s1,5025             # CHECK: tgei  $17, 5025        # encoding: [0x06,0x28,0x13,0xa1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEI_MM
-        tgeiu     $sp,-28621           # CHECK: tgeiu $sp, -28621      # encoding: [0x07,0xa9,0x90,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEIU_MM
+        tgei      $s1,5025
+        tgeiu     $sp,-28621
         tgeu      $22,$28              # CHECK: tgeu $22, $gp          # encoding: [0x02,0xdc,0x00,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tgeu      $20,$14,379          # CHECK: tgeu $20, $14, 379     # encoding: [0x02,0x8e,0x5e,0xf1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tlbp                           # CHECK: tlbp                   # encoding: [0x42,0x00,0x00,0x08]
         tlbr                           # CHECK: tlbr                   # encoding: [0x42,0x00,0x00,0x01]
         tlbwi                          # CHECK: tlbwi                  # encoding: [0x42,0x00,0x00,0x02]
         tlbwr                          # CHECK: tlbwr                  # encoding: [0x42,0x00,0x00,0x06]
         tlt       $15,$13              # CHECK: tlt $15, $13           # encoding: [0x01,0xed,0x00,0x32]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
         tlt       $2,$19,133           # CHECK: tlt $2, $19, 133       # encoding: [0x00,0x53,0x21,0x72]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
-        tlti      $14,-21059           # CHECK: tlti  $14, -21059      # encoding: [0x05,0xca,0xad,0xbd]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTI_MM
-        tltiu     $ra,-5076            # CHECK: tltiu $ra, -5076       # encoding: [0x07,0xeb,0xec,0x2c]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TTLTIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTIU_MM
+        tlti      $14,-21059
+        tltiu     $ra,-5076
         tltu      $11,$16              # CHECK: tltu $11, $16          # encoding: [0x01,0x70,0x00,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tltu      $16,$29,1016         # CHECK: tltu $16, $sp, 1016    # encoding: [0x02,0x1d,0xfe,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tne       $6,$17               # CHECK: tne $6, $17            # encoding: [0x00,0xd1,0x00,0x36]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
         tne       $7,$8,885            # CHECK: tne $7, $8, 885        # encoding: [0x00,0xe8,0xdd,0x76]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
-        tnei      $12,-29647           # CHECK: tnei  $12, -29647      # encoding: [0x05,0x8e,0x8c,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNEI_MM
+        tnei      $12,-29647
         trunc.w.d $f22,$f15            # CHECK: trunc.w.d $f22, $f14   # encoding: [0x46,0x20,0x75,0x8d]
         trunc.w.s $f28,$f30            # CHECK: trunc.w.s $f28, $f30   # encoding: [0x46,0x00,0xf7,0x0d]
         trunc.w.d $f4,$f6,$4           # CHECK: trunc.w.d $f4, $f6     # encoding: [0x46,0x20,0x31,0x0d]
diff --git a/llvm/test/MC/Mips/mips32r5/valid.s b/llvm/test/MC/Mips/mips32r5/valid.s
index 87f2667..5bca6dd 100644
--- a/llvm/test/MC/Mips/mips32r5/valid.s
+++ b/llvm/test/MC/Mips/mips32r5/valid.s
@@ -282,63 +282,27 @@ a:
         syscall                        # CHECK: syscall                # encoding: [0x00,0x00,0x00,0x0c]
         syscall   256                  # CHECK: syscall 256            # encoding: [0x00,0x00,0x40,0x0c]
         teq       $0,$3                # CHECK: teq $zero, $3          # encoding: [0x00,0x03,0x00,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
         teq       $5,$7,620            # CHECK: teq $5, $7, 620        # encoding: [0x00,0xa7,0x9b,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
-        teqi      $s5,-17504           # CHECK: teqi  $21, -17504      # encoding: [0x06,0xac,0xbb,0xa0]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQI_MM
+        teqi      $s5,-17504
         tge       $7,$10               # CHECK: tge $7, $10            # encoding: [0x00,0xea,0x00,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
         tge       $5,$19,340           # CHECK: tge $5, $19, 340       # encoding: [0x00,0xb3,0x55,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
-        tgei      $s1,5025             # CHECK: tgei  $17, 5025        # encoding: [0x06,0x28,0x13,0xa1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEI_MM
-        tgeiu     $sp,-28621           # CHECK: tgeiu $sp, -28621      # encoding: [0x07,0xa9,0x90,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEIU_MM
+        tgei      $s1,5025
+        tgeiu     $sp,-28621
         tgeu      $22,$28              # CHECK: tgeu $22, $gp          # encoding: [0x02,0xdc,0x00,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tgeu      $20,$14,379          # CHECK: tgeu $20, $14, 379     # encoding: [0x02,0x8e,0x5e,0xf1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tlbp                           # CHECK: tlbp                   # encoding: [0x42,0x00,0x00,0x08]
         tlbr                           # CHECK: tlbr                   # encoding: [0x42,0x00,0x00,0x01]
         tlbwi                          # CHECK: tlbwi                  # encoding: [0x42,0x00,0x00,0x02]
         tlbwr                          # CHECK: tlbwr                  # encoding: [0x42,0x00,0x00,0x06]
         tlt       $15,$13              # CHECK: tlt $15, $13           # encoding: [0x01,0xed,0x00,0x32]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
         tlt       $2,$19,133           # CHECK: tlt $2, $19, 133       # encoding: [0x00,0x53,0x21,0x72]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
-        tlti      $14,-21059           # CHECK: tlti  $14, -21059      # encoding: [0x05,0xca,0xad,0xbd]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTI_MM
-        tltiu     $ra,-5076            # CHECK: tltiu $ra, -5076       # encoding: [0x07,0xeb,0xec,0x2c]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TTLTIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTIU_MM
+        tlti      $14,-21059
+        tltiu     $ra,-5076
         tltu      $11,$16              # CHECK: tltu $11, $16          # encoding: [0x01,0x70,0x00,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tltu      $16,$29,1016         # CHECK: tltu $16, $sp, 1016    # encoding: [0x02,0x1d,0xfe,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tne       $6,$17               # CHECK: tne $6, $17            # encoding: [0x00,0xd1,0x00,0x36]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
         tne       $7,$8,885            # CHECK: tne $7, $8, 885        # encoding: [0x00,0xe8,0xdd,0x76]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
-        tnei      $12,-29647           # CHECK: tnei  $12, -29647      # encoding: [0x05,0x8e,0x8c,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNEI_MM
+        tnei      $12,-29647
         trunc.w.d $f22,$f15            # CHECK: trunc.w.d $f22, $f14   # encoding: [0x46,0x20,0x75,0x8d]
         trunc.w.s $f28,$f30            # CHECK: trunc.w.s $f28, $f30   # encoding: [0x46,0x00,0xf7,0x0d]
         trunc.w.d $f4,$f6,$4           # CHECK: trunc.w.d $f4, $f6     # encoding: [0x46,0x20,0x31,0x0d]
diff --git a/llvm/test/MC/Mips/mips32r6/valid.s b/llvm/test/MC/Mips/mips32r6/valid.s
index 68c52ca..cf776ad 100644
--- a/llvm/test/MC/Mips/mips32r6/valid.s
+++ b/llvm/test/MC/Mips/mips32r6/valid.s
@@ -217,41 +217,17 @@ a:
         syscall                  # CHECK: syscall                # encoding: [0x00,0x00,0x00,0x0c]
         syscall   256            # CHECK: syscall 256            # encoding: [0x00,0x00,0x40,0x0c]
         teq     $0,$3            # CHECK: teq $zero, $3          # encoding: [0x00,0x03,0x00,0x34]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
         teq     $5,$7,620        # CHECK: teq $5, $7, 620        # encoding: [0x00,0xa7,0x9b,0x34]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
         tge     $7,$10           # CHECK: tge $7, $10            # encoding: [0x00,0xea,0x00,0x30]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
         tge     $5,$19,340       # CHECK: tge $5, $19, 340       # encoding: [0x00,0xb3,0x55,0x30]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
         tgeu    $22,$28          # CHECK: tgeu $22, $gp          # encoding: [0x02,0xdc,0x00,0x31]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tgeu    $20,$14,379      # CHECK: tgeu $20, $14, 379     # encoding: [0x02,0x8e,0x5e,0xf1]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tlt     $15,$13          # CHECK: tlt $15, $13           # encoding: [0x01,0xed,0x00,0x32]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
         tlt     $2,$19,133       # CHECK: tlt $2, $19, 133       # encoding: [0x00,0x53,0x21,0x72]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
         tltu    $11,$16          # CHECK: tltu $11, $16          # encoding: [0x01,0x70,0x00,0x33]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tltu    $16,$29,1016     # CHECK: tltu $16, $sp, 1016    # encoding: [0x02,0x1d,0xfe,0x33]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tne     $6,$17           # CHECK: tne $6, $17            # encoding: [0x00,0xd1,0x00,0x36]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
         tne     $7,$8,885        # CHECK: tne $7, $8, 885        # encoding: [0x00,0xe8,0xdd,0x76]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
         xor     $2, 4            # CHECK: xori $2, $2, 4         # encoding: [0x38,0x42,0x00,0x04]
 
 1:
diff --git a/llvm/test/MC/Mips/mips4/valid.s b/llvm/test/MC/Mips/mips4/valid.s
index 82011d07..68f269c 100644
--- a/llvm/test/MC/Mips/mips4/valid.s
+++ b/llvm/test/MC/Mips/mips4/valid.s
@@ -1,6 +1,6 @@
 # Instructions that are valid
 #
-# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -show-inst -mcpu=mips4 | FileCheck %s
+# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -mcpu=mips4 | FileCheck %s
 a:
         .set noat
         abs.d     $f7,$f25             # CHECK: encoding:
@@ -294,63 +294,27 @@ a:
         syscall                        # CHECK: syscall                # encoding: [0x00,0x00,0x00,0x0c]
         syscall   256                  # CHECK: syscall 256            # encoding: [0x00,0x00,0x40,0x0c]
         teq       $0,$3                # CHECK: teq $zero, $3          # encoding: [0x00,0x03,0x00,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
         teq       $5,$7,620            # CHECK: teq $5, $7, 620        # encoding: [0x00,0xa7,0x9b,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
-        teqi      $s5,-17504           # CHECK: teqi  $21, -17504      # encoding: [0x06,0xac,0xbb,0xa0]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQI_MM
+        teqi      $s5,-17504
         tge       $7,$10               # CHECK: tge $7, $10            # encoding: [0x00,0xea,0x00,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
         tge       $5,$19,340           # CHECK: tge $5, $19, 340       # encoding: [0x00,0xb3,0x55,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
-        tgei      $s1,5025             # CHECK: tgei  $17, 5025        # encoding: [0x06,0x28,0x13,0xa1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEI_MM
-        tgeiu     $sp,-28621           # CHECK: tgeiu $sp, -28621      # encoding: [0x07,0xa9,0x90,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEIU_MM
+        tgei      $s1,5025
+        tgeiu     $sp,-28621
         tgeu      $22,$28              # CHECK: tgeu $22, $gp          # encoding: [0x02,0xdc,0x00,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tgeu      $20,$14,379          # CHECK: tgeu $20, $14, 379     # encoding: [0x02,0x8e,0x5e,0xf1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tlbp                           # CHECK: tlbp                   # encoding: [0x42,0x00,0x00,0x08]
         tlbr                           # CHECK: tlbr                   # encoding: [0x42,0x00,0x00,0x01]
         tlbwi                          # CHECK: tlbwi                  # encoding: [0x42,0x00,0x00,0x02]
         tlbwr                          # CHECK: tlbwr                  # encoding: [0x42,0x00,0x00,0x06]
         tlt       $15,$13              # CHECK: tlt $15, $13           # encoding: [0x01,0xed,0x00,0x32]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
         tlt       $2,$19,133           # CHECK: tlt $2, $19, 133       # encoding: [0x00,0x53,0x21,0x72]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
-        tlti      $14,-21059           # CHECK: tlti  $14, -21059      # encoding: [0x05,0xca,0xad,0xbd]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTI_MM
-        tltiu     $ra,-5076            # CHECK: tltiu $ra, -5076       # encoding: [0x07,0xeb,0xec,0x2c]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TTLTIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTIU_MM
+        tlti      $14,-21059
+        tltiu     $ra,-5076
         tltu      $11,$16              # CHECK: tltu $11, $16          # encoding: [0x01,0x70,0x00,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tltu      $16,$29,1016         # CHECK: tltu $16, $sp, 1016    # encoding: [0x02,0x1d,0xfe,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tne       $6,$17               # CHECK: tne $6, $17            # encoding: [0x00,0xd1,0x00,0x36]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
         tne       $7,$8,885            # CHECK: tne $7, $8, 885        # encoding: [0x00,0xe8,0xdd,0x76]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
-        tnei      $12,-29647           # CHECK: tnei  $12, -29647      # encoding: [0x05,0x8e,0x8c,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNEI_MM
+        tnei      $12,-29647
         trunc.l.d $f23,$f23            # CHECK: trunc.l.d $f23, $f23   # encoding: [0x46,0x20,0xbd,0xc9]
         trunc.l.s $f28,$f31            # CHECK: trunc.l.s $f28, $f31   # encoding: [0x46,0x00,0xff,0x09]
         trunc.w.d $f22,$f15            # CHECK: trunc.w.d $f22, $f15   # encoding: [0x46,0x20,0x7d,0x8d]
diff --git a/llvm/test/MC/Mips/mips5/valid.s b/llvm/test/MC/Mips/mips5/valid.s
index 0e049c4..ad58a15 100644
--- a/llvm/test/MC/Mips/mips5/valid.s
+++ b/llvm/test/MC/Mips/mips5/valid.s
@@ -1,6 +1,6 @@
 # Instructions that are valid
 #
-# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -show-inst -mcpu=mips5 | FileCheck %s
+# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -mcpu=mips5 | FileCheck %s
 a:
         .set noat
         abs.d     $f7,$f25             # CHECK: encoding:
@@ -296,63 +296,27 @@ a:
         syscall                        # CHECK: syscall                # encoding: [0x00,0x00,0x00,0x0c]
         syscall   256                  # CHECK: syscall 256            # encoding: [0x00,0x00,0x40,0x0c]
         teq       $0,$3                # CHECK: teq $zero, $3          # encoding: [0x00,0x03,0x00,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
         teq       $5,$7,620            # CHECK: teq $5, $7, 620        # encoding: [0x00,0xa7,0x9b,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
-        teqi      $s5,-17504           # CHECK: teqi  $21, -17504      # encoding: [0x06,0xac,0xbb,0xa0]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQI_MM
+        teqi      $s5,-17504
         tge       $7,$10               # CHECK: tge $7, $10            # encoding: [0x00,0xea,0x00,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
         tge       $5,$19,340           # CHECK: tge $5, $19, 340       # encoding: [0x00,0xb3,0x55,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
-        tgei      $s1,5025             # CHECK: tgei  $17, 5025        # encoding: [0x06,0x28,0x13,0xa1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEI_MM
-        tgeiu     $sp,-28621           # CHECK: tgeiu $sp, -28621      # encoding: [0x07,0xa9,0x90,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEIU_MM
+        tgei      $s1,5025
+        tgeiu     $sp,-28621
         tgeu      $22,$28              # CHECK: tgeu $22, $gp          # encoding: [0x02,0xdc,0x00,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tgeu      $20,$14,379          # CHECK: tgeu $20, $14, 379     # encoding: [0x02,0x8e,0x5e,0xf1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tlbp                           # CHECK: tlbp                   # encoding: [0x42,0x00,0x00,0x08]
         tlbr                           # CHECK: tlbr                   # encoding: [0x42,0x00,0x00,0x01]
         tlbwi                          # CHECK: tlbwi                  # encoding: [0x42,0x00,0x00,0x02]
         tlbwr                          # CHECK: tlbwr                  # encoding: [0x42,0x00,0x00,0x06]
         tlt       $15,$13              # CHECK: tlt $15, $13           # encoding: [0x01,0xed,0x00,0x32]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
         tlt       $2,$19,133           # CHECK: tlt $2, $19, 133       # encoding: [0x00,0x53,0x21,0x72]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
-        tlti      $14,-21059           # CHECK: tlti  $14, -21059      # encoding: [0x05,0xca,0xad,0xbd]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTI_MM
-        tltiu     $ra,-5076            # CHECK: tltiu $ra, -5076       # encoding: [0x07,0xeb,0xec,0x2c]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TTLTIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTIU_MM
+        tlti      $14,-21059
+        tltiu     $ra,-5076
         tltu      $11,$16              # CHECK: tltu $11, $16          # encoding: [0x01,0x70,0x00,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tltu      $16,$29,1016         # CHECK: tltu $16, $sp, 1016    # encoding: [0x02,0x1d,0xfe,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tne       $6,$17               # CHECK: tne $6, $17            # encoding: [0x00,0xd1,0x00,0x36]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
         tne       $7,$8,885            # CHECK: tne $7, $8, 885        # encoding: [0x00,0xe8,0xdd,0x76]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
-        tnei      $12,-29647           # CHECK: tnei  $12, -29647      # encoding: [0x05,0x8e,0x8c,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNEI_MM
+        tnei      $12,-29647
         trunc.l.d $f23,$f23            # CHECK: trunc.l.d $f23, $f23   # encoding: [0x46,0x20,0xbd,0xc9]
         trunc.l.s $f28,$f31            # CHECK: trunc.l.s $f28, $f31   # encoding: [0x46,0x00,0xff,0x09]
         trunc.w.d $f22,$f15            # CHECK: trunc.w.d $f22, $f15   # encoding: [0x46,0x20,0x7d,0x8d]
diff --git a/llvm/test/MC/Mips/mips64/valid.s b/llvm/test/MC/Mips/mips64/valid.s
index 2f852ce..d40b784 100644
--- a/llvm/test/MC/Mips/mips64/valid.s
+++ b/llvm/test/MC/Mips/mips64/valid.s
@@ -1,6 +1,6 @@
 # Instructions that are valid
 #
-# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -show-inst -mcpu=mips64 | FileCheck %s
+# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -mcpu=mips64 | FileCheck %s
 a:
         .set noat
         abs.d     $f7,$f25             # CHECK: encoding:
@@ -314,63 +314,27 @@ a:
         syscall                        # CHECK: syscall                # encoding: [0x00,0x00,0x00,0x0c]
         syscall   256                  # CHECK: syscall 256            # encoding: [0x00,0x00,0x40,0x0c]
         teq       $0,$3                # CHECK: teq $zero, $3          # encoding: [0x00,0x03,0x00,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
         teq       $5,$7,620            # CHECK: teq $5, $7, 620        # encoding: [0x00,0xa7,0x9b,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
-        teqi      $s5,-17504           # CHECK: teqi  $21, -17504      # encoding: [0x06,0xac,0xbb,0xa0]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQI_MM
+        teqi      $s5,-17504
         tge       $7,$10               # CHECK: tge $7, $10            # encoding: [0x00,0xea,0x00,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
         tge       $5,$19,340           # CHECK: tge $5, $19, 340       # encoding: [0x00,0xb3,0x55,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
-        tgei      $s1,5025             # CHECK: tgei  $17, 5025        # encoding: [0x06,0x28,0x13,0xa1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEI_MM
-        tgeiu     $sp,-28621           # CHECK: tgeiu $sp, -28621      # encoding: [0x07,0xa9,0x90,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEIU_MM
+        tgei      $s1,5025
+        tgeiu     $sp,-28621
         tgeu      $22,$28              # CHECK: tgeu $22, $gp          # encoding: [0x02,0xdc,0x00,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tgeu      $20,$14,379          # CHECK: tgeu $20, $14, 379     # encoding: [0x02,0x8e,0x5e,0xf1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tlbp                           # CHECK: tlbp                   # encoding: [0x42,0x00,0x00,0x08]
         tlbr                           # CHECK: tlbr                   # encoding: [0x42,0x00,0x00,0x01]
         tlbwi                          # CHECK: tlbwi                  # encoding: [0x42,0x00,0x00,0x02]
         tlbwr                          # CHECK: tlbwr                  # encoding: [0x42,0x00,0x00,0x06]
         tlt       $15,$13              # CHECK: tlt $15, $13           # encoding: [0x01,0xed,0x00,0x32]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
         tlt       $2,$19,133           # CHECK: tlt $2, $19, 133       # encoding: [0x00,0x53,0x21,0x72]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
-        tlti      $14,-21059           # CHECK: tlti  $14, -21059      # encoding: [0x05,0xca,0xad,0xbd]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTI_MM
-        tltiu     $ra,-5076            # CHECK: tltiu $ra, -5076       # encoding: [0x07,0xeb,0xec,0x2c]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TTLTIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTIU_MM
+        tlti      $14,-21059
+        tltiu     $ra,-5076
         tltu      $11,$16              # CHECK: tltu $11, $16          # encoding: [0x01,0x70,0x00,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tltu      $16,$29,1016         # CHECK: tltu $16, $sp, 1016    # encoding: [0x02,0x1d,0xfe,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tne       $6,$17               # CHECK: tne $6, $17            # encoding: [0x00,0xd1,0x00,0x36]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
         tne       $7,$8,885            # CHECK: tne $7, $8, 885        # encoding: [0x00,0xe8,0xdd,0x76]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
-        tnei      $12,-29647           # CHECK: tnei  $12, -29647      # encoding: [0x05,0x8e,0x8c,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNEI_MM
+        tnei      $12,-29647
         trunc.l.d $f23,$f23            # CHECK: trunc.l.d $f23, $f23   # encoding: [0x46,0x20,0xbd,0xc9]
         trunc.l.s $f28,$f31            # CHECK: trunc.l.s $f28, $f31   # encoding: [0x46,0x00,0xff,0x09]
         trunc.w.d $f22,$f15            # CHECK: trunc.w.d $f22, $f15   # encoding: [0x46,0x20,0x7d,0x8d]
diff --git a/llvm/test/MC/Mips/mips64r2/valid.s b/llvm/test/MC/Mips/mips64r2/valid.s
index 2147d21..eca641e 100644
--- a/llvm/test/MC/Mips/mips64r2/valid.s
+++ b/llvm/test/MC/Mips/mips64r2/valid.s
@@ -1,6 +1,6 @@
 # Instructions that are valid
 #
-# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -show-inst -mcpu=mips64r2 | FileCheck %s
+# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -mcpu=mips64r2 | FileCheck %s
 a:
         .set noat
         abs.d     $f7,$f25             # CHECK: encoding:
@@ -348,63 +348,27 @@ a:
         syscall                        # CHECK: syscall                # encoding: [0x00,0x00,0x00,0x0c]
         syscall   256                  # CHECK: syscall 256            # encoding: [0x00,0x00,0x40,0x0c]
         teq       $0,$3                # CHECK: teq $zero, $3          # encoding: [0x00,0x03,0x00,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
         teq       $5,$7,620            # CHECK: teq $5, $7, 620        # encoding: [0x00,0xa7,0x9b,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
-        teqi      $s5,-17504           # CHECK: teqi  $21, -17504      # encoding: [0x06,0xac,0xbb,0xa0]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQI_MM
+        teqi      $s5,-17504
         tge       $7,$10               # CHECK: tge $7, $10            # encoding: [0x00,0xea,0x00,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
         tge       $5,$19,340           # CHECK: tge $5, $19, 340       # encoding: [0x00,0xb3,0x55,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
-        tgei      $s1,5025             # CHECK: tgei  $17, 5025        # encoding: [0x06,0x28,0x13,0xa1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEI_MM
-        tgeiu     $sp,-28621           # CHECK: tgeiu $sp, -28621      # encoding: [0x07,0xa9,0x90,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEIU_MM
+        tgei      $s1,5025
+        tgeiu     $sp,-28621
         tgeu      $22,$28              # CHECK: tgeu $22, $gp          # encoding: [0x02,0xdc,0x00,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tgeu      $20,$14,379          # CHECK: tgeu $20, $14, 379     # encoding: [0x02,0x8e,0x5e,0xf1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tlbp                           # CHECK: tlbp                   # encoding: [0x42,0x00,0x00,0x08]
         tlbr                           # CHECK: tlbr                   # encoding: [0x42,0x00,0x00,0x01]
         tlbwi                          # CHECK: tlbwi                  # encoding: [0x42,0x00,0x00,0x02]
         tlbwr                          # CHECK: tlbwr                  # encoding: [0x42,0x00,0x00,0x06]
         tlt       $15,$13              # CHECK: tlt $15, $13           # encoding: [0x01,0xed,0x00,0x32]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
         tlt       $2,$19,133           # CHECK: tlt $2, $19, 133       # encoding: [0x00,0x53,0x21,0x72]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
-        tlti      $14,-21059           # CHECK: tlti  $14, -21059      # encoding: [0x05,0xca,0xad,0xbd]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTI_MM
-        tltiu     $ra,-5076            # CHECK: tltiu $ra, -5076       # encoding: [0x07,0xeb,0xec,0x2c]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TTLTIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTIU_MM
+        tlti      $14,-21059
+        tltiu     $ra,-5076
         tltu      $11,$16              # CHECK: tltu $11, $16          # encoding: [0x01,0x70,0x00,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tltu      $16,$29,1016         # CHECK: tltu $16, $sp, 1016    # encoding: [0x02,0x1d,0xfe,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tne       $6,$17               # CHECK: tne $6, $17            # encoding: [0x00,0xd1,0x00,0x36]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
         tne       $7,$8,885            # CHECK: tne $7, $8, 885        # encoding: [0x00,0xe8,0xdd,0x76]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
-        tnei      $12,-29647           # CHECK: tnei  $12, -29647      # encoding: [0x05,0x8e,0x8c,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNEI_MM
+        tnei      $12,-29647
         trunc.l.d $f23,$f23            # CHECK: trunc.l.d $f23, $f23   # encoding: [0x46,0x20,0xbd,0xc9]
         trunc.l.s $f28,$f31            # CHECK: trunc.l.s $f28, $f31   # encoding: [0x46,0x00,0xff,0x09]
         trunc.w.d $f22,$f15            # CHECK: trunc.w.d $f22, $f15   # encoding: [0x46,0x20,0x7d,0x8d]
diff --git a/llvm/test/MC/Mips/mips64r3/valid.s b/llvm/test/MC/Mips/mips64r3/valid.s
index 43ebcce..4bdef44 100644
--- a/llvm/test/MC/Mips/mips64r3/valid.s
+++ b/llvm/test/MC/Mips/mips64r3/valid.s
@@ -1,6 +1,6 @@
 # Instructions that are valid
 #
-# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -show-inst -mcpu=mips64r3 | FileCheck %s
+# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -mcpu=mips64r3 | FileCheck %s
 a:
         .set noat
         abs.d     $f7,$f25             # CHECK: encoding:
@@ -335,63 +335,27 @@ a:
         syscall                        # CHECK: syscall                # encoding: [0x00,0x00,0x00,0x0c]
         syscall   256                  # CHECK: syscall 256            # encoding: [0x00,0x00,0x40,0x0c]
         teq       $0,$3                # CHECK: teq $zero, $3          # encoding: [0x00,0x03,0x00,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
         teq       $5,$7,620            # CHECK: teq $5, $7, 620        # encoding: [0x00,0xa7,0x9b,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
-        teqi      $s5,-17504           # CHECK: teqi  $21, -17504      # encoding: [0x06,0xac,0xbb,0xa0]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQI_MM
+        teqi      $s5,-17504
         tge       $7,$10               # CHECK: tge $7, $10            # encoding: [0x00,0xea,0x00,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
         tge       $5,$19,340           # CHECK: tge $5, $19, 340       # encoding: [0x00,0xb3,0x55,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
-        tgei      $s1,5025             # CHECK: tgei  $17, 5025        # encoding: [0x06,0x28,0x13,0xa1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEI_MM
-        tgeiu     $sp,-28621           # CHECK: tgeiu $sp, -28621      # encoding: [0x07,0xa9,0x90,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEIU_MM
+        tgei      $s1,5025
+        tgeiu     $sp,-28621
         tgeu      $22,$28              # CHECK: tgeu $22, $gp          # encoding: [0x02,0xdc,0x00,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tgeu      $20,$14,379          # CHECK: tgeu $20, $14, 379     # encoding: [0x02,0x8e,0x5e,0xf1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tlbp                           # CHECK: tlbp                   # encoding: [0x42,0x00,0x00,0x08]
         tlbr                           # CHECK: tlbr                   # encoding: [0x42,0x00,0x00,0x01]
         tlbwi                          # CHECK: tlbwi                  # encoding: [0x42,0x00,0x00,0x02]
         tlbwr                          # CHECK: tlbwr                  # encoding: [0x42,0x00,0x00,0x06]
         tlt       $15,$13              # CHECK: tlt $15, $13           # encoding: [0x01,0xed,0x00,0x32]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
         tlt       $2,$19,133           # CHECK: tlt $2, $19, 133       # encoding: [0x00,0x53,0x21,0x72]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
-        tlti      $14,-21059           # CHECK: tlti  $14, -21059      # encoding: [0x05,0xca,0xad,0xbd]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTI_MM
-        tltiu     $ra,-5076            # CHECK: tltiu $ra, -5076       # encoding: [0x07,0xeb,0xec,0x2c]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TTLTIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTIU_MM
+        tlti      $14,-21059
+        tltiu     $ra,-5076
         tltu      $11,$16              # CHECK: tltu $11, $16          # encoding: [0x01,0x70,0x00,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tltu      $16,$29,1016         # CHECK: tltu $16, $sp, 1016    # encoding: [0x02,0x1d,0xfe,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tne       $6,$17               # CHECK: tne $6, $17            # encoding: [0x00,0xd1,0x00,0x36]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
         tne       $7,$8,885            # CHECK: tne $7, $8, 885        # encoding: [0x00,0xe8,0xdd,0x76]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
-        tnei      $12,-29647           # CHECK: tnei  $12, -29647      # encoding: [0x05,0x8e,0x8c,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNEI_MM
+        tnei      $12,-29647
         trunc.l.d $f23,$f23            # CHECK: trunc.l.d $f23, $f23   # encoding: [0x46,0x20,0xbd,0xc9]
         trunc.l.s $f28,$f31            # CHECK: trunc.l.s $f28, $f31   # encoding: [0x46,0x00,0xff,0x09]
         trunc.w.d $f22,$f15            # CHECK: trunc.w.d $f22, $f15   # encoding: [0x46,0x20,0x7d,0x8d]
diff --git a/llvm/test/MC/Mips/mips64r5/valid.s b/llvm/test/MC/Mips/mips64r5/valid.s
index 1a3733c..4215f67 100644
--- a/llvm/test/MC/Mips/mips64r5/valid.s
+++ b/llvm/test/MC/Mips/mips64r5/valid.s
@@ -1,6 +1,6 @@
 # Instructions that are valid
 #
-# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -show-inst -mcpu=mips64r5 | FileCheck %s
+# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -mcpu=mips64r5 | FileCheck %s
 a:
         .set noat
         abs.d     $f7,$f25             # CHECK: encoding:
@@ -343,63 +343,27 @@ a:
         syscall                        # CHECK: syscall                # encoding: [0x00,0x00,0x00,0x0c]
         syscall   256                  # CHECK: syscall 256            # encoding: [0x00,0x00,0x40,0x0c]
         teq       $0,$3                # CHECK: teq $zero, $3          # encoding: [0x00,0x03,0x00,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
         teq       $5,$7,620            # CHECK: teq $5, $7, 620        # encoding: [0x00,0xa7,0x9b,0x34]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
-        teqi      $s5,-17504           # CHECK: teqi  $21, -17504      # encoding: [0x06,0xac,0xbb,0xa0]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQI_MM
+        teqi      $s5,-17504
         tge       $7,$10               # CHECK: tge $7, $10            # encoding: [0x00,0xea,0x00,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
         tge       $5,$19,340           # CHECK: tge $5, $19, 340       # encoding: [0x00,0xb3,0x55,0x30]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
-        tgei      $s1,5025             # CHECK: tgei  $17, 5025        # encoding: [0x06,0x28,0x13,0xa1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEI_MM
-        tgeiu     $sp,-28621           # CHECK: tgeiu $sp, -28621      # encoding: [0x07,0xa9,0x90,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEIU_MM
+        tgei      $s1,5025
+        tgeiu     $sp,-28621
         tgeu      $22,$28              # CHECK: tgeu $22, $gp          # encoding: [0x02,0xdc,0x00,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tgeu      $20,$14,379          # CHECK: tgeu $20, $14, 379     # encoding: [0x02,0x8e,0x5e,0xf1]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
         tlbp                           # CHECK: tlbp                   # encoding: [0x42,0x00,0x00,0x08]
         tlbr                           # CHECK: tlbr                   # encoding: [0x42,0x00,0x00,0x01]
         tlbwi                          # CHECK: tlbwi                  # encoding: [0x42,0x00,0x00,0x02]
         tlbwr                          # CHECK: tlbwr                  # encoding: [0x42,0x00,0x00,0x06]
         tlt       $15,$13              # CHECK: tlt $15, $13           # encoding: [0x01,0xed,0x00,0x32]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
         tlt       $2,$19,133           # CHECK: tlt $2, $19, 133       # encoding: [0x00,0x53,0x21,0x72]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
-        tlti      $14,-21059           # CHECK: tlti  $14, -21059      # encoding: [0x05,0xca,0xad,0xbd]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTI_MM
-        tltiu     $ra,-5076            # CHECK: tltiu $ra, -5076       # encoding: [0x07,0xeb,0xec,0x2c]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TTLTIU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTIU_MM
+        tlti      $14,-21059
+        tltiu     $ra,-5076
         tltu      $11,$16              # CHECK: tltu $11, $16          # encoding: [0x01,0x70,0x00,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tltu      $16,$29,1016         # CHECK: tltu $16, $sp, 1016    # encoding: [0x02,0x1d,0xfe,0x33]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tne       $6,$17               # CHECK: tne $6, $17            # encoding: [0x00,0xd1,0x00,0x36]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
         tne       $7,$8,885            # CHECK: tne $7, $8, 885        # encoding: [0x00,0xe8,0xdd,0x76]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
-        tnei      $12,-29647           # CHECK: tnei  $12, -29647      # encoding: [0x05,0x8e,0x8c,0x31]
-                                       # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNEI
-                                       # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNEI_MM
+        tnei      $12,-29647
         trunc.l.d $f23,$f23            # CHECK: trunc.l.d $f23, $f23   # encoding: [0x46,0x20,0xbd,0xc9]
         trunc.l.s $f28,$f31            # CHECK: trunc.l.s $f28, $f31   # encoding: [0x46,0x00,0xff,0x09]
         trunc.w.d $f22,$f15            # CHECK: trunc.w.d $f22, $f15   # encoding: [0x46,0x20,0x7d,0x8d]
diff --git a/llvm/test/MC/Mips/mips64r6/valid.s b/llvm/test/MC/Mips/mips64r6/valid.s
index e824b21..2400713 100644
--- a/llvm/test/MC/Mips/mips64r6/valid.s
+++ b/llvm/test/MC/Mips/mips64r6/valid.s
@@ -10,7 +10,7 @@
 #   rs > rt
 # appropriately for each branch instruction
 #
-# RUN: llvm-mc %s -triple=mips-unknown-linux -show-encoding -show-inst -mcpu=mips64r6 2> %t0 | FileCheck %s
+# RUN: llvm-mc %s -triple=mips-unknown-linux -show-encoding -mcpu=mips64r6 2> %t0 | FileCheck %s
 # RUN: FileCheck %s -check-prefix=WARNING < %t0
 a:
         .set noat
@@ -251,41 +251,17 @@ a:
         syscall                  # CHECK: syscall                # encoding: [0x00,0x00,0x00,0x0c]
         syscall   256            # CHECK: syscall 256            # encoding: [0x00,0x00,0x40,0x0c]
         teq     $0,$3            # CHECK: teq $zero, $3          # encoding: [0x00,0x03,0x00,0x34]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
         teq     $5,$7,620        # CHECK: teq $5, $7, 620        # encoding: [0x00,0xa7,0x9b,0x34]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TEQ
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TEQ_MM
-        tge     $7,$10           # CHECK: tge $7, $10            # encoding: [0x00,0xea,0x00,0x30]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
         tge     $5,$19,340       # CHECK: tge $5, $19, 340       # encoding: [0x00,0xb3,0x55,0x30]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGE
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGE_MM
-        tgeu    $22,$28          # CHECK: tgeu $22, $gp          # encoding: [0x02,0xdc,0x00,0x31]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
+        tge     $7,$10           # CHECK: tge $7, $10            # encoding: [0x00,0xea,0x00,0x30]
         tgeu    $20,$14,379      # CHECK: tgeu $20, $14, 379     # encoding: [0x02,0x8e,0x5e,0xf1]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TGEU
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TGEU_MM
+        tgeu    $22,$28          # CHECK: tgeu $22, $gp          # encoding: [0x02,0xdc,0x00,0x31]
         tlt     $15,$13          # CHECK: tlt $15, $13           # encoding: [0x01,0xed,0x00,0x32]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
         tlt     $2,$19,133       # CHECK: tlt $2, $19, 133       # encoding: [0x00,0x53,0x21,0x72]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLT
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLT_MM
         tltu    $11,$16          # CHECK: tltu $11, $16          # encoding: [0x01,0x70,0x00,0x33]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tltu    $16,$29,1016     # CHECK: tltu $16, $sp, 1016    # encoding: [0x02,0x1d,0xfe,0x33]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TLTU
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TLTU_MM
         tne     $6,$17           # CHECK: tne $6, $17            # encoding: [0x00,0xd1,0x00,0x36]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
         tne     $7,$8,885        # CHECK: tne $7, $8, 885        # encoding: [0x00,0xe8,0xdd,0x76]
-                                 # CHECK-NEXT:                   # <MCInst #{{[0-9]+}} TNE
-                                 # CHECK-NOT:                    # <MCInst #{{[0-9]+}} TNE_MM
         xor     $2, 4            # CHECK: xori $2, $2, 4         # encoding: [0x38,0x42,0x00,0x04]
 
 1: