From de5cafe27131c002e6634dd7417577452eb1aac8 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Tue, 18 Jan 2022 17:50:02 +0100 Subject: [PATCH] nvptx: update fix for -Wformat-diag gcc/ChangeLog: * config/nvptx/nvptx.cc (nvptx_goacc_validate_dims_1): Update warning messages. libgomp/ChangeLog: * testsuite/libgomp.oacc-c-c++-common/acc_prof-kernels-1.c: Update scanning patterns. * testsuite/libgomp.oacc-c-c++-common/kernels-loop-2.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/parallel-dims.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/pr85486.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/pr95270-1.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/routine-nohost-2.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/struct-copyout-1.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/struct-copyout-2.c: Likewise. * testsuite/libgomp.oacc-fortran/attach-descriptor-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/derivedtypes-arrays-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/kernels-loop-2.f95: Likewise. * testsuite/libgomp.oacc-fortran/parallel-dims.f90: Likewise. --- gcc/config/nvptx/nvptx.cc | 8 ++++---- .../libgomp.oacc-c-c++-common/acc_prof-kernels-1.c | 4 ++-- .../libgomp.oacc-c-c++-common/kernels-loop-2.c | 4 ++-- .../libgomp.oacc-c-c++-common/parallel-dims.c | 12 ++++++------ .../testsuite/libgomp.oacc-c-c++-common/pr85486.c | 2 +- .../testsuite/libgomp.oacc-c-c++-common/pr95270-1.c | 4 ++-- .../libgomp.oacc-c-c++-common/routine-nohost-2.c | 2 +- .../libgomp.oacc-c-c++-common/struct-copyout-1.c | 2 +- .../libgomp.oacc-c-c++-common/struct-copyout-2.c | 2 +- .../libgomp.oacc-fortran/attach-descriptor-1.f90 | 2 +- .../libgomp.oacc-fortran/derivedtypes-arrays-1.f90 | 2 +- .../libgomp.oacc-fortran/kernels-loop-2.f95 | 4 ++-- .../testsuite/libgomp.oacc-fortran/parallel-dims.f90 | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/gcc/config/nvptx/nvptx.cc b/gcc/config/nvptx/nvptx.cc index a829bd3fe7a..db6a405d623 100644 --- a/gcc/config/nvptx/nvptx.cc +++ b/gcc/config/nvptx/nvptx.cc @@ -5894,7 +5894,7 @@ nvptx_goacc_validate_dims_1 (tree decl, int dims[], int fn_level, unsigned used) if (dims[GOMP_DIM_VECTOR] > PTX_WARP_SIZE) { - vector_reason = G_("using % (%d) due to call to" + vector_reason = G_("using % due to call to" " vector-partitionable routine, ignoring %d"); dims[GOMP_DIM_VECTOR] = PTX_WARP_SIZE; } @@ -5902,7 +5902,7 @@ nvptx_goacc_validate_dims_1 (tree decl, int dims[], int fn_level, unsigned used) if (dims[GOMP_DIM_VECTOR] == 0) { - vector_reason = G_("using % (%d), ignoring runtime setting"); + vector_reason = G_("using %, ignoring runtime setting"); dims[GOMP_DIM_VECTOR] = default_vector_length; } @@ -5916,12 +5916,12 @@ nvptx_goacc_validate_dims_1 (tree decl, int dims[], int fn_level, unsigned used) warning_at (decl ? DECL_SOURCE_LOCATION (decl) : UNKNOWN_LOCATION, 0, vector_reason != NULL ? vector_reason - : G_("using % (%d), ignoring %d"), + : G_("using %, ignoring %d"), dims[GOMP_DIM_VECTOR], old_dims[GOMP_DIM_VECTOR]); if (dims[GOMP_DIM_WORKER] != old_dims[GOMP_DIM_WORKER]) warning_at (decl ? DECL_SOURCE_LOCATION (decl) : UNKNOWN_LOCATION, 0, - G_("using % (%d), ignoring %d"), + G_("using %, ignoring %d"), dims[GOMP_DIM_WORKER], old_dims[GOMP_DIM_WORKER]); if (oacc_default_dims_p) diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-kernels-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-kernels-1.c index cb9b6cf8856..d7f47627438 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-kernels-1.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-kernels-1.c @@ -189,7 +189,7 @@ int main() int x[N]; #pragma acc kernels \ num_gangs (30) num_workers (3) vector_length (5) - /* { dg-prune-output "using .vector_length. \\(32\\), ignoring 5" } */ + /* { dg-prune-output "using .vector_length \\(32\\)., ignoring 5" } */ { for (int i = 0; i < N; ++i) x[i] = i * i; @@ -214,7 +214,7 @@ int main() int x[N]; #pragma acc kernels \ num_gangs (num_gangs) num_workers (num_workers) vector_length (vector_length) - /* { dg-prune-output "using .vector_length. \\(32\\), ignoring runtime setting" } */ + /* { dg-prune-output "using .vector_length \\(32\\)., ignoring runtime setting" } */ { for (int i = 0; i < N; ++i) x[i] = i * i; diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-2.c index 640951b4f85..591c0f322ef 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-2.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-2.c @@ -24,7 +24,7 @@ main (void) /* Parallelism dimensions: variable. */ #pragma acc kernels copyout (b[0:N]) \ num_gangs (3 + a[3]) num_workers (5 + a[5]) vector_length (7 + a[7]) - /* { dg-prune-output "using .vector_length. \\(32\\), ignoring runtime setting" } */ + /* { dg-prune-output "using .vector_length \\(32\\)., ignoring runtime setting" } */ { for (COUNTERTYPE i = 0; i < N; i++) b[i] = i * 4; @@ -33,7 +33,7 @@ main (void) /* Parallelism dimensions: literal. */ #pragma acc kernels copyin (a[0:N], b[0:N]) copyout (c[0:N]) \ num_gangs (3) num_workers (5) vector_length (7) - /* { dg-prune-output "using .vector_length. \\(32\\), ignoring 7" } */ + /* { dg-prune-output "using .vector_length \\(32\\)., ignoring 7" } */ { for (COUNTERTYPE ii = 0; ii < N; ii++) c[ii] = a[ii] + b[ii]; diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c index b1db3e887f8..f5273fb5ec4 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c @@ -133,7 +133,7 @@ int main () int gangs_min, gangs_max, workers_min, workers_max, vectors_min, vectors_max; gangs_min = workers_min = vectors_min = INT_MAX; gangs_max = workers_max = vectors_max = INT_MIN; -#pragma acc parallel copy (vectors_actual) /* { dg-warning "using .vector_length. \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } } */ \ +#pragma acc parallel copy (vectors_actual) /* { dg-warning "using .vector_length \\(32\\)., ignoring 1" "" { target openacc_nvidia_accel_selected } } */ \ vector_length (VECTORS) /* { dg-warning "'vector_length' value must be positive" "" { target c++ } } */ /* { dg-warning "region contains vector partitioned code but is not vector partitioned" "" { target *-*-* } .-2 } */ { @@ -341,7 +341,7 @@ int main () int gangs_min, gangs_max, workers_min, workers_max, vectors_min, vectors_max; gangs_min = workers_min = vectors_min = INT_MAX; gangs_max = workers_max = vectors_max = INT_MIN; -#pragma acc parallel copy (vectors_actual) /* { dg-warning "using .vector_length. \\(1024\\), ignoring 2097152" "" { target openacc_nvidia_accel_selected } } */ \ +#pragma acc parallel copy (vectors_actual) /* { dg-warning "using .vector_length \\(1024\\)., ignoring 2097152" "" { target openacc_nvidia_accel_selected } } */ \ vector_length (VECTORS) { if (acc_on_device (acc_device_host)) @@ -386,7 +386,7 @@ int main () int gangs_min, gangs_max, workers_min, workers_max, vectors_min, vectors_max; gangs_min = workers_min = vectors_min = INT_MAX; gangs_max = workers_max = vectors_max = INT_MIN; -#pragma acc parallel copy (vectors_actual) /* { dg-warning "using .vector_length. \\(32\\), ignoring runtime setting" "" { target openacc_nvidia_accel_selected } } */ \ +#pragma acc parallel copy (vectors_actual) /* { dg-warning "using .vector_length \\(32\\)., ignoring runtime setting" "" { target openacc_nvidia_accel_selected } } */ \ vector_length (vectors) { if (acc_on_device (acc_device_host)) @@ -443,7 +443,7 @@ int main () int gangs_min, gangs_max, workers_min, workers_max, vectors_min, vectors_max; gangs_min = workers_min = vectors_min = INT_MAX; gangs_max = workers_max = vectors_max = INT_MIN; -#pragma acc parallel copy (gangs_actual, workers_actual, vectors_actual) /* { dg-warning "using .vector_length. \\(32\\), ignoring 11" "" { target openacc_nvidia_accel_selected } } */ \ +#pragma acc parallel copy (gangs_actual, workers_actual, vectors_actual) /* { dg-warning "using .vector_length \\(32\\)., ignoring 11" "" { target openacc_nvidia_accel_selected } } */ \ num_gangs (gangs) \ num_workers (WORKERS) \ vector_length (VECTORS) @@ -564,7 +564,7 @@ int main () int gangs_min, gangs_max, workers_min, workers_max, vectors_min, vectors_max; gangs_min = workers_min = vectors_min = INT_MAX; gangs_max = workers_max = vectors_max = INT_MIN; -#pragma acc serial /* { dg-warning "using .vector_length. \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } } */ \ +#pragma acc serial /* { dg-warning "using .vector_length \\(32\\)., ignoring 1" "" { target openacc_nvidia_accel_selected } } */ \ reduction (min: gangs_min, workers_min, vectors_min) reduction (max: gangs_max, workers_max, vectors_max) { for (int i = 100; i > -100; i--) @@ -586,7 +586,7 @@ int main () int gangs_min, gangs_max, workers_min, workers_max, vectors_min, vectors_max; gangs_min = workers_min = vectors_min = INT_MAX; gangs_max = workers_max = vectors_max = INT_MIN; -#pragma acc serial copy (vectors_actual) /* { dg-warning "using .vector_length. \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } } */ \ +#pragma acc serial copy (vectors_actual) /* { dg-warning "using .vector_length \\(32\\)., ignoring 1" "" { target openacc_nvidia_accel_selected } } */ \ copy (gangs_min, gangs_max, workers_min, workers_max, vectors_min, vectors_max) /* { dg-bogus "warning: region contains gang partitioned code but is not gang partitioned" "TODO 'serial'" { xfail *-*-* } .-2 } { dg-bogus "warning: region contains worker partitioned code but is not worker partitioned" "TODO 'serial'" { xfail *-*-* } .-3 } diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/pr85486.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/pr85486.c index fcf5d60f866..10f84dad509 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/pr85486.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/pr85486.c @@ -31,7 +31,7 @@ main (void) int err = 0; -#pragma acc parallel copy (ary) VECTOR_LENGTH /* { dg-warning "using .vector_length. \\(32\\) due to call to vector-partitionable routine, ignoring 128" } */ +#pragma acc parallel copy (ary) VECTOR_LENGTH /* { dg-warning "using .vector_length \\(32\\). due to call to vector-partitionable routine, ignoring 128" } */ { Vector (&ary[0][0], m * n, (1 << 24) - (1 << 16)); } diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/pr95270-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/pr95270-1.c index 06afddb91a2..4a13663b609 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/pr95270-1.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/pr95270-1.c @@ -16,7 +16,7 @@ main () /* Test attach/detach directives. */ #pragma acc enter data attach(data_p) -#pragma acc serial copyout(ptrbits) /* { dg-warning "using .vector_length. \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } } */ +#pragma acc serial copyout(ptrbits) /* { dg-warning "using .vector_length \\(32\\)., ignoring 1" "" { target openacc_nvidia_accel_selected } } */ { ptrbits = (uintptr_t) data_p; } @@ -28,7 +28,7 @@ main () /* Test attach/detach API call. */ acc_attach ((void **) &data_p); -#pragma acc serial copyout(ptrbits) /* { dg-warning "using .vector_length. \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } } */ +#pragma acc serial copyout(ptrbits) /* { dg-warning "using .vector_length \\(32\\)., ignoring 1" "" { target openacc_nvidia_accel_selected } } */ { ptrbits = (uintptr_t) data_p; } diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-nohost-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-nohost-2.c index 7d7dbb569d3..20c420d7757 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-nohost-2.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-nohost-2.c @@ -21,7 +21,7 @@ int main() int x = -10; #pragma acc serial copy(x) - /* { dg-warning {using .vector_length. \(32\), ignoring 1} "" { target openacc_nvidia_accel_selected } .-1 } */ + /* { dg-warning {using .vector_length \(32\)., ignoring 1} "" { target openacc_nvidia_accel_selected } .-1 } */ { if (f1) x = f1(x); diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/struct-copyout-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/struct-copyout-1.c index 9f3d8268018..501a0e12732 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/struct-copyout-1.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/struct-copyout-1.c @@ -23,7 +23,7 @@ main (int argc, char *argv[]) #pragma acc enter data copyin(t.s) - #pragma acc serial present(t.s) /* { dg-warning "using .vector_length. \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } } */ + #pragma acc serial present(t.s) /* { dg-warning "using .vector_length \\(32\\)., ignoring 1" "" { target openacc_nvidia_accel_selected } } */ { t.s.a = 5; t.s.b = 6; diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/struct-copyout-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/struct-copyout-2.c index 654afaddba2..72ce4be7cf2 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/struct-copyout-2.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/struct-copyout-2.c @@ -23,7 +23,7 @@ main (int argc, char *argv[]) #pragma acc enter data copyin(s.a, s.b, s.c[0:N]) - #pragma acc serial present(s.a, s.b, s.c[0:N]) /* { dg-warning "using .vector_length. \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } } */ + #pragma acc serial present(s.a, s.b, s.c[0:N]) /* { dg-warning "using .vector_length \\(32\\)., ignoring 1" "" { target openacc_nvidia_accel_selected } } */ { s.a = 3; s.b = 4; diff --git a/libgomp/testsuite/libgomp.oacc-fortran/attach-descriptor-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/attach-descriptor-1.f90 index 12df6af0230..b03cbcd56d4 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/attach-descriptor-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/attach-descriptor-1.f90 @@ -43,7 +43,7 @@ subroutine test(variant) end if !$acc serial present(myvar%arr2) - ! { dg-warning "using .vector_length. \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } .-1 } + ! { dg-warning "using .vector_length \\(32\\)., ignoring 1" "" { target openacc_nvidia_accel_selected } .-1 } do i=1,10 myvar%arr1(i) = i + variant myvar%arr2(i) = i - variant diff --git a/libgomp/testsuite/libgomp.oacc-fortran/derivedtypes-arrays-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/derivedtypes-arrays-1.f90 index bd9afa2218c..c9978772424 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/derivedtypes-arrays-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/derivedtypes-arrays-1.f90 @@ -88,7 +88,7 @@ end do !$acc data copyin(var3%t2(5)%t1%arr1) !$acc serial present(var3%t2(5)%t1%arr1) -! { dg-warning "using .vector_length. \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } .-1 } +! { dg-warning "using .vector_length \\(32\\)., ignoring 1" "" { target openacc_nvidia_accel_selected } .-1 } var3%t2(5)%t1%arr1(:,:) = 6 !$acc end serial diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-2.f95 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-2.f95 index a60273ac294..62f49ba9098 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-2.f95 +++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-2.f95 @@ -16,7 +16,7 @@ program main ! Parallelism dimensions: variable. !$acc kernels copyout (b(0:n-1)) & !$acc num_gangs (3 + a(3)) num_workers (5 + a(5)) vector_length (7 + a(7)) - ! { dg-prune-output "using .vector_length. \\(32\\), ignoring runtime setting" } + ! { dg-prune-output "using .vector_length \\(32\\)., ignoring runtime setting" } do i = 0, n -1 b(i) = i * 4 end do @@ -25,7 +25,7 @@ program main ! Parallelism dimensions: literal. !$acc kernels copyin (a(0:n-1), b(0:n-1)) copyout (c(0:n-1)) & !$acc num_gangs (3) num_workers (5) vector_length (7) - ! { dg-prune-output "using .vector_length. \\(32\\), ignoring 7" } + ! { dg-prune-output "using .vector_length \\(32\\)., ignoring 7" } do ii = 0, n - 1 c(ii) = a(ii) + b(ii) end do diff --git a/libgomp/testsuite/libgomp.oacc-fortran/parallel-dims.f90 b/libgomp/testsuite/libgomp.oacc-fortran/parallel-dims.f90 index 02e3c2f4496..cd3f3555b78 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/parallel-dims.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/parallel-dims.f90 @@ -67,7 +67,7 @@ program main workers_max = -huge(gangs_max) - 1 ! INT_MIN vectors_max = -huge(gangs_max) - 1 ! INT_MIN !$acc serial & - !$acc reduction (min: gangs_min, workers_min, vectors_min) reduction (max: gangs_max, workers_max, vectors_max) ! { dg-warning "using .vector_length. \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } } + !$acc reduction (min: gangs_min, workers_min, vectors_min) reduction (max: gangs_max, workers_max, vectors_max) ! { dg-warning "using .vector_length \\(32\\)., ignoring 1" "" { target openacc_nvidia_accel_selected } } ! { dg-note {variable 'D\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } .-1 } do i = 100, -99, -1 gangs_min = acc_gang (); @@ -93,7 +93,7 @@ program main workers_max = -huge(gangs_max) - 1 ! INT_MIN vectors_max = -huge(gangs_max) - 1 ! INT_MIN !$acc serial copy (vectors_actual) & - !$acc copy (gangs_min, gangs_max, workers_min, workers_max, vectors_min, vectors_max) ! { dg-warning "using .vector_length. \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } } + !$acc copy (gangs_min, gangs_max, workers_min, workers_max, vectors_min, vectors_max) ! { dg-warning "using .vector_length \\(32\\)., ignoring 1" "" { target openacc_nvidia_accel_selected } } ! { dg-bogus "\[Ww\]arning: region contains gang partitioned code but is not gang partitioned" "TODO 'serial'" { xfail *-*-* } .-1 } ! { dg-bogus "\[Ww\]arning: region contains worker partitioned code but is not worker partitioned" "TODO 'serial'" { xfail *-*-* } .-2 } ! { dg-bogus "\[Ww\]arning: region contains vector partitioned code but is not vector partitioned" "TODO 'serial'" { xfail *-*-* } .-3 } -- 2.34.1