29 changes: 20 additions & 9 deletions openmp/runtime/test/ompt/callback.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#endif
#include <inttypes.h>
#include <omp.h>
#include <ompt.h>
#include <omp-tools.h>
#include "ompt-signal.h"

// Used to detect architecture
Expand All @@ -23,10 +23,13 @@ static const char* ompt_thread_t_values[] = {

static const char* ompt_task_status_t_values[] = {
NULL,
"ompt_task_complete",
"ompt_task_yield",
"ompt_task_cancel",
"ompt_task_others"
"ompt_task_complete", // 1
"ompt_task_yield", // 2
"ompt_task_cancel", // 3
"ompt_task_detach", // 4
"ompt_task_early_fulfill", // 5
"ompt_task_late_fulfill", // 6
"ompt_task_switch" // 7
};
static const char* ompt_cancel_flag_t_values[] = {
"ompt_cancel_parallel",
Expand Down Expand Up @@ -439,7 +442,8 @@ on_ompt_callback_implicit_task(
ompt_data_t *parallel_data,
ompt_data_t *task_data,
unsigned int team_size,
unsigned int thread_num)
unsigned int thread_num,
int flags)
{
switch(endpoint)
{
Expand Down Expand Up @@ -651,9 +655,9 @@ on_ompt_callback_task_schedule(
}

static void
on_ompt_callback_task_dependences(
on_ompt_callback_dependences(
ompt_data_t *task_data,
const ompt_task_dependence_t *deps,
const ompt_dependence_t *deps,
int ndeps)
{
printf("%" PRIu64 ": ompt_event_task_dependences: task_id=%" PRIu64 ", deps=%p, ndeps=%d\n", ompt_get_thread_data()->value, task_data->value, (void *)deps, ndeps);
Expand Down Expand Up @@ -710,6 +714,7 @@ do{ \

int ompt_initialize(
ompt_function_lookup_t lookup,
int initial_device_num,
ompt_data_t *tool_data)
{
ompt_set_callback = (ompt_set_callback_t) lookup("ompt_set_callback");
Expand Down Expand Up @@ -747,7 +752,7 @@ int ompt_initialize(
register_callback(ompt_callback_parallel_end);
register_callback(ompt_callback_task_create);
register_callback(ompt_callback_task_schedule);
register_callback(ompt_callback_task_dependences);
register_callback(ompt_callback_dependences);
register_callback(ompt_callback_task_dependence);
register_callback(ompt_callback_thread_begin);
register_callback(ompt_callback_thread_end);
Expand All @@ -760,10 +765,16 @@ void ompt_finalize(ompt_data_t *tool_data)
printf("0: ompt_event_runtime_shutdown\n");
}

#ifdef __cplusplus
extern "C" {
#endif
ompt_start_tool_result_t* ompt_start_tool(
unsigned int omp_version,
const char *runtime_version)
{
static ompt_start_tool_result_t ompt_start_tool_result = {&ompt_initialize,&ompt_finalize, 0};
return &ompt_start_tool_result;
}
#ifdef __cplusplus
}
#endif
2 changes: 1 addition & 1 deletion openmp/runtime/test/ompt/cancel/cancel_taskgroup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ int main()
// 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_others=4
// 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

Expand Down
2 changes: 1 addition & 1 deletion openmp/runtime/test/ompt/loadtool/tool_available/tool_available.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ int main()
#ifdef TOOL

#include <stdio.h>
#include <ompt.h>
#include <omp-tools.h>

int ompt_initialize(
ompt_function_lookup_t lookup,
Expand Down
4 changes: 2 additions & 2 deletions openmp/runtime/test/ompt/loadtool/tool_available_search/tool_available_search.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#ifdef CODE
#include "stdio.h"
#include "omp.h"
#include "ompt.h"
#include "omp-tools.h"

int main()
{
Expand Down Expand Up @@ -52,7 +52,7 @@ int main()

#ifdef TOOL

#include <ompt.h>
#include <omp-tools.h>
#include "stdio.h"

#ifdef SECOND_TOOL
Expand Down
4 changes: 2 additions & 2 deletions openmp/runtime/test/ompt/loadtool/tool_not_available/tool_not_available.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#ifdef CODE
#include "stdio.h"
#include "omp.h"
#include "ompt.h"
#include "omp-tools.h"

int main()
{
Expand Down Expand Up @@ -56,7 +56,7 @@ int main()

#ifdef TOOL

#include <ompt.h>
#include <omp-tools.h>
#include "stdio.h"

ompt_start_tool_result_t* ompt_start_tool(
Expand Down
2 changes: 1 addition & 1 deletion openmp/runtime/test/ompt/parallel/parallel_if0.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ int main()
// 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_others=4
// 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]+}}
Expand Down
2 changes: 1 addition & 1 deletion openmp/runtime/test/ompt/parallel/serialized.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ int main()
// 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_others=4
// 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]+}}
Expand Down
2 changes: 1 addition & 1 deletion openmp/runtime/test/ompt/synchronization/barrier/implicit_task_data.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <unistd.h>
#include <inttypes.h>
#include <omp.h>
#include <ompt.h>
#include <omp-tools.h>

static const char* ompt_thread_t_values[] = {
NULL,
Expand Down
2 changes: 1 addition & 1 deletion openmp/runtime/test/ompt/tasks/explicit_task.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %libomp-compile-and-run | %sort-threads | FileCheck %s
// RUN: %libomp-compile-and-run | %sort-threads | tee %s.out | FileCheck %s
// REQUIRES: ompt
// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7
#define TEST_NEED_PRINT_FRAME_FROM_OUTLINED_FN
Expand Down
2 changes: 1 addition & 1 deletion openmp/runtime/test/ompt/tasks/taskyield.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ int main()
// 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

// CHECK: {{^}}[[THREAD_ID:[0-9]+]]: ompt_event_task_schedule: first_task_id={{[0-9]+}}, second_task_id=[[WORKER_TASK]], prior_task_status=ompt_task_others=4
// CHECK: {{^}}[[THREAD_ID:[0-9]+]]: ompt_event_task_schedule: first_task_id={{[0-9]+}}, second_task_id=[[WORKER_TASK]], prior_task_status=ompt_task_switch=7
// CHECK: {{^}}[[THREAD_ID]]: ompt_event_task_schedule: first_task_id=[[WORKER_TASK]], second_task_id={{[0-9]+}}, prior_task_status=ompt_task_complete=1


Expand Down