Hi!
On 2024-10-14T10:23:56+0200, I wrote:
> On 2024-10-13T10:21:01+0200, Tobias Burnus <tbur...@baylibre.com> wrote:
>> Now pushed as r15-4298-g3269a722b7a036.
>> --- a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90
>> +++ b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90
>> -! TODO: Have to disable the acc_on_device builtin for we want to test the
>> -! libgomp library function? The command line option
>> -! '-fno-builtin-acc_on_device' is valid for C/C++/ObjC/ObjC++ but not for
>> -! Fortran.
Here, you've just remove the comment, whereas...
>> --- a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f
>> +++ b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f
>> @@ -1,5 +1,5 @@
>> ! { dg-do run }
>> -! { dg-additional-options "-cpp" }
>> +! { dg-additional-options "-cpp -fno-builtin-acc_on_device" }
>> -! TODO: Have to disable the acc_on_device builtin for we want to test
>> -! the libgomp library function? The command line option
>> -! '-fno-builtin-acc_on_device' is valid for C/C++/ObjC/ObjC++ but not
>> -! for Fortran.
... here, and...
>> --- a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f
>> +++ b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f
>> @@ -1,5 +1,5 @@
>> ! { dg-do run }
>> -! { dg-additional-options "-cpp" }
>> +! { dg-additional-options "-cpp -fno-builtin-acc_on_device" }
>> -! TODO: Have to disable the acc_on_device builtin for we want to test
>> -! the libgomp library function? The command line option
>> -! '-fno-builtin-acc_on_device' is valid for C/C++/ObjC/ObjC++ but not
>> -! for Fortran.
... here, you also specify '-fno-builtin-acc_on_device'. This should be
done in the former, too, and some explanation be added, like in
'libgomp.oacc-c-c++-common/acc_on_device-1.c'. Pushed to trunk branch
commit 9f549d216c9716e787aaa38593bc9f83195b60ae
"Fortran: Use OpenACC's acc_on_device builtin, fix OpenMP'
__builtin_is_initial_device: Harmonize
'libgomp.oacc-fortran/acc_on_device-1-*'",
see attached.
Grüße
Thomas
>From 9f549d216c9716e787aaa38593bc9f83195b60ae Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwi...@baylibre.com>
Date: Mon, 14 Oct 2024 10:34:34 +0200
Subject: [PATCH] Fortran: Use OpenACC's acc_on_device builtin, fix OpenMP'
__builtin_is_initial_device: Harmonize
'libgomp.oacc-fortran/acc_on_device-1-*'
The test case 'libgomp.oacc-fortran/acc_on_device-1-1.f90' added in
commit 3269a722b7a03613e9c4e2862bc5088c4a17cc11
"Fortran: Use OpenACC's acc_on_device builtin, fix OpenMP' __builtin_is_initial_device"
was missing '-fno-builtin-acc_on_device', and all
'libgomp.oacc-fortran/acc_on_device-1-*' need comments, why that option is
specified.
PR testsuite/82250
libgomp/
* testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90: Add
'-fno-builtin-acc_on_device'.
* testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f: Comment.
* testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f: Comment.
---
libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90 | 3 +++
libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f | 5 ++++-
libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f | 5 ++++-
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90
index 89748204f05..774c2b869e8 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90
@@ -1,6 +1,9 @@
! { dg-do run }
! { dg-additional-options "-cpp" }
+! Disable the acc_on_device builtin; we want to test the libgomp library function.
+! { dg-additional-options -fno-builtin-acc_on_device }
+
! { dg-additional-options "-fopt-info-all-omp" }
! { dg-additional-options "--param=openacc-privatization=noisy" }
! { dg-additional-options "-foffload=-fopt-info-all-omp" }
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f
index e31e0fc715b..b57beac6f43 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f
+++ b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f
@@ -1,5 +1,8 @@
! { dg-do run }
-! { dg-additional-options "-cpp -fno-builtin-acc_on_device" }
+! { dg-additional-options "-cpp" }
+
+! Disable the acc_on_device builtin; we want to test the libgomp library function.
+! { dg-additional-options -fno-builtin-acc_on_device }
! { dg-additional-options "-fopt-info-all-omp" }
! { dg-additional-options "--param=openacc-privatization=noisy" }
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f
index 0595be241f8..969d530e30f 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f
+++ b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f
@@ -1,5 +1,8 @@
! { dg-do run }
-! { dg-additional-options "-cpp -fno-builtin-acc_on_device" }
+! { dg-additional-options "-cpp" }
+
+! Disable the acc_on_device builtin; we want to test the libgomp library function.
+! { dg-additional-options -fno-builtin-acc_on_device }
! { dg-additional-options "-fopt-info-all-omp" }
! { dg-additional-options "--param=openacc-privatization=noisy" }
--
2.34.1
