Index: runtime/src/ompt-specific.cpp =================================================================== --- runtime/src/ompt-specific.cpp +++ runtime/src/ompt-specific.cpp @@ -396,6 +396,9 @@ if (parallel_data) { *parallel_data = team_info ? &(team_info->parallel_data) : NULL; } + if (thread_num) { + *thread_num = __kmp_get_gtid(); + } return info ? 2 : 0; } return 0; Index: runtime/test/ompt/callback.h =================================================================== --- runtime/test/ompt/callback.h +++ runtime/test/ompt/callback.h @@ -33,6 +33,20 @@ "ompt_cancel_discarded_task" }; +static void format_task_type(int type, char* buffer) +{ + char* progress = buffer; + if(type & ompt_task_initial) progress += sprintf(progress, "ompt_task_initial"); + if(type & ompt_task_implicit) progress += sprintf(progress, "ompt_task_implicit"); + if(type & ompt_task_explicit) progress += sprintf(progress, "ompt_task_explicit"); + if(type & ompt_task_target) progress += sprintf(progress, "ompt_task_target"); + if(type & ompt_task_undeferred) progress += sprintf(progress, "|ompt_task_undeferred"); + if(type & ompt_task_untied) progress += sprintf(progress, "|ompt_task_untied"); + if(type & ompt_task_final) progress += sprintf(progress, "|ompt_task_final"); + if(type & ompt_task_mergeable) progress += sprintf(progress, "|ompt_task_mergeable"); + if(type & ompt_task_merged) progress += sprintf(progress, "|ompt_task_merged"); +} + static ompt_set_callback_t ompt_set_callback; static ompt_get_task_info_t ompt_get_task_info; static ompt_get_thread_data_t ompt_get_thread_data; @@ -49,16 +63,15 @@ static void print_ids(int level) { - ompt_frame_t* frame ; - ompt_data_t* parallel_data; + int task_type, thread_num; + ompt_frame_t* frame; + ompt_data_t* task_parallel_data; ompt_data_t* task_data; - int exists_task = ompt_get_task_info(level, NULL, &task_data, &frame, ¶llel_data, NULL); - if (frame) - { - printf("%" PRIu64 ": task level %d: parallel_id=%" PRIu64 ", task_id=%" PRIu64 ", exit_frame=%p, reenter_frame=%p\n", ompt_get_thread_data()->value, level, exists_task ? parallel_data->value : 0, exists_task ? task_data->value : 0, frame->exit_frame, frame->enter_frame); - } - else - printf("%" PRIu64 ": task level %d: parallel_id=%" PRIu64 ", task_id=%" PRIu64 ", frame=%p\n", ompt_get_thread_data()->value, level, exists_task ? parallel_data->value : 0, exists_task ? task_data->value : 0, frame); + int exists_task = ompt_get_task_info(level, &task_type, &task_data, &frame, &task_parallel_data, &thread_num); + char buffer[2048]; + format_task_type(task_type, buffer); + if(frame) + printf("%" PRIu64 ": task level %d: parallel_id=%" PRIu64 ", task_id=%" PRIu64 ", exit_frame=%p, reenter_frame=%p, task_type=%s=%d, thread_num=%d\n", ompt_get_thread_data()->value, level, exists_task ? task_parallel_data->value : 0, exists_task ? task_data->value : 0, frame->exit_frame, frame->enter_frame, buffer, task_type, thread_num); } #define print_frame(level)\ @@ -151,21 +164,6 @@ ((uint64_t)addr) / FUZZY_ADDRESS_DISCARD_BYTES - 1, \ ((uint64_t)addr) / FUZZY_ADDRESS_DISCARD_BYTES, addr) - -static void format_task_type(int type, char* buffer) -{ - char* progress = buffer; - if(type & ompt_task_initial) progress += sprintf(progress, "ompt_task_initial"); - if(type & ompt_task_implicit) progress += sprintf(progress, "ompt_task_implicit"); - if(type & ompt_task_explicit) progress += sprintf(progress, "ompt_task_explicit"); - if(type & ompt_task_target) progress += sprintf(progress, "ompt_task_target"); - if(type & ompt_task_undeferred) progress += sprintf(progress, "|ompt_task_undeferred"); - if(type & ompt_task_untied) progress += sprintf(progress, "|ompt_task_untied"); - if(type & ompt_task_final) progress += sprintf(progress, "|ompt_task_final"); - if(type & ompt_task_mergeable) progress += sprintf(progress, "|ompt_task_mergeable"); - if(type & ompt_task_merged) progress += sprintf(progress, "|ompt_task_merged"); -} - static void on_ompt_callback_mutex_acquire( ompt_mutex_kind_t kind, Index: runtime/test/ompt/tasks/task_types.c =================================================================== --- runtime/test/ompt/tasks/task_types.c +++ runtime/test/ompt/tasks/task_types.c @@ -4,29 +4,16 @@ #include #include -__attribute__ ((noinline)) // workaround for bug in icc -void print_task_type(int id) -{ - #pragma omp critical - { - int task_type; - char buffer[2048]; - ompt_get_task_info(0, &task_type, NULL, NULL, NULL, NULL); - format_task_type(task_type, buffer); - printf("%" PRIu64 ": id=%d task_type=%s=%d\n", ompt_get_thread_data()->value, id, buffer, task_type); - } -}; - int main() { //initial task - print_task_type(0); + print_ids(0); int x; //implicit task #pragma omp parallel num_threads(1) { - print_task_type(1); + print_ids(0); x++; } @@ -36,33 +23,33 @@ //explicit task #pragma omp task { - print_task_type(2); + print_ids(0); x++; } //explicit task with undeferred #pragma omp task if(0) { - print_task_type(3); + print_ids(0); x++; } //explicit task with untied #pragma omp task untied { - print_task_type(4); + print_ids(0); x++; } //explicit task with final #pragma omp task final(1) { - print_task_type(5); + print_ids(0); x++; //nested explicit task with final and undeferred #pragma omp task { - print_task_type(6); + print_ids(0); x++; } } @@ -72,7 +59,7 @@ /* #pragma omp task mergeable if((int)sin(0)) { - print_task_type(7); + print_ids(0); x++; } */ @@ -88,25 +75,34 @@ // CHECK: {{^}}0: NULL_POINTER=[[NULL:.*$]] - // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_task_create: parent_task_id=0, parent_task_frame.exit=[[NULL]], parent_task_frame.reenter=[[NULL]], new_task_id={{[0-9]+}}, codeptr_ra=[[NULL]], task_type=ompt_task_initial=1, has_dependences=no + // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_task_create: parent_task_id=0, parent_task_frame.exit=[[NULL]], parent_task_frame.reenter=[[NULL]], new_task_id=[[INITIAL_TASK_ID:[0-9]+]], codeptr_ra=[[NULL]], task_type=ompt_task_initial=1, has_dependences=no // CHECK-NOT: 0: parallel_data initially not null - // 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-DAG: {{^[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=4, has_dependences=no - // CHECK-DAG: {{^[0-9]+}}: id=2 task_type=ompt_task_explicit=4 + //initial task + // CHECK: {{^}}[[MASTER_ID]]: task level 0: parallel_id={{[0-9]+}}, task_id=[[INITIAL_TASK_ID]], exit_frame=[[NULL]], reenter_frame=[[NULL]], task_type=ompt_task_initial=1, thread_num=0 + + //implicit task + // CHECK: {{^}}[[MASTER_ID]]: task level 0: parallel_id={{[0-9]+}}, task_id={{[0-9]+}}, exit_frame={{0x[0-f]+}}, reenter_frame=[[NULL]], task_type=ompt_task_implicit|ompt_task_undeferred=134217730, thread_num=0 + + //explicit task + // CHECK-DAG: {{^[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=[[EXPLICIT_TASK_ID:[0-9]+]], codeptr_ra={{0x[0-f]+}}, task_type=ompt_task_explicit=4, has_dependences=no + // CHECK-DAG: {{^[0-9]+}}: task level 0: parallel_id=[[PARALLEL_ID:[0-9]+]], task_id=[[EXPLICIT_TASK_ID]], exit_frame={{0x[0-f]+}}, reenter_frame=[[NULL]], task_type=ompt_task_explicit=4, thread_num={{[01]}} - // CHECK-DAG: {{^[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-DAG: {{^[0-9]+}}: id=3 task_type=ompt_task_explicit|ompt_task_undeferred=134217732 + //explicit task with undeferred + // CHECK-DAG: {{^[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=[[EXPLICIT_UNDEFERRED_TASK_ID:[0-9]+]], codeptr_ra={{0x[0-f]+}}, task_type=ompt_task_explicit|ompt_task_undeferred=134217732, has_dependences=no + // CHECK-DAG: {{^[0-9]+}}: task level 0: parallel_id=[[PARALLEL_ID]], task_id=[[EXPLICIT_UNDEFERRED_TASK_ID]], exit_frame={{0x[0-f]+}}, reenter_frame=[[NULL]], task_type=ompt_task_explicit|ompt_task_undeferred=134217732, thread_num={{[01]}} - // CHECK-DAG: {{^[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_untied=268435460, has_dependences=no - // CHECK-DAG: {{^[0-9]+}}: id=4 task_type=ompt_task_explicit|ompt_task_untied=268435460 + //explicit task with untied + // CHECK-DAG: {{^[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=[[EXPLICIT_UNTIED_TASK_ID:[0-9]+]], codeptr_ra={{0x[0-f]+}}, task_type=ompt_task_explicit|ompt_task_untied=268435460, has_dependences=no + // CHECK-DAG: {{^[0-9]+}}: task level 0: parallel_id=[[PARALLEL_ID]], task_id=[[EXPLICIT_UNTIED_TASK_ID]], exit_frame={{.*}}, reenter_frame=[[NULL]], task_type=ompt_task_explicit|ompt_task_untied=268435460, thread_num={{[01]}} - // CHECK-DAG: {{^[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_final=536870916, has_dependences=no - // CHECK-DAG: {{^[0-9]+}}: id=5 task_type=ompt_task_explicit|ompt_task_final=536870916 + //explicit task with final + // CHECK-DAG: {{^[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=[[EXPLICIT_FINAL_TASK_ID:[0-9]+]], codeptr_ra={{0x[0-f]+}}, task_type=ompt_task_explicit|ompt_task_final=536870916, has_dependences=no + // CHECK-DAG: {{^[0-9]+}}: task level 0: parallel_id=[[PARALLEL_ID]], task_id=[[EXPLICIT_FINAL_TASK_ID]], exit_frame={{0x[0-f]+}}, reenter_frame=[[NULL]], task_type=ompt_task_explicit|ompt_task_final=536870916, thread_num={{[01]}} - // CHECK-DAG: {{^[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-DAG: {{^[0-9]+}}: id=6 task_type=ompt_task_explicit|ompt_task_undeferred|ompt_task_final=671088644 + //nested explicit task with final and undeferred + // CHECK-DAG: {{^[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=[[NESTED_FINAL_UNDEFERRED_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-DAG: {{^[0-9]+}}: task level 0: parallel_id=[[PARALLEL_ID]], task_id=[[NESTED_FINAL_UNDEFERRED_TASK_ID]], exit_frame={{0x[0-f]+}}, reenter_frame=[[NULL]], task_type=ompt_task_explicit|ompt_task_undeferred|ompt_task_final=671088644, thread_num={{[01]}} return 0; }