diff --git a/llvm/test/CodeGen/Mips/fp-maximumnum-minimumnum.ll b/llvm/test/CodeGen/Mips/fp-maximumnum-minimumnum.ll
index bc81966ca0f5c..3f8ff789d593d 100644
--- a/llvm/test/CodeGen/Mips/fp-maximumnum-minimumnum.ll
+++ b/llvm/test/CodeGen/Mips/fp-maximumnum-minimumnum.ll
@@ -1,5 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
 ; RUN: llc --mtriple=mipsisa32r6 < %s | FileCheck %s --check-prefix=MIPS32R6
+; RUN: llc --mtriple=mips64 < %s | FileCheck %s --check-prefix=MIPS64R2
 
 declare float @llvm.maximumnum.f32(float, float)
 declare double @llvm.maximumnum.f64(double, double)
@@ -13,6 +14,28 @@ define float @maximumnum_float(float %x, float %y) {
 ; MIPS32R6-NEXT:    min.s $f1, $f12, $f12
 ; MIPS32R6-NEXT:    jr $ra
 ; MIPS32R6-NEXT:    max.s $f0, $f1, $f0
+;
+; MIPS64R2-LABEL: maximumnum_float:
+; MIPS64R2:       # %bb.0:
+; MIPS64R2-NEXT:    c.un.s $f12, $f12
+; MIPS64R2-NEXT:    movt.s $f12, $f13, $fcc0
+; MIPS64R2-NEXT:    c.un.s $f13, $f13
+; MIPS64R2-NEXT:    movt.s $f13, $f12, $fcc0
+; MIPS64R2-NEXT:    c.ule.s $f12, $f13
+; MIPS64R2-NEXT:    mov.s $f0, $f13
+; MIPS64R2-NEXT:    movf.s $f0, $f12, $fcc0
+; MIPS64R2-NEXT:    add.s $f1, $f0, $f0
+; MIPS64R2-NEXT:    c.un.s $f0, $f0
+; MIPS64R2-NEXT:    movt.s $f0, $f1, $fcc0
+; MIPS64R2-NEXT:    mfc1 $1, $f12
+; MIPS64R2-NEXT:    mov.s $f1, $f0
+; MIPS64R2-NEXT:    movz.s $f1, $f12, $1
+; MIPS64R2-NEXT:    mfc1 $1, $f13
+; MIPS64R2-NEXT:    mtc1 $zero, $f2
+; MIPS64R2-NEXT:    movz.s $f1, $f13, $1
+; MIPS64R2-NEXT:    c.eq.s $f0, $f2
+; MIPS64R2-NEXT:    jr $ra
+; MIPS64R2-NEXT:    movt.s $f0, $f1, $fcc0
   %z = call float @llvm.maximumnum.f32(float %x, float %y)
   ret float %z
 }
@@ -24,6 +47,20 @@ define float @maximumnum_float_nsz(float %x, float %y) {
 ; MIPS32R6-NEXT:    min.s $f1, $f12, $f12
 ; MIPS32R6-NEXT:    jr $ra
 ; MIPS32R6-NEXT:    max.s $f0, $f1, $f0
+;
+; MIPS64R2-LABEL: maximumnum_float_nsz:
+; MIPS64R2:       # %bb.0:
+; MIPS64R2-NEXT:    mov.s $f0, $f13
+; MIPS64R2-NEXT:    c.un.s $f12, $f12
+; MIPS64R2-NEXT:    movt.s $f12, $f13, $fcc0
+; MIPS64R2-NEXT:    c.un.s $f13, $f13
+; MIPS64R2-NEXT:    movt.s $f0, $f12, $fcc0
+; MIPS64R2-NEXT:    c.ule.s $f12, $f0
+; MIPS64R2-NEXT:    movf.s $f0, $f12, $fcc0
+; MIPS64R2-NEXT:    add.s $f1, $f0, $f0
+; MIPS64R2-NEXT:    c.un.s $f0, $f0
+; MIPS64R2-NEXT:    jr $ra
+; MIPS64R2-NEXT:    movt.s $f0, $f1, $fcc0
   %z = call nsz float @llvm.maximumnum.f32(float %x, float %y)
   ret float %z
 }
