[Openmp-commits] [PATCH] D112798: [OpenMP][OMPT] Rename callback master to masked in ompt-multiplex.h

[Joachim Protze via Phabricator via Openmp-commits]

protze.joachim created this revision.
protze.joachim added a reviewer: hbae.
protze.joachim added a project: OpenMP.
Herald added subscribers: guansong, yaxunl.
protze.joachim requested review of this revision.
Herald added a reviewer: jdoerfert.
Herald added a subscriber: sstefan1.

OpenMP 5.1 replaced callback ompt_callback_master_t by 
ompt_callback_masked_t. In order to stick to the standard, 
the implementation is updated accordingly.

Patch prepared by Semih Burak


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D112798

Files:
  openmp/tools/multiplex/ompt-multiplex.h


Index: openmp/tools/multiplex/ompt-multiplex.h
===================================================================
--- openmp/tools/multiplex/ompt-multiplex.h
+++ openmp/tools/multiplex/ompt-multiplex.h
@@ -76,7 +76,7 @@
   macro(callback_dependences, ompt_callback_dependences_t, 18);                \
   macro(callback_task_dependence, ompt_callback_task_dependence_t, 19);        \
   macro(callback_work, ompt_callback_work_t, 20);                              \
-  macro(callback_master, ompt_callback_master_t, 21);                          \
+  macro(callback_masked, ompt_callback_masked_t, 21);                          \
   macro(callback_target_map, ompt_callback_target_map_t, 22);                  \
   macro(callback_sync_region, ompt_callback_sync_region_t, 23);                \
   macro(callback_lock_init, ompt_callback_mutex_acquire_t, 24);                \
@@ -431,17 +431,17 @@
   }
 }
 
-static void ompt_multiplex_callback_master(ompt_scope_endpoint_t endpoint,
+static void ompt_multiplex_callback_masked(ompt_scope_endpoint_t endpoint,
                                            ompt_data_t *parallel_data,
                                            ompt_data_t *task_data,
                                            const void *codeptr_ra) {
-  if (ompt_multiplex_own_callbacks.ompt_callback_master) {
-    ompt_multiplex_own_callbacks.ompt_callback_master(
+  if (ompt_multiplex_own_callbacks.ompt_callback_masked) {
+    ompt_multiplex_own_callbacks.ompt_callback_masked(
         endpoint, ompt_multiplex_get_own_parallel_data(parallel_data),
         ompt_multiplex_get_own_task_data(task_data), codeptr_ra);
   }
-  if (ompt_multiplex_client_callbacks.ompt_callback_master) {
-    ompt_multiplex_client_callbacks.ompt_callback_master(
+  if (ompt_multiplex_client_callbacks.ompt_callback_masked) {
+    ompt_multiplex_client_callbacks.ompt_callback_masked(
         endpoint, ompt_multiplex_get_client_parallel_data(parallel_data),
         ompt_multiplex_get_client_task_data(task_data), codeptr_ra);
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D112798.383294.patch
Type: text/x-patch
Size: 2041 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20211029/17100065/attachment.bin>