Skip to content

Commit ed32762

Browse files
committed
Fix comment typos, disabled clang-format on unit tests header, replaced deprecated 'master' by 'single' in unit tests
1 parent 459dfd3 commit ed32762

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

openmp/runtime/src/kmp_global.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ KMP_BUILD_ASSERT(sizeof(kmp_tasking_flags_t) == 4);
354354

355355
int __kmp_task_stealing_constraint = 1; /* Constrain task stealing by default */
356356

357-
std::atomic<kmp_int32> __kmp_n_tasks_in_flight = 0; /* ° of tasks in flight */
357+
std::atomic<kmp_int32> __kmp_n_tasks_in_flight = 0; /* n° of tasks in flight */
358358

359359
kmp_int32 __kmp_enable_task_throttling = 1; /* Serialize tasks once a threshold
360360
is reached, such as the number of

openmp/runtime/src/kmp_tasking.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1475,7 +1475,7 @@ kmp_task_t *__kmp_task_alloc(ident_t *loc_ref, kmp_int32 gtid,
14751475
if (UNLIKELY(!TCR_4(__kmp_init_middle)))
14761476
__kmp_middle_initialize();
14771477

1478-
// task throttling: to many tasks co-existing, emptying queue now
1478+
// task throttling: too many tasks co-existing, emptying queue now
14791479
if (__kmp_enable_task_throttling)
14801480
while (TCR_4(__kmp_n_tasks_in_flight.load()) >= __kmp_task_maximum)
14811481
__kmpc_omp_taskyield(NULL, gtid, 0);

openmp/runtime/test/tasking/omp_throttling_max.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
// clang-format off
12
// RUN: %libomp-compile && env OMP_NUM_THREADS=2 KMP_ENABLE_TASK_THROTTLING=1 KMP_TASK_MAXIMUM=0 %libomp-run
23
// RUN: %libomp-compile && env OMP_NUM_THREADS=2 KMP_ENABLE_TASK_THROTTLING=1 KMP_TASK_MAXIMUM=1 %libomp-run
34
// RUN: %libomp-compile && env OMP_NUM_THREADS=2 KMP_ENABLE_TASK_THROTTLING=1 KMP_TASK_MAXIMUM=256 %libomp-run
45
// RUN: %libomp-compile && env OMP_NUM_THREADS=2 KMP_ENABLE_TASK_THROTTLING=1 KMP_TASK_MAXIMUM=65536 %libomp-run
56
// RUN: %libomp-compile && env OMP_NUM_THREADS=2 KMP_ENABLE_TASK_THROTTLING=1 KMP_TASK_MAXIMUM=100000 %libomp-run
7+
// clang-format on
68

79
/**
810
* This test ensures that task throttling on the maximum number of tasks
@@ -46,7 +48,7 @@ int main(void) {
4648
while (!done)
4749
;
4850

49-
#pragma omp master
51+
#pragma omp single
5052
{
5153
int ntasks = 0;
5254
while (!done) {

openmp/runtime/test/tasking/omp_throttling_max_ready_per_thread.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
// clang-format off
12
// RUN: %libomp-compile && env OMP_NUM_THREADS=2 KMP_ENABLE_TASK_THROTTLING=1 KMP_TASK_MAXIMUM_READY_PER_THREAD=0 %libomp-run
23
// RUN: %libomp-compile && env OMP_NUM_THREADS=2 KMP_ENABLE_TASK_THROTTLING=1 KMP_TASK_MAXIMUM_READY_PER_THREAD=1 %libomp-run
34
// RUN: %libomp-compile && env OMP_NUM_THREADS=2 KMP_ENABLE_TASK_THROTTLING=1 KMP_TASK_MAXIMUM_READY_PER_THREAD=256 %libomp-run
45
// RUN: %libomp-compile && env OMP_NUM_THREADS=2 KMP_ENABLE_TASK_THROTTLING=1 KMP_TASK_MAXIMUM_READY_PER_THREAD=65536 %libomp-run
56
// RUN: %libomp-compile && env OMP_NUM_THREADS=2 KMP_ENABLE_TASK_THROTTLING=1 KMP_TASK_MAXIMUM_READY_PER_THREAD=100000 %libomp-run
7+
// clang-format on
68

79
/**
810
* This test ensures that task throttling on the maximum number of ready tasks
@@ -46,7 +48,7 @@ int main(void) {
4648
while (!done)
4749
;
4850

49-
#pragma omp master
51+
#pragma omp single
5052
{
5153
int ntasks = 0;
5254
while (!done) {

0 commit comments

Comments
 (0)