[Openmp-commits] [PATCH] D107177: [OpenMP] Fixing llvm-omp-device-info compilation with runtimes

[Jose Manuel Monsalve Diaz via Phabricator via Openmp-commits]

josemonsalve2 created this revision.
josemonsalve2 added reviewers: jdoerfert, jhuber6, JonChesterfield, tianshilei1992.
Herald added subscribers: guansong, yaxunl, mgorny.
josemonsalve2 requested review of this revision.
Herald added subscribers: llvm-commits, openmp-commits, sstefan1.
Herald added projects: OpenMP, LLVM.

When using `-DLLVM_ENABLED_RUNTIMES` instead of `-DLLVM_ENABLED_PROJECTS`
the `llvm-omp-device-info` tool is not compiled or installed.
In general, no llvm tool would be build on runtimes, because the
-DLLVM_BUILD_TOOLS flag is removed by the way runtimes compilation calls
cmake again.

This patch is simple. Just forward the value of this flag to the
runtime cmake command.

I'm also removing an unnecessary comment in the compilation of the tool


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D107177

Files:
  llvm/runtimes/CMakeLists.txt
  openmp/libomptarget/tools/deviceinfo/CMakeLists.txt


Index: openmp/libomptarget/tools/deviceinfo/CMakeLists.txt
===================================================================
--- openmp/libomptarget/tools/deviceinfo/CMakeLists.txt
+++ openmp/libomptarget/tools/deviceinfo/CMakeLists.txt
@@ -11,7 +11,6 @@
 ##===----------------------------------------------------------------------===##
 
 libomptarget_say("Building the llvm-omp-device-info tool")
-libomptarget_say("llvm-omp-device-info using plugins ${LIBOMPTARGET_TESTED_PLUGINS}")
 
 add_llvm_tool(llvm-omp-device-info llvm-omp-device-info.cpp)
 
Index: llvm/runtimes/CMakeLists.txt
===================================================================
--- llvm/runtimes/CMakeLists.txt
+++ llvm/runtimes/CMakeLists.txt
@@ -232,6 +232,7 @@
                                       -DLLVM_DEFAULT_TARGET_TRIPLE=${TARGET_TRIPLE}
                                       -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED}
                                       -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR_default}
+                                      -DLLVM_BUILD_TOOLS=${LLVM_BUILD_TOOLS}
                                       -DCMAKE_C_COMPILER_WORKS=ON
                                       -DCMAKE_CXX_COMPILER_WORKS=ON
                                       -DCMAKE_ASM_COMPILER_WORKS=ON


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D107177.363124.patch
Type: text/x-patch
Size: 1330 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20210730/278aa304/attachment-0001.bin>