42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
![]() |
From 2414b9faee9c264ce4b92b4d709375313df03344 Mon Sep 17 00:00:00 2001
|
||
|
From: Ethan Stewart <ethan.stewart@amd.com>
|
||
|
Date: Tue, 22 Sep 2020 13:39:22 -0500
|
||
|
Subject: [PATCH] Add amdgcn to devicelibs bitcode names
|
||
|
|
||
|
---
|
||
|
clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp | 8 ++++----
|
||
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
||
|
diff --git a/clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp b/clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp
|
||
|
index cc9b4f1caba..d22609fbe62 100644
|
||
|
--- a/clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp
|
||
|
+++ b/clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp
|
||
|
@@ -148,21 +148,21 @@ const char *AMDGCN::OpenMPLinker::constructOmpExtraCmds(
|
||
|
llvm::StringRef WaveFrontSizeBC;
|
||
|
std::string GFXVersion = SubArchName.drop_front(3).str();
|
||
|
if (stoi(GFXVersion) < 1000)
|
||
|
- WaveFrontSizeBC = "oclc_wavefrontsize64_on.bc";
|
||
|
+ WaveFrontSizeBC = "oclc_wavefrontsize64_on.amdgcn.bc";
|
||
|
else
|
||
|
- WaveFrontSizeBC = "oclc_wavefrontsize64_off.bc";
|
||
|
+ WaveFrontSizeBC = "oclc_wavefrontsize64_off.amdgcn.bc";
|
||
|
|
||
|
// FIXME: remove double link of hip aompextras, ockl, and WaveFrontSizeBC
|
||
|
if (Args.hasArg(options::OPT_cuda_device_only))
|
||
|
BCLibs.append(
|
||
|
{Args.MakeArgString("libomptarget-amdgcn-" + SubArchName + ".bc"),
|
||
|
- "hip.bc", "ockl.bc",
|
||
|
+ "hip.amdgcn.bc", "ockl.amdgcn.bc",
|
||
|
std::string(WaveFrontSizeBC)});
|
||
|
else {
|
||
|
BCLibs.append(
|
||
|
{Args.MakeArgString("libomptarget-amdgcn-" + SubArchName + ".bc"),
|
||
|
Args.MakeArgString("libaompextras-amdgcn-" + SubArchName + ".bc"),
|
||
|
- "hip.bc", "ockl.bc",
|
||
|
+ "hip.amdgcn.bc", "ockl.amdgcn.bc",
|
||
|
Args.MakeArgString("libbc-hostrpc-amdgcn.a"),
|
||
|
std::string(WaveFrontSizeBC)});
|
||
|
|
||
|
--
|
||
|
2.17.1
|