https://github.com/sarnex created
https://github.com/llvm/llvm-project/pull/141855
None
>From 18e18ca675a38ef6bf34a4450291ed9ebc85eb66 Mon Sep 17 00:00:00 2001
From: "Sarnie, Nick" <nick.sar...@intel.com>
Date: Wed, 28 May 2025 14:00:46 -0700
Subject: [PATCH] [clang][Driver][OpenMP][SPIR-V] Fix SPIR-V OpenMP DeviceRTL
expected file name
Signed-off-by: Sarnie, Nick <nick.sar...@intel.com>
---
clang/lib/Driver/ToolChains/CommonArgs.cpp | 2 +-
.../lib/{libomptarget-spirv64.bc => libomptarget-spirv.bc} | 0
clang/test/Driver/spirv-openmp-toolchain.c | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename clang/test/Driver/Inputs/spirv-openmp/lib/{libomptarget-spirv64.bc =>
libomptarget-spirv.bc} (100%)
diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp
b/clang/lib/Driver/ToolChains/CommonArgs.cpp
index 60db462d87342..937ee09cac7cc 100644
--- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -2811,7 +2811,7 @@ void tools::addOpenMPDeviceRTL(const Driver &D,
StringRef ArchPrefix = Triple.isAMDGCN() ? "amdgpu"
: Triple.isNVPTX() ? "nvptx"
- : "spirv64";
+ : "spirv";
std::string LibOmpTargetName = ("libomptarget-" + ArchPrefix + ".bc").str();
// First check whether user specifies bc library
diff --git a/clang/test/Driver/Inputs/spirv-openmp/lib/libomptarget-spirv64.bc
b/clang/test/Driver/Inputs/spirv-openmp/lib/libomptarget-spirv.bc
similarity index 100%
rename from clang/test/Driver/Inputs/spirv-openmp/lib/libomptarget-spirv64.bc
rename to clang/test/Driver/Inputs/spirv-openmp/lib/libomptarget-spirv.bc
diff --git a/clang/test/Driver/spirv-openmp-toolchain.c
b/clang/test/Driver/spirv-openmp-toolchain.c
index 3fd6d94a1222b..a61f3bc2399eb 100644
--- a/clang/test/Driver/spirv-openmp-toolchain.c
+++ b/clang/test/Driver/spirv-openmp-toolchain.c
@@ -54,7 +54,7 @@
// RUN: %clang -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp
-fopenmp-targets=spirv64-intel \
// RUN: --sysroot=%S/Inputs/spirv-openmp/ %s 2>&1 | FileCheck
--check-prefix=CHECK-GPULIB %s
-// CHECK-GPULIB: "-cc1" "-triple"
"spirv64-intel"{{.*}}"-mlink-builtin-bitcode" "{{.*}}libomptarget-spirv64.bc"
+// CHECK-GPULIB: "-cc1" "-triple"
"spirv64-intel"{{.*}}"-mlink-builtin-bitcode" "{{.*}}libomptarget-spirv.bc"
// RUN: not %clang -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp
--offload-arch=spirv64-intel \
// RUN: --libomptarget-spirv-bc-path=%t/ -nogpulib %s 2>&1 \
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
