[Openmp-commits] [openmp] c46ccb8 - [OpenMP][tests][NFC] Update test status for gcc 11 and 12

[Joachim Protze via Openmp-commits]

Author: Joachim Protze
Date: 2021-07-25T18:56:36+02:00
New Revision: c46ccb8538c5c0b4724a842e110ad46d7e1b107a

URL: https://github.com/llvm/llvm-project/commit/c46ccb8538c5c0b4724a842e110ad46d7e1b107a
DIFF: https://github.com/llvm/llvm-project/commit/c46ccb8538c5c0b4724a842e110ad46d7e1b107a.diff

LOG: [OpenMP][tests][NFC] Update test status for gcc 11 and 12

gcc 11 introduced support for depend clause, but the gomp interface of libomp
does not yet handle the information.
Also remove -fopenmp-version=50, which is no longer needed for clang, but not
supported by gcc.

Added: 
    

Modified: 
    openmp/runtime/test/ompt/tasks/task_early_fulfill.c
    openmp/runtime/test/ompt/tasks/task_late_fulfill.c
    openmp/runtime/test/ompt/tasks/taskwait-depend.c
    openmp/runtime/test/tasking/omp_detach_taskwait.c
    openmp/tools/archer/tests/task/task_early_fulfill.c
    openmp/tools/archer/tests/task/task_late_fulfill.c

Removed: 
    


################################################################################
diff  --git a/openmp/runtime/test/ompt/tasks/task_early_fulfill.c b/openmp/runtime/test/ompt/tasks/task_early_fulfill.c
index e1324e6af681a..f2939f81a9258 100644
--- a/openmp/runtime/test/ompt/tasks/task_early_fulfill.c
+++ b/openmp/runtime/test/ompt/tasks/task_early_fulfill.c
@@ -1,9 +1,11 @@
-// RUN: %libomp-compile -fopenmp-version=50 && env OMP_NUM_THREADS='3' \
+// RUN: %libomp-compile && env OMP_NUM_THREADS='3' \
 // RUN:    %libomp-run | %sort-threads | FileCheck %s
 // REQUIRES: ompt
 
 // Checked gcc 10.1 still does not support detach clause on task construct.
 // UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7, gcc-8, gcc-9, gcc-10
+// gcc 11 introduced detach clause, but gomp interface in libomp has no support
+// XFAIL: gcc-11, gcc-12
 // clang supports detach clause since version 11.
 // UNSUPPORTED: clang-10, clang-9, clang-8, clang-7
 // icc compiler does not support detach clause.

diff  --git a/openmp/runtime/test/ompt/tasks/task_late_fulfill.c b/openmp/runtime/test/ompt/tasks/task_late_fulfill.c
index 13a2a54a60df7..d14b78d9c88f3 100644
--- a/openmp/runtime/test/ompt/tasks/task_late_fulfill.c
+++ b/openmp/runtime/test/ompt/tasks/task_late_fulfill.c
@@ -1,9 +1,11 @@
-// RUN: %libomp-compile -fopenmp-version=50 && env OMP_NUM_THREADS='3' \
+// RUN: %libomp-compile && env OMP_NUM_THREADS='3' \
 // RUN:    %libomp-run | %sort-threads | FileCheck %s
 // REQUIRES: ompt
 
 // Checked gcc 10.1 still does not support detach clause on task construct.
 // UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7, gcc-8, gcc-9, gcc-10
+// gcc 11 introduced detach clause, but gomp interface in libomp has no support
+// XFAIL: gcc-11, gcc-12
 // clang supports detach clause since version 11.
 // UNSUPPORTED: clang-10, clang-9, clang-8, clang-7
 // icc compiler does not support detach clause.

