This is an archive of the discontinued LLVM Phabricator instance.

Differential D145307

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

Authored by sunshaoce on Mar 4 2023, 9:57 AM.

Details

Reviewers
jdoerfert
jhuber6
Commits
rG420d2fcac9ce: [OpenMP][CUDA] Get rid of redundant macro def
Summary

Resolve warning of TARGET_NAME macro redefinition.

Diff Detail

Event Timeline

sunshaoce created this revision.Mar 4 2023, 9:57 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 4 2023, 9:57 AM
Herald added subscribers: mattd, guansong, yaxunl. · View Herald Transcript
sunshaoce requested review of this revision.Mar 4 2023, 9:57 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 4 2023, 9:57 AM
Herald added subscribers: openmp-commits, sstefan1. · View Herald Transcript
jhuber6 accepted this revision.Mar 4 2023, 9:59 AM

We should rework how these are handled once we delete the old plugins in a few weeks. But this is good for now.

This revision is now accepted and ready to land.Mar 4 2023, 9:59 AM
Harbormaster completed remote builds in B217370: Diff 502378.Mar 4 2023, 10:00 AM
Closed by commit rG420d2fcac9ce: [OpenMP][CUDA] Get rid of redundant macro def (authored by sunshaoce). · Explain WhyMar 4 2023, 10:02 AM
This revision was automatically updated to reflect the committed changes.
sunshaoce added a commit: rG420d2fcac9ce: [OpenMP][CUDA] Get rid of redundant macro def.

Revision Contents

PathSize
openmp/
libomptarget/
plugins/
cuda/
dynamic_cuda/
4 lines

Diff 502379

openmp/libomptarget/plugins/cuda/dynamic_cuda/cuda.cpp

Show First 20 Lines • Show All 79 Lines • ▼ Show 20 Lines
DLWRAP(cuEventDestroy, 1) DLWRAP(cuEventDestroy, 1)
DLWRAP_FINALIZE() DLWRAP_FINALIZE()
#ifndef DYNAMIC_CUDA_PATH #ifndef DYNAMIC_CUDA_PATH
#define DYNAMIC_CUDA_PATH "libcuda.so" #define DYNAMIC_CUDA_PATH "libcuda.so"
#endif #endif
#ifndef TARGET_NAME
#define TARGET_NAME CUDA #define TARGET_NAME CUDA
#endif
#ifndef DEBUG_PREFIX
#define DEBUG_PREFIX "Target " GETNAME(TARGET_NAME) " RTL" #define DEBUG_PREFIX "Target " GETNAME(TARGET_NAME) " RTL"
#endif
static bool checkForCUDA() { static bool checkForCUDA() {
// return true if dlopen succeeded and all functions found // return true if dlopen succeeded and all functions found
// Prefer _v2 versions of functions if found in the library // Prefer _v2 versions of functions if found in the library
std::unordered_map<std::string, const char *> TryFirst = { std::unordered_map<std::string, const char *> TryFirst = {
{"cuMemAlloc", "cuMemAlloc_v2"}, {"cuMemAlloc", "cuMemAlloc_v2"},
{"cuMemFree", "cuMemFree_v2"}, {"cuMemFree", "cuMemFree_v2"},
▲ Show 20 Lines • Show All 55 Lines • Show Last 20 Lines