[Openmp-commits] [openmp] r356302 - [OpenMP] Fix OMPT cancellation test for GOMP

[Jonathan Peyton via Openmp-commits]

Author: jlpeyton
Date: Fri Mar 15 14:24:45 2019
New Revision: 356302

URL: http://llvm.org/viewvc/llvm-project?rev=356302&view=rev
Log:
[OpenMP] Fix OMPT cancellation test for GOMP

The GOMP sections interface uses schedule(dynamic) dispatch so it cannot
be assumed which thread executes the cancel and which thread executes
the cancellation point.  This patch allows either thread to execute either
section.

Modified:
    openmp/trunk/runtime/test/ompt/cancel/cancel_worksharing.c

Modified: openmp/trunk/runtime/test/ompt/cancel/cancel_worksharing.c
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/test/ompt/cancel/cancel_worksharing.c?rev=356302&r1=356301&r2=356302&view=diff
==============================================================================
--- openmp/trunk/runtime/test/ompt/cancel/cancel_worksharing.c (original)
+++ openmp/trunk/runtime/test/ompt/cancel/cancel_worksharing.c Fri Mar 15 14:24:45 2019
@@ -59,9 +59,9 @@ int main()
   
   // cancel for and sections
   // CHECK: {{^}}[[MASTER_ID]]: ompt_event_cancel: task_data=[[TASK_ID:[0-9]+]], flags=ompt_cancel_loop|ompt_cancel_activated=20, codeptr_ra={{0x[0-f]*}}
-  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_cancel: task_data=[[TASK_ID:[0-9]+]], flags=ompt_cancel_sections|ompt_cancel_activated=18, codeptr_ra={{0x[0-f]*}}
+  // CHECK: {{^}}[[MASTER_ID]]: ompt_event_cancel: task_data=[[TASK_ID:[0-9]+]], flags=ompt_cancel_sections|ompt_cancel_{{activated=18|detected=34}}, codeptr_ra={{0x[0-f]*}}
   // CHECK: {{^}}[[OTHER_THREAD_ID:[0-9]+]]: ompt_event_cancel: task_data=[[TASK_ID:[0-9]+]], flags=ompt_cancel_loop|ompt_cancel_detected=36, codeptr_ra={{0x[0-f]*}}
-  // CHECK: {{^}}[[OTHER_THREAD_ID:[0-9]+]]: ompt_event_cancel: task_data=[[TASK_ID:[0-9]+]], flags=ompt_cancel_sections|ompt_cancel_detected=34, codeptr_ra={{0x[0-f]*}}
+  // CHECK: {{^}}[[OTHER_THREAD_ID:[0-9]+]]: ompt_event_cancel: task_data=[[TASK_ID:[0-9]+]], flags=ompt_cancel_sections|ompt_cancel_{{activated=18|detected=34}}, codeptr_ra={{0x[0-f]*}}
 
   return 0;
 }