[PATCH] Fix regular expression error in PR 100166 patch

[PATCH] Fix regular expression error in PR 100166 patch

[Michael Meissner]

Fix regular expression error in PR 100166 patch

In my patch for PR testsuite/100166 (which fixes various tests so that the
plxv and pstxv instructions can be counted as legitimate instructions), I
had a typo in the pr86731-fwrapv-longlong.c test (using plvx instead of
plxv).  This patch fixes this error.

Can I apply it to the mainline?  I have tested this on a big endian power8
system (using --with-cpu=power8), a little endian power9 system (using
--with-cpu=power9), and on a power10 prototype (using --with-cpu=power10).  The
pr86731-fwrapv-longlong.c test passes in all cases.

2021-07-14  Michael Meissner  <meissner@linux.ibm.com>

gcc/testsuite/
	PR testsuite/100166
	* gcc.target/powerpc/pr86731-fwrapv-longlong.c: Fix typo.
---
 gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c b/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c
index bd1502bb30a..97bc60f7cd6 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c
@@ -30,5 +30,5 @@ vector signed long long splats4(void)
 
 /* { dg-final { scan-assembler-times {\mvspltis[bhw]\M} 0 } } */
 /* { dg-final { scan-assembler-times {\mvsl[bhwd]\M} 0 } } */
-/* { dg-final { scan-assembler-times {\mp?lxv\M|\mlxv\M|\mlxvd2x\M} 2 } } */
+/* { dg-final { scan-assembler-times {\mp?lxv?\M|\mlxvd2x\M} 2 } } */
 
-- 
2.31.1


-- 
Michael Meissner, IBM
IBM, M/S 2506R, 550 King Street, Littleton, MA 01460-6245, USA
email: meissner@linux.ibm.com, phone: +1 (978) 899-4797

Re: [PATCH] Fix regular expression error in PR 100166 patch

[Bill Schmidt]

Hi Mike,

On 7/14/21 4:42 PM, Michael Meissner wrote:
> Fix regular expression error in PR 100166 patch
>
> In my patch for PR testsuite/100166 (which fixes various tests so that the
> plxv and pstxv instructions can be counted as legitimate instructions), I
> had a typo in the pr86731-fwrapv-longlong.c test (using plvx instead of
> plxv).  This patch fixes this error.
>
> Can I apply it to the mainline?  I have tested this on a big endian power8
> system (using --with-cpu=power8), a little endian power9 system (using
> --with-cpu=power9), and on a power10 prototype (using --with-cpu=power10).  The
> pr86731-fwrapv-longlong.c test passes in all cases.
>
> 2021-07-14  Michael Meissner  <meissner@linux.ibm.com>
>
> gcc/testsuite/
> 	PR testsuite/100166
> 	* gcc.target/powerpc/pr86731-fwrapv-longlong.c: Fix typo.
> ---
>   gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c b/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c
> index bd1502bb30a..97bc60f7cd6 100644
> --- a/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c
> +++ b/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c
> @@ -30,5 +30,5 @@ vector signed long long splats4(void)
>   
>   /* { dg-final { scan-assembler-times {\mvspltis[bhw]\M} 0 } } */
>   /* { dg-final { scan-assembler-times {\mvsl[bhwd]\M} 0 } } */
> -/* { dg-final { scan-assembler-times {\mp?lxv\M|\mlxv\M|\mlxvd2x\M} 2 } } */
> +/* { dg-final { scan-assembler-times {\mp?lxv?\M|\mlxvd2x\M} 2 } } */
>   

That doesn't look like what you meant to do... That would accept "lx" 
among other strings...

Thanks,
Bill

Re: [PATCH] Fix regular expression error in PR 100166 patch

[Michael Meissner]

On Wed, Jul 14, 2021 at 04:51:52PM -0500, Bill Schmidt wrote:
> Hi Mike,
> 
> On 7/14/21 4:42 PM, Michael Meissner wrote:
> >Fix regular expression error in PR 100166 patch
> >
> >In my patch for PR testsuite/100166 (which fixes various tests so that the
> >plxv and pstxv instructions can be counted as legitimate instructions), I
> >had a typo in the pr86731-fwrapv-longlong.c test (using plvx instead of
> >plxv).  This patch fixes this error.
> >
> >Can I apply it to the mainline?  I have tested this on a big endian power8
> >system (using --with-cpu=power8), a little endian power9 system (using
> >--with-cpu=power9), and on a power10 prototype (using --with-cpu=power10).  The
> >pr86731-fwrapv-longlong.c test passes in all cases.
> >
> >2021-07-14  Michael Meissner  <meissner@linux.ibm.com>
> >
> >gcc/testsuite/
> >	PR testsuite/100166
> >	* gcc.target/powerpc/pr86731-fwrapv-longlong.c: Fix typo.
> >---
> >  gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> >diff --git a/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c b/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c
> >index bd1502bb30a..97bc60f7cd6 100644
> >--- a/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c
> >+++ b/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c
> >@@ -30,5 +30,5 @@ vector signed long long splats4(void)
> >  /* { dg-final { scan-assembler-times {\mvspltis[bhw]\M} 0 } } */
> >  /* { dg-final { scan-assembler-times {\mvsl[bhwd]\M} 0 } } */
> >-/* { dg-final { scan-assembler-times {\mp?lxv\M|\mlxv\M|\mlxvd2x\M} 2 } } */
> >+/* { dg-final { scan-assembler-times {\mp?lxv?\M|\mlxvd2x\M} 2 } } */
> 
> That doesn't look like what you meant to do... That would accept
> "lx" among other strings...

Yes, you are right.  I was trying to capture lxvx as per a suggestion from
Segher.

-- 
Michael Meissner, IBM
IBM, M/S 2506R, 550 King Street, Littleton, MA 01460-6245, USA
email: meissner@linux.ibm.com, phone: +1 (978) 899-4797