Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[OpenMP][test] Make %p 0x prefix optional #138514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[OpenMP][test] Make %p 0x prefix optional #138514

wants to merge 1 commit into from
+418 −418

Conversation

rorth
Copy link
Collaborator

@rorth rorth commented May 5, 2025

Testing openmp on Solaris/amd64 shows a large number of failures, all due to the same issue:

# .---command stderr------------
# | openmp/runtime/test/ompt/misc/interoperability.cpp:67:16: error: CHECK-SAME: expected string not found in input
# | // CHECK-SAME: parent_task_frame.reenter={{0x[0-f]+}}
# |                ^
# | <stdin>:5:101: note: scanning from here
# | 281474976710658: ompt_event_parallel_begin: parent_task_id=281474976710659, parent_task_frame.exit=0, parent_task_frame.reenter=7fffbedffe90, parallel_id=281474976710661, requested_team_size=2, codeptr_ra=408b8e, invoker=2

The testsuite expects pointers to be printed with a 0x prefix when using the %p format, while Solaris libc just prints them in hex without a prefix.

However, this difference is completely benign. ISO C (up to C23, 7.23.6.1) states

p	The argument shall be a pointer to void or a pointer to a character
	type. The value of the pointer is converted to a sequence of printing
	characters, in an implementation-defined manner.

I saw two ways around this:

  • replace every instance of %p with a macro (KMP_PTR_FMT, defined as "%p" or `"0x%p" as appropriate), or
  • adjust the testsuite to make the 0x prefix optional

The second route seemed less intrusive and more readable, so that's what this patch does. While large, it's also completely mechanical.

Tested on amd64-pc-solaris2.11 and x86_64-pc-linux-gnu.

@rorth
[OpenMP][test] Make %p 0x prefix optional
e93f2d1 
Testing `openmp` on Solaris/amd64 shows a large number of failures, all due
to the same issue:

```
# .---command stderr------------
# | openmp/runtime/test/ompt/misc/interoperability.cpp:67:16: error: CHECK-SAME: expected string not found in input
# | // CHECK-SAME: parent_task_frame.reenter={{0x[0-f]+}}
# |                ^
# | <stdin>:5:101: note: scanning from here
# | 281474976710658: ompt_event_parallel_begin: parent_task_id=281474976710659, parent_task_frame.exit=0, parent_task_frame.reenter=7fffbedffe90, parallel_id=281474976710661, requested_team_size=2, codeptr_ra=408b8e, invoker=2
```

The testsuite expects pointers to be printed with a `0x` prefix when using
the `%p` format, while Solaris `libc` just prints them in hex without a
prefix.

However, this difference is completely benign.  ISO C (up to C23, 7.23.6.1)
states

```
p	The argument shall be a pointer to void or a pointer to a character
	type. The value of the pointer is converted to a sequence of printing
	characters, in an implementation-defined manner.
```

I saw two ways around this:

- replace every instance of `%p` with a macro (`KMP_PTR_FMT`, defined as
  `"%p"` or `"0x%p" as appropriate), or
- adjust the testsuite to make the `0x` prefix optional

The second route seemed less intrusive and more readable, so that's what
this patch does.  While large, it's also completely mechanical.

Tested on `amd64-pc-solaris2.11` and `x86_64-pc-linux-gnu`.
@rorth rorth requested review from MaskRay, brad0 and hansangbae May 5, 2025 12:00
@llvmbot llvmbot added openmp:libomp OpenMP host runtime openmp:libomptarget OpenMP offload runtime labels May 5, 2025
@github-actions GitHub Actions
Copy link

github-actions bot commented May 5, 2025

⚠️ C/C++ code formatter, clang-format found issues in your code. ⚠️

You can test this locally with the following command: 
git-clang-format --diff HEAD~1 HEAD --extensions c,h,cpp -- 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/misc/api_calls_misc.c openmp/runtime/test/ompt/misc/control_tool.c openmp/runtime/test/ompt/misc/interoperability.cpp openmp/runtime/test/ompt/misc/runtime_error.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/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/repeated_calls.c openmp/runtime/test/ompt/parallel/serialized.c openmp/runtime/test/ompt/synchronization/barrier/explicit.c openmp/runtime/test/ompt/synchronization/barrier/for_loop.c openmp/runtime/test/ompt/synchronization/barrier/for_simd.c openmp/runtime/test/ompt/synchronization/barrier/implicit_task_data.c openmp/runtime/test/ompt/synchronization/barrier/parallel_region.c openmp/runtime/test/ompt/synchronization/barrier/sections.c openmp/runtime/test/ompt/synchronization/barrier/single.c openmp/runtime/test/ompt/synchronization/critical.c openmp/runtime/test/ompt/synchronization/flush.c openmp/runtime/test/ompt/synchronization/lock.c openmp/runtime/test/ompt/synchronization/masked.c openmp/runtime/test/ompt/synchronization/master.c openmp/runtime/test/ompt/synchronization/nest_lock.c openmp/runtime/test/ompt/synchronization/ordered.c openmp/runtime/test/ompt/synchronization/taskgroup.c openmp/runtime/test/ompt/synchronization/taskwait.c openmp/runtime/test/ompt/synchronization/test_lock.c openmp/runtime/test/ompt/synchronization/test_nest_lock.c openmp/runtime/test/ompt/synchronization/test_nest_lock_parallel.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/task_types_serialized.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/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 openmp/tools/multiplex/tests/custom_data_storage/custom_data_storage.c openmp/tools/multiplex/tests/print/print.c
View the diff from clang-format here. 
diff --git a/openmp/runtime/test/ompt/cancel/cancel_parallel.c b/openmp/runtime/test/ompt/cancel/cancel_parallel.c
index 209b190c0..5060e81d6 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-9]+]], 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-9]+]],
+  // 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-9]+]], 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-9]+]],
+  // 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 01ab2d18e..5c9abc654 100644
--- a/openmp/runtime/test/ompt/cancel/cancel_taskgroup.c
+++ b/openmp/runtime/test/ompt/cancel/cancel_taskgroup.c
@@ -71,20 +71,44 @@ int main()
   // CHECK-SAME: task_id=[[PARENT_TASK_ID:[0-9]+]],
   // 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-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=[[PARENT_TASK_ID]], parent_task_frame.exit={{(0x)?[0-f]*}}, parent_task_frame.reenter={{(0x)?[0-f]*}}, new_task_id=[[SECOND_TASK_ID:[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=[[PARENT_TASK_ID]], parent_task_frame.exit={{(0x)?[0-f]*}}, parent_task_frame.reenter={{(0x)?[0-f]*}}, new_task_id=[[THIRD_TASK_ID:[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=[[PARENT_TASK_ID]], parent_task_frame.exit={{(0x)?[0-f]*}},
