https://github.com/DominikAdamski updated
https://github.com/llvm/llvm-project/pull/88190
>From 44def17f36e8e27eb4232681e5ae7eff5de6d90f Mon Sep 17 00:00:00 2001
From: Dominik Adamski <dominik.adam...@amd.com>
Date: Tue, 9 Apr 2024 14:35:26 -0500
Subject: [PATCH 1/3] [Flang][AMDGPU] Add rocm-path flag
ROCm installation path is used for finding and automatically
linking required bitcode libraries.
---
clang/include/clang/Driver/Options.td | 3 ++-
clang/lib/Driver/ToolChains/Flang.cpp | 4 ++++
flang/test/Driver/driver-help-hidden.f90 | 1 +
flang/test/Driver/driver-help.f90 | 1 +
flang/test/Driver/omp-driver-offload.f90 | 21 +++++++++++++++++++++
5 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/clang/include/clang/Driver/Options.td
b/clang/include/clang/Driver/Options.td
index f745e573eb2686..651aa10150c06e 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -1341,7 +1341,8 @@ def hip_link : Flag<["--"], "hip-link">,
Group<opencl_Group>,
HelpText<"Link clang-offload-bundler bundles for HIP">;
def no_hip_rt: Flag<["-"], "no-hip-rt">, Group<hip_Group>,
HelpText<"Do not link against HIP runtime libraries">;
-def rocm_path_EQ : Joined<["--"], "rocm-path=">, Group<hip_Group>,
+def rocm_path_EQ : Joined<["--"], "rocm-path=">,
+ Visibility<[FlangOption]>, Group<hip_Group>,
HelpText<"ROCm installation path, used for finding and automatically linking
required bitcode libraries.">;
def hip_path_EQ : Joined<["--"], "hip-path=">, Group<hip_Group>,
HelpText<"HIP runtime installation path, used for finding HIP version and
adding HIP include path.">;
diff --git a/clang/lib/Driver/ToolChains/Flang.cpp
b/clang/lib/Driver/ToolChains/Flang.cpp
index 2c83f70eb7887e..75e4ead81e43ed 100644
--- a/clang/lib/Driver/ToolChains/Flang.cpp
+++ b/clang/lib/Driver/ToolChains/Flang.cpp
@@ -342,6 +342,10 @@ void Flang::AddAMDGPUTargetArgs(const ArgList &Args,
StringRef Val = A->getValue();
CmdArgs.push_back(Args.MakeArgString("-mcode-object-version=" + Val));
}
+
+ // Check ROCm path if specified
+ const ToolChain &TC = getToolChain();
+ TC.getDeviceLibs(Args);
}
void Flang::addTargetOptions(const ArgList &Args,
diff --git a/flang/test/Driver/driver-help-hidden.f90
b/flang/test/Driver/driver-help-hidden.f90
index 48f48f5384fdc5..10b15fb454b9aa 100644
--- a/flang/test/Driver/driver-help-hidden.f90
+++ b/flang/test/Driver/driver-help-hidden.f90
@@ -144,6 +144,7 @@
! CHECK-NEXT: -print-target-triple Print the normalized target triple
! CHECK-NEXT: -pthread Support POSIX threads in generated code
! CHECK-NEXT: -P Disable linemarker output in -E mode
+! CHECK-NEXT: --rocm-path=<value> ROCm installation path, used for finding and
automatically linking required bitcode libraries.
! CHECK-NEXT: -Rpass-analysis=<value> Report transformation analysis from
optimization passes whose name matches the given POSIX regular expression
! CHECK-NEXT: -Rpass-missed=<value> Report missed transformations by
optimization passes whose name matches the given POSIX regular expression
! CHECK-NEXT: -Rpass=<value> Report transformations performed by
optimization passes whose name matches the given POSIX regular expression
diff --git a/flang/test/Driver/driver-help.f90
b/flang/test/Driver/driver-help.f90
index 38f74395a678ab..ed5af2a68eb044 100644
--- a/flang/test/Driver/driver-help.f90
+++ b/flang/test/Driver/driver-help.f90
@@ -132,6 +132,7 @@
! HELP-NEXT: -print-target-triple Print the normalized target triple
! HELP-NEXT: -pthread Support POSIX threads in generated code
! HELP-NEXT: -P Disable linemarker output in -E mode
+! HELP-NEXT: --rocm-path=<value> ROCm installation path, used for finding and
automatically linking required bitcode libraries.
! HELP-NEXT: -Rpass-analysis=<value> Report transformation analysis from
optimization passes whose name matches the given POSIX regular expression
! HELP-NEXT: -Rpass-missed=<value> Report missed transformations by
optimization passes whose name matches the given POSIX regular expression
! HELP-NEXT: -Rpass=<value> Report transformations performed by
optimization passes whose name matches the given POSIX regular expression
diff --git a/flang/test/Driver/omp-driver-offload.f90
b/flang/test/Driver/omp-driver-offload.f90
index 7e9a73627cd757..836dcfc85eb9de 100644
--- a/flang/test/Driver/omp-driver-offload.f90
+++ b/flang/test/Driver/omp-driver-offload.f90
@@ -201,3 +201,24 @@
! RUN: -nogpulibc %s 2>&1 \
! RUN: | FileCheck --check-prefix=NO-LIBC-GPU-AMDGPU %s
! NO-LIBC-GPU-AMDGPU-NOT: "-lcgpu-amdgpu"
+
+! RUN: rm -rf %t/Inputs
+
+! RUN: not %flang -### -v --target=x86_64-unknown-linux-gnu -fopenmp \
+! RUN: --offload-arch=gfx900 \
+! RUN: --rocm-path=%t/Inputs/rocm %s 2>&1 \
+! RUN: | FileCheck --check-prefix=ROCM-PATH-NOT-FOUND %s
+! ROCM-PATH-NOT-FOUND: error: cannot find ROCm device library;
+
+! RUN: rm -rf %t/Inputs
+! RUN: mkdir -p %t/Inputs
+! RUN: cp -r %S/../../../clang/test/Driver/Inputs/rocm %t/Inputs
+! RUN: mkdir -p %t/Inputs/rocm/share/hip
+! RUN: mkdir -p %t/Inputs/rocm/hip
+! RUN: mv %t/Inputs/rocm/bin/.hipVersion %t/Inputs/rocm/share/hip/version
+
+! RUN: %flang -### -v --target=x86_64-unknown-linux-gnu -fopenmp \
+! RUN: --offload-arch=gfx900 \
+! RUN: --rocm-path=%t/Inputs/rocm %s 2>&1 \
+! RUN: | FileCheck --check-prefix=ROCM-PATH %s
+! ROCM-PATH: Found HIP installation: {{.*Inputs.*rocm}}, version
3.6.20214-a2917cd
>From 1d0ecee2b09e91cc9ce6f0c79e27357a2c8f58ff Mon Sep 17 00:00:00 2001
From: Dominik Adamski <dominik.adam...@amd.com>
Date: Tue, 9 Apr 2024 15:44:52 -0500
Subject: [PATCH 2/3] Remove extra new line
---
flang/test/Driver/omp-driver-offload.f90 | 1 -
1 file changed, 1 deletion(-)
diff --git a/flang/test/Driver/omp-driver-offload.f90
b/flang/test/Driver/omp-driver-offload.f90
index 836dcfc85eb9de..f3993fdbdb2126 100644
--- a/flang/test/Driver/omp-driver-offload.f90
+++ b/flang/test/Driver/omp-driver-offload.f90
@@ -203,7 +203,6 @@
! NO-LIBC-GPU-AMDGPU-NOT: "-lcgpu-amdgpu"
! RUN: rm -rf %t/Inputs
-
! RUN: not %flang -### -v --target=x86_64-unknown-linux-gnu -fopenmp \
! RUN: --offload-arch=gfx900 \
! RUN: --rocm-path=%t/Inputs/rocm %s 2>&1 \
>From 5b106231ab0f5432ba788035635a0d9d91b22ce0 Mon Sep 17 00:00:00 2001
From: Dominik Adamski <dominik.adam...@amd.com>
Date: Wed, 10 Apr 2024 06:38:01 -0500
Subject: [PATCH 3/3] Applied remarks
---
clang/lib/Driver/ToolChains/Flang.cpp | 8 +++++++-
flang/test/Driver/omp-driver-offload.f90 | 3 +--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/clang/lib/Driver/ToolChains/Flang.cpp
b/clang/lib/Driver/ToolChains/Flang.cpp
index 75e4ead81e43ed..330c90b0ba30f5 100644
--- a/clang/lib/Driver/ToolChains/Flang.cpp
+++ b/clang/lib/Driver/ToolChains/Flang.cpp
@@ -345,7 +345,13 @@ void Flang::AddAMDGPUTargetArgs(const ArgList &Args,
// Check ROCm path if specified
const ToolChain &TC = getToolChain();
- TC.getDeviceLibs(Args);
+ std::string HIPVersion;
+ llvm::raw_string_ostream HIPInfo(HIPVersion);
+ TC.printVerboseInfo(HIPInfo);
+ llvm::StringRef HIPInfoStrRef(HIPInfo.str());
+ if (!HIPInfoStrRef.contains("Found HIP installation") &&
+ !Args.getLastArg(options::OPT_nogpulib))
+ TC.getDriver().Diag(diag::err_drv_no_rocm_device_lib) << 0;
}
void Flang::addTargetOptions(const ArgList &Args,
diff --git a/flang/test/Driver/omp-driver-offload.f90
b/flang/test/Driver/omp-driver-offload.f90
index f3993fdbdb2126..a0ed8e1110a2ec 100644
--- a/flang/test/Driver/omp-driver-offload.f90
+++ b/flang/test/Driver/omp-driver-offload.f90
@@ -202,10 +202,9 @@
! RUN: | FileCheck --check-prefix=NO-LIBC-GPU-AMDGPU %s
! NO-LIBC-GPU-AMDGPU-NOT: "-lcgpu-amdgpu"
-! RUN: rm -rf %t/Inputs
! RUN: not %flang -### -v --target=x86_64-unknown-linux-gnu -fopenmp \
! RUN: --offload-arch=gfx900 \
-! RUN: --rocm-path=%t/Inputs/rocm %s 2>&1 \
+! RUN: --rocm-path=%S/Inputs/rocm %s 2>&1 \
! RUN: | FileCheck --check-prefix=ROCM-PATH-NOT-FOUND %s
! ROCM-PATH-NOT-FOUND: error: cannot find ROCm device library;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
