Revert: r215698 - Current implementation of c.cond.fmt instructions only accept default cc0 register...

It causes a number of regressions when -fintegrated-as is enabled. This happens
because there are codegen-only instructions that incorrectly uses the first
operand as the encoding for the $fcc register. The regressions do not occur when
-via-file-asm is also given.

llvm-svn: 215847

12 files changed, 183 insertions, 183 deletions

diff --git a/llvm/test/MC/Mips/mips32/valid-xfail.s b/llvm/test/MC/Mips/mips32/valid-xfail.s
index e434231a0ba..d680740babf 100644
--- a/llvm/test/MC/Mips/mips32/valid-xfail.s
+++ b/llvm/test/MC/Mips/mips32/valid-xfail.s
@@ -7,4 +7,32 @@
 # XFAIL: *
 
         .set noat
+        c.eq.d          $fcc1,$f15,$f15
+        c.eq.s          $fcc5,$f24,$f17
+        c.f.d           $fcc4,$f11,$f21
+        c.f.s           $fcc4,$f30,$f7
+        c.le.d          $fcc4,$f18,$f1
+        c.le.s          $fcc6,$f24,$f4
+        c.lt.d          $fcc3,$f9,$f3
+        c.lt.s          $fcc2,$f17,$f14
+        c.nge.d         $fcc5,$f21,$f16
+        c.nge.s         $fcc3,$f11,$f8
+        c.ngl.s         $fcc2,$f31,$f23
+        c.ngle.s        $fcc2,$f18,$f23
+        c.ngt.d         $fcc4,$f24,$f7
+        c.ngt.s         $fcc5,$f8,$f13
+        c.ole.d         $fcc2,$f16,$f31
+        c.ole.s         $fcc3,$f7,$f20
+        c.olt.d         $fcc4,$f19,$f28
+        c.olt.s         $fcc6,$f20,$f7
+        c.seq.d         $fcc4,$f31,$f7
+        c.seq.s         $fcc7,$f1,$f25
+        c.ueq.d         $fcc4,$f13,$f25
+        c.ueq.s         $fcc6,$f3,$f30
+        c.ule.d         $fcc7,$f25,$f18
+        c.ule.s         $fcc7,$f21,$f30
+        c.ult.d         $fcc6,$f6,$f17
+        c.ult.s         $fcc7,$f24,$f10
+        c.un.d          $fcc6,$f23,$f24
+        c.un.s          $fcc1,$f30,$f4
         rorv            $13,$a3,$s5
diff --git a/llvm/test/MC/Mips/mips32/valid.s b/llvm/test/MC/Mips/mips32/valid.s
index 5a94a30130e..d330905ae29 100644
--- a/llvm/test/MC/Mips/mips32/valid.s
+++ b/llvm/test/MC/Mips/mips32/valid.s
@@ -28,34 +28,6 @@
         c.ngle.d  $f0,$f16
         c.sf.d    $f30,$f0
         c.sf.s    $f14,$f22
-        c.eq.d    $fcc1,$f15,$f15
-        c.eq.s    $fcc5,$f24,$f17
-        c.f.d     $fcc4,$f11,$f21
-        c.f.s     $fcc4,$f30,$f7
-        c.le.d    $fcc4,$f18,$f1
-        c.le.s    $fcc6,$f24,$f4
-        c.lt.d    $fcc3,$f9,$f3
-        c.lt.s    $fcc2,$f17,$f14
-        c.nge.d   $fcc5,$f21,$f16
-        c.nge.s   $fcc3,$f11,$f8
-        c.ngl.s   $fcc2,$f31,$f23
-        c.ngle.s  $fcc2,$f18,$f23
-        c.ngt.d   $fcc4,$f24,$f7
-        c.ngt.s   $fcc5,$f8,$f13
-        c.ole.d   $fcc2,$f16,$f31
-        c.ole.s   $fcc3,$f7,$f20
-        c.olt.d   $fcc4,$f19,$f28
-        c.olt.s   $fcc6,$f20,$f7
-        c.seq.d   $fcc4,$f31,$f7
-        c.seq.s   $fcc7,$f1,$f25
-        c.ueq.d   $fcc4,$f13,$f25
-        c.ueq.s   $fcc6,$f3,$f30
-        c.ule.d   $fcc7,$f25,$f18
-        c.ule.s   $fcc7,$f21,$f30
-        c.ult.d   $fcc6,$f6,$f17
-        c.ult.s   $fcc7,$f24,$f10
-        c.un.d    $fcc6,$f23,$f24
-        c.un.s    $fcc1,$f30,$f4
         ceil.w.d  $f11,$f25
         ceil.w.s  $f6,$f20
         cfc1      $s1,$21
