Commit d64d068c by Ilya Leoshkevich Committed by Ilya Leoshkevich

S/390: Make tests expect column numbers in RTL output

RTL output now includes column numbers in addition to line numbers,
like this:

  "gcc/testsuite/gcc.target/s390/md/andc-splitter-1.c":16:1

This confuses some S/390 tests.

gcc/testsuite/ChangeLog:

2018-11-05  Ilya Leoshkevich  <iii@linux.ibm.com>

	* gcc.target/s390/md/andc-splitter-1.c: Add colon to
	expectations.
	* gcc.target/s390/md/andc-splitter-2.c: Likewise.
	* gcc.target/s390/md/setmem_long-1.c: Likewise.

From-SVN: r265813
parent 733441e2
2018-11-05 Ilya Leoshkevich <iii@linux.ibm.com>
* gcc.target/s390/md/andc-splitter-1.c: Add colon to
expectations.
* gcc.target/s390/md/andc-splitter-2.c: Likewise.
* gcc.target/s390/md/setmem_long-1.c: Likewise.
2018-11-05 Richard Biener <rguenther@suse.de> 2018-11-05 Richard Biener <rguenther@suse.de>
PR tree-optimization/87873 PR tree-optimization/87873
......
...@@ -14,26 +14,26 @@ ...@@ -14,26 +14,26 @@
__attribute__ ((noinline)) __attribute__ ((noinline))
unsigned long andc_vv(unsigned long a, unsigned long b) unsigned long andc_vv(unsigned long a, unsigned long b)
{ return ~b & a; } { return ~b & a; }
/* { dg-final { scan-assembler ":16 .\* \{\\*anddi3\}" } } */ /* { dg-final { scan-assembler ":16:.\* \{\\*anddi3\}" } } */
/* { dg-final { scan-assembler ":16 .\* \{\\*xordi3\}" } } */ /* { dg-final { scan-assembler ":16:.\* \{\\*xordi3\}" } } */
__attribute__ ((noinline)) __attribute__ ((noinline))
unsigned long andc_pv(unsigned long *a, unsigned long b) unsigned long andc_pv(unsigned long *a, unsigned long b)
{ return ~b & *a; } { return ~b & *a; }
/* { dg-final { scan-assembler ":22 .\* \{\\*anddi3\}" } } */ /* { dg-final { scan-assembler ":22:.\* \{\\*anddi3\}" } } */
/* { dg-final { scan-assembler ":22 .\* \{\\*xordi3\}" } } */ /* { dg-final { scan-assembler ":22:.\* \{\\*xordi3\}" } } */
__attribute__ ((noinline)) __attribute__ ((noinline))
unsigned long andc_vp(unsigned long a, unsigned long *b) unsigned long andc_vp(unsigned long a, unsigned long *b)
{ return ~*b & a; } { return ~*b & a; }
/* { dg-final { scan-assembler ":28 .\* \{\\*anddi3\}" } } */ /* { dg-final { scan-assembler ":28:.\* \{\\*anddi3\}" } } */
/* { dg-final { scan-assembler ":28 .\* \{\\*xordi3\}" } } */ /* { dg-final { scan-assembler ":28:.\* \{\\*xordi3\}" } } */
__attribute__ ((noinline)) __attribute__ ((noinline))
unsigned long andc_pp(unsigned long *a, unsigned long *b) unsigned long andc_pp(unsigned long *a, unsigned long *b)
{ return ~*b & *a; } { return ~*b & *a; }
/* { dg-final { scan-assembler ":34 .\* \{\\*anddi3\}" } } */ /* { dg-final { scan-assembler ":34:.\* \{\\*anddi3\}" } } */
/* { dg-final { scan-assembler ":34 .\* \{\\*xordi3\}" } } */ /* { dg-final { scan-assembler ":34:.\* \{\\*xordi3\}" } } */
/* { dg-final { scan-assembler-times "\tngr\?k\?\t" 4 } } */ /* { dg-final { scan-assembler-times "\tngr\?k\?\t" 4 } } */
/* { dg-final { scan-assembler-times "\txgr\?\t" 4 } } */ /* { dg-final { scan-assembler-times "\txgr\?\t" 4 } } */
......
...@@ -14,26 +14,26 @@ ...@@ -14,26 +14,26 @@
__attribute__ ((noinline)) __attribute__ ((noinline))
unsigned int andc_vv(unsigned int a, unsigned int b) unsigned int andc_vv(unsigned int a, unsigned int b)
{ return ~b & a; } { return ~b & a; }
/* { dg-final { scan-assembler ":16 .\* \{\\*andsi3_\(esa\|zarch\)\}" } } */ /* { dg-final { scan-assembler ":16:.\* \{\\*andsi3_\(esa\|zarch\)\}" } } */
/* { dg-final { scan-assembler ":16 .\* \{\\*xorsi3\}" } } */ /* { dg-final { scan-assembler ":16:.\* \{\\*xorsi3\}" } } */
__attribute__ ((noinline)) __attribute__ ((noinline))
unsigned int andc_pv(unsigned int *a, unsigned int b) unsigned int andc_pv(unsigned int *a, unsigned int b)
{ return ~b & *a; } { return ~b & *a; }
/* { dg-final { scan-assembler ":22 .\* \{\\*andsi3_\(esa\|zarch\)\}" } } */ /* { dg-final { scan-assembler ":22:.\* \{\\*andsi3_\(esa\|zarch\)\}" } } */
/* { dg-final { scan-assembler ":22 .\* \{\\*xorsi3\}" } } */ /* { dg-final { scan-assembler ":22:.\* \{\\*xorsi3\}" } } */
__attribute__ ((noinline)) __attribute__ ((noinline))
unsigned int andc_vp(unsigned int a, unsigned int *b) unsigned int andc_vp(unsigned int a, unsigned int *b)
{ return ~*b & a; } { return ~*b & a; }
/* { dg-final { scan-assembler ":28 .\* \{\\*andsi3_\(esa\|zarch\)\}" } } */ /* { dg-final { scan-assembler ":28:.\* \{\\*andsi3_\(esa\|zarch\)\}" } } */
/* { dg-final { scan-assembler ":28 .\* \{\\*xorsi3\}" } } */ /* { dg-final { scan-assembler ":28:.\* \{\\*xorsi3\}" } } */
__attribute__ ((noinline)) __attribute__ ((noinline))
unsigned int andc_pp(unsigned int *a, unsigned int *b) unsigned int andc_pp(unsigned int *a, unsigned int *b)
{ return ~*b & *a; } { return ~*b & *a; }
/* { dg-final { scan-assembler ":34 .\* \{\\*andsi3_\(esa\|zarch\)\}" } } */ /* { dg-final { scan-assembler ":34:.\* \{\\*andsi3_\(esa\|zarch\)\}" } } */
/* { dg-final { scan-assembler ":34 .\* \{\\*xorsi3\}" } } */ /* { dg-final { scan-assembler ":34:.\* \{\\*xorsi3\}" } } */
/* { dg-final { scan-assembler-times "\tnr\?k\?\t" 4 } } */ /* { dg-final { scan-assembler-times "\tnr\?k\?\t" 4 } } */
/* { dg-final { scan-assembler-times "\txr\?k\?\t" 4 } } */ /* { dg-final { scan-assembler-times "\txr\?k\?\t" 4 } } */
......
...@@ -23,8 +23,8 @@ void test2(char *p, int c, int len) ...@@ -23,8 +23,8 @@ void test2(char *p, int c, int len)
} }
/* Check that the right patterns are used. */ /* Check that the right patterns are used. */
/* { dg-final { scan-assembler-times {c"?:16 .*{[*]setmem_long_?3?1?z?}} 1 } } */ /* { dg-final { scan-assembler-times {c"?:16:.*{[*]setmem_long_?3?1?z?}} 1 } } */
/* { dg-final { scan-assembler-times {c"?:22 .*{[*]setmem_long_and_?3?1?z?}} 1 } } */ /* { dg-final { scan-assembler-times {c"?:22:.*{[*]setmem_long_and_?3?1?z?}} 1 } } */
#define LEN 500 #define LEN 500
char buf[LEN + 2]; char buf[LEN + 2];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment