https://github.com/yxsamliu created
https://github.com/llvm/llvm-project/pull/85675
since it will cause duplicate symbols when the partially linked object is
linked again.
Change-Id: I2aea39ad0d57d3dc80b6aff395d9506ab9ebbf4d
>From 6d6b362fbf965706108362a55c894588e80ad778 Mon Sep 17 00:00:00 2001
From: "Yaxun (Sam) Liu" <yaxun....@amd.com>
Date: Mon, 18 Mar 2024 14:09:56 -0400
Subject: [PATCH] [HIP] do not link runtime for -r
since it will cause duplicate symbols when the partially
linked object is linked again.
Change-Id: I2aea39ad0d57d3dc80b6aff395d9506ab9ebbf4d
---
clang/lib/Driver/ToolChains/CommonArgs.cpp | 3 ++-
clang/test/Driver/hip-partial-link.hip | 2 +-
clang/test/Driver/hip-runtime-libs-linux.hip | 5 +++++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp
b/clang/lib/Driver/ToolChains/CommonArgs.cpp
index 83015b0cb81a6e..4cecdd3168a28e 100644
--- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -2830,7 +2830,8 @@ void tools::addHIPRuntimeLibArgs(const ToolChain &TC,
Compilation &C,
llvm::opt::ArgStringList &CmdArgs) {
if ((C.getActiveOffloadKinds() & Action::OFK_HIP) &&
!Args.hasArg(options::OPT_nostdlib) &&
- !Args.hasArg(options::OPT_no_hip_rt)) {
+ !Args.hasArg(options::OPT_no_hip_rt) &&
+ !Args.hasArg(options::OPT_r)) {
TC.AddHIPRuntimeLibArgs(Args, CmdArgs);
} else {
// Claim "no HIP libraries" arguments if any
diff --git a/clang/test/Driver/hip-partial-link.hip
b/clang/test/Driver/hip-partial-link.hip
index faa185972abc33..c8451ec81ed37e 100644
--- a/clang/test/Driver/hip-partial-link.hip
+++ b/clang/test/Driver/hip-partial-link.hip
@@ -47,7 +47,7 @@
// OBJ: D __hip_gpubin_handle_[[ID2]]
// RUN: %clang -v --target=x86_64-unknown-linux-gnu --no-offload-new-driver \
-// RUN: --hip-link -no-hip-rt -fgpu-rdc --offload-arch=gfx906 \
+// RUN: --hip-link -fgpu-rdc --offload-arch=gfx906 \
// RUN: -fuse-ld=lld -nostdlib -r %t.main.o %t.lib.o -o %t.final.o \
// RUN: 2>&1 | FileCheck -check-prefix=LINK-O %s
// LINK-O-NOT: Found undefined HIP {{.*}}symbol
diff --git a/clang/test/Driver/hip-runtime-libs-linux.hip
b/clang/test/Driver/hip-runtime-libs-linux.hip
index 142582963c958f..a4cd2733114b69 100644
--- a/clang/test/Driver/hip-runtime-libs-linux.hip
+++ b/clang/test/Driver/hip-runtime-libs-linux.hip
@@ -43,6 +43,11 @@
// RUN: --rocm-path=%S/Inputs/rocm %t.o 2>&1 \
// RUN: | FileCheck -check-prefixes=NOHIPRT %s
+// Test HIP runtime lib is not linked with -r.
+// RUN: %clang -### --hip-link -r --target=x86_64-linux-gnu \
+// RUN: --rocm-path=%S/Inputs/rocm %t.o 2>&1 \
+// RUN: | FileCheck -check-prefixes=NOHIPRT %s
+
// Test HIP runtime lib is linked without hip-link if there is HIP input file.
// RUN: %clang -### --target=x86_64-linux-gnu -nogpuinc -nogpulib \
// RUN: --rocm-path=%S/Inputs/rocm %s 2>&1 \
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