diff --git a/llvm/test/MC/Mips/mips32r2/valid-xfail.s b/llvm/test/MC/Mips/mips32r2/valid-xfail.s
index c928f2c5307..ef02d51b53f 100644
--- a/llvm/test/MC/Mips/mips32r2/valid-xfail.s
+++ b/llvm/test/MC/Mips/mips32r2/valid-xfail.s
@@ -33,22 +33,50 @@
         bmnz.v          $w15,$w2,$w28
         bmz.v           $w13,$w11,$w21
         bsel.v          $w28,$w7,$w0
-        c.un.ps         $fcc4,$f2,$f26
-        c.ult.ps        $fcc7,$f14,$f0
-        c.ule.ps        $fcc6,$f17,$f3
-        c.ueq.ps        $fcc1,$f5,$f29
-        c.sf.ps         $fcc6,$f4,$f6
-        c.seq.ps        $fcc6,$f31,$f14
-        c.olt.ps        $fcc3,$f7,$f16
-        c.ole.ps        $fcc7,$f21,$f8
-        c.ngt.ps        $fcc5,$f30,$f6
-        c.ngle.ps       $fcc7,$f12,$f20
-        c.ngl.ps        $f21,$f30
-        c.nge.ps        $f1,$f26
-        c.lt.ps         $f19,$f5
-        c.le.ps         $fcc1,$f7,$f20
-        c.f.ps          $fcc6,$f11,$f11
+        c.eq.d          $fcc1,$f15,$f15
         c.eq.ps         $fcc5,$f0,$f9
+        c.eq.s          $fcc5,$f24,$f17
+        c.f.d           $fcc4,$f11,$f21
+        c.f.ps          $fcc6,$f11,$f11
+        c.f.s           $fcc4,$f30,$f7
+        c.le.d          $fcc4,$f18,$f1
+        c.le.ps         $fcc1,$f7,$f20
+        c.le.s          $fcc6,$f24,$f4
+        c.lt.d          $fcc3,$f9,$f3
+        c.lt.ps         $f19,$f5
+        c.lt.s          $fcc2,$f17,$f14
+        c.nge.d         $fcc5,$f21,$f16
+        c.nge.ps        $f1,$f26
+        c.nge.s         $fcc3,$f11,$f8
+        c.ngl.ps        $f21,$f30
+        c.ngl.s         $fcc2,$f31,$f23
+        c.ngle.ps       $fcc7,$f12,$f20
+        c.ngle.s        $fcc2,$f18,$f23
+        c.ngt.d         $fcc4,$f24,$f7
+        c.ngt.ps        $fcc5,$f30,$f6
+        c.ngt.s         $fcc5,$f8,$f13
+        c.ole.d         $fcc2,$f16,$f31
+        c.ole.ps        $fcc7,$f21,$f8
+        c.ole.s         $fcc3,$f7,$f20
+        c.olt.d         $fcc4,$f19,$f28
+        c.olt.ps        $fcc3,$f7,$f16
+        c.olt.s         $fcc6,$f20,$f7
+        c.seq.d         $fcc4,$f31,$f7
+        c.seq.ps        $fcc6,$f31,$f14
+        c.seq.s         $fcc7,$f1,$f25
+        c.sf.ps         $fcc6,$f4,$f6
+        c.ueq.d         $fcc4,$f13,$f25
+        c.ueq.ps        $fcc1,$f5,$f29
+        c.ueq.s         $fcc6,$f3,$f30
+        c.ule.d         $fcc7,$f25,$f18
+        c.ule.ps        $fcc6,$f17,$f3
+        c.ule.s         $fcc7,$f21,$f30
+        c.ult.d         $fcc6,$f6,$f17
+        c.ult.ps        $fcc7,$f14,$f0
+        c.ult.s         $fcc7,$f24,$f10
+        c.un.d          $fcc6,$f23,$f24
+        c.un.ps         $fcc4,$f2,$f26
+        c.un.s          $fcc1,$f30,$f4
         ceil.l.d        $f1,$f3
         ceil.l.s        $f18,$f13
         cfcmsa          $s6,$19
