Skip to content

[HIP][CUDA] Support for header file types .hiph, .cuh (fixes 148972) #148973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+25 −8
Open

[HIP][CUDA] Support for header file types .hiph, .cuh (fixes 148972) #148973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32b3ac0
[HIP][CUDA] Support for header file types .hiph, .cuh
alexbaretta Jul 15, 2025
09c9aae
Merge branch 'main' into clangd-fix-cuda-hip-header-language-detection
alexbaretta Jul 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions clang-tools-extra/clangd/HeaderSourceSwitch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ namespace clangd {
std::optional<Path> getCorrespondingHeaderOrSource(
PathRef OriginalFile, llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> VFS) {
llvm::StringRef SourceExtensions[] = {".cpp", ".c", ".cc", ".cxx",
".c++", ".m", ".mm"};
".c++", ".m", ".mm", ".cu", ".hip"};
llvm::StringRef HeaderExtensions[] = {".h", ".hh", ".hpp", ".hxx",
".inc", ".cppm", ".ccm", ".cxxm",
".c++m", ".ixx"};
".c++m", ".ixx", ".cuh", ".hiph"};

llvm::StringRef PathExt = llvm::sys::path::extension(OriginalFile);

Expand Down
4 changes: 4 additions & 0 deletions clang/include/clang/Driver/Types.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ TYPE("objective-c++", ObjCXX, PP_ObjCXX, "mm", phases
TYPE("hlsl", HLSL, PP_CXX, "hlsl", phases::Preprocess, phases::Compile, phases::Backend, phases::Assemble)

// C family input files to precompile.
TYPE("cuda-header-cpp-output", PP_CUDA_Header, INVALID, "cuih", phases::Precompile)
TYPE("cuda-header", CUDA_Header, PP_CUDA_Header, "cuh", phases::Preprocess, phases::Precompile)
TYPE("hip-header-cpp-output", PP_HIP_Header, INVALID, "hiphi", phases::Precompile)
TYPE("hip-header", HIP_Header, PP_HIP_Header, "hiph", phases::Preprocess, phases::Precompile)
TYPE("c-header-cpp-output", PP_CHeader, INVALID, "i", phases::Precompile)
TYPE("c-header", CHeader, PP_CHeader, "h", phases::Preprocess, phases::Precompile)
TYPE("cl-header", CLHeader, PP_CHeader, "h", phases::Preprocess, phases::Precompile)
Expand Down
8 changes: 8 additions & 0 deletions clang/lib/Driver/Types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ types::ID types::lookupTypeForExtension(llvm::StringRef Ext) {
.Case("clii", TY_PP_CLCXX)
.Case("cp", TY_CXX)
.Case("cu", TY_CUDA)
.Case("cuh", TY_CUDA_Header)
.Case("hh", TY_CXXHeader)
.Case("ii", TY_PP_CXX)
.Case("ll", TY_LLVM_IR)
Expand Down Expand Up @@ -361,6 +362,7 @@ types::ID types::lookupTypeForExtension(llvm::StringRef Ext) {
.Case("gch", TY_PCH)
.Case("hip", TY_HIP)
.Case("hipi", TY_PP_HIP)
.Case("hiph", TY_HIP_Header)
.Case("hpp", TY_CXXHeader)
.Case("hxx", TY_CXXHeader)
.Case("iim", TY_PP_CXXModule)
Expand Down Expand Up @@ -443,5 +445,11 @@ ID types::lookupHeaderTypeForSourceType(ID Id) {
case types::TY_CL:
case types::TY_CLCXX:
return types::TY_CLHeader;
case types::TY_CUDA:
case types::TY_CUDA_DEVICE:
return types::TY_CUDA_Header;
case types::TY_HIP:
case types::TY_HIP_DEVICE:
return types::TY_HIP_Header;
}
}
4 changes: 2 additions & 2 deletions clang/lib/Frontend/FrontendOptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ InputKind FrontendOptions::getInputKindForExtension(StringRef Extension) {
.Cases("mm", "M", Language::ObjCXX)
.Case("mii", InputKind(Language::ObjCXX).getPreprocessed())
.Cases("C", "cc", "cp", Language::CXX)
.Cases("cpp", "CPP", "c++", "cxx", "hpp", "hxx", Language::CXX)
.Cases("cpp", "CPP", "c++", "cxx", "hpp", "hxx", "cuh", Language::CXX)
.Case("cppm", Language::CXX)
.Cases("iim", "iih", InputKind(Language::CXX).getPreprocessed())
.Case("cl", Language::OpenCL)
.Case("clcpp", Language::OpenCLCXX)
.Cases("cu", "cuh", Language::CUDA)
.Case("hip", Language::HIP)
.Cases("hip", "hiph", Language::HIP)
.Cases("ll", "bc", Language::LLVM_IR)
.Case("hlsl", Language::HLSL)
.Case("cir", Language::CIR)
Expand Down
2 changes: 1 addition & 1 deletion clang/lib/InstallAPI/HeaderFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ std::optional<std::string> createIncludeHeaderName(const StringRef FullPath) {

bool isHeaderFile(StringRef Path) {
return StringSwitch<bool>(sys::path::extension(Path))
.Cases(".h", ".H", ".hh", ".hpp", ".hxx", true)
.Cases(".h", ".H", ".hh", ".hpp", ".hxx", ".cuh", ".hiph", true)
.Default(false);
}

Expand Down
11 changes: 8 additions & 3 deletions clang/lib/Tooling/InterpolatingCompilationDatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,14 @@ static types::ID foldType(types::ID Lang) {
case types::TY_ObjCXX:
case types::TY_ObjCXXHeader:
return types::TY_ObjCXX;
case types::TY_CUDA:
case types::TY_CUDA_DEVICE:
return types::TY_CUDA;
case types::TY_CUDA:
case types::TY_CUDA_DEVICE:
case types::TY_CUDA_Header:
return types::TY_CUDA;
case types::TY_HIP:
case types::TY_HIP_DEVICE:
case types::TY_HIP_Header:
return types::TY_HIP;
default:
return types::TY_INVALID;
}
Expand Down