@@ -33,6 +70,21 @@ define float @maximumnum_float_nnan(float %x, float %y) {
 ; MIPS32R6:       # %bb.0:
 ; MIPS32R6-NEXT:    jr $ra
 ; MIPS32R6-NEXT:    max.s $f0, $f12, $f14
+;
+; MIPS64R2-LABEL: maximumnum_float_nnan:
+; MIPS64R2:       # %bb.0:
+; MIPS64R2-NEXT:    c.ule.s $f12, $f13
+; MIPS64R2-NEXT:    mov.s $f0, $f13
+; MIPS64R2-NEXT:    movf.s $f0, $f12, $fcc0
+; MIPS64R2-NEXT:    mfc1 $1, $f12
+; MIPS64R2-NEXT:    mov.s $f1, $f0
+; MIPS64R2-NEXT:    movz.s $f1, $f12, $1
+; MIPS64R2-NEXT:    mfc1 $1, $f13
+; MIPS64R2-NEXT:    movz.s $f1, $f13, $1
+; MIPS64R2-NEXT:    mtc1 $zero, $f2
+; MIPS64R2-NEXT:    c.eq.s $f0, $f2
+; MIPS64R2-NEXT:    jr $ra
+; MIPS64R2-NEXT:    movt.s $f0, $f1, $fcc0
   %z = call nnan float @llvm.maximumnum.f32(float %x, float %y)
   ret float %z
 }
@@ -45,6 +97,28 @@ define double @maximumnum_double(double %x, double %y) {
 ; MIPS32R6-NEXT:    min.d $f1, $f12, $f12
 ; MIPS32R6-NEXT:    jr $ra
 ; MIPS32R6-NEXT:    max.d $f0, $f1, $f0
+;
+; MIPS64R2-LABEL: maximumnum_double:
+; MIPS64R2:       # %bb.0:
+; MIPS64R2-NEXT:    c.un.d $f12, $f12
+; MIPS64R2-NEXT:    movt.d $f12, $f13, $fcc0
+; MIPS64R2-NEXT:    c.un.d $f13, $f13
+; MIPS64R2-NEXT:    movt.d $f13, $f12, $fcc0
+; MIPS64R2-NEXT:    c.ule.d $f12, $f13
+; MIPS64R2-NEXT:    mov.d $f0, $f13
+; MIPS64R2-NEXT:    movf.d $f0, $f12, $fcc0
+; MIPS64R2-NEXT:    add.d $f1, $f0, $f0
+; MIPS64R2-NEXT:    c.un.d $f0, $f0
+; MIPS64R2-NEXT:    movt.d $f0, $f1, $fcc0
+; MIPS64R2-NEXT:    dmfc1 $1, $f12
+; MIPS64R2-NEXT:    mov.d $f1, $f0
+; MIPS64R2-NEXT:    movz.d $f1, $f12, $1
+; MIPS64R2-NEXT:    dmfc1 $1, $f13
+; MIPS64R2-NEXT:    movz.d $f1, $f13, $1
+; MIPS64R2-NEXT:    dmtc1 $zero, $f2
+; MIPS64R2-NEXT:    c.eq.d $f0, $f2
+; MIPS64R2-NEXT:    jr $ra
+; MIPS64R2-NEXT:    movt.d $f0, $f1, $fcc0
   %z = call double @llvm.maximumnum.f64(double %x, double %y)
   ret double %z
 }
@@ -56,6 +130,20 @@ define double @maximumnum_double_nsz(double %x, double %y) {
 ; MIPS32R6-NEXT:    min.d $f1, $f12, $f12
 ; MIPS32R6-NEXT:    jr $ra
 ; MIPS32R6-NEXT:    max.d $f0, $f1, $f0
+;
+; MIPS64R2-LABEL: maximumnum_double_nsz:
+; MIPS64R2:       # %bb.0:
+; MIPS64R2-NEXT:    mov.d $f0, $f13
+; MIPS64R2-NEXT:    c.un.d $f12, $f12
+; MIPS64R2-NEXT:    movt.d $f12, $f13, $fcc0
+; MIPS64R2-NEXT:    c.un.d $f13, $f13
+; MIPS64R2-NEXT:    movt.d $f0, $f12, $fcc0
+; MIPS64R2-NEXT:    c.ule.d $f12, $f0
+; MIPS64R2-NEXT:    movf.d $f0, $f12, $fcc0
+; MIPS64R2-NEXT:    add.d $f1, $f0, $f0
+; MIPS64R2-NEXT:    c.un.d $f0, $f0
+; MIPS64R2-NEXT:    jr $ra
+; MIPS64R2-NEXT:    movt.d $f0, $f1, $fcc0
   %z = call nsz double @llvm.maximumnum.f64(double %x, double %y)
   ret double %z
 }
