[Openmp-commits] [openmp] r351311 - [OMPT] Make sure that OMPT is enabled when accessing internals of the runtime
Hans Wennborg via Openmp-commits
openmp-commits at lists.llvm.org
Thu Jan 17 03:35:54 PST 2019
I see there was a follow-up commit in r351315 to fix a compile error,
but the test is still failing on the bots, e.g.
http://lab.llvm.org:8011/builders/openmp-clang-x86_64-linux-debian/builds/170
http://lab.llvm.org:8011/builders/openmp-gcc-x86_64-linux-debian/builds/149
I've reverted both in r351431 and merged that to the 8.0 branch in
351432 to unbreak things.
On Wed, Jan 16, 2019 at 10:02 AM Joachim Protze via Openmp-commits
<openmp-commits at lists.llvm.org> wrote:
>
> Author: jprotze
> Date: Wed Jan 16 00:58:17 2019
> New Revision: 351311
>
> URL: http://llvm.org/viewvc/llvm-project?rev=351311&view=rev
> Log:
> [OMPT] Make sure that OMPT is enabled when accessing internals of the runtime
>
> Make sure that OMPT is enabled in runtime entry points that access internals
> of the runtime. Else, return an appropiate value indicating an error or that
> the data is not available.
>
> Patch provided by @sconvent
>
> Reviewers: jlpeyton, omalyshe, hbae, Hahnfeld, joachim.protze
>
> Reviewed By: joachim.protze
>
> Tags: #openmp, #ompt
>
> Differential Revision: https://reviews.llvm.org/D47717
>
> Added:
> openmp/trunk/runtime/test/ompt/misc/api_calls_without_ompt.c
> Modified:
> openmp/trunk/runtime/src/ompt-general.cpp
>
> Modified: openmp/trunk/runtime/src/ompt-general.cpp
> URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/ompt-general.cpp?rev=351311&r1=351310&r2=351311&view=diff
> ==============================================================================
> --- openmp/trunk/runtime/src/ompt-general.cpp (original)
> +++ openmp/trunk/runtime/src/ompt-general.cpp Wed Jan 16 00:58:17 2019
> @@ -450,6 +450,9 @@ OMPT_API_ROUTINE ompt_set_result_t ompt_
>
> OMPT_API_ROUTINE int ompt_get_callback(ompt_callbacks_t which,
> ompt_callback_t *callback) {
> + if (!ompt_enabled.enabled)
> + return ompt_get_callback_failure;
> +
> switch (which) {
>
> #define ompt_event_macro(event_name, callback_type, event_id) \
> @@ -457,7 +460,7 @@ OMPT_API_ROUTINE int ompt_get_callback(o
> if (ompt_event_implementation_status(event_name)) { \
> ompt_callback_t mycb = \
> (ompt_callback_t)ompt_callbacks.ompt_callback(event_name); \
> - if (mycb) { \
> + if (ompt_enabled.event_name && mycb) { \
> *callback = mycb; \
> return ompt_get_callback_success; \
> } \
> @@ -480,11 +483,15 @@ OMPT_API_ROUTINE int ompt_get_callback(o
> OMPT_API_ROUTINE int ompt_get_parallel_info(int ancestor_level,
> ompt_data_t **parallel_data,
> int *team_size) {
> + if (!ompt_enabled.enabled)
> + return 0;
> return __ompt_get_parallel_info_internal(ancestor_level, parallel_data,
> team_size);
> }
>
> OMPT_API_ROUTINE int ompt_get_state(ompt_wait_id_t *wait_id) {
> + if (!ompt_enabled.enabled)
> + return omp_state_work_serial;
> int thread_state = __ompt_get_state_internal(wait_id);
>
> if (thread_state == ompt_state_undefined) {
> @@ -499,6 +506,8 @@ OMPT_API_ROUTINE int ompt_get_state(ompt
> ****************************************************************************/
>
> OMPT_API_ROUTINE ompt_data_t *ompt_get_thread_data(void) {
> + if (!ompt_enabled.enabled)
> + return NULL;
> return __ompt_get_thread_data_internal();
> }
>
> @@ -507,6 +516,8 @@ OMPT_API_ROUTINE int ompt_get_task_info(
> ompt_frame_t **task_frame,
> ompt_data_t **parallel_data,
> int *thread_num) {
> + if (!ompt_enabled.enabled)
> + return 0;
> return __ompt_get_task_info_internal(ancestor_level, type, task_data,
> task_frame, parallel_data, thread_num);
> }
> @@ -581,7 +592,7 @@ OMPT_API_ROUTINE int ompt_get_place_num(
> #if !KMP_AFFINITY_SUPPORTED
> return -1;
> #else
> - if (__kmp_get_gtid() < 0)
> + if (!ompt_enabled.enabled || __kmp_get_gtid() < 0)
> return -1;
>
> int gtid;
> @@ -602,7 +613,7 @@ OMPT_API_ROUTINE int ompt_get_partition_
> #if !KMP_AFFINITY_SUPPORTED
> return 0;
> #else
> - if (__kmp_get_gtid() < 0)
> + if (!ompt_enabled.enabled || __kmp_get_gtid() < 0)
> return 0;
>
> int i, gtid, place_num, first_place, last_place, start, end;
> @@ -637,7 +648,7 @@ OMPT_API_ROUTINE int ompt_get_partition_
> ****************************************************************************/
>
> OMPT_API_ROUTINE int ompt_get_proc_id(void) {
> - if (__kmp_get_gtid() < 0)
> + if (!ompt_enabled.enabled || __kmp_get_gtid() < 0)
> return -1;
> #if KMP_OS_LINUX
> return sched_getcpu();
>
> Added: openmp/trunk/runtime/test/ompt/misc/api_calls_without_ompt.c
> URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/test/ompt/misc/api_calls_without_ompt.c?rev=351311&view=auto
> ==============================================================================
> --- openmp/trunk/runtime/test/ompt/misc/api_calls_without_ompt.c (added)
> +++ openmp/trunk/runtime/test/ompt/misc/api_calls_without_ompt.c Wed Jan 16 00:58:17 2019
> @@ -0,0 +1,148 @@
> +// RUN: %libomp-compile-and-run | FileCheck %s
> +// REQUIRES: ompt
> +
> +#define _BSD_SOURCE
> +#define _DEFAULT_SOURCE
> +
> +#include <stdio.h>
> +#include <inttypes.h>
> +#include <omp.h>
> +#include <ompt.h>
> +
> +static ompt_set_callback_t ompt_set_callback;
> +static ompt_get_callback_t ompt_get_callback;
> +static ompt_get_state_t ompt_get_state;
> +static ompt_get_task_info_t ompt_get_task_info;
> +static ompt_get_thread_data_t ompt_get_thread_data;
> +static ompt_get_parallel_info_t ompt_get_parallel_info;
> +static ompt_get_unique_id_t ompt_get_unique_id;
> +static ompt_get_num_procs_t ompt_get_num_procs;
> +static ompt_get_num_places_t ompt_get_num_places;
> +static ompt_get_place_proc_ids_t ompt_get_place_proc_ids;
> +static ompt_get_place_num_t ompt_get_place_num;
> +static ompt_get_partition_place_nums_t ompt_get_partition_place_nums;
> +static ompt_get_proc_id_t ompt_get_proc_id;
> +static ompt_enumerate_states_t ompt_enumerate_states;
> +static ompt_enumerate_mutex_impls_t ompt_enumerate_mutex_impls;
> +
> +int main() {
> + // Call OpenMP API function to force initialization of OMPT.
> + // (omp_get_thread_num() does not work because it just returns 0 if the
> + // runtime isn't initialized yet...)
> + omp_get_num_threads();
> +
> + ompt_data_t *tdata = ompt_get_thread_data();
> + uint64_t tvalue = tdata ? tdata->value : 0;
> +
> + printf("%" PRIu64 ": ompt_get_num_places()=%d\n", tvalue,
> + ompt_get_num_places());
> +
> + printf("%" PRIu64 ": ompt_get_place_proc_ids()=%d\n", tvalue,
> + ompt_get_place_proc_ids(0, 0, NULL));
> +
> + printf("%" PRIu64 ": ompt_get_place_num()=%d\n", tvalue,
> + ompt_get_place_num());
> +
> + printf("%" PRIu64 ": ompt_get_partition_place_nums()=%d\n", tvalue,
> + ompt_get_partition_place_nums(0, NULL));
> +
> + printf("%" PRIu64 ": ompt_get_proc_id()=%d\n", tvalue, ompt_get_proc_id());
> +
> + printf("%" PRIu64 ": ompt_get_num_procs()=%d\n", tvalue,
> + ompt_get_num_procs());
> +
> + ompt_callback_t callback;
> + printf("%" PRIu64 ": ompt_get_callback()=%d\n", tvalue,
> + ompt_get_callback(ompt_callback_thread_begin, &callback));
> +
> + printf("%" PRIu64 ": ompt_get_state()=%d\n", tvalue, ompt_get_state(NULL));
> +
> + int state = omp_state_undefined;
> + const char *state_name;
> + printf("%" PRIu64 ": ompt_enumerate_states()=%d\n", tvalue,
> + ompt_enumerate_states(state, &state, &state_name));
> +
> + int impl = ompt_mutex_impl_unknown;
> + const char *impl_name;
> + printf("%" PRIu64 ": ompt_enumerate_mutex_impls()=%d\n", tvalue,
> + ompt_enumerate_mutex_impls(impl, &impl, &impl_name));
> +
> + printf("%" PRIu64 ": ompt_get_thread_data()=%p\n", tvalue,
> + ompt_get_thread_data());
> +
> + printf("%" PRIu64 ": ompt_get_parallel_info()=%d\n", tvalue,
> + ompt_get_parallel_info(0, NULL, NULL));
> +
> + printf("%" PRIu64 ": ompt_get_task_info()=%d\n", tvalue,
> + ompt_get_task_info(0, NULL, NULL, NULL, NULL, NULL));
> +
> + // Check if libomp supports the callbacks for this test.
> +
> + // CHECK: 0: NULL_POINTER=[[NULL:.*$]]
> +
> + // CHECK: {{^}}[[MASTER_ID:[0-9]+]]: ompt_get_num_places()={{[0-9]+}}
> +
> + // CHECK: {{^}}[[MASTER_ID]]: ompt_get_place_proc_ids()={{[0-9]+}}
> +
> + // CHECK: {{^}}[[MASTER_ID]]: ompt_get_place_num()=-1
> +
> + // CHECK: {{^}}[[MASTER_ID]]: ompt_get_partition_place_nums()=0
> +
> + // CHECK: {{^}}[[MASTER_ID]]: ompt_get_proc_id()=-1
> +
> + // CHECK: {{^}}[[MASTER_ID]]: ompt_get_num_procs()={{[0-9]+}}
> +
> + // CHECK: {{^}}[[MASTER_ID]]: ompt_get_callback()=0
> +
> + // CHECK: {{^}}[[MASTER_ID]]: ompt_get_state()=0
> +
> + // CHECK: {{^}}[[MASTER_ID]]: ompt_enumerate_states()=1
> +
> + // CHECK: {{^}}[[MASTER_ID]]: ompt_enumerate_mutex_impls()=1
> +
> + // CHECK: {{^}}[[MASTER_ID]]: ompt_get_thread_data()=[[NULL]]
> +
> + // CHECK: {{^}}[[MASTER_ID]]: ompt_get_parallel_info()=0
> +
> + // CHECK: {{^}}[[MASTER_ID]]: ompt_get_task_info()=0
> +
> + return 0;
> +}
> +
> +int ompt_initialize(ompt_function_lookup_t lookup, ompt_data_t *tool_data) {
> + ompt_set_callback = (ompt_set_callback_t)lookup("ompt_set_callback");
> + ompt_get_callback = (ompt_get_callback_t)lookup("ompt_get_callback");
> + ompt_get_state = (ompt_get_state_t)lookup("ompt_get_state");
> + ompt_get_task_info = (ompt_get_task_info_t)lookup("ompt_get_task_info");
> + ompt_get_thread_data = (ompt_get_thread_data_t)lookup("ompt_get_thread_data");
> + ompt_get_parallel_info =
> + (ompt_get_parallel_info_t)lookup("ompt_get_parallel_info");
> + ompt_get_unique_id = (ompt_get_unique_id_t)lookup("ompt_get_unique_id");
> +
> + ompt_get_num_procs = (ompt_get_num_procs_t)lookup("ompt_get_num_procs");
> + ompt_get_num_places = (ompt_get_num_places_t)lookup("ompt_get_num_places");
> + ompt_get_place_proc_ids =
> + (ompt_get_place_proc_ids_t)lookup("ompt_get_place_proc_ids");
> + ompt_get_place_num = (ompt_get_place_num_t)lookup("ompt_get_place_num");
> + ompt_get_partition_place_nums =
> + (ompt_get_partition_place_nums_t)lookup("ompt_get_partition_place_nums");
> + ompt_get_proc_id = (ompt_get_proc_id_t)lookup("ompt_get_proc_id");
> + ompt_enumerate_states =
> + (ompt_enumerate_states_t)lookup("ompt_enumerate_states");
> + ompt_enumerate_mutex_impls =
> + (ompt_enumerate_mutex_impls_t)lookup("ompt_enumerate_mutex_impls");
> +
> + printf("0: NULL_POINTER=%p\n", (void *)NULL);
> + return 0; // no success -> OMPT not enabled
> +}
> +
> +void ompt_finalize(ompt_data_t *tool_data) {
> + printf("0: ompt_event_runtime_shutdown\n");
> +}
> +
> +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;
> +}
>
>
> _______________________________________________
> Openmp-commits mailing list
> Openmp-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/openmp-commits
More information about the Openmp-commits
mailing list