https://github.com/jhuber6 updated
https://github.com/llvm/llvm-project/pull/85842
>From d920ec18c3133dba59149c756a91f7d459040435 Mon Sep 17 00:00:00 2001
From: Joseph Huber <hube...@outlook.com>
Date: Tue, 19 Mar 2024 13:29:35 -0500
Subject: [PATCH] [HIP] Correctly omit bundling with the new driver
Summary:
The HIP phases do not emit the offload bundler output when we do not
invoke the final linker phase in device only mode. Check this propery.
---
clang/lib/Driver/Driver.cpp | 16 ++++++++++------
clang/test/Driver/hip-phases.hip | 12 ++++++++++++
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index 1daf588142b3b4..767c1cd47e8cd9 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -4645,13 +4645,17 @@ Action *Driver::BuildOffloadingActions(Compilation &C,
}
}
+ // HIP code in non-RDC mode will bundle the output if it invoked the linker.
+ bool ShouldBundleHIP =
+ C.isOffloadingHostKind(Action::OFK_HIP) &&
+ Args.hasFlag(options::OPT_gpu_bundle_output,
+ options::OPT_no_gpu_bundle_output, true) &&
+ !Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false) &&
+ !llvm::any_of(OffloadActions,
+ [](Action *A) { return A->getType() != types::TY_Image; });
+
// All kinds exit now in device-only mode except for non-RDC mode HIP.
- if (offloadDeviceOnly() &&
- (getFinalPhase(Args) == phases::Preprocess ||
- !C.isOffloadingHostKind(Action::OFK_HIP) ||
- !Args.hasFlag(options::OPT_gpu_bundle_output,
- options::OPT_no_gpu_bundle_output, true) ||
- Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false)))
+ if (offloadDeviceOnly() && !ShouldBundleHIP)
return C.MakeAction<OffloadAction>(DDeps, types::TY_Nothing);
if (OffloadActions.empty())
diff --git a/clang/test/Driver/hip-phases.hip b/clang/test/Driver/hip-phases.hip
index ca63d4304d3959..180ef43022f818 100644
--- a/clang/test/Driver/hip-phases.hip
+++ b/clang/test/Driver/hip-phases.hip
@@ -648,3 +648,15 @@
// LTO-NEXT: 14: offload, "host-hip (x86_64-unknown-linux-gnu)" {2},
"device-hip (x86_64-unknown-linux-gnu)" {13}, ir
// LTO-NEXT: 15: backend, {14}, assembler, (host-hip)
// LTO-NEXT: 16: assembler, {15}, object, (host-hip)
+
+//
+// Test the new driver when not bundling
+//
+// RUN: %clang -### --target=x86_64-linux-gnu --offload-new-driver
-ccc-print-phases \
+// RUN: --offload-device-only --offload-arch=gfx90a -emit-llvm -c %s
2>&1 \
+// RUN: | FileCheck -check-prefix=DEVICE-ONLY %s
+// DEVICE-ONLY: 0: input, "[[INPUT:.+]]", hip, (device-hip, gfx90a)
+// DEVICE-ONLY-NEXT: 1: preprocessor, {0}, hip-cpp-output, (device-hip, gfx90a)
+// DEVICE-ONLY-NEXT: 2: compiler, {1}, ir, (device-hip, gfx90a)
+// DEVICE-ONLY-NEXT: 3: backend, {2}, ir, (device-hip, gfx90a)
+// DEVICE-ONLY-NEXT: 4: offload, "device-hip (amdgcn-amd-amdhsa:gfx90a)" {3},
none
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