@@ -65,6 +153,21 @@ define double @maximumnum_double_nnan(double %x, double %y) {
 ; MIPS32R6:       # %bb.0:
 ; MIPS32R6-NEXT:    jr $ra
 ; MIPS32R6-NEXT:    max.d $f0, $f12, $f14
+;
+; MIPS64R2-LABEL: maximumnum_double_nnan:
+; MIPS64R2:       # %bb.0:
+; MIPS64R2-NEXT:    c.ule.d $f12, $f13
+; MIPS64R2-NEXT:    mov.d $f0, $f13
+; MIPS64R2-NEXT:    movf.d $f0, $f12, $fcc0
+; MIPS64R2-NEXT:    dmfc1 $1, $f12
+; MIPS64R2-NEXT:    mov.d $f1, $f0
+; MIPS64R2-NEXT:    movz.d $f1, $f12, $1
+; MIPS64R2-NEXT:    dmfc1 $1, $f13
+; MIPS64R2-NEXT:    movz.d $f1, $f13, $1
+; MIPS64R2-NEXT:    dmtc1 $zero, $f2
+; MIPS64R2-NEXT:    c.eq.d $f0, $f2
+; MIPS64R2-NEXT:    jr $ra
+; MIPS64R2-NEXT:    movt.d $f0, $f1, $fcc0
   %z = call nnan double @llvm.maximumnum.f64(double %x, double %y)
   ret double %z
 }
@@ -76,6 +179,31 @@ define float @minimumnum_float(float %x, float %y) {
 ; MIPS32R6-NEXT:    min.s $f1, $f12, $f12
 ; MIPS32R6-NEXT:    jr $ra
 ; MIPS32R6-NEXT:    min.s $f0, $f1, $f0
+;
+; MIPS64R2-LABEL: minimumnum_float:
+; MIPS64R2:       # %bb.0:
+; MIPS64R2-NEXT:    c.un.s $f12, $f12
+; MIPS64R2-NEXT:    movt.s $f12, $f13, $fcc0
+; MIPS64R2-NEXT:    c.un.s $f13, $f13
+; MIPS64R2-NEXT:    movt.s $f13, $f12, $fcc0
+; MIPS64R2-NEXT:    c.olt.s $f12, $f13
+; MIPS64R2-NEXT:    mov.s $f0, $f13
+; MIPS64R2-NEXT:    movt.s $f0, $f12, $fcc0
+; MIPS64R2-NEXT:    add.s $f1, $f0, $f0
+; MIPS64R2-NEXT:    c.un.s $f0, $f0
+; MIPS64R2-NEXT:    movt.s $f0, $f1, $fcc0
+; MIPS64R2-NEXT:    mfc1 $1, $f12
+; MIPS64R2-NEXT:    lui $2, 32768
+; MIPS64R2-NEXT:    xor $1, $1, $2
+; MIPS64R2-NEXT:    mov.s $f1, $f0
+; MIPS64R2-NEXT:    movz.s $f1, $f12, $1
+; MIPS64R2-NEXT:    mfc1 $1, $f13
+; MIPS64R2-NEXT:    xor $1, $1, $2
+; MIPS64R2-NEXT:    mtc1 $zero, $f2
+; MIPS64R2-NEXT:    movz.s $f1, $f13, $1
+; MIPS64R2-NEXT:    c.eq.s $f0, $f2
+; MIPS64R2-NEXT:    jr $ra
+; MIPS64R2-NEXT:    movt.s $f0, $f1, $fcc0
   %z = call float @llvm.minimumnum.f32(float %x, float %y)
   ret float %z
 }
