1b4f161978
Testing `openmp` on Solaris/amd64 shows a large number of failures, all
due to the same issue:
```
# .---command stderr------------
# | openmp/runtime/test/ompt/misc/interoperability.cpp:67:16: error: CHECK-SAME: expected string not found in input
# | // CHECK-SAME: parent_task_frame.reenter={{0x[0-f]+}}
# | ^
# | <stdin>:5:101: note: scanning from here
# | 281474976710658: ompt_event_parallel_begin: parent_task_id=281474976710659, parent_task_frame.exit=0, parent_task_frame.reenter=7fffbedffe90, parallel_id=281474976710661, requested_team_size=2, codeptr_ra=408b8e, invoker=2
```
The testsuite expects pointers to be printed with a `0x` prefix when
using the `%p` format, while Solaris `libc` just prints them in hex
without a prefix.
However, this difference is completely benign. ISO C (up to C23,
7.23.6.1) states
```
p The argument shall be a pointer to void or a pointer to a character
type. The value of the pointer is converted to a sequence of printing
characters, in an implementation-defined manner.
```
I saw two ways around this:
- replace every instance of `%p` with a macro (`KMP_PTR_FMT`, defined as
`"%p"` or `"0x%p" as appropriate), or
- adjust the testsuite to make the `0x` prefix optional
The second route seemed less intrusive and more readable, so that's what
this patch does. While large, it's also completely mechanical.
Tested on `amd64-pc-solaris2.11` and `x86_64-pc-linux-gnu`.
90 lines
3.1 KiB
C
90 lines
3.1 KiB
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
|
|
|
|
#define USE_PRIVATE_TOOL 1
|
|
#include "callback.h"
|
|
#include <omp.h>
|
|
|
|
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);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void on_ompt_callback_master(ompt_scope_endpoint_t endpoint,
|
|
ompt_data_t *parallel_data,
|
|
ompt_data_t *task_data,
|
|
const void *codeptr_ra) {
|
|
switch (endpoint) {
|
|
case ompt_scope_begin:
|
|
printf("%" PRIu64 ":" _TOOL_PREFIX
|
|
" ompt_event_master_begin: codeptr_ra=%p\n",
|
|
ompt_get_thread_data()->value, codeptr_ra);
|
|
break;
|
|
case ompt_scope_end:
|
|
printf("%" PRIu64 ":" _TOOL_PREFIX
|
|
" ompt_event_master_end: codeptr_ra=%p\n",
|
|
ompt_get_thread_data()->value, codeptr_ra);
|
|
break;
|
|
case ompt_scope_beginend:
|
|
printf("ompt_scope_beginend should never be passed to %s\n", __func__);
|
|
exit(-1);
|
|
}
|
|
}
|
|
|
|
static void on_ompt_callback_thread_begin(ompt_thread_t thread_type,
|
|
ompt_data_t *thread_data) {
|
|
if (thread_data->ptr)
|
|
printf("%s\n", "0: thread_data initially not null");
|
|
thread_data->value = ompt_get_unique_id();
|
|
printf("%" PRIu64 ":" _TOOL_PREFIX
|
|
" ompt_event_thread_begin: thread_type=%s=%d, thread_id=%" PRIu64 "\n",
|
|
ompt_get_thread_data()->value, ompt_thread_t_values[thread_type],
|
|
thread_type, thread_data->value);
|
|
}
|
|
|
|
int ompt_initialize(ompt_function_lookup_t lookup, int initial_device_num,
|
|
ompt_data_t *tool_data) {
|
|
ompt_set_callback = (ompt_set_callback_t)lookup("ompt_set_callback");
|
|
ompt_get_unique_id = (ompt_get_unique_id_t)lookup("ompt_get_unique_id");
|
|
ompt_get_thread_data = (ompt_get_thread_data_t)lookup("ompt_get_thread_data");
|
|
|
|
register_ompt_callback(ompt_callback_master);
|
|
printf("0: NULL_POINTER=%p\n", (void *)NULL);
|
|
return 1; // success
|
|
}
|
|
|
|
void ompt_finalize(ompt_data_t *tool_data) {}
|
|
|
|
ompt_start_tool_result_t *ompt_start_tool(unsigned int omp_version,
|
|
const char *runtime_version) {
|
|
static ompt_start_tool_result_t ompt_start_tool_result = {&ompt_initialize,
|
|
&ompt_finalize, 0};
|
|
return &ompt_start_tool_result;
|
|
}
|
|
|
|
// Check if libomp supports the callbacks for this test.
|
|
// CHECK-NOT: {{^}}0: Could not register callback 'ompt_callback_master'
|
|
|
|
// CHECK: 0: NULL_POINTER=[[NULL:.*$]]
|
|
|
|
// CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_event_master_begin:
|
|
// 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: codeptr_ra=[[RETURN_ADDRESS_END:(0x)?[0-f]+]]
|
|
// CHECK: {{^}}[[MASTER_ID]]: current_address={{.*}}[[RETURN_ADDRESS_END]]
|