diff --git a/llvm/test/MC/Mips/mips32r2/valid.s b/llvm/test/MC/Mips/mips32r2/valid.s
index ec708c804b5..631c691ed71 100644
--- a/llvm/test/MC/Mips/mips32r2/valid.s
+++ b/llvm/test/MC/Mips/mips32r2/valid.s
@@ -28,34 +28,6 @@
         c.ngle.d  $f0,$f16
         c.sf.d    $f30,$f0
         c.sf.s    $f14,$f22
-        c.eq.d    $fcc1,$f15,$f15
-        c.eq.s    $fcc5,$f24,$f17
-        c.f.d     $fcc4,$f11,$f21
-        c.f.s     $fcc4,$f30,$f7
-        c.le.d    $fcc4,$f18,$f1
-        c.le.s    $fcc6,$f24,$f4
-        c.lt.d    $fcc3,$f9,$f3
-        c.lt.s    $fcc2,$f17,$f14
-        c.nge.d   $fcc5,$f21,$f16
-        c.nge.s   $fcc3,$f11,$f8
-        c.ngl.s   $fcc2,$f31,$f23
-        c.ngle.s  $fcc2,$f18,$f23
-        c.ngt.d   $fcc4,$f24,$f7
-        c.ngt.s   $fcc5,$f8,$f13
-        c.ole.d   $fcc2,$f16,$f31
-        c.ole.s   $fcc3,$f7,$f20
-        c.olt.d   $fcc4,$f19,$f28
-        c.olt.s   $fcc6,$f20,$f7
-        c.seq.d   $fcc4,$f31,$f7
-        c.seq.s   $fcc7,$f1,$f25
-        c.ueq.d   $fcc4,$f13,$f25
-        c.ueq.s   $fcc6,$f3,$f30
-        c.ule.d   $fcc7,$f25,$f18
-        c.ule.s   $fcc7,$f21,$f30
-        c.ult.d   $fcc6,$f6,$f17
-        c.ult.s   $fcc7,$f24,$f10
-        c.un.d    $fcc6,$f23,$f24
-        c.un.s    $fcc1,$f30,$f4
         ceil.w.d  $f11,$f25
         ceil.w.s  $f6,$f20
         cfc1      $s1,$21
diff --git a/llvm/test/MC/Mips/mips4/valid-xfail.s b/llvm/test/MC/Mips/mips4/valid-xfail.s
index 1dcf276457e..ff6f457ca83 100644
--- a/llvm/test/MC/Mips/mips4/valid-xfail.s
+++ b/llvm/test/MC/Mips/mips4/valid-xfail.s
@@ -7,6 +7,34 @@
 # XFAIL: *
 
         .set noat