@@ -87,6 +215,20 @@ define float @minimumnum_float_nsz(float %x, float %y) {
 ; MIPS32R6-NEXT:    min.s $f1, $f12, $f12
 ; MIPS32R6-NEXT:    jr $ra
 ; MIPS32R6-NEXT:    min.s $f0, $f1, $f0
+;
+; MIPS64R2-LABEL: minimumnum_float_nsz:
+; MIPS64R2:       # %bb.0:
+; MIPS64R2-NEXT:    mov.s $f0, $f13
+; MIPS64R2-NEXT:    c.un.s $f12, $f12
+; MIPS64R2-NEXT:    movt.s $f12, $f13, $fcc0
+; MIPS64R2-NEXT:    c.un.s $f13, $f13
+; MIPS64R2-NEXT:    movt.s $f0, $f12, $fcc0
+; MIPS64R2-NEXT:    c.olt.s $f12, $f0
+; MIPS64R2-NEXT:    movt.s $f0, $f12, $fcc0
+; MIPS64R2-NEXT:    add.s $f1, $f0, $f0
+; MIPS64R2-NEXT:    c.un.s $f0, $f0
+; MIPS64R2-NEXT:    jr $ra
+; MIPS64R2-NEXT:    movt.s $f0, $f1, $fcc0
   %z = call nsz float @llvm.minimumnum.f32(float %x, float %y)
   ret float %z
 }
@@ -96,6 +238,24 @@ define float @minimumnum_float_nnan(float %x, float %y) {
 ; MIPS32R6:       # %bb.0:
 ; MIPS32R6-NEXT:    jr $ra
 ; MIPS32R6-NEXT:    min.s $f0, $f12, $f14
+;
+; MIPS64R2-LABEL: minimumnum_float_nnan:
+; MIPS64R2:       # %bb.0:
+; MIPS64R2-NEXT:    c.olt.s $f12, $f13
+; MIPS64R2-NEXT:    mov.s $f0, $f13
+; MIPS64R2-NEXT:    movt.s $f0, $f12, $fcc0
+; MIPS64R2-NEXT:    mfc1 $1, $f12
+; MIPS64R2-NEXT:    lui $2, 32768
+; MIPS64R2-NEXT:    xor $1, $1, $2
+; MIPS64R2-NEXT:    mov.s $f1, $f0
+; MIPS64R2-NEXT:    movz.s $f1, $f12, $1
+; MIPS64R2-NEXT:    mfc1 $1, $f13
+; MIPS64R2-NEXT:    xor $1, $1, $2
+; MIPS64R2-NEXT:    movz.s $f1, $f13, $1
+; MIPS64R2-NEXT:    mtc1 $zero, $f2
+; MIPS64R2-NEXT:    c.eq.s $f0, $f2
+; MIPS64R2-NEXT:    jr $ra
+; MIPS64R2-NEXT:    movt.s $f0, $f1, $fcc0
   %z = call nnan float @llvm.minimumnum.f32(float %x, float %y)
   ret float %z
 }
@@ -107,6 +267,32 @@ define double @minimumnum_double(double %x, double %y) {
 ; MIPS32R6-NEXT:    min.d $f1, $f12, $f12
 ; MIPS32R6-NEXT:    jr $ra
 ; MIPS32R6-NEXT:    min.d $f0, $f1, $f0
+;
+; MIPS64R2-LABEL: minimumnum_double:
+; MIPS64R2:       # %bb.0:
+; MIPS64R2-NEXT:    c.un.d $f12, $f12
+; MIPS64R2-NEXT:    movt.d $f12, $f13, $fcc0
+; MIPS64R2-NEXT:    c.un.d $f13, $f13
+; MIPS64R2-NEXT:    movt.d $f13, $f12, $fcc0
+; MIPS64R2-NEXT:    c.olt.d $f12, $f13
+; MIPS64R2-NEXT:    mov.d $f0, $f13
+; MIPS64R2-NEXT:    movt.d $f0, $f12, $fcc0
+; MIPS64R2-NEXT:    add.d $f1, $f0, $f0
+; MIPS64R2-NEXT:    c.un.d $f0, $f0
+; MIPS64R2-NEXT:    movt.d $f0, $f1, $fcc0
+; MIPS64R2-NEXT:    dmfc1 $1, $f12
+; MIPS64R2-NEXT:    daddiu $2, $zero, 1
+; MIPS64R2-NEXT:    dsll $2, $2, 63
+; MIPS64R2-NEXT:    xor $1, $1, $2
+; MIPS64R2-NEXT:    mov.d $f1, $f0
+; MIPS64R2-NEXT:    movz.d $f1, $f12, $1
+; MIPS64R2-NEXT:    dmfc1 $1, $f13
+; MIPS64R2-NEXT:    xor $1, $1, $2
+; MIPS64R2-NEXT:    movz.d $f1, $f13, $1
+; MIPS64R2-NEXT:    dmtc1 $zero, $f2
+; MIPS64R2-NEXT:    c.eq.d $f0, $f2
+; MIPS64R2-NEXT:    jr $ra
+; MIPS64R2-NEXT:    movt.d $f0, $f1, $fcc0
   %z = call double @llvm.minimumnum.f64(double %x, double %y)
   ret double %z
 }
