diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2023-06-14 12:44:05 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2023-06-14 12:56:35 +0200 |
| commit | f2ef1dabbc18eb6efc0eb47bbb0eebbc6d72e09e (patch) | |
| tree | 7214bffaf053bffd501180c36ccd42cf36909cf9 | |
| parent | 4bcb46b3ade1796c5a57b294f5cca25f00671cac (diff) | |
| download | gcc-f2ef1dabbc18eb6efc0eb47bbb0eebbc6d72e09e.zip gcc-f2ef1dabbc18eb6efc0eb47bbb0eebbc6d72e09e.tar.gz gcc-f2ef1dabbc18eb6efc0eb47bbb0eebbc6d72e09e.tar.bz2 | |
Align a 'OMP_TARGET_OFFLOAD=mandatory' diagnostic with others
On 2023-06-14T11:42:22+0200, Tobias Burnus <tobias@codesourcery.com> wrote:
> On 14.06.23 10:09, Thomas Schwinge wrote:
>> Let me know if I should also adjust the new 'target { ! offload_device }'
>> diagnostic "[...] MANDATORY but only the host device is available" to
>> include a comma before 'but', for consistency with the other existing
>> diagnostics (cited above)?
>
> I think it makes sense to be consistent. Thus: Yes, please add the commas.
Fix-up for recent commit 18c8b56c7d67a9e37acf28822587786f0fc0efbc
"OpenMP: Set default-device-var with OMP_TARGET_OFFLOAD=mandatory".
libgomp/
* target.c (resolve_device): Align a
'OMP_TARGET_OFFLOAD=mandatory' diagnostic with others.
* testsuite/libgomp.c/target-51.c: Adjust.
| -rw-r--r-- | libgomp/target.c | 4 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.c/target-51.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libgomp/target.c b/libgomp/target.c index f1020fa..e39ef8f 100644 --- a/libgomp/target.c +++ b/libgomp/target.c @@ -152,8 +152,8 @@ resolve_device (int device_id, bool remapped) return NULL; if (gomp_target_offload_var == GOMP_TARGET_OFFLOAD_MANDATORY && gomp_get_num_devices () == 0) - gomp_fatal ("OMP_TARGET_OFFLOAD is set to MANDATORY but only the host " - "device is available"); + gomp_fatal ("OMP_TARGET_OFFLOAD is set to MANDATORY, " + "but only the host device is available"); else if (device_id == omp_invalid_device) gomp_fatal ("omp_invalid_device encountered"); else if (gomp_target_offload_var == GOMP_TARGET_OFFLOAD_MANDATORY) diff --git a/libgomp/testsuite/libgomp.c/target-51.c b/libgomp/testsuite/libgomp.c/target-51.c index cf9e690..bbe9ade 100644 --- a/libgomp/testsuite/libgomp.c/target-51.c +++ b/libgomp/testsuite/libgomp.c/target-51.c @@ -9,7 +9,7 @@ /* See comment in target-50.c/target-50.c for why the output differs. */ -/* { dg-output ".*libgomp: OMP_TARGET_OFFLOAD is set to MANDATORY but only the host device is available.*" { target { ! offload_device } } } */ +/* { dg-output ".*libgomp: OMP_TARGET_OFFLOAD is set to MANDATORY, but only the host device is available.*" { target { ! offload_device } } } */ /* { dg-output ".*libgomp: OMP_TARGET_OFFLOAD is set to MANDATORY, but device not found.*" { target offload_device } } */ int |