+  // parent_task_frame.reenter={{(0x)?[0-f]*}},
+  // new_task_id=[[FIRST_TASK_ID:[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=[[PARENT_TASK_ID]], parent_task_frame.exit={{(0x)?[0-f]*}},
+  // parent_task_frame.reenter={{(0x)?[0-f]*}},
+  // new_task_id=[[SECOND_TASK_ID:[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=[[PARENT_TASK_ID]], parent_task_frame.exit={{(0x)?[0-f]*}},
+  // parent_task_frame.reenter={{(0x)?[0-f]*}},
+  // new_task_id=[[THIRD_TASK_ID:[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=[[PARENT_TASK_ID]], parent_task_frame.exit={{(0x)?[0-f]*}}, parent_task_frame.reenter={{(0x)?[0-f]*}}, new_task_id=[[CANCEL_TASK_ID:[0-9]+]], 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-9]+]], 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]]
-  
-  // CHECK-DAG: {{^}}[[THREAD_ID:[0-9]+]]: ompt_event_thread_begin: thread_type=ompt_thread_worker=2, thread_id=[[THREAD_ID]]
-  // CHECK-DAG: {{^}}[[THREAD_ID]]: ompt_event_cancel: task_data={{[0-9]+}}, flags=ompt_cancel_taskgroup|ompt_cancel_detected=40, codeptr_ra={{(0x)?[0-f]*}}
+
+  // CHECK-DAG: {{^}}[[THREAD_ID:[0-9]+]]: ompt_event_thread_begin:
+  // thread_type=ompt_thread_worker=2, thread_id=[[THREAD_ID]] CHECK-DAG:
+  // {{^}}[[THREAD_ID]]: ompt_event_cancel: task_data={{[0-9]+}},
+  // flags=ompt_cancel_taskgroup|ompt_cancel_detected=40,
+  // codeptr_ra={{(0x)?[0-f]*}}
 
   return 0;
 }
diff --git a/openmp/runtime/test/ompt/cancel/cancel_worksharing.c b/openmp/runtime/test/ompt/cancel/cancel_worksharing.c
index 7f0913200..ab94ba974 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-9]+]], flags=ompt_cancel_loop|ompt_cancel_activated=20, codeptr_ra={{(0x)?[0-f]*}}
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_cancel: task_data=[[TASK_ID:[0-9]+]], 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-9]+]], 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-9]+]], 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-9]+]],
+  // flags=ompt_cancel_loop|ompt_cancel_activated=20, codeptr_ra={{(0x)?[0-f]*}}
+  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_cancel: task_data=[[TASK_ID:[0-9]+]],
+  // 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-9]+]],
+  // 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-9]+]],
+  // flags=ompt_cancel_sections|ompt_cancel_{{activated=18|detected=34}},
+  // codeptr_ra={{(0x)?[0-f]*}}
 
   return 0;
 }
diff --git a/openmp/runtime/test/ompt/misc/control_tool.c b/openmp/runtime/test/ompt/misc/control_tool.c
index ed164206b..5ca8c9c19 100644
--- a/openmp/runtime/test/ompt/misc/control_tool.c
+++ b/openmp/runtime/test/ompt/misc/control_tool.c
@@ -20,10 +20,15 @@ int main()
 
   // CHECK: 0: NULL_POINTER=[[NULL:.*$]]
 
-  // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: __builtin_frame_address({{.}})=[[EXIT_FRAME:(0x)?[0-f]*]]
-  // CHECK: {{^}}[[MASTER_ID]]: __builtin_frame_address(0)=[[REENTER_FRAME:(0x)?[0-f]*]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_control_tool: command=3, modifier=1, arg=[[NULL]], codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]*]], current_task_frame.exit=[[EXIT_FRAME]], current_task_frame.reenter={{(0x)?[0-f]*}}
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: current_address={{.*}}[[RETURN_ADDRESS]]
+  // CHECK: {{^}}[[MASTER_ID:[0-9]+]]:
+  // __builtin_frame_address({{.}})=[[EXIT_FRAME:(0x)?[0-f]*]] CHECK:
+  // {{^}}[[MASTER_ID]]:
+  // __builtin_frame_address(0)=[[REENTER_FRAME:(0x)?[0-f]*]] CHECK:
+  // {{^}}[[MASTER_ID]]: ompt_event_control_tool: command=3, modifier=1,
+  // arg=[[NULL]], codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]*]],
+  // current_task_frame.exit=[[EXIT_FRAME]],
+  // current_task_frame.reenter={{(0x)?[0-f]*}} CHECK-NEXT: {{^}}[[MASTER_ID]]:
+  // current_address={{.*}}[[RETURN_ADDRESS]]
 
   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 975561aab..8e9ede7a3 100644
--- a/openmp/runtime/test/ompt/parallel/dynamic_enough_threads.c
+++ b/openmp/runtime/test/ompt/parallel/dynamic_enough_threads.c
@@ -29,7 +29,12 @@ 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-9]+]], parent_task_frame.exit=[[NULL]], parent_task_frame.reenter={{(0x)?[0-f]+}}, parallel_id=[[PARALLEL_ID:[0-9]+]], requested_team_size=4, 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-9]+]], parent_task_frame.exit=[[NULL]],
+  // parent_task_frame.reenter={{(0x)?[0-f]+}},
+  // parallel_id=[[PARALLEL_ID:[0-9]+]], 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-9]+]], team_size={{[1-4]}}
   // CHECK: {{^}}[[MASTER_ID]]: task level 0: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]]
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 ce5040d6b..70564f9b3 100644
--- a/openmp/runtime/test/ompt/parallel/dynamic_not_enough_threads.c
+++ b/openmp/runtime/test/ompt/parallel/dynamic_not_enough_threads.c
@@ -29,7 +29,12 @@ 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-9]+]], parent_task_frame.exit=[[NULL]], parent_task_frame.reenter={{(0x)?[0-f]+}}, parallel_id=[[PARALLEL_ID:[0-9]+]], requested_team_size=4, 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-9]+]], parent_task_frame.exit=[[NULL]],
+  // parent_task_frame.reenter={{(0x)?[0-f]+}},
+  // parallel_id=[[PARALLEL_ID:[0-9]+]], 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-9]+]], team_size={{[1-4]}}
   // CHECK: {{^}}[[MASTER_ID]]: task level 0: parallel_id=[[PARALLEL_ID]], task_id=[[IMPLICIT_TASK_ID]]
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 d896d544f..00f510964 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-9]+]], parent_task_frame.exit=[[NULL]], parent_task_frame.reenter={{(0x)?[0-f]+}}, parallel_id=[[PARALLEL_ID:[0-9]+]], 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-9]+]]
-  // 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-9]+]], 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-9]+]], 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-9]+]]
-  // 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-9]+]], parent_task_frame.exit=[[NULL]],
+  // parent_task_frame.reenter={{(0x)?[0-f]+}},
+  // parallel_id=[[PARALLEL_ID:[0-9]+]], 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-9]+]]
-  // 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-9]+]], 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-9]+]]
-  // 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-9]+]] 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-9]+]], 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-9]+]], 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-9]+]] 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-9]+]] 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-9]+]], 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-9]+]] 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 b6e3b972a..dab0303eb 100644
--- a/openmp/runtime/test/ompt/parallel/nested_serialized_task_frames.c
+++ b/openmp/runtime/test/ompt/parallel/nested_serialized_task_frames.c
@@ -37,27 +37,33 @@ int main()
 
   // region 0
   // CHECK: {{^}}[[MASTER_ID]]: 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:[0-9]+]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin: parallel_id=[[PARALLEL_ID_0]], task_id=[[TASK_ID_0:[0-9]+]]
