[libc] make uefi tests build

RossComputerGuy · RossComputerGuy · commit d7cbeeae3727 · 2025-02-07T21:59:17.000-08:00
diff --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt
@@ -257,8 +257,10 @@ else()
   set(LIBC_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX})
 endif()
 
-if(LIBC_TARGET_OS_IS_GPU)
-  include(prepare_libc_gpu_build)
+if(LIBC_TARGET_OS_IS_GPU OR LIBC_TARGET_OS_IS_UEFI)
+  if(LIBC_TARGET_OS_IS_GPU)
+    include(prepare_libc_gpu_build)
+  endif()
   set(LIBC_ENABLE_UNITTESTS OFF)
 endif()
 
diff --git a/libc/cmake/modules/LLVMLibCTestRules.cmake b/libc/cmake/modules/LLVMLibCTestRules.cmake
@@ -673,6 +673,7 @@ function(add_libc_hermetic test_name)
       libc.src.string.memset
       libc.src.strings.bcmp
       libc.src.strings.bzero
+      libc.src.stdlib.atexit
   )
 
   if(libc.src.compiler.__stack_chk_fail IN_LIST TARGET_LLVMLIBC_ENTRYPOINTS)
@@ -743,6 +744,11 @@ function(add_libc_hermetic test_name)
     endif()
   endforeach()
 
+  if(LIBC_TARGET_OS_IS_UEFI)
+    target_link_options(${fq_build_target_name} PRIVATE
+      ${LIBC_COMPILE_OPTIONS_DEFAULT} "-Wl,/lldmingw")
+  endif()
+
   if(LIBC_TARGET_ARCHITECTURE_IS_AMDGPU)
     target_link_options(${fq_build_target_name} PRIVATE
       ${LIBC_COMPILE_OPTIONS_DEFAULT} -Wno-multi-gpu
@@ -778,7 +784,7 @@ function(add_libc_hermetic test_name)
                    ${fq_deps_list})
   # TODO: currently the dependency chain is broken such that getauxval cannot properly
   # propagate to hermetic tests. This is a temporary workaround.
