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

Merge topic 'cuda_unity'

Browse Source 
b90ae10dda Add support for unity builds with CUDA sources
c99ff40b21 Unity: refactor unity extension logic to single function

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9655
This commit is contained in:
Brad King
2024-08-13 15:01:01 +00:00
committed by Kitware Robot
parent fc0faeb34e b90ae10dda
commit 88e90fcd20
18 changed files with 248 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Source/cmLocalGenerator.cxx
View File

@@ -3163,6 +3163,25 @@ void cmLocalGenerator::WriteUnitySourceInclude(
unity_file << "\n";
}
namespace {
std::string unity_file_extension(std::string const& lang)
{
std::string extension;
if (lang == "C") {
extension = "_c.c";
} else if (lang == "CXX") {
extension = "_cxx.cxx";
} else if (lang == "CUDA") {
extension = "_cu.cu";
} else if (lang == "OBJC") {
extension = "_m.m";
} else if (lang == "OBJCXX") {
extension = "_mm.mm";
}
return extension;
}
}
std::vector<cmLocalGenerator::UnitySource>
cmLocalGenerator::AddUnityFilesModeAuto(
cmGeneratorTarget* target, std::string const& lang,
@@ -3181,17 +3200,8 @@ cmLocalGenerator::AddUnityFilesModeAuto(
chunk = std::min(itemsLeft, batchSize);
std::string extension;
if (lang == "C") {
extension = "_c.c";
} else if (lang == "CXX") {
extension = "_cxx.cxx";
} else if (lang == "OBJC") {
extension = "_m.m";
} else if (lang == "OBJCXX") {
extension = "_mm.mm";
}
std::string filename = cmStrCat(filename_base, "unity_", batch, extension);
std::string filename =
cmStrCat(filename_base, "unity_", batch, unity_file_extension(lang));
auto const begin = filtered_sources.begin() + batch * batchSize;
auto const end = begin + chunk;
unity_files.emplace_back(this->WriteUnitySource(
@@ -3229,8 +3239,8 @@ cmLocalGenerator::AddUnityFilesModeGroup(
for (auto const& item : explicit_mapping) {
auto const& name = item.first;
std::string filename = cmStrCat(filename_base, "unity_", name,
(lang == "C") ? "_c.c" : "_cxx.cxx");
std::string filename =
cmStrCat(filename_base, "unity_", name, unity_file_extension(lang));
unity_files.emplace_back(this->WriteUnitySource(
target, configs, cmMakeRange(item.second), beforeInclude, afterInclude,
std::move(filename)));
@@ -3292,7 +3302,7 @@ void cmLocalGenerator::AddUnityBuild(cmGeneratorTarget* target)
cmValue afterInclude = target->GetProperty("UNITY_BUILD_CODE_AFTER_INCLUDE");
cmValue unityMode = target->GetProperty("UNITY_BUILD_MODE");
for (std::string lang : { "C", "CXX", "OBJC", "OBJCXX" }) {
for (std::string lang : { "C", "CXX", "OBJC", "OBJCXX", "CUDA" }) {
std::vector<UnityBatchedSource> filtered_sources;
std::copy_if(unitySources.begin(), unitySources.end(),
std::back_inserter(filtered_sources),

6
Source/cmVisualStudio10TargetGenerator.cxx
View File

@@ -2686,6 +2686,12 @@ void cmVisualStudio10TargetGenerator::WriteAllSources(Elem& e0)
}
}
}
if (haveUnityBuild && strcmp(tool, "CudaCompile") == 0 &&
si.Source->GetProperty("UNITY_SOURCE_FILE")) {
if (!si.Source->GetPropertyAsBool("SKIP_UNITY_BUILD_INCLUSION")) {
exclude_configs = all_configs;
}
}
if (si.Kind == cmGeneratorTarget::SourceKindObjectSource ||
si.Kind == cmGeneratorTarget::SourceKindUnityBatched) {