+  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin:
+  // parallel_id=[[PARALLEL_ID_0]], task_id=[[TASK_ID_0:[0-9]+]]
 
   // region 1
   // CHECK: {{^}}[[MASTER_ID]]: ompt_event_parallel_begin
-  // CHECK-SAME: parent_task_frame.exit=[[REGION_0_FRAME_EXIT:(0x)?[0-f]+]], parent_task_frame.reenter=[[REGION_0_FRAME_ENTER:(0x)?[0-f]+]],
-  // CHECK-SAME: parallel_id=[[PARALLEL_ID_1:[0-9]+]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin: parallel_id=[[PARALLEL_ID_1]], task_id=[[TASK_ID_1:[0-9]+]]
+  // CHECK-SAME: parent_task_frame.exit=[[REGION_0_FRAME_EXIT:(0x)?[0-f]+]],
+  // parent_task_frame.reenter=[[REGION_0_FRAME_ENTER:(0x)?[0-f]+]], CHECK-SAME:
+  // parallel_id=[[PARALLEL_ID_1:[0-9]+]] CHECK: {{^}}[[MASTER_ID]]:
+  // ompt_event_implicit_task_begin: parallel_id=[[PARALLEL_ID_1]],
+  // task_id=[[TASK_ID_1:[0-9]+]]
 
   // region 2
   // CHECK: {{^}}[[MASTER_ID]]: ompt_event_parallel_begin
-  // CHECK-SAME: parent_task_frame.exit=[[REGION_1_FRAME_EXIT:(0x)?[0-f]+]], parent_task_frame.reenter=[[REGION_1_FRAME_ENTER:(0x)?[0-f]+]],
-  // CHECK-SAME: parallel_id=[[PARALLEL_ID_2:[0-9]+]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin: parallel_id=[[PARALLEL_ID_2]], task_id=[[TASK_ID_2:[0-9]+]]
+  // CHECK-SAME: parent_task_frame.exit=[[REGION_1_FRAME_EXIT:(0x)?[0-f]+]],
+  // parent_task_frame.reenter=[[REGION_1_FRAME_ENTER:(0x)?[0-f]+]], CHECK-SAME:
+  // parallel_id=[[PARALLEL_ID_2:[0-9]+]] CHECK: {{^}}[[MASTER_ID]]:
+  // ompt_event_implicit_task_begin: parallel_id=[[PARALLEL_ID_2]],
+  // task_id=[[TASK_ID_2:[0-9]+]]
 
-  // region 2's implicit task information (exit frame should be set, while enter should be NULL)
-  // CHECK: {{^}}[[MASTER_ID]]: task level 0: parallel_id=[[PARALLEL_ID_2]], task_id=[[TASK_ID_2]]
-  // CHECK-SAME: exit_frame={{(0x)?[0-f]+}}
-  // CHECK-SAME: reenter_frame=[[NULL]]
-  // CHECK-SAME: task_type=ompt_task_implicit
+  // region 2's implicit task information (exit frame should be set, while enter
+  // should be NULL) CHECK: {{^}}[[MASTER_ID]]: task level 0:
+  // parallel_id=[[PARALLEL_ID_2]], task_id=[[TASK_ID_2]] CHECK-SAME:
+  // exit_frame={{(0x)?[0-f]+}} CHECK-SAME: reenter_frame=[[NULL]] CHECK-SAME:
+  // task_type=ompt_task_implicit
 
   // region 1's implicit task information (both exit and enter frames should be set)
   // CHECK: {{^}}[[MASTER_ID]]: task level 1: parallel_id=[[PARALLEL_ID_1]], task_id=[[TASK_ID_1]]
diff --git a/openmp/runtime/test/ompt/parallel/nested_thread_num.c b/openmp/runtime/test/ompt/parallel/nested_thread_num.c
index e4e9f6ad7..78f772e45 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-9]+]], 
+// THREADS-SAME: parent_task_id=[[PARENT_TASK_ID:[0-9]+]],
 // THREADS-SAME: parent_task_frame.exit=[[NULL]],
 // THREADS-SAME: parent_task_frame.reenter={{(0x)?[0-f]+}},
 // THREADS-SAME: parallel_id=[[PARALLEL_ID:[0-9]+]], requested_team_size=2,
@@ -98,17 +98,17 @@ int main() {
 // THREADS-SAME: thread_num=0
 
 // THREADS: {{^}}[[MASTER_ID]]: task level 1:
-// THREADS-SAME: parallel_id=[[IMPLICIT_PARALLEL_ID:[0-9]+]], 
-// THREADS-SAME: task_id=[[PARENT_TASK_ID]], exit_frame=[[NULL]], 
+// THREADS-SAME: parallel_id=[[IMPLICIT_PARALLEL_ID:[0-9]+]],
+// 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-9]+]], 
+// THREADS-SAME: parallel_id=[[NESTED_PARALLEL_ID:[0-9]+]],
 // 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]]
@@ -131,8 +131,8 @@ int main() {
 // THREADS-SAME: reenter_frame={{(0x)?[0-f]+}}
 
 // THREADS: {{^}}[[MASTER_ID]]: task level 2:
-// THREADS-SAME: parallel_id=[[IMPLICIT_PARALLEL_ID]], 
-// THREADS-SAME: task_id=[[PARENT_TASK_ID]], exit_frame=[[NULL]], 
+// THREADS-SAME: parallel_id=[[IMPLICIT_PARALLEL_ID]],
+// THREADS-SAME: task_id=[[PARENT_TASK_ID]], exit_frame=[[NULL]],
 // THREADS-SAME: reenter_frame={{(0x)?[0-f]+}}
 
 // THREADS: __builtin_frame_address(0)=[[NESTED_REENTER:(0x)?[0-f]+]]
@@ -146,7 +146,7 @@ int main() {
 // THREADS-SAME: codeptr_ra=[[BARRIER_RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
 
 // THREADS: {{^}}[[MASTER_ID]]: task level 0:
-// THREADS-SAME:  parallel_id=[[NESTED_PARALLEL_ID]], 
+// THREADS-SAME:  parallel_id=[[NESTED_PARALLEL_ID]],
 // THREADS-SAME: task_id=[[NESTED_IMPLICIT_TASK_ID]],
 // THREADS-SAME: exit_frame=[[NESTED_EXIT]], reenter_frame={{(0x)?[0-f]+}}
 
@@ -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-9]+]], 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-9]+]],
+// 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 5a0e71622..41972cc01 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-9]+]], parent_task_frame.exit=[[NULL]], parent_task_frame.reenter={{(0x)?[0-f]+}}, parallel_id=[[PARALLEL_ID:[0-9]+]], 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-9]+]], parent_task_frame.exit=[[NULL]],
+  // parent_task_frame.reenter={{(0x)?[0-f]+}},
+  // parallel_id=[[PARALLEL_ID:[0-9]+]], 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-9]+]]
-  // 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-9]+]], 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-9]+]], 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-9]+]]
-  // 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-9]+]]
-  // 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-9]+]] 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-9]+]], 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-9]+]], 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-9]+]] 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-9]+]] 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 6359adf60..c8b00ae81 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
@@ -42,28 +42,35 @@ int main()
 
   // region 0
   // CHECK: {{^}}[[MASTER_ID]]: 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:[0-9]+]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin: parallel_id=[[PARALLEL_ID_0]], task_id=[[TASK_ID_0:[0-9]+]]
