Hi! I'd like to ping this patch. Segher had objected to the change in diagnostics, but I hope we've solved that now with the better informational message [1].
Thanks! Bill [1] https://gcc.gnu.org/pipermail/gcc-patches/2021-November/585250.html On 11/17/21 2:58 PM, Bill Schmidt wrote: > Hi! This patch is broken out of the previous patch for all the builtins test > suite adjustments. Here we have some slight changes in error messages due to > how the internals have changed between the old and new builtins methods. > > For scalar-extract-exp-2.c we change: > error: '__builtin_vec_scalar_extract_exp is not supported in this compiler > configuration' > > to: > error: '__builtin_vsx_scalar_extract_exp' requires the '-mcpu=power9' > option and either the '-m64' or '-mpowerpc64' option > note: builtin '__builtin_vec_scalar_extract_exp' requires builtin > '__builtin_vsx_scalar_extract_exp' > > The new message provides more information. In both cases, it is less than > ideal that we don't refer to scalar_extract_exp, which is referenced in > the source line, but this is because scalar_extract_exp is #define'd to > __builtin_vec_scalar_extract_exp, so it's unavoidable. Certainly this is no > worse than before, and arguably better. > > The cases for: > scalar-insert-exp-2.c > scalar-insert-exp-5.c > scalar-insert-exp-8.c > are all similar. > > For scalar-extract-sig-2.c we again change: > error: '__builtin_vec_scalar_extract_sig' is not supported in this compiler > configuration' > > to: > error: '__builtin_vsx_scalar_extract_sig' requires the '-mcpu=power9' > option and either the '-m64' or '-mpowerpc64' option > note: builtin '__builtin_vec_scalar_extract_sig' requires builtin > '__builtin_vsx_scalar_extract_sig' > > Here it is clearer because there is no #define to muddy things up, and > again the new message is arguably better than the old. > > For scalar-test-neg-{2,3,5}.c, we actually change the test case. This is > because we deliberately removed some undocumented and pointless > overloads, > where each overload mapped to a single builtin. These were: > __builtin_vec_scalar_test_neg_sp > __builtin_vec_scalar_test_neg_dp > __builtin_vec_scalar_test_neg_qp > which are redundant with the "real" overload: > __builtin_vec_scalar_test_neg > The latter maps to three builtins of the appropriate type. > > The revised test case uses the "real" overload instead, and otherwise the > changes to the error messages are the same as for all the other cases. > > 2021-11-17 Bill Schmidt <wschm...@linux.ibm.com> > > gcc/testsuite/ > * gcc.target/powerpc/bfp/scalar-extract-exp-2.c: Adjust error > message. > * gcc.target/powerpc/bfp/scalar-extract-sig-2.c: Likewise. > * gcc.target/powerpc/bfp/scalar-insert-exp-2.c: Likewise. > * gcc.target/powerpc/bfp/scalar-insert-exp-5.c: Likewise. > * gcc.target/powerpc/bfp/scalar-insert-exp-8.c: Likewise. > * gcc.target/powerpc/bfp/scalar-test-neg-2.c: Likewise. > * gcc.target/powerpc/bfp/scalar-test-neg-3.c: Likewise. > * gcc.target/powerpc/bfp/scalar-test-neg-5.c: Likewise. > --- > gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-2.c | 2 +- > gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-2.c | 2 +- > gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-2.c | 2 +- > gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-5.c | 2 +- > gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-8.c | 2 +- > gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-2.c | 2 +- > gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-3.c | 2 +- > gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-5.c | 2 +- > 8 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-2.c > b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-2.c > index 922180675fc..53b67c95cf9 100644 > --- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-2.c > +++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-2.c > @@ -14,7 +14,7 @@ get_exponent (double *p) > { > double source = *p; > > - return scalar_extract_exp (source); /* { dg-error > "'__builtin_vec_scalar_extract_exp' is not supported in this compiler > configuration" } */ > + return scalar_extract_exp (source); /* { dg-error > "'__builtin_vsx_scalar_extract_exp' requires the" } */ > } > > > diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-2.c > b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-2.c > index e24d4bd23fe..39ee74c94dc 100644 > --- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-2.c > +++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-2.c > @@ -12,5 +12,5 @@ get_significand (double *p) > { > double source = *p; > > - return __builtin_vec_scalar_extract_sig (source); /* { dg-error > "'__builtin_vec_scalar_extract_sig' is not supported in this compiler > configuration" } */ > + return __builtin_vec_scalar_extract_sig (source); /* { dg-error > "'__builtin_vsx_scalar_extract_sig' requires the" } */ > } > diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-2.c > b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-2.c > index feb943104da..efd69725905 100644 > --- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-2.c > +++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-2.c > @@ -16,5 +16,5 @@ insert_exponent (unsigned long long int *significand_p, > unsigned long long int significand = *significand_p; > unsigned long long int exponent = *exponent_p; > > - return scalar_insert_exp (significand, exponent); /* { dg-error > "'__builtin_vec_scalar_insert_exp' is not supported in this compiler > configuration" } */ > + return scalar_insert_exp (significand, exponent); /* { dg-error > "'__builtin_vsx_scalar_insert_exp' requires the" } */ > } > diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-5.c > b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-5.c > index 0e5683d5d1a..f85966a6fdf 100644 > --- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-5.c > +++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-5.c > @@ -16,5 +16,5 @@ insert_exponent (double *significand_p, > double significand = *significand_p; > unsigned long long int exponent = *exponent_p; > > - return scalar_insert_exp (significand, exponent); /* { dg-error > "'__builtin_vec_scalar_insert_exp' is not supported in this compiler > configuration" } */ > + return scalar_insert_exp (significand, exponent); /* { dg-error > "'__builtin_vsx_scalar_insert_exp_dp' requires the" } */ > } > diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-8.c > b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-8.c > index bd68f770985..b1be8284b4e 100644 > --- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-8.c > +++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-8.c > @@ -16,5 +16,5 @@ insert_exponent (unsigned __int128 *significand_p, /* { > dg-error "'__int128' is > unsigned __int128 significand = *significand_p; /* { dg-error "'__int128' > is not supported on this target" } */ > unsigned long long int exponent = *exponent_p; > > - return scalar_insert_exp (significand, exponent); /* { dg-error > "'__builtin_vec_scalar_insert_exp' is not supported in this compiler > configuration" } */ > + return scalar_insert_exp (significand, exponent); /* { dg-error > "'__builtin_vsx_scalar_insert_exp' requires the" } */ > } > diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-2.c > b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-2.c > index 7d2b4deefc3..46d743a899b 100644 > --- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-2.c > +++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-2.c > @@ -10,5 +10,5 @@ test_neg (float *p) > { > float source = *p; > > - return __builtin_vec_scalar_test_neg_sp (source); /* { dg-error > "'__builtin_vsx_scalar_test_neg_sp' requires" } */ > + return __builtin_vec_scalar_test_neg (source); /* { dg-error > "'__builtin_vsx_scalar_test_neg_sp' requires" } */ > } > diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-3.c > b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-3.c > index b503dfa8b56..bfc892b116e 100644 > --- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-3.c > +++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-3.c > @@ -10,5 +10,5 @@ test_neg (double *p) > { > double source = *p; > > - return __builtin_vec_scalar_test_neg_dp (source); /* { dg-error > "'__builtin_vsx_scalar_test_neg_dp' requires" } */ > + return __builtin_vec_scalar_test_neg (source); /* { dg-error > "'__builtin_vsx_scalar_test_neg_dp' requires" } */ > } > diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-5.c > b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-5.c > index bab86040a7b..8c55c1cfb5c 100644 > --- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-5.c > +++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-5.c > @@ -10,5 +10,5 @@ test_neg (__ieee128 *p) > { > __ieee128 source = *p; > > - return __builtin_vec_scalar_test_neg_qp (source); /* { dg-error > "'__builtin_vsx_scalar_test_neg_qp' requires" } */ > + return __builtin_vec_scalar_test_neg (source); /* { dg-error > "'__builtin_vsx_scalar_test_neg_qp' requires" } */ > }
