reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-28 05:50:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CUDA: Properly de-duplicate libs when doing device linking

Browse Source 
The nvcc device linker is designed so that each static library
with device symbols only needs to be listed once as it doesn't
care about link order. If you provide the same static library
multiple times it will error out. To make sure this occurs
we find the unique set of link items.
This commit is contained in:
Robert Maynard 2018-07-13 14:44:16 -04:00 committed by Brad King
parent b07c71831c
commit fd0523a215
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/cmLinkLineDeviceComputer.cxx
View File

@ -3,7 +3,9 @@
#include "cmLinkLineDeviceComputer.h"
#include <set>
#include <sstream>
#include <utility>
#include "cmAlgorithms.h"
#include "cmComputeLinkInformation.h"
@ -28,6 +30,12 @@ std::string cmLinkLineDeviceComputer::ComputeLinkLibraries(
{
// Write the library flags to the build rule.
std::ostringstream fout;
// Generate the unique set of link items when device linking.
// The nvcc device linker is designed so that each static library
// with device symbols only needs to be listed once as it doesn't
// care about link order.
std::set<std::string> emitted;
typedef cmComputeLinkInformation::ItemVector ItemVector;
ItemVector const& items = cli.GetItems();
std::string config = cli.GetConfig();
@ -50,20 +58,24 @@ std::string cmLinkLineDeviceComputer::ComputeLinkLibraries(
}
}
std::string out;
if (item.IsPath) {
// nvcc understands absolute paths to libraries ending in '.a' should
// be passed to nvlink. Other extensions like '.so' or '.dylib' are
// rejected by the nvcc front-end even though nvlink knows to ignore
// them. Bypass the front-end via '-Xnvlink'.
if (!cmHasLiteralSuffix(item.Value, ".a")) {
fout << "-Xnvlink ";
out += "-Xnvlink ";
}
fout << this->ConvertToOutputFormat(
this->ConvertToLinkReference(item.Value));
out +=
this->ConvertToOutputFormat(this->ConvertToLinkReference(item.Value));
} else {
fout << item.Value;
out += item.Value;
}
if (emitted.insert(out).second) {
fout << out << " ";
}
fout << " ";
}
if (!stdLibString.empty()) {

3
Tests/CudaOnly/CircularLinkLine/CMakeLists.txt
View File

@ -16,8 +16,7 @@ add_executable(CudaOnlyCircularLinkLine main.cu)
target_link_libraries(CUDACircularDeviceLinking1 PUBLIC CUDACircularDeviceLinking2)
target_link_libraries(CUDACircularDeviceLinking2 PUBLIC CUDACircularDeviceLinking3)
#FIXME: complete the loop once supported
#target_link_libraries(CUDACircularDeviceLinking3 PUBLIC CUDACircularDeviceLinking1)
target_link_libraries(CUDACircularDeviceLinking3 PUBLIC CUDACircularDeviceLinking1)
target_link_libraries(CudaOnlyCircularLinkLine PRIVATE CUDACircularDeviceLinking3)