+  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin:
+  // parallel_id=[[PARALLEL_ID_0]], task_id=[[TASK_ID_0:[0-9]+]]
 
   // explicit task
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_create: parent_task_id=[[TASK_ID_0]]
-  // CHECK-SAME: parent_task_frame.exit=[[REGION_0_FRAME_EXIT:(0x)?[0-f]+]]
-  // CHECK-SAME: parent_task_frame.reenter=[[REGION_0_FRAME_ENTER:(0x)?[0-f]+]]
-  // CHECK-SAME: new_task_id=[[TASK_ID_1:[0-9]+]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_schedule: first_task_id=[[TASK_ID_0]], second_task_id=[[TASK_ID_1]]
+  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_create:
+  // parent_task_id=[[TASK_ID_0]] CHECK-SAME:
+  // parent_task_frame.exit=[[REGION_0_FRAME_EXIT:(0x)?[0-f]+]] CHECK-SAME:
+  // parent_task_frame.reenter=[[REGION_0_FRAME_ENTER:(0x)?[0-f]+]] CHECK-SAME:
+  // new_task_id=[[TASK_ID_1:[0-9]+]] CHECK: {{^}}[[MASTER_ID]]:
+  // ompt_event_task_schedule: first_task_id=[[TASK_ID_0]],
+  // second_task_id=[[TASK_ID_1]]
 
   // region 1
   // CHECK: {{^}}[[MASTER_ID]]: ompt_event_parallel_begin
-  // CHECK-SAME: parent_task_frame.exit=[[EXPLICIT_TASK_FRAME_EXIT:(0x)?[0-f]+]], parent_task_frame.reenter=[[EXPLICIT_TASK_FRAME_ENTER:(0x)?[0-f]+]],
+  // CHECK-SAME:
+  // parent_task_frame.exit=[[EXPLICIT_TASK_FRAME_EXIT:(0x)?[0-f]+]],
+  // parent_task_frame.reenter=[[EXPLICIT_TASK_FRAME_ENTER:(0x)?[0-f]+]],
   // CHECK-SAME: parallel_id=[[PARALLEL_ID_1:[0-9]+]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin: parallel_id=[[PARALLEL_ID_1]], task_id=[[TASK_ID_2:[0-9]+]]
+  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin:
+  // parallel_id=[[PARALLEL_ID_1]], task_id=[[TASK_ID_2:[0-9]+]]
 
-  // region 1's implicit task information (exit frame should be set, while enter should be NULL)
-  // CHECK: {{^}}[[MASTER_ID]]: task level 0: parallel_id=[[PARALLEL_ID_1]], task_id=[[TASK_ID_2]]
-  // CHECK-SAME: exit_frame={{(0x)?[0-f]+}}
-  // CHECK-SAME: reenter_frame=[[NULL]]
-  // CHECK-SAME: task_type=ompt_task_implicit
+  // region 1's implicit task information (exit frame should be set, while enter
+  // should be NULL) CHECK: {{^}}[[MASTER_ID]]: task level 0:
+  // parallel_id=[[PARALLEL_ID_1]], task_id=[[TASK_ID_2]] CHECK-SAME:
+  // exit_frame={{(0x)?[0-f]+}} CHECK-SAME: reenter_frame=[[NULL]] CHECK-SAME:
+  // task_type=ompt_task_implicit
 
   // explicit task information (both exit and enter frames should be set)
   // CHECK: {{^}}[[MASTER_ID]]: task level 1: parallel_id=[[PARALLEL_ID_0]], task_id=[[TASK_ID_1]]
diff --git a/openmp/runtime/test/ompt/parallel/serialized.c b/openmp/runtime/test/ompt/parallel/serialized.c
index 9774c6c57..e4de636b6 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-9]+]], parent_task_frame.exit=[[NULL]], parent_task_frame.reenter={{(0x)?[0-f]+}}, parallel_id=[[PARALLEL_ID:[0-9]+]], 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-9]+]], parent_task_frame.exit=[[NULL]],
+  // parent_task_frame.reenter={{(0x)?[0-f]+}},
+  // parallel_id=[[PARALLEL_ID:[0-9]+]], 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-9]+]]
-  // 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-9]+]], 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-9]+]], 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-9]+]]
-  // 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-9]+]]
-  // 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-9]+]] 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-9]+]], 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-9]+]], 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-9]+]] 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-9]+]] 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/critical.c b/openmp/runtime/test/ompt/synchronization/critical.c
index 6f8f93746..79bcddb44 100644
--- a/openmp/runtime/test/ompt/synchronization/critical.c
+++ b/openmp/runtime/test/ompt/synchronization/critical.c
@@ -22,11 +22,15 @@ int main()
 
   // CHECK: 0: NULL_POINTER=[[NULL:.*$]]
 
-  // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_wait_critical: wait_id=[[WAIT_ID:[0-9]+]], hint={{[0-9]+}}, impl={{[0-9]+}}, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_acquired_critical: wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS]]
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: current_address={{.*}}[[RETURN_ADDRESS]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_release_critical: wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: current_address={{.*}}[[RETURN_ADDRESS]]
+  // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_wait_critical:
+  // wait_id=[[WAIT_ID:[0-9]+]], hint={{[0-9]+}}, impl={{[0-9]+}},
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]] CHECK: {{^}}[[MASTER_ID]]:
+  // ompt_event_acquired_critical: wait_id=[[WAIT_ID]],
+  // codeptr_ra=[[RETURN_ADDRESS]] CHECK-NEXT: {{^}}[[MASTER_ID]]:
+  // current_address={{.*}}[[RETURN_ADDRESS]] CHECK: {{^}}[[MASTER_ID]]:
+  // ompt_event_release_critical: wait_id=[[WAIT_ID]],
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]] CHECK-NEXT: {{^}}[[MASTER_ID]]:
+  // current_address={{.*}}[[RETURN_ADDRESS]]
 
   return 0;
 }
diff --git a/openmp/runtime/test/ompt/synchronization/lock.c b/openmp/runtime/test/ompt/synchronization/lock.c
index 7bd5ac963..d9c4ae387 100644
--- a/openmp/runtime/test/ompt/synchronization/lock.c
+++ b/openmp/runtime/test/ompt/synchronization/lock.c
@@ -30,15 +30,22 @@ int main()
   // CHECK: 0: NULL_POINTER=[[NULL:.*$]]
 
   // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: &lock: [[WAIT_ID:[0-9]+]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_init_lock: wait_id=[[WAIT_ID]], hint={{[0-9]+}}, impl={{[0-9]+}}, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_wait_lock: wait_id=[[WAIT_ID]], hint={{[0-9]+}}, impl={{[0-9]+}}, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_acquired_lock: wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_release_lock: wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_destroy_lock: wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
