diff options
| author | Julian Brown <julian@codesourcery.com> | 2019-07-31 05:38:42 -0700 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2020-03-03 12:50:41 +0100 |
| commit | 78ffe6be90f5f0d0aa01772659879fd81e480dc9 (patch) | |
| tree | c2a6301cd86f0f163681547e83a8a9aa950b0f05 /libgomp | |
| parent | da5430880b8c503a39cfc2445337a6374419c446 (diff) | |
| download | gcc-78ffe6be90f5f0d0aa01772659879fd81e480dc9.zip gcc-78ffe6be90f5f0d0aa01772659879fd81e480dc9.tar.gz gcc-78ffe6be90f5f0d0aa01772659879fd81e480dc9.tar.bz2 | |
[og9] Update parallel-dims.c and serial-dims.c warning line numbering.
* testsuite/libgomp.oacc-c-c++-common/parallel-dims.c: Use relative
line numbers for warning.
* testsuite/libgomp.oacc-c-c++-common/serial-dims.c: Likewise.
(cherry picked from openacc-gcc-9-branch commit
fcea4b6e384e30231ab6d88b1f9feb1007b3e96b)
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog.omp | 6 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c | 2 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c | 8 |
3 files changed, 11 insertions, 5 deletions
diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index c850203..a187ebb 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,5 +1,11 @@ 2019-07-31 Julian Brown <julian@codesourcery.com> + * testsuite/libgomp.oacc-c-c++-common/parallel-dims.c: Use relative + line numbers for warning. + * testsuite/libgomp.oacc-c-c++-common/serial-dims.c: Likewise. + +2019-07-31 Julian Brown <julian@codesourcery.com> + * config/nvptx/gomp_print.c (gomp_print_string, gomp_print_integer, gomp_print_double): New. * plugin/plugin-nvptx.c (GOMP_OFFLOAD_openacc_async_construct): Add 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 ec63e3f..d9f2c75 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c @@ -158,7 +158,7 @@ int main () gangs_min = workers_min = vectors_min = INT_MAX; gangs_max = workers_max = vectors_max = INT_MIN; #pragma acc parallel copy (vectors_actual) /* { dg-warning "region contains vector partitioned code but is not vector partitioned" } */ \ - /* { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } 157 } */ \ + /* { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } .-1 } */ \ vector_length (VECTORS) /* { dg-warning "'vector_length' value must be positive" "" { target c++ } } */ { /* We're actually executing with vector_length (1), just the GCC nvptx diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c index d469209..fd4b17c 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c @@ -59,10 +59,10 @@ int main () gangs_max = workers_max = vectors_max = INT_MIN; gangs_actual = workers_actual = vectors_actual = 1; #pragma acc serial - /* { dg-warning "region contains gang partitioned code but is not gang partitioned" "" { target *-*-* } 58 } */ - /* { dg-warning "region contains worker partitioned code but is not worker partitioned" "" { target *-*-* } 58 } */ - /* { dg-warning "region contains vector partitioned code but is not vector partitioned" "" { target *-*-* } 58 } */ - /* { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } 58 } */ + /* { dg-warning "region contains gang partitioned code but is not gang partitioned" "" { target *-*-* } .-1 } */ + /* { dg-warning "region contains worker partitioned code but is not worker partitioned" "" { target *-*-* } .-2 } */ + /* { dg-warning "region contains vector partitioned code but is not vector partitioned" "" { target *-*-* } .-3 } */ + /* { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } .-4 } */ { if (acc_on_device (acc_device_nvidia)) { |