Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-06-08 01:04:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Initial support for CUDA.

Browse Source 
Modify CUDA compile arguments by removing everything but -I header.h stuff
This commit is contained in:
Max Rietmann 2019-04-01 14:32:45 +02:00
parent 8d0cfd9101
commit 32bd6f8ecf
2 changed files with 52 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lsp.hh
View File

@ -261,6 +261,6 @@ struct ShowMessageParam {
// Used to identify the language at a file level. The ordering is important, as // Used to identify the language at a file level. The ordering is important, as
// a file previously identified as `C`, will be changed to `Cpp` if it // a file previously identified as `C`, will be changed to `Cpp` if it
// encounters a c++ declaration. // encounters a c++ declaration.
enum class LanguageId { Unknown = -1, C = 0, Cpp = 1, ObjC = 2, ObjCpp = 3 }; enum class LanguageId { Unknown = -1, C = 0, Cpp = 1, ObjC = 2, ObjCpp = 3, CUDA = 4 };
} // namespace ccls } // namespace ccls

57
src/project.cc
View File

@ -59,7 +59,9 @@ std::pair<LanguageId, bool> lookupExtension(std::string_view filename) {
I == types::TY_ObjCXXHeader; I == types::TY_ObjCXXHeader;
bool objc = types::isObjC(I); bool objc = types::isObjC(I);
LanguageId ret; LanguageId ret;
if (types::isCXX(I)) if (I == types::TY_CUDA)
ret = LanguageId::CUDA;
else if (types::isCXX(I))
ret = objc ? LanguageId::ObjCpp : LanguageId::Cpp; ret = objc ? LanguageId::ObjCpp : LanguageId::Cpp;
else if (objc) else if (objc)
ret = LanguageId::ObjC; ret = LanguageId::ObjC;
@ -123,6 +125,8 @@ struct ProjectProcessor {
ok |= lang == LanguageId::ObjC; ok |= lang == LanguageId::ObjC;
else if (A.consume_front("%objective-cpp ")) else if (A.consume_front("%objective-cpp "))
ok |= lang == LanguageId::ObjCpp; ok |= lang == LanguageId::ObjCpp;
else if (A.consume_front("%cu "))
ok |= lang == LanguageId::CUDA;
else else
break; break;
} }
@ -326,6 +330,13 @@ int ComputeGuessScore(std::string_view a, std::string_view b) {
} // namespace } // namespace
template <typename Enumeration>
auto as_integer(Enumeration const value)
-> typename std::underlying_type<Enumeration>::type
{
return static_cast<typename std::underlying_type<Enumeration>::type>(value);
}
void Project::LoadDirectory(const std::string &root, Project::Folder &folder) { void Project::LoadDirectory(const std::string &root, Project::Folder &folder) {
SmallString<256> CDBDir, Path, StdinPath; SmallString<256> CDBDir, Path, StdinPath;
std::string err_msg; std::string err_msg;
@ -412,11 +423,45 @@ void Project::LoadDirectory(const std::string &root, Project::Folder &folder) {
DoPathMapping(entry.filename); DoPathMapping(entry.filename);
std::vector<std::string> args = std::move(Cmd.CommandLine); std::vector<std::string> args = std::move(Cmd.CommandLine);
entry.args.reserve(args.size());
for (std::string &arg : args) { auto [lang, header] = lookupExtension(entry.filename);
DoPathMapping(arg);
if (!proc.ExcludesArg(arg)) // CMAKE splits nvcc compiles into 2 seperates commands, and has (mostly) non-clang arguments. Replace these with a simple call to clang with only "-I /path/header.h" arguments.
entry.args.push_back(Intern(arg)); // .ccls will also need:
// clang
// %cu --cuda-gpu-arch=sm_70 --cuda-path=/usr/local/cuda-9.2/
if(lang == LanguageId::CUDA) {
entry.args.push_back(Intern("/usr/bin/clang-7"));
entry.args.push_back(Intern("-c"));
entry.args.push_back(Intern(entry.filename));
LOG_S(INFO) << entry.filename << ": (CUDA) clang-7 -c filename";
bool take_next_arg = false;
for (std::string &arg : args) {
// take header includes (-I /path/to/header.h)
if(arg == "-I") {
entry.args.push_back(Intern(arg));
take_next_arg = true;
}
else if (take_next_arg) {
// take actual header include location (/path/to/header.h)
entry.args.push_back(Intern(arg));
take_next_arg = false;
}
else {
LOG_S(INFO) << entry.filename << ": (CUDA) Ignoring arg: " << arg;
}
}
}
else {
entry.args.reserve(args.size());
for (std::string &arg : args) {
DoPathMapping(arg);
if (!proc.ExcludesArg(arg)) {
// LOG_S(INFO) << entry.filename << ": Accepted arg: " << arg <<
// "\n";
entry.args.push_back(Intern(arg));
}
}
} }
entry.compdb_size = entry.args.size(); entry.compdb_size = entry.args.size();