- 
+  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_init_lock: wait_id=[[WAIT_ID]],
+  // hint={{[0-9]+}}, impl={{[0-9]+}},
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK-NEXT:
+  // {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]] CHECK:
+  // {{^}}[[MASTER_ID]]: ompt_event_wait_lock: wait_id=[[WAIT_ID]],
+  // hint={{[0-9]+}}, impl={{[0-9]+}},
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK:
+  // {{^}}[[MASTER_ID]]: ompt_event_acquired_lock: wait_id=[[WAIT_ID]],
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK-NEXT:
+  // {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]] CHECK:
+  // {{^}}[[MASTER_ID]]: ompt_event_release_lock: wait_id=[[WAIT_ID]],
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK-NEXT:
+  // {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]] CHECK:
+  // {{^}}[[MASTER_ID]]: ompt_event_destroy_lock: wait_id=[[WAIT_ID]],
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK-NEXT:
+  // {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
+
   return 0;
 }
diff --git a/openmp/runtime/test/ompt/synchronization/nest_lock.c b/openmp/runtime/test/ompt/synchronization/nest_lock.c
index 680ec6b56..3a1f005af 100644
--- a/openmp/runtime/test/ompt/synchronization/nest_lock.c
+++ b/openmp/runtime/test/ompt/synchronization/nest_lock.c
@@ -34,20 +34,31 @@ int main()
 
   // CHECK: 0: NULL_POINTER=[[NULL:.*$]]
 
-  // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_init_nest_lock: wait_id=[[WAIT_ID:[0-9]+]], hint={{[0-9]+}}, impl={{[0-9]+}}, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_wait_nest_lock: wait_id=[[WAIT_ID]], hint={{[0-9]+}}, impl={{[0-9]+}}, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_acquired_nest_lock_first: wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS]]{{[0-f][0-f]}}
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_wait_nest_lock: wait_id=[[WAIT_ID]], hint={{[0-9]+}}, impl={{[0-9]+}}, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_acquired_nest_lock_next: wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS]]
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_release_nest_lock_prev: wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_release_nest_lock_last: wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_destroy_nest_lock: wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
+  // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_init_nest_lock:
+  // wait_id=[[WAIT_ID:[0-9]+]], hint={{[0-9]+}}, impl={{[0-9]+}},
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK-NEXT:
+  // {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]] CHECK:
+  // {{^}}[[MASTER_ID]]: ompt_event_wait_nest_lock: wait_id=[[WAIT_ID]],
+  // hint={{[0-9]+}}, impl={{[0-9]+}},
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK:
+  // {{^}}[[MASTER_ID]]: ompt_event_acquired_nest_lock_first:
+  // wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS]]{{[0-f][0-f]}}
   // CHECK-NEXT: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
+  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_wait_nest_lock: wait_id=[[WAIT_ID]],
+  // hint={{[0-9]+}}, impl={{[0-9]+}},
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK:
+  // {{^}}[[MASTER_ID]]: ompt_event_acquired_nest_lock_next:
+  // wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS]] CHECK-NEXT:
+  // {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]] CHECK:
+  // {{^}}[[MASTER_ID]]: ompt_event_release_nest_lock_prev: wait_id=[[WAIT_ID]],
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK-NEXT:
+  // {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]] CHECK:
+  // {{^}}[[MASTER_ID]]: ompt_event_release_nest_lock_last: wait_id=[[WAIT_ID]],
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK-NEXT:
+  // {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]] CHECK:
+  // {{^}}[[MASTER_ID]]: ompt_event_destroy_nest_lock: wait_id=[[WAIT_ID]],
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK-NEXT:
+  // {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
 
   return 0;
 }
diff --git a/openmp/runtime/test/ompt/synchronization/ordered.c b/openmp/runtime/test/ompt/synchronization/ordered.c
index ce1ab2e93..3aa81a4a3 100644
--- a/openmp/runtime/test/ompt/synchronization/ordered.c
+++ b/openmp/runtime/test/ompt/synchronization/ordered.c
@@ -22,11 +22,15 @@ int main()
 
   // CHECK: 0: NULL_POINTER=[[NULL:.*$]]
 
-  // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_wait_ordered: wait_id=[[WAIT_ID:[0-9]+]], hint={{[0-9]+}}, impl={{[0-9]+}}, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_acquired_ordered: wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS]]
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: current_address={{.*}}[[RETURN_ADDRESS]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_release_ordered: wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: current_address={{.*}}[[RETURN_ADDRESS]]
-  
+  // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_wait_ordered:
+  // wait_id=[[WAIT_ID:[0-9]+]], hint={{[0-9]+}}, impl={{[0-9]+}},
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]] CHECK: {{^}}[[MASTER_ID]]:
+  // ompt_event_acquired_ordered: wait_id=[[WAIT_ID]],
+  // codeptr_ra=[[RETURN_ADDRESS]] CHECK-NEXT: {{^}}[[MASTER_ID]]:
+  // current_address={{.*}}[[RETURN_ADDRESS]] CHECK: {{^}}[[MASTER_ID]]:
+  // ompt_event_release_ordered: wait_id=[[WAIT_ID]],
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]] CHECK-NEXT: {{^}}[[MASTER_ID]]:
+  // current_address={{.*}}[[RETURN_ADDRESS]]
+
   return 0;
 }
diff --git a/openmp/runtime/test/ompt/synchronization/taskgroup.c b/openmp/runtime/test/ompt/synchronization/taskgroup.c
index bd41cc07c..e4c8a98bb 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-9]+]], task_id=[[TASK_ID:[0-9]+]], 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-9]+]], task_id=[[TASK_ID:[0-9]+]],
+  // 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/synchronization/taskwait.c b/openmp/runtime/test/ompt/synchronization/taskwait.c
index 9056b7dd8..264fe32b7 100644
--- a/openmp/runtime/test/ompt/synchronization/taskwait.c
+++ b/openmp/runtime/test/ompt/synchronization/taskwait.c
@@ -26,11 +26,16 @@ int main()
 
   // CHECK: 0: NULL_POINTER=[[NULL:.*$]]
 
