[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.

diff --git a/openmp/tools/archer/tests/races/critical-unrelated.c b/openmp/tools/archer/tests/races/critical-unrelated.c
index af5a6d2..bff8b97 100644 (file)
--- 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 37b9629..e24b4cd 100644 (file)
--- 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 8086ffd..4245490 100644 (file)
--- 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 009045e..700e4a7 100644 (file)
--- 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 d5e2188..664dd49 100644 (file)
--- 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 7bc0324..04b2957 100644 (file)
--- 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 29aac18..02f1fb5 100644 (file)
--- 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 281269f..06d5bc0 100644 (file)
--- 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;