[libc-commits] [libc] [llvm] Reapply "[libc] Port process utilities to hermetic mode and enable some tests" (PR #211484)
via libc-commits
libc-commits at lists.llvm.org
Thu Jul 23 01:06:15 PDT 2026
llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-libc
Author: Pavel Labath (labath)
<details>
<summary>Changes</summary>
This reverts https://github.com/llvm/llvm-project/pull/210889 (https://github.com/labath/llvm-project/commit/b7f642fdb262e2ed3c2209b9a10017084e1595ad, "Revert
recent changes to the hermetic tests"), re-applying https://github.com/llvm/llvm-project/pull/209999
(https://github.com/labath/llvm-project/commit/9e2e9b33e14808541c0470b92ade34bee6608bf6, "[libc] Port process
utilities to hermetic mode and enable some tests") and https://github.com/llvm/llvm-project/pull/210715
(https://github.com/labath/llvm-project/commit/4bd1a447e136e60ea441370ac5d7b898aa4efab0, "[libc] Make hermetic test
syscall deps linux-only"), which was reverted due to failures on the GPU
bots.
There are a couple of small changes w.r.t the original patches:
- This version disables the exit tests on builds that do not
support subprocess tests (via the newly introduced
LIBC_TEST_SUBPROCESS_TESTS). This is necessary because the GPU builds
contain the relevant entry points, which means their tests are not
skipped automatically.
- fix a typo in a variable name
- make the dependencies conditional on LIBC_TEST_SUBPROCESS_TESTS
instead of listing the target OSs directly. This is a no-op, as that's
exactly how the variable is defined, but it makes the code cleaner.
---
Full diff: https://github.com/llvm/llvm-project/pull/211484.diff
7 Files Affected:
- (modified) libc/cmake/modules/LLVMLibCTestRules.cmake (+18)
- (modified) libc/test/UnitTest/CMakeLists.txt (+11-2)
- (modified) libc/test/UnitTest/ExecuteFunctionUnix.cpp (+41-13)
- (modified) libc/test/UnitTest/HermeticTestUtils.cpp (+5-14)
- (modified) libc/test/UnitTest/LibcDeathTestExecutors.cpp (+2-3)
- (modified) libc/test/src/stdlib/CMakeLists.txt (+17-28)
- (modified) utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel (+1)
``````````diff
diff --git a/libc/cmake/modules/LLVMLibCTestRules.cmake b/libc/cmake/modules/LLVMLibCTestRules.cmake
index 677abd88b0d29..bb83d2e06bdc1 100644
--- a/libc/cmake/modules/LLVMLibCTestRules.cmake
+++ b/libc/cmake/modules/LLVMLibCTestRules.cmake
@@ -793,6 +793,23 @@ function(add_libc_hermetic test_name)
libc.src.strings.bzero
)
+ # Syscalls used by death tests.
+ if(LIBC_TEST_SUBPROCESS_TESTS)
+ list(APPEND fq_deps_list
+ libc.src.poll.poll
+ libc.src.signal.kill
+ libc.src.stdio.fflush
+ libc.src.stdio.stderr
+ libc.src.stdio.stdout
+ libc.src.stdlib.exit
+ libc.src.string.strsignal
+ libc.src.sys.wait.waitpid
+ libc.src.unistd.close
+ libc.src.unistd.fork
+ libc.src.unistd.pipe
+ )
+ endif()
+
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.
@@ -1020,6 +1037,7 @@ function(add_libc_test test_name)
${test_name}.__hermetic__
LINK_LIBRARIES
LibcTest.hermetic
+ LibcDeathTestExecutors.hermetic
${LIBC_TEST_UNPARSED_ARGUMENTS}
)
get_fq_target_name(${test_name} fq_test_name)
diff --git a/libc/test/UnitTest/CMakeLists.txt b/libc/test/UnitTest/CMakeLists.txt
index 0bc5ff8b2d9be..18f375d49cbde 100644
--- a/libc/test/UnitTest/CMakeLists.txt
+++ b/libc/test/UnitTest/CMakeLists.txt
@@ -40,7 +40,7 @@ function(add_unittest_framework_library name)
endif()
target_compile_options(${name}.unit PRIVATE ${compile_options})
- _get_hermetic_test_compile_options(compile_options "")
+ _get_hermetic_test_compile_options(compile_options "")
target_include_directories(${name}.hermetic PRIVATE ${LIBC_INCLUDE_DIR})
target_compile_options(${name}.hermetic PRIVATE ${compile_options} -nostdinc++)
@@ -97,8 +97,17 @@ add_unittest_framework_library(
)
set(libc_death_test_srcs LibcDeathTestExecutors.cpp)
+set(libc_death_test_deps libc.hdr.stdint_proxy)
if (LIBC_TEST_SUBPROCESS_TESTS)
list(APPEND libc_death_test_srcs ExecuteFunctionUnix.cpp)
+ list(APPEND libc_death_test_deps
+ libc.include.llvm-libc-macros.poll-macros
+ libc.include.llvm-libc-macros.signal_macros
+ libc.include.llvm-libc-macros.sys_wait_macros
+ libc.include.llvm-libc-types.pid_t
+ libc.include.llvm-libc-types.struct_pollfd
+ libc.src.__support.libc_assert
+ )
endif()
add_unittest_framework_library(
@@ -108,7 +117,7 @@ add_unittest_framework_library(
HDRS
ExecuteFunction.h
DEPENDS
- libc.hdr.stdint_proxy
+ ${libc_death_test_deps}
)
add_unittest_framework_library(
diff --git a/libc/test/UnitTest/ExecuteFunctionUnix.cpp b/libc/test/UnitTest/ExecuteFunctionUnix.cpp
index ab18f7a2ebf52..6ca867d5e65df 100644
--- a/libc/test/UnitTest/ExecuteFunctionUnix.cpp
+++ b/libc/test/UnitTest/ExecuteFunctionUnix.cpp
@@ -7,9 +7,32 @@
//===----------------------------------------------------------------------===//
#include "ExecuteFunction.h"
+#include "src/__support/libc_assert.h"
#include "src/__support/macros/config.h"
#include "test/UnitTest/ExecuteFunction.h" // FunctionCaller
-#include <assert.h>
+
+#ifdef LIBC_FULL_BUILD
+#include "include/llvm-libc-macros/poll-macros.h"
+#include "include/llvm-libc-macros/signal-macros.h"
+#include "include/llvm-libc-macros/sys-wait-macros.h"
+#include "include/llvm-libc-types/pid_t.h"
+#include "include/llvm-libc-types/struct_pollfd.h"
+#include "src/__support/libc_assert.h"
+#include "src/poll/poll.h"
+#include "src/signal/kill.h"
+#include "src/stdio/fflush.h"
+#include "src/stdio/stderr.h"
+#include "src/stdio/stdout.h"
+#include "src/stdlib/exit.h"
+#include "src/string/strsignal.h"
+#include "src/sys/wait/waitpid.h"
+#include "src/unistd/close.h"
+#include "src/unistd/fork.h"
+#include "src/unistd/pipe.h"
+
+#define LIBC_IMPL LIBC_NAMESPACE
+
+#else // Overlay mode
#include <poll.h>
#include <signal.h>
#include <stdio.h>
@@ -18,13 +41,16 @@
#include <sys/wait.h>
#include <unistd.h>
+#define LIBC_IMPL
+#endif
+
namespace LIBC_NAMESPACE_DECL {
namespace testutils {
bool ProcessStatus::exited_normally() { return WIFEXITED(platform_defined); }
int ProcessStatus::get_exit_code() {
- assert(exited_normally() && "Abnormal termination, no exit code");
+ LIBC_ASSERT(exited_normally() && "Abnormal termination, no exit code");
return WEXITSTATUS(platform_defined);
}
@@ -36,15 +62,15 @@ int ProcessStatus::get_fatal_signal() {
ProcessStatus invoke_in_subprocess(FunctionCaller *func, int timeout_ms) {
int pipe_fds[2];
- if (::pipe(pipe_fds) == -1) {
+ if (LIBC_IMPL::pipe(pipe_fds) == -1) {
delete func;
return ProcessStatus::error("pipe(2) failed");
}
// Don't copy the buffers into the child process and print twice.
- ::fflush(stderr);
- ::fflush(stdout);
- pid_t pid = ::fork();
+ LIBC_IMPL::fflush(stderr);
+ LIBC_IMPL::fflush(stdout);
+ pid_t pid = LIBC_IMPL::fork();
if (pid == -1) {
delete func;
return ProcessStatus::error("fork(2) failed");
@@ -53,20 +79,20 @@ ProcessStatus invoke_in_subprocess(FunctionCaller *func, int timeout_ms) {
if (!pid) {
(*func)();
delete func;
- ::exit(0);
+ LIBC_IMPL::exit(0);
}
- ::close(pipe_fds[1]);
+ LIBC_IMPL::close(pipe_fds[1]);
pollfd poll_fd{pipe_fds[0], POLLIN, 0};
// No events requested so this call will only return after the timeout or if
// the pipes peer was closed, signaling the process exited.
- if (::poll(&poll_fd, 1, timeout_ms) == -1) {
+ if (LIBC_IMPL::poll(&poll_fd, 1, timeout_ms) == -1) {
delete func;
return ProcessStatus::error("poll(2) failed");
}
// If the pipe wasn't closed by the child yet then timeout has expired.
if (!(poll_fd.revents & POLLHUP)) {
- ::kill(pid, SIGKILL);
+ LIBC_IMPL::kill(pid, SIGKILL);
delete func;
return ProcessStatus::timed_out_ps();
}
@@ -74,17 +100,19 @@ ProcessStatus invoke_in_subprocess(FunctionCaller *func, int timeout_ms) {
int wstatus = 0;
// Wait on the pid of the subprocess here so it gets collected by the system
// and doesn't turn into a zombie.
- pid_t status = ::waitpid(pid, &wstatus, 0);
+ pid_t status = LIBC_IMPL::waitpid(pid, &wstatus, 0);
if (status == -1) {
delete func;
return ProcessStatus::error("waitpid(2) failed");
}
- assert(status == pid);
+ LIBC_ASSERT(status == pid);
delete func;
return {wstatus};
}
-const char *signal_as_string(int signum) { return ::strsignal(signum); }
+const char *signal_as_string(int signum) {
+ return LIBC_IMPL::strsignal(signum);
+}
} // namespace testutils
} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/test/UnitTest/HermeticTestUtils.cpp b/libc/test/UnitTest/HermeticTestUtils.cpp
index 6fa1b0177f00b..5ce661b2202c0 100644
--- a/libc/test/UnitTest/HermeticTestUtils.cpp
+++ b/libc/test/UnitTest/HermeticTestUtils.cpp
@@ -132,15 +132,9 @@ void *operator new(size_t size) { return malloc(size); }
void *operator new[](size_t size) { return malloc(size); }
-void operator delete(void *) {
- // The libc runtime should not use the global delete operator. Hence,
- // we just trap here to catch any such accidental usages.
- __builtin_trap();
-}
+void operator delete(void *ptr) { free(ptr); }
-void operator delete([[maybe_unused]] void *ptr, [[maybe_unused]] size_t size) {
- __builtin_trap();
-}
+void operator delete(void *ptr, [[maybe_unused]] size_t size) { free(ptr); }
// Defining members in the std namespace is not preferred. But, we do it here
// so that we can use it to define the operator new which takes std::align_val_t
@@ -149,11 +143,8 @@ namespace std {
enum class align_val_t : size_t {};
} // namespace std
-void operator delete([[maybe_unused]] void *mem, std::align_val_t) noexcept {
- __builtin_trap();
-}
+void operator delete(void *ptr, std::align_val_t) noexcept { free(ptr); }
-void operator delete([[maybe_unused]] void *mem, unsigned int,
- std::align_val_t) noexcept {
- __builtin_trap();
+void operator delete(void *ptr, unsigned int, std::align_val_t) noexcept {
+ free(ptr);
}
diff --git a/libc/test/UnitTest/LibcDeathTestExecutors.cpp b/libc/test/UnitTest/LibcDeathTestExecutors.cpp
index 5f8d7b86a5187..9a0a749a3404a 100644
--- a/libc/test/UnitTest/LibcDeathTestExecutors.cpp
+++ b/libc/test/UnitTest/LibcDeathTestExecutors.cpp
@@ -8,12 +8,11 @@
#include "LibcTest.h"
+#include "src/__support/libc_assert.h"
#include "src/__support/macros/config.h"
#include "test/UnitTest/ExecuteFunction.h"
#include "test/UnitTest/TestLogger.h"
-#include <assert.h>
-
namespace {
constexpr unsigned TIMEOUT_MS = 10000;
} // Anonymous namespace
@@ -51,7 +50,7 @@ bool Test::testProcessKilled(testutils::FunctionCaller *Func, int Signal,
}
int KilledBy = Result.get_fatal_signal();
- assert(KilledBy != 0 && "Not killed by any signal");
+ LIBC_ASSERT(KilledBy != 0 && "Not killed by any signal");
if (Signal == -1 || KilledBy == Signal)
return true;
diff --git a/libc/test/src/stdlib/CMakeLists.txt b/libc/test/src/stdlib/CMakeLists.txt
index 761aa4f792e29..4a0d7a6abd910 100644
--- a/libc/test/src/stdlib/CMakeLists.txt
+++ b/libc/test/src/stdlib/CMakeLists.txt
@@ -505,12 +505,9 @@ add_libc_test(
libc.hdr.types.wchar_t
)
-if(LLVM_LIBC_FULL_BUILD)
-
+if(LLVM_LIBC_FULL_BUILD AND LIBC_TEST_SUBPROCESS_TESTS)
add_libc_test(
_Exit_test
- # The EXPECT_EXITS test is only availible for unit tests.
- UNIT_TEST_ONLY
SUITE
libc-stdlib-tests
SRCS
@@ -522,8 +519,6 @@ if(LLVM_LIBC_FULL_BUILD)
add_libc_test(
exit_test
- # The EXPECT_EXITS test is only availible for unit tests.
- UNIT_TEST_ONLY
SUITE
libc-stdlib-tests
SRCS
@@ -535,7 +530,7 @@ if(LLVM_LIBC_FULL_BUILD)
add_libc_test(
atexit_test
- # The EXPECT_EXITS test is only availible for unit tests.
+ # TODO: Fix this test in hermetic mode.
UNIT_TEST_ONLY
SUITE
libc-stdlib-tests
@@ -550,8 +545,6 @@ if(LLVM_LIBC_FULL_BUILD)
add_libc_test(
at_quick_exit_test
- # The EXPECT_EXITS test is only availible for unit tests.
- UNIT_TEST_ONLY
SUITE
libc-stdlib-tests
SRCS
@@ -565,8 +558,6 @@ if(LLVM_LIBC_FULL_BUILD)
add_libc_test(
abort_test
- # The EXPECT_DEATH test is only availible for unit tests.
- UNIT_TEST_ONLY
SUITE
libc-stdlib-tests
SRCS
@@ -580,8 +571,6 @@ if(LLVM_LIBC_FULL_BUILD)
add_libc_test(
quick_exit_test
- # The EXPECT_EXITS test is only availible for unit tests.
- UNIT_TEST_ONLY
SUITE
libc-stdlib-tests
SRCS
@@ -590,21 +579,21 @@ if(LLVM_LIBC_FULL_BUILD)
libc.include.stdlib
libc.src.stdlib.quick_exit
)
+endif()
- # Only baremetal and GPU has an in-tree 'malloc' implementation.
- if((LIBC_TARGET_OS_IS_BAREMETAL OR LIBC_TARGET_OS_IS_GPU) AND
+# Only baremetal and GPU has an in-tree 'malloc' implementation.
+if((LIBC_TARGET_OS_IS_BAREMETAL OR LIBC_TARGET_OS_IS_GPU) AND
NOT LIBC_TARGET_ARCHITECTURE_IS_NVPTX)
- add_libc_test(
- malloc_test
- HERMETIC_TEST_ONLY
- SUITE
- libc-stdlib-tests
- SRCS
- malloc_test.cpp
- DEPENDS
- libc.include.stdlib
- libc.src.stdlib.malloc
- libc.src.stdlib.free
- )
- endif()
+ add_libc_test(
+ malloc_test
+ HERMETIC_TEST_ONLY
+ SUITE
+ libc-stdlib-tests
+ SRCS
+ malloc_test.cpp
+ DEPENDS
+ libc.include.stdlib
+ libc.src.stdlib.malloc
+ libc.src.stdlib.free
+ )
endif()
diff --git a/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
index a08ad1684eb76..7d25fe869e193 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
@@ -60,6 +60,7 @@ libc_test_library(
"//libc:__support_fputil_fp_bits",
"//libc:__support_fputil_fpbits_str",
"//libc:__support_fputil_rounding_mode",
+ "//libc:__support_libc_assert",
"//libc:__support_libc_errno",
"//libc:__support_macros_config",
"//libc:__support_macros_properties_architectures",
``````````
</details>
https://github.com/llvm/llvm-project/pull/211484
More information about the libc-commits
mailing list