From 77ad98c80881ba90bf18ec2780169c60e02c159b Mon Sep 17 00:00:00 2001 From: "protze@itc.rwth-aachen.de" Date: Fri, 22 Nov 2019 17:10:48 +0100 Subject: [PATCH] [OpenMP][Tool] archer tests require tsan Testing for tsan capability in the test-compiler in follow-up review --- openmp/tools/archer/tests/CMakeLists.txt | 5 ----- openmp/tools/archer/tests/barrier/barrier.c | 1 + openmp/tools/archer/tests/critical/critical.c | 1 + openmp/tools/archer/tests/critical/lock-nested.c | 1 + openmp/tools/archer/tests/critical/lock.c | 1 + openmp/tools/archer/tests/parallel/parallel-firstprivate.c | 1 + openmp/tools/archer/tests/parallel/parallel-simple.c | 1 + openmp/tools/archer/tests/parallel/parallel-simple2.c | 1 + openmp/tools/archer/tests/races/critical-unrelated.c | 1 + openmp/tools/archer/tests/races/lock-nested-unrelated.c | 1 + openmp/tools/archer/tests/races/lock-unrelated.c | 1 + openmp/tools/archer/tests/races/parallel-simple.c | 1 + openmp/tools/archer/tests/races/task-dependency.c | 1 + openmp/tools/archer/tests/races/task-taskgroup-unrelated.c | 1 + openmp/tools/archer/tests/races/task-taskwait-nested.c | 1 + openmp/tools/archer/tests/races/task-two.c | 1 + .../tools/archer/tests/reduction/parallel-reduction-nowait.c | 1 + openmp/tools/archer/tests/reduction/parallel-reduction.c | 1 + openmp/tools/archer/tests/task/task-barrier.c | 1 + openmp/tools/archer/tests/task/task-create.c | 1 + openmp/tools/archer/tests/task/task-dependency.c | 1 + openmp/tools/archer/tests/task/task-taskgroup-nested.c | 1 + openmp/tools/archer/tests/task/task-taskgroup.c | 1 + openmp/tools/archer/tests/task/task-taskwait-nested.c | 1 + openmp/tools/archer/tests/task/task-taskwait.c | 1 + openmp/tools/archer/tests/worksharing/ordered.c | 1 + 26 files changed, 25 insertions(+), 5 deletions(-) diff --git a/openmp/tools/archer/tests/CMakeLists.txt b/openmp/tools/archer/tests/CMakeLists.txt index 332f3a8b022a..4f70b1a826d1 100644 --- a/openmp/tools/archer/tests/CMakeLists.txt +++ b/openmp/tools/archer/tests/CMakeLists.txt @@ -2,11 +2,6 @@ include(CheckFunctionExists) include(CheckLibraryExists) -if (OPENMP_STANDALONE_BUILD) - return () -endif () - - # When using libgcc, -latomic may be needed for atomics # (but when using compiler-rt, the atomics will be built-in) # Note: we can not check for __atomic_load because clang treats it diff --git a/openmp/tools/archer/tests/barrier/barrier.c b/openmp/tools/archer/tests/barrier/barrier.c index 5d7ca2e8482d..f2f938d9b131 100644 --- a/openmp/tools/archer/tests/barrier/barrier.c +++ b/openmp/tools/archer/tests/barrier/barrier.c @@ -12,6 +12,7 @@ //===----------------------------------------------------------------------===// // RUN: %libarcher-compile-and-run | FileCheck %s +// REQUIRES: tsan #include #include diff --git a/openmp/tools/archer/tests/critical/critical.c b/openmp/tools/archer/tests/critical/critical.c index 4277a2a364e1..2fc75453fffa 100644 --- a/openmp/tools/archer/tests/critical/critical.c +++ b/openmp/tools/archer/tests/critical/critical.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run | FileCheck %s +// REQUIRES: tsan #include #include diff --git a/openmp/tools/archer/tests/critical/lock-nested.c b/openmp/tools/archer/tests/critical/lock-nested.c index 50f0e77b1b59..3174aed6a86b 100644 --- a/openmp/tools/archer/tests/critical/lock-nested.c +++ b/openmp/tools/archer/tests/critical/lock-nested.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run | FileCheck %s +// REQUIRES: tsan #include #include diff --git a/openmp/tools/archer/tests/critical/lock.c b/openmp/tools/archer/tests/critical/lock.c index ca209e1b5e3a..c4157ae3aa5b 100644 --- a/openmp/tools/archer/tests/critical/lock.c +++ b/openmp/tools/archer/tests/critical/lock.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run | FileCheck %s +// REQUIRES: tsan #include #include diff --git a/openmp/tools/archer/tests/parallel/parallel-firstprivate.c b/openmp/tools/archer/tests/parallel/parallel-firstprivate.c index f354978e2205..97e8fcb52fae 100644 --- a/openmp/tools/archer/tests/parallel/parallel-firstprivate.c +++ b/openmp/tools/archer/tests/parallel/parallel-firstprivate.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run | FileCheck %s +// REQUIRES: tsan #include #include diff --git a/openmp/tools/archer/tests/parallel/parallel-simple.c b/openmp/tools/archer/tests/parallel/parallel-simple.c index 0afb193cc2b8..86f0b5342d8a 100644 --- a/openmp/tools/archer/tests/parallel/parallel-simple.c +++ b/openmp/tools/archer/tests/parallel/parallel-simple.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run | FileCheck %s +// REQUIRES: tsan #include #include diff --git a/openmp/tools/archer/tests/parallel/parallel-simple2.c b/openmp/tools/archer/tests/parallel/parallel-simple2.c index ffb3cca7577f..4663998a59df 100644 --- a/openmp/tools/archer/tests/parallel/parallel-simple2.c +++ b/openmp/tools/archer/tests/parallel/parallel-simple2.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run | FileCheck %s +// REQUIRES: tsan #include #include diff --git a/openmp/tools/archer/tests/races/critical-unrelated.c b/openmp/tools/archer/tests/races/critical-unrelated.c index d94acf5f3868..736d6f1dd684 100644 --- a/openmp/tools/archer/tests/races/critical-unrelated.c +++ b/openmp/tools/archer/tests/races/critical-unrelated.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run-race | FileCheck %s +// REQUIRES: tsan #include #include diff --git a/openmp/tools/archer/tests/races/lock-nested-unrelated.c b/openmp/tools/archer/tests/races/lock-nested-unrelated.c index 67d12310f11f..cd8f515f3426 100644 --- a/openmp/tools/archer/tests/races/lock-nested-unrelated.c +++ b/openmp/tools/archer/tests/races/lock-nested-unrelated.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run-race | FileCheck %s +// REQUIRES: tsan #include #include diff --git a/openmp/tools/archer/tests/races/lock-unrelated.c b/openmp/tools/archer/tests/races/lock-unrelated.c index ec7c96db0ddd..358c58488d44 100644 --- a/openmp/tools/archer/tests/races/lock-unrelated.c +++ b/openmp/tools/archer/tests/races/lock-unrelated.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run-race | FileCheck %s +// REQUIRES: tsan #include #include diff --git a/openmp/tools/archer/tests/races/parallel-simple.c b/openmp/tools/archer/tests/races/parallel-simple.c index 94be4daa56fe..c77d18557fe0 100644 --- a/openmp/tools/archer/tests/races/parallel-simple.c +++ b/openmp/tools/archer/tests/races/parallel-simple.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run-race | FileCheck %s +// REQUIRES: tsan #include #include diff --git a/openmp/tools/archer/tests/races/task-dependency.c b/openmp/tools/archer/tests/races/task-dependency.c index 012c0d7bae9d..beb073de3d3d 100644 --- a/openmp/tools/archer/tests/races/task-dependency.c +++ b/openmp/tools/archer/tests/races/task-dependency.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run-race | FileCheck %s +// REQUIRES: tsan #include #include #include diff --git a/openmp/tools/archer/tests/races/task-taskgroup-unrelated.c b/openmp/tools/archer/tests/races/task-taskgroup-unrelated.c index f2ea78200fbe..2f1228b7be22 100644 --- a/openmp/tools/archer/tests/races/task-taskgroup-unrelated.c +++ b/openmp/tools/archer/tests/races/task-taskgroup-unrelated.c @@ -12,6 +12,7 @@ //===----------------------------------------------------------------------===// // RUN: %libarcher-compile-and-run-race | FileCheck %s +// REQUIRES: tsan #include #include #include diff --git a/openmp/tools/archer/tests/races/task-taskwait-nested.c b/openmp/tools/archer/tests/races/task-taskwait-nested.c index 90322d52ea3e..d49b1d2a8550 100644 --- a/openmp/tools/archer/tests/races/task-taskwait-nested.c +++ b/openmp/tools/archer/tests/races/task-taskwait-nested.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run-race | FileCheck %s +// REQUIRES: tsan #include #include #include diff --git a/openmp/tools/archer/tests/races/task-two.c b/openmp/tools/archer/tests/races/task-two.c index 7445961e27df..ad7b705837a7 100644 --- a/openmp/tools/archer/tests/races/task-two.c +++ b/openmp/tools/archer/tests/races/task-two.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run-race | FileCheck %s +// REQUIRES: tsan #include #include #include diff --git a/openmp/tools/archer/tests/reduction/parallel-reduction-nowait.c b/openmp/tools/archer/tests/reduction/parallel-reduction-nowait.c index 9010ee7cfc29..b91579f0b00c 100644 --- a/openmp/tools/archer/tests/reduction/parallel-reduction-nowait.c +++ b/openmp/tools/archer/tests/reduction/parallel-reduction-nowait.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run | FileCheck %s +// REQUIRES: tsan #include #include diff --git a/openmp/tools/archer/tests/reduction/parallel-reduction.c b/openmp/tools/archer/tests/reduction/parallel-reduction.c index 375c7fa06b02..6d1a556ac00e 100644 --- a/openmp/tools/archer/tests/reduction/parallel-reduction.c +++ b/openmp/tools/archer/tests/reduction/parallel-reduction.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run| FileCheck %s +// REQUIRES: tsan #include #include diff --git a/openmp/tools/archer/tests/task/task-barrier.c b/openmp/tools/archer/tests/task/task-barrier.c index 1698f6ab1308..23e597cea09c 100644 --- a/openmp/tools/archer/tests/task/task-barrier.c +++ b/openmp/tools/archer/tests/task/task-barrier.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run | FileCheck %s +// REQUIRES: tsan #include #include #include diff --git a/openmp/tools/archer/tests/task/task-create.c b/openmp/tools/archer/tests/task/task-create.c index f4dd7a05906b..700bb335e00c 100644 --- a/openmp/tools/archer/tests/task/task-create.c +++ b/openmp/tools/archer/tests/task/task-create.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run | FileCheck %s +// REQUIRES: tsan #include #include #include diff --git a/openmp/tools/archer/tests/task/task-dependency.c b/openmp/tools/archer/tests/task/task-dependency.c index fbde943f0838..a7a2a669c54b 100644 --- a/openmp/tools/archer/tests/task/task-dependency.c +++ b/openmp/tools/archer/tests/task/task-dependency.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run | FileCheck %s +// REQUIRES: tsan #include #include #include diff --git a/openmp/tools/archer/tests/task/task-taskgroup-nested.c b/openmp/tools/archer/tests/task/task-taskgroup-nested.c index 99d8db08b590..c82b6be3f929 100644 --- a/openmp/tools/archer/tests/task/task-taskgroup-nested.c +++ b/openmp/tools/archer/tests/task/task-taskgroup-nested.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run | FileCheck %s +// REQUIRES: tsan #include #include #include diff --git a/openmp/tools/archer/tests/task/task-taskgroup.c b/openmp/tools/archer/tests/task/task-taskgroup.c index 84e7abcd5054..799bd22dd513 100644 --- a/openmp/tools/archer/tests/task/task-taskgroup.c +++ b/openmp/tools/archer/tests/task/task-taskgroup.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run | FileCheck %s +// REQUIRES: tsan #include #include #include diff --git a/openmp/tools/archer/tests/task/task-taskwait-nested.c b/openmp/tools/archer/tests/task/task-taskwait-nested.c index 154bb7a90e8f..fe3fb27874d4 100644 --- a/openmp/tools/archer/tests/task/task-taskwait-nested.c +++ b/openmp/tools/archer/tests/task/task-taskwait-nested.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run | FileCheck %s +// REQUIRES: tsan #include #include #include diff --git a/openmp/tools/archer/tests/task/task-taskwait.c b/openmp/tools/archer/tests/task/task-taskwait.c index e217021e9406..af334dc310af 100644 --- a/openmp/tools/archer/tests/task/task-taskwait.c +++ b/openmp/tools/archer/tests/task/task-taskwait.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run | FileCheck %s +// REQUIRES: tsan #include #include #include diff --git a/openmp/tools/archer/tests/worksharing/ordered.c b/openmp/tools/archer/tests/worksharing/ordered.c index 8a0831376ede..e10d9d153d3b 100644 --- a/openmp/tools/archer/tests/worksharing/ordered.c +++ b/openmp/tools/archer/tests/worksharing/ordered.c @@ -13,6 +13,7 @@ // RUN: %libarcher-compile-and-run | FileCheck %s +// REQUIRES: tsan #include #include