-  // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_taskwait_begin: parallel_id={{[0-9]+}}, task_id={{[0-9]+}}, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_wait_taskwait_begin: parallel_id={{[0-9]+}}, task_id={{[0-9]+}}, codeptr_ra=[[RETURN_ADDRESS]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_wait_taskwait_end: parallel_id={{[0-9]+}}, task_id={{[0-9]+}}, codeptr_ra=[[RETURN_ADDRESS]]
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: ompt_event_taskwait_end: parallel_id={{[0-9]+}}, task_id={{[0-9]+}}, codeptr_ra=[[RETURN_ADDRESS]]
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: current_address={{.*}}[[RETURN_ADDRESS]]
+  // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_taskwait_begin:
+  // parallel_id={{[0-9]+}}, task_id={{[0-9]+}},
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]] CHECK: {{^}}[[MASTER_ID]]:
+  // ompt_event_wait_taskwait_begin: parallel_id={{[0-9]+}}, task_id={{[0-9]+}},
+  // codeptr_ra=[[RETURN_ADDRESS]] CHECK: {{^}}[[MASTER_ID]]:
+  // ompt_event_wait_taskwait_end: parallel_id={{[0-9]+}}, task_id={{[0-9]+}},
+  // codeptr_ra=[[RETURN_ADDRESS]] CHECK-NEXT: {{^}}[[MASTER_ID]]:
+  // ompt_event_taskwait_end: parallel_id={{[0-9]+}}, task_id={{[0-9]+}},
+  // codeptr_ra=[[RETURN_ADDRESS]] CHECK-NEXT: {{^}}[[MASTER_ID]]:
+  // current_address={{.*}}[[RETURN_ADDRESS]]
 
   return 0;
 }
diff --git a/openmp/runtime/test/ompt/synchronization/test_lock.c b/openmp/runtime/test/ompt/synchronization/test_lock.c
index 16e4d0624..f93135e67 100644
--- a/openmp/runtime/test/ompt/synchronization/test_lock.c
+++ b/openmp/runtime/test/ompt/synchronization/test_lock.c
@@ -33,22 +33,32 @@ int main()
 
   // CHECK: 0: NULL_POINTER=[[NULL:.*$]]
 
-  // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_init_lock: wait_id=[[WAIT_ID:[0-9]+]], hint=0, impl={{[0-9]+}}, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_wait_test_lock: wait_id=[[WAIT_ID]], hint=0, impl={{[0-9]+}}, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_acquired_test_lock: wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS]]{{[0-f][0-f]}}
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_release_lock: wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_wait_lock: wait_id=[[WAIT_ID]], hint=0, impl={{[0-9]+}}, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_acquired_lock: wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS]]{{[0-f][0-f]}}
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_wait_test_lock: wait_id=[[WAIT_ID]], hint=0, impl={{[0-9]+}}, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_release_lock: wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_destroy_lock: wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
+  // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_init_lock:
+  // wait_id=[[WAIT_ID:[0-9]+]], hint=0, impl={{[0-9]+}},
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK-NEXT:
+  // {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]] CHECK:
+  // {{^}}[[MASTER_ID]]: ompt_event_wait_test_lock: wait_id=[[WAIT_ID]], hint=0,
+  // impl={{[0-9]+}}, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
+  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_acquired_test_lock:
+  // wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS]]{{[0-f][0-f]}}
   // CHECK-NEXT: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
+  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_release_lock: wait_id=[[WAIT_ID]],
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK-NEXT:
+  // {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]] CHECK:
+  // {{^}}[[MASTER_ID]]: ompt_event_wait_lock: wait_id=[[WAIT_ID]], hint=0,
+  // impl={{[0-9]+}}, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
+  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_acquired_lock: wait_id=[[WAIT_ID]],
+  // codeptr_ra=[[RETURN_ADDRESS]]{{[0-f][0-f]}} CHECK-NEXT: {{^}}[[MASTER_ID]]:
+  // fuzzy_address={{.*}}[[RETURN_ADDRESS]] CHECK: {{^}}[[MASTER_ID]]:
+  // ompt_event_wait_test_lock: wait_id=[[WAIT_ID]], hint=0, impl={{[0-9]+}},
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK-NEXT:
+  // {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]] CHECK:
+  // {{^}}[[MASTER_ID]]: ompt_event_release_lock: wait_id=[[WAIT_ID]],
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK-NEXT:
+  // {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]] CHECK:
+  // {{^}}[[MASTER_ID]]: ompt_event_destroy_lock: wait_id=[[WAIT_ID]],
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK-NEXT:
+  // {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
 
   return 0;
 }
diff --git a/openmp/runtime/test/ompt/synchronization/test_nest_lock.c b/openmp/runtime/test/ompt/synchronization/test_nest_lock.c
index fcf417854..cec6be7d6 100644
--- a/openmp/runtime/test/ompt/synchronization/test_nest_lock.c
+++ b/openmp/runtime/test/ompt/synchronization/test_nest_lock.c
@@ -27,16 +27,27 @@ int main()
 
   // CHECK: 0: NULL_POINTER=[[NULL:.*$]]
 
-  // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_init_nest_lock: wait_id=[[WAIT_ID:[0-9]+]], hint=0, impl={{[0-9]+}}, codeptr_ra={{(0x)?[0-f]+}}  
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_wait_test_nest_lock: wait_id=[[WAIT_ID]], hint=0, impl={{[0-9]+}}, codeptr_ra={{(0x)?[0-f]+}}
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_acquired_test_nest_lock_first: wait_id=[[WAIT_ID]], codeptr_ra={{(0x)?[0-f]+}}
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_release_nest_lock_last: wait_id=[[WAIT_ID]], codeptr_ra={{(0x)?[0-f]+}}  
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_wait_nest_lock: wait_id=[[WAIT_ID]], hint=0, impl={{[0-9]+}}, codeptr_ra={{(0x)?[0-f]+}}  
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_acquired_nest_lock_first: wait_id=[[WAIT_ID]], codeptr_ra={{(0x)?[0-f]+}}  
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_wait_test_nest_lock: wait_id=[[WAIT_ID]], hint=0, impl={{[0-9]+}}, codeptr_ra={{(0x)?[0-f]+}}
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_acquired_nest_lock_next: wait_id=[[WAIT_ID]], codeptr_ra={{(0x)?[0-f]+}}
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_release_nest_lock_prev: wait_id=[[WAIT_ID]], codeptr_ra={{(0x)?[0-f]+}}  
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_release_nest_lock_last: wait_id=[[WAIT_ID]], codeptr_ra={{(0x)?[0-f]+}}  
+  // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_init_nest_lock:
+  // wait_id=[[WAIT_ID:[0-9]+]], hint=0, impl={{[0-9]+}},
+  // codeptr_ra={{(0x)?[0-f]+}} CHECK: {{^}}[[MASTER_ID]]:
+  // ompt_event_wait_test_nest_lock: wait_id=[[WAIT_ID]], hint=0,
+  // impl={{[0-9]+}}, codeptr_ra={{(0x)?[0-f]+}} CHECK: {{^}}[[MASTER_ID]]:
+  // ompt_event_acquired_test_nest_lock_first: wait_id=[[WAIT_ID]],
+  // codeptr_ra={{(0x)?[0-f]+}} CHECK: {{^}}[[MASTER_ID]]:
+  // ompt_event_release_nest_lock_last: wait_id=[[WAIT_ID]],
+  // codeptr_ra={{(0x)?[0-f]+}} CHECK: {{^}}[[MASTER_ID]]:
+  // ompt_event_wait_nest_lock: wait_id=[[WAIT_ID]], hint=0, impl={{[0-9]+}},
+  // codeptr_ra={{(0x)?[0-f]+}} CHECK: {{^}}[[MASTER_ID]]:
+  // ompt_event_acquired_nest_lock_first: wait_id=[[WAIT_ID]],
+  // codeptr_ra={{(0x)?[0-f]+}} CHECK: {{^}}[[MASTER_ID]]:
+  // ompt_event_wait_test_nest_lock: wait_id=[[WAIT_ID]], hint=0,
+  // impl={{[0-9]+}}, codeptr_ra={{(0x)?[0-f]+}} CHECK: {{^}}[[MASTER_ID]]:
+  // ompt_event_acquired_nest_lock_next: wait_id=[[WAIT_ID]],
+  // codeptr_ra={{(0x)?[0-f]+}} CHECK: {{^}}[[MASTER_ID]]:
+  // ompt_event_release_nest_lock_prev: wait_id=[[WAIT_ID]],
+  // codeptr_ra={{(0x)?[0-f]+}} CHECK: {{^}}[[MASTER_ID]]:
+  // ompt_event_release_nest_lock_last: wait_id=[[WAIT_ID]],
+  // codeptr_ra={{(0x)?[0-f]+}}
 
   return 0;
 }
