This is an archive of the discontinued LLVM Phabricator instance.

Differential D16631

[OMPT] Workaround clang failing with 'declare target'
ClosedPublic

Authored by Hahnfeld on Jan 27 2016, 7:29 AM.

Details

Reviewers
jlpeyton
ABataev
AndreyChurbanov
Commits
rGbba248c36833: [OMPT] Workaround clang failing with 'declare target'
rOMP259026: [OMPT] Workaround clang failing with 'declare target'
rL259026: [OMPT] Workaround clang failing with 'declare target'
Summary

Current clang trunk reports _OPENMP to be 201307 = OpenMP 4.0. It doesn't recognize #pragma omp declare target though (patch still pending) and therefore fails compilation.

Diff Detail

Event Timeline

Hahnfeld updated this revision to Diff 46133.Jan 27 2016, 7:29 AM
Hahnfeld retitled this revision from to [OMPT] Workaround clang failing with 'declare target'.
Hahnfeld updated this object.
Hahnfeld added reviewers: jlpeyton, AndreyChurbanov, ABataev.
Hahnfeld added subscribers: tcramer, openmp-commits.
jlpeyton accepted this revision.Jan 27 2016, 8:44 AM
jlpeyton edited edge metadata.

LGTM.

This revision is now accepted and ready to land.Jan 27 2016, 8:44 AM
Closed by commit rL259026: [OMPT] Workaround clang failing with 'declare target' (authored by Hahnfeld). · Explain WhyJan 27 2016, 11:18 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
runtime/
src/
include/
30/
5 lines
40/
5 lines
41/
5 lines

Diff 46133

runtime/src/include/30/ompt.h.var

Show First 20 Lines • Show All 455 Lines • ▼ Show 20 Lines
/**************************************************************************** /****************************************************************************
* MISCELLANEOUS FUNCTIONS * MISCELLANEOUS FUNCTIONS
***************************************************************************/ ***************************************************************************/
/* control */ /* control */
#if defined(_OPENMP) && (_OPENMP >= 201307) // FIXME: remove workaround for clang
#if !defined(__clang__) && defined(_OPENMP) && (_OPENMP >= 201307)
#pragma omp declare target #pragma omp declare target
#endif #endif
void ompt_control( void ompt_control(
uint64_t command, uint64_t command,
uint64_t modifier uint64_t modifier
); );
#if defined(_OPENMP) && (_OPENMP >= 201307) #if !defined(__clang__) && defined(_OPENMP) && (_OPENMP >= 201307)
#pragma omp end declare target #pragma omp end declare target
#endif #endif
/* state enumeration */ /* state enumeration */
OMPT_API_FUNCTION(int, ompt_enumerate_state, ( OMPT_API_FUNCTION(int, ompt_enumerate_state, (
int current_state, int current_state,
int *next_state, int *next_state,
const char **next_state_name const char **next_state_name
)); ));
#ifdef __cplusplus #ifdef __cplusplus
}; };
#endif #endif
#endif #endif

runtime/src/include/40/ompt.h.var

Show First 20 Lines • Show All 455 Lines • ▼ Show 20 Lines
/**************************************************************************** /****************************************************************************
* MISCELLANEOUS FUNCTIONS * MISCELLANEOUS FUNCTIONS
***************************************************************************/ ***************************************************************************/
/* control */ /* control */
#if defined(_OPENMP) && (_OPENMP >= 201307) // FIXME: remove workaround for clang
#if !defined(__clang__) && defined(_OPENMP) && (_OPENMP >= 201307)
#pragma omp declare target #pragma omp declare target
#endif #endif
void ompt_control( void ompt_control(
uint64_t command, uint64_t command,
uint64_t modifier uint64_t modifier
); );
#if defined(_OPENMP) && (_OPENMP >= 201307) #if !defined(__clang__) && defined(_OPENMP) && (_OPENMP >= 201307)
#pragma omp end declare target #pragma omp end declare target
#endif #endif
/* state enumeration */ /* state enumeration */
OMPT_API_FUNCTION(int, ompt_enumerate_state, ( OMPT_API_FUNCTION(int, ompt_enumerate_state, (
int current_state, int current_state,
int *next_state, int *next_state,
const char **next_state_name const char **next_state_name
)); ));
#ifdef __cplusplus #ifdef __cplusplus
}; };
#endif #endif
#endif #endif

runtime/src/include/41/ompt.h.var

Show First 20 Lines • Show All 455 Lines • ▼ Show 20 Lines
/**************************************************************************** /****************************************************************************
* MISCELLANEOUS FUNCTIONS * MISCELLANEOUS FUNCTIONS
***************************************************************************/ ***************************************************************************/
/* control */ /* control */
#if defined(_OPENMP) && (_OPENMP >= 201307) // FIXME: remove workaround for clang
#if !defined(__clang__) && defined(_OPENMP) && (_OPENMP >= 201307)
#pragma omp declare target #pragma omp declare target
#endif #endif
void ompt_control( void ompt_control(
uint64_t command, uint64_t command,
uint64_t modifier uint64_t modifier
); );
#if defined(_OPENMP) && (_OPENMP >= 201307) #if !defined(__clang__) && defined(_OPENMP) && (_OPENMP >= 201307)
#pragma omp end declare target #pragma omp end declare target
#endif #endif
/* state enumeration */ /* state enumeration */
OMPT_API_FUNCTION(int, ompt_enumerate_state, ( OMPT_API_FUNCTION(int, ompt_enumerate_state, (
int current_state, int current_state,
int *next_state, int *next_state,
const char **next_state_name const char **next_state_name
)); ));
#ifdef __cplusplus #ifdef __cplusplus
}; };
#endif #endif
#endif #endif