[libc] implement stdc_leading_zeros_u* for stdbit.h #79669
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- stdbit.stdc_leading_zeros_uc - stdbit.stdc_leading_zeros_us - stdbit.stdc_leading_zeros_ui - stdbit.stdc_leading_zeros_ul - stdbit.stdc_leading_zeros_ull Test via: $ ninja libc-stdbit-tests libc_include_tests
|
@llvm/pr-subscribers-libc Author: Nick Desaulniers (nickdesaulniers) Changes
Test via: Patch is 25.53 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/79669.diff 29 Files Affected:
diff --git a/libc/config/linux/x86_64/entrypoints.txt b/libc/config/linux/x86_64/entrypoints.txt
index 3812d9586121e7d..e714f0f6cc5ac51 100644
--- a/libc/config/linux/x86_64/entrypoints.txt
+++ b/libc/config/linux/x86_64/entrypoints.txt
@@ -91,6 +91,13 @@ set(TARGET_LIBC_ENTRYPOINTS
libc.src.inttypes.strtoimax
libc.src.inttypes.strtoumax
+ # stdbit.h entrypoints
+ libc.src.stdbit.stdc_leading_zeros_uc
+ libc.src.stdbit.stdc_leading_zeros_us
+ libc.src.stdbit.stdc_leading_zeros_ui
+ libc.src.stdbit.stdc_leading_zeros_ul
+ libc.src.stdbit.stdc_leading_zeros_ull
+
# stdlib.h entrypoints
libc.src.stdlib.abs
libc.src.stdlib.atoi
diff --git a/libc/config/linux/x86_64/headers.txt b/libc/config/linux/x86_64/headers.txt
index d103176897a74a8..4009501bc45ce8a 100644
--- a/libc/config/linux/x86_64/headers.txt
+++ b/libc/config/linux/x86_64/headers.txt
@@ -15,6 +15,7 @@ set(TARGET_PUBLIC_HEADERS
libc.include.signal
libc.include.spawn
libc.include.setjmp
+ libc.include.stdbit
libc.include.stdio
libc.include.stdlib
libc.include.string
diff --git a/libc/include/CMakeLists.txt b/libc/include/CMakeLists.txt
index 89fffd1022758ea..9474bdd3791264d 100644
--- a/libc/include/CMakeLists.txt
+++ b/libc/include/CMakeLists.txt
@@ -223,6 +223,15 @@ else()
message(STATUS "Skipping header signal.h as the target config is missing")
endif()
+add_gen_header(
+ stdbit
+ DEF_FILE stdbit.h.def
+ GEN_HDR stdbit.h
+ DEPENDS
+ .llvm_libc_common_h
+ .llvm-libc-macros.stdbit_macros
+)
+
add_gen_header(
stdio
DEF_FILE stdio.h.def
diff --git a/libc/include/llvm-libc-macros/CMakeLists.txt b/libc/include/llvm-libc-macros/CMakeLists.txt
index 96ee29d7327224c..c5a7e742cadd138 100644
--- a/libc/include/llvm-libc-macros/CMakeLists.txt
+++ b/libc/include/llvm-libc-macros/CMakeLists.txt
@@ -111,6 +111,12 @@ add_macro_header(
signal-macros.h
)
+add_macro_header(
+ stdbit_macros
+ HDR
+ stdbit-macros.h
+)
+
add_macro_header(
stdio_macros
HDR
diff --git a/libc/include/llvm-libc-macros/stdbit-macros.h b/libc/include/llvm-libc-macros/stdbit-macros.h
new file mode 100644
index 000000000000000..183328877c3da89
--- /dev/null
+++ b/libc/include/llvm-libc-macros/stdbit-macros.h
@@ -0,0 +1,19 @@
+//===-- Definition of macros to be used with stdbit functions ----------===//
+//
+// 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_STDBIT_MACROS_H
+#define __LLVM_LIBC_MACROS_STDBIT_MACROS_H
+
+#define stdc_leading_zeros(x) _Generic((x), \
+ unsigned char: stdc_leading_zeros_uc, \
+ unsigned short: stdc_leading_zeros_us, \
+ unsigned: stdc_leading_zeros_ui, \
+ unsigned long: stdc_leading_zeros_ul, \
+ unsigned long long: stdc_leading_zeros_ull)(x)
+
+#endif // __LLVM_LIBC_MACROS_STDBIT_MACROS_H
diff --git a/libc/include/stdbit.h.def b/libc/include/stdbit.h.def
new file mode 100644
index 000000000000000..cb79ac1caf049fd
--- /dev/null
+++ b/libc/include/stdbit.h.def
@@ -0,0 +1,17 @@
+//===-- C standard library header stdbit.h --------------------------------===//
+//
+// 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_STDBIT_H
+#define LLVM_LIBC_STDBIT_H
+
+#include <__llvm-libc-common.h>
+#include <llvm-libc-macros/stdbit-macros.h>
+
+%%public_api()
+
+#endif // LLVM_LIBC_STDBIT_H
diff --git a/libc/spec/spec.td b/libc/spec/spec.td
index 818cfaee6b61c2b..16abf97bf0b1cb4 100644
--- a/libc/spec/spec.td
+++ b/libc/spec/spec.td
@@ -50,6 +50,7 @@ def DoubleType : NamedType<"double">;
def LongDoubleType : NamedType<"long double">;
def CharType : NamedType<"char">;
def UnsignedCharType : NamedType<"unsigned char">;
+def UnsignedShortType : NamedType<"unsigned short">;
// TODO: Add compatibility layer to use C23 type _Float128 if possible.
def Float128Type : NamedType<"__float128">;
diff --git a/libc/spec/stdc.td b/libc/spec/stdc.td
index 43b81c4abaa0e6b..b21f620d0766af6 100644
--- a/libc/spec/stdc.td
+++ b/libc/spec/stdc.td
@@ -767,6 +767,22 @@ def StdC : StandardSpec<"stdc"> {
]
>;
+ HeaderSpec StdBit = HeaderSpec<
+ "stdbit.h",
+ [
+ Macro<"stdc_leading_zeros">
+ ], // Macros
+ [], // Types
+ [], // Enumerations
+ [
+ FunctionSpec<"stdc_leading_zeros_uc", RetValSpec<UnsignedCharType>, [ArgSpec<UnsignedCharType>]>,
+ FunctionSpec<"stdc_leading_zeros_us", RetValSpec<UnsignedShortType>, [ArgSpec<UnsignedShortType>]>,
+ FunctionSpec<"stdc_leading_zeros_ui", RetValSpec<UnsignedIntType>, [ArgSpec<UnsignedIntType>]>,
+ FunctionSpec<"stdc_leading_zeros_ul", RetValSpec<UnsignedLongType>, [ArgSpec<UnsignedLongType>]>,
+ FunctionSpec<"stdc_leading_zeros_ull", RetValSpec<UnsignedLongLongType>, [ArgSpec<UnsignedLongLongType>]>
+ ] // Functions
+ >;
+
HeaderSpec StdLib = HeaderSpec<
"stdlib.h",
[], // Macros
@@ -1141,7 +1157,7 @@ def StdC : StandardSpec<"stdc"> {
"wchar.h",
[ // Macros
Macro<"WEOF">,
- ],
+ ],
[ //Types
SizeTType,
WIntType,
@@ -1167,6 +1183,7 @@ def StdC : StandardSpec<"stdc"> {
Limits,
Math,
String,
+ StdBit,
StdIO,
StdLib,
IntTypes,
diff --git a/libc/src/CMakeLists.txt b/libc/src/CMakeLists.txt
index 492f9c5bd50f9bc..5211db7bc1f993e 100644
--- a/libc/src/CMakeLists.txt
+++ b/libc/src/CMakeLists.txt
@@ -5,9 +5,10 @@ add_subdirectory(errno)
add_subdirectory(fenv)
add_subdirectory(inttypes)
add_subdirectory(math)
-add_subdirectory(string)
-add_subdirectory(stdlib)
+add_subdirectory(stdbit)
add_subdirectory(stdio)
+add_subdirectory(stdlib)
+add_subdirectory(string)
add_subdirectory(wchar)
if(${LIBC_TARGET_OS} STREQUAL "linux")
diff --git a/libc/src/stdbit/CMakeLists.txt b/libc/src/stdbit/CMakeLists.txt
new file mode 100644
index 000000000000000..5747a8c2f353181
--- /dev/null
+++ b/libc/src/stdbit/CMakeLists.txt
@@ -0,0 +1,39 @@
+add_entrypoint_object(
+ stdc_leading_zeros_uc
+ SRCS
+ stdc_leading_zeros_uc.cpp
+ HDRS
+ stdc_leading_zeros_uc.h
+)
+
+add_entrypoint_object(
+ stdc_leading_zeros_us
+ SRCS
+ stdc_leading_zeros_us.cpp
+ HDRS
+ stdc_leading_zeros_us.h
+)
+
+add_entrypoint_object(
+ stdc_leading_zeros_ui
+ SRCS
+ stdc_leading_zeros_ui.cpp
+ HDRS
+ stdc_leading_zeros_ui.h
+)
+
+add_entrypoint_object(
+ stdc_leading_zeros_ul
+ SRCS
+ stdc_leading_zeros_ul.cpp
+ HDRS
+ stdc_leading_zeros_ul.h
+)
+
+add_entrypoint_object(
+ stdc_leading_zeros_ull
+ SRCS
+ stdc_leading_zeros_ull.cpp
+ HDRS
+ stdc_leading_zeros_ull.h
+)
diff --git a/libc/src/stdbit/stdc_leading_zeros_uc.cpp b/libc/src/stdbit/stdc_leading_zeros_uc.cpp
new file mode 100644
index 000000000000000..a985700274d2594
--- /dev/null
+++ b/libc/src/stdbit/stdc_leading_zeros_uc.cpp
@@ -0,0 +1,20 @@
+//===-- Implementation of stdc_leading_zeros_uc ---------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#include "src/stdbit/stdc_leading_zeros_uc.h"
+
+#include "src/__support/CPP/bit.h"
+#include "src/__support/common.h"
+
+namespace LIBC_NAMESPACE {
+
+LLVM_LIBC_FUNCTION(unsigned char, stdc_leading_zeros_uc, (unsigned char value)) {
+ return static_cast<unsigned char>(cpp::countl_zero(value));
+}
+
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_leading_zeros_uc.h b/libc/src/stdbit/stdc_leading_zeros_uc.h
new file mode 100644
index 000000000000000..0622e72b0683ee2
--- /dev/null
+++ b/libc/src/stdbit/stdc_leading_zeros_uc.h
@@ -0,0 +1,18 @@
+//===-- Implementation header for stdc_leading_zeros_uc ---------*- 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_STDBIT_STDC_LEADING_ZEROS_UC_H
+#define LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_UC_H
+
+namespace LIBC_NAMESPACE {
+
+unsigned char stdc_leading_zeros_uc(unsigned char value);
+
+} // namespace LIBC_NAMESPACE
+
+#endif // LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_UC_H
diff --git a/libc/src/stdbit/stdc_leading_zeros_ui.cpp b/libc/src/stdbit/stdc_leading_zeros_ui.cpp
new file mode 100644
index 000000000000000..99bc0eb70f33bf7
--- /dev/null
+++ b/libc/src/stdbit/stdc_leading_zeros_ui.cpp
@@ -0,0 +1,20 @@
+//===-- Implementation of stdc_leading_zeros_ui ---------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#include "src/stdbit/stdc_leading_zeros_ui.h"
+
+#include "src/__support/CPP/bit.h"
+#include "src/__support/common.h"
+
+namespace LIBC_NAMESPACE {
+
+LLVM_LIBC_FUNCTION(unsigned, stdc_leading_zeros_ui, (unsigned value)) {
+ return static_cast<unsigned>(cpp::countl_zero(value));
+}
+
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_leading_zeros_ui.h b/libc/src/stdbit/stdc_leading_zeros_ui.h
new file mode 100644
index 000000000000000..14113d486b54a0f
--- /dev/null
+++ b/libc/src/stdbit/stdc_leading_zeros_ui.h
@@ -0,0 +1,18 @@
+//===-- Implementation header for stdc_leading_zeros_ui ---------*- 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_STDBIT_STDC_LEADING_ZEROS_UI_H
+#define LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_UI_H
+
+namespace LIBC_NAMESPACE {
+
+unsigned stdc_leading_zeros_ui(unsigned value);
+
+} // namespace LIBC_NAMESPACE
+
+#endif // LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_UI_H
diff --git a/libc/src/stdbit/stdc_leading_zeros_ul.cpp b/libc/src/stdbit/stdc_leading_zeros_ul.cpp
new file mode 100644
index 000000000000000..4ce56be04ff358e
--- /dev/null
+++ b/libc/src/stdbit/stdc_leading_zeros_ul.cpp
@@ -0,0 +1,20 @@
+//===-- Implementation of stdc_leading_zeros_ul ---------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#include "src/stdbit/stdc_leading_zeros_ul.h"
+
+#include "src/__support/CPP/bit.h"
+#include "src/__support/common.h"
+
+namespace LIBC_NAMESPACE {
+
+LLVM_LIBC_FUNCTION(unsigned long, stdc_leading_zeros_ul, (unsigned long value)) {
+ return static_cast<unsigned long>(cpp::countl_zero(value));
+}
+
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_leading_zeros_ul.h b/libc/src/stdbit/stdc_leading_zeros_ul.h
new file mode 100644
index 000000000000000..a1f36299931dc2b
--- /dev/null
+++ b/libc/src/stdbit/stdc_leading_zeros_ul.h
@@ -0,0 +1,18 @@
+//===-- Implementation header for stdc_leading_zeros_ul ---------*- 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_STDBIT_STDC_LEADING_ZEROS_UL_H
+#define LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_UL_H
+
+namespace LIBC_NAMESPACE {
+
+unsigned long stdc_leading_zeros_ul(unsigned long value);
+
+} // namespace LIBC_NAMESPACE
+
+#endif // LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_UL_H
diff --git a/libc/src/stdbit/stdc_leading_zeros_ull.cpp b/libc/src/stdbit/stdc_leading_zeros_ull.cpp
new file mode 100644
index 000000000000000..5abd6a6e7aab9f7
--- /dev/null
+++ b/libc/src/stdbit/stdc_leading_zeros_ull.cpp
@@ -0,0 +1,20 @@
+//===-- Implementation of stdc_leading_zeros_ull --------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#include "src/stdbit/stdc_leading_zeros_ull.h"
+
+#include "src/__support/CPP/bit.h"
+#include "src/__support/common.h"
+
+namespace LIBC_NAMESPACE {
+
+LLVM_LIBC_FUNCTION(unsigned long long, stdc_leading_zeros_ull, (unsigned long long value)) {
+ return static_cast<unsigned long long>(cpp::countl_zero(value));
+}
+
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_leading_zeros_ull.h b/libc/src/stdbit/stdc_leading_zeros_ull.h
new file mode 100644
index 000000000000000..b05855b296af0b9
--- /dev/null
+++ b/libc/src/stdbit/stdc_leading_zeros_ull.h
@@ -0,0 +1,18 @@
+//===-- Implementation header for stdc_leading_zeros_ull --------*- 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_STDBIT_STDC_LEADING_ZEROS_ULL_H
+#define LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_ULL_H
+
+namespace LIBC_NAMESPACE {
+
+unsigned long long stdc_leading_zeros_ull(unsigned long long value);
+
+} // namespace LIBC_NAMESPACE
+
+#endif // LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_ULL_H
diff --git a/libc/src/stdbit/stdc_leading_zeros_us.cpp b/libc/src/stdbit/stdc_leading_zeros_us.cpp
new file mode 100644
index 000000000000000..0c14d5374a97373
--- /dev/null
+++ b/libc/src/stdbit/stdc_leading_zeros_us.cpp
@@ -0,0 +1,20 @@
+//===-- Implementation of stdc_leading_zeros_us ---------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#include "src/stdbit/stdc_leading_zeros_us.h"
+
+#include "src/__support/CPP/bit.h"
+#include "src/__support/common.h"
+
+namespace LIBC_NAMESPACE {
+
+LLVM_LIBC_FUNCTION(unsigned short, stdc_leading_zeros_us, (unsigned short value)) {
+ return static_cast<unsigned short>(cpp::countl_zero(value));
+}
+
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_leading_zeros_us.h b/libc/src/stdbit/stdc_leading_zeros_us.h
new file mode 100644
index 000000000000000..c0f62e2be2f02b4
--- /dev/null
+++ b/libc/src/stdbit/stdc_leading_zeros_us.h
@@ -0,0 +1,18 @@
+//===-- Implementation header for stdc_leading_zeros_us ---------*- 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_STDBIT_STDC_LEADING_ZEROS_US_H
+#define LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_US_H
+
+namespace LIBC_NAMESPACE {
+
+unsigned short stdc_leading_zeros_us(unsigned short value);
+
+} // namespace LIBC_NAMESPACE
+
+#endif // LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_US_H
diff --git a/libc/test/include/CMakeLists.txt b/libc/test/include/CMakeLists.txt
index 183e7ecde719e55..69a08822b06dc64 100644
--- a/libc/test/include/CMakeLists.txt
+++ b/libc/test/include/CMakeLists.txt
@@ -14,3 +14,22 @@ add_libc_test(
# This is needed because the __containerof macro uses statement expression.
-Wno-gnu-statement-expression-from-macro-expansion
)
+
+add_libc_test(
+ stdbit_test
+ SUITE
+ libc_include_tests
+ SRCS
+ stdbit_test.cpp
+ DEPENDS
+ libc.__support.CPP.limits
+ libc.include.llvm-libc-macros.stdbit_macros
+ libc.src.stdbit.stdc_leading_zeros_uc
+ libc.src.stdbit.stdc_leading_zeros_ui
+ libc.src.stdbit.stdc_leading_zeros_ul
+ libc.src.stdbit.stdc_leading_zeros_ull
+ libc.src.stdbit.stdc_leading_zeros_us
+ COMPILE_OPTIONS
+ # stdbit is full of type generic macros implemented via C11 _Generic.
+ -Wno-c11-extensions
+)
diff --git a/libc/test/include/stdbit_test.cpp b/libc/test/include/stdbit_test.cpp
new file mode 100644
index 000000000000000..c2e019d1096ea16
--- /dev/null
+++ b/libc/test/include/stdbit_test.cpp
@@ -0,0 +1,22 @@
+//===-- Unittests for stdbit ----------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDSList-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "test/UnitTest/Test.h"
+
+#include "llvm-libc-macros/stdbit-macros.h"
+#include "src/__support/CPP/limits.h" // UINT_WIDTH
+#include "src/stdbit/stdc_leading_zeros_uc.h"
+#include "src/stdbit/stdc_leading_zeros_ui.h"
+#include "src/stdbit/stdc_leading_zeros_ul.h"
+#include "src/stdbit/stdc_leading_zeros_ull.h"
+#include "src/stdbit/stdc_leading_zeros_us.h"
+
+TEST(LlvmLibcStdbitTest, TypeGenericMacro) {
+ using namespace LIBC_NAMESPACE;
+ EXPECT_EQ(stdc_leading_zeros(0U), static_cast<unsigned>(UINT_WIDTH));
+}
diff --git a/libc/test/src/CMakeLists.txt b/libc/test/src/CMakeLists.txt
index 6bd8ace9ea71af0..1f899c729e0abca 100644
--- a/libc/test/src/CMakeLists.txt
+++ b/libc/test/src/CMakeLists.txt
@@ -40,13 +40,14 @@ add_subdirectory(__support)
add_subdirectory(ctype)
add_subdirectory(errno)
add_subdirectory(fenv)
-add_subdirectory(math)
-add_subdirectory(string)
-add_subdirectory(stdlib)
add_subdirectory(inttypes)
+add_subdirectory(math)
+add_subdirectory(search)
+add_subdirectory(stdbit)
add_subdirectory(stdio)
+add_subdirectory(stdlib)
+add_subdirectory(string)
add_subdirectory(wchar)
-add_subdirectory(search)
if(${LIBC_TARGET_OS} STREQUAL "linux")
add_subdirectory(fcntl)
@@ -113,7 +114,7 @@ add_custom_target(libc-api-test)
add_dependencies(check-libc libc-api-test)
set(
- allocator_entrypoints
+ allocator_entrypoints
libc.src.stdlib.malloc
libc.src.stdlib.calloc
libc.src.stdlib.realloc
diff --git a/libc/test/src/stdbit/CMakeLists.txt b/libc/test/src/stdbit/CMakeLists.txt
new file mode 100644
index 000000000000000..73b32e4ec0caeab
--- /dev/null
+++ b/libc/test/src/stdbit/CMakeLists.txt
@@ -0,0 +1,51 @@
+add_custom_target(libc-stdbit-tests)
+
+add_libc_test(
+ stdc_leading_zeros_uc_test
+ SUITE
+ libc-stdbit-tests
+ SRCS
+ stdc_leading_zeros_uc_test.cpp
+ DEPENDS
+ libc.src.stdbit.stdc_leading_zeros_uc
+)
+
+add_libc_test(
+ stdc_leading_zeros_us_test
+ SUITE
+ libc-stdbit-tests
+ SRCS
+ stdc_leading_zeros_us_test.cpp
+ DEPENDS
+ libc.src.stdbit.stdc_leading_zeros_us
+)
+
+add_libc_test(
+ stdc_leading_zeros_ui_test
+ SUITE
+ libc-stdbit-tests
+ SRCS
+ stdc_leading_zeros_ui_test.cpp
+ DEPENDS
+ libc.src.stdbit.stdc_leading_zeros_ui
+)
+
+add_libc_test(
+ stdc_leading_zeros_ul_test
+ SUITE
+ libc-stdbit-tests
+ SRCS
+ stdc_leading_zeros_ul_test.cpp
+ DEPENDS
+ libc.src.stdbit.stdc_leading_zeros_ul
+)
+
+add_libc_test(
+ stdc_leading_zeros_ull_test
+ SUITE
+ libc-stdbit-tests
+ SRCS
+ stdc_leading_zeros_ull_test.cpp
+ DEPENDS
+ libc.src.stdbit.stdc_leading_zeros_ull
+...
[truncated]
|
nickdesaulniers
commented
Jan 27, 2024
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
libc/test/include/CMakeLists.txt
Outdated
| libc.src.stdbit.stdc_leading_zeros_ull | ||
| libc.src.stdbit.stdc_leading_zeros_us | ||
| COMPILE_OPTIONS | ||
| # stdbit is full of type generic macros implemented via C11 _Generic. |
There was a problem hiding this comment.
if you are using C11 features then why is the flag -Wno-c11-extensions? This comment may need some more detail.
There was a problem hiding this comment.
added more info in dfbf115e640e, but let me know if there's a better way to word this.
libc/test/include/stdbit_test.cpp
Outdated
| #include "src/stdbit/stdc_leading_zeros_us.h" | ||
|
|
||
| TEST(LlvmLibcStdbitTest, TypeGenericMacro) { | ||
| using namespace LIBC_NAMESPACE; |
There was a problem hiding this comment.
generally in tests we should avoid doing using namespace LIBC_NAMESPACE since it means that if the namespaced symbol isn't available but the system one is, the test will still pass.
There was a problem hiding this comment.
I've changed this test significantly in 3386377, PTAL
| #include "src/stdbit/stdc_leading_zeros_uc.h" | ||
| #include "test/UnitTest/Test.h" | ||
|
|
||
| #define LZ(x) LIBC_NAMESPACE::stdc_leading_zeros_uc((x)) |
There was a problem hiding this comment.
given that this macro is used in two places, I think it's cleaner to not use the macro and instead write out the function call. Same for the other test files.
| @@ -0,0 +1,25 @@ | |||
| //===-- Unittests for stdc_leading_zeros_ull | |||
|
https://snapshots.sourceware.org/glibc/trunk/latest/manual/html_node/Bit-Manipulation.html |
lntue
reviewed
Jan 27, 2024
| stdc_leading_zeros_uc.cpp | ||
| HDRS | ||
| stdc_leading_zeros_uc.h | ||
| ) |
There was a problem hiding this comment.
Can you add DEPENDS libc.src.__support.CPP.bit to these entrypoints?
There was a problem hiding this comment.
fixed in 7a898f3, good catch (I'll get the hang of this)
lntue
reviewed
Jan 27, 2024
| SRCS | ||
| stdc_leading_zeros_ull_test.cpp | ||
| DEPENDS | ||
| libc.src.stdbit.stdc_leading_zeros_ull |
There was a problem hiding this comment.
Can you add libc.src.__support.CPP.limits to their lists of dependency?
There was a problem hiding this comment.
I've removed this dependency in 3386377, but please triple check.
gchatelet
reviewed
Jan 29, 2024
Right, there's something like 70 functions to implement for stdbit.h. This PR is just 5 of them (with the corresponding type-generic macro). In terms of completeness, we'll need to ensure that we provide all of the preprocessor defines that the standard mandates. Since those macros may be used as feature detection, we should wait to provide them until the implementation is complete and tested. |
lntue
approved these changes
Jan 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Test via:
$ ninja libc-stdbit-tests libc_include_tests