From 8fdde048c9e40b9ef4de14612326378d4831ac49 Mon Sep 17 00:00:00 2001 From: Peter Bergner Date: Sat, 29 Feb 2020 16:29:19 -0600 Subject: [PATCH] Revert "rs6000: Fix more testsuite fallout from rs6000_legitimate_address_p() fix. [PR93913]" This reverts commit 98529e6d7408e896cb74c327ae60b3ccea055d9c. See PR93974. --- gcc/testsuite/ChangeLog | 9 --------- gcc/testsuite/gcc.target/powerpc/fold-vec-st-char.c | 2 +- gcc/testsuite/gcc.target/powerpc/fold-vec-st-float.c | 2 +- gcc/testsuite/gcc.target/powerpc/fold-vec-st-int.c | 2 +- gcc/testsuite/gcc.target/powerpc/fold-vec-st-short.c | 2 +- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9ae8374fa051..cef4e5a5c332 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -3,15 +3,6 @@ PR ada/91100 * gnat.dg/socket1.adb: Disable on hppa*-*-hpux*. -2020-02-26 Peter Bergner - - PR target/93913 - * gcc.target/powerpc/fold-vec-st-char.c (scan-assembler-times): Allow - stxv and stxvx instructions as well. - * gcc.target/powerpc/fold-vec-st-float.c: Likewise. - * gcc.target/powerpc/fold-vec-st-int.c: Likewise. - * gcc.target/powerpc/fold-vec-st-short.c: Likewise. - 2020-02-27 Jakub Jelinek PR c/93949 diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-char.c index d8de63fdeba6..4c4582780c22 100644 --- a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-char.c +++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-char.c @@ -91,4 +91,4 @@ testst_cst7 (vector bool char vbc1, int i1, signed char * vscp) return vec_st(vbc1, 36, vscp); } -/* { dg-final { scan-assembler-times {\m(?:stvx|stxv|stxvx)\M} 14 } } */ +/* { dg-final { scan-assembler-times {\mstvx\M} 14 } } */ diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-float.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-float.c index 61780fb308b2..5a8fc6670a69 100644 --- a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-float.c +++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-float.c @@ -31,4 +31,4 @@ testst_cst2 (vector float vf1, int i1, float * fp) return vec_st(vf1, 24, fp); } -/* { dg-final { scan-assembler-times {\m(?:stvx|stxv|stxvx)\M} 4 } } */ +/* { dg-final { scan-assembler-times {\mstvx\M} 4 } } */ diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-int.c index 4155a8f130f8..4db35f0dd945 100644 --- a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-int.c +++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-int.c @@ -80,5 +80,5 @@ testst_cst7 (vector bool int vbi1, int i1, signed int * vsip) return vec_st(vbi1, 36, vsip); } -/* { dg-final { scan-assembler-times {\m(?:stvx|stxv|stxvx)\M} 14 } } */ +/* { dg-final { scan-assembler-times {\mstvx\M} 14 } } */ diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-short.c index d9b7a0754a67..ba8397eef263 100644 --- a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-short.c +++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-short.c @@ -80,4 +80,4 @@ testst_cst7 (vector bool short vbs1, int i1, signed short * vssp) return vec_st(vbs1, 36, vssp); } -/* { dg-final { scan-assembler-times {\m(?:stvx|stxv|stxvx)\M} 14} } */ +/* { dg-final { scan-assembler-times {\mstvx\M} 14} } */ -- 2.47.2