diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2025-01-09 17:50:40 +0900 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2025-01-09 17:50:40 +0900 |
| commit | fea7da1b00cc97d742faede2df96c7d327950f49 (patch) | |
| tree | 4de1d6b4ddc69f4f32daabb11ad5c71ab0cf895e /llvm/lib/Linker/IRMover.cpp | |
| parent | 9b99dde0d47102625d93c5d1cbbc04951025a6c9 (diff) | |
| parent | 0aa930a41f2d1ebf1fa90ec42da8f96d15a4dcbb (diff) | |
| download | llvm-users/chapuni/cov/single/nextcount.zip llvm-users/chapuni/cov/single/nextcount.tar.gz llvm-users/chapuni/cov/single/nextcount.tar.bz2 | |
Merge branch 'users/chapuni/cov/single/nextcount-base' into users/chapuni/cov/single/nextcountusers/chapuni/cov/single/nextcount
Diffstat (limited to 'llvm/lib/Linker/IRMover.cpp')
| -rw-r--r-- | llvm/lib/Linker/IRMover.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/llvm/lib/Linker/IRMover.cpp b/llvm/lib/Linker/IRMover.cpp index a0c3f2c..be3535a 100644 --- a/llvm/lib/Linker/IRMover.cpp +++ b/llvm/lib/Linker/IRMover.cpp @@ -1562,10 +1562,6 @@ Error IRLinker::run() { bool EnableDLWarning = true; bool EnableTripleWarning = true; if (SrcTriple.isNVPTX() && DstTriple.isNVPTX()) { - std::string ModuleId = SrcM->getModuleIdentifier(); - StringRef FileName = llvm::sys::path::filename(ModuleId); - bool SrcIsLibDevice = - FileName.starts_with("libdevice") && FileName.ends_with(".10.bc"); bool SrcHasLibDeviceDL = (SrcM->getDataLayoutStr().empty() || SrcM->getDataLayoutStr() == "e-i64:64-v16:16-v32:32-n16:32:64"); @@ -1576,8 +1572,8 @@ Error IRLinker::run() { SrcTriple.getOSName() == "gpulibs") || (SrcTriple.getVendorName() == "unknown" && SrcTriple.getOSName() == "unknown"); - EnableTripleWarning = !(SrcIsLibDevice && SrcHasLibDeviceTriple); - EnableDLWarning = !(SrcIsLibDevice && SrcHasLibDeviceDL); + EnableTripleWarning = !SrcHasLibDeviceTriple; + EnableDLWarning = !(SrcHasLibDeviceTriple && SrcHasLibDeviceDL); } if (EnableDLWarning && (SrcM->getDataLayout() != DstM.getDataLayout())) { |