On 15/01/2021 3:07 pm, Kwok Cheung Yeung wrote:
I have tested bootstrapping on x86_64 (no offloading) with no issues, and
running the libgomp testsuite with Nvidia offloading shows no regressions. I
have also tested all the gomp.exp tests in the main gcc testsuite, also with no
issues. I am currently still running the full testsuite, but do not anticipate
any problems.
Okay to commit on trunk, if the full testsuite run does not show any
regressions?
Found an issue already :-( - the libgomp include files are not found when the
tests are run via 'make check'. I have now included the relevant parts of the
include files in the tests themselves. Okay for trunk (to be merged into the
main patch)?
Thanks
Kwok
diff --git a/gcc/testsuite/c-c++-common/gomp/task-detach-1.c
b/gcc/testsuite/c-c++-common/gomp/task-detach-1.c
index c7dda82..f50f748 100644
--- a/gcc/testsuite/c-c++-common/gomp/task-detach-1.c
+++ b/gcc/testsuite/c-c++-common/gomp/task-detach-1.c
@@ -1,7 +1,12 @@
/* { dg-do compile } */
/* { dg-options "-fopenmp" } */
-#include <omp.h>
+typedef enum omp_event_handle_t
+{
+ __omp_event_handle_t_max__ = __UINTPTR_MAX__
+} omp_event_handle_t;
+
+extern void omp_fulfill_event (omp_event_handle_t);
void f (omp_event_handle_t x, omp_event_handle_t y, int z)
{
diff --git a/gcc/testsuite/g++.dg/gomp/task-detach-1.C
b/gcc/testsuite/g++.dg/gomp/task-detach-1.C
index 443d3e8..2f0c650 100644
--- a/gcc/testsuite/g++.dg/gomp/task-detach-1.C
+++ b/gcc/testsuite/g++.dg/gomp/task-detach-1.C
@@ -1,7 +1,10 @@
// { dg-do compile }
// { dg-options "-fopenmp" }
-#include <omp.h>
+typedef enum omp_event_handle_t
+{
+ __omp_event_handle_t_max__ = __UINTPTR_MAX__
+} omp_event_handle_t;
template <typename T>
void func ()
diff --git a/gcc/testsuite/gcc.dg/gomp/task-detach-1.c
b/gcc/testsuite/gcc.dg/gomp/task-detach-1.c
index fa7315e..611044d 100644
--- a/gcc/testsuite/gcc.dg/gomp/task-detach-1.c
+++ b/gcc/testsuite/gcc.dg/gomp/task-detach-1.c
@@ -1,7 +1,12 @@
/* { dg-do compile } */
/* { dg-options "-fopenmp" } */
-#include <omp.h>
+typedef enum omp_event_handle_t
+{
+ __omp_event_handle_t_max__ = __UINTPTR_MAX__
+} omp_event_handle_t;
+
+extern void omp_fulfill_event (omp_event_handle_t);
void f (omp_event_handle_t x)
{
diff --git a/gcc/testsuite/gfortran.dg/gomp/task-detach-1.f90
b/gcc/testsuite/gfortran.dg/gomp/task-detach-1.f90
index dc51345..114068e 100644
--- a/gcc/testsuite/gfortran.dg/gomp/task-detach-1.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/task-detach-1.f90
@@ -2,8 +2,10 @@
! { dg-options "-fopenmp" }
program task_detach_1
- use omp_lib
-
+ use iso_c_binding, only: c_intptr_t
+ implicit none
+
+ integer, parameter :: omp_event_handle_kind = c_intptr_t
integer (kind=omp_event_handle_kind) :: x, y
integer :: z
