From 25b3164bfbe6dcca6687b4da97f212d8ece878fe Mon Sep 17 00:00:00 2001 From: Joachim Protze Date: Thu, 12 Nov 2020 01:22:48 +0100 Subject: [PATCH] [OpenMP][Tools][Tests] Fix ompt multiplex test With 6213ed0 the master callback was renamed to masked. The multiplex tests must check for masked now. --- .../multiplex/tests/custom_data_storage/custom_data_storage.c | 8 ++++---- openmp/tools/multiplex/tests/custom_data_storage/first-tool.h | 2 +- openmp/tools/multiplex/tests/print/print.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/openmp/tools/multiplex/tests/custom_data_storage/custom_data_storage.c b/openmp/tools/multiplex/tests/custom_data_storage/custom_data_storage.c index bbd90a6..96d9a75 100644 --- a/openmp/tools/multiplex/tests/custom_data_storage/custom_data_storage.c +++ b/openmp/tools/multiplex/tests/custom_data_storage/custom_data_storage.c @@ -64,7 +64,7 @@ int main() { // CHECK-SAME: task_id=[[_FIRST_MASTER_IMPLICIT_TASK_ID:[0-9]+]], team_size=2, // CHECK-SAME: thread_num=0 -// CHECK: {{^}}[[_1ST_MSTR_TID]]: _first_tool: ompt_event_master_begin: +// CHECK: {{^}}[[_1ST_MSTR_TID]]: _first_tool: ompt_event_masked_begin: // CHECK-SAME: parallel_id=[[_FIRST_PARALLEL_ID]], // CHECK-SAME: task_id=[[_FIRST_MASTER_IMPLICIT_TASK_ID]], // CHECK-SAME: codeptr_ra={{0x[0-f]+}} @@ -77,7 +77,7 @@ int main() { // CHECK-SAME: codeptr_ra={{0x[0-f]+}}, task_type=ompt_task_explicit=4, // CHECK-SAME: has_dependences=no -// CHECK: {{^}}[[_1ST_MSTR_TID]]: _first_tool: ompt_event_master_end: +// CHECK: {{^}}[[_1ST_MSTR_TID]]: _first_tool: ompt_event_masked_end: // CHECK-SAME: parallel_id=[[_FIRST_PARALLEL_ID]], // CHECK-SAME: task_id=[[_FIRST_MASTER_IMPLICIT_TASK_ID]], // CHECK-SAME: codeptr_ra={{0x[0-f]+}} @@ -166,7 +166,7 @@ int main() { // CHECK-SAME: task_id=[[SECOND_MASTER_IMPLICIT_TASK_ID:[0-9]+]], team_size=2, // CHECK-SAME: thread_num=0 -// CHECK: {{^}}[[_2ND_MSTR_TID]]: second_tool: ompt_event_master_begin: +// CHECK: {{^}}[[_2ND_MSTR_TID]]: second_tool: ompt_event_masked_begin: // CHECK-SAME: parallel_id=[[SECOND_PARALLEL_ID]], // CHECK-SAME: task_id=[[SECOND_MASTER_IMPLICIT_TASK_ID]], // CHECK-SAME: codeptr_ra={{0x[0-f]+}} @@ -179,7 +179,7 @@ int main() { // CHECK-SAME: codeptr_ra={{0x[0-f]+}}, task_type=ompt_task_explicit=4, // CHECK-SAME: has_dependences=no -// CHECK: {{^}}[[_2ND_MSTR_TID]]: second_tool: ompt_event_master_end: +// CHECK: {{^}}[[_2ND_MSTR_TID]]: second_tool: ompt_event_masked_end: // CHECK-SAME: parallel_id=[[SECOND_PARALLEL_ID]], // CHECK-SAME: task_id=[[SECOND_MASTER_IMPLICIT_TASK_ID]], // CHECK-SAME: codeptr_ra={{0x[0-f]+}} diff --git a/openmp/tools/multiplex/tests/custom_data_storage/first-tool.h b/openmp/tools/multiplex/tests/custom_data_storage/first-tool.h index 15a025a..a553ab8 100644 --- a/openmp/tools/multiplex/tests/custom_data_storage/first-tool.h +++ b/openmp/tools/multiplex/tests/custom_data_storage/first-tool.h @@ -123,7 +123,7 @@ static void on_cds_ompt_callback_master(ompt_scope_endpoint_t endpoint, const void *codeptr_ra) { parallel_data = get_own_ompt_data(parallel_data); task_data = get_own_ompt_data(task_data); - on_ompt_callback_master(endpoint, parallel_data, task_data, codeptr_ra); + on_ompt_callback_masked(endpoint, parallel_data, task_data, codeptr_ra); } static void on_cds_ompt_callback_parallel_begin( diff --git a/openmp/tools/multiplex/tests/print/print.c b/openmp/tools/multiplex/tests/print/print.c index 6af93b3..c492899 100644 --- a/openmp/tools/multiplex/tests/print/print.c +++ b/openmp/tools/multiplex/tests/print/print.c @@ -65,7 +65,7 @@ int main() { // CHECK-SAME: task_id=[[_FIRST_MASTER_IMPLICIT_TASK_ID:[0-9]+]], team_size=2, // CHECK-SAME: thread_num=0 -// CHECK: {{^}}[[_1ST_MSTR_TID]]: _first_tool: ompt_event_master_begin: +// CHECK: {{^}}[[_1ST_MSTR_TID]]: _first_tool: ompt_event_masked_begin: // CHECK-SAME: parallel_id=[[_FIRST_PARALLEL_ID]], // CHECK-SAME: task_id=[[_FIRST_MASTER_IMPLICIT_TASK_ID]], // CHECK-SAME: codeptr_ra={{0x[0-f]+}} @@ -78,7 +78,7 @@ int main() { // CHECK-SAME: codeptr_ra={{0x[0-f]+}}, task_type=ompt_task_explicit=4, // CHECK-SAME: has_dependences=no -// CHECK: {{^}}[[_1ST_MSTR_TID]]: _first_tool: ompt_event_master_end: +// CHECK: {{^}}[[_1ST_MSTR_TID]]: _first_tool: ompt_event_masked_end: // CHECK-SAME: parallel_id=[[_FIRST_PARALLEL_ID]], // CHECK-SAME: task_id=[[_FIRST_MASTER_IMPLICIT_TASK_ID]], // CHECK-SAME: codeptr_ra={{0x[0-f]+}} @@ -163,7 +163,7 @@ int main() { // CHECK-SAME: task_id=[[SECOND_MASTER_IMPLICIT_TASK_ID:[0-9]+]], team_size=2, // CHECK-SAME: thread_num=0 -// CHECK: {{^}}[[_2ND_MSTR_TID]]: second_tool: ompt_event_master_begin: +// CHECK: {{^}}[[_2ND_MSTR_TID]]: second_tool: ompt_event_masked_begin: // CHECK-SAME: parallel_id=[[SECOND_PARALLEL_ID]], // CHECK-SAME: task_id=[[SECOND_MASTER_IMPLICIT_TASK_ID]], // CHECK-SAME: codeptr_ra={{0x[0-f]+}} @@ -176,7 +176,7 @@ int main() { // CHECK-SAME: codeptr_ra={{0x[0-f]+}}, task_type=ompt_task_explicit=4, // CHECK-SAME: has_dependences=no -// CHECK: {{^}}[[_2ND_MSTR_TID]]: second_tool: ompt_event_master_end: +// CHECK: {{^}}[[_2ND_MSTR_TID]]: second_tool: ompt_event_masked_end: // CHECK-SAME: parallel_id=[[SECOND_PARALLEL_ID]], // CHECK-SAME: task_id=[[SECOND_MASTER_IMPLICIT_TASK_ID]], // CHECK-SAME: codeptr_ra={{0x[0-f]+}} -- 2.7.4