This is an archive of the discontinued LLVM Phabricator instance.

Differential D104633

[OpenMP][OMPT] Fix compile-time assertion in multiplex.h
ClosedPublic

Authored by protze.joachim on Jun 21 2021, 3:53 AM.

Details

Reviewers
jdoerfert
Commits
rGfedbff75f46b: [OpenMP][OMPT] Fix compile-time assertion in ompt-multiplex.h
Summary

The compile-time assertion is supposed to prevent double-free caused by unexpected combination of preprocessor defines passed by an OMPT tool.
The current defines are not used, so this patch replaces the check with macros actually used in ompt-multiplex.h

Reported by: Semih Burak

Diff Detail

Event Timeline

protze.joachim created this revision.Jun 21 2021, 3:53 AM
Herald added subscribers: guansong, yaxunl. · View Herald TranscriptJun 21 2021, 3:53 AM
protze.joachim requested review of this revision.Jun 21 2021, 3:53 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptJun 21 2021, 3:53 AM
Herald added a subscriber: sstefan1. · View Herald Transcript
protze.joachim edited the summary of this revision. (Show Details)Jun 21 2021, 3:55 AM
Harbormaster completed remote builds in B110168: Diff 353327.Jun 21 2021, 4:46 AM
jdoerfert accepted this revision.Jun 22 2021, 1:22 PM

LG

This revision is now accepted and ready to land.Jun 22 2021, 1:22 PM
This revision was landed with ongoing or failed builds.Jul 12 2021, 3:13 AM
Closed by commit rGfedbff75f46b: [OpenMP][OMPT] Fix compile-time assertion in ompt-multiplex.h (authored by protze.joachim). · Explain Why
This revision was automatically updated to reflect the committed changes.
protze.joachim added a commit: rGfedbff75f46b: [OpenMP][OMPT] Fix compile-time assertion in ompt-multiplex.h.

Revision Contents

PathSize
openmp/
tools/
multiplex/
15 lines

Diff 357879

openmp/tools/multiplex/ompt-multiplex.h

Show All 32 Lines
static ompt_get_thread_data_t ompt_multiplex_get_thread_data; static ompt_get_thread_data_t ompt_multiplex_get_thread_data;
static ompt_get_parallel_info_t ompt_multiplex_get_parallel_info; static ompt_get_parallel_info_t ompt_multiplex_get_parallel_info;
// contains name of the environment var in which the tool path is specified // contains name of the environment var in which the tool path is specified
#ifndef CLIENT_TOOL_LIBRARIES_VAR #ifndef CLIENT_TOOL_LIBRARIES_VAR
#error CLIENT_TOOL_LIBRARIES_VAR should be defined before including of ompt-multiplex.h #error CLIENT_TOOL_LIBRARIES_VAR should be defined before including of ompt-multiplex.h
#endif #endif
#if defined(CUSTOM_DELETE_DATA) && !defined(CUSTOM_GET_CLIENT_DATA) #if defined(OMPT_MULTIPLEX_CUSTOM_DELETE_TASK_DATA) && \
#error CUSTOM_GET_CLIENT_DATA must be set if CUSTOM_DELETE_DATA is set !defined(OMPT_MULTIPLEX_CUSTOM_GET_CLIENT_TASK_DATA)
#error OMPT_MULTIPLEX_CUSTOM_GET_CLIENT_TASK_DATA must be set if OMPT_MULTIPLEX_CUSTOM_DELETE_TASK_DATA is set
#endif
#if defined(OMPT_MULTIPLEX_CUSTOM_DELETE_PARALLEL_DATA) && \
!defined(OMPT_MULTIPLEX_CUSTOM_GET_CLIENT_PARALLEL_DATA)
#error OMPT_MULTIPLEX_CUSTOM_GET_CLIENT_PARALLEL_DATA must be set if OMPT_MULTIPLEX_CUSTOM_DELETE_PARALLEL_DATA is set
#endif
#if defined(OMPT_MULTIPLEX_CUSTOM_DELETE_THREAD_DATA) && \
!defined(OMPT_MULTIPLEX_CUSTOM_GET_CLIENT_THREAD_DATA)
#error OMPT_MULTIPLEX_CUSTOM_GET_CLIENT_THREAD_DATA must be set if OMPT_MULTIPLEX_CUSTOM_DELETE_THREAD_DATA is set
#endif #endif
#define OMPT_API_ROUTINE static #define OMPT_API_ROUTINE static
#define OMPT_LOAD_CLIENT_FOREACH_OMPT_EVENT(macro) \ #define OMPT_LOAD_CLIENT_FOREACH_OMPT_EVENT(macro) \
macro(callback_thread_begin, ompt_callback_thread_begin_t, 1); \ macro(callback_thread_begin, ompt_callback_thread_begin_t, 1); \
macro(callback_thread_end, ompt_callback_thread_end_t, 2); \ macro(callback_thread_end, ompt_callback_thread_end_t, 2); \
macro(callback_parallel_begin, ompt_callback_parallel_begin_t, 3); \ macro(callback_parallel_begin, ompt_callback_parallel_begin_t, 3); \
▲ Show 20 Lines • Show All 1,044 Lines • Show Last 20 Lines