diff --git a/openmp/runtime/test/ompt/synchronization/test_nest_lock_parallel.c b/openmp/runtime/test/ompt/synchronization/test_nest_lock_parallel.c
index 37456b00c..57b376331 100644
--- a/openmp/runtime/test/ompt/synchronization/test_nest_lock_parallel.c
+++ b/openmp/runtime/test/ompt/synchronization/test_nest_lock_parallel.c
@@ -39,22 +39,34 @@ int main()
 
   // CHECK: 0: NULL_POINTER=[[NULL:.*$]]
 
-  // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_wait_nest_lock: wait_id=[[WAIT_ID:[0-9]+]], hint=0, impl={{[0-9]+}}, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_acquired_nest_lock_first: wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS]]{{[0-f][0-f]}}
+  // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_wait_nest_lock:
+  // wait_id=[[WAIT_ID:[0-9]+]], hint=0, impl={{[0-9]+}},
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK:
+  // {{^}}[[MASTER_ID]]: ompt_event_acquired_nest_lock_first:
+  // wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS]]{{[0-f][0-f]}}
   // CHECK-NEXT: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_wait_test_nest_lock: wait_id=[[WAIT_ID]], hint=0, impl={{[0-9]+}}, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_acquired_nest_lock_next: wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS]]{{[0-f][0-f]}}
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_release_nest_lock_prev: wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
-  // CHECK-NEXT: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_release_nest_lock_last: wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
+  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_wait_test_nest_lock:
+  // wait_id=[[WAIT_ID]], hint=0, impl={{[0-9]+}},
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK:
+  // {{^}}[[MASTER_ID]]: ompt_event_acquired_nest_lock_next:
+  // wait_id=[[WAIT_ID]], codeptr_ra=[[RETURN_ADDRESS]]{{[0-f][0-f]}}
   // CHECK-NEXT: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
+  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_release_nest_lock_prev:
+  // wait_id=[[WAIT_ID]],
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK-NEXT:
+  // {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]] CHECK:
+  // {{^}}[[MASTER_ID]]: ompt_event_release_nest_lock_last: wait_id=[[WAIT_ID]],
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK-NEXT:
+  // {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
 
   // CHECK: {{^}}[[MASTER_ID]]: ompt_event_destroy_nest_lock: wait_id=[[WAIT_ID]]
 
-  // CHECK: {{^}}[[THREAD_ID:[0-9]+]]: ompt_event_wait_test_nest_lock: wait_id=[[WAIT_ID]], hint=0, impl={{[0-9]+}}, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
-  // CHECK-NOT: {{^}}[[THREAD_ID]]: ompt_event_acquired_test_nest_lock_next: wait_id=[[WAIT_ID]]
-  // CHECK-NEXT: {{^}}[[THREAD_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
+  // CHECK: {{^}}[[THREAD_ID:[0-9]+]]: ompt_event_wait_test_nest_lock:
+  // wait_id=[[WAIT_ID]], hint=0, impl={{[0-9]+}},
+  // codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}} CHECK-NOT:
+  // {{^}}[[THREAD_ID]]: ompt_event_acquired_test_nest_lock_next:
+  // wait_id=[[WAIT_ID]] CHECK-NEXT: {{^}}[[THREAD_ID]]:
+  // fuzzy_address={{.*}}[[RETURN_ADDRESS]]
 
   return 0;
 }
diff --git a/openmp/runtime/test/ompt/tasks/serialized.c b/openmp/runtime/test/ompt/tasks/serialized.c
index ad7342d3f..8c8133b97 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-9]+]]
-  // 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-9]+]] 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_serialized.c b/openmp/runtime/test/ompt/tasks/task_types_serialized.c
index b7b4d4d0e..03fbf5fef 100644
--- a/openmp/runtime/test/ompt/tasks/task_types_serialized.c
+++ b/openmp/runtime/test/ompt/tasks/task_types_serialized.c
@@ -92,23 +92,54 @@ int main()
   // CHECK: {{^}}[[MASTER_ID]]: id=0 task_type=ompt_task_initial=1
   // CHECK: {{^}}[[MASTER_ID]]: id=1 task_type=ompt_task_implicit|ompt_task_undeferred=134217730
 