+        c.eq.d          $fcc1,$f15,$f15
+        c.eq.s          $fcc5,$f24,$f17
+        c.f.d           $fcc4,$f11,$f21
+        c.f.s           $fcc4,$f30,$f7
+        c.le.d          $fcc4,$f18,$f1
+        c.le.s          $fcc6,$f24,$f4
+        c.lt.d          $fcc3,$f9,$f3
+        c.lt.s          $fcc2,$f17,$f14
+        c.nge.d         $fcc5,$f21,$f16
+        c.nge.s         $fcc3,$f11,$f8
+        c.ngl.s         $fcc2,$f31,$f23
+        c.ngle.s        $fcc2,$f18,$f23
+        c.ngt.d         $fcc4,$f24,$f7
+        c.ngt.s         $fcc5,$f8,$f13
+        c.ole.d         $fcc2,$f16,$f31
+        c.ole.s         $fcc3,$f7,$f20
+        c.olt.d         $fcc4,$f19,$f28
+        c.olt.s         $fcc6,$f20,$f7
+        c.seq.d         $fcc4,$f31,$f7
+        c.seq.s         $fcc7,$f1,$f25
+        c.ueq.d         $fcc4,$f13,$f25
+        c.ueq.s         $fcc6,$f3,$f30
+        c.ule.d         $fcc7,$f25,$f18
+        c.ule.s         $fcc7,$f21,$f30
+        c.ult.d         $fcc6,$f6,$f17
+        c.ult.s         $fcc7,$f24,$f10
+        c.un.d          $fcc6,$f23,$f24
+        c.un.s          $fcc1,$f30,$f4
         madd.d          $f18,$f19,$f26,$f20
         madd.s          $f1,$f31,$f19,$f25
         msub.d          $f10,$f1,$f31,$f18
diff --git a/llvm/test/MC/Mips/mips4/valid.s b/llvm/test/MC/Mips/mips4/valid.s
index 6bd294ef2fd..949b91da922 100644
--- a/llvm/test/MC/Mips/mips4/valid.s
+++ b/llvm/test/MC/Mips/mips4/valid.s
@@ -28,34 +28,6 @@
         c.ngle.d  $f0,$f16
         c.sf.d    $f30,$f0
         c.sf.s    $f14,$f22
-        c.eq.d    $fcc1,$f15,$f15
-        c.eq.s    $fcc5,$f24,$f17
-        c.f.d     $fcc4,$f11,$f21
-        c.f.s     $fcc4,$f30,$f7
-        c.le.d    $fcc4,$f18,$f1
-        c.le.s    $fcc6,$f24,$f4
-        c.lt.d    $fcc3,$f9,$f3
-        c.lt.s    $fcc2,$f17,$f14
-        c.nge.d   $fcc5,$f21,$f16
-        c.nge.s   $fcc3,$f11,$f8
-        c.ngl.s   $fcc2,$f31,$f23
-        c.ngle.s  $fcc2,$f18,$f23
-        c.ngt.d   $fcc4,$f24,$f7
-        c.ngt.s   $fcc5,$f8,$f13
-        c.ole.d   $fcc2,$f16,$f31
-        c.ole.s   $fcc3,$f7,$f20
-        c.olt.d   $fcc4,$f19,$f28
-        c.olt.s   $fcc6,$f20,$f7
-        c.seq.d   $fcc4,$f31,$f7
-        c.seq.s   $fcc7,$f1,$f25
-        c.ueq.d   $fcc4,$f13,$f25
-        c.ueq.s   $fcc6,$f3,$f30
-        c.ule.d   $fcc7,$f25,$f18
-        c.ule.s   $fcc7,$f21,$f30
-        c.ult.d   $fcc6,$f6,$f17
-        c.ult.s   $fcc7,$f24,$f10
-        c.un.d    $fcc6,$f23,$f24
-        c.un.s    $fcc1,$f30,$f4
         ceil.l.d  $f1,$f3
         ceil.l.s  $f18,$f13
         ceil.w.d  $f11,$f25
diff --git a/llvm/test/MC/Mips/mips5/valid-xfail.s b/llvm/test/MC/Mips/mips5/valid-xfail.s
index 2b60c6a4d25..8d1d0d78d0e 100644
--- a/llvm/test/MC/Mips/mips5/valid-xfail.s
+++ b/llvm/test/MC/Mips/mips5/valid-xfail.s
@@ -10,22 +10,50 @@
         abs.ps          $f22,$f8
         add.ps          $f25,$f27,$f13
         alnv.ps         $f12,$f18,$f30,$12
