mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 04:40:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ninja: Add support for CUDA nvcc response files

Browse Source
This commit is contained in:
Francisco Facioni
2019-05-30 09:35:03 +01:00
committed by Brad King
parent 5efac09bed
commit d91b5a72cd
3 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/Compiler/NVIDIA-CUDA.cmake
View File

@@ -40,3 +40,8 @@ endif()
set(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_INCLUDES 0) set(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_INCLUDES 0)
set(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_LIBRARIES 0) set(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_LIBRARIES 0)
set(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_OBJECTS 0) set(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_OBJECTS 0)
if (CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL "9.0")
set(CMAKE_CUDA_RESPONSE_FILE_LINK_FLAG "--options-file ")
set(CMAKE_CUDA_RESPONSE_FILE_FLAG "--options-file ")
endif()

21
Source/cmNinjaNormalTargetGenerator.cxx
View File

@@ -182,11 +182,11 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkRule(bool useResponseFile)
if (flag) { if (flag) {
responseFlag = flag; responseFlag = flag;
} else { } else if (this->TargetLinkLanguage != "CUDA") {
responseFlag = "@"; responseFlag = "@";
} }
if (!useResponseFile) { if (!useResponseFile || responseFlag.empty()) {
vars.Objects = "$in"; vars.Objects = "$in";
vars.LinkLibraries = "$LINK_PATH $LINK_LIBRARIES"; vars.LinkLibraries = "$LINK_PATH $LINK_LIBRARIES";
} else { } else {
@@ -300,11 +300,11 @@ void cmNinjaNormalTargetGenerator::WriteLinkRule(bool useResponseFile)
if (flag) { if (flag) {
responseFlag = flag; responseFlag = flag;
} else { } else if (this->TargetLinkLanguage != "CUDA") {
responseFlag = "@"; responseFlag = "@";
} }
if (!useResponseFile) { if (!useResponseFile || responseFlag.empty()) {
vars.Objects = "$in"; vars.Objects = "$in";
vars.LinkLibraries = "$LINK_PATH $LINK_LIBRARIES"; vars.LinkLibraries = "$LINK_PATH $LINK_LIBRARIES";
} else { } else {
@@ -713,7 +713,7 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkStatement()
bool usedResponseFile = false; bool usedResponseFile = false;
globalGen->WriteBuild(this->GetBuildFileStream(), build, globalGen->WriteBuild(this->GetBuildFileStream(), build,
commandLineLengthLimit, &usedResponseFile); commandLineLengthLimit, &usedResponseFile);
this->WriteDeviceLinkRule(false); this->WriteDeviceLinkRule(usedResponseFile);
} }
void cmNinjaNormalTargetGenerator::WriteLinkStatement() void cmNinjaNormalTargetGenerator::WriteLinkStatement()
@@ -1047,8 +1047,17 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
symlinkVars["POST_BUILD"] = postBuildCmdLine; symlinkVars["POST_BUILD"] = postBuildCmdLine;
} }
std::string cmakeVarLang = "CMAKE_";
cmakeVarLang += this->TargetLinkLanguage;
// build response file name
std::string cmakeLinkVar = cmakeVarLang + "_RESPONSE_FILE_LINK_FLAG";
const char* flag = GetMakefile()->GetDefinition(cmakeLinkVar);
bool const lang_supports_response = bool const lang_supports_response =
!(this->TargetLinkLanguage == "RC" || this->TargetLinkLanguage == "CUDA"); !(this->TargetLinkLanguage == "RC" ||
(this->TargetLinkLanguage == "CUDA" && !flag));
int commandLineLengthLimit = -1; int commandLineLengthLimit = -1;
if (!lang_supports_response || !this->ForceResponseFile()) { if (!lang_supports_response || !this->ForceResponseFile()) {
commandLineLengthLimit = commandLineLengthLimit =

14
Source/cmNinjaTargetGenerator.cxx
View File

@@ -465,12 +465,12 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang)
std::string flags = "$FLAGS"; std::string flags = "$FLAGS";
std::string responseFlag; std::string responseFlag;
bool const lang_supports_response = !(lang == "RC" || lang == "CUDA"); bool const lang_supports_response = lang != "RC";
if (lang_supports_response && this->ForceResponseFile()) { if (lang_supports_response && this->ForceResponseFile()) {
std::string const responseFlagVar = std::string const responseFlagVar =
"CMAKE_" + lang + "_RESPONSE_FILE_FLAG"; "CMAKE_" + lang + "_RESPONSE_FILE_FLAG";
responseFlag = this->Makefile->GetSafeDefinition(responseFlagVar); responseFlag = this->Makefile->GetSafeDefinition(responseFlagVar);
if (responseFlag.empty()) { if (responseFlag.empty() && lang != "CUDA") {
responseFlag = "@"; responseFlag = "@";
} }
} }
@@ -944,8 +944,16 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
std::string const objectFileDir = std::string const objectFileDir =
cmSystemTools::GetFilenamePath(objectFileName); cmSystemTools::GetFilenamePath(objectFileName);
std::string cmakeVarLang = "CMAKE_";
cmakeVarLang += language;
// build response file name
std::string cmakeLinkVar = cmakeVarLang + "_RESPONSE_FILE_FLAG";
const char* flag = GetMakefile()->GetDefinition(cmakeLinkVar);
bool const lang_supports_response = bool const lang_supports_response =
!(language == "RC" || language == "CUDA"); !(language == "RC" || (language == "CUDA" && !flag));
int const commandLineLengthLimit = int const commandLineLengthLimit =
((lang_supports_response && this->ForceResponseFile())) ? -1 : 0; ((lang_supports_response && this->ForceResponseFile())) ? -1 : 0;