This is an archive of the discontinued LLVM Phabricator instance.

Differential D97256

[CMake][profile] Don't use `TARGET lld` to avoid ordering issues
ClosedPublic

Authored by phosek on Feb 22 2021, 10:24 PM.

Details

Reviewers
aeubanks
MaskRay
smeenai
Commits
rGb6876ddc8232: [CMake][profile] Don't use `TARGET lld` to avoid ordering issues
Summary

Depending on the order in which lld and compiler-rt projects are
processed by CMake, TARGET lld might evaluate to TRUE or FALSE
even though lld-available lit stanza is always set because lld is
being built. We check whether lld project is enabled instead which
is used by other compiler-rt tests.

The ideal solution here would be to use CMake generator expressions,
but those cannot be used for dependencies yet, see:
https://gitlab.kitware.com/cmake/cmake/-/issues/19467

Diff Detail

Event Timeline

phosek created this revision.Feb 22 2021, 10:24 PM
Herald added a subscriber: mgorny. · View Herald TranscriptFeb 22 2021, 10:24 PM
phosek requested review of this revision.Feb 22 2021, 10:24 PM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 22 2021, 10:24 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
phosek added a comment.Feb 22 2021, 10:25 PM

This should address the issue that @aeubanks reported on D96757.

MaskRay accepted this revision.Feb 22 2021, 10:29 PM

LGTM.

This revision is now accepted and ready to land.Feb 22 2021, 10:29 PM
MaskRay added a comment.Feb 22 2021, 10:30 PM

I had a similar fix D71950 ;-)

Harbormaster completed remote builds in B90338: Diff 325679.Feb 22 2021, 10:56 PM
Closed by commit rGb6876ddc8232: [CMake][profile] Don't use `TARGET lld` to avoid ordering issues (authored by phosek). · Explain WhyFeb 22 2021, 11:33 PM
This revision was automatically updated to reflect the committed changes.
phosek added a commit: rGb6876ddc8232: [CMake][profile] Don't use `TARGET lld` to avoid ordering issues.
phosek mentioned this in D97314: [libc++abi] Link against cxx-headers when available.Feb 24 2021, 11:11 AM

Revision Contents

PathSize
compiler-rt/
test/
profile/
2 lines

Diff 325692

compiler-rt/test/profile/CMakeLists.txt

set(PROFILE_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(PROFILE_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(PROFILE_LIT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) set(PROFILE_LIT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
set(PROFILE_TESTSUITES) set(PROFILE_TESTSUITES)
set(PROFILE_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS}) set(PROFILE_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
if(NOT COMPILER_RT_STANDALONE_BUILD) if(NOT COMPILER_RT_STANDALONE_BUILD)
list(APPEND PROFILE_TEST_DEPS profile llvm-profdata llvm-cov) list(APPEND PROFILE_TEST_DEPS profile llvm-profdata llvm-cov)
if(NOT APPLE AND COMPILER_RT_HAS_LLD AND TARGET lld) if(NOT APPLE AND COMPILER_RT_HAS_LLD AND "lld" IN_LIST LLVM_ENABLE_PROJECTS)
list(APPEND PROFILE_TEST_DEPS lld) list(APPEND PROFILE_TEST_DEPS lld)
endif() endif()
endif() endif()
set(PROFILE_TEST_ARCH ${PROFILE_SUPPORTED_ARCH}) set(PROFILE_TEST_ARCH ${PROFILE_SUPPORTED_ARCH})
if(APPLE) if(APPLE)
darwin_filter_host_archs(PROFILE_SUPPORTED_ARCH PROFILE_TEST_ARCH) darwin_filter_host_archs(PROFILE_SUPPORTED_ARCH PROFILE_TEST_ARCH)
endif() endif()
Show All 16 Lines