[mips] Remove -allow-deprecated-dag-overlap flag from tests. NFC

Fix DAG check statements in MIPS codegen tests to remove
-allow-deprecated-dag-overlap flag.

llvm-svn: 343730

8 files changed, 146 insertions, 127 deletions

diff --git a/llvm/test/CodeGen/Mips/bswap.ll b/llvm/test/CodeGen/Mips/bswap.ll
index 59486c606ad..0e8fd2ae4ff 100644
--- a/llvm/test/CodeGen/Mips/bswap.ll
+++ b/llvm/test/CodeGen/Mips/bswap.ll
@@ -1,7 +1,11 @@
-; RUN: llc  < %s -march=mipsel -mcpu=mips32r2 | FileCheck -allow-deprecated-dag-overlap %s -check-prefix=MIPS32
-; RUN: llc  < %s -mtriple=mipsel-mti-linux-gnu -mcpu=mips32r2 -mattr=+micromips | FileCheck -allow-deprecated-dag-overlap %s -check-prefix=MM
-; RUN: llc  < %s -march=mips64el -mcpu=mips64r2 | FileCheck -allow-deprecated-dag-overlap %s -check-prefix=MIPS64
-; RUN: llc  < %s -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips32r2 -mattr=+mips16 | FileCheck -allow-deprecated-dag-overlap %s -check-prefix=MIPS16
+; RUN: llc  < %s -march=mipsel -mcpu=mips32r2 \
+; RUN:   | FileCheck %s -check-prefix=MIPS32
+; RUN: llc  < %s -march=mipsel -mcpu=mips32r2 -mattr=+micromips \
+; RUN:   | FileCheck %s -check-prefix=MM
+; RUN: llc  < %s -march=mips64el -mcpu=mips64r2 \
+; RUN:   | FileCheck %s -check-prefix=MIPS64
+; RUN: llc  < %s -march=mipsel -mcpu=mips32r2 -mattr=+mips16 \
+; RUN:   | FileCheck %s -check-prefix=MIPS16
 
 define i32 @bswap32(i32 signext %x) nounwind readnone {
 entry:
@@ -68,10 +72,8 @@ entry:
 ; MIPS16-DAG: srl $[[R1:[0-9]+]], $4, 24
 ; MIPS16-DAG: sll $[[R2:[0-9]+]], $4, 8
 ; MIPS16-DAG: sll $[[R3:[0-9]+]], $4, 24
-; MIPS16-DAG: li  $[[R4:[0-9]+]], 65280
 ; MIPS16-DAG: and $[[R0]], $[[R4]]
 ; MIPS16-DAG: or  $[[R1]], $[[R0]]
-; MIPS16-DAG: lw  $[[R7:[0-9]+]], 1f
 ; MIPS16-DAG: and $[[R2]], $[[R7]]
 ; MIPS16-DAG: or  $[[R3]], $[[R2]]
 ; MIPS16-DAG: or  $[[R3]], $[[R1]]
diff --git a/llvm/test/CodeGen/Mips/cconv/arguments-hard-float-varargs.ll b/llvm/test/CodeGen/Mips/cconv/arguments-hard-float-varargs.ll
index 6b0af667ee4..ae1a6d54bb2 100644
--- a/llvm/test/CodeGen/Mips/cconv/arguments-hard-float-varargs.ll
+++ b/llvm/test/CodeGen/Mips/cconv/arguments-hard-float-varargs.ll
@@ -1,14 +1,22 @@
-; RUN: llc -march=mips -relocation-model=static < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,SYM32,O32,O32BE %s
-; RUN: llc -march=mipsel -relocation-model=static < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,SYM32,O32,O32LE %s
-
-; RUN-TODO: llc -march=mips64 -relocation-model=static -target-abi o32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32 %s
-; RUN-TODO: llc -march=mips64el -relocation-model=static -target-abi o32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32 %s
-
-; RUN: llc -march=mips64 -relocation-model=static -target-abi n32 < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,SYM32,N32,NEW,NEWBE %s
-; RUN: llc -march=mips64el -relocation-model=static -target-abi n32 < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,SYM32,N32,NEW,NEWLE %s
-
-; RUN: llc -march=mips64 -relocation-model=static -target-abi n64 < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,SYM64,N64,NEW,NEWBE %s
-; RUN: llc -march=mips64el -relocation-model=static -target-abi n64 < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,SYM64,N64,NEW,NEWLE %s
+; RUN: llc -march=mips -relocation-model=static < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,SYM32,O32,O32BE %s
+; RUN: llc -march=mipsel -relocation-model=static < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,SYM32,O32,O32LE %s
+
+; RUN-TODO: llc -march=mips64 -relocation-model=static -target-abi o32 < %s \
+; RUN-TODO:   | FileCheck --check-prefixes=ALL,SYM32,O32 %s
+; RUN-TODO: llc -march=mips64el -relocation-model=static -target-abi o32 < %s \
+; RUN-TODO:   | FileCheck --check-prefixes=ALL,SYM32,O32 %s
+
+; RUN: llc -march=mips64 -relocation-model=static -target-abi n32 < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,SYM32,N32,NEW,NEWBE %s
+; RUN: llc -march=mips64el -relocation-model=static -target-abi n32 < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,SYM32,N32,NEW,NEWLE %s
+
+; RUN: llc -march=mips64 -relocation-model=static -target-abi n64 < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,SYM64,N64,NEW,NEWBE %s
+; RUN: llc -march=mips64el -relocation-model=static -target-abi n64 < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,SYM64,N64,NEW,NEWLE %s
 
 ; Test the effect of varargs on floating point types in the non-variable part
 ; of the argument list as specified by section 2 of the MIPSpro N32 Handbook.
@@ -79,11 +87,8 @@ entry:
 ; LLVM will rebind the load to the stack pointer instead of the varargs pointer
 ; during lowering. This is fine and doesn't change the behaviour.
 ; O32-DAG:           addiu [[VAPTR]], [[VAPTR]], 8
-; O32-DAG:           sw [[VAPTR]], 4($sp)
 ; N32-DAG:           addiu [[VAPTR]], [[VAPTR]], 8
-; N32-DAG:           sw [[VAPTR]], 4($sp)
 ; N64-DAG:           daddiu [[VAPTR]], [[VAPTR]], 8
-; N64-DAG:           sd [[VAPTR]], 0($sp)
 ; O32-DAG:           ldc1 [[FTMP1:\$f[0-9]+]], 16($sp)
 ; NEW-DAG:           ldc1 [[FTMP1:\$f[0-9]+]], 8($sp)
 ; ALL-DAG:           sdc1 [[FTMP1]], 16([[R2]])
@@ -147,11 +152,8 @@ entry:
 ; correct half of the argument slot.
 ;
 ; O32-DAG:           addiu [[VAPTR]], [[VAPTR]], 4
-; O32-DAG:           sw [[VAPTR]], 4($sp)
 ; N32-DAG:           addiu [[VAPTR]], [[VAPTR]], 8
-; N32-DAG:           sw [[VAPTR]], 4($sp)
 ; N64-DAG:           daddiu [[VAPTR]], [[VAPTR]], 8
-; N64-DAG:           sd [[VAPTR]], 0($sp)
 ; O32-DAG:           lwc1 [[FTMP1:\$f[0-9]+]], 12($sp)
 ; NEWLE-DAG:         lwc1 [[FTMP1:\$f[0-9]+]], 8($sp)
 ; NEWBE-DAG:         lwc1 [[FTMP1:\$f[0-9]+]], 12($sp)
diff --git a/llvm/test/CodeGen/Mips/cconv/arguments-varargs.ll b/llvm/test/CodeGen/Mips/cconv/arguments-varargs.ll
index 591b37ec087..275f6afbf77 100644
--- a/llvm/test/CodeGen/Mips/cconv/arguments-varargs.ll
+++ b/llvm/test/CodeGen/Mips/cconv/arguments-varargs.ll
@@ -1,14 +1,22 @@
-; RUN: llc -mtriple=mips-linux -relocation-model=static < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,O32,O32-BE %s
-; RUN: llc -mtriple=mipsel-linux -relocation-model=static < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,O32,O32-LE %s
-
-; RUN-TODO: llc -march=mips64 -relocation-model=static -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s
-; RUN-TODO: llc -march=mips64el -relocation-model=static -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s
-
-; RUN: llc -mtriple=mips64-linux -relocation-model=static -target-abi n32 < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,NEW,N32,NEW-BE %s
-; RUN: llc -mtriple=mips64el-linux -relocation-model=static -target-abi n32 < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,NEW,N32,NEW-LE %s
-
-; RUN: llc -march=mips64 -relocation-model=static -target-abi n64 < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,NEW,N64,NEW-BE %s
-; RUN: llc -march=mips64el -relocation-model=static -target-abi n64 < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,NEW,N64,NEW-LE %s
+; RUN: llc -mtriple=mips-linux -relocation-model=static < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,O32,O32-BE %s
+; RUN: llc -mtriple=mipsel-linux -relocation-model=static < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,O32,O32-LE %s
+
+; RUN-TODO: llc -march=mips64 -relocation-model=static -target-abi o32 < %s \
+; RUN-TODO:   | FileCheck --check-prefixes=ALL,O32 %s
+; RUN-TODO: llc -march=mips64el -relocation-model=static -target-abi o32 < %s \
+; RUN-TODO:   | FileCheck --check-prefixes=ALL,O32 %s
+
+; RUN: llc -mtriple=mips64-linux -relocation-model=static -target-abi n32 < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,NEW,N32,NEW-BE %s
+; RUN: llc -mtriple=mips64el-linux -relocation-model=static -target-abi n32 < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,NEW,N32,NEW-LE %s
+
+; RUN: llc -march=mips64 -relocation-model=static -target-abi n64 < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,NEW,N64,NEW-BE %s
+; RUN: llc -march=mips64el -relocation-model=static -target-abi n64 < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,NEW,N64,NEW-LE %s
 
 @hwords = global [3 x i16] zeroinitializer, align 1
 @words  = global [3 x i32] zeroinitializer, align 1
@@ -52,9 +60,6 @@ entry:
 ; N64-DAG:       daddiu [[VA:\$[0-9]+]], [[SP]], 8
 ; N64-DAG:       sd [[VA]], 0([[SP]])
 
-; Store [[VA]]
-; O32-DAG:       sw [[VA]], 0([[SP]])
-
 ; ALL: teqi $zero, 1
 
 ; Increment [[VA]]
@@ -170,9 +175,6 @@ entry:
 ; N64-DAG:       daddiu [[VA:\$[0-9]+]], [[SP]], 8
 ; N64-DAG:       sd [[VA]], 0([[SP]])
 
-; Store [[VA]]
-; O32-DAG:       sw [[VA]], 0([[SP]])
-
 ; ALL: teqi $zero, 1
 
 ; Increment [[VA]]
@@ -288,9 +290,6 @@ entry:
 ; N64-DAG:       daddiu [[VA:\$[0-9]+]], [[SP]], 8
 ; N64-DAG:       sd [[VA]], 0([[SP]])
 
-; Store [[VA]]
-; O32-DAG:       sw [[VA]], 0([[SP]])
-
 ; ALL: teqi $zero, 1
 
 ; Increment [[VA]] (and realign pointer for O32)
@@ -413,9 +412,6 @@ entry:
 ; N64-DAG:       daddiu [[VA:\$[0-9]+]], [[SP]], 8
 ; N64-DAG:       sd [[VA]], 0([[SP]])
 
-; Store [[VA]]
-; O32-DAG:       sw [[VA]], 0([[SP]])
-
 ; ALL: teqi $zero, 1
 
 ; Increment [[VA]]
@@ -531,9 +527,6 @@ entry:
 ; N64-DAG:       daddiu [[VA:\$[0-9]+]], [[SP]], 8
 ; N64-DAG:       sd [[VA]], 0([[SP]])
 
-; Store [[VA]]
-; O32-DAG:       sw [[VA]], 0([[SP]])
-
 ; ALL: teqi $zero, 1
 
 ; Increment [[VA]]
@@ -649,9 +642,6 @@ entry:
 ; N64-DAG:       daddiu [[VA:\$[0-9]+]], [[SP]], 8
 ; N64-DAG:       sd [[VA]], 0([[SP]])
 
-; Store [[VA]]
-; O32-DAG:       sw [[VA]], 0([[SP]])
-
 ; ALL: teqi $zero, 1
 
 ; Increment [[VA]] (and realign pointer for O32)
@@ -773,9 +763,6 @@ entry:
 ; N64-DAG:       daddiu [[VA:\$[0-9]+]], [[SP]], 8
 ; N64-DAG:       sd [[VA]], 0([[SP]])
 
-; Store [[VA]]
-; O32-DAG:       sw [[VA]], 0([[SP]])
-
 ; ALL: teqi $zero, 1
 
 ; Increment [[VA]]
@@ -890,9 +877,6 @@ entry:
 ; N64-DAG:       daddiu [[VA:\$[0-9]+]], [[SP]], 8
 ; N64-DAG:       sd [[VA]], 0([[SP]])
 
-; Store [[VA]]
-; O32-DAG:       sw [[VA]], 0([[SP]])
-
 ; ALL: teqi $zero, 1
 
 ; Increment [[VA]]
@@ -1007,9 +991,6 @@ entry:
 ; N64-DAG:       daddiu [[VA:\$[0-9]+]], [[SP]], 8
 ; N64-DAG:       sd [[VA]], 0([[SP]])
 
-; Store [[VA]]
-; O32-DAG:       sw [[VA]], 0([[SP]])
-
 ; ALL: teqi $zero, 1
 
 ; Increment [[VA]] (and realign pointer for O32)
diff --git a/llvm/test/CodeGen/Mips/cconv/callee-saved.ll b/llvm/test/CodeGen/Mips/cconv/callee-saved.ll
index 93acbe41e42..8cfd1397ed9 100644
--- a/llvm/test/CodeGen/Mips/cconv/callee-saved.ll
+++ b/llvm/test/CodeGen/Mips/cconv/callee-saved.ll
@@ -1,22 +1,34 @@
-; RUN: llc -march=mips < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,O32 %s
-; RUN: llc -march=mipsel < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,O32 %s
-; RUN: llc -march=mips < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,O32-INV %s
-; RUN: llc -march=mipsel < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,O32-INV %s
+; RUN: llc -march=mips   < %s | FileCheck --check-prefixes=ALL,O32 %s
+; RUN: llc -march=mipsel < %s | FileCheck --check-prefixes=ALL,O32 %s
+; RUN: llc -march=mips   < %s | FileCheck --check-prefixes=ALL,O32-INV %s
+; RUN: llc -march=mipsel < %s | FileCheck --check-prefixes=ALL,O32-INV %s
 
-; RUN-TODO: llc -march=mips64 -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s
-; RUN-TODO: llc -march=mips64el -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s
-; RUN-TODO: llc -march=mips64 -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32-INV %s
-; RUN-TODO: llc -march=mips64el -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32-INV %s
+; RUN-TODO: llc -march=mips64 -target-abi o32 < %s \
+; RUN-TODO:   | FileCheck --check-prefixes=ALL,O32 %s
+; RUN-TODO: llc -march=mips64el -target-abi o32 < %s \
+; RUN-TODO:   | FileCheck --check-prefixes=ALL,O32 %s
+; RUN-TODO: llc -march=mips64 -target-abi o32 < %s \
+; RUN-TODO:   | FileCheck --check-prefixes=ALL,O32-INV %s
+; RUN-TODO: llc -march=mips64el -target-abi o32 < %s \
+; RUN-TODO:   | FileCheck --check-prefixes=ALL,O32-INV %s
 
-; RUN: llc -march=mips64 -target-abi n32 < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,N32 %s
-; RUN: llc -march=mips64el -target-abi n32 < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,N32 %s
-; RUN: llc -march=mips64 -target-abi n32 < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,N32-INV %s
-; RUN: llc -march=mips64el -target-abi n32 < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,N32-INV %s
+; RUN: llc -march=mips64 -target-abi n32 < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,N32 %s
+; RUN: llc -march=mips64el -target-abi n32 < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,N32 %s
+; RUN: llc -march=mips64 -target-abi n32 < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,N32-INV %s
+; RUN: llc -march=mips64el -target-abi n32 < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,N32-INV %s
 
-; RUN: llc -march=mips64 -target-abi n64 < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,N64 %s
-; RUN: llc -march=mips64el -target-abi n64 < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,N64 %s
-; RUN: llc -march=mips64 -target-abi n64 < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,N64-INV %s
-; RUN: llc -march=mips64el -target-abi n64 < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,N64-INV %s
+; RUN: llc -march=mips64 -target-abi n64 < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,N64 %s
+; RUN: llc -march=mips64el -target-abi n64 < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,N64 %s
+; RUN: llc -march=mips64 -target-abi n64 < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,N64-INV %s
+; RUN: llc -march=mips64el -target-abi n64 < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,N64-INV %s
 
 ; Test the callee-saved registers are callee-saved as specified by section
 ; 2 of the MIPSpro N32 Handbook and section 3 of the SYSV ABI spec.
@@ -61,7 +73,7 @@ entry:
 ; O32-INV-NOT:   sw $28,
 ; O32-INV-NOT:   sw $29,
 ; O32-DAG:       sw [[G30:\$fp]], [[OFF30:[0-9]+]]($sp)
-; O32-DAG:       sw [[G31:\$fp]], [[OFF31:[0-9]+]]($sp)
+; O32-DAG:       sw [[G31:\$ra]], [[OFF31:[0-9]+]]($sp)
 ; O32-DAG:       lw [[G16]], [[OFF16]]($sp)
 ; O32-DAG:       lw [[G17]], [[OFF17]]($sp)
 ; O32-DAG:       lw [[G18]], [[OFF18]]($sp)
@@ -106,7 +118,7 @@ entry:
 ; N32-DAG:       sd [[G28:\$gp]], [[OFF28:[0-9]+]]($sp)
 ; N32-INV-NOT:   sd $29,
 ; N32-DAG:       sd [[G30:\$fp]], [[OFF30:[0-9]+]]($sp)
-; N32-DAG:       sd [[G31:\$fp]], [[OFF31:[0-9]+]]($sp)
+; N32-DAG:       sd [[G31:\$ra]], [[OFF31:[0-9]+]]($sp)
 ; N32-DAG:       ld [[G16]], [[OFF16]]($sp)
 ; N32-DAG:       ld [[G17]], [[OFF17]]($sp)
 ; N32-DAG:       ld [[G18]], [[OFF18]]($sp)
@@ -146,7 +158,7 @@ entry:
 ; N64-DAG:       sd [[G22:\$22]], [[OFF22:[0-9]+]]($sp)
 ; N64-DAG:       sd [[G23:\$23]], [[OFF23:[0-9]+]]($sp)
 ; N64-DAG:       sd [[G30:\$fp]], [[OFF30:[0-9]+]]($sp)
-; N64-DAG:       sd [[G31:\$fp]], [[OFF31:[0-9]+]]($sp)
+; N64-DAG:       sd [[G31:\$ra]], [[OFF31:[0-9]+]]($sp)
 ; N64-INV-NOT:   sd $24,
 ; N64-INV-NOT:   sd $25,
 ; N64-INV-NOT:   sd $26,
diff --git a/llvm/test/CodeGen/Mips/cconv/return-struct.ll b/llvm/test/CodeGen/Mips/cconv/return-struct.ll
index ad0cad00f44..83cf14fecee 100644
--- a/llvm/test/CodeGen/Mips/cconv/return-struct.ll
+++ b/llvm/test/CodeGen/Mips/cconv/return-struct.ll
@@ -1,14 +1,22 @@
-; RUN: llc -mtriple=mips-linux-gnu -relocation-model=static < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,O32,O32-BE %s
-; RUN: llc -mtriple=mipsel-linux-gnu -relocation-model=static < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,O32,O32-LE %s
-
-; RUN-TODO: llc -mtriple=mips64-linux-gnu -relocation-model=static -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s
-; RUN-TODO: llc -mtriple=mips64el-linux-gnu -relocation-model=static -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s
-
-; RUN: llc -mtriple=mips64-linux-gnu -relocation-model=static -target-abi n32 < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,N32,N32-BE %s
-; RUN: llc -mtriple=mips64el-linux-gnu -relocation-model=static -target-abi n32 < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,N32,N32-LE %s
-
-; RUN: llc -mtriple=mips64-linux-gnu -relocation-model=static -target-abi n64 < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,N64,N64-BE %s
-; RUN: llc -mtriple=mips64el-linux-gnu -relocation-model=static -target-abi n64 < %s | FileCheck -allow-deprecated-dag-overlap --check-prefixes=ALL,N64,N64-LE %s
+; RUN: llc -mtriple=mips-linux-gnu -relocation-model=static < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,O32,O32-BE %s
+; RUN: llc -mtriple=mipsel-linux-gnu -relocation-model=static < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,O32,O32-LE %s
+
+; RUN-TODO: llc -mtriple=mips64-linux-gnu -relocation-model=static -target-abi o32 < %s \
+; RUN-TODO:   | FileCheck --check-prefixes=ALL,O32 %s
+; RUN-TODO: llc -mtriple=mips64el-linux-gnu -relocation-model=static -target-abi o32 < %s \
+; RUN-TODO:   | FileCheck --check-prefixes=ALL,O32 %s
+
+; RUN: llc -mtriple=mips64-linux-gnu -relocation-model=static -target-abi n32 < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,N32,N32-BE %s
+; RUN: llc -mtriple=mips64el-linux-gnu -relocation-model=static -target-abi n32 < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,N32,N32-LE %s
+
+; RUN: llc -mtriple=mips64-linux-gnu -relocation-model=static -target-abi n64 < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,N64,N64-BE %s
+; RUN: llc -mtriple=mips64el-linux-gnu -relocation-model=static -target-abi n64 < %s \
+; RUN:   | FileCheck --check-prefixes=ALL,N64,N64-LE %s
 
 ; Test struct returns for all ABI's and byte orders.
 
@@ -137,7 +145,7 @@ entry:
 ; N64-BE-DAG:        dsll [[R2:\$[0-9]+]], [[R1]], 16
 ; N64-BE-DAG:        lhu [[R3:\$[0-9]+]], 4([[PTR]])
 ; N64-BE-DAG:        or [[R4:\$[0-9]+]], [[R3]], [[R2]]
-; N32-BE-DAG:        dsll $2, [[R4]], 16
+; N64-BE-DAG:        dsll $2, [[R4]], 16
 
 ; Ensure that large structures (>128-bit) are returned indirectly.
 ; We pick an extremely large structure so we don't have to match inlined memcpy's.
diff --git a/llvm/test/CodeGen/Mips/madd-msub.ll b/llvm/test/CodeGen/Mips/madd-msub.ll
index 776491973cb..c5f7af1de20 100644
--- a/llvm/test/CodeGen/Mips/madd-msub.ll
+++ b/llvm/test/CodeGen/Mips/madd-msub.ll
@@ -1,10 +1,17 @@
-; RUN: llc -march=mips -mcpu=mips32   < %s | FileCheck -allow-deprecated-dag-overlap %s -check-prefixes=ALL,32
-; RUN: llc -march=mips -mcpu=mips32r2 < %s | FileCheck -allow-deprecated-dag-overlap %s -check-prefixes=ALL,32
-; RUN: llc -march=mips -mcpu=mips32r6 < %s | FileCheck -allow-deprecated-dag-overlap %s -check-prefixes=ALL,32R6
-; RUN: llc -march=mips -mcpu=mips32 -mattr=dsp < %s | FileCheck -allow-deprecated-dag-overlap %s -check-prefix=DSP
-; RUN: llc -march=mips -mcpu=mips64   -target-abi n64 < %s | FileCheck -allow-deprecated-dag-overlap %s -check-prefixes=ALL,64
-; RUN: llc -march=mips -mcpu=mips64r2 -target-abi n64 < %s | FileCheck -allow-deprecated-dag-overlap %s -check-prefixes=ALL,64
-; RUN: llc -march=mips -mcpu=mips64r6 -target-abi n64 < %s | FileCheck -allow-deprecated-dag-overlap %s -check-prefixes=ALL,64R6
+; RUN: llc -march=mips -mcpu=mips32 < %s \
+; RUN:   | FileCheck %s -check-prefixes=ALL,32
+; RUN: llc -march=mips -mcpu=mips32r2 < %s \
+; RUN:   | FileCheck %s -check-prefixes=ALL,32
+; RUN: llc -march=mips -mcpu=mips32r6 < %s \
+; RUN:   | FileCheck %s -check-prefixes=ALL,32R6
+; RUN: llc -march=mips -mcpu=mips32r2 -mattr=dsp < %s \
+; RUN:   | FileCheck %s -check-prefix=DSP
+; RUN: llc -march=mips -mcpu=mips64   -target-abi n64 < %s \
+; RUN:   | FileCheck %s -check-prefixes=ALL,64
+; RUN: llc -march=mips -mcpu=mips64r2 -target-abi n64 < %s \
+; RUN:   | FileCheck %s -check-prefixes=ALL,64
+; RUN: llc -march=mips -mcpu=mips64r6 -target-abi n64 < %s \
+; RUN:   | FileCheck %s -check-prefixes=ALL,64R6
 
 ; FIXME: The MIPS16 test should check its output
 ; RUN: llc -march=mips -mattr=mips16 < %s
@@ -238,8 +245,8 @@ entry:
 ; 32-DAG:        [[m]]fhi $2
 ; 32-DAG:        [[m]]flo $3
 
-; DSP-DAG:       addiu $[[T0:[0-9]+]], $zero, 0
-; DSP-DAG:       mtlo $6, $[[AC:ac[0-3]+]]
+; DSP-DAG:       mtlo $7, $[[AC:ac[0-3]+]]
+; DSP-DAG:       mthi $6, $[[AC]]
 ; DSP-DAG:       msub $[[AC]], ${{[45]}}, ${{[45]}}
 ; DSP-DAG:       mfhi $2, $[[AC]]
 ; DSP-DAG:       mflo $3, $[[AC]]
diff --git a/llvm/test/CodeGen/Mips/msa/basic_operations.ll b/llvm/test/CodeGen/Mips/msa/basic_operations.ll
index 82c2e17a550..c1bbb98a491 100644
--- a/llvm/test/CodeGen/Mips/msa/basic_operations.ll
+++ b/llvm/test/CodeGen/Mips/msa/basic_operations.ll
@@ -1,21 +1,21 @@
-; RUN: llc -march=mips -mattr=+msa,+fp64 -relocation-model=pic \
-; RUN:   -verify-machineinstrs < %s | \
-; RUN:   FileCheck -allow-deprecated-dag-overlap -check-prefixes=ALL,O32,MIPS32,ALL-BE,O32-BE %s
-; RUN: llc -march=mipsel -mattr=+msa,+fp64 -relocation-model=pic \
-; RUN:   -verify-machineinstrs < %s | \
-; RUN:   FileCheck -allow-deprecated-dag-overlap -check-prefixes=ALL,O32,MIPS32,ALL-LE,O32-LE %s
-; RUN: llc -march=mips64 -target-abi n32 -mattr=+msa,+fp64 \
-; RUN:   -relocation-model=pic -verify-machineinstrs < %s | \
-; RUN:   FileCheck -allow-deprecated-dag-overlap -check-prefixes=ALL,N32,MIPS64,ALL-BE %s
-; RUN: llc -march=mips64el -target-abi n32 -mattr=+msa,+fp64 \
-; RUN:   -relocation-model=pic -verify-machineinstrs < %s | \
-; RUN:   FileCheck -allow-deprecated-dag-overlap -check-prefixes=ALL,N32,MIPS64,ALL-LE %s
-; RUN: llc -march=mips64 -mattr=+msa,+fp64 -relocation-model=pic \
-; RUN:   -verify-machineinstrs < %s | \
-; RUN:   FileCheck -allow-deprecated-dag-overlap -check-prefixes=ALL,N64,MIPS64,ALL-BE %s
-; RUN: llc -march=mips64el -mattr=+msa,+fp64 -relocation-model=pic \
-; RUN:   -verify-machineinstrs < %s | \
-; RUN:   FileCheck -allow-deprecated-dag-overlap -check-prefixes=ALL,N64,MIPS64,ALL-LE %s
+; RUN: llc -march=mips -mcpu=mips32r5 -mattr=+msa,+fp64 -relocation-model=pic \
+; RUN:   -verify-machineinstrs < %s \
+; RUN:   | FileCheck -check-prefixes=ALL,O32,MIPS32,ALL-BE,O32-BE %s
+; RUN: llc -march=mipsel -mcpu=mips32r5 -mattr=+msa,+fp64 -relocation-model=pic \
+; RUN:   -verify-machineinstrs < %s \
+; RUN:   | FileCheck -check-prefixes=ALL,O32,MIPS32,ALL-LE,O32-LE %s
+; RUN: llc -march=mips64 -mcpu=mips64r5 -target-abi n32 -mattr=+msa,+fp64 \
+; RUN:   -relocation-model=pic -verify-machineinstrs < %s \
+; RUN:   | FileCheck -check-prefixes=ALL,N32,MIPS64,ALL-BE %s
+; RUN: llc -march=mips64el -mcpu=mips64r5 -target-abi n32 -mattr=+msa,+fp64 \
+; RUN:   -relocation-model=pic -verify-machineinstrs < %s \
+; RUN:   | FileCheck -check-prefixes=ALL,N32,MIPS64,ALL-LE %s
+; RUN: llc -march=mips64 -mcpu=mips64r5 -mattr=+msa,+fp64 -relocation-model=pic \
+; RUN:   -verify-machineinstrs < %s \
+; RUN:   | FileCheck -check-prefixes=ALL,N64,MIPS64,ALL-BE %s
+; RUN: llc -march=mips64el -mcpu=mips64r5 -mattr=+msa,+fp64 -relocation-model=pic \
+; RUN:   -verify-machineinstrs < %s \
+; RUN:   | FileCheck -check-prefixes=ALL,N64,MIPS64,ALL-LE %s
 
 @v4i8 = global <4 x i8> <i8 0, i8 0, i8 0, i8 0>
 @v16i8 = global <16 x i8> <i8 0, i8 0, i8 0, i8 0, i8 0, i8 0, i8 0, i8 0, i8 0, i8 0, i8 0, i8 0, i8 0, i8 0, i8 0, i8 0>
@@ -552,9 +552,10 @@ define i64 @extract_sext_v2i64_vidx() nounwind {
   ; N32-DAG: lw [[PTR_I:\$[0-9]+]], %got_disp(i32)(
   ; N64-DAG: ld [[PTR_I:\$[0-9]+]], %got_disp(i32)(
   ; ALL-DAG: lw [[IDX:\$[0-9]+]], 0([[PTR_I]])
+  ; O32-DAG: addiu [[IDY:\$[0-9]+]], [[IDX]], 1
 
   %4 = extractelement <2 x i64> %2, i32 %3
-  ; MIPS32-DAG: splat.w $w[[R3:[0-9]+]], [[R1]]{{\[}}[[IDX]]]
+  ; MIPS32-DAG: splat.w $w[[R3:[0-9]+]], [[R1]]{{\[}}[[IDY]]]
   ; MIPS32-DAG: mfc1 [[R5:\$[0-9]+]], $f[[R3]]
   ; MIPS32-DAG: splat.w $w[[R4:[0-9]+]], [[R1]]{{\[}}[[IDX]]]
   ; MIPS32-DAG: mfc1 [[R6:\$[0-9]+]], $f[[R4]]
@@ -662,9 +663,10 @@ define i64 @extract_zext_v2i64_vidx() nounwind {
   ; N32-DAG: lw [[PTR_I:\$[0-9]+]], %got_disp(i32)(
   ; N64-DAG: ld [[PTR_I:\$[0-9]+]], %got_disp(i32)(
   ; ALL-DAG: lw [[IDX:\$[0-9]+]], 0([[PTR_I]])
+  ; O32-DAG: addiu [[IDY:\$[0-9]+]], [[IDX]], 1
 
   %4 = extractelement <2 x i64> %2, i32 %3
-  ; MIPS32-DAG: splat.w $w[[R3:[0-9]+]], [[R1]]{{\[}}[[IDX]]]
+  ; MIPS32-DAG: splat.w $w[[R3:[0-9]+]], [[R1]]{{\[}}[[IDY]]]
   ; MIPS32-DAG: mfc1 [[R5:\$[0-9]+]], $f[[R3]]
   ; MIPS32-DAG: splat.w $w[[R4:[0-9]+]], [[R1]]{{\[}}[[IDX]]]
   ; MIPS32-DAG: mfc1 [[R6:\$[0-9]+]], $f[[R4]]
diff --git a/llvm/test/CodeGen/Mips/no-odd-spreg.ll b/llvm/test/CodeGen/Mips/no-odd-spreg.ll
index b3662d54f73..467e458ba82 100644
--- a/llvm/test/CodeGen/Mips/no-odd-spreg.ll
+++ b/llvm/test/CodeGen/Mips/no-odd-spreg.ll
@@ -1,8 +1,13 @@
-; RUN: llc -march=mipsel -mcpu=mips32 < %s | FileCheck -allow-deprecated-dag-overlap %s -check-prefixes=ALL,ODDSPREG,ODDSPREG-NO-EMIT
-; RUN: llc -march=mipsel -mcpu=mips32 -mattr=+nooddspreg < %s | FileCheck -allow-deprecated-dag-overlap %s -check-prefixes=ALL,NOODDSPREG
-; RUN: llc -march=mipsel -mcpu=mips32r6 -mattr=fp64 < %s | FileCheck -allow-deprecated-dag-overlap %s -check-prefixes=ALL,ODDSPREG,ODDSPREG-NO-EMIT
-; RUN: llc -march=mipsel -mcpu=mips32r6 -mattr=fp64,+nooddspreg < %s | FileCheck -allow-deprecated-dag-overlap %s -check-prefixes=ALL,NOODDSPREG
-; RUN: llc -march=mipsel -mcpu=mips32r6 -mattr=fpxx,-nooddspreg < %s | FileCheck -allow-deprecated-dag-overlap %s -check-prefixes=ALL,ODDSPREG,ODDSPREG-EMIT
+; RUN: llc -march=mipsel -mcpu=mips32 < %s \
+; RUN:   | FileCheck %s -check-prefixes=ALL,ODDSPREG,ODDSPREG-NO-EMIT
+; RUN: llc -march=mipsel -mcpu=mips32 -mattr=+nooddspreg < %s \
+; RUN:   | FileCheck %s -check-prefixes=ALL,NOODDSPREG
+; RUN: llc -march=mipsel -mcpu=mips32r6 -mattr=fp64 < %s \
+; RUN:   | FileCheck %s -check-prefixes=ALL,ODDSPREG,ODDSPREG-NO-EMIT
+; RUN: llc -march=mipsel -mcpu=mips32r6 -mattr=fp64,+nooddspreg < %s \
+; RUN:   | FileCheck %s -check-prefixes=ALL,NOODDSPREG
+; RUN: llc -march=mipsel -mcpu=mips32r6 -mattr=fpxx,-nooddspreg < %s \
+; RUN:   | FileCheck %s -check-prefixes=ALL,ODDSPREG,ODDSPREG-EMIT
 
 ; We don't emit a directive unless we need to. This is to support versions of
 ; GAS which do not support the directive.
@@ -55,7 +60,7 @@ entry:
 
 ; ALL-LABEL: two_doubles:
 ; ALL-DAG:        add.d $[[T0:f[0-9]+]], $f12, ${{f[0-9]+}}
-; ALL-DAG:        add.d $f0, $f12, $[[T0]]
+; ALL-DAG:        add.d ${{f[0-9]+}}, $f12, $[[T0]]
 
 
 ; INVALID: -mattr=+nooddspreg is not currently permitted for a 32-bit FPU register file (FR=0 mode).