Skip to content

Commit 770d928

Browse files
authored
[Offload][NFC] Remove 'libomptarget' message helpers (#92581)
Summary: This isn't `libomptarget` anymore, and these messages were always unnecessary because no other project uses these prefixed messages. The effect of this is that no longer will the logs have `LIBOMPTARGET --` in front of everything. We have a message stating when we start building the offload project so it'll still be trivial to find.
1 parent 16bb7e8 commit 770d928

File tree

11 files changed

+27
-46
lines changed

11 files changed

+27
-46
lines changed

offload/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,6 @@ else()
118118
set(LIBOMPTARGET_INTDIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
119119
endif()
120120

121-
# Message utilities.
122-
include(LibomptargetUtils)
123-
124121
# Get dependencies for the different components of the project.
125122
include(LibomptargetGetDependencies)
126123

@@ -146,7 +143,8 @@ set(LIBOMPTARGET_PLUGINS_TO_BUILD "all" CACHE STRING
146143
if(LIBOMPTARGET_PLUGINS_TO_BUILD STREQUAL "all")
147144
set(LIBOMPTARGET_PLUGINS_TO_BUILD ${LIBOMPTARGET_ALL_PLUGIN_TARGETS})
148145
endif()
149-
message("Building with support for ${LIBOMPTARGET_PLUGINS_TO_BUILD} plugins")
146+
message(STATUS "Building the offload library with support for "
147+
"the \"${LIBOMPTARGET_PLUGINS_TO_BUILD}\" plugins")
150148

151149
set(LIBOMPTARGET_ENUM_PLUGIN_TARGETS "")
152150
foreach(plugin IN LISTS LIBOMPTARGET_PLUGINS_TO_BUILD)

offload/DeviceRTL/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ set(LIBOMPTARGET_BUILD_DEVICERTL_BCLIB TRUE CACHE BOOL
22
"Can be set to false to disable building this library.")
33

44
if (NOT LIBOMPTARGET_BUILD_DEVICERTL_BCLIB)
5-
libomptarget_say("Not building DeviceRTL: Disabled by LIBOMPTARGET_BUILD_DEVICERTL_BCLIB")
5+
message(STATUS "Not building DeviceRTL: Disabled by LIBOMPTARGET_BUILD_DEVICERTL_BCLIB")
66
return()
77
endif()
88

99
# Check to ensure the host system is a supported host architecture.
1010
if(NOT ${CMAKE_SIZEOF_VOID_P} EQUAL "8")
11-
libomptarget_say("Not building DeviceRTL: Runtime does not support 32-bit hosts")
11+
message(STATUS "Not building DeviceRTL: Runtime does not support 32-bit hosts")
1212
return()
1313
endif()
1414

@@ -20,10 +20,10 @@ if (LLVM_DIR)
2020
find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)
2121
find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)
2222
if ((NOT CLANG_TOOL) OR (NOT LINK_TOOL) OR (NOT OPT_TOOL) OR (NOT PACKAGER_TOOL))
23-
libomptarget_say("Not building DeviceRTL. Missing clang: ${CLANG_TOOL}, llvm-link: ${LINK_TOOL}, opt: ${OPT_TOOL}, or clang-offload-packager: ${PACKAGER_TOOL}")
23+
message(STATUS "Not building DeviceRTL. Missing clang: ${CLANG_TOOL}, llvm-link: ${LINK_TOOL}, opt: ${OPT_TOOL}, or clang-offload-packager: ${PACKAGER_TOOL}")
2424
return()
2525
else()
26-
libomptarget_say("Building DeviceRTL. Using clang: ${CLANG_TOOL}, llvm-link: ${LINK_TOOL} and opt: ${OPT_TOOL}")
26+
message(STATUS "Building DeviceRTL. Using clang: ${CLANG_TOOL}, llvm-link: ${LINK_TOOL} and opt: ${OPT_TOOL}")
2727
endif()
2828
elseif (LLVM_TOOL_CLANG_BUILD AND NOT CMAKE_CROSSCOMPILING AND NOT OPENMP_STANDALONE_BUILD)
2929
# LLVM in-tree builds may use CMake target names to discover the tools.
@@ -32,9 +32,9 @@ elseif (LLVM_TOOL_CLANG_BUILD AND NOT CMAKE_CROSSCOMPILING AND NOT OPENMP_STANDA
3232
set(PACKAGER_TOOL $<TARGET_FILE:clang-offload-packager>)
3333
set(LINK_TOOL $<TARGET_FILE:llvm-link>)
3434
set(OPT_TOOL $<TARGET_FILE:opt>)
35-
libomptarget_say("Building DeviceRTL. Using clang from in-tree build")
35+
message(STATUS "Building DeviceRTL. Using clang from in-tree build")
3636
else()
37-
libomptarget_say("Not building DeviceRTL. No appropriate clang found")
37+
message(STATUS "Not building DeviceRTL. No appropriate clang found")
3838
return()
3939
endif()
4040

offload/cmake/Modules/LibomptargetUtils.cmake

Lines changed: 0 additions & 17 deletions
This file was deleted.

offload/plugins-nextgen/amdgpu/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
find_package(hsa-runtime64 QUIET 1.2.0 HINTS ${CMAKE_INSTALL_PREFIX} PATHS /opt/rocm)
33

44
if(NOT (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(ppc64le)|(aarch64)$" AND CMAKE_SYSTEM_NAME MATCHES "Linux"))
5-
libomptarget_say("Not building AMDGPU NextGen plugin: only support AMDGPU in Linux x86_64, ppc64le, or aarch64 hosts")
5+
message(STATUS "Not building AMDGPU NextGen plugin: only support AMDGPU in Linux x86_64, ppc64le, or aarch64 hosts")
66
return()
77
endif()
88

@@ -15,10 +15,10 @@ target_include_directories(omptarget.rtl.amdgpu PRIVATE
1515

1616
option(LIBOMPTARGET_FORCE_DLOPEN_LIBHSA "Build with dlopened libhsa" OFF)
1717
if(hsa-runtime64_FOUND AND NOT LIBOMPTARGET_FORCE_DLOPEN_LIBHSA)
18-
libomptarget_say("Building AMDGPU plugin linked against libhsa")
18+
message(STATUS "Building AMDGPU plugin linked against libhsa")
1919
target_link_libraries(omptarget.rtl.amdgpu PRIVATE hsa-runtime64::hsa-runtime64)
2020
else()
21-
libomptarget_say("Building AMDGPU plugin for dlopened libhsa")
21+
message(STATUS "Building AMDGPU plugin for dlopened libhsa")
2222
target_include_directories(omptarget.rtl.amdgpu PRIVATE dynamic_hsa)
2323
target_sources(omptarget.rtl.amdgpu PRIVATE dynamic_hsa/hsa.cpp)
2424
endif()
@@ -33,6 +33,6 @@ if (LIBOMPTARGET_FOUND_AMDGPU_GPU OR LIBOMPTARGET_FORCE_AMDGPU_TESTS)
3333
list(APPEND LIBOMPTARGET_TESTED_PLUGINS "omptarget.rtl.amdgpu")
3434
set(LIBOMPTARGET_TESTED_PLUGINS "${LIBOMPTARGET_TESTED_PLUGINS}" PARENT_SCOPE)
3535
else()
36-
libomptarget_say("Not generating AMDGPU tests, no supported devices detected."
36+
message(STATUS "Not generating AMDGPU tests, no supported devices detected."
3737
" Use 'LIBOMPTARGET_FORCE_AMDGPU_TESTS' to override.")
3838
endif()
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
if (NOT (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(ppc64le)|(aarch64)$" AND CMAKE_SYSTEM_NAME MATCHES "Linux"))
2-
libomptarget_say("Not building CUDA NextGen offloading plugin: only support CUDA in Linux x86_64, ppc64le, or aarch64 hosts.")
2+
message(STATUS "Not building CUDA NextGen offloading plugin: only support CUDA in Linux x86_64, ppc64le, or aarch64 hosts.")
33
return()
44
endif()
55

6-
libomptarget_say("Building CUDA NextGen offloading plugin.")
6+
message(STATUS "Building CUDA NextGen offloading plugin.")
77

88
# Create the library and add the default arguments.
99
add_target_library(omptarget.rtl.cuda CUDA)
@@ -12,10 +12,10 @@ target_sources(omptarget.rtl.cuda PRIVATE src/rtl.cpp)
1212

1313
option(LIBOMPTARGET_FORCE_DLOPEN_LIBCUDA "Build with dlopened libcuda" OFF)
1414
if(LIBOMPTARGET_DEP_CUDA_FOUND AND NOT LIBOMPTARGET_FORCE_DLOPEN_LIBCUDA)
15-
libomptarget_say("Building CUDA plugin linked against libcuda")
15+
message(STATUS "Building CUDA plugin linked against libcuda")
1616
target_link_libraries(omptarget.rtl.cuda PRIVATE CUDA::cuda_driver)
1717
else()
18-
libomptarget_say("Building CUDA plugin for dlopened libcuda")
18+
message(STATUS "Building CUDA plugin for dlopened libcuda")
1919
target_include_directories(omptarget.rtl.cuda PRIVATE dynamic_cuda)
2020
target_sources(omptarget.rtl.cuda PRIVATE dynamic_cuda/cuda.cpp)
2121
endif()
@@ -24,12 +24,12 @@ endif()
2424
# functional NVIDIA GPU on the system, or if manually specifies by the user.
2525
option(LIBOMPTARGET_FORCE_NVIDIA_TESTS "Build NVIDIA libomptarget tests" OFF)
2626
if (LIBOMPTARGET_FOUND_NVIDIA_GPU OR LIBOMPTARGET_FORCE_NVIDIA_TESTS)
27-
libomptarget_say("Enable tests using CUDA plugin")
27+
message(STATUS "Enable tests using CUDA plugin")
2828
set(LIBOMPTARGET_SYSTEM_TARGETS
2929
"${LIBOMPTARGET_SYSTEM_TARGETS} nvptx64-nvidia-cuda nvptx64-nvidia-cuda-LTO" PARENT_SCOPE)
3030
list(APPEND LIBOMPTARGET_TESTED_PLUGINS "omptarget.rtl.cuda")
3131
set(LIBOMPTARGET_TESTED_PLUGINS "${LIBOMPTARGET_TESTED_PLUGINS}" PARENT_SCOPE)
3232
else()
33-
libomptarget_say("Not generating NVIDIA tests, no supported devices detected."
33+
message(STATUS "Not generating NVIDIA tests, no supported devices detected."
3434
" Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.")
3535
endif()

offload/plugins-nextgen/host/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ endif()
44

55
set(supported_targets x86_64 aarch64 ppc64 ppc64le s390x)
66
if(NOT ${CMAKE_SYSTEM_PROCESSOR} IN_LIST supported_targets)
7-
libomptarget_say("Not building ${machine} NextGen offloading plugin")
7+
message(STATUS "Not building ${machine} NextGen offloading plugin")
88
return()
99
endif()
1010

@@ -19,14 +19,14 @@ add_target_library(omptarget.rtl.host ${machine})
1919
target_sources(omptarget.rtl.host PRIVATE src/rtl.cpp)
2020

2121
if(LIBOMPTARGET_DEP_LIBFFI_FOUND)
22-
libomptarget_say("Building ${machine} plugin linked with libffi")
22+
message(STATUS "Building ${machine} plugin linked with libffi")
2323
if(FFI_STATIC_LIBRARIES)
2424
target_link_libraries(omptarget.rtl.host PRIVATE FFI::ffi_static)
2525
else()
2626
target_link_libraries(omptarget.rtl.host PRIVATE FFI::ffi)
2727
endif()
2828
else()
29-
libomptarget_say("Building ${machine} plugin for dlopened libffi")
29+
message(STATUS "Building ${machine} plugin for dlopened libffi")
3030
target_sources(omptarget.rtl.host PRIVATE dynamic_ffi/ffi.cpp)
3131
target_include_directories(omptarget.rtl.host PRIVATE dynamic_ffi)
3232
endif()
@@ -39,7 +39,7 @@ if(LIBOMPTARGET_DEP_LIBFFI_FOUND)
3939
set(LIBOMPTARGET_TESTED_PLUGINS
4040
"${LIBOMPTARGET_TESTED_PLUGINS}" PARENT_SCOPE)
4141
else()
42-
libomptarget_say("Not generating ${tmachine_name} tests. LibFFI not found.")
42+
message(STATUS "Not generating ${tmachine_name} tests. LibFFI not found.")
4343
endif()
4444

4545
# Define the target specific triples and ELF machine values.

offload/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
libomptarget_say("Building offloading runtime library libomptarget.")
1+
message(STATUS "Building offloading runtime library libomptarget.")
22

33
if(LIBOMP_STANDALONE)
44
set(LIBOMP ${LIBOMP_STANDALONE})

offload/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# CMakeLists.txt file for unit testing OpenMP offloading runtime library.
22
if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
33
CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0.0)
4-
libomptarget_say("Can only test with Clang compiler in version 6.0.0 or later.")
4+
message(STATUS "Can only test with Clang compiler in version 6.0.0 or later.")
55
libomptarget_warning_say("The check-libomptarget target will not be available!")
66
return()
77
endif()

offload/tools/deviceinfo/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
libomptarget_say("Building the llvm-omp-device-info tool")
1+
message(STATUS "Building the llvm-omp-device-info tool")
22

33
add_openmp_tool(llvm-omp-device-info llvm-omp-device-info.cpp)
44

offload/tools/kernelreplay/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
libomptarget_say("Building the llvm-omp-kernel-replay tool")
1+
message(STATUS "Building the llvm-omp-kernel-replay tool")
22

33
add_openmp_tool(llvm-omp-kernel-replay llvm-omp-kernel-replay.cpp)
44

offload/unittests/Plugins/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set(PLUGINS_TEST_SOURCES NextgenPluginsTest.cpp)
33
set(PLUGINS_TEST_INCLUDE ${LIBOMPTARGET_INCLUDE_DIR})
44

55
foreach(PLUGIN IN LISTS LIBOMPTARGET_TESTED_PLUGINS)
6-
libomptarget_say("Building plugin unit tests for ${PLUGIN}")
6+
message(STATUS "Building plugin unit tests for ${PLUGIN}")
77
add_libompt_unittest("${PLUGIN}.unittests" ${PLUGINS_TEST_SOURCES})
88
add_dependencies("${PLUGIN}.unittests" ${PLUGINS_TEST_COMMON} ${PLUGIN})
99
target_link_libraries("${PLUGIN}.unittests" PRIVATE ${PLUGINS_TEST_COMMON} ${PLUGIN})

0 commit comments

Comments
 (0)