[Openmp-commits] [openmp] 4acc2f2 - [OpenMP][Tools][Tests][NFC] Address flaky archer tests

[Joachim Protze via Openmp-commits]

Author: Joachim Protze
Date: 2021-07-29T17:56:44+02:00
New Revision: 4acc2f29a278ff2a0a4d683dd6d706cc2f7123fd

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

LOG: [OpenMP][Tools][Tests][NFC] Address flaky archer tests

Adding more concurrent threads significantly increases the
chance that the data race can be observed during testing.

Added: 
    

Modified: 
    openmp/tools/archer/tests/races/critical-unrelated.c
    openmp/tools/archer/tests/races/lock-nested-unrelated.c
    openmp/tools/archer/tests/races/lock-unrelated.c
    openmp/tools/archer/tests/races/parallel-simple.c
    openmp/tools/archer/tests/races/task-dependency.c
    openmp/tools/archer/tests/races/task-taskgroup-unrelated.c
    openmp/tools/archer/tests/races/task-taskwait-nested.c
    openmp/tools/archer/tests/races/task-two.c

Removed: 
    


################################################################################
diff  --git a/openmp/tools/archer/tests/races/critical-unrelated.c b/openmp/tools/archer/tests/races/critical-unrelated.c
index af5a6d22ae2a4..bff8b9763c149 100644
--- a/openmp/tools/archer/tests/races/critical-unrelated.c
+++ b/openmp/tools/archer/tests/races/critical-unrelated.c
@@ -19,7 +19,7 @@
 int main(int argc, char *argv[]) {
   int var = 0;
 
-#pragma omp parallel num_threads(2) shared(var)
+#pragma omp parallel num_threads(8) shared(var)
   {
 #pragma omp critical
     {

diff  --git a/openmp/tools/archer/tests/races/lock-nested-unrelated.c b/openmp/tools/archer/tests/races/lock-nested-unrelated.c
index 37b96296c1223..e24b4cdedc71b 100644
--- a/openmp/tools/archer/tests/races/lock-nested-unrelated.c
+++ b/openmp/tools/archer/tests/races/lock-nested-unrelated.c
@@ -22,7 +22,7 @@ int main(int argc, char *argv[]) {
   omp_nest_lock_t lock;
   omp_init_nest_lock(&lock);
 
-#pragma omp parallel num_threads(2) shared(var)
+#pragma omp parallel num_threads(8) shared(var)
   {
     omp_set_nest_lock(&lock);
     omp_set_nest_lock(&lock);

diff  --git a/openmp/tools/archer/tests/races/lock-unrelated.c b/openmp/tools/archer/tests/races/lock-unrelated.c
index 8086ffdb16785..4245490a703f3 100644
--- a/openmp/tools/archer/tests/races/lock-unrelated.c
+++ b/openmp/tools/archer/tests/races/lock-unrelated.c
@@ -22,7 +22,7 @@ int main(int argc, char *argv[]) {
   omp_lock_t lock;
   omp_init_lock(&lock);
 
-#pragma omp parallel num_threads(2) shared(var)
+#pragma omp parallel num_threads(8) shared(var)
   {
     omp_set_lock(&lock);
     // Dummy locking.

diff  --git a/openmp/tools/archer/tests/races/parallel-simple.c b/openmp/tools/archer/tests/races/parallel-simple.c
index 009045ebb46f0..700e4a7f3313f 100644
--- a/openmp/tools/archer/tests/races/parallel-simple.c
+++ b/openmp/tools/archer/tests/races/parallel-simple.c
@@ -19,7 +19,7 @@
 int main(int argc, char *argv[]) {
   int var = 0;
 
-#pragma omp parallel num_threads(2) shared(var)
+#pragma omp parallel num_threads(8) shared(var)
   { var++; }
 
   int error = (var != 2);

diff  --git a/openmp/tools/archer/tests/races/task-dependency.c b/openmp/tools/archer/tests/races/task-dependency.c
index d5e2188c205b6..664dd49d28a32 100644
--- a/openmp/tools/archer/tests/races/task-dependency.c
+++ b/openmp/tools/archer/tests/races/task-dependency.c
@@ -21,7 +21,7 @@
 int main(int argc, char *argv[]) {
   int var = 0, a = 0;
 
-#pragma omp parallel num_threads(2) shared(var, a)
+#pragma omp parallel num_threads(8) shared(var, a)
 #pragma omp master
   {
 #pragma omp task shared(var, a) depend(out : var)

diff  --git a/openmp/tools/archer/tests/races/task-taskgroup-unrelated.c b/openmp/tools/archer/tests/races/task-taskgroup-unrelated.c
index 7bc03249e3633..04b2957b48637 100644
--- a/openmp/tools/archer/tests/races/task-taskgroup-unrelated.c
+++ b/openmp/tools/archer/tests/races/task-taskgroup-unrelated.c
@@ -21,7 +21,7 @@
 int main(int argc, char *argv[]) {
   int var = 0, a = 0;
 
-#pragma omp parallel num_threads(2) shared(var, a)
+#pragma omp parallel num_threads(8) shared(var, a)
 #pragma omp master
   {
 #pragma omp task shared(var, a)

diff  --git a/openmp/tools/archer/tests/races/task-taskwait-nested.c b/openmp/tools/archer/tests/races/task-taskwait-nested.c
index 29aac18ba8f62..02f1fb576c870 100644
--- a/openmp/tools/archer/tests/races/task-taskwait-nested.c
+++ b/openmp/tools/archer/tests/races/task-taskwait-nested.c
@@ -21,7 +21,7 @@
 int main(int argc, char *argv[]) {
   int var = 0, a = 0;
 
-#pragma omp parallel num_threads(2) shared(var, a)
+#pragma omp parallel num_threads(8) shared(var, a)
 #pragma omp master
   {
 #pragma omp task shared(var, a)

diff  --git a/openmp/tools/archer/tests/races/task-two.c b/openmp/tools/archer/tests/races/task-two.c
index 281269fc49d46..06d5bc021ee65 100644
--- a/openmp/tools/archer/tests/races/task-two.c
+++ b/openmp/tools/archer/tests/races/task-two.c
@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#define NUM_THREADS 2
+#define NUM_THREADS 8
 
 int main(int argc, char *argv[]) {
   int var = 0;