This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
[MIPS, committed] Tighten gcc.target/mips regexps

From: Richard Sandiford <rdsandiford at googlemail dot com>
To: gcc-patches at gcc dot gnu dot org
Date: Mon, 27 Aug 2012 17:30:40 +0100
Subject: [MIPS, committed] Tighten gcc.target/mips regexps
The patch to make gcc.target/mips use gcc-dg triggered some false
failures for -O3 -g, where the file's pathname was included in the
output and happened to match some of the scan-assembler-not regexps.

This patch tightens the regexps by:

- making sure that register names are prefixed by "$".
- using "\top" for scan-assembler-not tests for instruction OP.
- using "\top\t" for scan-assembler tests for instruction OP.

Tested on mipsisa64-elf, mips64-elf and mips64-linux-gnu.  Applied.

Richard


gcc/testsuite/
	* gcc.target/mips/20020620-1.c, gcc.target/mips/atomic-memory-2.c,
	gcc.target/mips/branch-2.c, gcc.target/mips/branch-3.c,
	gcc.target/mips/clear-cache-1.c, gcc.target/mips/const-anchor-1.c,
	gcc.target/mips/const-anchor-2.c, gcc.target/mips/dspr2-MULT.c,
	gcc.target/mips/dspr2-MULTU.c, gcc.target/mips/ext-1.c,
	gcc.target/mips/ext-2.c, gcc.target/mips/ext-3.c,
	gcc.target/mips/ext-4.c, gcc.target/mips/ext_ins.c,
	gcc.target/mips/fpcmp-1.c, gcc.target/mips/fpcmp-2.c,
	gcc.target/mips/mips16e-extends.c, gcc.target/mips/mips32-dsp.c,
	gcc.target/mips/mips32-dsp-type.c, gcc.target/mips/mips32r2-mxhc1.c,
	gcc.target/mips/mips-ps-5.c, gcc.target/mips/mips-ps-7.c,
	gcc.target/mips/mips-ps-type-2.c, gcc.target/mips/mips-ps-type.c,
	gcc.target/mips/movcc-1.c, gcc.target/mips/movcc-2.c,
	gcc.target/mips/movcc-3.c, gcc.target/mips/neg-abs-1.c,
	gcc.target/mips/neg-abs-2.c, gcc.target/mips/nmadd-1.c,
	gcc.target/mips/nmadd-2.c, gcc.target/mips/nmadd-3.c,
	gcc.target/mips/octeon-exts-7.c, gcc.target/mips/octeon-seq-4.c,
	gcc.target/mips/rsqrt-1.c, gcc.target/mips/rsqrt-2.c,
	gcc.target/mips/rsqrt-3.c, gcc.target/mips/sb1-1.c,
	gcc.target/mips/scc-4.c, gcc.target/mips/stack-1.c,
	gcc.target/mips/unaligned-1.c: Tighten regexps.

Index: gcc/testsuite/gcc.target/mips/20020620-1.c
===================================================================
--- gcc/testsuite/gcc.target/mips/20020620-1.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/20020620-1.c	2012-08-27 17:29:17.687034223 +0100
@@ -5,4 +5,4 @@ int foo (int *x, int i)
 {
   return x[i] + i;
 }
-/* { dg-final { scan-assembler-not "move" } } */
+/* { dg-final { scan-assembler-not "\tmove" } } */
Index: gcc/testsuite/gcc.target/mips/atomic-memory-2.c
===================================================================
--- gcc/testsuite/gcc.target/mips/atomic-memory-2.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/atomic-memory-2.c	2012-08-27 17:29:17.688034223 +0100
@@ -1,8 +1,8 @@
 /* { dg-do compile } */
 /* { dg-options "isa>=2 -mabi=32" } */
 /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
-/* { dg-final { scan-assembler "addiu" } } */
-/* { dg-final { scan-assembler-not "subu" } } */
+/* { dg-final { scan-assembler "\taddiu\t" } } */
+/* { dg-final { scan-assembler-not "\tsubu" } } */
 
 NOMIPS16 unsigned long
 f(unsigned long *p)
Index: gcc/testsuite/gcc.target/mips/branch-2.c
===================================================================
--- gcc/testsuite/gcc.target/mips/branch-2.c	2012-08-27 16:56:39.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/branch-2.c	2012-08-27 17:29:17.688034223 +0100
@@ -1,7 +1,7 @@
 /* { dg-options "-mshared -mabi=32" } */
 /* { dg-final { scan-assembler-not "(\\\$25|\\\$28|cpload)" } } */
 /* { dg-final { scan-assembler-not "\tjr\t\\\$1\n" } } */
-/* { dg-final { scan-assembler-not "cprestore" } } */
+/* { dg-final { scan-assembler-not "\\.cprestore" } } */
 
 #include "branch-helper.h"
 
Index: gcc/testsuite/gcc.target/mips/branch-3.c
===================================================================
--- gcc/testsuite/gcc.target/mips/branch-3.c	2012-08-27 16:56:39.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/branch-3.c	2012-08-27 17:29:17.689034223 +0100
@@ -1,7 +1,7 @@
 /* { dg-options "-mshared -mabi=32" } */
 /* { dg-final { scan-assembler "\t\\.cpload\t\\\$25\n" } } */
 /* { dg-final { scan-assembler "\tjr\t\\\$1\n" } } */
-/* { dg-final { scan-assembler-not "cprestore" } } */
+/* { dg-final { scan-assembler-not "\\.cprestore" } } */
 
 #include "branch-helper.h"
 
Index: gcc/testsuite/gcc.target/mips/clear-cache-1.c
===================================================================
--- gcc/testsuite/gcc.target/mips/clear-cache-1.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/clear-cache-1.c	2012-08-27 17:29:17.689034223 +0100
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
 /* { dg-options "-msynci isa_rev>=2" } */
-/* { dg-final { scan-assembler "synci" } } */
-/* { dg-final { scan-assembler "jr.hb" } } */
+/* { dg-final { scan-assembler "\tsynci\t" } } */
+/* { dg-final { scan-assembler "\tjr.hb\t" } } */
 /* { dg-final { scan-assembler-not "_flush_cache|mips_sync_icache|_cacheflush" } } */
 
 NOMIPS16 void f()
Index: gcc/testsuite/gcc.target/mips/const-anchor-1.c
===================================================================
--- gcc/testsuite/gcc.target/mips/const-anchor-1.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/const-anchor-1.c	2012-08-27 17:29:17.708034220 +0100
@@ -2,7 +2,7 @@
    (0x1234000) used to build another constant.  */
 /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
 /* { dg-final { scan-assembler-not "0x12330000|305332224" } } */
