replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[OpenMP][OMPT] Fix building with OMPT disabled after 6d3b81664a

This commit is contained in:
Martin Storsjö 2020-11-26 10:09:32 +02:00
parent dde0fcd7a7
commit 6b429668de
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
openmp/runtime/src/ompt-specific.h
View File

@ -109,6 +109,26 @@ inline void ompt_set_thread_state(kmp_info_t *thread, ompt_state_t state) {
inline const char *ompt_get_runtime_version() {
return &__kmp_version_lib_ver[KMP_VERSION_MAGIC_LEN];
}
class OmptReturnAddressGuard {
private:
bool SetAddress{false};
int Gtid;
public:
OmptReturnAddressGuard(int Gtid, void *ReturnAddress) : Gtid(Gtid) {
if (ompt_enabled.enabled && Gtid >= 0 && __kmp_threads[Gtid] &&
!__kmp_threads[Gtid]->th.ompt_thread_info.return_address) {
SetAddress = true;
__kmp_threads[Gtid]->th.ompt_thread_info.return_address = ReturnAddress;
}
}
~OmptReturnAddressGuard() {
if (SetAddress)
__kmp_threads[Gtid]->th.ompt_thread_info.return_address = NULL;
}
};
#endif // OMPT_SUPPORT
// macros providing the OMPT callbacks for reduction clause
@ -135,23 +155,4 @@ inline const char *ompt_get_runtime_version() {
#define OMPT_REDUCTION_END
#endif // ! OMPT_SUPPORT && OMPT_OPTIONAL
class OmptReturnAddressGuard {
private:
bool SetAddress{false};
int Gtid;
public:
OmptReturnAddressGuard(int Gtid, void *ReturnAddress) : Gtid(Gtid) {
if (ompt_enabled.enabled && Gtid >= 0 && __kmp_threads[Gtid] &&
!__kmp_threads[Gtid]->th.ompt_thread_info.return_address) {
SetAddress = true;
__kmp_threads[Gtid]->th.ompt_thread_info.return_address = ReturnAddress;
}
}
~OmptReturnAddressGuard() {
if (SetAddress)
__kmp_threads[Gtid]->th.ompt_thread_info.return_address = NULL;
}
};
#endif