This is an archive of the discontinued LLVM Phabricator instance.

Paths

Table of Contentst

-
llvm/runtimes/
-
runtimes/
2/3
CMakeLists.txt

Differential D147654

[OpenMP] Add tool dependencies in runtimes mode
ClosedPublic

Authored by jhuber6 on Apr 5 2023, 12:27 PM.

Download Raw Diff

Details

Reviewers

tra
jdoerfert
ye-luo
tianshilei1992
JonChesterfield

Commits

rGf5459fc03120: [OpenMP] Add tool dependencies in runtimes mode

Summary

The OpenMP offloading device runtime depends on multiple tools. We
should ensure that these tools are build before invoking the OpenMP
build.

Diff Detail

Repository: rG LLVM Github Monorepo

Unit TestsFailed

	Time	Test
	60,070 ms	x64 debian > MLIR.Examples/standalone::test.toy

Event Timeline

jhuber6 created this revision.Apr 5 2023, 12:27 PM

Herald added a project: Restricted Project. · View Herald TranscriptApr 5 2023, 12:27 PM

Herald added subscribers: sunshaoce, guansong, yaxunl. · View Herald Transcript

jhuber6 requested review of this revision.Apr 5 2023, 12:27 PM

Herald added a project: Restricted Project. · View Herald TranscriptApr 5 2023, 12:27 PM

Herald added subscribers: llvm-commits, jplehr, sstefan1. · View Herald Transcript

LGTM with a couple of nits.

llvm/runtimes/CMakeLists.txt
386	Should `AND OPENMP_ENABLE_LIBOMPTARGET)` be moved to the top-level `if`?
388	Nit: stray <TAB> character.

This revision is now accepted and ready to land.Apr 5 2023, 12:40 PM

jhuber6 marked an inline comment as done.Apr 5 2023, 1:07 PM

jhuber6 added inline comments.

llvm/runtimes/CMakeLists.txt
386	These dependencies are only relevant for `libomptarget`. So if we're only building `libomp` they can be ignored.

This revision was landed with ongoing or failed builds.Apr 5 2023, 1:15 PM

Closed by commit rGf5459fc03120: [OpenMP] Add tool dependencies in runtimes mode (authored by jhuber6). · Explain Why

This revision was automatically updated to reflect the committed changes.

jhuber6 added a commit: rGf5459fc03120: [OpenMP] Add tool dependencies in runtimes mode.

Harbormaster completed remote builds in B223864: Diff 511184.Apr 5 2023, 1:39 PM

Revision Contents

Path

Size

llvm/

runtimes/

CMakeLists.txt

11 lines

Diff 511184

llvm/runtimes/CMakeLists.txt

	Show First 20 Lines • Show All 376 Lines • ▼ Show 20 Lines
	endfunction()			endfunction()

	if(runtimes)			if(runtimes)
	# Create a runtimes target that uses this file as its top-level CMake file.			# Create a runtimes target that uses this file as its top-level CMake file.
	# The runtimes target is a configuration of all the runtime libraries			# The runtimes target is a configuration of all the runtime libraries
	# together in a single CMake invocation.			# together in a single CMake invocation.
	set(extra_deps "")			set(extra_deps "")
	if("openmp" IN_LIST LLVM_ENABLE_RUNTIMES)			if("openmp" IN_LIST LLVM_ENABLE_RUNTIMES)
	if(TARGET opt)			foreach(dep opt llvm-link llvm-extract clang clang-offload-packager)
	list(APPEND extra_deps opt)			if(TARGET ${dep} AND OPENMP_ENABLE_LIBOMPTARGET)
				traUnsubmitted Not Done Reply Inline Actions Should `AND OPENMP_ENABLE_LIBOMPTARGET)` be moved to the top-level `if`? tra: Should `AND OPENMP_ENABLE_LIBOMPTARGET)` be moved to the top-level `if`?
				jhuber6AuthorUnsubmitted Done Reply Inline Actions These dependencies are only relevant for `libomptarget`. So if we're only building `libomp` they can be ignored. jhuber6: These dependencies are only relevant for `libomptarget`. So if we're only building `libomp`…
	endif()			list(APPEND extra_deps ${dep})
	if(TARGET llvm-link)
	list(APPEND extra_deps llvm-link)
	endif()			endif()
				traUnsubmitted Done Reply Inline Actions Nit: stray <TAB> character. tra: Nit: stray <TAB> character.
				endforeach()
	endif()			endif()
	if("libc" IN_LIST LLVM_ENABLE_RUNTIMES AND			if("libc" IN_LIST LLVM_ENABLE_RUNTIMES AND
	(LLVM_LIBC_FULL_BUILD OR LIBC_GPU_BUILD OR LIBC_GPU_ARCHITECTURES))			(LLVM_LIBC_FULL_BUILD OR LIBC_GPU_BUILD OR LIBC_GPU_ARCHITECTURES))
	if(TARGET libc-hdrgen)			if(TARGET libc-hdrgen)
	set(libc_tools libc-hdrgen)			set(libc_tools libc-hdrgen)
	set(libc_cmake_args "-DLIBC_HDRGEN_EXE=$<TARGET_FILE:libc-hdrgen>"			set(libc_cmake_args "-DLIBC_HDRGEN_EXE=$<TARGET_FILE:libc-hdrgen>"
	"-DLLVM_LIBC_FULL_BUILD=ON")			"-DLLVM_LIBC_FULL_BUILD=ON")
	list(APPEND extra_deps ${libc_tools})			list(APPEND extra_deps ${libc_tools})
	▲ Show 20 Lines • Show All 142 Lines • Show Last 20 Lines