[OMPT] Fix inconsistent testcases

[protze.joachim]

Summary

The main change of this patch is to insert {{.*}} in current_address=[[RETURN_ADDRESS_END]]. This is needed to match any of the alternatively printed addresses.

Additionally, clang-format is applied to the two tests.

[Hahnfeld]

I'd like to document which instructions exactly are there and why.

[pawosm01]

Can't compile this

# command stderr:
runtime/test/ompt/synchronization/flush.c:16:5: warning: more '%' conversions than data arguments [-Wformat]
    print_current_address(1);
    ^~~~~~~~~~~~~~~~~~~~~~~
runtime/test/ompt/callback.h:106:3: note: expanded from macro 'print_current_address'
  print_possible_return_addresses(get_ompt_label_address(id))
runtime/test/ompt/callback.h:125:53: note: expanded from macro 'print_possible_return_addresses'
  printf("%" PRIu64 ": current_address=%p or %p or %p\n", ompt_get_thread_data()->value, \
runtime/test/ompt/synchronization/flush.c:16:5: error: extraneous ')' before ';'
runtime/test/ompt/callback.h:106:3: note: expanded from macro 'print_current_address'
  print_possible_return_addresses(get_ompt_label_address(id))
runtime/test/ompt/callback.h:126:70: note: expanded from macro 'print_possible_return_addresses'
         ((char *)addr) - 4, ((char *)addr) - 8), ((char *)addr) - 12)
1 warning and 1 error generated.

error: command failed with exit status: 1

There is closing bracket after - 8 which needs to be deleted.
BTW, making changes to callbask.h, can you make it non-executable?

[Hahnfeld]

However, please see the bug report for deeper investigation.

runtime/test/ompt/callback.h

126 ↗

(On Diff #133581)

Yes, this probably needs to be ((char *)addr) - 8, ((char *)addr) - 12), removing the brace before the added address.

[pawosm01]

OMPT test cases all pass after that change.

[Hahnfeld]

Not needed anymore.

[protze.joachim]

The initial issue in this patch is resolved by D43195. So removed the additionally printed address for AARCH64, but still allow the testcases to match any printed address.

[omalyshe]

runtime/test/ompt/synchronization/flush.c

26

MASTER_ID was assigned above, so should be verified here:
// CHECK: {{^}}[[MASTER_ID]]: current_address={{.*}}[[RETURN_ADDRESS]]

30

Same comment as above. THREAD_ID should be verified here:
// CHECK: {{^}}[[THREAD_ID]]: current_address={{.*}}[[RETURN_ADDRESS]]

[protze.joachim]

Use the captured pattern as pointed out by Olga

[omalyshe]

LGTM.

runtime/test/ompt/synchronization/flush.c

 // RUN: %libomp-compile-and-run | %sort-threads | FileCheck %s
 // REQUIRES: ompt
 // GCC generates code that does not call the runtime for the flush construct
 // XFAIL: gcc
 
 #include "callback.h"
 #include <omp.h>
 
-int main()
-{
-  #pragma omp parallel num_threads(2)
+int main() {
   {
     int tid = omp_get_thread_num();
-    
-    #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'
+  return 0;
+}
 
-  // 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: {{^}}[[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]]

runtime/test/ompt/synchronization/master.c

 // RUN: %libomp-compile-and-run | FileCheck %s
 // REQUIRES: ompt
 // GCC generates code that does not call the runtime for the master construct
 // XFAIL: gcc
 
 #include "callback.h"
 #include <omp.h>
 
-int main()
-{
+int main() {
   int x = 0;
-  #pragma omp parallel num_threads(2)
   {
-    #pragma omp master
     {
       print_fuzzy_address(1);
       x++;
     }
     print_current_address(2);
   }
 
   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'
+  return 0;
+}
+
 
-  // CHECK: 0: NULL_POINTER=[[NULL:.*$]]
 
-  // 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]]
-
-
-  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]]: 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]]