1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
From eb1e1351da41a0da25aa056636932acd8a4f955f Mon Sep 17 00:00:00 2001
From: Ethan Stewart <ethan.stewart@amd.com>
Date: Fri, 25 Sep 2020 09:53:42 -0500
Subject: [PATCH] Add amdgcn to devicelibs bitcode names 3.8
---
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 25d3db59d44..1bb9d993bf7 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
|
