Skip to content

Commit 6c2f0d5

Browse files
kaloyan-ignatovkaloyan-ignatov
committed
[OpenMP][Test][NFC] output tool data as hex to improve readibility
hex format allows to better interpret IDs: the first digits represent the thread number, last digits represent the ID within a thread
1 parent b574bcf commit 6c2f0d5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+683
-682
lines changed

‎openmp/runtime/test/ompt/callback.h‎

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ static void print_ids(int level)
176176
char buffer[2048];
177177
format_task_type(task_type, buffer);
178178
if (frame) {
179-
printf("%" PRIu64 ": task level %d: parallel_id=%" PRIu64
180-
", task_id=%" PRIu64 ", exit_frame=%p, reenter_frame=%p, "
179+
printf("%" PRIu64 ": task level %d: parallel_id=%" PRIx64
180+
", task_id=%" PRIx64 ", exit_frame=%p, reenter_frame=%p, "
181181
"task_type=%s=%d, thread_num=%d\n",
182182
ompt_get_thread_data()->value, level,
183183
exists_task ? task_parallel_data->value : 0,
@@ -557,8 +557,8 @@ on_ompt_callback_sync_region(
557557
}
558558
uint64_t parallel_data_value = parallel_data ? parallel_data->value : 0;
559559
const char *begin_or_end = (endpoint == ompt_scope_begin) ? "begin" : "end";
560-
printf("%" PRIu64 ":" _TOOL_PREFIX " ompt_event_%s_%s: parallel_id=%" PRIu64
561-
", task_id=%" PRIu64 ", codeptr_ra=%p\n",
560+
printf("%" PRIu64 ":" _TOOL_PREFIX " ompt_event_%s_%s: parallel_id=%" PRIx64
561+
", task_id=%" PRIx64 ", codeptr_ra=%p\n",
562562
ompt_get_thread_data()->value, ompt_sync_region_t_values[kind],
563563
begin_or_end, parallel_data_value, task_data->value, codeptr_ra);
564564
switch (kind) {
@@ -595,7 +595,7 @@ on_ompt_callback_sync_region_wait(
595595
uint64_t parallel_data_value = parallel_data ? parallel_data->value : 0;
596596
const char *begin_or_end = (endpoint == ompt_scope_begin) ? "begin" : "end";
597597
printf("%" PRIu64 ":" _TOOL_PREFIX
598-
" ompt_event_wait_%s_%s: parallel_id=%" PRIu64 ", task_id=%" PRIu64
598+
" ompt_event_wait_%s_%s: parallel_id=%" PRIx64 ", task_id=%" PRIx64
599599
", codeptr_ra=%p\n",
600600
ompt_get_thread_data()->value, ompt_sync_region_t_values[kind],
601601
begin_or_end, parallel_data_value, task_data->value, codeptr_ra);
@@ -609,16 +609,16 @@ static void on_ompt_callback_reduction(ompt_sync_region_t kind,
609609
switch (endpoint) {
610610
case ompt_scope_begin:
611611
printf("%" PRIu64 ":" _TOOL_PREFIX
612-
" ompt_event_reduction_begin: parallel_id=%" PRIu64
613-
", task_id=%" PRIu64 ", codeptr_ra=%p\n",
612+
" ompt_event_reduction_begin: parallel_id=%" PRIx64
613+
", task_id=%" PRIx64 ", codeptr_ra=%p\n",
614614
ompt_get_thread_data()->value,
615615
(parallel_data) ? parallel_data->value : 0, task_data->value,
616616
codeptr_ra);
617617
break;
618618
case ompt_scope_end:
619619
printf("%" PRIu64 ":" _TOOL_PREFIX
620-
" ompt_event_reduction_end: parallel_id=%" PRIu64
621-
", task_id=%" PRIu64 ", codeptr_ra=%p\n",
620+
" ompt_event_reduction_end: parallel_id=%" PRIx64
621+
", task_id=%" PRIx64 ", codeptr_ra=%p\n",
622622
ompt_get_thread_data()->value,
623623
(parallel_data) ? parallel_data->value : 0, task_data->value,
624624
codeptr_ra);
@@ -662,7 +662,7 @@ on_ompt_callback_cancel(
662662
else if(flags & ompt_cancel_discarded_task)
663663
second_flag_value = ompt_cancel_flag_t_values[6];
664664

665-
printf("%" PRIu64 ":" _TOOL_PREFIX " ompt_event_cancel: task_data=%" PRIu64
665+
printf("%" PRIu64 ":" _TOOL_PREFIX " ompt_event_cancel: task_id=%" PRIx64
666666
", flags=%s|%s=%" PRIu32 ", codeptr_ra=%p\n",
667667
ompt_get_thread_data()->value, task_data->value, first_flag_value,
668668
second_flag_value, flags, codeptr_ra);
@@ -696,15 +696,15 @@ on_ompt_callback_implicit_task(
696696
printf("%s\n", "0: parallel_data initially not null");
697697
parallel_data->value = ompt_get_unique_id();
698698
printf("%" PRIu64 ":" _TOOL_PREFIX
699-
" ompt_event_initial_task_begin: parallel_id=%" PRIu64
700-
", task_id=%" PRIu64 ", actual_parallelism=%" PRIu32
699+
" ompt_event_initial_task_begin: parallel_id=%" PRIx64
700+
", task_id=%" PRIx64 ", actual_parallelism=%" PRIu32
701701
", index=%" PRIu32 ", flags=%" PRIu32 "\n",
702702
ompt_get_thread_data()->value, parallel_data->value,
703703
task_data->value, team_size, thread_num, flags);
704704
} else {
705705
printf("%" PRIu64 ":" _TOOL_PREFIX
706-
" ompt_event_implicit_task_begin: parallel_id=%" PRIu64
707-
", task_id=%" PRIu64 ", team_size=%" PRIu32
706+
" ompt_event_implicit_task_begin: parallel_id=%" PRIx64
707+
", task_id=%" PRIx64 ", team_size=%" PRIu32
708708
", thread_num=%" PRIu32 "\n",
709709
ompt_get_thread_data()->value, parallel_data->value,
710710
task_data->value, team_size, thread_num);
@@ -714,16 +714,16 @@ on_ompt_callback_implicit_task(
714714
case ompt_scope_end:
715715
if(flags & ompt_task_initial){
716716
printf("%" PRIu64 ":" _TOOL_PREFIX
717-
" ompt_event_initial_task_end: parallel_id=%" PRIu64
718-
", task_id=%" PRIu64 ", actual_parallelism=%" PRIu32
717+
" ompt_event_initial_task_end: parallel_id=%" PRIx64
718+
", task_id=%" PRIx64 ", actual_parallelism=%" PRIu32
719719
", index=%" PRIu32 "\n",
720720
ompt_get_thread_data()->value,
721721
(parallel_data) ? parallel_data->value : 0, task_data->value,
722722
team_size, thread_num);
723723
} else {
724724
printf("%" PRIu64 ":" _TOOL_PREFIX
725-
" ompt_event_implicit_task_end: parallel_id=%" PRIu64
726-
", task_id=%" PRIu64 ", team_size=%" PRIu32
725+
" ompt_event_implicit_task_end: parallel_id=%" PRIx64
726+
", task_id=%" PRIx64 ", team_size=%" PRIu32
727727
", thread_num=%" PRIu32 "\n",
728728
ompt_get_thread_data()->value,
729729
(parallel_data) ? parallel_data->value : 0, task_data->value,
@@ -799,14 +799,14 @@ on_ompt_callback_work(
799799
switch(endpoint)
800800
{
801801
case ompt_scope_begin:
802-
printf("%" PRIu64 ":" _TOOL_PREFIX " %s_begin: parallel_id=%" PRIu64
803-
", task_id=%" PRIu64 ", codeptr_ra=%p, count=%" PRIu64 "\n",
802+
printf("%" PRIu64 ":" _TOOL_PREFIX " %s_begin: parallel_id=%" PRIx64
803+
", task_id=%" PRIx64 ", codeptr_ra=%p, count=%" PRIu64 "\n",
804804
ompt_get_thread_data()->value, ompt_work_events_t_values[wstype],
805805
parallel_data->value, task_data->value, codeptr_ra, count);
806806
break;
807807
case ompt_scope_end:
808-
printf("%" PRIu64 ":" _TOOL_PREFIX " %s_end: parallel_id=%" PRIu64
809-
", task_id=%" PRIu64 ", codeptr_ra=%p, count=%" PRIu64 "\n",
808+
printf("%" PRIu64 ":" _TOOL_PREFIX " %s_end: parallel_id=%" PRIx64
809+
", task_id=%" PRIx64 ", codeptr_ra=%p, count=%" PRIu64 "\n",
810810
ompt_get_thread_data()->value, ompt_work_events_t_values[wstype],
811811
parallel_data->value, task_data->value, codeptr_ra, count);
812812
break;
@@ -844,10 +844,10 @@ static void on_ompt_callback_dispatch(
844844
default:
845845
event_name = "ompt_ws_loop_iteration_begin";
846846
}
847-
printf("%" PRIu64 ":" _TOOL_PREFIX
848-
" %s: parallel_id=%" PRIu64 ", task_id=%" PRIu64
849-
", codeptr_ra=%p, chunk_start=%" PRIu64 ", chunk_iterations=%" PRIu64
850-
"\n", ompt_get_thread_data()->value, event_name, parallel_data->value,
847+
printf("%" PRIu64 ":" _TOOL_PREFIX " %s: parallel_id=%" PRIx64
848+
", task_id=%" PRIx64 ", codeptr_ra=%p, chunk_start=%" PRIu64
849+
", chunk_iterations=%" PRIu64 "\n",
850+
ompt_get_thread_data()->value, event_name, parallel_data->value,
851851
task_data->value, codeptr_ra,
852852
dispatch_chunk ? dispatch_chunk->start : 0,
853853
dispatch_chunk ? dispatch_chunk->iterations : 0);
@@ -861,14 +861,14 @@ static void on_ompt_callback_masked(ompt_scope_endpoint_t endpoint,
861861
{
862862
case ompt_scope_begin:
863863
printf("%" PRIu64 ":" _TOOL_PREFIX
864-
" ompt_event_masked_begin: parallel_id=%" PRIu64
865-
", task_id=%" PRIu64 ", codeptr_ra=%p\n",
864+
" ompt_event_masked_begin: parallel_id=%" PRIx64
865+
", task_id=%" PRIx64 ", codeptr_ra=%p\n",
866866
ompt_get_thread_data()->value, parallel_data->value,
867867
task_data->value, codeptr_ra);
868868
break;
869869
case ompt_scope_end:
870870
printf("%" PRIu64 ":" _TOOL_PREFIX
871-
" ompt_event_masked_end: parallel_id=%" PRIu64 ", task_id=%" PRIu64
871+
" ompt_event_masked_end: parallel_id=%" PRIx64 ", task_id=%" PRIx64
872872
", codeptr_ra=%p\n",
873873
ompt_get_thread_data()->value, parallel_data->value,
874874
task_data->value, codeptr_ra);
@@ -890,9 +890,9 @@ static void on_ompt_callback_parallel_begin(
890890
const char *event = (flag & ompt_parallel_team) ? "parallel" : "teams";
891891
const char *size = (flag & ompt_parallel_team) ? "team_size" : "num_teams";
892892
printf("%" PRIu64 ":" _TOOL_PREFIX
893-
" ompt_event_%s_begin: parent_task_id=%" PRIu64
893+
" ompt_event_%s_begin: parent_task_id=%" PRIx64
894894
", parent_task_frame.exit=%p, parent_task_frame.reenter=%p, "
895-
"parallel_id=%" PRIu64 ", requested_%s=%" PRIu32
895+
"parallel_id=%" PRIx64 ", requested_%s=%" PRIu32
896896
", codeptr_ra=%p, invoker=%d\n",
897897
ompt_get_thread_data()->value, event, encountering_task_data->value,
898898
encountering_task_frame->exit_frame.ptr,
@@ -905,8 +905,8 @@ static void on_ompt_callback_parallel_end(ompt_data_t *parallel_data,
905905
int flag, const void *codeptr_ra) {
906906
int invoker = flag & 0xF;
907907
const char *event = (flag & ompt_parallel_team) ? "parallel" : "teams";
908-
printf("%" PRIu64 ":" _TOOL_PREFIX " ompt_event_%s_end: parallel_id=%" PRIu64
909-
", task_id=%" PRIu64 ", invoker=%d, codeptr_ra=%p\n",
908+
printf("%" PRIu64 ":" _TOOL_PREFIX " ompt_event_%s_end: parallel_id=%" PRIx64
909+
", task_id=%" PRIx64 ", invoker=%d, codeptr_ra=%p\n",
910910
ompt_get_thread_data()->value, event, parallel_data->value,
911911
encountering_task_data->value, invoker, codeptr_ra);
912912
}
@@ -929,9 +929,9 @@ on_ompt_callback_task_create(
929929

930930
printf(
931931
"%" PRIu64 ":" _TOOL_PREFIX
932-
" ompt_event_task_create: parent_task_id=%" PRIu64
932+
" ompt_event_task_create: parent_task_id=%" PRIx64
933933
", parent_task_frame.exit=%p, parent_task_frame.reenter=%p, "
934-
"new_task_id=%" PRIu64
934+
"new_task_id=%" PRIx64
935935
", codeptr_ra=%p, task_type=%s=%d, has_dependences=%s\n",
936936
ompt_get_thread_data()->value,
937937
encountering_task_data ? encountering_task_data->value : 0,
@@ -948,16 +948,17 @@ on_ompt_callback_task_schedule(
948948
ompt_data_t *second_task_data)
949949
{
950950
printf("%" PRIu64 ":" _TOOL_PREFIX
951-
" ompt_event_task_schedule: first_task_id=%" PRIu64
952-
", second_task_id=%" PRIu64 ", prior_task_status=%s=%d\n",
951+
" ompt_event_task_schedule: first_task_id=%" PRIx64
952+
", second_task_id=%" PRIx64 ", prior_task_status=%s=%d\n",
953953
ompt_get_thread_data()->value, first_task_data->value,
954954
(second_task_data ? second_task_data->value : -1),
955955
ompt_task_status_t_values[prior_task_status], prior_task_status);
956956
if (prior_task_status == ompt_task_complete ||
957957
prior_task_status == ompt_task_late_fulfill ||
958958
prior_task_status == ompt_taskwait_complete) {
959-
printf("%" PRIu64 ":" _TOOL_PREFIX " ompt_event_task_end: task_id=%" PRIu64
960-
"\n", ompt_get_thread_data()->value, first_task_data->value);
959+
printf("%" PRIu64 ":" _TOOL_PREFIX " ompt_event_task_end: task_id=%" PRIx64
960+
"\n",
961+
ompt_get_thread_data()->value, first_task_data->value);
961962
}
962963
}
963964

@@ -983,7 +984,7 @@ on_ompt_callback_dependences(
983984
}
984985
if (ndeps > 0)
985986
progress[-2] = 0;
986-
printf("%" PRIu64 ":" _TOOL_PREFIX " ompt_event_dependences: task_id=%" PRIu64
987+
printf("%" PRIu64 ":" _TOOL_PREFIX " ompt_event_dependences: task_id=%" PRIx64
987988
", deps=[%s], ndeps=%d\n",
988989
ompt_get_thread_data()->value, task_data->value, buffer, ndeps);
989990
}
@@ -994,8 +995,8 @@ on_ompt_callback_task_dependence(
994995
ompt_data_t *second_task_data)
995996
{
996997
printf("%" PRIu64 ":" _TOOL_PREFIX
997-
" ompt_event_task_dependence_pair: first_task_id=%" PRIu64
998-
", second_task_id=%" PRIu64 "\n",
998+
" ompt_event_task_dependence_pair: first_task_id=%" PRIx64
999+
", second_task_id=%" PRIx64 "\n",
9991000
ompt_get_thread_data()->value, first_task_data->value,
10001001
second_task_data->value);
10011002
}
@@ -1046,7 +1047,7 @@ on_ompt_callback_control_tool(
10461047
ompt_data_t *task_data;
10471048
while (ompt_get_task_info(task_level, NULL, (ompt_data_t **)&task_data, NULL,
10481049
NULL, NULL)) {
1049-
printf("%" PRIu64 ":" _TOOL_PREFIX " task level %d: task_id=%" PRIu64 "\n",
1050+
printf("%" PRIu64 ":" _TOOL_PREFIX " task level %d: task_id=%" PRIx64 "\n",
10501051
ompt_get_thread_data()->value, task_level, task_data->value);
10511052
task_level++;
10521053
}
@@ -1056,8 +1057,8 @@ on_ompt_callback_control_tool(
10561057
ompt_data_t *parallel_data;
10571058
while (ompt_get_parallel_info(parallel_level, (ompt_data_t **)&parallel_data,
10581059
NULL)) {
1059-
printf("%" PRIu64 ":" _TOOL_PREFIX " parallel level %d: parallel_id=%" PRIu64
1060-
"\n",
1060+
printf("%" PRIu64 ":" _TOOL_PREFIX
1061+
" parallel level %d: parallel_id=%" PRIx64 "\n",
10611062
ompt_get_thread_data()->value, parallel_level, parallel_data->value);
10621063
parallel_level++;
10631064
}

‎openmp/runtime/test/ompt/cancel/cancel_parallel.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ int main() {
2828
// CHECK-NOT: {{^}}0: Could not register callback 'ompt_callback_cancel'
2929

3030
// CHECK: {{^}}0: NULL_POINTER=[[NULL:.*$]]
31-
// 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
32-
// 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]}}
31+
// CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_initial_task_begin: parallel_id={{[0-f]+}}, task_id={{[0-f]+}}, actual_parallelism=1, index=1, flags=1
32+
// CHECK-DAG: {{^}}[[MASTER_ID]]: ompt_event_cancel: task_id=[[TASK_ID:[0-f]+]], flags=ompt_cancel_parallel|ompt_cancel_activated=17, codeptr_ra=[[RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
3333
// CHECK-DAG: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]]
3434

3535
// CHECK: {{^}}[[THREAD_ID:[0-9]+]]: ompt_event_implicit_task_begin
36-
// 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]}}
36+
// CHECK-DAG: {{^}}[[THREAD_ID]]: ompt_event_cancel: task_id=[[TASK_ID:[0-f]+]], flags=ompt_cancel_parallel|ompt_cancel_detected=33, codeptr_ra=[[OTHER_RETURN_ADDRESS:(0x)?[0-f]+]]{{[0-f][0-f]}}
3737
// CHECK-DAG: {{^}}[[THREAD_ID]]: fuzzy_address={{.*}}[[OTHER_RETURN_ADDRESS]]
3838

3939
return 0;

‎openmp/runtime/test/ompt/cancel/cancel_taskgroup.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,24 +67,24 @@ int main()
6767

6868
// CHECK: {{^}}0: NULL_POINTER=[[NULL:.*$]]
6969
// CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_masked_begin:
70-
// CHECK-SAME: parallel_id=[[PARALLEL_ID:[0-9]+]],
71-
// CHECK-SAME: task_id=[[PARENT_TASK_ID:[0-9]+]],
70+
// CHECK-SAME: parallel_id=[[PARALLEL_ID:[0-f]+]],
71+
// CHECK-SAME: task_id=[[PARENT_TASK_ID:[0-f]+]],
7272
// CHECK-SAME: codeptr_ra={{(0x)?[0-f]*}}
7373

74-
// 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
75-
// 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
76-
// 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
74+
// 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-f]+]], codeptr_ra={{(0x)?[0-f]*}}, task_type=ompt_task_explicit=4, has_dependences=no
75+
// 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-f]+]], codeptr_ra={{(0x)?[0-f]*}}, task_type=ompt_task_explicit=4, has_dependences=no
76+
// 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-f]+]], codeptr_ra={{(0x)?[0-f]*}}, task_type=ompt_task_explicit=4, has_dependences=no
7777

78-
// 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
78+
// 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-f]+]], codeptr_ra={{(0x)?[0-f]*}}, task_type=ompt_task_explicit|ompt_task_undeferred=134217732, has_dependences=no
7979
// 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
80-
// CHECK: {{^}}[[MASTER_ID]]: ompt_event_cancel: task_data=[[CANCEL_TASK_ID]], flags=ompt_cancel_taskgroup|ompt_cancel_activated=24, codeptr_ra={{(0x)?[0-f]*}}
80+
// CHECK: {{^}}[[MASTER_ID]]: ompt_event_cancel: task_id=[[CANCEL_TASK_ID]], flags=ompt_cancel_taskgroup|ompt_cancel_activated=24, codeptr_ra={{(0x)?[0-f]*}}
8181
// 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
8282

83-
// CHECK-DAG: {{^}}{{[0-9]+}}: ompt_event_cancel: task_data={{[0-9]+}}, flags=ompt_cancel_taskgroup|ompt_cancel_discarded_task=72, codeptr_ra=[[NULL]]
84-
// CHECK-DAG: {{^}}{{[0-9]+}}: ompt_event_cancel: task_data={{[0-9]+}}, flags=ompt_cancel_taskgroup|ompt_cancel_discarded_task=72, codeptr_ra=[[NULL]]
83+
// CHECK-DAG: {{^}}{{[0-9]+}}: ompt_event_cancel: task_id={{[0-f]+}}, flags=ompt_cancel_taskgroup|ompt_cancel_discarded_task=72, codeptr_ra=[[NULL]]
84+
// CHECK-DAG: {{^}}{{[0-9]+}}: ompt_event_cancel: task_id={{[0-f]+}}, flags=ompt_cancel_taskgroup|ompt_cancel_discarded_task=72, codeptr_ra=[[NULL]]
8585

8686
// CHECK-DAG: {{^}}[[THREAD_ID:[0-9]+]]: ompt_event_thread_begin: thread_type=ompt_thread_worker=2, thread_id=[[THREAD_ID]]
87-
// CHECK-DAG: {{^}}[[THREAD_ID]]: ompt_event_cancel: task_data={{[0-9]+}}, flags=ompt_cancel_taskgroup|ompt_cancel_detected=40, codeptr_ra={{(0x)?[0-f]*}}
87+
// CHECK-DAG: {{^}}[[THREAD_ID]]: ompt_event_cancel: task_id={{[0-f]+}}, flags=ompt_cancel_taskgroup|ompt_cancel_detected=40, codeptr_ra={{(0x)?[0-f]*}}
8888

8989
return 0;
9090
}

0 commit comments

Comments
 (0)