@@ -118,6 +304,20 @@ define double @minimumnum_double_nsz(double %x, double %y) {
 ; MIPS32R6-NEXT:    min.d $f1, $f12, $f12
 ; MIPS32R6-NEXT:    jr $ra
 ; MIPS32R6-NEXT:    min.d $f0, $f1, $f0
+;
+; MIPS64R2-LABEL: minimumnum_double_nsz:
+; MIPS64R2:       # %bb.0:
+; MIPS64R2-NEXT:    mov.d $f0, $f13
+; MIPS64R2-NEXT:    c.un.d $f12, $f12
+; MIPS64R2-NEXT:    movt.d $f12, $f13, $fcc0
+; MIPS64R2-NEXT:    c.un.d $f13, $f13
+; MIPS64R2-NEXT:    movt.d $f0, $f12, $fcc0
+; MIPS64R2-NEXT:    c.olt.d $f12, $f0
+; MIPS64R2-NEXT:    movt.d $f0, $f12, $fcc0
+; MIPS64R2-NEXT:    add.d $f1, $f0, $f0
+; MIPS64R2-NEXT:    c.un.d $f0, $f0
+; MIPS64R2-NEXT:    jr $ra
+; MIPS64R2-NEXT:    movt.d $f0, $f1, $fcc0
   %z = call nsz double @llvm.minimumnum.f64(double %x, double %y)
   ret double %z
 }
@@ -127,6 +327,25 @@ define double @minimumnum_double_nnan(double %x, double %y) {
 ; MIPS32R6:       # %bb.0:
 ; MIPS32R6-NEXT:    jr $ra
 ; MIPS32R6-NEXT:    min.d $f0, $f12, $f14
+;
+; MIPS64R2-LABEL: minimumnum_double_nnan:
+; MIPS64R2:       # %bb.0:
+; MIPS64R2-NEXT:    c.olt.d $f12, $f13
+; MIPS64R2-NEXT:    mov.d $f0, $f13
+; MIPS64R2-NEXT:    movt.d $f0, $f12, $fcc0
+; MIPS64R2-NEXT:    daddiu $1, $zero, 1
+; MIPS64R2-NEXT:    dsll $1, $1, 63
+; MIPS64R2-NEXT:    dmfc1 $2, $f12
+; MIPS64R2-NEXT:    xor $2, $2, $1
+; MIPS64R2-NEXT:    mov.d $f1, $f0
+; MIPS64R2-NEXT:    movz.d $f1, $f12, $2
+; MIPS64R2-NEXT:    dmfc1 $2, $f13
+; MIPS64R2-NEXT:    xor $1, $2, $1
+; MIPS64R2-NEXT:    movz.d $f1, $f13, $1
+; MIPS64R2-NEXT:    dmtc1 $zero, $f2
+; MIPS64R2-NEXT:    c.eq.d $f0, $f2
+; MIPS64R2-NEXT:    jr $ra
+; MIPS64R2-NEXT:    movt.d $f0, $f1, $fcc0
   %z = call nnan double @llvm.minimumnum.f64(double %x, double %y)
   ret double %z
 }