This is an archive of the discontinued LLVM Phabricator instance.

Differential D142064

[OpenMP][AMDGPU] Get rid of redundant macro def
ClosedPublic

Authored by tianshilei1992 on Jan 18 2023, 3:54 PM.

Details

Reviewers
jdoerfert
jhuber6
Commits
rG3ff1726cf802: [OpenMP][AMDGPU] Get rid of redundant macro def
Summary

The next gen plugin adds the def of DEBUG_PREFIX in CMake, causing
compiler warning that DEBUG_PREFIX is defined multiple times. This patch simply
guards the macro def.

Diff Detail

Event Timeline

tianshilei1992 created this revision.Jan 18 2023, 3:54 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 18 2023, 3:54 PM
Herald added subscribers: kosarev, kerbowa, guansong and 5 others. · View Herald Transcript
tianshilei1992 requested review of this revision.Jan 18 2023, 3:54 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 18 2023, 3:54 PM
Herald added subscribers: openmp-commits, sstefan1, wdng. · View Herald Transcript
Harbormaster completed remote builds in B208621: Diff 490325.Jan 18 2023, 3:58 PM
jdoerfert accepted this revision.Jan 18 2023, 3:58 PM
This revision is now accepted and ready to land.Jan 18 2023, 3:58 PM
Closed by commit rG3ff1726cf802: [OpenMP][AMDGPU] Get rid of redundant macro def (authored by tianshilei1992). · Explain WhyJan 18 2023, 5:08 PM
This revision was automatically updated to reflect the committed changes.
tianshilei1992 added a commit: rG3ff1726cf802: [OpenMP][AMDGPU] Get rid of redundant macro def.

Revision Contents

PathSize
openmp/
libomptarget/
plugins/
amdgpu/
dynamic_hsa/
2 lines

Diff 490335

openmp/libomptarget/plugins/amdgpu/dynamic_hsa/hsa.cpp

Show First 20 Lines • Show All 71 Lines • ▼ Show 20 Lines
#ifndef DYNAMIC_HSA_PATH #ifndef DYNAMIC_HSA_PATH
#define DYNAMIC_HSA_PATH "libhsa-runtime64.so" #define DYNAMIC_HSA_PATH "libhsa-runtime64.so"
#endif #endif
#ifndef TARGET_NAME #ifndef TARGET_NAME
#error "Missing TARGET_NAME macro" #error "Missing TARGET_NAME macro"
#endif #endif
#ifndef DEBUG_PREFIX
#define DEBUG_PREFIX "Target " GETNAME(TARGET_NAME) " RTL" #define DEBUG_PREFIX "Target " GETNAME(TARGET_NAME) " RTL"
#endif
static bool checkForHSA() { static bool checkForHSA() {
// return true if dlopen succeeded and all functions found // return true if dlopen succeeded and all functions found
const char *HsaLib = DYNAMIC_HSA_PATH; const char *HsaLib = DYNAMIC_HSA_PATH;
std::string ErrMsg; std::string ErrMsg;
auto DynlibHandle = std::make_unique<llvm::sys::DynamicLibrary>( auto DynlibHandle = std::make_unique<llvm::sys::DynamicLibrary>(
llvm::sys::DynamicLibrary::getPermanentLibrary(HsaLib, &ErrMsg)); llvm::sys::DynamicLibrary::getPermanentLibrary(HsaLib, &ErrMsg));
Show All 27 Lines