+        c.eq.d          $fcc1,$f15,$f15
         c.eq.ps         $fcc5,$f0,$f9
+        c.eq.s          $fcc5,$f24,$f17
+        c.f.d           $fcc4,$f11,$f21
         c.f.ps          $fcc6,$f11,$f11
+        c.f.s           $fcc4,$f30,$f7
+        c.le.d          $fcc4,$f18,$f1
         c.le.ps         $fcc1,$f7,$f20
+        c.le.s          $fcc6,$f24,$f4
+        c.lt.d          $fcc3,$f9,$f3
         c.lt.ps         $f19,$f5
+        c.lt.s          $fcc2,$f17,$f14
+        c.nge.d         $fcc5,$f21,$f16
         c.nge.ps        $f1,$f26
+        c.nge.s         $fcc3,$f11,$f8
         c.ngl.ps        $f21,$f30
+        c.ngl.s         $fcc2,$f31,$f23
         c.ngle.ps       $fcc7,$f12,$f20
+        c.ngle.s        $fcc2,$f18,$f23
+        c.ngt.d         $fcc4,$f24,$f7
         c.ngt.ps        $fcc5,$f30,$f6
+        c.ngt.s         $fcc5,$f8,$f13
+        c.ole.d         $fcc2,$f16,$f31
         c.ole.ps        $fcc7,$f21,$f8
+        c.ole.s         $fcc3,$f7,$f20
+        c.olt.d         $fcc4,$f19,$f28
         c.olt.ps        $fcc3,$f7,$f16
+        c.olt.s         $fcc6,$f20,$f7
+        c.seq.d         $fcc4,$f31,$f7
         c.seq.ps        $fcc6,$f31,$f14
+        c.seq.s         $fcc7,$f1,$f25
         c.sf.ps         $fcc6,$f4,$f6
+        c.ueq.d         $fcc4,$f13,$f25
         c.ueq.ps        $fcc1,$f5,$f29
+        c.ueq.s         $fcc6,$f3,$f30
+        c.ule.d         $fcc7,$f25,$f18
         c.ule.ps        $fcc6,$f17,$f3
+        c.ule.s         $fcc7,$f21,$f30
+        c.ult.d         $fcc6,$f6,$f17
         c.ult.ps        $fcc7,$f14,$f0
+        c.ult.s         $fcc7,$f24,$f10
+        c.un.d          $fcc6,$f23,$f24
         c.un.ps         $fcc4,$f2,$f26
+        c.un.s          $fcc1,$f30,$f4
         cvt.ps.s        $f3,$f18,$f19
         cvt.s.pl        $f30,$f1
         cvt.s.pu        $f14,$f25
diff --git a/llvm/test/MC/Mips/mips5/valid.s b/llvm/test/MC/Mips/mips5/valid.s
index 399cb9f04a6..3afdee1887c 100644
--- a/llvm/test/MC/Mips/mips5/valid.s
+++ b/llvm/test/MC/Mips/mips5/valid.s
@@ -28,34 +28,6 @@
         c.ngle.d  $f0,$f16
         c.sf.d    $f30,$f0
         c.sf.s    $f14,$f22
