[OMPT] Update types according to TR7

Some types and callback signatures have changed from TR6 to TR7.
Major changes (only adding signatures and stubs):
(-remove idle callback) done by D48362
-add reduction and dispatch callback
-add get_task_memory and finalize_tool runtime entry points
-ompt_invoker_t  becomes ompt_parallel_flag_t
-more types of sync_regions

Patch provided by Simon Convent

Reviewers: hbae, protze.joachim

Differential Revision: https://reviews.llvm.org/D50774

llvm-svn: 341834

1 files changed, 52 insertions, 31 deletions

diff --git a/openmp/runtime/test/ompt/callback.h b/openmp/runtime/test/ompt/callback.h
index 1ded070e03f..df8304344f3 100755
--- a/openmp/runtime/test/ompt/callback.h
+++ b/openmp/runtime/test/ompt/callback.h
@@ -14,7 +14,7 @@
 // Used to detect architecture
 #include "../../src/kmp_platform.h"
 
-static const char* ompt_thread_type_t_values[] = {
+static const char* ompt_thread_t_values[] = {
   NULL,
   "ompt_thread_initial",
   "ompt_thread_worker",
@@ -31,7 +31,7 @@ static const char* ompt_task_status_t_values[] = {
 static const char* ompt_cancel_flag_t_values[] = {
   "ompt_cancel_parallel",
   "ompt_cancel_sections",
-  "ompt_cancel_do",
+  "ompt_cancel_loop",
   "ompt_cancel_taskgroup",
   "ompt_cancel_activated",
   "ompt_cancel_detected",
@@ -194,7 +194,7 @@ ompt_label_##id:
 
 static void
 on_ompt_callback_mutex_acquire(
-  ompt_mutex_kind_t kind,
+  ompt_mutex_t kind,
   unsigned int hint,
   unsigned int impl,
   omp_wait_id_t wait_id,
@@ -224,7 +224,7 @@ on_ompt_callback_mutex_acquire(
 
 static void
 on_ompt_callback_mutex_acquired(
-  ompt_mutex_kind_t kind,
+  ompt_mutex_t kind,
   omp_wait_id_t wait_id,
   const void *codeptr_ra)
 {
@@ -252,7 +252,7 @@ on_ompt_callback_mutex_acquired(
 
 static void
 on_ompt_callback_mutex_released(
-  ompt_mutex_kind_t kind,
+  ompt_mutex_t kind,
   omp_wait_id_t wait_id,
   const void *codeptr_ra)
 {
@@ -297,7 +297,7 @@ on_ompt_callback_nest_lock(
 
 static void
 on_ompt_callback_sync_region(
-  ompt_sync_region_kind_t kind,
+  ompt_sync_region_t kind,
   ompt_scope_endpoint_t endpoint,
   ompt_data_t *parallel_data,
   ompt_data_t *task_data,
@@ -309,6 +309,9 @@ on_ompt_callback_sync_region(
       switch(kind)
       {
         case ompt_sync_region_barrier:
+        case ompt_sync_region_barrier_implicit:
+        case ompt_sync_region_barrier_explicit:
+        case ompt_sync_region_barrier_implementation:
           printf("%" PRIu64 ": ompt_event_barrier_begin: parallel_id=%" PRIu64 ", task_id=%" PRIu64 ", codeptr_ra=%p\n", ompt_get_thread_data()->value, parallel_data->value, task_data->value, codeptr_ra);
           print_ids(0);
           break;
@@ -318,12 +321,17 @@ on_ompt_callback_sync_region(
         case ompt_sync_region_taskgroup:
           printf("%" PRIu64 ": ompt_event_taskgroup_begin: parallel_id=%" PRIu64 ", task_id=%" PRIu64 ", codeptr_ra=%p\n", ompt_get_thread_data()->value, parallel_data->value, task_data->value, codeptr_ra);
           break;
+        case ompt_sync_region_reduction:
+          break;
       }
       break;
     case ompt_scope_end:
       switch(kind)
       {
         case ompt_sync_region_barrier:
+        case ompt_sync_region_barrier_implicit:
+        case ompt_sync_region_barrier_explicit:
+        case ompt_sync_region_barrier_implementation:
           printf("%" PRIu64 ": ompt_event_barrier_end: parallel_id=%" PRIu64 ", task_id=%" PRIu64 ", codeptr_ra=%p\n", ompt_get_thread_data()->value, (parallel_data)?parallel_data->value:0, task_data->value, codeptr_ra);
           break;
         case ompt_sync_region_taskwait:
@@ -332,6 +340,8 @@ on_ompt_callback_sync_region(
         case ompt_sync_region_taskgroup:
           printf("%" PRIu64 ": ompt_event_taskgroup_end: parallel_id=%" PRIu64 ", task_id=%" PRIu64 ", codeptr_ra=%p\n", ompt_get_thread_data()->value, (parallel_data)?parallel_data->value:0, task_data->value, codeptr_ra);
           break;
+        case ompt_sync_region_reduction:
+          break;
       }
       break;
   }
@@ -339,7 +349,7 @@ on_ompt_callback_sync_region(
 
 static void
 on_ompt_callback_sync_region_wait(
-  ompt_sync_region_kind_t kind,
+  ompt_sync_region_t kind,
   ompt_scope_endpoint_t endpoint,
   ompt_data_t *parallel_data,
   ompt_data_t *task_data,
@@ -351,6 +361,9 @@ on_ompt_callback_sync_region_wait(
       switch(kind)
       {
         case ompt_sync_region_barrier:
+        case ompt_sync_region_barrier_implicit:
+        case ompt_sync_region_barrier_explicit:
+        case ompt_sync_region_barrier_implementation:
           printf("%" PRIu64 ": ompt_event_wait_barrier_begin: parallel_id=%" PRIu64 ", task_id=%" PRIu64 ", codeptr_ra=%p\n", ompt_get_thread_data()->value, parallel_data->value, task_data->value, codeptr_ra);
           break;
         case ompt_sync_region_taskwait:
@@ -359,12 +372,17 @@ on_ompt_callback_sync_region_wait(
         case ompt_sync_region_taskgroup:
           printf("%" PRIu64 ": ompt_event_wait_taskgroup_begin: parallel_id=%" PRIu64 ", task_id=%" PRIu64 ", codeptr_ra=%p\n", ompt_get_thread_data()->value, parallel_data->value, task_data->value, codeptr_ra);
           break;
+        case ompt_sync_region_reduction:
+          break;
       }
       break;
     case ompt_scope_end:
       switch(kind)
       {
         case ompt_sync_region_barrier:
+        case ompt_sync_region_barrier_implicit:
+        case ompt_sync_region_barrier_explicit:
+        case ompt_sync_region_barrier_implementation:
           printf("%" PRIu64 ": ompt_event_wait_barrier_end: parallel_id=%" PRIu64 ", task_id=%" PRIu64 ", codeptr_ra=%p\n", ompt_get_thread_data()->value, (parallel_data)?parallel_data->value:0, task_data->value, codeptr_ra);
           break;
         case ompt_sync_region_taskwait:
@@ -373,6 +391,8 @@ on_ompt_callback_sync_region_wait(
         case ompt_sync_region_taskgroup:
           printf("%" PRIu64 ": ompt_event_wait_taskgroup_end: parallel_id=%" PRIu64 ", task_id=%" PRIu64 ", codeptr_ra=%p\n", ompt_get_thread_data()->value, (parallel_data)?parallel_data->value:0, task_data->value, codeptr_ra);
           break;
+        case ompt_sync_region_reduction:
+          break;
       }
       break;
   }
@@ -398,7 +418,7 @@ on_ompt_callback_cancel(
     first_flag_value = ompt_cancel_flag_t_values[0];
   else if(flags & ompt_cancel_sections)
     first_flag_value = ompt_cancel_flag_t_values[1];
-  else if(flags & ompt_cancel_do)
+  else if(flags & ompt_cancel_loop)
     first_flag_value = ompt_cancel_flag_t_values[2];
   else if(flags & ompt_cancel_taskgroup)
     first_flag_value = ompt_cancel_flag_t_values[3];
@@ -437,7 +457,7 @@ on_ompt_callback_implicit_task(
 
 static void
 on_ompt_callback_lock_init(
-  ompt_mutex_kind_t kind,
+  ompt_mutex_t kind,
   unsigned int hint,
   unsigned int impl,
   omp_wait_id_t wait_id,
@@ -458,7 +478,7 @@ on_ompt_callback_lock_init(
 
 static void
 on_ompt_callback_lock_destroy(
-  ompt_mutex_kind_t kind,
+  ompt_mutex_t kind,
   omp_wait_id_t wait_id,
   const void *codeptr_ra)
 {
@@ -477,7 +497,7 @@ on_ompt_callback_lock_destroy(
 
 static void
 on_ompt_callback_work(
-  ompt_work_type_t wstype,
+  ompt_work_t wstype,
   ompt_scope_endpoint_t endpoint,
   ompt_data_t *parallel_data,
   ompt_data_t *task_data,
@@ -561,29 +581,30 @@ on_ompt_callback_master(
   }
 }
 
-static void
-on_ompt_callback_parallel_begin(
-  ompt_data_t *encountering_task_data,
-  const omp_frame_t *encountering_task_frame,
-  ompt_data_t* parallel_data,
-  uint32_t requested_team_size,
-  ompt_invoker_t invoker,
-  const void *codeptr_ra)
-{
+static void on_ompt_callback_parallel_begin(
+    ompt_data_t *encountering_task_data,
+    const omp_frame_t *encountering_task_frame, ompt_data_t *parallel_data,
+    uint32_t requested_team_size, int flag, const void *codeptr_ra) {
   if(parallel_data->ptr)
     printf("0: parallel_data initially not null\n");
   parallel_data->value = ompt_get_unique_id();
-  printf("%" PRIu64 ": ompt_event_parallel_begin: parent_task_id=%" PRIu64 ", parent_task_frame.exit=%p, parent_task_frame.reenter=%p, parallel_id=%" PRIu64 ", requested_team_size=%" PRIu32 ", codeptr_ra=%p, invoker=%d\n", ompt_get_thread_data()->value, encountering_task_data->value, encountering_task_frame->exit_frame, encountering_task_frame->enter_frame, parallel_data->value, requested_team_size, codeptr_ra, invoker);
+  printf("%" PRIu64 ": ompt_event_parallel_begin: parent_task_id=%" PRIu64
+         ", parent_task_frame.exit=%p, parent_task_frame.reenter=%p, "
+         "parallel_id=%" PRIu64 ", requested_team_size=%" PRIu32
+         ", codeptr_ra=%p, invoker=%d\n",
+         ompt_get_thread_data()->value, encountering_task_data->value,
+         encountering_task_frame->exit_frame,
+         encountering_task_frame->enter_frame, parallel_data->value,
+         requested_team_size, codeptr_ra, flag);
 }
 
-static void
-on_ompt_callback_parallel_end(
-  ompt_data_t *parallel_data,
-  ompt_data_t *encountering_task_data,
-  ompt_invoker_t invoker,
-  const void *codeptr_ra)
-{
-  printf("%" PRIu64 ": ompt_event_parallel_end: parallel_id=%" PRIu64 ", task_id=%" PRIu64 ", invoker=%d, codeptr_ra=%p\n", ompt_get_thread_data()->value, parallel_data->value, encountering_task_data->value, invoker, codeptr_ra);
+static void on_ompt_callback_parallel_end(ompt_data_t *parallel_data,
+                                          ompt_data_t *encountering_task_data,
+                                          int flag, const void *codeptr_ra) {
+  printf("%" PRIu64 ": ompt_event_parallel_end: parallel_id=%" PRIu64
+         ", task_id=%" PRIu64 ", invoker=%d, codeptr_ra=%p\n",
+         ompt_get_thread_data()->value, parallel_data->value,
+         encountering_task_data->value, flag, codeptr_ra);
 }
 
 static void
@@ -648,13 +669,13 @@ on_ompt_callback_task_dependence(
 
 static void
 on_ompt_callback_thread_begin(
-  ompt_thread_type_t thread_type,
+  ompt_thread_t thread_type,
   ompt_data_t *thread_data)
 {
   if(thread_data->ptr)
     printf("%s\n", "0: thread_data initially not null");
   thread_data->value = ompt_get_unique_id();
-  printf("%" PRIu64 ": ompt_event_thread_begin: thread_type=%s=%d, thread_id=%" PRIu64 "\n", ompt_get_thread_data()->value, ompt_thread_type_t_values[thread_type], thread_type, thread_data->value);
+  printf("%" PRIu64 ": ompt_event_thread_begin: thread_type=%s=%d, thread_id=%" PRIu64 "\n", ompt_get_thread_data()->value, ompt_thread_t_values[thread_type], thread_type, thread_data->value);
 }
 
 static void