This is an archive of the discontinued LLVM Phabricator instance.

Differential D118268

[openmp] Disable build of old runtimes by default
ClosedPublic

Authored by JonChesterfield on Jan 26 2022, 9:44 AM.

Details

Reviewers
ronlieb
jdoerfert
Commits
rGe08f3bfe587d: [openmp] Disable build of old runtimes by default
Summary

The old runtime is not tested by CI. Disable the build prior to the llvm-14 branch.

Diff Detail

Event Timeline

JonChesterfield created this revision.Jan 26 2022, 9:44 AM
Herald added subscribers: asavonic, guansong, yaxunl and 2 others. · View Herald TranscriptJan 26 2022, 9:44 AM
JonChesterfield requested review of this revision.Jan 26 2022, 9:44 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 26 2022, 9:44 AM
Herald added subscribers: openmp-commits, sstefan1. · View Herald Transcript
grokos added a subscriber: grokos.Jan 26 2022, 9:48 AM
grokos added inline comments.
openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt
14

to enable

jdoerfert accepted this revision.Jan 26 2022, 10:01 AM

LG, see the nit by George

This revision is now accepted and ready to land.Jan 26 2022, 10:01 AM
JonChesterfield updated this revision to Diff 403344.Jan 26 2022, 11:16 AM
  • fix nit
This revision was landed with ongoing or failed builds.Jan 26 2022, 11:17 AM
Closed by commit rGe08f3bfe587d: [openmp] Disable build of old runtimes by default (authored by JonChesterfield). · Explain Why
This revision was automatically updated to reflect the committed changes.
JonChesterfield added a commit: rGe08f3bfe587d: [openmp] Disable build of old runtimes by default.
Harbormaster completed remote builds in B145806: Diff 403344.Jan 27 2022, 4:37 AM
ye-luo mentioned this in D118522: [OpenMP] disable build of old nvptx device runtime.Jan 28 2022, 5:53 PM
ye-luo mentioned this in rGbafb6f3e9cc7: [OpenMP] disable build of old nvptx device runtime.Jan 28 2022, 7:26 PM

Revision Contents

PathSize
openmp/
libomptarget/
deviceRTLs/
amdgcn/
4 lines
nvptx/
2 lines
plugins/
cuda/
2 lines

Diff 403345

openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt

##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
# #
# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
# See https://llvm.org/LICENSE.txt for license information. # See https://llvm.org/LICENSE.txt for license information.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
# #
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
# #
# Build the AMDGCN Device RTL bitcode library using clang -ffreestanding # Build the AMDGCN Device RTL bitcode library using clang -ffreestanding
# #
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
set(LIBOMPTARGET_BUILD_AMDGCN_BCLIB TRUE CACHE BOOL set(LIBOMPTARGET_BUILD_AMDGCN_BCLIB FALSE CACHE BOOL
"Can be set to false to disable building this library.") "Can be set to true to enable building this library.")
grokosUnsubmitted
Not Done
ReplyInline Actions

to enable

grokos: to enable
if (NOT LIBOMPTARGET_BUILD_AMDGCN_BCLIB) if (NOT LIBOMPTARGET_BUILD_AMDGCN_BCLIB)
libomptarget_say("Not building AMDGCN device RTL: Disabled by LIBOMPTARGET_BUILD_AMDGCN_BCLIB") libomptarget_say("Not building AMDGCN device RTL: Disabled by LIBOMPTARGET_BUILD_AMDGCN_BCLIB")
return() return()
endif() endif()
if (NOT LIBOMPTARGET_LLVM_INCLUDE_DIRS) if (NOT LIBOMPTARGET_LLVM_INCLUDE_DIRS)
libomptarget_say("Not building AMDGCN device RTL: Missing definition for LIBOMPTARGET_LLVM_INCLUDE_DIRS") libomptarget_say("Not building AMDGCN device RTL: Missing definition for LIBOMPTARGET_LLVM_INCLUDE_DIRS")
▲ Show 20 Lines • Show All 171 Lines • Show Last 20 Lines

openmp/libomptarget/deviceRTLs/nvptx/CMakeLists.txt

##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
# #
# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
# See https://llvm.org/LICENSE.txt for license information. # See https://llvm.org/LICENSE.txt for license information.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
# #
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
# #
# Build the NVPTX (CUDA) Device RTL if the CUDA tools are available # Build the NVPTX (CUDA) Device RTL if the CUDA tools are available
# #
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
# By default we will build NVPTX deviceRTL on a CUDA free system # By default we will build NVPTX deviceRTL on a CUDA free system
set(LIBOMPTARGET_BUILD_NVPTX_BCLIB TRUE CACHE BOOL set(LIBOMPTARGET_BUILD_NVPTX_BCLIB FALSE CACHE BOOL
"Whether build NVPTX deviceRTL on CUDA free system.") "Whether build NVPTX deviceRTL on CUDA free system.")
if (NOT (LIBOMPTARGET_DEP_CUDA_FOUND OR LIBOMPTARGET_BUILD_NVPTX_BCLIB)) if (NOT (LIBOMPTARGET_DEP_CUDA_FOUND OR LIBOMPTARGET_BUILD_NVPTX_BCLIB))
libomptarget_say("Not building NVPTX deviceRTL by default on CUDA free system.") libomptarget_say("Not building NVPTX deviceRTL by default on CUDA free system.")
return() return()
endif() endif()
if (NOT LIBOMPTARGET_LLVM_INCLUDE_DIRS) if (NOT LIBOMPTARGET_LLVM_INCLUDE_DIRS)
▲ Show 20 Lines • Show All 235 Lines • Show Last 20 Lines

openmp/libomptarget/plugins/cuda/CMakeLists.txt

Show First 20 Lines • Show All 66 Lines • ▼ Show 20 Linestarget_link_libraries(omptarget.rtl.cuda
"-Wl,-z,defs") "-Wl,-z,defs")
# Report to the parent scope that we are building a plugin for CUDA. # Report to the parent scope that we are building a plugin for CUDA.
# This controls whether tests are run for the nvptx offloading target # This controls whether tests are run for the nvptx offloading target
# Run them if libcuda is available, or if the user explicitly asked for dlopen # Run them if libcuda is available, or if the user explicitly asked for dlopen
# Otherwise this plugin is being built speculatively and there may be no cuda available # Otherwise this plugin is being built speculatively and there may be no cuda available
if (LIBOMPTARGET_CAN_LINK_LIBCUDA OR LIBOMPTARGET_FORCE_DLOPEN_LIBCUDA) if (LIBOMPTARGET_CAN_LINK_LIBCUDA OR LIBOMPTARGET_FORCE_DLOPEN_LIBCUDA)
libomptarget_say("Enable tests using CUDA plugin") libomptarget_say("Enable tests using CUDA plugin")
set(LIBOMPTARGET_SYSTEM_TARGETS "${LIBOMPTARGET_SYSTEM_TARGETS} nvptx64-nvidia-cuda nvptx64-nvidia-cuda-newRTL" PARENT_SCOPE) set(LIBOMPTARGET_SYSTEM_TARGETS "${LIBOMPTARGET_SYSTEM_TARGETS} nvptx64-nvidia-cuda-newRTL" PARENT_SCOPE)
else() else()
libomptarget_say("Disabling tests using CUDA plugin as cuda may not be available") libomptarget_say("Disabling tests using CUDA plugin as cuda may not be available")
endif() endif()