-        c.eq.d    $fcc1,$f15,$f15
-        c.eq.s    $fcc5,$f24,$f17
-        c.f.d     $fcc4,$f11,$f21
-        c.f.s     $fcc4,$f30,$f7
-        c.le.d    $fcc4,$f18,$f1
-        c.le.s    $fcc6,$f24,$f4
-        c.lt.d    $fcc3,$f9,$f3
-        c.lt.s    $fcc2,$f17,$f14
-        c.nge.d   $fcc5,$f21,$f16
-        c.nge.s   $fcc3,$f11,$f8
-        c.ngl.s   $fcc2,$f31,$f23
-        c.ngle.s  $fcc2,$f18,$f23
-        c.ngt.d   $fcc4,$f24,$f7
-        c.ngt.s   $fcc5,$f8,$f13
-        c.ole.d   $fcc2,$f16,$f31
-        c.ole.s   $fcc3,$f7,$f20
-        c.olt.d   $fcc4,$f19,$f28
-        c.olt.s   $fcc6,$f20,$f7
-        c.seq.d   $fcc4,$f31,$f7
-        c.seq.s   $fcc7,$f1,$f25
-        c.ueq.d   $fcc4,$f13,$f25
-        c.ueq.s   $fcc6,$f3,$f30
-        c.ule.d   $fcc7,$f25,$f18
-        c.ule.s   $fcc7,$f21,$f30
-        c.ult.d   $fcc6,$f6,$f17
-        c.ult.s   $fcc7,$f24,$f10
-        c.un.d    $fcc6,$f23,$f24
-        c.un.s    $fcc1,$f30,$f4
         ceil.l.d  $f1,$f3
         ceil.l.s  $f18,$f13
         ceil.w.d  $f11,$f25
diff --git a/llvm/test/MC/Mips/mips64/valid-xfail.s b/llvm/test/MC/Mips/mips64/valid-xfail.s
index 7be86e60ba9..e5455f5d03d 100644
--- a/llvm/test/MC/Mips/mips64/valid-xfail.s
+++ b/llvm/test/MC/Mips/mips64/valid-xfail.s
@@ -13,22 +13,50 @@
         alnv.ob         $v31,$v23,$v30,$at
         alnv.ob         $v8,$v17,$v30,$a1
         alnv.ps         $f12,$f18,$f30,$12
+        c.eq.d          $fcc1,$f15,$f15
         c.eq.ps         $fcc5,$f0,$f9
+        c.eq.s          $fcc5,$f24,$f17
+        c.f.d           $fcc4,$f11,$f21
         c.f.ps          $fcc6,$f11,$f11
+        c.f.s           $fcc4,$f30,$f7
+        c.le.d          $fcc4,$f18,$f1
         c.le.ps         $fcc1,$f7,$f20
+        c.le.s          $fcc6,$f24,$f4
+        c.lt.d          $fcc3,$f9,$f3
         c.lt.ps         $f19,$f5
+        c.lt.s          $fcc2,$f17,$f14
+        c.nge.d         $fcc5,$f21,$f16
         c.nge.ps        $f1,$f26
+        c.nge.s         $fcc3,$f11,$f8
         c.ngl.ps        $f21,$f30
+        c.ngl.s         $fcc2,$f31,$f23
         c.ngle.ps       $fcc7,$f12,$f20
+        c.ngle.s        $fcc2,$f18,$f23
+        c.ngt.d         $fcc4,$f24,$f7
         c.ngt.ps        $fcc5,$f30,$f6
+        c.ngt.s         $fcc5,$f8,$f13
+        c.ole.d         $fcc2,$f16,$f31
         c.ole.ps        $fcc7,$f21,$f8
+        c.ole.s         $fcc3,$f7,$f20
+        c.olt.d         $fcc4,$f19,$f28
         c.olt.ps        $fcc3,$f7,$f16
+        c.olt.s         $fcc6,$f20,$f7
+        c.seq.d         $fcc4,$f31,$f7
         c.seq.ps        $fcc6,$f31,$f14
+        c.seq.s         $fcc7,$f1,$f25
         c.sf.ps         $fcc6,$f4,$f6
+        c.ueq.d         $fcc4,$f13,$f25
         c.ueq.ps        $fcc1,$f5,$f29
+        c.ueq.s         $fcc6,$f3,$f30
+        c.ule.d         $fcc7,$f25,$f18
         c.ule.ps        $fcc6,$f17,$f3
+        c.ule.s         $fcc7,$f21,$f30
+        c.ult.d         $fcc6,$f6,$f17
         c.ult.ps        $fcc7,$f14,$f0
+        c.ult.s         $fcc7,$f24,$f10
+        c.un.d          $fcc6,$f23,$f24
         c.un.ps         $fcc4,$f2,$f26
