maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[CUDA][FIX] Fix name conflict in getNVPTXTargetFeatures 

Summary:
There was a naming conflict in the getNVPTXTargetFeatures function that
prevented some compilers from correctly disambiguating between the
enumeration and variable of the same name. Rename the variable to avoid
this.
This commit is contained in:
Joseph Huber 2022-03-23 23:07:51 -04:00
parent f74413d163
commit d912232741
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/Driver/ToolChains/Cuda.cpp
View File

@ -633,17 +633,17 @@ void NVPTX::OpenMPLinker::ConstructJob(Compilation &C, const JobAction &JA,
void NVPTX::getNVPTXTargetFeatures(const Driver &D, const llvm::Triple &Triple,
const llvm::opt::ArgList &Args,
std::vector<StringRef> &Features,
Optional<clang::CudaVersion> CudaVersion) {
if (!CudaVersion) {
Optional<clang::CudaVersion> Version) {
if (!Version) {
CudaInstallationDetector CudaInstallation(D, Triple, Args);
CudaVersion = CudaInstallation.version();
Version = CudaInstallation.version();
}
// New CUDA versions often introduce new instructions that are only supported
// by new PTX version, so we need to raise PTX level to enable them in NVPTX
// back-end.
const char *PtxFeature = nullptr;
switch (*CudaVersion) {
switch (*Version) {
#define CASE_CUDA_VERSION(CUDA_VER, PTX_VER) \
case CudaVersion::CUDA_##CUDA_VER: \
PtxFeature = "+ptx" #PTX_VER; \

2
clang/lib/Driver/ToolChains/Cuda.h
View File

@ -127,7 +127,7 @@ class LLVM_LIBRARY_VISIBILITY OpenMPLinker : public Tool {
void getNVPTXTargetFeatures(const Driver &D, const llvm::Triple &Triple,
const llvm::opt::ArgList &Args,
std::vector<StringRef> &Features,
Optional<clang::CudaVersion> CudaVersion = None);
Optional<clang::CudaVersion> Version = None);
} // end namespace NVPTX
} // end namespace tools