Adjust 'libgomp.c-c++-common/requires-3.c' (was: [Patch][v4] OpenMP: Move omp requires checks to libgomp)
Commit Message
Hi!
In preparation for other changes:
On 2022-06-29T16:33:02+0200, Tobias Burnus <tobias@codesourcery.com> wrote:
> --- /dev/null
> +++ b/libgomp/testsuite/libgomp.c-c++-common/requires-3-aux.c
> @@ -0,0 +1,11 @@
> +/* { dg-skip-if "" { *-*-* } } */
> +
> +#pragma omp requires unified_address
> +
> +int x;
> +
> +void foo (void)
> +{
> + #pragma omp target
> + x = 1;
> +}
> --- /dev/null
> +++ b/libgomp/testsuite/libgomp.c-c++-common/requires-3.c
> @@ -0,0 +1,24 @@
> +/* { dg-do link { target offloading_enabled } } */
Not expected to see 'offloading_enabled' here...
> +/* { dg-additional-sources requires-3-aux.c } */
> +
> +/* Check diagnostic by device-compiler's lto1.
..., because of this note ^.
> + Other file uses: 'requires unified_address'. */
> +
> +#pragma omp requires unified_address,unified_shared_memory
> +
> +int a[10];
> +extern void foo (void);
> +
> +int
> +main (void)
> +{
> + #pragma omp target
> + for (int i = 0; i < 10; i++)
> + a[i] = 0;
> +
> + foo ();
> + return 0;
> +}
> +
> +/* { dg-error "OpenMP 'requires' directive with non-identical clauses in multiple compilation units: 'unified_address, unified_shared_memory' vs. 'unified_address'" "" { target *-*-* } 0 } */
> +/* { dg-excess-errors "Ignore messages like: errors during merging of translation units|mkoffload returned 1 exit status" } */
OK to push the attached "Adjust 'libgomp.c-c++-common/requires-3.c'"?
Grüße
Thomas
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
Comments
Hi Thomas, hello all,
On 07.07.22 10:37, Thomas Schwinge wrote:
> In preparation for other changes:
>
> On 2022-06-29T16:33:02+0200, Tobias Burnus <tobias@codesourcery.com> wrote:
>> +++ b/libgomp/testsuite/libgomp.c-c++-common/requires-3.c
>> @@ -0,0 +1,24 @@
>> +/* { dg-do link { target offloading_enabled } } */
> Not expected to see 'offloading_enabled' here...
>
>> +/* { dg-additional-sources requires-3-aux.c } */
>> +
>> +/* Check diagnostic by device-compiler's lto1.
> ..., because of this note ^.
...
> Subject: [PATCH] Adjust 'libgomp.c-c++-common/requires-3.c'
...
> libgomp/
> * testsuite/libgomp.c-c++-common/requires-3.c: Adjust.
...
> index 4b07ffdd09b..7091f400ef0 100644
> --- a/libgomp/testsuite/libgomp.c-c++-common/requires-3.c
> +++ b/libgomp/testsuite/libgomp.c-c++-common/requires-3.c
> @@ -1,4 +1,4 @@
> -/* { dg-do link { target offloading_enabled } } */
> +/* { dg-do link { target { offload_target_nvptx || offload_target_amdgcn } } } */
LGTM.
Tobias
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
From 6a4031b351680bdbfe3cdb9ac4e4a3aa59e4ca84 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
Date: Thu, 7 Jul 2022 09:59:45 +0200
Subject: [PATCH] Adjust 'libgomp.c-c++-common/requires-3.c'
As documented, this one does "Check diagnostic by device-compiler's lto1".
Indeed there are none when compiling with '-foffload=disable' with an
offloading-enabled compiler, so we should use 'offload_target_[...]', as
used in other similar test cases.
Follow-up to recent commit 683f11843974f0bdf42f79cdcbb0c2b43c7b81b0
"OpenMP: Move omp requires checks to libgomp".
libgomp/
* testsuite/libgomp.c-c++-common/requires-3.c: Adjust.
---
libgomp/testsuite/libgomp.c-c++-common/requires-3.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
@@ -1,4 +1,4 @@
-/* { dg-do link { target offloading_enabled } } */
+/* { dg-do link { target { offload_target_nvptx || offload_target_amdgcn } } } */
/* { dg-additional-sources requires-3-aux.c } */
/* Check diagnostic by device-compiler's lto1.
--
2.35.1