Hi! I'd like to ping this patch.
Thanks!
Bill
On 11/18/21 10:15 AM, Bill Schmidt wrote:
> Hi! This patch is broken out from the test case patch for the new
> builtins support.
>
> One advantage of the new builtins support is uniform error messages for
> arguments with restricted values. Previously this was done in many places
> in an ad hoc manner, with little uniformity. This patch adjusts the
> expected error messages accordingly.
>
> All error messages are now one of the following:
> "argument %d must be a %d-bit unsigned literal"
> "argument %d must be a literal between %d and %d, inclusive"
> "argument %d must be a variable or a literal between %d and %d, inclusive"
> "argument %d must be either a literal %d or a literal %d"
>
> These messages were chosen to require the fewest changes from previous
> messages while still introducing uniformity. This patch adjusts error
> messages for some cases where this produces changed messages.
>
> Tested on powerpc64le-linux-gnu and powerpc64-linux-gnu (-m32/-m64) with
> no regressions. is this okay for trunk?
>
> Thanks!
> Bill
>
>
> 2021-11-17 Bill Schmidt <wschm...@linux.ibm.com>
>
> gcc/testsuite/
> * gcc.target/powerpc/pr80315-1.c: Adjust error message.
> * gcc.target/powerpc/pr80315-2.c: Likewise.
> * gcc.target/powerpc/pr80315-3.c: Likewise.
> * gcc.target/powerpc/pr80315-4.c: Likewise.
> * gcc.target/powerpc/pr88100.c: Likewise.
> ---
> gcc/testsuite/gcc.target/powerpc/pr80315-1.c | 2 +-
> gcc/testsuite/gcc.target/powerpc/pr80315-2.c | 2 +-
> gcc/testsuite/gcc.target/powerpc/pr80315-3.c | 2 +-
> gcc/testsuite/gcc.target/powerpc/pr80315-4.c | 2 +-
> gcc/testsuite/gcc.target/powerpc/pr88100.c | 12 ++++++------
> 5 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/gcc/testsuite/gcc.target/powerpc/pr80315-1.c
> b/gcc/testsuite/gcc.target/powerpc/pr80315-1.c
> index e2db0ff4b5f..f37f1f169a2 100644
> --- a/gcc/testsuite/gcc.target/powerpc/pr80315-1.c
> +++ b/gcc/testsuite/gcc.target/powerpc/pr80315-1.c
> @@ -10,6 +10,6 @@ main()
> int mask;
>
> /* Argument 2 must be 0 or 1. Argument 3 must be in range 0..15. */
> - res = __builtin_crypto_vshasigmaw (test, 1, 0xff); /* { dg-error {argument
> 3 must be in the range \[0, 15\]} } */
> + res = __builtin_crypto_vshasigmaw (test, 1, 0xff); /* { dg-error {argument
> 3 must be a 4-bit unsigned literal} } */
> return 0;
> }
> diff --git a/gcc/testsuite/gcc.target/powerpc/pr80315-2.c
> b/gcc/testsuite/gcc.target/powerpc/pr80315-2.c
> index 144b705c012..0819a0511b7 100644
> --- a/gcc/testsuite/gcc.target/powerpc/pr80315-2.c
> +++ b/gcc/testsuite/gcc.target/powerpc/pr80315-2.c
> @@ -10,6 +10,6 @@ main ()
> int mask;
>
> /* Argument 2 must be 0 or 1. Argument 3 must be in range 0..15. */
> - res = __builtin_crypto_vshasigmad (test, 1, 0xff); /* { dg-error {argument
> 3 must be in the range \[0, 15\]} } */
> + res = __builtin_crypto_vshasigmad (test, 1, 0xff); /* { dg-error {argument
> 3 must be a 4-bit unsigned literal} } */
> return 0;
> }
> diff --git a/gcc/testsuite/gcc.target/powerpc/pr80315-3.c
> b/gcc/testsuite/gcc.target/powerpc/pr80315-3.c
> index 99a3e24eadd..cc2e46cf5cb 100644
> --- a/gcc/testsuite/gcc.target/powerpc/pr80315-3.c
> +++ b/gcc/testsuite/gcc.target/powerpc/pr80315-3.c
> @@ -12,6 +12,6 @@ main ()
> int mask;
>
> /* Argument 2 must be 0 or 1. Argument 3 must be in range 0..15. */
> - res = vec_shasigma_be (test, 1, 0xff); /* { dg-error {argument 3 must be
> in the range \[0, 15\]} } */
> + res = vec_shasigma_be (test, 1, 0xff); /* { dg-error {argument 3 must be a
> 4-bit unsigned literal} } */
> return res;
> }
> diff --git a/gcc/testsuite/gcc.target/powerpc/pr80315-4.c
> b/gcc/testsuite/gcc.target/powerpc/pr80315-4.c
> index 7f5f6f75029..ac12910741b 100644
> --- a/gcc/testsuite/gcc.target/powerpc/pr80315-4.c
> +++ b/gcc/testsuite/gcc.target/powerpc/pr80315-4.c
> @@ -12,6 +12,6 @@ main ()
> int mask;
>
> /* Argument 2 must be 0 or 1. Argument 3 must be in range 0..15. */
> - res = vec_shasigma_be (test, 1, 0xff); /* { dg-error {argument 3 must be
> in the range \[0, 15\]} } */
> + res = vec_shasigma_be (test, 1, 0xff); /* { dg-error {argument 3 must be a
> 4-bit unsigned literal} } */
> return res;
> }
> diff --git a/gcc/testsuite/gcc.target/powerpc/pr88100.c
> b/gcc/testsuite/gcc.target/powerpc/pr88100.c
> index 4452145ce95..764c897a497 100644
> --- a/gcc/testsuite/gcc.target/powerpc/pr88100.c
> +++ b/gcc/testsuite/gcc.target/powerpc/pr88100.c
> @@ -10,35 +10,35 @@
> vector unsigned char
> splatu1 (void)
> {
> - return vec_splat_u8(0x100);/* { dg-error "argument 1 must be a 5-bit
> signed literal" } */
> + return vec_splat_u8(0x100);/* { dg-error "argument 1 must be a literal
> between -16 and 15, inclusive" } */
> }
>
> vector unsigned short
> splatu2 (void)
> {
> - return vec_splat_u16(0x10000);/* { dg-error "argument 1 must be a 5-bit
> signed literal" } */
> + return vec_splat_u16(0x10000);/* { dg-error "argument 1 must be a literal
> between -16 and 15, inclusive" } */
> }
>
> vector unsigned int
> splatu3 (void)
> {
> - return vec_splat_u32(0x10000000);/* { dg-error "argument 1 must be a 5-bit
> signed literal" } */
> + return vec_splat_u32(0x10000000);/* { dg-error "argument 1 must be a
> literal between -16 and 15, inclusive" } */
> }
>
> vector signed char
> splats1 (void)
> {
> - return vec_splat_s8(0x100);/* { dg-error "argument 1 must be a 5-bit
> signed literal" } */
> + return vec_splat_s8(0x100);/* { dg-error "argument 1 must be a literal
> between -16 and 15, inclusive" } */
> }
>
> vector signed short
> splats2 (void)
> {
> - return vec_splat_s16(0x10000);/* { dg-error "argument 1 must be a 5-bit
> signed literal" } */
> + return vec_splat_s16(0x10000);/* { dg-error "argument 1 must be a literal
> between -16 and 15, inclusive" } */
> }
>
> vector signed int
> splats3 (void)
> {
> - return vec_splat_s32(0x10000000);/* { dg-error "argument 1 must be a 5-bit
> signed literal" } */
> + return vec_splat_s32(0x10000000);/* { dg-error "argument 1 must be a
> literal between -16 and 15, inclusive" } */
> }
