Pushed as pre-approved by Jeff. The patch fixes -Wformat-diag warnings.
Martin
gcc/ChangeLog:
* config/nvptx/nvptx.cc (nvptx_goacc_validate_dims_1): Wrap
keyword.
* config/nvptx/nvptx.md: Remove trailing dot.
libgomp/ChangeLog:
* testsuite/libgomp.oacc-c++/privatized-ref-2.C: Update keyword
in dg-warning.
* testsuite/libgomp.oacc-c++/privatized-ref-3.C: Likewise.
* testsuite/libgomp.oacc-c-c++-common/acc_prof-kernels-1.c: Likewise.
* 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-c-c++-common/vector-length-64-1.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.
* testsuite/libgomp.oacc-fortran/privatized-ref-1.f95: Likewise.
---
gcc/config/nvptx/nvptx.cc | 8 ++++----
gcc/config/nvptx/nvptx.md | 6 +++---
.../testsuite/libgomp.oacc-c++/privatized-ref-2.C | 6 +++---
.../testsuite/libgomp.oacc-c++/privatized-ref-3.C | 6 +++---
.../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 | 14 +++++++-------
.../testsuite/libgomp.oacc-c-c++-common/pr85486.c | 2 +-
.../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-c-c++-common/vector-length-64-1.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 ++--
.../libgomp.oacc-fortran/parallel-dims.f90 | 4 ++--
.../libgomp.oacc-fortran/privatized-ref-1.f95 | 6 +++---
18 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/gcc/config/nvptx/nvptx.cc b/gcc/config/nvptx/nvptx.cc
index 20fd8938f2d..a829bd3fe7a 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 vector_length (%d) due to call to"
+ vector_reason = G_("using %<vector_length%> (%d) 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 vector_length (%d), ignoring runtime setting");
+ vector_reason = G_("using %<vector_length%> (%d), 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 vector_length (%d), ignoring %d"),
+ : G_("using %<vector_length%> (%d), 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 num_workers (%d), ignoring %d"),
+ G_("using %<num_workers%> (%d), ignoring %d"),
dims[GOMP_DIM_WORKER], old_dims[GOMP_DIM_WORKER]);
if (oacc_default_dims_p)
diff --git a/gcc/config/nvptx/nvptx.md b/gcc/config/nvptx/nvptx.md
index ce74672e5ae..5cf190ab73e 100644
--- a/gcc/config/nvptx/nvptx.md
+++ b/gcc/config/nvptx/nvptx.md
@@ -1410,7 +1410,7 @@ (define_expand "nonlocal_goto"
(match_operand 3 "" "")]
""
{
- sorry ("target cannot support nonlocal goto.");
+ sorry ("target cannot support nonlocal goto");
emit_insn (gen_nop ());
DONE;
})
@@ -1419,7 +1419,7 @@ (define_expand "nonlocal_goto_receiver"
[(const_int 0)]
""
{
- sorry ("target cannot support nonlocal goto.");
+ sorry ("target cannot support nonlocal goto");
})
(define_expand "allocate_stack"
@@ -1438,7 +1438,7 @@ (define_expand "allocate_stack"
/* The ptx documentation specifies an alloca intrinsic (for 32 bit
only) but notes it is not implemented. The assembler emits a
confused error message. Issue a blunt one now instead. */
- sorry ("target cannot support alloca.");
+ sorry ("target cannot support alloca");
emit_insn (gen_nop ());
DONE;
})
diff --git a/libgomp/testsuite/libgomp.oacc-c++/privatized-ref-2.C
b/libgomp/testsuite/libgomp.oacc-c++/privatized-ref-2.C
index 520016ab59d..f531bae5f2d 100644
--- a/libgomp/testsuite/libgomp.oacc-c++/privatized-ref-2.C
+++ b/libgomp/testsuite/libgomp.oacc-c++/privatized-ref-2.C
@@ -69,7 +69,7 @@ void workers (void)
#pragma acc parallel copyout(res) num_gangs(64) num_workers(64) /* { dg-line
l_compute[incr c_compute] } */
/* { dg-note {variable 'i' declared in block isn't candidate for adjusting OpenACC
privatization level: not addressable} "" { target *-*-* } l_compute$c_compute }
*/
/* { dg-note {variable 'j' declared in block isn't candidate for adjusting OpenACC
privatization level: not addressable} "" { target *-*-* } l_compute$c_compute }
*/
- /* { dg-warning "using num_workers \\(32\\), ignoring 64" "" { target
openacc_nvidia_accel_selected } l_compute$c_compute } */
+ /* { dg-warning "using .num_workers. \\(32\\), ignoring 64" "" { target
openacc_nvidia_accel_selected } l_compute$c_compute } */
{
int i, j;
#pragma acc loop gang /* { dg-line l_loop[incr c_loop] } */
@@ -105,7 +105,7 @@ void vectors (void)
#pragma acc parallel copyout(res) num_gangs(64) num_workers(64) /* { dg-line
l_compute[incr c_compute] } */
/* { dg-note {variable 'i' declared in block isn't candidate for adjusting OpenACC
privatization level: not addressable} "" { target *-*-* } l_compute$c_compute }
*/
/* { dg-note {variable 'j' declared in block isn't candidate for adjusting OpenACC
privatization level: not addressable} "" { target *-*-* } l_compute$c_compute }
*/
- /* { dg-warning "using num_workers \\(32\\), ignoring 64" "" { target
openacc_nvidia_accel_selected } l_compute$c_compute } */
+ /* { dg-warning "using .num_workers. \\(32\\), ignoring 64" "" { target
openacc_nvidia_accel_selected } l_compute$c_compute } */
{
int i, j;
#pragma acc loop gang worker /* { dg-line l_loop[incr c_loop] } */
@@ -141,7 +141,7 @@ void gangs_workers_vectors (void)
#pragma acc parallel copyout(res) num_gangs(64) num_workers(64) /* { dg-line
l_compute[incr c_compute] } */
/* { dg-note {variable 'i' declared in block isn't candidate for adjusting OpenACC
privatization level: not addressable} "" { target *-*-* } l_compute$c_compute }
*/
/* { dg-note {variable 'j' declared in block isn't candidate for adjusting OpenACC
privatization level: not addressable} "" { target *-*-* } l_compute$c_compute }
*/
- /* { dg-warning "using num_workers \\(32\\), ignoring 64" "" { target
openacc_nvidia_accel_selected } l_compute$c_compute } */
+ /* { dg-warning "using .num_workers. \\(32\\), ignoring 64" "" { target
openacc_nvidia_accel_selected } l_compute$c_compute } */
{
int i, j;
#pragma acc loop collapse(2) gang worker vector /* { dg-line l_loop[incr
c_loop] } */
diff --git a/libgomp/testsuite/libgomp.oacc-c++/privatized-ref-3.C
b/libgomp/testsuite/libgomp.oacc-c++/privatized-ref-3.C
index cb7085a01e8..9030fb1d605 100644
--- a/libgomp/testsuite/libgomp.oacc-c++/privatized-ref-3.C
+++ b/libgomp/testsuite/libgomp.oacc-c++/privatized-ref-3.C
@@ -86,7 +86,7 @@ void workers (void)
{ dg-bogus {note: variable 'tmpvar' adjusted for OpenACC privatization level: 'gang'}
"" { target { openacc_nvidia_accel_selected && __OPTIMIZE__ } }
l_compute$c_compute }
*/
/* { dg-note {variable 'tmpref' declared in block isn't candidate for adjusting
OpenACC privatization level: not addressable} "" { target *-*-* }
l_compute$c_compute } */
- /* { dg-warning "using num_workers \\(32\\), ignoring 64" "" { target
openacc_nvidia_accel_selected } l_compute$c_compute } */
+ /* { dg-warning "using .num_workers. \\(32\\), ignoring 64" "" { target
openacc_nvidia_accel_selected } l_compute$c_compute } */
{
int i, j;
int tmpvar;
@@ -132,7 +132,7 @@ void vectors (void)
{ dg-bogus {note: variable 'tmpvar' adjusted for OpenACC privatization level: 'gang'}
"" { target { openacc_nvidia_accel_selected && __OPTIMIZE__ } }
l_compute$c_compute }
*/
/* { dg-note {variable 'tmpref' declared in block isn't candidate for adjusting
OpenACC privatization level: not addressable} "" { target *-*-* }
l_compute$c_compute } */
- /* { dg-warning "using num_workers \\(32\\), ignoring 64" "" { target
openacc_nvidia_accel_selected } l_compute$c_compute } */
+ /* { dg-warning "using .num_workers. \\(32\\), ignoring 64" "" { target
openacc_nvidia_accel_selected } l_compute$c_compute } */
{
int i, j;
int tmpvar;
@@ -178,7 +178,7 @@ void gangs_workers_vectors (void)
{ dg-bogus {note: variable 'tmpvar' adjusted for OpenACC privatization level: 'gang'}
"" { target { openacc_nvidia_accel_selected && __OPTIMIZE__ } }
l_compute$c_compute }
*/
/* { dg-note {variable 'tmpref' declared in block isn't candidate for adjusting
OpenACC privatization level: not addressable} "" { target *-*-* }
l_compute$c_compute } */
- /* { dg-warning "using num_workers \\(32\\), ignoring 64" "" { target
openacc_nvidia_accel_selected } l_compute$c_compute } */
+ /* { dg-warning "using .num_workers. \\(32\\), ignoring 64" "" { target
openacc_nvidia_accel_selected } l_compute$c_compute } */
{
int i, j;
int tmpvar;
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 ad33f72e2fb..cb9b6cf8856 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 b84088879c6..640951b4f85 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 9392e1d88c5..b1db3e887f8 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 } */
{
@@ -246,7 +246,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 (workers_actual) /* { dg-warning "using num_workers \\(32\\),
ignoring 2097152" "" { target openacc_nvidia_accel_selected } } */ \
+#pragma acc parallel copy (workers_actual) /* { dg-warning "using .num_workers. \\(32\\),
ignoring 2097152" "" { target openacc_nvidia_accel_selected } } */ \
num_workers (WORKERS)
{
if (acc_on_device (acc_device_host))
@@ -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 f95f2ee3123..fcf5d60f866 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 0457c232bc9..06afddb91a2 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 4d081f269eb..7d7dbb569d3 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 b86f1c921a9..9f3d8268018 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 4dd8a3a7e17..654afaddba2 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-c-c++-common/vector-length-64-1.c
b/libgomp/testsuite/libgomp.oacc-c-c++-common/vector-length-64-1.c
index 2d57ad4464a..faa0f70b090 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/vector-length-64-1.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/vector-length-64-1.c
@@ -4,7 +4,7 @@
int
main (void)
{
-#pragma acc parallel vector_length (64) num_workers (16) /* { dg-warning "using num_workers
\\(15\\), ignoring 16" "" { target openacc_nvidia_accel_selected } } */
+#pragma acc parallel vector_length (64) num_workers (16) /* { dg-warning "using .num_workers.
\\(15\\), ignoring 16" "" { target openacc_nvidia_accel_selected } } */
{
#pragma acc loop worker
for (unsigned int i = 0; i < 32; i++)
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/attach-descriptor-1.f90
b/libgomp/testsuite/libgomp.oacc-fortran/attach-descriptor-1.f90
index 2701192e37d..12df6af0230 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 7bca2df6628..bd9afa2218c 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 4b69e813d05..a60273ac294 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 fad3d9d6a80..02e3c2f4496 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 }
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/privatized-ref-1.f95
b/libgomp/testsuite/libgomp.oacc-fortran/privatized-ref-1.f95
index a8230561fc9..73d9975ae8b 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/privatized-ref-1.f95
+++ b/libgomp/testsuite/libgomp.oacc-fortran/privatized-ref-1.f95
@@ -96,7 +96,7 @@ contains
real, intent(out) :: res(:)
!$acc parallel copyout(res) num_gangs(64) num_workers(64)
- ! { dg-warning "using num_workers \\(32\\), ignoring 64" "" { target
openacc_nvidia_accel_selected } .-1 }
+ ! { dg-warning "using .num_workers. \\(32\\), ignoring 64" "" { target
openacc_nvidia_accel_selected } .-1 }
!$acc loop gang ! { dg-line l_loop[incr c_loop] }
! { dg-note {variable 'i' in 'private' clause isn't candidate for adjusting OpenACC
privatization level: not addressable} "" { target *-*-* } l_loop$c_loop }
@@ -120,7 +120,7 @@ contains
real, intent(out) :: res(:)
!$acc parallel copyout(res) num_gangs(64) num_workers(64)
- ! { dg-warning "using num_workers \\(32\\), ignoring 64" "" { target
openacc_nvidia_accel_selected } .-1 }
+ ! { dg-warning "using .num_workers. \\(32\\), ignoring 64" "" { target
openacc_nvidia_accel_selected } .-1 }
!$acc loop gang worker ! { dg-line l_loop[incr c_loop] }
! { dg-note {variable 'i' in 'private' clause isn't candidate for adjusting OpenACC
privatization level: not addressable} "" { target *-*-* } l_loop$c_loop }
@@ -144,7 +144,7 @@ contains
real, intent(out) :: res(:)
!$acc parallel copyout(res) num_gangs(64) num_workers(64)
- ! { dg-warning "using num_workers \\(32\\), ignoring 64" "" { target
openacc_nvidia_accel_selected } .-1 }
+ ! { dg-warning "using .num_workers. \\(32\\), ignoring 64" "" { target
openacc_nvidia_accel_selected } .-1 }
!$acc loop collapse(2) gang worker vector private(t1) ! { dg-line l_loop[incr c_loop] }
! { dg-note {variable 'i' in 'private' clause isn't candidate for adjusting OpenACC
privatization level: not addressable} "" { target *-*-* } l_loop$c_loop }
--
2.34.1
