Skip to content

Commit ac9f06c

Browse files
[OpenMP] Fix test omp_parallel_num_threads_list.c to require fewer threads. (#96916)
Original test case used too many threads for some environments. This update reduces to a max of 36 threads.
1 parent d3ca779 commit ac9f06c

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

openmp/runtime/test/parallel/omp_parallel_num_threads_list.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ int test_omp_parallel_num_threads_list() {
101101
int threads[2] = {3, 3};
102102
__kmpc_push_num_threads_list(NULL, __kmpc_global_thread_num(NULL), 2,
103103
threads);
104-
#pragma omp parallel reduction(+ : num_failed) // num_clause(3,3) // 2nd level
104+
#pragma omp parallel reduction(+ : num_failed) // num_threads(3,3) // 2nd level
105105
{
106106
#pragma omp single
107107
num_failed = num_failed + !(omp_get_num_threads() == 3);
@@ -127,54 +127,54 @@ int test_omp_parallel_num_threads_list() {
127127
} // end 1st level parallel
128128

129129
// Test lists at multiple levels
130-
int threads2[2] = {4, 3};
130+
int threads2[2] = {3,2};
131131
__kmpc_push_num_threads_list(NULL, __kmpc_global_thread_num(NULL), 2,
132132
threads2);
133-
#pragma omp parallel reduction(+ : num_failed) // num_clause(4,3) // 1st level
133+
#pragma omp parallel reduction(+ : num_failed) // num_threads(3,2) // 1st level
134134
{
135135
#pragma omp single
136-
num_failed = num_failed + !(omp_get_num_threads() == 4);
136+
num_failed = num_failed + !(omp_get_num_threads() == 3);
137137
#pragma omp parallel reduction(+ : num_failed) // 2nd level
138138
{
139139
#pragma omp single
140-
num_failed = num_failed + !(omp_get_num_threads() == 3);
140+
num_failed = num_failed + !(omp_get_num_threads() == 2);
141141
#pragma omp parallel reduction(+ : num_failed) // 3rd level
142142
{
143143
#pragma omp single
144-
num_failed = num_failed + !(omp_get_num_threads() == 3);
145-
int threads3[2] = {2, 5};
144+
num_failed = num_failed + !(omp_get_num_threads() == 2);
145+
int threads3[2] = {3,1};
146146
__kmpc_push_num_threads_list(NULL, __kmpc_global_thread_num(NULL), 2,
147147
threads3);
148-
#pragma omp parallel reduction(+ : num_failed) // num_clause(2,5) // 4th level
148+
#pragma omp parallel reduction(+ : num_failed) // num_threads(3,1) // 4th level
149149
{
150150
#pragma omp single
151-
num_failed = num_failed + !(omp_get_num_threads() == 2);
151+
num_failed = num_failed + !(omp_get_num_threads() == 3);
152152
#pragma omp parallel reduction(+ : num_failed) // 5th level
153153
{
154154
#pragma omp single
155-
num_failed = num_failed + !(omp_get_num_threads() == 5);
155+
num_failed = num_failed + !(omp_get_num_threads() == 1);
156156
#pragma omp parallel reduction(+ : num_failed) // 6th level
157157
{
158158
#pragma omp single
159-
num_failed = num_failed + !(omp_get_num_threads() == 5);
159+
num_failed = num_failed + !(omp_get_num_threads() == 1);
160160
} // end 6th level parallel
161161
} // end 5th level parallel
162162
} // end 4th level parallel
163163
#pragma omp parallel reduction(+ : num_failed) // 4th level
164164
{
165165
#pragma omp single
166-
num_failed = num_failed + !(omp_get_num_threads() == 3);
166+
num_failed = num_failed + !(omp_get_num_threads() == 2);
167167
} // end 4th level parallel
168168
} // end 3rd level parallel
169169
} // end 2nd level parallel
170170
#pragma omp parallel reduction(+ : num_failed) // 2nd level
171171
{
172172
#pragma omp single
173-
num_failed = num_failed + !(omp_get_num_threads() == 3);
173+
num_failed = num_failed + !(omp_get_num_threads() == 2);
174174
#pragma omp parallel reduction(+ : num_failed) // 3rd level
175175
{
176176
#pragma omp single
177-
num_failed = num_failed + !(omp_get_num_threads() == 3);
177+
num_failed = num_failed + !(omp_get_num_threads() == 2);
178178
} // end 3rd level parallel
179179
} // end 2nd level parallel
180180
} // end 1st level parallel

0 commit comments

Comments
 (0)