+        c.un.s          $fcc1,$f30,$f4
         cvt.ps.s        $f3,$f18,$f19
         cvt.s.pl        $f30,$f1
         cvt.s.pu        $f14,$f25
diff --git a/llvm/test/MC/Mips/mips64/valid.s b/llvm/test/MC/Mips/mips64/valid.s
index 6120664e0df..1bd057d757d 100644
--- a/llvm/test/MC/Mips/mips64/valid.s
+++ b/llvm/test/MC/Mips/mips64/valid.s
@@ -28,34 +28,6 @@
         c.ngle.d  $f0,$f16
         c.sf.d    $f30,$f0
         c.sf.s    $f14,$f22
-        c.eq.d    $fcc1,$f15,$f15
-        c.eq.s    $fcc5,$f24,$f17
-        c.f.d     $fcc4,$f11,$f21
-        c.f.s     $fcc4,$f30,$f7
-        c.le.d    $fcc4,$f18,$f1
-        c.le.s    $fcc6,$f24,$f4
-        c.lt.d    $fcc3,$f9,$f3
-        c.lt.s    $fcc2,$f17,$f14
-        c.nge.d   $fcc5,$f21,$f16
-        c.nge.s   $fcc3,$f11,$f8
-        c.ngl.s   $fcc2,$f31,$f23
-        c.ngle.s  $fcc2,$f18,$f23
-        c.ngt.d   $fcc4,$f24,$f7
-        c.ngt.s   $fcc5,$f8,$f13
-        c.ole.d   $fcc2,$f16,$f31
-        c.ole.s   $fcc3,$f7,$f20
-        c.olt.d   $fcc4,$f19,$f28
-        c.olt.s   $fcc6,$f20,$f7
-        c.seq.d   $fcc4,$f31,$f7
-        c.seq.s   $fcc7,$f1,$f25
-        c.ueq.d   $fcc4,$f13,$f25
-        c.ueq.s   $fcc6,$f3,$f30
-        c.ule.d   $fcc7,$f25,$f18
-        c.ule.s   $fcc7,$f21,$f30
-        c.ult.d   $fcc6,$f6,$f17
-        c.ult.s   $fcc7,$f24,$f10
-        c.un.d    $fcc6,$f23,$f24
-        c.un.s    $fcc1,$f30,$f4
         ceil.l.d  $f1,$f3
         ceil.l.s  $f18,$f13
         ceil.w.d  $f11,$f25
diff --git a/llvm/test/MC/Mips/mips64r2/valid-xfail.s b/llvm/test/MC/Mips/mips64r2/valid-xfail.s
index 65f4bd8bc32..9ac47f63154 100644
--- a/llvm/test/MC/Mips/mips64r2/valid-xfail.s
+++ b/llvm/test/MC/Mips/mips64r2/valid-xfail.s
@@ -36,22 +36,50 @@
         bmnz.v          $w15,$w2,$w28
         bmz.v           $w13,$w11,$w21
         bsel.v          $w28,$w7,$w0
+        c.eq.d          $fcc1,$f15,$f15
         c.eq.ps         $fcc5,$f0,$f9
+        c.eq.s          $fcc5,$f24,$f17
+        c.f.d           $fcc4,$f11,$f21
         c.f.ps          $fcc6,$f11,$f11
+        c.f.s           $fcc4,$f30,$f7
+        c.le.d          $fcc4,$f18,$f1
         c.le.ps         $fcc1,$f7,$f20
+        c.le.s          $fcc6,$f24,$f4
+        c.lt.d          $fcc3,$f9,$f3
         c.lt.ps         $f19,$f5
+        c.lt.s          $fcc2,$f17,$f14
+        c.nge.d         $fcc5,$f21,$f16
         c.nge.ps        $f1,$f26
+        c.nge.s         $fcc3,$f11,$f8
         c.ngl.ps        $f21,$f30