-  if (LIBC_TARGET_ARCHITECTURE_IS_AARCH64)
+  if (LIBC_TARGET_ARCHITECTURE_IS_AARCH64 AND NOT LIBC_TARGET_OS_IS_UEFI)
     target_link_libraries(
       ${fq_build_target_name}
       PRIVATE
diff --git a/libc/config/uefi/config.json b/libc/config/uefi/config.json
@@ -15,7 +15,7 @@
       "value": true
     },
     "LIBC_CONF_PRINTF_FLOAT_TO_STR_USE_MEGA_LONG_DOUBLE_TABLE": {
-      "value": false
+      "value": true
     },
     "LIBC_CONF_PRINTF_DISABLE_STRERROR": {
       "value": true
diff --git a/libc/config/uefi/entrypoints.txt b/libc/config/uefi/entrypoints.txt
@@ -172,6 +172,7 @@ set(TARGET_LIBC_ENTRYPOINTS
     libc.src.stdlib.atoi
     libc.src.stdlib.atol
     libc.src.stdlib.atoll
+    libc.src.stdlib.atexit
     libc.src.stdlib.bsearch
     libc.src.stdlib.calloc
     libc.src.stdlib.div
@@ -188,7 +189,6 @@ set(TARGET_LIBC_ENTRYPOINTS
     libc.src.stdlib.strtod
     libc.src.stdlib.strtof
     libc.src.stdlib.strtol
-    libc.src.stdlib.strtold
     libc.src.stdlib.strtoll
     libc.src.stdlib.strtoul
     libc.src.stdlib.strtoull
diff --git a/libc/docs/uefi/support.rst b/libc/docs/uefi/support.rst
@@ -198,7 +198,6 @@ qsort_r        |check|
 strtod         |check|
 strtof         |check|
 strtol         |check|
-strtold        |check|
 strtoll        |check|
 strtoul        |check|
 strtoull       |check|
diff --git a/libc/include/llvm-libc-macros/signal-macros.h b/libc/include/llvm-libc-macros/signal-macros.h
@@ -13,6 +13,8 @@
 #include "linux/signal-macros.h"
 #elif defined(__NVPTX__) || defined(__AMDGPU__)
 #include "gpu/signal-macros.h"
+#elif defined(__UEFI__)
+#include "uefi/signal-macros.h"
 #endif
 
 #endif // LLVM_LIBC_MACROS_SIGNAL_MACROS_H
diff --git a/libc/include/llvm-libc-macros/uefi/CMakeLists.txt b/libc/include/llvm-libc-macros/uefi/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_header(
+  signal_macros
+  HDR
+    signal-macros.h
+)
diff --git a/libc/include/llvm-libc-macros/uefi/signal-macros.h b/libc/include/llvm-libc-macros/uefi/signal-macros.h
@@ -0,0 +1,28 @@
+//===-- Definition of GPU signal number macros ----------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_MACROS_GPU_SIGNAL_MACROS_H
+#define LLVM_LIBC_MACROS_GPU_SIGNAL_MACROS_H
+
+#define SIGINT 2
+#define SIGILL 4
+#define SIGABRT 6
+#define SIGFPE 8
+#define SIGSEGV 11
+#define SIGTERM 15
+
+#define SIG_DFL ((__sighandler_t)(0))
+#define SIG_IGN ((__sighandler_t)(1))
+#define SIG_ERR ((__sighandler_t)(-1))
+
+// Max signal number
+#define NSIG 64
+
+#define __NSIGSET_WORDS NSIG
+
+#endif // LLVM_LIBC_MACROS_GPU_SIGNAL_MACROS_H
diff --git a/libc/src/__support/OSUtil/uefi/io.cpp b/libc/src/__support/OSUtil/uefi/io.cpp
@@ -22,14 +22,20 @@ ssize_t read_from_stdin(char *buf, size_t size) {
 
 void write_to_stdout(cpp::string_view msg) {
   // TODO: use mbstowcs once implemented
-  efi_system_table->ConOut->OutputString(
-      efi_system_table->ConOut, reinterpret_cast<const char16_t *>(msg.data()));
+  for (size_t i = 0; i < msg.size(); i++) {
+    char16_t e[2] = {msg[i], 0};
+    efi_system_table->ConOut->OutputString(
+        efi_system_table->ConOut, reinterpret_cast<const char16_t *>(&e));
+  }
 }
 
 void write_to_stderr(cpp::string_view msg) {
   // TODO: use mbstowcs once implemented
-  efi_system_table->StdErr->OutputString(
-      efi_system_table->StdErr, reinterpret_cast<const char16_t *>(msg.data()));
+  for (size_t i = 0; i < msg.size(); i++) {
+    char16_t e[2] = {msg[i], 0};
+    efi_system_table->StdErr->OutputString(
+        efi_system_table->StdErr, reinterpret_cast<const char16_t *>(&e));
+  }
 }
 
 } // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/src/__support/UEFI/file.cpp b/libc/src/__support/UEFI/file.cpp
@@ -44,8 +44,11 @@ size_t File::write(const void *data, size_t data_len) {
     reset();
 
   if (handle_type == FileHandleSimpleTextOutput) {
-    handle.simple_text_output->OutputString(
-        handle.simple_text_output, reinterpret_cast<const char16_t *>(data));
+    for (size_t i = 0; i < data_len; i++) {
+      char16_t e[2] = {((const char *)data)[i], 0};
+      handle.simple_text_output->OutputString(
+          handle.simple_text_output, reinterpret_cast<const char16_t *>(&e));
+    }
     return data_len;
   }
   return 0;
diff --git a/libc/src/__support/macros/properties/types.h b/libc/src/__support/macros/properties/types.h
@@ -10,7 +10,7 @@
 #ifndef LLVM_LIBC_SRC___SUPPORT_MACROS_PROPERTIES_TYPES_H
 #define LLVM_LIBC_SRC___SUPPORT_MACROS_PROPERTIES_TYPES_H
 
-#include "hdr/float_macros.h"                      // LDBL_MANT_DIG
+#include "hdr/float_macros.h"                        // LDBL_MANT_DIG
 #include "include/llvm-libc-macros/float16-macros.h" // LIBC_TYPES_HAS_FLOAT16
 #include "include/llvm-libc-types/float128.h"        // float128
 #include "src/__support/macros/properties/architectures.h"
@@ -43,7 +43,7 @@
 
 // int128 / uint128 support
 #if defined(__SIZEOF_INT128__) && !defined(LIBC_TARGET_OS_IS_WINDOWS)
-#define LIBC_TYPES_HAS_INT128
+// #define LIBC_TYPES_HAS_INT128
 #endif // defined(__SIZEOF_INT128__)
 
 // -- float16 support ---------------------------------------------------------
diff --git a/libc/src/__support/threads/mutex.h b/libc/src/__support/threads/mutex.h
@@ -41,6 +41,8 @@
 #include "src/__support/threads/linux/mutex.h"
 #elif defined(LIBC_TARGET_ARCH_IS_GPU)
 #include "src/__support/threads/gpu/mutex.h"
+#elif defined(__UEFI__)
+#include "src/__support/threads/uefi/mutex.h"
 #endif // __linux__
 
 #endif // LLVM_LIBC_SRC___SUPPORT_THREADS_MUTEX_H
diff --git a/libc/src/__support/threads/uefi/CMakeLists.txt b/libc/src/__support/threads/uefi/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_header_library(
+  mutex
+  HDRS
+    mutex.h
+)
diff --git a/libc/src/__support/threads/uefi/mutex.h b/libc/src/__support/threads/uefi/mutex.h
@@ -0,0 +1,32 @@
+//===--- Implementation of a UEFI mutex class -------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC___SUPPORT_THREADS_UEFI_MUTEX_H
+#define LLVM_LIBC_SRC___SUPPORT_THREADS_UEFI_MUTEX_H
+
+#include "src/__support/macros/attributes.h"
+#include "src/__support/macros/config.h"
+#include "src/__support/threads/mutex_common.h"
+
+namespace LIBC_NAMESPACE_DECL {
+
+/// Implementation of a simple passthrough mutex which guards nothing. A
+/// complete Mutex locks in general cannot be implemented on the GPU. We simply
+/// define the Mutex interface and require that only a single thread executes
+/// code requiring a mutex lock.
+struct Mutex {
+  LIBC_INLINE constexpr Mutex(bool, bool, bool, bool) {}
+
+  LIBC_INLINE MutexError lock() { return MutexError::NONE; }
+  LIBC_INLINE MutexError unlock() { return MutexError::NONE; }
+  LIBC_INLINE MutexError reset() { return MutexError::NONE; }
+};
+
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC___SUPPORT_THREADS_GPU_MUTEX_H
diff --git a/libc/src/stdio/uefi/puts.cpp b/libc/src/stdio/uefi/puts.cpp
@@ -14,7 +14,11 @@
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(int, puts, (const char *__restrict str)) {
-  return (int)stdout.write(reinterpret_cast<const void *>(str), strlen(str));
+  int rc = (int)stdout.write(reinterpret_cast<const void *>(str), strlen(str));
+  if (rc < 1)
+    return rc;
+
+  return (int)stdout.write("\r\n", 2);
 }
 
 } // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/test/UnitTest/CMakeLists.txt b/libc/test/UnitTest/CMakeLists.txt
@@ -25,7 +25,8 @@ function(add_unittest_framework_library name)
     endif()
   endforeach()
 
-  if(LLVM_LIBC_FULL_BUILD)
+  # UEFI requires full builds
+  if(LLVM_LIBC_FULL_BUILD AND NOT LIBC_TARGET_OS_IS_UEFI)
     # TODO: Build test framework with LIBC_FULL_BUILD in full build mode after
     # making LibcFPExceptionHelpers and LibcDeathTestExecutors hermetic.
     set(LLVM_LIBC_FULL_BUILD "")
diff --git a/libc/test/UnitTest/LibcTest.cpp b/libc/test/UnitTest/LibcTest.cpp
@@ -13,10 +13,12 @@
 #include "src/__support/CPP/string_view.h"
 #include "src/__support/fixed_point/fx_rep.h"
 #include "src/__support/macros/config.h"
+#include "src/__support/macros/properties/os.h"
 #include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128
 #include "src/__support/uint128.h"
 #include "test/UnitTest/TestLogger.h"
 
+#ifndef LIBC_TARGET_OS_IS_UEFI
 #if __STDC_HOSTED__
 #include <time.h>
 #define LIBC_TEST_USE_CLOCK
@@ -27,6 +29,7 @@
 extern "C" clock_t clock() noexcept { return LIBC_NAMESPACE::clock(); }
 #define LIBC_TEST_USE_CLOCK
 #endif
+#endif
 
 namespace LIBC_NAMESPACE_DECL {
 namespace testing {
@@ -158,13 +161,17 @@ int Test::runTests(const TestOptions &Options) {
     }
 
     tlog << green << "[ RUN      ] " << reset << TestName << '\n';
+#ifdef LIBC_TEST_USE_CLOCK
     [[maybe_unused]] const uint64_t start_time = clock();
+#endif
     RunContext Ctx;
     T->SetUp();
     T->setContext(&Ctx);
     T->Run();
     T->TearDown();
+#ifdef LIBC_TEST_USE_CLOCK
     [[maybe_unused]] const uint64_t end_time = clock();
+#endif
     switch (Ctx.status()) {
     case RunContext::RunResult::Fail:
       tlog << red << "[  FAILED  ] " << reset << TestName << '\n';
diff --git a/libc/test/include/CMakeLists.txt b/libc/test/include/CMakeLists.txt
@@ -1,3 +1,7 @@
+if(LIBC_TARGET_OS_IS_UEFI)
+  return()
+endif()
+
 add_custom_target(libc_include_tests)
 add_dependencies(check-libc libc_include_tests)
 
diff --git a/libc/test/integration/scudo/CMakeLists.txt b/libc/test/integration/scudo/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(NOT LLVM_LIBC_INCLUDE_SCUDO)
+if(NOT LLVM_LIBC_INCLUDE_SCUDO OR LIBC_TARGET_OS_IS_UEFI)
   return()
 endif()
 
diff --git a/libc/test/src/CMakeLists.txt b/libc/test/src/CMakeLists.txt
@@ -92,7 +92,11 @@ add_subdirectory(assert)
 add_subdirectory(compiler)
 add_subdirectory(dirent)
 add_subdirectory(locale)
-add_subdirectory(setjmp)
+
+if(NOT LIBC_TARGET_OS_IS_UEFI)
+  add_subdirectory(setjmp)
+endif()
+
 add_subdirectory(signal)
 add_subdirectory(spawn)
 
diff --git a/libc/test/src/__support/CMakeLists.txt b/libc/test/src/__support/CMakeLists.txt
@@ -116,21 +116,22 @@ add_libc_test(
     libc.src.__support.uint128
 )
 
-add_libc_test(
-  str_to_float_test
-  SUITE
-    libc-support-tests
-  SRCS
-    str_to_float_test.cpp
-    str_to_double_test.cpp
-    str_to_long_double_test.cpp
-  DEPENDS
-    libc.src.__support.integer_literals
-    libc.src.__support.str_to_float
-    libc.src.__support.uint128
-    libc.src.errno.errno
-)
-
+if(NOT LIBC_TARGET_OS_IS_UEFI)
+  add_libc_test(
+    str_to_float_test
+    SUITE
+      libc-support-tests
+    SRCS
+      str_to_float_test.cpp
+      str_to_double_test.cpp
+      str_to_long_double_test.cpp
+    DEPENDS
+      libc.src.__support.integer_literals
+      libc.src.__support.str_to_float
+      libc.src.__support.uint128
+      libc.src.errno.errno
+  )
+endif()
 
 add_libc_test(
   str_to_integer_test
@@ -159,22 +160,24 @@ add_libc_test(
     libc.src.__support.uint128
 )
 
-add_libc_test(
-  arg_list_test
-  SUITE
-    libc-support-tests
-  SRCS
-    arg_list_test.cpp
-  DEPENDS
-    libc.src.__support.arg_list
-    libc.src.__support.macros.properties.os
-)
+if(NOT LIBC_TARGET_OS_IS_UEFI)
+  add_libc_test(
+    arg_list_test
+    SUITE
+      libc-support-tests
+    SRCS
+      arg_list_test.cpp
+    DEPENDS
+      libc.src.__support.arg_list
+      libc.src.__support.macros.properties.os
+  )
+endif()
 
 # TODO: clang-cl generates calls into runtime library functions to
 # handle 128-bit integer arithmetics and conversions which are not yet
 # available on Windows. Re-enable 128-bit integer support on Windows once
 # these functions are ready.
-if(NOT LIBC_TARGET_ARCHITECTURE_IS_NVPTX AND NOT LIBC_TARGET_OS_IS_WINDOWS)
+if(NOT LIBC_TARGET_ARCHITECTURE_IS_NVPTX AND NOT LIBC_TARGET_OS_IS_WINDOWS AND NOT LIBC_TARGET_OS_IS_UEFI)
   add_libc_test(
     big_int_test
     SUITE
diff --git a/libc/test/src/__support/FPUtil/CMakeLists.txt b/libc/test/src/__support/FPUtil/CMakeLists.txt
@@ -1,3 +1,7 @@
+if(LIBC_TARGET_OS_IS_UEFI)
+  return()
+endif()
+
 add_custom_target(libc-fputil-tests)
 
 add_fp_unittest(
diff --git a/libc/test/src/__support/File/CMakeLists.txt b/libc/test/src/__support/File/CMakeLists.txt
diff --git a/libc/test/src/compiler/CMakeLists.txt b/libc/test/src/compiler/CMakeLists.txt
diff --git a/libc/test/src/errno/CMakeLists.txt b/libc/test/src/errno/CMakeLists.txt
diff --git a/libc/test/src/math/CMakeLists.txt b/libc/test/src/math/CMakeLists.txt
diff --git a/libc/test/src/math/smoke/CMakeLists.txt b/libc/test/src/math/smoke/CMakeLists.txt
diff --git a/libc/test/src/stdfix/CMakeLists.txt b/libc/test/src/stdfix/CMakeLists.txt
diff --git a/libc/test/src/stdio/printf_core/CMakeLists.txt b/libc/test/src/stdio/printf_core/CMakeLists.txt
diff --git a/libc/test/src/stdio/scanf_core/CMakeLists.txt b/libc/test/src/stdio/scanf_core/CMakeLists.txt
diff --git a/libc/test/src/time/CMakeLists.txt b/libc/test/src/time/CMakeLists.txt
diff --git a/libc/test/utils/UnitTest/CMakeLists.txt b/libc/test/utils/UnitTest/CMakeLists.txt
