From 051b9873e78fe1acb1a3fecd0c6e5685b6c12fb3 Mon Sep 17 00:00:00 2001 From: Peter Bergner Date: Wed, 26 Feb 2020 11:58:08 -0600 Subject: [PATCH] rs6000: Fix more testsuite fallout from rs6000_legitimate_address_p() fix. [PR93913] 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. --- 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, 13 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 662ffbfd11e..79a868e8957 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +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-26 Patrick Palka * g++.dg/concepts/diagnostic2.C: New test. 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 4c4582780c2..d8de63fdeba 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 {\mstvx\M} 14 } } */ +/* { dg-final { scan-assembler-times {\m(?:stvx|stxv|stxvx)\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 5a8fc6670a6..61780fb308b 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 {\mstvx\M} 4 } } */ +/* { dg-final { scan-assembler-times {\m(?:stvx|stxv|stxvx)\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 4db35f0dd94..4155a8f130f 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 {\mstvx\M} 14 } } */ +/* { dg-final { scan-assembler-times {\m(?:stvx|stxv|stxvx)\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 ba8397eef26..d9b7a0754a6 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 {\mstvx\M} 14} } */ +/* { dg-final { scan-assembler-times {\m(?:stvx|stxv|stxvx)\M} 14} } */ -- 2.30.2