[all-commits] [llvm/llvm-project] 7f3d00: [libomptarget][amdcgn] Add build dependency for ll...

[Joachim via All-commits]

  Branch: refs/heads/release/13.x
  Home:   https://github.com/llvm/llvm-project
  Commit: 7f3d00c9b49b8de4df63d51462081ce272af488d
      https://github.com/llvm/llvm-project/commit/7f3d00c9b49b8de4df63d51462081ce272af488d
  Author: Joachim Protze <protze at itc.rwth-aachen.de>
  Date:   2021-09-03 (Fri, 03 Sep 2021)

  Changed paths:
    M llvm/runtimes/CMakeLists.txt
    M openmp/libomptarget/DeviceRTL/CMakeLists.txt
    M openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt

  Log Message:
  -----------
  [libomptarget][amdcgn] Add build dependency for llvm-link and opt

D107156 and D107320 are not sufficient when OpenMP is built as llvm runtime
(LLVM_ENABLE_RUNTIMES=openmp) because dependencies only work within the same
cmake instance.

We could limit the dependency to cases where libomptarget/plugins are really
built. But compared to the whole llvm project, building openmp runtime is
negligible and postponing the build of OpenMP runtime after the dependencies
are ready seems reasonable.

The direct dependency introduced in D107156 and D107320 is necessary for the
case where OpenMP is built as llvm project (LLVM_ENABLE_PROJECTS=openmp).

Differential Revision: https://reviews.llvm.org/D108404

(cherry picked from commit 4bb36df144127c5bee6ea2607bc544c003aae446)


  Commit: c45fa58f171e72176c3df71909f2b85137cd909f
      https://github.com/llvm/llvm-project/commit/c45fa58f171e72176c3df71909f2b85137cd909f
  Author: Joachim Protze <protze at itc.rwth-aachen.de>
  Date:   2021-09-03 (Fri, 03 Sep 2021)

  Changed paths:
    M llvm/runtimes/CMakeLists.txt
    M openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt

  Log Message:
  -----------
  [libomptarget][amdcgn] Only add opt/llvm-link dependency if TARGET is available

In some build configurations, the target we depend on is not available for declaring the build dependency.
We only need to declare the build dependency, if the build target is available in the same build.

Fixes the issue raised in https://reviews.llvm.org/D107156#2969862
This patch should go into release/13 together with D108404

Differential Revision: https://reviews.llvm.org/D108868

(cherry picked from commit 5ea1c37118699f0ed1da17e0d8562011d0002edd)


Compare: https://github.com/llvm/llvm-project/compare/3b1fa4aef006...c45fa58f171e