diff options
author | Joseph Huber <huberjn@outlook.com> | 2024-01-07 13:33:16 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-07 13:33:16 -0600 |
commit | 38228d5efe18cbe45ea02ebb08b2d2a7e4b68560 (patch) | |
tree | af23e7fa1f838eed2cd26fe15c1a5120ddff0a50 /libc | |
parent | 92e243173c09fc78c25814a7d7e392971034f5be (diff) | |
download | llvm-38228d5efe18cbe45ea02ebb08b2d2a7e4b68560.zip llvm-38228d5efe18cbe45ea02ebb08b2d2a7e4b68560.tar.gz llvm-38228d5efe18cbe45ea02ebb08b2d2a7e4b68560.tar.bz2 |
[libc] Fix GPU tests not running after recent patches (#77248)
Summary:
A previous patch added a dependency on the stack protectors, this was
not built on the GPU targets so every test was disabled. It turns out
that disabled tests still get targets so we need to specifically check
if the it is in the target's set of entrypoints before we can use it.
Another patch, because the build-bot was down, snuck in that prevented
the new math tests from being run. The problem is that the `signal.h`
header requires target specific definitions but was being used
unconditionally. I have made changes that disable building this header
if the file is not defined in the config. This required disbaling the
signal_to_string utility, so that will simply be missing from targets
that don't define it.
Diffstat (limited to 'libc')
-rw-r--r-- | libc/cmake/modules/LLVMLibCTestRules.cmake | 21 | ||||
-rw-r--r-- | libc/include/CMakeLists.txt | 40 | ||||
-rw-r--r-- | libc/src/__support/StringUtil/CMakeLists.txt | 34 |
3 files changed, 54 insertions, 41 deletions
diff --git a/libc/cmake/modules/LLVMLibCTestRules.cmake b/libc/cmake/modules/LLVMLibCTestRules.cmake index b69839a..24f543f 100644 --- a/libc/cmake/modules/LLVMLibCTestRules.cmake +++ b/libc/cmake/modules/LLVMLibCTestRules.cmake @@ -498,10 +498,14 @@ function(add_integration_test test_name) libc.src.string.memcpy libc.src.string.memmove libc.src.string.memset - # __stack_chk_fail should always be included to allow building libc with - # stack protector. - libc.src.compiler.__stack_chk_fail ) + + if(libc.src.compiler.__stack_chk_fail IN_LIST TARGET_LLVMLIBC_ENTRYPOINTS) + # __stack_chk_fail should always be included if supported to allow building + # libc with the stack protector enabled. + list(APPEND fq_deps_list libc.src.compiler.__stack_chk_fail) + endif() + list(REMOVE_DUPLICATES fq_deps_list) # TODO: Instead of gathering internal object files from entrypoints, @@ -668,12 +672,15 @@ function(add_libc_hermetic_test test_name) libc.src.string.memmove libc.src.string.memset libc.src.__support.StringUtil.error_to_string - # __stack_chk_fail should always be included to allow building libc with - # stack protector. - libc.src.compiler.__stack_chk_fail ) - if(TARGET libc.src.time.clock) + if(libc.src.compiler.__stack_chk_fail IN_LIST TARGET_LLVMLIBC_ENTRYPOINTS) + # __stack_chk_fail should always be included if supported to allow building + # libc with the stack protector enabled. + list(APPEND fq_deps_list libc.src.compiler.__stack_chk_fail) + endif() + + if(libc.src.time.clock IN_LIST TARGET_LLVMLIBC_ENTRYPOINTS) # We will link in the 'clock' implementation if it exists for test timing. list(APPEND fq_deps_list libc.src.time.clock) endif() diff --git a/libc/include/CMakeLists.txt b/libc/include/CMakeLists.txt index 59c6c4a..c93693c 100644 --- a/libc/include/CMakeLists.txt +++ b/libc/include/CMakeLists.txt @@ -184,24 +184,28 @@ add_gen_header( .llvm-libc-macros.generic_error_number_macros ) -add_gen_header( - signal - DEF_FILE signal.h.def - PARAMS - platform_signal=../config/${LIBC_TARGET_OS}/signal.h.in - GEN_HDR signal.h - DATA_FILES - ../config/${LIBC_TARGET_OS}/signal.h.in - DEPENDS - .llvm-libc-macros.signal_macros - .llvm-libc-types.sig_atomic_t - .llvm-libc-types.sigset_t - .llvm-libc-types.struct_sigaction - .llvm-libc-types.union_sigval - .llvm-libc-types.siginfo_t - .llvm-libc-types.stack_t - .llvm-libc-types.pid_t -) +if(EXISTS "${LIBC_SOURCE_DIR}/config/${LIBC_TARGET_OS}/signal.h.in") + add_gen_header( + signal + DEF_FILE signal.h.def + PARAMS + platform_signal=${LIBC_SOURCE_DIR}/config/${LIBC_TARGET_OS}/signal.h.in + GEN_HDR signal.h + DATA_FILES + ${LIBC_SOURCE_DIR}/config/${LIBC_TARGET_OS}/signal.h.in + DEPENDS + .llvm-libc-macros.signal_macros + .llvm-libc-types.sig_atomic_t + .llvm-libc-types.sigset_t + .llvm-libc-types.struct_sigaction + .llvm-libc-types.union_sigval + .llvm-libc-types.siginfo_t + .llvm-libc-types.stack_t + .llvm-libc-types.pid_t + ) +else() + message(STATUS "Skipping header signal.h as the target config is missing") +endif() add_gen_header( stdio diff --git a/libc/src/__support/StringUtil/CMakeLists.txt b/libc/src/__support/StringUtil/CMakeLists.txt index c053966..41b20dc 100644 --- a/libc/src/__support/StringUtil/CMakeLists.txt +++ b/libc/src/__support/StringUtil/CMakeLists.txt @@ -51,19 +51,21 @@ add_object_library( libc.src.__support.integer_to_string ) -add_object_library( - signal_to_string - HDRS - signal_to_string.h - SRCS - signal_to_string.cpp - DEPENDS - .message_mapper - .platform_signals - libc.include.signal - libc.src.__support.common - libc.src.__support.CPP.span - libc.src.__support.CPP.string_view - libc.src.__support.CPP.stringstream - libc.src.__support.integer_to_string -) +if(TARGET libc.include.signal) + add_object_library( + signal_to_string + HDRS + signal_to_string.h + SRCS + signal_to_string.cpp + DEPENDS + .message_mapper + .platform_signals + libc.include.signal + libc.src.__support.common + libc.src.__support.CPP.span + libc.src.__support.CPP.string_view + libc.src.__support.CPP.stringstream + libc.src.__support.integer_to_string + ) +endif() |