-  // CHECK: {{^[0-9]+}}: 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={{[0-9]+}}, codeptr_ra={{(0x)?[0-f]+}}, task_type=ompt_task_explicit|ompt_task_undeferred=134217732, has_dependences=no
-  // CHECK: {{^[0-9]+}}: id=2 task_type=ompt_task_explicit|ompt_task_undeferred=134217732
-
-  // CHECK: {{^[0-9]+}}: 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={{[0-9]+}}, codeptr_ra={{(0x)?[0-f]+}}, task_type=ompt_task_explicit|ompt_task_undeferred=134217732, has_dependences=no
-  // CHECK: {{^[0-9]+}}: id=3 task_type=ompt_task_explicit|ompt_task_undeferred=134217732
-
-  // CHECK: {{^[0-9]+}}: 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={{[0-9]+}}, codeptr_ra={{(0x)?[0-f]+}}, task_type=ompt_task_explicit|ompt_task_undeferred|ompt_task_untied=402653188, has_dependences=no
-  // CHECK: {{^[0-9]+}}: id=4 task_type=ompt_task_explicit|ompt_task_undeferred|ompt_task_untied=402653188
-
-  // CHECK: {{^[0-9]+}}: 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={{[0-9]+}}, codeptr_ra={{(0x)?[0-f]+}}, task_type=ompt_task_explicit|ompt_task_undeferred|ompt_task_final=671088644, has_dependences=no
-  // CHECK: {{^[0-9]+}}: id=5 task_type=ompt_task_explicit|ompt_task_undeferred|ompt_task_final=671088644
-
-  // CHECK: {{^[0-9]+}}: 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={{[0-9]+}}, codeptr_ra={{(0x)?[0-f]+}}, task_type=ompt_task_explicit|ompt_task_undeferred|ompt_task_final=671088644, has_dependences=no
-  // CHECK: {{^[0-9]+}}: id=6 task_type=ompt_task_explicit|ompt_task_undeferred|ompt_task_final=671088644
-
-  // ___CHECK: {{^[0-9]+}}: 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={{[0-9]+}}, codeptr_ra={{(0x)?[0-f]+}}, task_type=ompt_task_explicit|ompt_task_undeferred=134217732, has_dependences=no
-  // ___CHECK: {{^[0-9]+}}: id=7 task_type=ompt_task_explicit|ompt_task_undeferred=134217732
+  // CHECK: {{^[0-9]+}}: 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={{[0-9]+}},
+  // codeptr_ra={{(0x)?[0-f]+}},
+  // task_type=ompt_task_explicit|ompt_task_undeferred=134217732,
+  // has_dependences=no CHECK: {{^[0-9]+}}: id=2
+  // task_type=ompt_task_explicit|ompt_task_undeferred=134217732
+
+  // CHECK: {{^[0-9]+}}: 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={{[0-9]+}},
+  // codeptr_ra={{(0x)?[0-f]+}},
+  // task_type=ompt_task_explicit|ompt_task_undeferred=134217732,
+  // has_dependences=no CHECK: {{^[0-9]+}}: id=3
+  // task_type=ompt_task_explicit|ompt_task_undeferred=134217732
+
+  // CHECK: {{^[0-9]+}}: 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={{[0-9]+}},
+  // codeptr_ra={{(0x)?[0-f]+}},
+  // task_type=ompt_task_explicit|ompt_task_undeferred|ompt_task_untied=402653188,
+  // has_dependences=no CHECK: {{^[0-9]+}}: id=4
+  // task_type=ompt_task_explicit|ompt_task_undeferred|ompt_task_untied=402653188
+
+  // CHECK: {{^[0-9]+}}: 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={{[0-9]+}},
+  // codeptr_ra={{(0x)?[0-f]+}},
+  // task_type=ompt_task_explicit|ompt_task_undeferred|ompt_task_final=671088644,
+  // has_dependences=no CHECK: {{^[0-9]+}}: id=5
+  // task_type=ompt_task_explicit|ompt_task_undeferred|ompt_task_final=671088644
+
+  // CHECK: {{^[0-9]+}}: 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={{[0-9]+}},
+  // codeptr_ra={{(0x)?[0-f]+}},
+  // task_type=ompt_task_explicit|ompt_task_undeferred|ompt_task_final=671088644,
+  // has_dependences=no CHECK: {{^[0-9]+}}: id=6
+  // task_type=ompt_task_explicit|ompt_task_undeferred|ompt_task_final=671088644
+
+  // ___CHECK: {{^[0-9]+}}: 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={{[0-9]+}},
+  // codeptr_ra={{(0x)?[0-f]+}},
+  // task_type=ompt_task_explicit|ompt_task_undeferred=134217732,
+  // has_dependences=no
+  // ___CHECK: {{^[0-9]+}}: id=7
+  // task_type=ompt_task_explicit|ompt_task_undeferred=134217732
 
   return 0;
 }
diff --git a/openmp/runtime/test/ompt/tasks/taskyield.c b/openmp/runtime/test/ompt/tasks/taskyield.c
index 40bd6bfe6..041952b10 100644
--- a/openmp/runtime/test/ompt/tasks/taskyield.c
+++ b/openmp/runtime/test/ompt/tasks/taskyield.c
@@ -45,8 +45,16 @@ int main()
   
   // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_implicit_task_begin: parallel_id={{[0-9]+}}, task_id=[[IMPLICIT_TASK_ID:[0-9]+]], 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
+  // 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
 
   // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_schedule: first_task_id=[[IMPLICIT_TASK_ID]], second_task_id=[[MAIN_TASK]], prior_task_status=ompt_task_yield=2
   // CHECK: {{^}}[[MASTER_ID]]: ompt_event_task_schedule: first_task_id=[[MAIN_TASK]], second_task_id=[[IMPLICIT_TASK_ID]], prior_task_status=ompt_task_complete=1
diff --git a/openmp/runtime/test/ompt/worksharing/taskinfo/sections_serialized.c b/openmp/runtime/test/ompt/worksharing/taskinfo/sections_serialized.c
index 8a4c14deb..9acc7d8c9 100644
--- a/openmp/runtime/test/ompt/worksharing/taskinfo/sections_serialized.c
+++ b/openmp/runtime/test/ompt/worksharing/taskinfo/sections_serialized.c
@@ -27,16 +27,17 @@ int main()
 
   // 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-9]+]]
 
   // CHECK: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin: parallel_id=[[PARALLEL_ID]], task_id=[[TASK_ID:[0-9]+]]
 
-  // 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]]
-  // CHECK-SAME: exit_frame={{(0x)?[0-f]+}}
-  // CHECK-SAME: reenter_frame=[[NULL]]
-  // CHECK-SAME: task_type=ompt_task_implicit
+  // 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]] CHECK-SAME:
+  // exit_frame={{(0x)?[0-f]+}} CHECK-SAME: reenter_frame=[[NULL]] CHECK-SAME:
+  // task_type=ompt_task_implicit
 
   // information about initial task (exit frame should be NULL, while enter frame shoule be set)
   // CHECK: {{^}}[[MASTER_ID]]: task level 1: parallel_id=[[INITIAL_PARALLEL_ID]], task_id=[[INITIAL_TASK_ID]]

rorth added a commit to rorth/llvm-project that referenced this pull request May 5, 2025
@rorth
[OpenMP][test] Adjust tool_available_search.c for Solaris
47403e6 
After PR llvm#138514, only 3 testsuite failures remain on Solaris/amd64.  One
of them is

```
libomp :: ompt/loadtool/tool_available_search/tool_available_search.c
```

The issue is that the expected message is that emitted by Linux/glibc,
while the Solaris messages differ:

On Linux/x86_64, I get
```
Opening projects/openmp/runtime/test/ompt/loadtool/tool_available_search/Output/non_existing_file.so... Failed: projects/openmp/runtime/test/ompt/loadtool/tool_available_search/Output/non_existing_file.so: cannot open shared object file: No such file or directory
```
while Solaris/amd64 emits
```
Opening projects/openmp/runtime/test/ompt/loadtool/tool_available_search/Output/non_existing_file.so... Failed: ld.so.1: tool_available_search.c.tmp: projects/openmp/runtime/test/ompt/loadtool/tool_available_search/Output/non_existing_file.so: open failed: No such file or directory
```

Since the exact wording is obviously an implementation detail, this patch
allows for both forms.

Tested on `amd64-pc-solaris2.11` and `x86_64-pc-linux-gnu`.
@rorth rorth mentioned this pull request May 5, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MaskRay MaskRay Awaiting requested review from MaskRay

@brad0 brad0 Awaiting requested review from brad0

@hansangbae hansangbae Awaiting requested review from hansangbae

Assignees
No one assigned
Labels
openmp:libomp OpenMP host runtime openmp:libomptarget OpenMP offload runtime
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rorth @llvmbot