-/* { dg-final { scan-assembler "addiu\t\\\$5,\\\$\[0-9\]*,-1" } } */
+/* { dg-final { scan-assembler "\td?addiu\t\\\$5,\\\$\[0-9\]*,-1" } } */
 
 NOMIPS16 void f ()
 {
Index: gcc/testsuite/gcc.target/mips/const-anchor-2.c
===================================================================
--- gcc/testsuite/gcc.target/mips/const-anchor-2.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/const-anchor-2.c	2012-08-27 17:29:17.708034220 +0100
@@ -1,7 +1,7 @@
 /* Derive a constant (0x30001) from another constant.  */
 /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
 /* { dg-final { scan-assembler-not "0x300000|196608" } } */
-/* { dg-final { scan-assembler "addiu\t\\\$5,\\\$\[0-9\]*,32763" } } */
+/* { dg-final { scan-assembler "\td?addiu\t\\\$5,\\\$\[0-9\]*,32763" } } */
 
 NOMIPS16 void f ()
 {
Index: gcc/testsuite/gcc.target/mips/dspr2-MULT.c
===================================================================
--- gcc/testsuite/gcc.target/mips/dspr2-MULT.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/dspr2-MULT.c	2012-08-27 17:29:17.690034223 +0100
@@ -7,8 +7,8 @@
 
 /* See PR target/51729 for the reason behind the XFAILs.  */
 /* { dg-final { scan-assembler "\tmult\t" } } */
-/* { dg-final { scan-assembler "ac1" { xfail *-*-* } } } */
-/* { dg-final { scan-assembler "ac2" { xfail *-*-* } } } */
+/* { dg-final { scan-assembler "\\\$ac1" { xfail *-*-* } } } */
+/* { dg-final { scan-assembler "\\\$ac2" { xfail *-*-* } } } */
 
 typedef long long a64;
 
Index: gcc/testsuite/gcc.target/mips/dspr2-MULTU.c
===================================================================
--- gcc/testsuite/gcc.target/mips/dspr2-MULTU.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/dspr2-MULTU.c	2012-08-27 17:29:17.690034223 +0100
@@ -6,8 +6,8 @@
 
 /* See PR target/51729 for the reason behind the XFAILs.  */
 /* { dg-final { scan-assembler "\tmultu\t" } } */
-/* { dg-final { scan-assembler "ac1" { xfail *-*-* } } } */
-/* { dg-final { scan-assembler "ac2" { xfail *-*-* } } } */
+/* { dg-final { scan-assembler "\\\$ac1" { xfail *-*-* } } } */
+/* { dg-final { scan-assembler "\\\$ac2" { xfail *-*-* } } } */
 
 typedef unsigned long long a64;
 
Index: gcc/testsuite/gcc.target/mips/ext-1.c
===================================================================
--- gcc/testsuite/gcc.target/mips/ext-1.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/ext-1.c	2012-08-27 17:29:17.691034223 +0100
@@ -2,7 +2,7 @@
 /* { dg-options "isa_rev>=2 -mgp64" } */
 /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
 /* { dg-final { scan-assembler "\tdext\t" } } */
-/* { dg-final { scan-assembler-not "and" } } */
+/* { dg-final { scan-assembler-not "\tand" } } */
 
 struct
 {
Index: gcc/testsuite/gcc.target/mips/ext-2.c
===================================================================
--- gcc/testsuite/gcc.target/mips/ext-2.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/ext-2.c	2012-08-27 17:29:17.691034223 +0100
@@ -5,8 +5,8 @@
 /* { dg-options "isa_rev>=2 -mgp64" } */
 /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
 /* { dg-final { scan-assembler "\tdext\t" } } */
-/* { dg-final { scan-assembler-not "and" } } */
-/* { dg-final { scan-assembler-not "srl" } } */
+/* { dg-final { scan-assembler-not "\tand" } } */
+/* { dg-final { scan-assembler-not "\td?srl" } } */
 
 NOMIPS16 void
 f (unsigned char x, unsigned char *r)
Index: gcc/testsuite/gcc.target/mips/ext-3.c
===================================================================
--- gcc/testsuite/gcc.target/mips/ext-3.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/ext-3.c	2012-08-27 17:29:17.692034223 +0100
@@ -3,7 +3,7 @@
 /* { dg-options "isa_rev>=2 -mgp64" } */
 /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
 /* { dg-final { scan-assembler "\tdext\t" } } */
-/* { dg-final { scan-assembler-not "sll" } } */
+/* { dg-final { scan-assembler-not "\td?sll" } } */
 
 NOMIPS16 unsigned long long
 f (unsigned *i)
Index: gcc/testsuite/gcc.target/mips/ext-4.c
===================================================================
--- gcc/testsuite/gcc.target/mips/ext-4.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/ext-4.c	2012-08-27 17:29:17.692034223 +0100
@@ -3,7 +3,7 @@
 /* { dg-options "isa_rev>=2 -mgp64" } */
 /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
 /* { dg-final { scan-assembler "\tdext\t" } } */
-/* { dg-final { scan-assembler-not "sll" } } */
+/* { dg-final { scan-assembler-not "\td?sll" } } */
 
 NOMIPS16 unsigned long long
 f (unsigned long long i)
Index: gcc/testsuite/gcc.target/mips/ext_ins.c
===================================================================
--- gcc/testsuite/gcc.target/mips/ext_ins.c	2012-08-27 16:56:39.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/ext_ins.c	2012-08-27 17:29:17.693034223 +0100
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
 /* { dg-options "isa_rev>=2" } */
-/* { dg-final { scan-assembler "ext" } } */
-/* { dg-final { scan-assembler "ins" } } */
+/* { dg-final { scan-assembler "\td?ext\t" } } */
+/* { dg-final { scan-assembler "\td?ins\t" } } */
 
 struct A 
 {
Index: gcc/testsuite/gcc.target/mips/fpcmp-1.c
===================================================================
--- gcc/testsuite/gcc.target/mips/fpcmp-1.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/fpcmp-1.c	2012-08-27 17:29:17.694034223 +0100
@@ -2,5 +2,5 @@
 /* { dg-options "-mhard-float" } */
 NOMIPS16 int f1 (float x, float y) { return __builtin_isless (x, y); }
 NOMIPS16 int f2 (double x, double y) { return __builtin_isless (x, y); }
-/* { dg-final { scan-assembler "c\\.ule\\.s" } } */
-/* { dg-final { scan-assembler "c\\.ule\\.d" } } */
+/* { dg-final { scan-assembler "\tc\\.ule\\.s\t" } } */
+/* { dg-final { scan-assembler "\tc\\.ule\\.d\t" } } */
Index: gcc/testsuite/gcc.target/mips/fpcmp-2.c
===================================================================
--- gcc/testsuite/gcc.target/mips/fpcmp-2.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/fpcmp-2.c	2012-08-27 17:29:17.694034223 +0100
@@ -2,5 +2,5 @@
 /* { dg-options "-mhard-float" } */
 NOMIPS16 int f1 (float x, float y) { return __builtin_islessequal (x, y); }
 NOMIPS16 int f2 (double x, double y) { return __builtin_islessequal (x, y); }
-/* { dg-final { scan-assembler "c\\.ult\\.s" } } */
-/* { dg-final { scan-assembler "c\\.ult\\.d" } } */
+/* { dg-final { scan-assembler "\tc\\.ult\\.s\t" } } */
+/* { dg-final { scan-assembler "\tc\\.ult\\.d\t" } } */
Index: gcc/testsuite/gcc.target/mips/mips16e-extends.c
===================================================================
--- gcc/testsuite/gcc.target/mips/mips16e-extends.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/mips16e-extends.c	2012-08-27 17:29:17.697034223 +0100
@@ -16,7 +16,7 @@ MIPS16 signed char cksum8 (unsigned long
   return l;
 }
 
-/* { dg-final { scan-assembler "zeh" } } */
-/* { dg-final { scan-assembler "seh" } } */
-/* { dg-final { scan-assembler "zeb" } } */
-/* { dg-final { scan-assembler "seb" } } */
+/* { dg-final { scan-assembler "\tzeh\t" } } */
+/* { dg-final { scan-assembler "\tseh\t" } } */
+/* { dg-final { scan-assembler "\tzeb\t" } } */
+/* { dg-final { scan-assembler "\tseb\t" } } */
Index: gcc/testsuite/gcc.target/mips/mips32-dsp.c
===================================================================
--- gcc/testsuite/gcc.target/mips/mips32-dsp.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/mips32-dsp.c	2012-08-27 17:29:17.699034223 +0100
@@ -1,103 +1,103 @@
 /* Test MIPS32 DSP instructions */
 /* { dg-do compile } */
 /* { dg-options "-mgp32 -mdsp" } */
-/* { dg-final { scan-assembler "addq.ph" } } */
-/* { dg-final { scan-assembler "addq_s.ph" } } */
-/* { dg-final { scan-assembler "addq_s.w" } } */
-/* { dg-final { scan-assembler "addu.qb" } } */
-/* { dg-final { scan-assembler "addu_s.qb" } } */
-/* { dg-final { scan-assembler "subq.ph" } } */
-/* { dg-final { scan-assembler "subq_s.ph" } } */
-/* { dg-final { scan-assembler "subq_s.w" } } */
-/* { dg-final { scan-assembler "subu.qb" } } */
-/* { dg-final { scan-assembler "subu_s.qb" } } */
-/* { dg-final { scan-assembler "addsc" } } */
-/* { dg-final { scan-assembler "addwc" } } */
-/* { dg-final { scan-assembler "modsub" } } */
-/* { dg-final { scan-assembler "raddu.w.qb" } } */
-/* { dg-final { scan-assembler "absq_s.ph" } } */
-/* { dg-final { scan-assembler "absq_s.w" } } */
-/* { dg-final { scan-assembler "precrq.qb.ph" } } */
-/* { dg-final { scan-assembler "precrq.ph.w" } } */
-/* { dg-final { scan-assembler "precrq_rs.ph.w" } } */
-/* { dg-final { scan-assembler "precrqu_s.qb.ph" } } */
-/* { dg-final { scan-assembler "preceq.w.phl" } } */
-/* { dg-final { scan-assembler "preceq.w.phr" } } */
-/* { dg-final { scan-assembler "precequ.ph.qbl" } } */
-/* { dg-final { scan-assembler "precequ.ph.qbr" } } */
-/* { dg-final { scan-assembler "precequ.ph.qbla" } } */
-/* { dg-final { scan-assembler "precequ.ph.qbra" } } */
-/* { dg-final { scan-assembler "preceu.ph.qbl" } } */
-/* { dg-final { scan-assembler "preceu.ph.qbr" } } */
-/* { dg-final { scan-assembler "preceu.ph.qbla" } } */
-/* { dg-final { scan-assembler "preceu.ph.qbra" } } */
-/* { dg-final { scan-assembler "shllv?.qb" } } */
-/* { dg-final { scan-assembler "shllv?.ph" } } */
-/* { dg-final { scan-assembler "shllv?_s.ph" } } */
-/* { dg-final { scan-assembler "shllv?_s.w" } } */
-/* { dg-final { scan-assembler "shrlv?.qb" } } */
-/* { dg-final { scan-assembler "shrav?.ph" } } */
-/* { dg-final { scan-assembler "shrav?_r.ph" } } */
-/* { dg-final { scan-assembler "shrav?_r.w" } } */
-/* { dg-final { scan-assembler "muleu_s.ph.qbl" } } */
-/* { dg-final { scan-assembler "muleu_s.ph.qbr" } } */
-/* { dg-final { scan-assembler "mulq_rs.ph" } } */
-/* { dg-final { scan-assembler "muleq_s.w.phl" } } */
-/* { dg-final { scan-assembler "muleq_s.w.phr" } } */
-/* { dg-final { scan-assembler "dpau.h.qbl" } } */
-/* { dg-final { scan-assembler "dpau.h.qbr" } } */
-/* { dg-final { scan-assembler "dpsu.h.qbl" } } */
-/* { dg-final { scan-assembler "dpsu.h.qbr" } } */
-/* { dg-final { scan-assembler "dpaq_s.w.ph" } } */
-/* { dg-final { scan-assembler "dpsq_s.w.ph" } } */
-/* { dg-final { scan-assembler "mulsaq_s.w.ph" } } */
-/* { dg-final { scan-assembler "dpaq_sa.l.w" } } */
-/* { dg-final { scan-assembler "dpsq_sa.l.w" } } */
-/* { dg-final { scan-assembler "maq_s.w.phl" } } */
-/* { dg-final { scan-assembler "maq_s.w.phr" } } */
-/* { dg-final { scan-assembler "maq_sa.w.phl" } } */
-/* { dg-final { scan-assembler "maq_sa.w.phr" } } */
-/* { dg-final { scan-assembler "bitrev" } } */
-/* { dg-final { scan-assembler "insv" } } */
-/* { dg-final { scan-assembler "replv?.qb" } } */
-/* { dg-final { scan-assembler "repl.ph" } } */
-/* { dg-final { scan-assembler "replv.ph" } } */
-/* { dg-final { scan-assembler "cmpu.eq.qb" } } */
-/* { dg-final { scan-assembler "cmpu.lt.qb" } } */
-/* { dg-final { scan-assembler "cmpu.le.qb" } } */
-/* { dg-final { scan-assembler "cmpgu.eq.qb" } } */
-/* { dg-final { scan-assembler "cmpgu.lt.qb" } } */
-/* { dg-final { scan-assembler "cmpgu.le.qb" } } */
-/* { dg-final { scan-assembler "cmp.eq.ph" } } */
-/* { dg-final { scan-assembler "cmp.lt.ph" } } */
-/* { dg-final { scan-assembler "cmp.le.ph" } } */
-/* { dg-final { scan-assembler "pick.qb" } } */
-/* { dg-final { scan-assembler "pick.ph" } } */
-/* { dg-final { scan-assembler "packrl.ph" } } */
-/* { dg-final { scan-assembler "extrv?.w" } } */
-/* { dg-final { scan-assembler "extrv?_s.h" } } */
-/* { dg-final { scan-assembler "extrv?_r.w" } } */
-/* { dg-final { scan-assembler "extrv?_rs.w" } } */
-/* { dg-final { scan-assembler "extpv?" } } */
-/* { dg-final { scan-assembler "extpdpv?" } } */
-/* { dg-final { scan-assembler "shilov?" } } */
-/* { dg-final { scan-assembler "mthlip" } } */
-/* { dg-final { scan-assembler "mfhi" } } */
-/* { dg-final { scan-assembler "mflo" } } */
-/* { dg-final { scan-assembler "mthi" } } */
-/* { dg-final { scan-assembler "mtlo" } } */
-/* { dg-final { scan-assembler "wrdsp" } } */
-/* { dg-final { scan-assembler "rddsp" } } */
-/* { dg-final { scan-assembler "lbux?" } } */
-/* { dg-final { scan-assembler "lhx?" } } */
-/* { dg-final { scan-assembler "lwx?" } } */
-/* { dg-final { scan-assembler "bposge32" } } */
-/* { dg-final { scan-assembler "madd" } } */
-/* { dg-final { scan-assembler "maddu" } } */
-/* { dg-final { scan-assembler "msub" } } */
-/* { dg-final { scan-assembler "msubu" } } */
-/* { dg-final { scan-assembler "mult" } } */
-/* { dg-final { scan-assembler "multu" } } */
+/* { dg-final { scan-assembler "\taddq.ph\t" } } */
+/* { dg-final { scan-assembler "\taddq_s.ph\t" } } */
+/* { dg-final { scan-assembler "\taddq_s.w\t" } } */
+/* { dg-final { scan-assembler "\taddu.qb\t" } } */
+/* { dg-final { scan-assembler "\taddu_s.qb\t" } } */
+/* { dg-final { scan-assembler "\tsubq.ph\t" } } */
+/* { dg-final { scan-assembler "\tsubq_s.ph\t" } } */
+/* { dg-final { scan-assembler "\tsubq_s.w\t" } } */
+/* { dg-final { scan-assembler "\tsubu.qb\t" } } */
+/* { dg-final { scan-assembler "\tsubu_s.qb\t" } } */
+/* { dg-final { scan-assembler "\taddsc\t" } } */
+/* { dg-final { scan-assembler "\taddwc\t" } } */
+/* { dg-final { scan-assembler "\tmodsub\t" } } */
+/* { dg-final { scan-assembler "\traddu.w.qb\t" } } */
+/* { dg-final { scan-assembler "\tabsq_s.ph\t" } } */
+/* { dg-final { scan-assembler "\tabsq_s.w\t" } } */
+/* { dg-final { scan-assembler "\tprecrq.qb.ph\t" } } */
+/* { dg-final { scan-assembler "\tprecrq.ph.w\t" } } */
+/* { dg-final { scan-assembler "\tprecrq_rs.ph.w\t" } } */
+/* { dg-final { scan-assembler "\tprecrqu_s.qb.ph\t" } } */
+/* { dg-final { scan-assembler "\tpreceq.w.phl\t" } } */
+/* { dg-final { scan-assembler "\tpreceq.w.phr\t" } } */
+/* { dg-final { scan-assembler "\tprecequ.ph.qbl\t" } } */
+/* { dg-final { scan-assembler "\tprecequ.ph.qbr\t" } } */
+/* { dg-final { scan-assembler "\tprecequ.ph.qbla\t" } } */
+/* { dg-final { scan-assembler "\tprecequ.ph.qbra\t" } } */
+/* { dg-final { scan-assembler "\tpreceu.ph.qbl\t" } } */
+/* { dg-final { scan-assembler "\tpreceu.ph.qbr\t" } } */
+/* { dg-final { scan-assembler "\tpreceu.ph.qbla\t" } } */
+/* { dg-final { scan-assembler "\tpreceu.ph.qbra\t" } } */
+/* { dg-final { scan-assembler "\tshllv?.qb\t" } } */
+/* { dg-final { scan-assembler "\tshllv?.ph\t" } } */
+/* { dg-final { scan-assembler "\tshllv?_s.ph\t" } } */
+/* { dg-final { scan-assembler "\tshllv?_s.w\t" } } */
+/* { dg-final { scan-assembler "\tshrlv?.qb\t" } } */
+/* { dg-final { scan-assembler "\tshrav?.ph\t" } } */
+/* { dg-final { scan-assembler "\tshrav?_r.ph\t" } } */
+/* { dg-final { scan-assembler "\tshrav?_r.w\t" } } */
+/* { dg-final { scan-assembler "\tmuleu_s.ph.qbl\t" } } */
+/* { dg-final { scan-assembler "\tmuleu_s.ph.qbr\t" } } */
+/* { dg-final { scan-assembler "\tmulq_rs.ph\t" } } */
+/* { dg-final { scan-assembler "\tmuleq_s.w.phl\t" } } */
+/* { dg-final { scan-assembler "\tmuleq_s.w.phr\t" } } */
+/* { dg-final { scan-assembler "\tdpau.h.qbl\t" } } */
+/* { dg-final { scan-assembler "\tdpau.h.qbr\t" } } */
+/* { dg-final { scan-assembler "\tdpsu.h.qbl\t" } } */
+/* { dg-final { scan-assembler "\tdpsu.h.qbr\t" } } */
+/* { dg-final { scan-assembler "\tdpaq_s.w.ph\t" } } */
+/* { dg-final { scan-assembler "\tdpsq_s.w.ph\t" } } */
+/* { dg-final { scan-assembler "\tmulsaq_s.w.ph\t" } } */
+/* { dg-final { scan-assembler "\tdpaq_sa.l.w\t" } } */
+/* { dg-final { scan-assembler "\tdpsq_sa.l.w\t" } } */
+/* { dg-final { scan-assembler "\tmaq_s.w.phl\t" } } */
+/* { dg-final { scan-assembler "\tmaq_s.w.phr\t" } } */
+/* { dg-final { scan-assembler "\tmaq_sa.w.phl\t" } } */
+/* { dg-final { scan-assembler "\tmaq_sa.w.phr\t" } } */
+/* { dg-final { scan-assembler "\tbitrev\t" } } */
+/* { dg-final { scan-assembler "\tinsv\t" } } */
+/* { dg-final { scan-assembler "\treplv?.qb\t" } } */
+/* { dg-final { scan-assembler "\trepl.ph\t" } } */
+/* { dg-final { scan-assembler "\treplv.ph\t" } } */
+/* { dg-final { scan-assembler "\tcmpu.eq.qb\t" } } */
+/* { dg-final { scan-assembler "\tcmpu.lt.qb\t" } } */
+/* { dg-final { scan-assembler "\tcmpu.le.qb\t" } } */
+/* { dg-final { scan-assembler "\tcmpgu.eq.qb\t" } } */
+/* { dg-final { scan-assembler "\tcmpgu.lt.qb\t" } } */
+/* { dg-final { scan-assembler "\tcmpgu.le.qb\t" } } */
+/* { dg-final { scan-assembler "\tcmp.eq.ph\t" } } */
+/* { dg-final { scan-assembler "\tcmp.lt.ph\t" } } */
+/* { dg-final { scan-assembler "\tcmp.le.ph\t" } } */
+/* { dg-final { scan-assembler "\tpick.qb\t" } } */
+/* { dg-final { scan-assembler "\tpick.ph\t" } } */
+/* { dg-final { scan-assembler "\tpackrl.ph\t" } } */
+/* { dg-final { scan-assembler "\textrv?.w\t" } } */
+/* { dg-final { scan-assembler "\textrv?_s.h\t" } } */
+/* { dg-final { scan-assembler "\textrv?_r.w\t" } } */
+/* { dg-final { scan-assembler "\textrv?_rs.w\t" } } */
+/* { dg-final { scan-assembler "\textpv?\t" } } */
+/* { dg-final { scan-assembler "\textpdpv?\t" } } */
+/* { dg-final { scan-assembler "\tshilov?\t" } } */
+/* { dg-final { scan-assembler "\tmthlip\t" } } */
+/* { dg-final { scan-assembler "\tmfhi\t" } } */
+/* { dg-final { scan-assembler "\tmflo\t" } } */
+/* { dg-final { scan-assembler "\tmthi\t" } } */
+/* { dg-final { scan-assembler "\tmtlo\t" } } */
+/* { dg-final { scan-assembler "\twrdsp\t" } } */
+/* { dg-final { scan-assembler "\trddsp\t" } } */
+/* { dg-final { scan-assembler "\tlbux?\t" } } */
+/* { dg-final { scan-assembler "\tlhx?\t" } } */
+/* { dg-final { scan-assembler "\tlwx?\t" } } */
+/* { dg-final { scan-assembler "\tbposge32\t" } } */
+/* { dg-final { scan-assembler "\tmadd\t" } } */
+/* { dg-final { scan-assembler "\tmaddu\t" } } */
+/* { dg-final { scan-assembler "\tmsub\t" } } */
+/* { dg-final { scan-assembler "\tmsubu\t" } } */
+/* { dg-final { scan-assembler "\tmult\t" } } */
+/* { dg-final { scan-assembler "\tmultu\t" } } */
 
 #include <stdlib.h>
 #include <stdio.h>
Index: gcc/testsuite/gcc.target/mips/mips32-dsp-type.c
===================================================================
--- gcc/testsuite/gcc.target/mips/mips32-dsp-type.c	2012-08-27 16:56:39.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/mips32-dsp-type.c	2012-08-27 17:29:17.697034223 +0100
@@ -1,10 +1,10 @@
 /* Test MIPS32 DSP instructions */
 /* { dg-do compile } */
 /* { dg-options "-mdsp" } */
-/* { dg-final { scan-assembler "addq.ph" } } */
-/* { dg-final { scan-assembler "addu.qb" } } */
-/* { dg-final { scan-assembler "subq.ph" } } */
-/* { dg-final { scan-assembler "subu.qb" } } */
+/* { dg-final { scan-assembler "\taddq.ph\t" } } */
+/* { dg-final { scan-assembler "\taddu.qb\t" } } */
+/* { dg-final { scan-assembler "\tsubq.ph\t" } } */
+/* { dg-final { scan-assembler "\tsubu.qb\t" } } */
 
 typedef char v4qi __attribute__ ((vector_size(4)));
 typedef short v2hi __attribute__ ((vector_size(4)));
Index: gcc/testsuite/gcc.target/mips/mips32r2-mxhc1.c
===================================================================
--- gcc/testsuite/gcc.target/mips/mips32r2-mxhc1.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/mips32r2-mxhc1.c	2012-08-27 17:29:17.700034223 +0100
@@ -1,8 +1,8 @@
 /* { dg-do compile } */
 /* { dg-options "-mabi=32 -mfp64" } */
 /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
-/* { dg-final { scan-assembler "mthc1" } } */
-/* { dg-final { scan-assembler "mfhc1" } } */
+/* { dg-final { scan-assembler "\tmthc1\t" } } */
+/* { dg-final { scan-assembler "\tmfhc1\t" } } */
 
 NOMIPS16 double func1 (long long a)
 {
Index: gcc/testsuite/gcc.target/mips/mips-ps-5.c
===================================================================
--- gcc/testsuite/gcc.target/mips/mips-ps-5.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/mips-ps-5.c	2012-08-27 17:29:17.695034223 +0100
@@ -12,6 +12,6 @@ foo (void)
     a[i] = b[i] == c[i] + 1 ? b[i] : c[i];
 }
 
-/* { dg-final { scan-assembler "add\\.ps" } } */
-/* { dg-final { scan-assembler "c\\.eq\\.ps" } } */
-/* { dg-final { scan-assembler "mov\[tf\]\\.ps" } } */
+/* { dg-final { scan-assembler "\tadd\\.ps\t" } } */
+/* { dg-final { scan-assembler "\tc\\.eq\\.ps\t" } } */
+/* { dg-final { scan-assembler "\tmov\[tf\]\\.ps\t" } } */
Index: gcc/testsuite/gcc.target/mips/mips-ps-7.c
===================================================================
--- gcc/testsuite/gcc.target/mips/mips-ps-7.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/mips-ps-7.c	2012-08-27 17:29:17.695034223 +0100
@@ -13,6 +13,6 @@ foo (void)
     a[i] = b[i] == c[i] + 1 ? b[i] : c[i];
 }
 
-/* { dg-final { scan-assembler "add\\.ps" } } */
-/* { dg-final { scan-assembler "c\\.eq\\.ps" } } */
-/* { dg-final { scan-assembler "mov\[tf\]\\.ps" } } */
+/* { dg-final { scan-assembler "\tadd\\.ps\t" } } */
+/* { dg-final { scan-assembler "\tc\\.eq\\.ps\t" } } */
+/* { dg-final { scan-assembler "\tmov\[tf\]\\.ps\t" } } */
Index: gcc/testsuite/gcc.target/mips/mips-ps-type-2.c
===================================================================
--- gcc/testsuite/gcc.target/mips/mips-ps-type-2.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/mips-ps-type-2.c	2012-08-27 17:29:17.696034223 +0100
@@ -3,20 +3,20 @@
 /* { dg-do compile } */
 /* { dg-options "isa_rev>=2 -mgp32 -mpaired-single -ffinite-math-only" } */
 /* { dg-skip-if "nmadd and nmsub need combine" { *-*-* } { "-O0" } { "" } } */
-/* { dg-final { scan-assembler "cvt.ps.s" } } */
-/* { dg-final { scan-assembler "mov.ps" } } */
-/* { dg-final { scan-assembler "ldc1" } } */
-/* { dg-final { scan-assembler "sdc1" } } */
-/* { dg-final { scan-assembler "add.ps" } } */
-/* { dg-final { scan-assembler "sub.ps" } } */
-/* { dg-final { scan-assembler "neg.ps" } } */
-/* { dg-final { scan-assembler "mul.ps" } } */
-/* { dg-final { scan-assembler "madd.ps" } } */
-/* { dg-final { scan-assembler "msub.ps" } } */
-/* { dg-final { scan-assembler "nmadd.ps" } } */
-/* { dg-final { scan-assembler "nmsub.ps" } } */
-/* { dg-final { scan-assembler "movn.ps" } } */
-/* { dg-final { scan-assembler "movz.ps" } } */
+/* { dg-final { scan-assembler "\tcvt.ps.s\t" } } */
+/* { dg-final { scan-assembler "\tmov.ps\t" } } */
+/* { dg-final { scan-assembler "\tldc1\t" } } */
+/* { dg-final { scan-assembler "\tsdc1\t" } } */
+/* { dg-final { scan-assembler "\tadd.ps\t" } } */
+/* { dg-final { scan-assembler "\tsub.ps\t" } } */
+/* { dg-final { scan-assembler "\tneg.ps\t" } } */
+/* { dg-final { scan-assembler "\tmul.ps\t" } } */
+/* { dg-final { scan-assembler "\tmadd.ps\t" } } */
+/* { dg-final { scan-assembler "\tmsub.ps\t" } } */
+/* { dg-final { scan-assembler "\tnmadd.ps\t" } } */
+/* { dg-final { scan-assembler "\tnmsub.ps\t" } } */
+/* { dg-final { scan-assembler "\tmovn.ps\t" } } */
+/* { dg-final { scan-assembler "\tmovz.ps\t" } } */
 
 typedef float v2sf __attribute__ ((vector_size(8)));
 void gobble (v2sf);
Index: gcc/testsuite/gcc.target/mips/mips-ps-type.c
===================================================================
--- gcc/testsuite/gcc.target/mips/mips-ps-type.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/mips-ps-type.c	2012-08-27 17:29:17.696034223 +0100
@@ -3,19 +3,19 @@
 /* { dg-do compile } */ 
 /* { dg-options "-mpaired-single -mgp64 -ffinite-math-only" } */
 /* { dg-skip-if "nmadd and nmsub need combine" { *-*-* } { "-O0" } { "" } } */
-/* { dg-final { scan-assembler "cvt.ps.s" } } */ 
-/* { dg-final { scan-assembler "mov.ps" } } */ 
-/* { dg-final { scan-assembler "ldc1" } } */ 
-/* { dg-final { scan-assembler "sdc1" } } */ 
-/* { dg-final { scan-assembler "add.ps" } } */ 
-/* { dg-final { scan-assembler "sub.ps" } } */ 
-/* { dg-final { scan-assembler "neg.ps" } } */ 
-/* { dg-final { scan-assembler "mul.ps" } } */ 
-/* { dg-final { scan-assembler "madd.ps" } } */ 
-/* { dg-final { scan-assembler "msub.ps" } } */ 
-/* { dg-final { scan-assembler "nmadd.ps" } } */ 
-/* { dg-final { scan-assembler "nmsub.ps" } } */ 
-/* { dg-final { scan-assembler "mov(n|z).ps" } } */ 
+/* { dg-final { scan-assembler "\tcvt.ps.s\t" } } */
+/* { dg-final { scan-assembler "\tmov.ps\t" } } */
+/* { dg-final { scan-assembler "\tldc1\t" } } */
+/* { dg-final { scan-assembler "\tsdc1\t" } } */
+/* { dg-final { scan-assembler "\tadd.ps\t" } } */
+/* { dg-final { scan-assembler "\tsub.ps\t" } } */
+/* { dg-final { scan-assembler "\tneg.ps\t" } } */
+/* { dg-final { scan-assembler "\tmul.ps\t" } } */
+/* { dg-final { scan-assembler "\tmadd.ps\t" } } */
+/* { dg-final { scan-assembler "\tmsub.ps\t" } } */
+/* { dg-final { scan-assembler "\tnmadd.ps\t" } } */
+/* { dg-final { scan-assembler "\tnmsub.ps\t" } } */
+/* { dg-final { scan-assembler "\tmov(n|z).ps\t" } } */
 
 typedef float v2sf __attribute__ ((vector_size(8)));
 
Index: gcc/testsuite/gcc.target/mips/movcc-1.c
===================================================================
--- gcc/testsuite/gcc.target/mips/movcc-1.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/movcc-1.c	2012-08-27 17:29:17.700034223 +0100
@@ -1,8 +1,8 @@
 /* { dg-do compile } */
 /* { dg-options "isa>=4" } */
 /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
-/* { dg-final { scan-assembler "movz" } } */
-/* { dg-final { scan-assembler "movn" } } */
+/* { dg-final { scan-assembler "\tmovz\t" } } */
+/* { dg-final { scan-assembler "\tmovn\t" } } */
 
 void ext_int (int);
 
Index: gcc/testsuite/gcc.target/mips/movcc-2.c
===================================================================
--- gcc/testsuite/gcc.target/mips/movcc-2.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/movcc-2.c	2012-08-27 17:29:17.701034222 +0100
@@ -1,8 +1,8 @@
 /* { dg-do compile } */
 /* { dg-options "isa>=4" } */
 /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
-/* { dg-final { scan-assembler "movz" } } */
-/* { dg-final { scan-assembler "movn" } } */
+/* { dg-final { scan-assembler "\tmovz\t" } } */
+/* { dg-final { scan-assembler "\tmovn\t" } } */
 
 void ext_long (long);
 
Index: gcc/testsuite/gcc.target/mips/movcc-3.c
===================================================================
--- gcc/testsuite/gcc.target/mips/movcc-3.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/movcc-3.c	2012-08-27 17:29:17.701034222 +0100
@@ -1,14 +1,14 @@
 /* { dg-do compile } */
 /* { dg-options "isa>=4 -mhard-float" } */
 /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
-/* { dg-final { scan-assembler "movt" } } */
-/* { dg-final { scan-assembler "movf" } } */
-/* { dg-final { scan-assembler "movz.s" } } */
-/* { dg-final { scan-assembler "movn.s" } } */
-/* { dg-final { scan-assembler "movt.s" } } */
-/* { dg-final { scan-assembler "movz.d" } } */
-/* { dg-final { scan-assembler "movn.d" } } */
-/* { dg-final { scan-assembler "movf.d" } } */
+/* { dg-final { scan-assembler "\tmovt\t" } } */
+/* { dg-final { scan-assembler "\tmovf\t" } } */
+/* { dg-final { scan-assembler "\tmovz.s\t" } } */
+/* { dg-final { scan-assembler "\tmovn.s\t" } } */
+/* { dg-final { scan-assembler "\tmovt.s\t" } } */
+/* { dg-final { scan-assembler "\tmovz.d\t" } } */
+/* { dg-final { scan-assembler "\tmovn.d\t" } } */
+/* { dg-final { scan-assembler "\tmovf.d\t" } } */
 
 void ext_int (int);
 void ext_long (long);
Index: gcc/testsuite/gcc.target/mips/neg-abs-1.c
===================================================================
--- gcc/testsuite/gcc.target/mips/neg-abs-1.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/neg-abs-1.c	2012-08-27 17:29:17.702034222 +0100
@@ -2,10 +2,10 @@
    matter.  */
 /* { dg-do compile } */
 /* { dg-options "-mhard-float -ffinite-math-only" } */
-/* { dg-final { scan-assembler "neg.s" } } */
-/* { dg-final { scan-assembler "neg.d" } } */
-/* { dg-final { scan-assembler "abs.s" } } */
-/* { dg-final { scan-assembler "abs.d" } } */
+/* { dg-final { scan-assembler "\tneg.s\t" } } */
+/* { dg-final { scan-assembler "\tneg.d\t" } } */
+/* { dg-final { scan-assembler "\tabs.s\t" } } */
+/* { dg-final { scan-assembler "\tabs.d\t" } } */
 
 NOMIPS16 float f1 (float f) { return -f; }
 NOMIPS16 float f2 (float f) { return __builtin_fabsf (f); }
Index: gcc/testsuite/gcc.target/mips/neg-abs-2.c
===================================================================
--- gcc/testsuite/gcc.target/mips/neg-abs-2.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/neg-abs-2.c	2012-08-27 17:29:17.703034222 +0100
@@ -2,10 +2,10 @@
    matter.  */
 /* { dg-do compile } */
 /* { dg-options "-mhard-float -fno-finite-math-only" } */
-/* { dg-final { scan-assembler-not "neg.s" } } */
-/* { dg-final { scan-assembler-not "neg.d" } } */
-/* { dg-final { scan-assembler-not "abs.s" } } */
-/* { dg-final { scan-assembler-not "abs.d" } } */
+/* { dg-final { scan-assembler-not "\tneg.s\t" } } */
+/* { dg-final { scan-assembler-not "\tneg.d\t" } } */
+/* { dg-final { scan-assembler-not "\tabs.s\t" } } */
+/* { dg-final { scan-assembler-not "\tabs.d\t" } } */
 
 float f1 (float f) { return -f; }
 float f2 (float f) { return __builtin_fabsf (f); }
Index: gcc/testsuite/gcc.target/mips/nmadd-1.c
===================================================================
--- gcc/testsuite/gcc.target/mips/nmadd-1.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/nmadd-1.c	2012-08-27 17:29:17.703034222 +0100
@@ -1,10 +1,10 @@
 /* { dg-do compile } */
 /* { dg-options "-ffast-math isa=4 -mhard-float" } */
 /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
-/* { dg-final { scan-assembler "nmadd.s" } } */
-/* { dg-final { scan-assembler "nmadd.d" } } */
-/* { dg-final { scan-assembler "nmsub.s" } } */
-/* { dg-final { scan-assembler "nmsub.d" } } */
+/* { dg-final { scan-assembler "\tnmadd.s\t" } } */
+/* { dg-final { scan-assembler "\tnmadd.d\t" } } */
+/* { dg-final { scan-assembler "\tnmsub.s\t" } } */
+/* { dg-final { scan-assembler "\tnmsub.d\t" } } */
 
 NOMIPS16 float
 sub1 (float f, float g, float h)
Index: gcc/testsuite/gcc.target/mips/nmadd-2.c
===================================================================
--- gcc/testsuite/gcc.target/mips/nmadd-2.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/nmadd-2.c	2012-08-27 17:29:17.704034222 +0100
@@ -1,10 +1,10 @@
 /* { dg-do compile } */
 /* { dg-options "-fno-fast-math -ffinite-math-only isa=4 -mhard-float" } */
 /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
-/* { dg-final { scan-assembler "nmadd.s" } } */
-/* { dg-final { scan-assembler "nmadd.d" } } */
-/* { dg-final { scan-assembler "nmsub.s" } } */
-/* { dg-final { scan-assembler "nmsub.d" } } */
+/* { dg-final { scan-assembler "\tnmadd.s\t" } } */
+/* { dg-final { scan-assembler "\tnmadd.d\t" } } */
+/* { dg-final { scan-assembler "\tnmsub.s\t" } } */
+/* { dg-final { scan-assembler "\tnmsub.d\t" } } */
 
 NOMIPS16 float
 sub1 (float f, float g, float h)
Index: gcc/testsuite/gcc.target/mips/nmadd-3.c
===================================================================
--- gcc/testsuite/gcc.target/mips/nmadd-3.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/nmadd-3.c	2012-08-27 17:29:17.704034222 +0100
@@ -2,10 +2,8 @@
    We can't use nmadd and nmsub in that case.  */
 /* { dg-do compile } */
 /* { dg-options "-fno-fast-math -fno-finite-math-only isa=4 -mhard-float" } */
-/* { dg-final { scan-assembler-not "nmadd.s" } } */
-/* { dg-final { scan-assembler-not "nmadd.d" } } */
-/* { dg-final { scan-assembler-not "nmsub.s" } } */
-/* { dg-final { scan-assembler-not "nmsub.d" } } */
+/* { dg-final { scan-assembler-not "\tnmadd" } } */
+/* { dg-final { scan-assembler-not "\tnmsub" } } */
 
 float
 sub1 (float f, float g, float h)
Index: gcc/testsuite/gcc.target/mips/octeon-exts-7.c
===================================================================
--- gcc/testsuite/gcc.target/mips/octeon-exts-7.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/octeon-exts-7.c	2012-08-27 17:29:17.705034222 +0100
@@ -3,7 +3,7 @@
 /* { dg-options "-march=octeon -mgp64" } */
 /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
 /* { dg-final { scan-assembler-times "\texts\t" 1 } } */
-/* { dg-final { scan-assembler-not "sll|sra" } } */
+/* { dg-final { scan-assembler-not "\td?(sll|sra)" } } */
 
 struct bar
 {
Index: gcc/testsuite/gcc.target/mips/octeon-seq-4.c
===================================================================
--- gcc/testsuite/gcc.target/mips/octeon-seq-4.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/octeon-seq-4.c	2012-08-27 17:29:17.706034222 +0100
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
 /* { dg-options "-march=octeon" } */
 /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
-/* { dg-final { scan-assembler-not "xor" } } */
+/* { dg-final { scan-assembler-not "\txor" } } */
 
 unsigned
 m (unsigned e);
Index: gcc/testsuite/gcc.target/mips/rsqrt-1.c
===================================================================
--- gcc/testsuite/gcc.target/mips/rsqrt-1.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/rsqrt-1.c	2012-08-27 17:29:17.706034222 +0100
@@ -1,8 +1,8 @@
 /* { dg-do compile } */
 /* { dg-options "-ffast-math isa=4 -mhard-float -mgp64" } */
 /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
-/* { dg-final { scan-assembler "rsqrt.d" } } */
-/* { dg-final { scan-assembler "rsqrt.s" } } */
+/* { dg-final { scan-assembler "\trsqrt.d\t" } } */
+/* { dg-final { scan-assembler "\trsqrt.s\t" } } */
 
 extern double sqrt(double);
 extern float sqrtf(float);
Index: gcc/testsuite/gcc.target/mips/rsqrt-2.c
===================================================================
--- gcc/testsuite/gcc.target/mips/rsqrt-2.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/rsqrt-2.c	2012-08-27 17:29:17.707034221 +0100
@@ -1,8 +1,8 @@
 /* { dg-do compile } */
 /* { dg-options "-ffast-math isa=4 -mhard-float -mgp64" } */
 /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
-/* { dg-final { scan-assembler "rsqrt.d" } } */
-/* { dg-final { scan-assembler "rsqrt.s" } } */
+/* { dg-final { scan-assembler "\trsqrt.d\t" } } */
+/* { dg-final { scan-assembler "\trsqrt.s\t" } } */
 
 extern double sqrt(double);
 extern float sqrtf(float);
Index: gcc/testsuite/gcc.target/mips/rsqrt-3.c
===================================================================
--- gcc/testsuite/gcc.target/mips/rsqrt-3.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/rsqrt-3.c	2012-08-27 17:29:17.707034221 +0100
@@ -1,8 +1,8 @@
 /* { dg-do compile } */
 /* { dg-options "isa=4 -mhard-float" } */
 /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
-/* { dg-final { scan-assembler-not "rsqrt.d" } } */
-/* { dg-final { scan-assembler-not "rsqrt.s" } } */
+/* { dg-final { scan-assembler-not "\trsqrt.d\t" } } */
+/* { dg-final { scan-assembler-not "\trsqrt.s\t" } } */
 
 extern double sqrt(double);
 extern float sqrtf(float);
Index: gcc/testsuite/gcc.target/mips/sb1-1.c
===================================================================
--- gcc/testsuite/gcc.target/mips/sb1-1.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/sb1-1.c	2012-08-27 17:29:40.152033570 +0100
@@ -2,10 +2,10 @@
 /* { dg-do compile } */ 
 /* { dg-options "-march=sb1 -mpaired-single -mgp64 -ffast-math" } */
 /* { dg-skip-if "rsqrt code quality test" { *-*-* } { "-O0" } { "" } } */
-/* { dg-final { scan-assembler "div.ps" } } */ 
-/* { dg-final { scan-assembler "recip.ps" } } */ 
-/* { dg-final { scan-assembler "sqrt.ps" } } */ 
-/* { dg-final { scan-assembler "rsqrt.ps" } } */
+/* { dg-final { scan-assembler "\tdiv.ps\t" } } */
+/* { dg-final { scan-assembler "\trecip.ps\t" } } */
+/* { dg-final { scan-assembler "\tsqrt.ps\t" } } */
+/* { dg-final { scan-assembler "\trsqrt.ps\t" } } */
 
 typedef float v2sf __attribute__ ((vector_size (8)));
 
Index: gcc/testsuite/gcc.target/mips/scc-4.c
===================================================================
--- gcc/testsuite/gcc.target/mips/scc-4.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/scc-4.c	2012-08-27 17:29:17.708034220 +0100
@@ -2,8 +2,8 @@
 /* { dg-options "-mabi=o64" } */
 /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
 
-/* { dg-final { scan-assembler "slt\t" } } */
-/* { dg-final { scan-assembler "sltu\t\|xor\t\|xori\t" } } */
+/* { dg-final { scan-assembler "\tslt\t" } } */
+/* { dg-final { scan-assembler "\tsltu\t\|\txor\t\|\txori\t" } } */
 
 /* This test should work both in mips16 and non-mips16 mode.  */
 
Index: gcc/testsuite/gcc.target/mips/stack-1.c
===================================================================
--- gcc/testsuite/gcc.target/mips/stack-1.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/stack-1.c	2012-08-27 17:29:17.708034220 +0100
@@ -1,6 +1,6 @@
-/* { dg-final { scan-assembler "addiu\t(\\\$sp,)?\\\$sp,\[1-9\]" } } */
+/* { dg-final { scan-assembler "\td?addiu\t(\\\$sp,)?\\\$sp,\[1-9\]" } } */
 /* { dg-final { scan-assembler "\tlw\t" } } */
-/* { dg-final { scan-assembler-not "addiu\t(\\\$sp,)?\\\$sp,\[1-9\].*\tlw\t" } } */
+/* { dg-final { scan-assembler-not "\td?addiu\t(\\\$sp,)?\\\$sp,\[1-9\].*\tlw\t" } } */
 
 int foo (int y)
 {
Index: gcc/testsuite/gcc.target/mips/unaligned-1.c
===================================================================
--- gcc/testsuite/gcc.target/mips/unaligned-1.c	2012-08-27 17:27:13.000000000 +0100
+++ gcc/testsuite/gcc.target/mips/unaligned-1.c	2012-08-27 17:29:17.707034221 +0100
@@ -1,14 +1,14 @@
 /* { dg-options "-mgp64" } */
 /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
-/* { dg-final { scan-assembler-times "sdl\t" 1 } } */
-/* { dg-final { scan-assembler-times "sdr\t" 1 } } */
-/* { dg-final { scan-assembler-times "ldl\t" 1 } } */
-/* { dg-final { scan-assembler-times "ldr\t" 1 } } */
-/* { dg-final { scan-assembler-times "swl\t" 1 } } */
-/* { dg-final { scan-assembler-times "swr\t" 1 } } */
-/* { dg-final { scan-assembler-times "lwl\t" 1 } } */
-/* { dg-final { scan-assembler-times "lwr\t" 1 } } */
-/* { dg-final { scan-assembler-not "nop" } } */
+/* { dg-final { scan-assembler-times "\tsdl\t" 1 } } */
+/* { dg-final { scan-assembler-times "\tsdr\t" 1 } } */
+/* { dg-final { scan-assembler-times "\tldl\t" 1 } } */
+/* { dg-final { scan-assembler-times "\tldr\t" 1 } } */
+/* { dg-final { scan-assembler-times "\tswl\t" 1 } } */
+/* { dg-final { scan-assembler-times "\tswr\t" 1 } } */
+/* { dg-final { scan-assembler-times "\tlwl\t" 1 } } */
+/* { dg-final { scan-assembler-times "\tlwr\t" 1 } } */
+/* { dg-final { scan-assembler-not "\tnop" } } */
 
 /* Test to make sure we produce the unaligned load/store for
    both 64bit and 32bits sized accesses.  */
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]