JonChesterfield created this revision.
JonChesterfield added reviewers: jdoerfert, pdhaliwal, ronlieb, grokos,
tianshilei1992.
Herald added subscribers: guansong, yaxunl.
JonChesterfield requested review of this revision.
Herald added subscribers: cfe-commits, sstefan1.
Herald added a project: clang.
[clang] Search runtimes build tree for openmp runtime
D96248 <https://reviews.llvm.org/D96248> added support for finding the openmp
devicertl bitcode in the clang
lib directory where it is installed, or in the LIBRARY_PATH environment.
When testing openmp from a build using ENABLE_RUNTIMES, the corresponding
bitcode may be found under runtimes/runtimes-bins. This patch adds that to
the list of places clang looks, at lower priority then the others.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D101935
Files:
clang/lib/Driver/ToolChains/CommonArgs.cpp
Index: clang/lib/Driver/ToolChains/CommonArgs.cpp
===================================================================
--- clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -1686,6 +1686,12 @@
llvm::sys::path::append(DefaultLibPath, Twine("lib") + CLANG_LIBDIR_SUFFIX);
LibraryPaths.emplace_back(DefaultLibPath.c_str());
+ // Add path to runtimes binary folder, used by ENABLE_RUNTIMES build
+ SmallString<256> RuntimesBinPath = llvm::sys::path::parent_path(D.Dir);
+ llvm::sys::path::append(RuntimesBinPath,
+ "runtimes/runtimes-bins/openmp/libomptarget");
+ LibraryPaths.emplace_back(RuntimesBinPath.c_str());
+
OptSpecifier LibomptargetBCPathOpt =
Triple.isAMDGCN() ? options::OPT_libomptarget_amdgcn_bc_path_EQ
: options::OPT_libomptarget_nvptx_bc_path_EQ;
Index: clang/lib/Driver/ToolChains/CommonArgs.cpp
===================================================================
--- clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -1686,6 +1686,12 @@
llvm::sys::path::append(DefaultLibPath, Twine("lib") + CLANG_LIBDIR_SUFFIX);
LibraryPaths.emplace_back(DefaultLibPath.c_str());
+ // Add path to runtimes binary folder, used by ENABLE_RUNTIMES build
+ SmallString<256> RuntimesBinPath = llvm::sys::path::parent_path(D.Dir);
+ llvm::sys::path::append(RuntimesBinPath,
+ "runtimes/runtimes-bins/openmp/libomptarget");
+ LibraryPaths.emplace_back(RuntimesBinPath.c_str());
+
OptSpecifier LibomptargetBCPathOpt =
Triple.isAMDGCN() ? options::OPT_libomptarget_amdgcn_bc_path_EQ
: options::OPT_libomptarget_nvptx_bc_path_EQ;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