+        c.ngl.s         $fcc2,$f31,$f23
         c.ngle.ps       $fcc7,$f12,$f20
+        c.ngle.s        $fcc2,$f18,$f23
+        c.ngt.d         $fcc4,$f24,$f7
         c.ngt.ps        $fcc5,$f30,$f6
+        c.ngt.s         $fcc5,$f8,$f13
+        c.ole.d         $fcc2,$f16,$f31
         c.ole.ps        $fcc7,$f21,$f8
+        c.ole.s         $fcc3,$f7,$f20
+        c.olt.d         $fcc4,$f19,$f28
         c.olt.ps        $fcc3,$f7,$f16
+        c.olt.s         $fcc6,$f20,$f7
+        c.seq.d         $fcc4,$f31,$f7
         c.seq.ps        $fcc6,$f31,$f14
+        c.seq.s         $fcc7,$f1,$f25
         c.sf.ps         $fcc6,$f4,$f6
+        c.ueq.d         $fcc4,$f13,$f25
         c.ueq.ps        $fcc1,$f5,$f29
+        c.ueq.s         $fcc6,$f3,$f30
+        c.ule.d         $fcc7,$f25,$f18
         c.ule.ps        $fcc6,$f17,$f3
+        c.ule.s         $fcc7,$f21,$f30
+        c.ult.d         $fcc6,$f6,$f17
         c.ult.ps        $fcc7,$f14,$f0
+        c.ult.s         $fcc7,$f24,$f10
+        c.un.d          $fcc6,$f23,$f24
         c.un.ps         $fcc4,$f2,$f26
+        c.un.s          $fcc1,$f30,$f4
         cvt.ps.s        $f3,$f18,$f19
         cmp.eq.ph       $s7,$14
         cmp.le.ph       $8,$14
diff --git a/llvm/test/MC/Mips/mips64r2/valid.s b/llvm/test/MC/Mips/mips64r2/valid.s
index 40f3bf42893..7a2244a6642 100644
--- a/llvm/test/MC/Mips/mips64r2/valid.s
+++ b/llvm/test/MC/Mips/mips64r2/valid.s
@@ -28,34 +28,6 @@
         c.ngle.d  $f0,$f16
         c.sf.d    $f30,$f0
         c.sf.s    $f14,$f22
-        c.eq.d    $fcc1,$f15,$f15
-        c.eq.s    $fcc5,$f24,$f17
-        c.f.d     $fcc4,$f11,$f21
-        c.f.s     $fcc4,$f30,$f7
-        c.le.d    $fcc4,$f18,$f1
-        c.le.s    $fcc6,$f24,$f4
-        c.lt.d    $fcc3,$f9,$f3
-        c.lt.s    $fcc2,$f17,$f14
-        c.nge.d   $fcc5,$f21,$f16
-        c.nge.s   $fcc3,$f11,$f8
-        c.ngl.s   $fcc2,$f31,$f23
-        c.ngle.s  $fcc2,$f18,$f23
-        c.ngt.d   $fcc4,$f24,$f7
-        c.ngt.s   $fcc5,$f8,$f13
-        c.ole.d   $fcc2,$f16,$f31
-        c.ole.s   $fcc3,$f7,$f20
-        c.olt.d   $fcc4,$f19,$f28
-        c.olt.s   $fcc6,$f20,$f7
-        c.seq.d   $fcc4,$f31,$f7
-        c.seq.s   $fcc7,$f1,$f25
-        c.ueq.d   $fcc4,$f13,$f25
-        c.ueq.s   $fcc6,$f3,$f30
-        c.ule.d   $fcc7,$f25,$f18
-        c.ule.s   $fcc7,$f21,$f30
-        c.ult.d   $fcc6,$f6,$f17
-        c.ult.s   $fcc7,$f24,$f10
-        c.un.d    $fcc6,$f23,$f24
-        c.un.s    $fcc1,$f30,$f4
         ceil.l.d  $f1,$f3
         ceil.l.s  $f18,$f13
         ceil.w.d  $f11,$f25