diff options
| -rw-r--r-- | openmp/runtime/test/ompt/synchronization/flush.c | 32 | ||||
| -rw-r--r-- | openmp/runtime/test/ompt/synchronization/master.c | 30 |
2 files changed, 31 insertions, 31 deletions
diff --git a/openmp/runtime/test/ompt/synchronization/flush.c b/openmp/runtime/test/ompt/synchronization/flush.c index 875871d1f43..287d035ff85 100644 --- a/openmp/runtime/test/ompt/synchronization/flush.c +++ b/openmp/runtime/test/ompt/synchronization/flush.c @@ -6,27 +6,25 @@ #include "callback.h" #include <omp.h> -int main() -{ - #pragma omp parallel num_threads(2) +int main() { +#pragma omp parallel num_threads(2) { int tid = omp_get_thread_num(); - - #pragma omp flush + +#pragma omp flush print_current_address(1); } - // Check if libomp supports the callbacks for this test. - // CHECK-NOT: {{^}}0: Could not register callback 'ompt_callback_flush' - - // CHECK: 0: NULL_POINTER=[[NULL:.*$]] - // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_flush: codeptr_ra=[[RETURN_ADDRESS:0x[0-f]+]] - // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: current_address=[[RETURN_ADDRESS]] - // - // CHECK: {{^}}[[THREAD_ID:[0-9]+]]: ompt_event_flush: codeptr_ra=[[RETURN_ADDRESS:0x[0-f]+]] - // CHECK: {{^}}[[THREAD_ID:[0-9]+]]: current_address=[[RETURN_ADDRESS]] - - - return 0; } +// Check if libomp supports the callbacks for this test. +// CHECK-NOT: {{^}}0: Could not register callback 'ompt_callback_flush' + +// CHECK: 0: NULL_POINTER=[[NULL:.*$]] +// CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_flush: +// CHECK-SAME: codeptr_ra=[[RETURN_ADDRESS:0x[0-f]+]] +// CHECK: {{^}}[[MASTER_ID]]: current_address={{.*}}[[RETURN_ADDRESS]] +// +// CHECK: {{^}}[[THREAD_ID:[0-9]+]]: ompt_event_flush: +// CHECK-SAME: codeptr_ra=[[RETURN_ADDRESS:0x[0-f]+]] +// CHECK: {{^}}[[THREAD_ID]]: current_address={{.*}}[[RETURN_ADDRESS]] diff --git a/openmp/runtime/test/ompt/synchronization/master.c b/openmp/runtime/test/ompt/synchronization/master.c index 9e1e7c28e3b..8cc2d46a7eb 100644 --- a/openmp/runtime/test/ompt/synchronization/master.c +++ b/openmp/runtime/test/ompt/synchronization/master.c @@ -6,12 +6,11 @@ #include "callback.h" #include <omp.h> -int main() -{ +int main() { int x = 0; - #pragma omp parallel num_threads(2) +#pragma omp parallel num_threads(2) { - #pragma omp master +#pragma omp master { print_fuzzy_address(1); x++; @@ -21,16 +20,19 @@ int main() printf("%" PRIu64 ": x=%d\n", ompt_get_thread_data()->value, x); - // Check if libomp supports the callbacks for this test. - // CHECK-NOT: {{^}}0: Could not register callback 'ompt_callback_master' - - // CHECK: 0: NULL_POINTER=[[NULL:.*$]] + return 0; +} - // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_master_begin: parallel_id=[[PARALLEL_ID:[0-9]+]], task_id=[[TASK_ID:[0-9]+]], codeptr_ra=[[RETURN_ADDRESS:0x[0-f]+]]{{[0-f][0-f]}} - // CHECK: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]] - // CHECK: {{^}}[[MASTER_ID]]: ompt_event_master_end: parallel_id=[[PARALLEL_ID]], task_id=[[TASK_ID]], codeptr_ra=[[RETURN_ADDRESS_END:0x[0-f]+]] - // CHECK: {{^}}[[MASTER_ID]]: current_address=[[RETURN_ADDRESS_END]] +// Check if libomp supports the callbacks for this test. +// CHECK-NOT: {{^}}0: Could not register callback 'ompt_callback_master' +// CHECK: 0: NULL_POINTER=[[NULL:.*$]] - return 0; -} +// CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_master_begin: +// CHECK-SAME: parallel_id=[[PARALLEL_ID:[0-9]+]], task_id=[[TASK_ID:[0-9]+]], +// CHECK-SAME: codeptr_ra=[[RETURN_ADDRESS:0x[0-f]+]]{{[0-f][0-f]}} +// CHECK: {{^}}[[MASTER_ID]]: fuzzy_address={{.*}}[[RETURN_ADDRESS]] +// CHECK: {{^}}[[MASTER_ID]]: ompt_event_master_end: +// CHECK-SAME: parallel_id=[[PARALLEL_ID]], task_id=[[TASK_ID]], +// CHECK-SAME: codeptr_ra=[[RETURN_ADDRESS_END:0x[0-f]+]] +// CHECK: {{^}}[[MASTER_ID]]: current_address={{.*}}[[RETURN_ADDRESS_END]] |
