diff options
| author | Tobias Burnus <tobias@codesourcery.com> | 2019-09-18 13:45:34 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2020-03-03 12:51:25 +0100 |
| commit | 0c61ed9b762a293d2bf6e1ceb82ded863ffc8683 (patch) | |
| tree | 8ff0197bdbef912695a12fab1766ee28282b15fe /libgomp | |
| parent | e04901322aaf707053635ff4c2103c6b1a5d5afd (diff) | |
| download | gcc-0c61ed9b762a293d2bf6e1ceb82ded863ffc8683.zip gcc-0c61ed9b762a293d2bf6e1ceb82ded863ffc8683.tar.gz gcc-0c61ed9b762a293d2bf6e1ceb82ded863ffc8683.tar.bz2 | |
libgomp - fix dg-warning line numbers
libgomp/
* testsuite/libgomp.oacc-c-c++-common/parallel-dims.c: Fix dg-warning
line numbers.
* testsuite/libgomp.oacc-c-c++-common/serial-dims.c: Likewise.
(cherry picked from openacc-gcc-9-branch commit
0f2a4240229e97fdbcd3c8299642ed4b85f5b347)
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 db7f2a4..943a9e4 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,5 +1,11 @@ 2019-09-18 Tobias Burnus <tobias@codesourcery.com> + * testsuite/libgomp.oacc-c-c++-common/parallel-dims.c: Fix dg-warning + line numbers. + * testsuite/libgomp.oacc-c-c++-common/serial-dims.c: Likewise. + +2019-09-18 Tobias Burnus <tobias@codesourcery.com> + * linux/gomp_print.c (gomp_print_integer): Use PRId64 if available, otherwise cast for %ld. 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 d9f2c75..2c14f9c 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 } .-1 } */ \ + /* { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } 160 } */ \ 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 fd4b17c..3895405 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 *-*-* } .-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 } */ + /* { dg-warning "region contains gang partitioned code but is not gang partitioned" "" { target *-*-* } 61 } */ + /* { dg-warning "region contains worker partitioned code but is not worker partitioned" "" { target *-*-* } 61 } */ + /* { dg-warning "region contains vector partitioned code but is not vector partitioned" "" { target *-*-* } 61 } */ + /* { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } 61 } */ { if (acc_on_device (acc_device_nvidia)) { |