diff  --git a/openmp/runtime/test/ompt/tasks/taskwait-depend.c b/openmp/runtime/test/ompt/tasks/taskwait-depend.c
index e62ad70f26ce8..74fee2024237c 100644
--- a/openmp/runtime/test/ompt/tasks/taskwait-depend.c
+++ b/openmp/runtime/test/ompt/tasks/taskwait-depend.c
@@ -70,8 +70,8 @@ int main() {
 // CHECK-SAME: parent_task_frame.reenter={{0x[0-f]+}},
 // CHECK-SAME: new_task_id=[[SECOND_TASK:[0-f]+]],
 // CHECK-SAME: codeptr_ra=[[RETURN_ADDRESS:0x[0-f]+]]{{[0-f][0-f]}},
-// CHECK-SAME: task_type=ompt_task_explicit|ompt_task_undeferred|
-// CHECK-SAME: ompt_task_mergeable=1207959556, has_dependences=yes
+// CHECK-SAME: task_type=ompt_task_taskwait|ompt_task_undeferred|
+// CHECK-SAME: ompt_task_mergeable=1207959568, has_dependences=yes
 
 // CHECK: {{^}}[[MASTER_ID]]: ompt_event_dependences:
 // CHECK-SAME: task_id=[[SECOND_TASK]], deps=[([[ADDRX]],

diff  --git a/openmp/runtime/test/tasking/omp_detach_taskwait.c b/openmp/runtime/test/tasking/omp_detach_taskwait.c
index c45de2b98c280..5ac095405ab61 100644
--- a/openmp/runtime/test/tasking/omp_detach_taskwait.c
+++ b/openmp/runtime/test/tasking/omp_detach_taskwait.c
@@ -1,8 +1,10 @@
-// RUN: %libomp-compile -fopenmp-version=50 && env OMP_NUM_THREADS='3' %libomp-run
-// RUN: %libomp-compile -fopenmp-version=50 && env OMP_NUM_THREADS='1' %libomp-run
+// RUN: %libomp-compile && env OMP_NUM_THREADS='3' %libomp-run
+// RUN: %libomp-compile && env OMP_NUM_THREADS='1' %libomp-run
 
 // Checked gcc 10.1 still does not support detach clause on task construct.
 // UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7, gcc-8, gcc-9, gcc-10
+// gcc 11 introduced detach clause, but gomp interface in libomp has no support
+// XFAIL: gcc-11, gcc-12
 // clang supports detach clause since version 11.
 // UNSUPPORTED: clang-10, clang-9, clang-8, clang-7
 // icc compiler does not support detach clause.

diff  --git a/openmp/tools/archer/tests/task/task_early_fulfill.c b/openmp/tools/archer/tests/task/task_early_fulfill.c
index 0990b36e47ad5..5b5f45e0b0797 100644
--- a/openmp/tools/archer/tests/task/task_early_fulfill.c
+++ b/openmp/tools/archer/tests/task/task_early_fulfill.c
@@ -2,8 +2,10 @@
 // RUN:    %libarcher-run
 //| FileCheck %s
 
-// Checked gcc 9.2 still does not support detach clause on task construct.
-// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7, gcc-8, gcc-9
+// Checked gcc 10.1 still does not support detach clause on task construct.
+// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7, gcc-8, gcc-9, gcc-10
+// gcc 11 introduced detach clause, but gomp interface in libomp has no support
+// XFAIL: gcc-11, gcc-12
 // clang supports detach clause since version 11.
 // UNSUPPORTED: clang-10, clang-9, clang-8, clang-7
 // icc compiler does not support detach clause.

diff  --git a/openmp/tools/archer/tests/task/task_late_fulfill.c b/openmp/tools/archer/tests/task/task_late_fulfill.c
index d27409245e7e5..31d096deec756 100644
--- a/openmp/tools/archer/tests/task/task_late_fulfill.c
+++ b/openmp/tools/archer/tests/task/task_late_fulfill.c
@@ -1,8 +1,10 @@
 // RUN: %libarcher-compile -fopenmp-version=50 && env OMP_NUM_THREADS='3' \
 // RUN:   %libarcher-run-race | FileCheck %s
 
-// Checked gcc 9.2 still does not support detach clause on task construct.
-// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7, gcc-8, gcc-9
+// Checked gcc 10.1 still does not support detach clause on task construct.
+// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7, gcc-8, gcc-9, gcc-10
+// gcc 11 introduced detach clause, but gomp interface in libomp has no support
+// XFAIL: gcc-11, gcc-12
 // clang supports detach clause since version 11.
 // UNSUPPORTED: clang-10, clang-9, clang-8, clang-7
 // icc compiler does not support detach clause.
@@ -45,10 +47,10 @@ int main() {
 }
 
 // no race for a++ in line 32:
-// CHECK-NOT: #0 {{.*}}task_late_fulfill.c:35
+// CHECK-NOT: #0 {{.*}}task_late_fulfill.c:37
 
 // CHECK: WARNING: ThreadSanitizer: data race
 // CHECK-NEXT:   {{(Write|Read)}} of size 4
-// CHECK-NEXT: #0 {{.*}}task_late_fulfill.c:31
+// CHECK-NEXT: #0 {{.*}}task_late_fulfill.c:33
 // CHECK:   Previous write of size 4
-// CHECK-NEXT: #0 {{.*}}task_late_fulfill.c:40
+// CHECK-NEXT: #0 {{.*}}task_late_fulfill.c:42