[Openmp-commits] [openmp] [OpenMP][Test][NFC] output tool data as hex to improve readibility (PR #152757)
via Openmp-commits
openmp-commits at lists.llvm.org
Fri Aug 8 09:39:32 PDT 2025
github-actions[bot] wrote:
<!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code. :warning:
<details>
<summary>
You can test this locally with the following command:
</summary>
``````````bash
git-clang-format --diff HEAD~1 HEAD --extensions h,c -- openmp/runtime/test/ompt/callback.h openmp/runtime/test/ompt/cancel/cancel_parallel.c openmp/runtime/test/ompt/cancel/cancel_taskgroup.c openmp/runtime/test/ompt/cancel/cancel_worksharing.c openmp/runtime/test/ompt/parallel/dynamic_enough_threads.c openmp/runtime/test/ompt/parallel/dynamic_not_enough_threads.c openmp/runtime/test/ompt/parallel/max_active_levels_serialized.c openmp/runtime/test/ompt/parallel/nested.c openmp/runtime/test/ompt/parallel/nested_lwt.c openmp/runtime/test/ompt/parallel/nested_serialized.c openmp/runtime/test/ompt/parallel/nested_serialized_task_frames.c openmp/runtime/test/ompt/parallel/nested_thread_num.c openmp/runtime/test/ompt/parallel/nested_threadnum.c openmp/runtime/test/ompt/parallel/no_thread_num_clause.c openmp/runtime/test/ompt/parallel/normal.c openmp/runtime/test/ompt/parallel/not_enough_threads.c openmp/runtime/test/ompt/parallel/parallel_if0.c openmp/runtime/test/ompt/parallel/region_in_expl_task_task_frames.c openmp/runtime/test/ompt/parallel/serialized.c openmp/runtime/test/ompt/synchronization/barrier/implicit_task_data.c openmp/runtime/test/ompt/synchronization/masked.c openmp/runtime/test/ompt/synchronization/reduction/empty_reduce.c openmp/runtime/test/ompt/synchronization/reduction/tree_reduce.c openmp/runtime/test/ompt/synchronization/taskgroup.c openmp/runtime/test/ompt/tasks/dependences.c openmp/runtime/test/ompt/tasks/dependences_mutexinoutset.c openmp/runtime/test/ompt/tasks/explicit_task.c openmp/runtime/test/ompt/tasks/serialized.c openmp/runtime/test/ompt/tasks/task_early_fulfill.c openmp/runtime/test/ompt/tasks/task_if0-depend.c openmp/runtime/test/ompt/tasks/task_in_joinbarrier.c openmp/runtime/test/ompt/tasks/task_late_fulfill.c openmp/runtime/test/ompt/tasks/task_memory.c openmp/runtime/test/ompt/tasks/task_types.c openmp/runtime/test/ompt/tasks/taskloop.c openmp/runtime/test/ompt/tasks/taskloop_dispatch.c openmp/runtime/test/ompt/tasks/taskwait-depend.c openmp/runtime/test/ompt/tasks/taskyield.c openmp/runtime/test/ompt/tasks/untied_task.c openmp/runtime/test/ompt/worksharing/for/base.h openmp/runtime/test/ompt/worksharing/for/base_serialized.h openmp/runtime/test/ompt/worksharing/for/base_split.h openmp/runtime/test/ompt/worksharing/for/loop_dispatch.c openmp/runtime/test/ompt/worksharing/sections.c openmp/runtime/test/ompt/worksharing/sections_dispatch.c openmp/runtime/test/ompt/worksharing/single.c openmp/runtime/test/ompt/worksharing/taskinfo/sections_serialized.c
``````````
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/openmp/runtime/test/ompt/cancel/cancel_parallel.c b/openmp/runtime/test/ompt/cancel/cancel_parallel.c
index c3abb428a..92c8f93e2 100644
--- a/openmp/runtime/test/ompt/cancel/cancel_parallel.c
+++ b/openmp/runtime/test/ompt/cancel/cancel_parallel.c
@@ -28,13 +28,20 @@ int main() {
// CHECK-NOT: {{^}}0: Could not register callback 'ompt_callback_cancel'
// CHECK: {{^}}0: NULL_POINTER=[[NULL:.*$]]
- // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_initial_task_begin: parallel_id={{[0-9]+}}, task_id={{[0-9]+}}, actual_parallelism=1, index=1, flags=1
- // CHECK-DAG: {{^}}[[MASTER_ID]]: ompt_event_cancel: task_data=[[TASK_ID:[0-f]+]], flags=ompt_cancel_parallel|ompt_cancel_activated=17, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
- // CHECK-DAG: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
+ // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_initial_task_begin:
+ // parallel_id={{[0-9]+}}, task_id={{[0-9]+}}, actual_parallelism=1, index=1,
+ // flags=1 CHECK-DAG: {{^}}[[MASTER_ID]]: ompt_event_cancel:
+ // task_data=[[TASK_ID:[0-f]+]],
+ // flags=ompt_cancel_parallel|ompt_cancel_activated=17,
+ // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK-DAG:
+ // {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
// CHECK: {{^}}[[THREAD_ID:[0-9]+]]: ompt_event_implicit_task_begin
- // CHECK-DAG: {{^}}[[THREAD_ID]]: ompt_event_cancel: task_data=[[TASK_ID:[0-f]+]], flags=ompt_cancel_parallel|ompt_cancel_detected=33, codeptr_ra=[[OTHER_RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
- // CHECK-DAG: {{^}}[[THREAD_ID]]: fuzzy_address={{.*}}[[OTHER_RETURN_ADDRESS]]
+ // CHECK-DAG: {{^}}[[THREAD_ID]]: ompt_event_cancel:
+ // task_data=[[TASK_ID:[0-f]+]],
+ // flags=ompt_cancel_parallel|ompt_cancel_detected=33,
+ // codeptr_ra=[[OTHER_RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK-DAG:
+ // {{^}}[[THREAD_ID]]: fuzzy_address={{.*}}[[OTHER_RETURN_ADDRESS]]
return 0;
}
diff --git a/openmp/runtime/test/ompt/cancel/cancel_taskgroup.c b/openmp/runtime/test/ompt/cancel/cancel_taskgroup.c
index 584b5a8c4..eb0fd3768 100644
--- a/openmp/runtime/test/ompt/cancel/cancel_taskgroup.c
+++ b/openmp/runtime/test/ompt/cancel/cancel_taskgroup.c
@@ -71,14 +71,35 @@ int main()
// CHECK-SAME: task_id=[[PARENT_TASK_ID:[0-f]+]],
// CHECK-SAME: codeptr_ra={{(0x)?[0-f]*}}
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_create: parent_task_id=[[PARENT_TASK_ID]], parent_task_frame.exit={{(0x)?[0-f]*}}, parent_task_frame.reenter={{(0x)?[0-f]*}}, new_task_id=[[FIRST_TASK_ID:[0-f]+]], codeptr_ra={{(0x)?[0-f]*}}, task_type=ompt_task_explicit=4, has_dependences=no
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_create: parent_task_id=[[PARENT_TASK_ID]], parent_task_frame.exit={{(0x)?[0-f]*}}, parent_task_frame.reenter={{(0x)?[0-f]*}}, new_task_id=[[SECOND_TASK_ID:[0-f]+]], codeptr_ra={{(0x)?[0-f]*}}, task_type=ompt_task_explicit=4, has_dependences=no
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_create: parent_task_id=[[PARENT_TASK_ID]], parent_task_frame.exit={{(0x)?[0-f]*}}, parent_task_frame.reenter={{(0x)?[0-f]*}}, new_task_id=[[THIRD_TASK_ID:[0-f]+]], codeptr_ra={{(0x)?[0-f]*}}, task_type=ompt_task_explicit=4, has_dependences=no
+ // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_create:
+ // parent_task_id=[[PARENT_TASK_ID]], parent_task_frame.exit={{(0x)?[0-f]*}},
+ // parent_task_frame.reenter={{(0x)?[0-f]*}},
+ // new_task_id=[[FIRST_TASK_ID:[0-f]+]], codeptr_ra={{(0x)?[0-f]*}},
+ // task_type=ompt_task_explicit=4, has_dependences=no CHECK:
+ // {{^}}[[MASTER_ID]]: ompt_event_task_create:
+ // parent_task_id=[[PARENT_TASK_ID]], parent_task_frame.exit={{(0x)?[0-f]*}},
+ // parent_task_frame.reenter={{(0x)?[0-f]*}},
+ // new_task_id=[[SECOND_TASK_ID:[0-f]+]], codeptr_ra={{(0x)?[0-f]*}},
+ // task_type=ompt_task_explicit=4, has_dependences=no CHECK:
+ // {{^}}[[MASTER_ID]]: ompt_event_task_create:
+ // parent_task_id=[[PARENT_TASK_ID]], parent_task_frame.exit={{(0x)?[0-f]*}},
+ // parent_task_frame.reenter={{(0x)?[0-f]*}},
+ // new_task_id=[[THIRD_TASK_ID:[0-f]+]], codeptr_ra={{(0x)?[0-f]*}},
+ // task_type=ompt_task_explicit=4, has_dependences=no
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_create: parent_task_id=[[PARENT_TASK_ID]], parent_task_frame.exit={{(0x)?[0-f]*}}, parent_task_frame.reenter={{(0x)?[0-f]*}}, new_task_id=[[CANCEL_TASK_ID:[0-f]+]], codeptr_ra={{(0x)?[0-f]*}}, task_type=ompt_task_explicit|ompt_task_undeferred=134217732, has_dependences=no
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_schedule: first_task_id=[[PARENT_TASK_ID]], second_task_id=[[CANCEL_TASK_ID]], prior_task_status=ompt_task_switch=7
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_cancel: task_data=[[CANCEL_TASK_ID]], flags=ompt_cancel_taskgroup|ompt_cancel_activated=24, codeptr_ra={{(0x)?[0-f]*}}
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_schedule: first_task_id=[[CANCEL_TASK_ID]], second_task_id=[[PARENT_TASK_ID]], prior_task_status=ompt_task_cancel=3
+ // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_create:
+ // parent_task_id=[[PARENT_TASK_ID]], parent_task_frame.exit={{(0x)?[0-f]*}},
+ // parent_task_frame.reenter={{(0x)?[0-f]*}},
+ // new_task_id=[[CANCEL_TASK_ID:[0-f]+]], codeptr_ra={{(0x)?[0-f]*}},
+ // task_type=ompt_task_explicit|ompt_task_undeferred=134217732,
+ // has_dependences=no CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_schedule:
+ // first_task_id=[[PARENT_TASK_ID]], second_task_id=[[CANCEL_TASK_ID]],
+ // prior_task_status=ompt_task_switch=7 CHECK: {{^}}[[MASTER_ID]]:
+ // ompt_event_cancel: task_data=[[CANCEL_TASK_ID]],
+ // flags=ompt_cancel_taskgroup|ompt_cancel_activated=24,
+ // codeptr_ra={{(0x)?[0-f]*}} CHECK: {{^}}[[MASTER_ID]]:
+ // ompt_event_task_schedule: first_task_id=[[CANCEL_TASK_ID]],
+ // second_task_id=[[PARENT_TASK_ID]], prior_task_status=ompt_task_cancel=3
// CHECK-DAG: {{^}}{{[0-9]+}}: ompt_event_cancel: task_data={{[0-9]+}}, flags=ompt_cancel_taskgroup|ompt_cancel_discarded_task=72, codeptr_ra=[[NULL]]
// CHECK-DAG: {{^}}{{[0-9]+}}: ompt_event_cancel: task_data={{[0-9]+}}, flags=ompt_cancel_taskgroup|ompt_cancel_discarded_task=72, codeptr_ra=[[NULL]]
diff --git a/openmp/runtime/test/ompt/cancel/cancel_worksharing.c b/openmp/runtime/test/ompt/cancel/cancel_worksharing.c
index 825a02476..f482e7484 100644
--- a/openmp/runtime/test/ompt/cancel/cancel_worksharing.c
+++ b/openmp/runtime/test/ompt/cancel/cancel_worksharing.c
@@ -56,12 +56,19 @@ int main()
// CHECK: {{^}}0: NULL_POINTER=[[NULL:.*$]]
// CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_initial_task_begin: parallel_id={{[0-9]+}}, task_id={{[0-9]+}}, actual_parallelism=1, index=1, flags=1
-
+
// cancel for and sections
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_cancel: task_data=[[TASK_ID:[0-f]+]], flags=ompt_cancel_loop|ompt_cancel_activated=20, codeptr_ra={{(0x)?[0-f]*}}
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_cancel: task_data=[[TASK_ID:[0-f]+]], flags=ompt_cancel_sections|ompt_cancel_{{activated=18|detected=34}}, codeptr_ra={{(0x)?[0-f]*}}
- // CHECK: {{^}}[[OTHER_THREAD_ID:[0-9]+]]: ompt_event_cancel: task_data=[[TASK_ID:[0-f]+]], flags=ompt_cancel_loop|ompt_cancel_detected=36, codeptr_ra={{(0x)?[0-f]*}}
- // CHECK: {{^}}[[OTHER_THREAD_ID:[0-9]+]]: ompt_event_cancel: task_data=[[TASK_ID:[0-f]+]], flags=ompt_cancel_sections|ompt_cancel_{{activated=18|detected=34}}, codeptr_ra={{(0x)?[0-f]*}}
+ // CHECK: {{^}}[[MASTER_ID]]: ompt_event_cancel: task_data=[[TASK_ID:[0-f]+]],
+ // flags=ompt_cancel_loop|ompt_cancel_activated=20, codeptr_ra={{(0x)?[0-f]*}}
+ // CHECK: {{^}}[[MASTER_ID]]: ompt_event_cancel: task_data=[[TASK_ID:[0-f]+]],
+ // flags=ompt_cancel_sections|ompt_cancel_{{activated=18|detected=34}},
+ // codeptr_ra={{(0x)?[0-f]*}} CHECK: {{^}}[[OTHER_THREAD_ID:[0-9]+]]:
+ // ompt_event_cancel: task_data=[[TASK_ID:[0-f]+]],
+ // flags=ompt_cancel_loop|ompt_cancel_detected=36, codeptr_ra={{(0x)?[0-f]*}}
+ // CHECK: {{^}}[[OTHER_THREAD_ID:[0-9]+]]: ompt_event_cancel:
+ // task_data=[[TASK_ID:[0-f]+]],
+ // flags=ompt_cancel_sections|ompt_cancel_{{activated=18|detected=34}},
+ // codeptr_ra={{(0x)?[0-f]*}}
return 0;
}
diff --git a/openmp/runtime/test/ompt/parallel/dynamic_enough_threads.c b/openmp/runtime/test/ompt/parallel/dynamic_enough_threads.c
index c80b12630..be4cd68d0 100644
--- a/openmp/runtime/test/ompt/parallel/dynamic_enough_threads.c
+++ b/openmp/runtime/test/ompt/parallel/dynamic_enough_threads.c
@@ -29,12 +29,21 @@ int main()
// CHECK-NOT: 0: task_data initially not null
// CHECK-NOT: 0: thread_data initially not null
- // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_parallel_begin: parent_task_id=[[PARENT_TASK_ID:[0-f]+]], parent_task_frame.exit=[[NULL]], parent_task_frame.reenter={{(0x)?[0-f]+}}, parallel_id=[[PARALLEL_ID:[0-f]+]], requested_team_size=4, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}, invoker=[[PARALLEL_INVOKER:[0-9]+]]
-
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID:[0-f]+]], team_size={{[1-4]}}
- // CHECK: {{^}}[[MASTER_ID]]: task level 0: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]]
- // CHECK: {{^}}[[MASTER_ID]]: task level 1: parallel_id=[[IMPLICIT_PARALLEL_ID:[0-f]+]], task_id=[[PARENT_TASK_ID]]
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_end: parallel_id={{[0-9]+}}, task_id=[[IMPLICIT_TASK_ID]]
+ // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_parallel_begin:
+ // parent_task_id=[[PARENT_TASK_ID:[0-f]+]], parent_task_frame.exit=[[NULL]],
+ // parent_task_frame.reenter={{(0x)?[0-f]+}},
+ // parallel_id=[[PARALLEL_ID:[0-f]+]], requested_team_size=4,
+ // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}},
+ // invoker=[[PARALLEL_INVOKER:[0-9]+]]
+
+ // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin:
+ // parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID:[0-f]+]],
+ // team_size={{[1-4]}} CHECK: {{^}}[[MASTER_ID]]: task level 0:
+ // parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]] CHECK:
+ // {{^}}[[MASTER_ID]]: task level 1:
+ // parallel_id=[[IMPLICIT_PARALLEL_ID:[0-f]+]], task_id=[[PARENT_TASK_ID]]
+ // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_end:
+ // parallel_id={{[0-9]+}}, task_id=[[IMPLICIT_TASK_ID]]
// CHECK: {{^}}[[MASTER_ID]]: ompt_event_parallel_end: parallel_id=[[PARALLEL_ID]], task_id=[[PARENT_TASK_ID]], invoker=[[PARALLEL_INVOKER]]
// CHECK: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
diff --git a/openmp/runtime/test/ompt/parallel/dynamic_not_enough_threads.c b/openmp/runtime/test/ompt/parallel/dynamic_not_enough_threads.c
index 8a2f54755..4edd079e5 100644
--- a/openmp/runtime/test/ompt/parallel/dynamic_not_enough_threads.c
+++ b/openmp/runtime/test/ompt/parallel/dynamic_not_enough_threads.c
@@ -29,12 +29,21 @@ int main()
// CHECK-NOT: 0: task_data initially not null
// CHECK-NOT: 0: thread_data initially not null
- // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_parallel_begin: parent_task_id=[[PARENT_TASK_ID:[0-f]+]], parent_task_frame.exit=[[NULL]], parent_task_frame.reenter={{(0x)?[0-f]+}}, parallel_id=[[PARALLEL_ID:[0-f]+]], requested_team_size=4, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}, invoker=[[PARALLEL_INVOKER:[0-9]+]]
-
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID:[0-f]+]], team_size={{[1-4]}}
- // CHECK: {{^}}[[MASTER_ID]]: task level 0: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]]
- // CHECK: {{^}}[[MASTER_ID]]: task level 1: parallel_id=[[IMPLICIT_PARALLEL_ID:[0-f]+]], task_id=[[PARENT_TASK_ID]]
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_end: parallel_id={{[0-9]+}}, task_id=[[IMPLICIT_TASK_ID]]
+ // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_parallel_begin:
+ // parent_task_id=[[PARENT_TASK_ID:[0-f]+]], parent_task_frame.exit=[[NULL]],
+ // parent_task_frame.reenter={{(0x)?[0-f]+}},
+ // parallel_id=[[PARALLEL_ID:[0-f]+]], requested_team_size=4,
+ // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}},
+ // invoker=[[PARALLEL_INVOKER:[0-9]+]]
+
+ // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin:
+ // parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID:[0-f]+]],
+ // team_size={{[1-4]}} CHECK: {{^}}[[MASTER_ID]]: task level 0:
+ // parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]] CHECK:
+ // {{^}}[[MASTER_ID]]: task level 1:
+ // parallel_id=[[IMPLICIT_PARALLEL_ID:[0-f]+]], task_id=[[PARENT_TASK_ID]]
+ // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_end:
+ // parallel_id={{[0-9]+}}, task_id=[[IMPLICIT_TASK_ID]]
// CHECK: {{^}}[[MASTER_ID]]: ompt_event_parallel_end: parallel_id=[[PARALLEL_ID]], task_id=[[PARENT_TASK_ID]], invoker=[[PARALLEL_INVOKER]]
// CHECK: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
diff --git a/openmp/runtime/test/ompt/parallel/max_active_levels_serialized.c b/openmp/runtime/test/ompt/parallel/max_active_levels_serialized.c
index 3af5edf4c..592aca100 100644
--- a/openmp/runtime/test/ompt/parallel/max_active_levels_serialized.c
+++ b/openmp/runtime/test/ompt/parallel/max_active_levels_serialized.c
@@ -39,35 +39,69 @@ int main()
// CHECK-NOT: 0: task_data initially not null
// CHECK-NOT: 0: thread_data initially not null
- // THREADS: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_parallel_begin: parent_task_id=[[PARENT_TASK_ID:[0-f]+]], parent_task_frame.exit=[[NULL]], parent_task_frame.reenter={{(0x)?[0-f]+}}, parallel_id=[[PARALLEL_ID:[0-f]+]], requested_team_size=2, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}, invoker=[[PARALLEL_INVOKER:[0-9]+]]
-
- // THREADS: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID:[0-f]+]]
- // THREADS: {{^}}[[MASTER_ID]]: task level 0: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]]
- // THREADS: {{^}}[[MASTER_ID]]: task level 1: parallel_id=[[IMPLICIT_PARALLEL_ID:[0-f]+]], task_id=[[PARENT_TASK_ID]]
- // THREADS: {{^}}[[MASTER_ID]]: ompt_event_parallel_begin: parent_task_id=[[IMPLICIT_TASK_ID]], parent_task_frame.exit={{(0x)?[0-f]+}}, parent_task_frame.reenter={{(0x)?[0-f]+}}, parallel_id=[[NESTED_PARALLEL_ID:[0-f]+]], requested_team_size=2, codeptr_ra=[[NESTED_RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}, invoker=[[PARALLEL_INVOKER]]
- // THREADS: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin: parallel_id=[[NESTED_PARALLEL_ID]], task_id=[[NESTED_IMPLICIT_TASK_ID:[0-f]+]]
- // THREADS: {{^}}[[MASTER_ID]]: task level 0: parallel_id=[[NESTED_PARALLEL_ID]], task_id=[[NESTED_IMPLICIT_TASK_ID]]
- // THREADS: {{^}}[[MASTER_ID]]: task level 1: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]]
- // THREADS: {{^}}[[MASTER_ID]]: task level 2: parallel_id=[[IMPLICIT_PARALLEL_ID]], task_id=[[PARENT_TASK_ID]]
- // THREADS: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_end: parallel_id={{[0-9]+}}, task_id=[[NESTED_IMPLICIT_TASK_ID]]
- // THREADS: {{^}}[[MASTER_ID]]: ompt_event_parallel_end: parallel_id=[[NESTED_PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]], invoker=[[PARALLEL_INVOKER]]
- // THREADS: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[NESTED_RETURN_ADDRESS]]
- // THREADS: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_end: parallel_id={{[0-9]+}}, task_id=[[IMPLICIT_TASK_ID]]
- // THREADS: {{^}}[[MASTER_ID]]: ompt_event_parallel_end: parallel_id=[[PARALLEL_ID]], task_id=[[PARENT_TASK_ID]], invoker=[[PARALLEL_INVOKER]]
- // THREADS: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
+ // THREADS: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_parallel_begin:
+ // parent_task_id=[[PARENT_TASK_ID:[0-f]+]], parent_task_frame.exit=[[NULL]],
+ // parent_task_frame.reenter={{(0x)?[0-f]+}},
+ // parallel_id=[[PARALLEL_ID:[0-f]+]], requested_team_size=2,
+ // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}},
+ // invoker=[[PARALLEL_INVOKER:[0-9]+]]
- // THREADS: {{^}}[[THREAD_ID:[0-9]+]]: ompt_event_implicit_task_begin: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID:[0-f]+]]
- // THREADS: {{^}}[[THREAD_ID]]: task level 0: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]]
- // THREADS: {{^}}[[THREAD_ID]]: task level 1: parallel_id=[[IMPLICIT_PARALLEL_ID]], task_id=[[PARENT_TASK_ID]]
- // THREADS: {{^}}[[THREAD_ID]]: ompt_event_parallel_begin: parent_task_id=[[IMPLICIT_TASK_ID]], parent_task_frame.exit={{(0x)?[0-f]+}}, parent_task_frame.reenter={{(0x)?[0-f]+}}, parallel_id=[[NESTED_PARALLEL_ID:[0-f]+]], requested_team_size=2, codeptr_ra=[[NESTED_RETURN_ADDRESS]]{{[0-f][0-f]}}, invoker=[[PARALLEL_INVOKER]]
- // THREADS: {{^}}[[THREAD_ID]]: ompt_event_implicit_task_begin: parallel_id=[[NESTED_PARALLEL_ID]], task_id=[[NESTED_IMPLICIT_TASK_ID:[0-f]+]]
- // THREADS: {{^}}[[THREAD_ID]]: task level 0: parallel_id=[[NESTED_PARALLEL_ID]], task_id=[[NESTED_IMPLICIT_TASK_ID]]
- // THREADS: {{^}}[[THREAD_ID]]: task level 1: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]]
- // THREADS: {{^}}[[THREAD_ID]]: task level 2: parallel_id=[[IMPLICIT_PARALLEL_ID]], task_id=[[PARENT_TASK_ID]]
- // THREADS: {{^}}[[THREAD_ID]]: ompt_event_implicit_task_end: parallel_id={{[0-9]+}}, task_id=[[NESTED_IMPLICIT_TASK_ID]]
- // THREADS: {{^}}[[THREAD_ID]]: ompt_event_parallel_end: parallel_id=[[NESTED_PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]], invoker=[[PARALLEL_INVOKER]]
- // THREADS: {{^}}[[THREAD_ID]]: fuzzy_address={{.*}}[[NESTED_RETURN_ADDRESS]]
- // THREADS: {{^}}[[THREAD_ID]]: ompt_event_implicit_task_end: parallel_id={{[0-9]+}}, task_id=[[IMPLICIT_TASK_ID]]
+ // THREADS: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin:
+ // parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID:[0-f]+]] THREADS:
+ // {{^}}[[MASTER_ID]]: task level 0: parallel_id=[[PARALLEL_ID]],
+ // task_id=[[IMPLICIT_TASK_ID]] THREADS: {{^}}[[MASTER_ID]]: task level 1:
+ // parallel_id=[[IMPLICIT_PARALLEL_ID:[0-f]+]], task_id=[[PARENT_TASK_ID]]
+ // THREADS: {{^}}[[MASTER_ID]]: ompt_event_parallel_begin:
+ // parent_task_id=[[IMPLICIT_TASK_ID]],
+ // parent_task_frame.exit={{(0x)?[0-f]+}},
+ // parent_task_frame.reenter={{(0x)?[0-f]+}},
+ // parallel_id=[[NESTED_PARALLEL_ID:[0-f]+]], requested_team_size=2,
+ // codeptr_ra=[[NESTED_RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}},
+ // invoker=[[PARALLEL_INVOKER]] THREADS: {{^}}[[MASTER_ID]]:
+ // ompt_event_implicit_task_begin: parallel_id=[[NESTED_PARALLEL_ID]],
+ // task_id=[[NESTED_IMPLICIT_TASK_ID:[0-f]+]] THREADS: {{^}}[[MASTER_ID]]:
+ // task level 0: parallel_id=[[NESTED_PARALLEL_ID]],
+ // task_id=[[NESTED_IMPLICIT_TASK_ID]] THREADS: {{^}}[[MASTER_ID]]: task level
+ // 1: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]] THREADS:
+ // {{^}}[[MASTER_ID]]: task level 2: parallel_id=[[IMPLICIT_PARALLEL_ID]],
+ // task_id=[[PARENT_TASK_ID]] THREADS: {{^}}[[MASTER_ID]]:
+ // ompt_event_implicit_task_end: parallel_id={{[0-9]+}},
+ // task_id=[[NESTED_IMPLICIT_TASK_ID]] THREADS: {{^}}[[MASTER_ID]]:
+ // ompt_event_parallel_end: parallel_id=[[NESTED_PARALLEL_ID]],
+ // task_id=[[IMPLICIT_TASK_ID]], invoker=[[PARALLEL_INVOKER]] THREADS:
+ // {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[NESTED_RETURN_ADDRESS]] THREADS:
+ // {{^}}[[MASTER_ID]]: ompt_event_implicit_task_end: parallel_id={{[0-9]+}},
+ // task_id=[[IMPLICIT_TASK_ID]] THREADS: {{^}}[[MASTER_ID]]:
+ // ompt_event_parallel_end: parallel_id=[[PARALLEL_ID]],
+ // task_id=[[PARENT_TASK_ID]], invoker=[[PARALLEL_INVOKER]] THREADS:
+ // {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
+
+ // THREADS: {{^}}[[THREAD_ID:[0-9]+]]: ompt_event_implicit_task_begin:
+ // parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID:[0-f]+]] THREADS:
+ // {{^}}[[THREAD_ID]]: task level 0: parallel_id=[[PARALLEL_ID]],
+ // task_id=[[IMPLICIT_TASK_ID]] THREADS: {{^}}[[THREAD_ID]]: task level 1:
+ // parallel_id=[[IMPLICIT_PARALLEL_ID]], task_id=[[PARENT_TASK_ID]] THREADS:
+ // {{^}}[[THREAD_ID]]: ompt_event_parallel_begin:
+ // parent_task_id=[[IMPLICIT_TASK_ID]],
+ // parent_task_frame.exit={{(0x)?[0-f]+}},
+ // parent_task_frame.reenter={{(0x)?[0-f]+}},
+ // parallel_id=[[NESTED_PARALLEL_ID:[0-f]+]], requested_team_size=2,
+ // codeptr_ra=[[NESTED_RETURN_ADDRESS]]{{[0-f][0-f]}},
+ // invoker=[[PARALLEL_INVOKER]] THREADS: {{^}}[[THREAD_ID]]:
+ // ompt_event_implicit_task_begin: parallel_id=[[NESTED_PARALLEL_ID]],
+ // task_id=[[NESTED_IMPLICIT_TASK_ID:[0-f]+]] THREADS: {{^}}[[THREAD_ID]]:
+ // task level 0: parallel_id=[[NESTED_PARALLEL_ID]],
+ // task_id=[[NESTED_IMPLICIT_TASK_ID]] THREADS: {{^}}[[THREAD_ID]]: task level
+ // 1: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]] THREADS:
+ // {{^}}[[THREAD_ID]]: task level 2: parallel_id=[[IMPLICIT_PARALLEL_ID]],
+ // task_id=[[PARENT_TASK_ID]] THREADS: {{^}}[[THREAD_ID]]:
+ // ompt_event_implicit_task_end: parallel_id={{[0-9]+}},
+ // task_id=[[NESTED_IMPLICIT_TASK_ID]] THREADS: {{^}}[[THREAD_ID]]:
+ // ompt_event_parallel_end: parallel_id=[[NESTED_PARALLEL_ID]],
+ // task_id=[[IMPLICIT_TASK_ID]], invoker=[[PARALLEL_INVOKER]] THREADS:
+ // {{^}}[[THREAD_ID]]: fuzzy_address={{.*}}[[NESTED_RETURN_ADDRESS]] THREADS:
+ // {{^}}[[THREAD_ID]]: ompt_event_implicit_task_end: parallel_id={{[0-9]+}},
+ // task_id=[[IMPLICIT_TASK_ID]]
return 0;
}
diff --git a/openmp/runtime/test/ompt/parallel/nested_serialized_task_frames.c b/openmp/runtime/test/ompt/parallel/nested_serialized_task_frames.c
index 405e7130d..6c33186d8 100644
--- a/openmp/runtime/test/ompt/parallel/nested_serialized_task_frames.c
+++ b/openmp/runtime/test/ompt/parallel/nested_serialized_task_frames.c
@@ -31,9 +31,10 @@ int main()
// CHECK-NOT: {{^}}0: Could not register callback 'ompt_callback_task_create'
// CHECK-NOT: {{^}}0: Could not register callback 'ompt_callback_implicit_task'
-
// CHECK: {{^}}0: NULL_POINTER=[[NULL:.*$]]
- // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_initial_task_begin: parallel_id=[[INITIAL_PARALLEL_ID:[0-f]+]], task_id=[[INITIAL_TASK_ID:[0-f]+]], actual_parallelism=1, index=1, flags=1
+ // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_initial_task_begin:
+ // parallel_id=[[INITIAL_PARALLEL_ID:[0-f]+]],
+ // task_id=[[INITIAL_TASK_ID:[0-f]+]], actual_parallelism=1, index=1, flags=1
// region 0
// CHECK: {{^}}[[MASTER_ID]]: ompt_event_parallel_begin
diff --git a/openmp/runtime/test/ompt/parallel/nested_thread_num.c b/openmp/runtime/test/ompt/parallel/nested_thread_num.c
index 321eb0797..dbdf91aef 100644
--- a/openmp/runtime/test/ompt/parallel/nested_thread_num.c
+++ b/openmp/runtime/test/ompt/parallel/nested_thread_num.c
@@ -77,7 +77,7 @@ int main() {
// THREADS: {{^}}0: NULL_POINTER=[[NULL:.*$]]
// THREADS: __builtin_frame_address(0)=[[MAIN_REENTER:(0x)?[0-f]+]]
// THREADS: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_parallel_begin:
-// THREADS-SAME: parent_task_id=[[PARENT_TASK_ID:[0-f]+]],
+// THREADS-SAME: parent_task_id=[[PARENT_TASK_ID:[0-f]+]],
// THREADS-SAME: parent_task_frame.exit=[[NULL]],
// THREADS-SAME: parent_task_frame.reenter={{(0x)?[0-f]+}},
// THREADS-SAME: parallel_id=[[PARALLEL_ID:[0-f]+]], requested_team_size=2,
@@ -86,7 +86,7 @@ int main() {
// nested parallel masters
// THREADS: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin:
-// THREADS-SAME: parallel_id=[[PARALLEL_ID]],
+// THREADS-SAME: parallel_id=[[PARALLEL_ID]],
// THREADS-SAME: task_id=[[IMPLICIT_TASK_ID:[0-f]+]],
// THREADS-SAME: team_size=2, thread_num=0
@@ -98,24 +98,24 @@ int main() {
// THREADS-SAME: thread_num=0
// THREADS: {{^}}[[MASTER_ID]]: task level 1:
-// THREADS-SAME: parallel_id=[[IMPLICIT_PARALLEL_ID:[0-f]+]],
-// THREADS-SAME: task_id=[[PARENT_TASK_ID]], exit_frame=[[NULL]],
+// THREADS-SAME: parallel_id=[[IMPLICIT_PARALLEL_ID:[0-f]+]],
+// THREADS-SAME: task_id=[[PARENT_TASK_ID]], exit_frame=[[NULL]],
// THREADS-SAME: reenter_frame={{(0x)?[0-f]+}}
// THREADS: __builtin_frame_address(0)=[[REENTER:(0x)?[0-f]+]]
// THREADS: {{^}}[[MASTER_ID]]: ompt_event_parallel_begin:
-// THREADS-SAME: parent_task_id=[[IMPLICIT_TASK_ID]],
+// THREADS-SAME: parent_task_id=[[IMPLICIT_TASK_ID]],
// THREADS-SAME: parent_task_frame.exit=[[EXIT]],
// THREADS-SAME: parent_task_frame.reenter={{(0x)?[0-f]+}},
-// THREADS-SAME: parallel_id=[[NESTED_PARALLEL_ID:[0-f]+]],
+// THREADS-SAME: parallel_id=[[NESTED_PARALLEL_ID:[0-f]+]],
// THREADS-SAME: requested_team_size=2,
// THREADS-SAME: codeptr_ra=[[NESTED_RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}},
// THREADS-SAME: invoker=[[PARALLEL_INVOKER]]
// THREADS: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin:
// THREADS-SAME: parallel_id=[[NESTED_PARALLEL_ID]],
-// THREADS-SAME: task_id=[[NESTED_IMPLICIT_TASK_ID:[0-f]+]], team_size=2,
+// THREADS-SAME: task_id=[[NESTED_IMPLICIT_TASK_ID:[0-f]+]], team_size=2,
// THREADS-SAME: thread_num=0
// THREADS: __builtin_frame_address({{.}})=[[NESTED_EXIT:(0x)?[0-f]+]]
@@ -219,8 +219,8 @@ int main() {
// Worker of first nesting level
// THREADS: {{^}}[[THREAD_ID:[0-9]+]]: ompt_event_implicit_task_begin:
-// THREADS-SAME: parallel_id=[[PARALLEL_ID]],
-// THREADS-SAME: task_id=[[IMPLICIT_TASK_ID:[0-f]+]], team_size=2,
+// THREADS-SAME: parallel_id=[[PARALLEL_ID]],
+// THREADS-SAME: task_id=[[IMPLICIT_TASK_ID:[0-f]+]], team_size=2,
// THREADS-SAME: thread_num=[[OUTER_THREADNUM:[0-9]+]]
// THREADS: {{^}}[[THREAD_ID]]: task level 0: parallel_id=[[PARALLEL_ID]],
@@ -232,12 +232,13 @@ int main() {
// THREADS-SAME: task_id=[[PARENT_TASK_ID]]
// THREADS: {{^}}[[THREAD_ID]]: ompt_event_parallel_begin:
-// THREADS-SAME: parent_task_id=[[IMPLICIT_TASK_ID]],
+// THREADS-SAME: parent_task_id=[[IMPLICIT_TASK_ID]],
// THREADS-SAME: parent_task_frame.exit={{(0x)?[0-f]+}},
// THREADS-SAME: parent_task_frame.reenter={{(0x)?[0-f]+}},
-// THREADS-SAME: parallel_id=[[NESTED_PARALLEL_ID:[0-f]+]], requested_team_size=2,
-// THREADS-SAME: codeptr_ra=[[NESTED_RETURN_ADDRESS]]{{[0-f][0-f]}},
-// THREADS-SAME: invoker=[[PARALLEL_INVOKER]]
+// THREADS-SAME: parallel_id=[[NESTED_PARALLEL_ID:[0-f]+]],
+// requested_team_size=2, THREADS-SAME:
+// codeptr_ra=[[NESTED_RETURN_ADDRESS]]{{[0-f][0-f]}}, THREADS-SAME:
+// invoker=[[PARALLEL_INVOKER]]
// THREADS: {{^}}[[THREAD_ID]]: ompt_event_implicit_task_begin:
// THREADS-SAME: parallel_id=[[NESTED_PARALLEL_ID]],
diff --git a/openmp/runtime/test/ompt/parallel/parallel_if0.c b/openmp/runtime/test/ompt/parallel/parallel_if0.c
index 3eefc9527..574d2675f 100644
--- a/openmp/runtime/test/ompt/parallel/parallel_if0.c
+++ b/openmp/runtime/test/ompt/parallel/parallel_if0.c
@@ -45,25 +45,58 @@ int main()
// CHECK-NOT: 0: task_data initially not null
// CHECK-NOT: 0: thread_data initially not null
- // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_parallel_begin: parent_task_id=[[PARENT_TASK_ID:[0-f]+]], parent_task_frame.exit=[[NULL]], parent_task_frame.reenter={{(0x)?[0-f]+}}, parallel_id=[[PARALLEL_ID:[0-f]+]], requested_team_size=1, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}, invoker=[[PARALLEL_INVOKER:[0-9]+]]
+ // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_parallel_begin:
+ // parent_task_id=[[PARENT_TASK_ID:[0-f]+]], parent_task_frame.exit=[[NULL]],
+ // parent_task_frame.reenter={{(0x)?[0-f]+}},
+ // parallel_id=[[PARALLEL_ID:[0-f]+]], requested_team_size=1,
+ // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}},
+ // invoker=[[PARALLEL_INVOKER:[0-9]+]]
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID:[0-f]+]]
- // CHECK: {{^}}[[MASTER_ID]]: task level 0: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]], exit_frame={{(0x)?[0-f]+}}, reenter_frame=[[NULL]]
- // CHECK: {{^}}[[MASTER_ID]]: task level 1: parallel_id=[[IMPLICIT_PARALLEL_ID:[0-f]+]], task_id=[[PARENT_TASK_ID]], exit_frame=[[NULL]], reenter_frame={{(0x)?[0-f]+}}
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_parallel_begin: parent_task_id=[[IMPLICIT_TASK_ID]], parent_task_frame.exit={{(0x)?[0-f]+}}, parent_task_frame.reenter={{(0x)?[0-f]+}}, parallel_id=[[NESTED_PARALLEL_ID:[0-f]+]], requested_team_size=1, codeptr_ra=[[NESTED_RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}, invoker=[[PARALLEL_INVOKER]]
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin: parallel_id=[[NESTED_PARALLEL_ID]], task_id=[[NESTED_IMPLICIT_TASK_ID:[0-f]+]]
- // CHECK: {{^}}[[MASTER_ID]]: task level 0: parallel_id=[[NESTED_PARALLEL_ID]], task_id=[[NESTED_IMPLICIT_TASK_ID]], exit_frame={{(0x)?[0-f]+}}, reenter_frame=[[NULL]]
- // CHECK: {{^}}[[MASTER_ID]]: task level 1: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]], exit_frame={{(0x)?[0-f]+}}, reenter_frame={{(0x)?[0-f]+}}
- // CHECK: {{^}}[[MASTER_ID]]: task level 2: parallel_id=[[IMPLICIT_PARALLEL_ID]], task_id=[[PARENT_TASK_ID]], exit_frame=[[NULL]], reenter_frame={{(0x)?[0-f]+}}
-
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_create: parent_task_id=[[NESTED_IMPLICIT_TASK_ID]], parent_task_frame.exit={{(0x)?[0-f]+}}, parent_task_frame.reenter={{(0x)?[0-f]+}}, new_task_id=[[EXPLICIT_TASK_ID:[0-f]+]]
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_schedule: first_task_id=[[NESTED_IMPLICIT_TASK_ID]], second_task_id=[[EXPLICIT_TASK_ID]], prior_task_status=ompt_task_switch=7
- // CHECK: {{^}}[[MASTER_ID]]: task level 0: parallel_id=[[NESTED_PARALLEL_ID]], task_id=[[EXPLICIT_TASK_ID]], exit_frame={{(0x)?[0-f]+}}, reenter_frame=[[NULL]]
- // CHECK: {{^}}[[MASTER_ID]]: task level 1: parallel_id=[[NESTED_PARALLEL_ID]], task_id=[[NESTED_IMPLICIT_TASK_ID]], exit_frame={{(0x)?[0-f]+}}, reenter_frame={{(0x)?[0-f]+}}
- // CHECK: {{^}}[[MASTER_ID]]: task level 2: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]], exit_frame={{(0x)?[0-f]+}}, reenter_frame={{(0x)?[0-f]+}}
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_schedule: first_task_id=[[EXPLICIT_TASK_ID]], second_task_id=[[NESTED_IMPLICIT_TASK_ID]], prior_task_status=ompt_task_complete=1
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_end: task_id=[[EXPLICIT_TASK_ID]]
+ // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin:
+ // parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID:[0-f]+]] CHECK:
+ // {{^}}[[MASTER_ID]]: task level 0: parallel_id=[[PARALLEL_ID]],
+ // task_id=[[IMPLICIT_TASK_ID]], exit_frame={{(0x)?[0-f]+}},
+ // reenter_frame=[[NULL]] CHECK: {{^}}[[MASTER_ID]]: task level 1:
+ // parallel_id=[[IMPLICIT_PARALLEL_ID:[0-f]+]], task_id=[[PARENT_TASK_ID]],
+ // exit_frame=[[NULL]], reenter_frame={{(0x)?[0-f]+}} CHECK:
+ // {{^}}[[MASTER_ID]]: ompt_event_parallel_begin:
+ // parent_task_id=[[IMPLICIT_TASK_ID]],
+ // parent_task_frame.exit={{(0x)?[0-f]+}},
+ // parent_task_frame.reenter={{(0x)?[0-f]+}},
+ // parallel_id=[[NESTED_PARALLEL_ID:[0-f]+]], requested_team_size=1,
+ // codeptr_ra=[[NESTED_RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}},
+ // invoker=[[PARALLEL_INVOKER]] CHECK: {{^}}[[MASTER_ID]]:
+ // ompt_event_implicit_task_begin: parallel_id=[[NESTED_PARALLEL_ID]],
+ // task_id=[[NESTED_IMPLICIT_TASK_ID:[0-f]+]] CHECK: {{^}}[[MASTER_ID]]: task
+ // level 0: parallel_id=[[NESTED_PARALLEL_ID]],
+ // task_id=[[NESTED_IMPLICIT_TASK_ID]], exit_frame={{(0x)?[0-f]+}},
+ // reenter_frame=[[NULL]] CHECK: {{^}}[[MASTER_ID]]: task level 1:
+ // parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]],
+ // exit_frame={{(0x)?[0-f]+}}, reenter_frame={{(0x)?[0-f]+}} CHECK:
+ // {{^}}[[MASTER_ID]]: task level 2: parallel_id=[[IMPLICIT_PARALLEL_ID]],
+ // task_id=[[PARENT_TASK_ID]], exit_frame=[[NULL]],
+ // reenter_frame={{(0x)?[0-f]+}}
+ // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_create:
+ // parent_task_id=[[NESTED_IMPLICIT_TASK_ID]],
+ // parent_task_frame.exit={{(0x)?[0-f]+}},
+ // parent_task_frame.reenter={{(0x)?[0-f]+}},
+ // new_task_id=[[EXPLICIT_TASK_ID:[0-f]+]] CHECK: {{^}}[[MASTER_ID]]:
+ // ompt_event_task_schedule: first_task_id=[[NESTED_IMPLICIT_TASK_ID]],
+ // second_task_id=[[EXPLICIT_TASK_ID]], prior_task_status=ompt_task_switch=7
+ // CHECK: {{^}}[[MASTER_ID]]: task level 0:
+ // parallel_id=[[NESTED_PARALLEL_ID]], task_id=[[EXPLICIT_TASK_ID]],
+ // exit_frame={{(0x)?[0-f]+}}, reenter_frame=[[NULL]] CHECK:
+ // {{^}}[[MASTER_ID]]: task level 1: parallel_id=[[NESTED_PARALLEL_ID]],
+ // task_id=[[NESTED_IMPLICIT_TASK_ID]], exit_frame={{(0x)?[0-f]+}},
+ // reenter_frame={{(0x)?[0-f]+}} CHECK: {{^}}[[MASTER_ID]]: task level 2:
+ // parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]],
+ // exit_frame={{(0x)?[0-f]+}}, reenter_frame={{(0x)?[0-f]+}} CHECK:
+ // {{^}}[[MASTER_ID]]: ompt_event_task_schedule:
+ // first_task_id=[[EXPLICIT_TASK_ID]],
+ // second_task_id=[[NESTED_IMPLICIT_TASK_ID]],
+ // prior_task_status=ompt_task_complete=1 CHECK: {{^}}[[MASTER_ID]]:
+ // ompt_event_task_end: task_id=[[EXPLICIT_TASK_ID]]
// CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_end: parallel_id=0, task_id=[[NESTED_IMPLICIT_TASK_ID]]
// CHECK: {{^}}[[MASTER_ID]]: ompt_event_parallel_end: parallel_id=[[NESTED_PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]], invoker=[[PARALLEL_INVOKER]]
diff --git a/openmp/runtime/test/ompt/parallel/region_in_expl_task_task_frames.c b/openmp/runtime/test/ompt/parallel/region_in_expl_task_task_frames.c
index 5703b8d26..a0ae92985 100644
--- a/openmp/runtime/test/ompt/parallel/region_in_expl_task_task_frames.c
+++ b/openmp/runtime/test/ompt/parallel/region_in_expl_task_task_frames.c
@@ -36,9 +36,10 @@ int main()
// CHECK-NOT: {{^}}0: Could not register callback 'ompt_callback_task_create'
// CHECK-NOT: {{^}}0: Could not register callback 'ompt_callback_implicit_task'
-
// CHECK: {{^}}0: NULL_POINTER=[[NULL:.*$]]
- // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_initial_task_begin: parallel_id=[[INITIAL_PARALLEL_ID:[0-f]+]], task_id=[[INITIAL_TASK_ID:[0-f]+]], actual_parallelism=1, index=1, flags=1
+ // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_initial_task_begin:
+ // parallel_id=[[INITIAL_PARALLEL_ID:[0-f]+]],
+ // task_id=[[INITIAL_TASK_ID:[0-f]+]], actual_parallelism=1, index=1, flags=1
// region 0
// CHECK: {{^}}[[MASTER_ID]]: ompt_event_parallel_begin
diff --git a/openmp/runtime/test/ompt/parallel/serialized.c b/openmp/runtime/test/ompt/parallel/serialized.c
index a6a39efea..43a14a31e 100644
--- a/openmp/runtime/test/ompt/parallel/serialized.c
+++ b/openmp/runtime/test/ompt/parallel/serialized.c
@@ -45,25 +45,58 @@ int main()
// CHECK-NOT: 0: task_data initially not null
// CHECK-NOT: 0: thread_data initially not null
- // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_parallel_begin: parent_task_id=[[PARENT_TASK_ID:[0-f]+]], parent_task_frame.exit=[[NULL]], parent_task_frame.reenter={{(0x)?[0-f]+}}, parallel_id=[[PARALLEL_ID:[0-f]+]], requested_team_size=1, codeptr_ra=[[OUTER_RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}, invoker=[[PARALLEL_INVOKER:[0-9]+]]
+ // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_parallel_begin:
+ // parent_task_id=[[PARENT_TASK_ID:[0-f]+]], parent_task_frame.exit=[[NULL]],
+ // parent_task_frame.reenter={{(0x)?[0-f]+}},
+ // parallel_id=[[PARALLEL_ID:[0-f]+]], requested_team_size=1,
+ // codeptr_ra=[[OUTER_RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}},
+ // invoker=[[PARALLEL_INVOKER:[0-9]+]]
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID:[0-f]+]]
- // CHECK: {{^}}[[MASTER_ID]]: task level 0: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]], exit_frame={{(0x)?[0-f]+}}, reenter_frame=[[NULL]]
- // CHECK: {{^}}[[MASTER_ID]]: task level 1: parallel_id=[[IMPLICIT_PARALLEL_ID:[0-f]+]], task_id=[[PARENT_TASK_ID]], exit_frame=[[NULL]], reenter_frame={{(0x)?[0-f]+}}
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_parallel_begin: parent_task_id=[[IMPLICIT_TASK_ID]], parent_task_frame.exit={{(0x)?[0-f]+}}, parent_task_frame.reenter={{(0x)?[0-f]+}}, parallel_id=[[NESTED_PARALLEL_ID:[0-f]+]], requested_team_size=1, codeptr_ra=[[INNER_RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}, invoker=[[PARALLEL_INVOKER]]
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin: parallel_id=[[NESTED_PARALLEL_ID]], task_id=[[NESTED_IMPLICIT_TASK_ID:[0-f]+]]
- // CHECK: {{^}}[[MASTER_ID]]: task level 0: parallel_id=[[NESTED_PARALLEL_ID]], task_id=[[NESTED_IMPLICIT_TASK_ID]], exit_frame={{(0x)?[0-f]+}}, reenter_frame=[[NULL]]
- // CHECK: {{^}}[[MASTER_ID]]: task level 1: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]], exit_frame={{(0x)?[0-f]+}}, reenter_frame={{(0x)?[0-f]+}}
- // CHECK: {{^}}[[MASTER_ID]]: task level 2: parallel_id=[[IMPLICIT_PARALLEL_ID]], task_id=[[PARENT_TASK_ID]], exit_frame=[[NULL]], reenter_frame={{(0x)?[0-f]+}}
-
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_create: parent_task_id=[[NESTED_IMPLICIT_TASK_ID]], parent_task_frame.exit={{(0x)?[0-f]+}}, parent_task_frame.reenter={{(0x)?[0-f]+}}, new_task_id=[[EXPLICIT_TASK_ID:[0-f]+]]
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_schedule: first_task_id=[[NESTED_IMPLICIT_TASK_ID]], second_task_id=[[EXPLICIT_TASK_ID]], prior_task_status=ompt_task_switch=7
- // CHECK: {{^}}[[MASTER_ID]]: task level 0: parallel_id=[[NESTED_PARALLEL_ID]], task_id=[[EXPLICIT_TASK_ID]], exit_frame={{(0x)?[0-f]+}}, reenter_frame=[[NULL]]
- // CHECK: {{^}}[[MASTER_ID]]: task level 1: parallel_id=[[NESTED_PARALLEL_ID]], task_id=[[NESTED_IMPLICIT_TASK_ID]], exit_frame={{(0x)?[0-f]+}}, reenter_frame={{(0x)?[0-f]+}}
- // CHECK: {{^}}[[MASTER_ID]]: task level 2: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]], exit_frame={{(0x)?[0-f]+}}, reenter_frame={{(0x)?[0-f]+}}
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_schedule: first_task_id=[[EXPLICIT_TASK_ID]], second_task_id=[[NESTED_IMPLICIT_TASK_ID]], prior_task_status=ompt_task_complete=1
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_end: task_id=[[EXPLICIT_TASK_ID]]
+ // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin:
+ // parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID:[0-f]+]] CHECK:
+ // {{^}}[[MASTER_ID]]: task level 0: parallel_id=[[PARALLEL_ID]],
+ // task_id=[[IMPLICIT_TASK_ID]], exit_frame={{(0x)?[0-f]+}},
+ // reenter_frame=[[NULL]] CHECK: {{^}}[[MASTER_ID]]: task level 1:
+ // parallel_id=[[IMPLICIT_PARALLEL_ID:[0-f]+]], task_id=[[PARENT_TASK_ID]],
+ // exit_frame=[[NULL]], reenter_frame={{(0x)?[0-f]+}} CHECK:
+ // {{^}}[[MASTER_ID]]: ompt_event_parallel_begin:
+ // parent_task_id=[[IMPLICIT_TASK_ID]],
+ // parent_task_frame.exit={{(0x)?[0-f]+}},
+ // parent_task_frame.reenter={{(0x)?[0-f]+}},
+ // parallel_id=[[NESTED_PARALLEL_ID:[0-f]+]], requested_team_size=1,
+ // codeptr_ra=[[INNER_RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}},
+ // invoker=[[PARALLEL_INVOKER]] CHECK: {{^}}[[MASTER_ID]]:
+ // ompt_event_implicit_task_begin: parallel_id=[[NESTED_PARALLEL_ID]],
+ // task_id=[[NESTED_IMPLICIT_TASK_ID:[0-f]+]] CHECK: {{^}}[[MASTER_ID]]: task
+ // level 0: parallel_id=[[NESTED_PARALLEL_ID]],
+ // task_id=[[NESTED_IMPLICIT_TASK_ID]], exit_frame={{(0x)?[0-f]+}},
+ // reenter_frame=[[NULL]] CHECK: {{^}}[[MASTER_ID]]: task level 1:
+ // parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]],
+ // exit_frame={{(0x)?[0-f]+}}, reenter_frame={{(0x)?[0-f]+}} CHECK:
+ // {{^}}[[MASTER_ID]]: task level 2: parallel_id=[[IMPLICIT_PARALLEL_ID]],
+ // task_id=[[PARENT_TASK_ID]], exit_frame=[[NULL]],
+ // reenter_frame={{(0x)?[0-f]+}}
+ // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_create:
+ // parent_task_id=[[NESTED_IMPLICIT_TASK_ID]],
+ // parent_task_frame.exit={{(0x)?[0-f]+}},
+ // parent_task_frame.reenter={{(0x)?[0-f]+}},
+ // new_task_id=[[EXPLICIT_TASK_ID:[0-f]+]] CHECK: {{^}}[[MASTER_ID]]:
+ // ompt_event_task_schedule: first_task_id=[[NESTED_IMPLICIT_TASK_ID]],
+ // second_task_id=[[EXPLICIT_TASK_ID]], prior_task_status=ompt_task_switch=7
+ // CHECK: {{^}}[[MASTER_ID]]: task level 0:
+ // parallel_id=[[NESTED_PARALLEL_ID]], task_id=[[EXPLICIT_TASK_ID]],
+ // exit_frame={{(0x)?[0-f]+}}, reenter_frame=[[NULL]] CHECK:
+ // {{^}}[[MASTER_ID]]: task level 1: parallel_id=[[NESTED_PARALLEL_ID]],
+ // task_id=[[NESTED_IMPLICIT_TASK_ID]], exit_frame={{(0x)?[0-f]+}},
+ // reenter_frame={{(0x)?[0-f]+}} CHECK: {{^}}[[MASTER_ID]]: task level 2:
+ // parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]],
+ // exit_frame={{(0x)?[0-f]+}}, reenter_frame={{(0x)?[0-f]+}} CHECK:
+ // {{^}}[[MASTER_ID]]: ompt_event_task_schedule:
+ // first_task_id=[[EXPLICIT_TASK_ID]],
+ // second_task_id=[[NESTED_IMPLICIT_TASK_ID]],
+ // prior_task_status=ompt_task_complete=1 CHECK: {{^}}[[MASTER_ID]]:
+ // ompt_event_task_end: task_id=[[EXPLICIT_TASK_ID]]
// CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_end: parallel_id=0, task_id=[[NESTED_IMPLICIT_TASK_ID]]
// CHECK: {{^}}[[MASTER_ID]]: ompt_event_parallel_end: parallel_id=[[NESTED_PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]], invoker=[[PARALLEL_INVOKER]], codeptr_ra=[[INNER_RETURN_ADDRESS]]{{[0-f][0-f]}}
diff --git a/openmp/runtime/test/ompt/synchronization/taskgroup.c b/openmp/runtime/test/ompt/synchronization/taskgroup.c
index 30561e623..4e8effc03 100644
--- a/openmp/runtime/test/ompt/synchronization/taskgroup.c
+++ b/openmp/runtime/test/ompt/synchronization/taskgroup.c
@@ -37,12 +37,18 @@ int main()
// CHECK: {{^}}0: NULL_POINTER=[[NULL:.*$]]
- // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_taskgroup_begin: parallel_id=[[PARALLEL_ID:[0-f]+]], task_id=[[TASK_ID:[0-f]+]], codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]
- // CHECK-NEXT: {{^}}[[MASTER_ID]]: current_address={{.*}}[[RETURN_ADDRESS]]
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_wait_taskgroup_begin: parallel_id=[[PARALLEL_ID]], task_id=[[TASK_ID]], codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_wait_taskgroup_end: parallel_id=[[PARALLEL_ID]], task_id=[[TASK_ID]], codeptr_ra=[[RETURN_ADDRESS]]
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_taskgroup_end: parallel_id=[[PARALLEL_ID]], task_id=[[TASK_ID]], codeptr_ra=[[RETURN_ADDRESS]]
- // CHECK-NEXT: {{^}}[[MASTER_ID]]: current_address={{.*}}[[RETURN_ADDRESS]]
+ // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_taskgroup_begin:
+ // parallel_id=[[PARALLEL_ID:[0-f]+]], task_id=[[TASK_ID:[0-f]+]],
+ // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]] CHECK-NEXT: {{^}}[[MASTER_ID]]:
+ // current_address={{.*}}[[RETURN_ADDRESS]] CHECK: {{^}}[[MASTER_ID]]:
+ // ompt_event_wait_taskgroup_begin: parallel_id=[[PARALLEL_ID]],
+ // task_id=[[TASK_ID]], codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]] CHECK:
+ // {{^}}[[MASTER_ID]]: ompt_event_wait_taskgroup_end:
+ // parallel_id=[[PARALLEL_ID]], task_id=[[TASK_ID]],
+ // codeptr_ra=[[RETURN_ADDRESS]] CHECK: {{^}}[[MASTER_ID]]:
+ // ompt_event_taskgroup_end: parallel_id=[[PARALLEL_ID]], task_id=[[TASK_ID]],
+ // codeptr_ra=[[RETURN_ADDRESS]] CHECK-NEXT: {{^}}[[MASTER_ID]]:
+ // current_address={{.*}}[[RETURN_ADDRESS]]
return 0;
}
diff --git a/openmp/runtime/test/ompt/tasks/serialized.c b/openmp/runtime/test/ompt/tasks/serialized.c
index 94c14ab5e..102e596d1 100644
--- a/openmp/runtime/test/ompt/tasks/serialized.c
+++ b/openmp/runtime/test/ompt/tasks/serialized.c
@@ -52,7 +52,7 @@ int main() {
// CHECK-NOT: 0: new_task_data initially not null
// CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_initial_task_begin: parallel_id={{[0-9]+}}
- // CHECK-SAME: task_id={{[0-9]+}}, actual_parallelism=1, index=1, flags=1
+ // CHECK-SAME: task_id={{[0-9]+}}, actual_parallelism=1, index=1, flags=1
// CHECK: {{^}}[[MASTER_ID]]: __builtin_frame_address(0)
// CHECK-SAME: =[[MAIN_REENTER:(0x)?[0-f]+]]
@@ -79,13 +79,14 @@ int main() {
// CHECK-SAME: task_id=[[PARENT_TASK_ID]],
// CHECK-SAME: exit_frame=[[NULL]], reenter_frame={{(0x)?[0-f]+}}
- // CHECK: {{^}}[[MASTER_ID]]: __builtin_frame_address(0)=[[REENTER:(0x)?[0-f]+]]
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_create
- // CHECK-SAME: parent_task_id=[[IMPLICIT_TASK_ID]]
- // CHECK-SAME: parent_task_frame.exit=[[EXIT]]
- // CHECK-SAME: parent_task_frame.reenter={{(0x)?[0-f]+}}
- // CHECK-SAME: new_task_id=[[TASK_ID:[0-f]+]]
- // CHECK-SAME: codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
+ // CHECK: {{^}}[[MASTER_ID]]:
+ // __builtin_frame_address(0)=[[REENTER:(0x)?[0-f]+]] CHECK:
+ // {{^}}[[MASTER_ID]]: ompt_event_task_create CHECK-SAME:
+ // parent_task_id=[[IMPLICIT_TASK_ID]] CHECK-SAME:
+ // parent_task_frame.exit=[[EXIT]] CHECK-SAME:
+ // parent_task_frame.reenter={{(0x)?[0-f]+}} CHECK-SAME:
+ // new_task_id=[[TASK_ID:[0-f]+]] CHECK-SAME:
+ // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
// CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_schedule:
// CHECK-SAME: first_task_id=[[IMPLICIT_TASK_ID]], second_task_id=[[TASK_ID]]
diff --git a/openmp/runtime/test/ompt/tasks/task_types.c b/openmp/runtime/test/ompt/tasks/task_types.c
index 27c01793c..d375aa4af 100644
--- a/openmp/runtime/test/ompt/tasks/task_types.c
+++ b/openmp/runtime/test/ompt/tasks/task_types.c
@@ -91,8 +91,9 @@ int main() {
// CHECK: {{^}}0: NULL_POINTER=[[NULL:.*$]]
- // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_initial_task_begin: parallel_id={{[0-9]+}}
- // CHECK-SAME: task_id=[[INITIAL_TASK_ID:[0-f]+]], actual_parallelism=1, index=1, flags=1
+ // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_initial_task_begin:
+ // parallel_id={{[0-9]+}} CHECK-SAME: task_id=[[INITIAL_TASK_ID:[0-f]+]],
+ // actual_parallelism=1, index=1, flags=1
// CHECK-NOT: 0: parallel_data initially not null
diff --git a/openmp/runtime/test/ompt/tasks/taskyield.c b/openmp/runtime/test/ompt/tasks/taskyield.c
index afd187810..cacc7da0c 100644
--- a/openmp/runtime/test/ompt/tasks/taskyield.c
+++ b/openmp/runtime/test/ompt/tasks/taskyield.c
@@ -42,8 +42,10 @@ int main()
// make sure initial data pointers are null
// CHECK-NOT: 0: new_task_data initially not null
-
- // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_implicit_task_begin: parallel_id={{[0-9]+}}, task_id=[[IMPLICIT_TASK_ID:[0-f]+]], team_size={{[0-9]+}}, thread_num={{[0-9]+}}
+
+ // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_implicit_task_begin:
+ // parallel_id={{[0-9]+}}, task_id=[[IMPLICIT_TASK_ID:[0-f]+]],
+ // team_size={{[0-9]+}}, thread_num={{[0-9]+}}
// CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_create: parent_task_id={{[0-9]+}}, parent_task_frame.exit={{(0x)?[0-f]+}}, parent_task_frame.reenter={{(0x)?[0-f]+}}, new_task_id=[[WORKER_TASK:[0-9]+]], codeptr_ra={{(0x)?[0-f]+}}, task_type=ompt_task_explicit=4, has_dependences=no
// CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_create: parent_task_id={{[0-9]+}}, parent_task_frame.exit={{(0x)?[0-f]+}}, parent_task_frame.reenter={{(0x)?[0-f]+}}, new_task_id=[[MAIN_TASK:[0-9]+]], codeptr_ra={{(0x)?[0-f]+}}, task_type=ompt_task_explicit=4, has_dependences=no
diff --git a/openmp/runtime/test/ompt/worksharing/taskinfo/sections_serialized.c b/openmp/runtime/test/ompt/worksharing/taskinfo/sections_serialized.c
index 87746df21..4442a7c26 100644
--- a/openmp/runtime/test/ompt/worksharing/taskinfo/sections_serialized.c
+++ b/openmp/runtime/test/ompt/worksharing/taskinfo/sections_serialized.c
@@ -21,16 +21,19 @@ int main()
// CHECK-NOT: {{^}}0: Could not register callback 'ompt_callback_task_create'
// CHECK-NOT: {{^}}0: Could not register callback 'ompt_callback_implicit_task'
-
// CHECK: {{^}}0: NULL_POINTER=[[NULL:.*$]]
- // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_initial_task_begin: parallel_id=[[INITIAL_PARALLEL_ID:[0-f]+]], task_id=[[INITIAL_TASK_ID:[0-f]+]], actual_parallelism=1, index=1, flags=1
+ // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_initial_task_begin:
+ // parallel_id=[[INITIAL_PARALLEL_ID:[0-f]+]],
+ // task_id=[[INITIAL_TASK_ID:[0-f]+]], actual_parallelism=1, index=1, flags=1
// region 0
// CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_parallel_begin
- // CHECK-SAME: parent_task_frame.exit=[[NULL]], parent_task_frame.reenter=[[INITIAL_TASK_FRAME_ENTER:(0x)?[0-f]+]],
+ // CHECK-SAME: parent_task_frame.exit=[[NULL]],
+ // parent_task_frame.reenter=[[INITIAL_TASK_FRAME_ENTER:(0x)?[0-f]+]],
// CHECK-SAME: parallel_id=[[PARALLEL_ID:[0-f]+]]
- // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin: parallel_id=[[PARALLEL_ID]], task_id=[[TASK_ID:[0-f]+]]
+ // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin:
+ // parallel_id=[[PARALLEL_ID]], task_id=[[TASK_ID:[0-f]+]]
// information about implicit task (exit frame should be set, while enter should be NULL)
// CHECK: {{^}}[[MASTER_ID]]: task level 0: parallel_id=[[PARALLEL_ID]], task_id=[[TASK_ID]]
``````````
</details>
https://github.com/llvm/llvm-project/pull/152757
More information about the Openmp-commits
mailing list