This is an archive of the discontinued LLVM Phabricator instance.

Differential D143017

[Libomptarget] Fix disabling amdgpu on non-Linux.
ClosedPublic

Authored by sthibaul on Jan 31 2023, 2:10 PM.

Details

Reviewers
jhuber6
JonChesterfield
jdoerfert
Commits
rG71fb11ff3469: [Libomptarget] Fix disabling amdgpu on non-Linux.
Summary

Previously, on non-Linux, amdgpu would get enabled whatever the CPU architecture.

Diff Detail

Event Timeline

sthibaul created this revision.Jan 31 2023, 2:10 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 31 2023, 2:10 PM
Herald added subscribers: kosarev, kerbowa, tpr and 4 others. · View Herald Transcript
sthibaul requested review of this revision.Jan 31 2023, 2:10 PM
Herald added a reviewer: jdoerfert. · View Herald TranscriptJan 31 2023, 2:10 PM
Herald added subscribers: sstefan1, wdng. · View Herald Transcript
sthibaul added a comment.Jan 31 2023, 2:11 PM

(This apparently dates back up to llvm 15)

jhuber6 accepted this revision.Jan 31 2023, 2:12 PM

Didn't know we even attempted to build libomptarget on non-Linux yet. Maybe some day we'll have it working on Windows.

This revision is now accepted and ready to land.Jan 31 2023, 2:12 PM
Harbormaster completed remote builds in B211071: Diff 493730.Jan 31 2023, 2:23 PM
sthibaul added a comment.Feb 4 2023, 5:38 AM

FI I don't have commit access

jhuber6 added a comment.Feb 4 2023, 5:41 AM
In D143017#4104215, @sthibaul wrote:

FI I don't have commit access

What's your github email.

sthibaul added a comment.Feb 4 2023, 5:42 AM

I'm samuel.thibault@ens-lyon.org there

Closed by commit rG71fb11ff3469: [Libomptarget] Fix disabling amdgpu on non-Linux. (authored by sthibaul, committed by jhuber6). · Explain WhyFeb 4 2023, 5:45 AM
This revision was automatically updated to reflect the committed changes.
jhuber6 added a commit: rG71fb11ff3469: [Libomptarget] Fix disabling amdgpu on non-Linux..
Herald added a project: Restricted Project. · View Herald TranscriptFeb 4 2023, 5:45 AM
Herald added a subscriber: openmp-commits. · View Herald Transcript

Revision Contents

PathSize
openmp/
libomptarget/
plugins-nextgen/
amdgpu/
2 lines
cuda/
2 lines
plugins/
cuda/
2 lines

Diff 494817

openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt

Show All 16 Lines
if (NOT LIBOMPTARGET_BUILD_AMDGPU_PLUGIN) if (NOT LIBOMPTARGET_BUILD_AMDGPU_PLUGIN)
libomptarget_say("Not building AMDGPU NextGen offloading plugin: LIBOMPTARGET_BUILD_AMDGPU_PLUGIN is false") libomptarget_say("Not building AMDGPU NextGen offloading plugin: LIBOMPTARGET_BUILD_AMDGPU_PLUGIN is false")
return() return()
endif() endif()
# as of rocm-3.7, hsa is installed with cmake packages and kmt is found via hsa # as of rocm-3.7, hsa is installed with cmake packages and kmt is found via hsa
find_package(hsa-runtime64 QUIET 1.2.0 HINTS ${CMAKE_INSTALL_PREFIX} PATHS /opt/rocm) find_package(hsa-runtime64 QUIET 1.2.0 HINTS ${CMAKE_INSTALL_PREFIX} PATHS /opt/rocm)
if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(ppc64le)|(aarch64)$" AND CMAKE_SYSTEM_NAME MATCHES "Linux") if(NOT (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(ppc64le)|(aarch64)$" AND CMAKE_SYSTEM_NAME MATCHES "Linux"))
libomptarget_say("Not building AMDGPU NextGen plugin: only support AMDGPU in Linux x86_64, ppc64le, or aarch64 hosts") libomptarget_say("Not building AMDGPU NextGen plugin: only support AMDGPU in Linux x86_64, ppc64le, or aarch64 hosts")
return() return()
endif() endif()
################################################################################ ################################################################################
# Define the suffix for the runtime messaging dumps. # Define the suffix for the runtime messaging dumps.
add_definitions(-DTARGET_NAME=AMDGPU) add_definitions(-DTARGET_NAME=AMDGPU)
▲ Show 20 Lines • Show All 74 Lines • Show Last 20 Lines

openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt

Show All 10 Lines
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
set(LIBOMPTARGET_BUILD_CUDA_PLUGIN TRUE CACHE BOOL set(LIBOMPTARGET_BUILD_CUDA_PLUGIN TRUE CACHE BOOL
"Whether to build CUDA plugin") "Whether to build CUDA plugin")
if (NOT LIBOMPTARGET_BUILD_CUDA_PLUGIN) if (NOT LIBOMPTARGET_BUILD_CUDA_PLUGIN)
libomptarget_say("Not building CUDA NextGen offloading plugin: LIBOMPTARGET_BUILD_CUDA_PLUGIN is false") libomptarget_say("Not building CUDA NextGen offloading plugin: LIBOMPTARGET_BUILD_CUDA_PLUGIN is false")
return() return()
endif() endif()
if (NOT(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(ppc64le)|(aarch64)$" AND CMAKE_SYSTEM_NAME MATCHES "Linux")) if (NOT (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(ppc64le)|(aarch64)$" AND CMAKE_SYSTEM_NAME MATCHES "Linux"))
libomptarget_say("Not building CUDA NextGen offloading plugin: only support CUDA in Linux x86_64, ppc64le, or aarch64 hosts.") libomptarget_say("Not building CUDA NextGen offloading plugin: only support CUDA in Linux x86_64, ppc64le, or aarch64 hosts.")
return() return()
endif() endif()
libomptarget_say("Building CUDA NextGen offloading plugin.") libomptarget_say("Building CUDA NextGen offloading plugin.")
set(LIBOMPTARGET_DLOPEN_LIBCUDA OFF) set(LIBOMPTARGET_DLOPEN_LIBCUDA OFF)
option(LIBOMPTARGET_FORCE_DLOPEN_LIBCUDA "Build with dlopened libcuda" ${LIBOMPTARGET_DLOPEN_LIBCUDA}) option(LIBOMPTARGET_FORCE_DLOPEN_LIBCUDA "Build with dlopened libcuda" ${LIBOMPTARGET_DLOPEN_LIBCUDA})
Show All 40 Lines

openmp/libomptarget/plugins/cuda/CMakeLists.txt

Show All 10 Lines
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
set(LIBOMPTARGET_BUILD_CUDA_PLUGIN TRUE CACHE BOOL set(LIBOMPTARGET_BUILD_CUDA_PLUGIN TRUE CACHE BOOL
"Whether to build CUDA plugin") "Whether to build CUDA plugin")
if (NOT LIBOMPTARGET_BUILD_CUDA_PLUGIN) if (NOT LIBOMPTARGET_BUILD_CUDA_PLUGIN)
libomptarget_say("Not building CUDA offloading plugin: LIBOMPTARGET_BUILD_CUDA_PLUGIN is false") libomptarget_say("Not building CUDA offloading plugin: LIBOMPTARGET_BUILD_CUDA_PLUGIN is false")
return() return()
endif() endif()
if (NOT(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(ppc64le)|(aarch64)$" AND CMAKE_SYSTEM_NAME MATCHES "Linux")) if (NOT (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(ppc64le)|(aarch64)$" AND CMAKE_SYSTEM_NAME MATCHES "Linux"))
libomptarget_say("Not building CUDA offloading plugin: only support CUDA in Linux x86_64, ppc64le, or aarch64 hosts.") libomptarget_say("Not building CUDA offloading plugin: only support CUDA in Linux x86_64, ppc64le, or aarch64 hosts.")
return() return()
endif() endif()
libomptarget_say("Building CUDA offloading plugin.") libomptarget_say("Building CUDA offloading plugin.")
set(LIBOMPTARGET_DLOPEN_LIBCUDA OFF) set(LIBOMPTARGET_DLOPEN_LIBCUDA OFF)
option(LIBOMPTARGET_FORCE_DLOPEN_LIBCUDA "Build with dlopened libcuda" ${LIBOMPTARGET_DLOPEN_LIBCUDA}) option(LIBOMPTARGET_FORCE_DLOPEN_LIBCUDA "Build with dlopened libcuda" ${LIBOMPTARGET_DLOPEN_LIBCUDA})
▲ Show 20 Lines • Show All 50 Lines • Show Last 20 Lines