[libc] [llvm] [libc][NFC] Rename `UInt.h` to `big_int.h` and `UInt128.h` to `uint128.h` for consistency (PR #87808)
Guillaume Chatelet via llvm-commits
llvm-commits at lists.llvm.org
Sat Apr 6 01:27:11 PDT 2024
https://github.com/gchatelet updated https://github.com/llvm/llvm-project/pull/87808
>From bfd8ae4dd069bf8bdddf38b4c3a330a205f46c33 Mon Sep 17 00:00:00 2001
From: Guillaume Chatelet <gchatelet at google.com>
Date: Fri, 5 Apr 2024 17:29:10 +0000
Subject: [PATCH 1/2] [libc][NFC] Rename `UInt.h` to `big_int.h` and
`UInt128.h` to `uint128.h` for consistency
---
libc/fuzzing/__support/CMakeLists.txt | 2 +-
libc/fuzzing/__support/uint_fuzz.cpp | 2 +-
libc/src/__support/CMakeLists.txt | 10 +++++-----
libc/src/__support/FPUtil/BasicOperations.h | 2 +-
libc/src/__support/FPUtil/CMakeLists.txt | 2 +-
libc/src/__support/FPUtil/FPBits.h | 2 +-
libc/src/__support/FPUtil/Hypot.h | 2 +-
libc/src/__support/FPUtil/dyadic_float.h | 2 +-
libc/src/__support/FPUtil/generic/FMA.h | 2 +-
libc/src/__support/FPUtil/generic/sqrt.h | 2 +-
.../FPUtil/generic/sqrt_80_bit_long_double.h | 2 +-
libc/src/__support/{UInt.h => big_int.h} | 0
libc/src/__support/float_to_string.h | 2 +-
libc/src/__support/hash.h | 2 +-
libc/src/__support/integer_literals.h | 2 +-
libc/src/__support/integer_to_string.h | 2 +-
libc/src/__support/str_to_float.h | 2 +-
libc/src/__support/str_to_integer.h | 2 +-
libc/src/__support/{UInt128.h => uint128.h} | 2 +-
libc/src/math/generic/log_range_reduction.h | 2 +-
libc/src/stdio/printf_core/CMakeLists.txt | 12 ++++++------
libc/src/stdio/printf_core/float_dec_converter.h | 2 +-
libc/test/UnitTest/CMakeLists.txt | 4 ++--
libc/test/UnitTest/LibcTest.cpp | 2 +-
libc/test/UnitTest/StringUtils.h | 2 +-
libc/test/UnitTest/TestLogger.cpp | 6 +++---
libc/test/src/__support/CMakeLists.txt | 4 ++--
libc/test/src/__support/CPP/CMakeLists.txt | 4 ++--
libc/test/src/__support/CPP/bit_test.cpp | 2 +-
libc/test/src/__support/CPP/limits_test.cpp | 2 +-
.../src/__support/FPUtil/dyadic_float_test.cpp | 2 +-
.../__support/high_precision_decimal_test.cpp | 2 +-
.../src/__support/integer_to_string_test.cpp | 4 ++--
libc/test/src/__support/math_extras_test.cpp | 2 +-
libc/test/src/__support/str_to_fp_test.h | 2 +-
libc/test/src/__support/uint_test.cpp | 2 +-
libc/test/src/math/smoke/nanf128_test.cpp | 2 +-
libc/test/src/stdlib/strtold_test.cpp | 2 +-
.../bazel/llvm-project-overlay/libc/BUILD.bazel | 16 ++++++++--------
.../libc/test/UnitTest/BUILD.bazel | 4 ++--
.../libc/test/src/__support/BUILD.bazel | 4 ++--
.../libc/test/src/__support/CPP/BUILD.bazel | 4 ++--
.../libc/test/src/__support/FPUtil/BUILD.bazel | 2 +-
43 files changed, 67 insertions(+), 67 deletions(-)
rename libc/src/__support/{UInt.h => big_int.h} (100%)
rename libc/src/__support/{UInt128.h => uint128.h} (97%)
diff --git a/libc/fuzzing/__support/CMakeLists.txt b/libc/fuzzing/__support/CMakeLists.txt
index 278e914e3fbe95..d4f6db71fdd849 100644
--- a/libc/fuzzing/__support/CMakeLists.txt
+++ b/libc/fuzzing/__support/CMakeLists.txt
@@ -3,5 +3,5 @@ add_libc_fuzzer(
SRCS
uint_fuzz.cpp
DEPENDS
- libc.src.__support.uint
+ libc.src.__support.big_int
)
diff --git a/libc/fuzzing/__support/uint_fuzz.cpp b/libc/fuzzing/__support/uint_fuzz.cpp
index f48f00d3b4ba11..07149f511b8386 100644
--- a/libc/fuzzing/__support/uint_fuzz.cpp
+++ b/libc/fuzzing/__support/uint_fuzz.cpp
@@ -1,5 +1,5 @@
#include "src/__support/CPP/bit.h"
-#include "src/__support/UInt.h"
+#include "src/__support/big_int.h"
#include "src/string/memory_utils/inline_memcpy.h"
using namespace LIBC_NAMESPACE;
diff --git a/libc/src/__support/CMakeLists.txt b/libc/src/__support/CMakeLists.txt
index 7b1820d9bf3538..dcae55e050bf1f 100644
--- a/libc/src/__support/CMakeLists.txt
+++ b/libc/src/__support/CMakeLists.txt
@@ -104,7 +104,7 @@ add_header_library(
HDRS
integer_to_string.h
DEPENDS
- .uint
+ .big_int
libc.src.__support.common
libc.src.__support.CPP.algorithm
libc.src.__support.CPP.limits
@@ -204,9 +204,9 @@ add_header_library(
)
add_header_library(
- uint
+ big_int
HDRS
- UInt.h
+ big_int.h
DEPENDS
.math_extras
.number_pair
@@ -220,9 +220,9 @@ add_header_library(
add_header_library(
uint128
HDRS
- UInt128.h
+ uint128.h
DEPENDS
- .uint
+ .big_int
libc.src.__support.macros.properties.types
)
diff --git a/libc/src/__support/FPUtil/BasicOperations.h b/libc/src/__support/FPUtil/BasicOperations.h
index 6e4156497618e2..e5ac101fedc0e3 100644
--- a/libc/src/__support/FPUtil/BasicOperations.h
+++ b/libc/src/__support/FPUtil/BasicOperations.h
@@ -14,9 +14,9 @@
#include "FEnvImpl.h"
#include "src/__support/CPP/type_traits.h"
-#include "src/__support/UInt128.h"
#include "src/__support/common.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
+#include "src/__support/uint128.h"
namespace LIBC_NAMESPACE {
namespace fputil {
diff --git a/libc/src/__support/FPUtil/CMakeLists.txt b/libc/src/__support/FPUtil/CMakeLists.txt
index ff155a19758d20..cc323dced5b365 100644
--- a/libc/src/__support/FPUtil/CMakeLists.txt
+++ b/libc/src/__support/FPUtil/CMakeLists.txt
@@ -201,8 +201,8 @@ add_header_library(
DEPENDS
.fp_bits
.multiply_add
+ libc.src.__support.big_int
libc.src.__support.common
- libc.src.__support.uint
libc.src.__support.macros.optimization
)
diff --git a/libc/src/__support/FPUtil/FPBits.h b/libc/src/__support/FPUtil/FPBits.h
index 155bff2f558102..ab050360c353b0 100644
--- a/libc/src/__support/FPUtil/FPBits.h
+++ b/libc/src/__support/FPUtil/FPBits.h
@@ -11,13 +11,13 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/CPP/type_traits.h"
-#include "src/__support/UInt128.h"
#include "src/__support/common.h"
#include "src/__support/libc_assert.h" // LIBC_ASSERT
#include "src/__support/macros/attributes.h" // LIBC_INLINE, LIBC_INLINE_VAR
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_FLOAT128
#include "src/__support/math_extras.h" // mask_trailing_ones
#include "src/__support/sign.h" // Sign
+#include "src/__support/uint128.h"
#include <stdint.h>
diff --git a/libc/src/__support/FPUtil/Hypot.h b/libc/src/__support/FPUtil/Hypot.h
index 2e699657346446..76b1f079762136 100644
--- a/libc/src/__support/FPUtil/Hypot.h
+++ b/libc/src/__support/FPUtil/Hypot.h
@@ -15,8 +15,8 @@
#include "rounding_mode.h"
#include "src/__support/CPP/bit.h"
#include "src/__support/CPP/type_traits.h"
-#include "src/__support/UInt128.h"
#include "src/__support/common.h"
+#include "src/__support/uint128.h"
namespace LIBC_NAMESPACE {
namespace fputil {
diff --git a/libc/src/__support/FPUtil/dyadic_float.h b/libc/src/__support/FPUtil/dyadic_float.h
index e0c205f52383ba..49fb11971104b3 100644
--- a/libc/src/__support/FPUtil/dyadic_float.h
+++ b/libc/src/__support/FPUtil/dyadic_float.h
@@ -12,7 +12,7 @@
#include "FPBits.h"
#include "multiply_add.h"
#include "src/__support/CPP/type_traits.h"
-#include "src/__support/UInt.h"
+#include "src/__support/big_int.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include <stddef.h>
diff --git a/libc/src/__support/FPUtil/generic/FMA.h b/libc/src/__support/FPUtil/generic/FMA.h
index f03af9246337ff..f403aa7333b394 100644
--- a/libc/src/__support/FPUtil/generic/FMA.h
+++ b/libc/src/__support/FPUtil/generic/FMA.h
@@ -14,9 +14,9 @@
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/rounding_mode.h"
-#include "src/__support/UInt128.h"
#include "src/__support/macros/attributes.h" // LIBC_INLINE
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
+#include "src/__support/uint128.h"
namespace LIBC_NAMESPACE {
namespace fputil {
diff --git a/libc/src/__support/FPUtil/generic/sqrt.h b/libc/src/__support/FPUtil/generic/sqrt.h
index b6b4aaecb2ccc1..7e7600ba6502a9 100644
--- a/libc/src/__support/FPUtil/generic/sqrt.h
+++ b/libc/src/__support/FPUtil/generic/sqrt.h
@@ -15,8 +15,8 @@
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/rounding_mode.h"
-#include "src/__support/UInt128.h"
#include "src/__support/common.h"
+#include "src/__support/uint128.h"
namespace LIBC_NAMESPACE {
namespace fputil {
diff --git a/libc/src/__support/FPUtil/generic/sqrt_80_bit_long_double.h b/libc/src/__support/FPUtil/generic/sqrt_80_bit_long_double.h
index 656ade4f773535..6308ffe95493e0 100644
--- a/libc/src/__support/FPUtil/generic/sqrt_80_bit_long_double.h
+++ b/libc/src/__support/FPUtil/generic/sqrt_80_bit_long_double.h
@@ -13,8 +13,8 @@
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/rounding_mode.h"
-#include "src/__support/UInt128.h"
#include "src/__support/common.h"
+#include "src/__support/uint128.h"
namespace LIBC_NAMESPACE {
namespace fputil {
diff --git a/libc/src/__support/UInt.h b/libc/src/__support/big_int.h
similarity index 100%
rename from libc/src/__support/UInt.h
rename to libc/src/__support/big_int.h
diff --git a/libc/src/__support/float_to_string.h b/libc/src/__support/float_to_string.h
index 4c59cfd99c2e6c..09b13324f25bbd 100644
--- a/libc/src/__support/float_to_string.h
+++ b/libc/src/__support/float_to_string.h
@@ -15,7 +15,7 @@
#include "src/__support/CPP/type_traits.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/dyadic_float.h"
-#include "src/__support/UInt.h"
+#include "src/__support/big_int.h"
#include "src/__support/common.h"
#include "src/__support/libc_assert.h"
#include "src/__support/macros/attributes.h"
diff --git a/libc/src/__support/hash.h b/libc/src/__support/hash.h
index 6b362ba8318910..d1218fdc25927f 100644
--- a/libc/src/__support/hash.h
+++ b/libc/src/__support/hash.h
@@ -11,8 +11,8 @@
#include "src/__support/CPP/bit.h" // rotl
#include "src/__support/CPP/limits.h" // numeric_limits
-#include "src/__support/UInt128.h" // UInt128
#include "src/__support/macros/attributes.h" // LIBC_INLINE
+#include "src/__support/uint128.h" // UInt128
#include <stdint.h> // For uint64_t
namespace LIBC_NAMESPACE {
diff --git a/libc/src/__support/integer_literals.h b/libc/src/__support/integer_literals.h
index e99799c3512e2f..5fb67464090cef 100644
--- a/libc/src/__support/integer_literals.h
+++ b/libc/src/__support/integer_literals.h
@@ -14,8 +14,8 @@
#define LLVM_LIBC_SRC___SUPPORT_INTEGER_LITERALS_H
#include "src/__support/CPP/limits.h" // CHAR_BIT
-#include "src/__support/UInt128.h" // UInt128
#include "src/__support/macros/attributes.h" // LIBC_INLINE
+#include "src/__support/uint128.h" // UInt128
#include <stddef.h> // size_t
#include <stdint.h> // uintxx_t
diff --git a/libc/src/__support/integer_to_string.h b/libc/src/__support/integer_to_string.h
index f72d00d1a7456d..375f0e82960e38 100644
--- a/libc/src/__support/integer_to_string.h
+++ b/libc/src/__support/integer_to_string.h
@@ -67,7 +67,7 @@
#include "src/__support/CPP/span.h"
#include "src/__support/CPP/string_view.h"
#include "src/__support/CPP/type_traits.h"
-#include "src/__support/UInt.h" // make_integral_or_big_int_unsigned_t
+#include "src/__support/big_int.h" // make_integral_or_big_int_unsigned_t
#include "src/__support/common.h"
namespace LIBC_NAMESPACE {
diff --git a/libc/src/__support/str_to_float.h b/libc/src/__support/str_to_float.h
index f622b7edaa8a72..cd0c07629f8766 100644
--- a/libc/src/__support/str_to_float.h
+++ b/libc/src/__support/str_to_float.h
@@ -17,13 +17,13 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/dyadic_float.h"
#include "src/__support/FPUtil/rounding_mode.h"
-#include "src/__support/UInt128.h"
#include "src/__support/common.h"
#include "src/__support/ctype_utils.h"
#include "src/__support/detailed_powers_of_ten.h"
#include "src/__support/high_precision_decimal.h"
#include "src/__support/str_to_integer.h"
#include "src/__support/str_to_num_result.h"
+#include "src/__support/uint128.h"
#include "src/errno/libc_errno.h" // For ERANGE
namespace LIBC_NAMESPACE {
diff --git a/libc/src/__support/str_to_integer.h b/libc/src/__support/str_to_integer.h
index 02c71d40a1c0ad..6db851ab0e65a5 100644
--- a/libc/src/__support/str_to_integer.h
+++ b/libc/src/__support/str_to_integer.h
@@ -11,10 +11,10 @@
#include "src/__support/CPP/limits.h"
#include "src/__support/CPP/type_traits.h"
-#include "src/__support/UInt128.h"
#include "src/__support/common.h"
#include "src/__support/ctype_utils.h"
#include "src/__support/str_to_num_result.h"
+#include "src/__support/uint128.h"
#include "src/errno/libc_errno.h" // For ERANGE
namespace LIBC_NAMESPACE {
diff --git a/libc/src/__support/UInt128.h b/libc/src/__support/uint128.h
similarity index 97%
rename from libc/src/__support/UInt128.h
rename to libc/src/__support/uint128.h
index b6ef9ca18eb01f..722e79d0802e22 100644
--- a/libc/src/__support/UInt128.h
+++ b/libc/src/__support/uint128.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_UINT128_H
#define LLVM_LIBC_SRC___SUPPORT_UINT128_H
-#include "UInt.h"
+#include "big_int.h"
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128
#ifdef LIBC_TYPES_HAS_INT128
diff --git a/libc/src/math/generic/log_range_reduction.h b/libc/src/math/generic/log_range_reduction.h
index 64c0fc3aa4f539..d12da47a2cfae7 100644
--- a/libc/src/math/generic/log_range_reduction.h
+++ b/libc/src/math/generic/log_range_reduction.h
@@ -11,7 +11,7 @@
#include "common_constants.h"
#include "src/__support/FPUtil/dyadic_float.h"
-#include "src/__support/UInt128.h"
+#include "src/__support/uint128.h"
namespace LIBC_NAMESPACE {
diff --git a/libc/src/stdio/printf_core/CMakeLists.txt b/libc/src/stdio/printf_core/CMakeLists.txt
index 7db79c54beb0ae..21ff0d43ab7287 100644
--- a/libc/src/stdio/printf_core/CMakeLists.txt
+++ b/libc/src/stdio/printf_core/CMakeLists.txt
@@ -82,21 +82,21 @@ add_object_library(
float_dec_converter.h
fixed_converter.h #TODO: Check if this should be disabled when fixed unavail
DEPENDS
- .writer
.core_structs
.printf_config
+ .writer
+ libc.src.__support.big_int
+ libc.src.__support.common
libc.src.__support.CPP.limits
libc.src.__support.CPP.span
libc.src.__support.CPP.string_view
- libc.src.__support.FPUtil.fp_bits
+ libc.src.__support.float_to_string
libc.src.__support.FPUtil.fenv_impl
+ libc.src.__support.FPUtil.fp_bits
libc.src.__support.FPUtil.rounding_mode
- libc.src.__support.common
+ libc.src.__support.integer_to_string
libc.src.__support.libc_assert
- libc.src.__support.uint
libc.src.__support.uint128
- libc.src.__support.integer_to_string
- libc.src.__support.float_to_string
)
diff --git a/libc/src/stdio/printf_core/float_dec_converter.h b/libc/src/stdio/printf_core/float_dec_converter.h
index c4e8aaa2f0e2e9..666e4c9fa75e14 100644
--- a/libc/src/stdio/printf_core/float_dec_converter.h
+++ b/libc/src/stdio/printf_core/float_dec_converter.h
@@ -12,7 +12,7 @@
#include "src/__support/CPP/string_view.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/rounding_mode.h"
-#include "src/__support/UInt.h" // is_big_int_v
+#include "src/__support/big_int.h" // is_big_int_v
#include "src/__support/float_to_string.h"
#include "src/__support/integer_to_string.h"
#include "src/__support/libc_assert.h"
diff --git a/libc/test/UnitTest/CMakeLists.txt b/libc/test/UnitTest/CMakeLists.txt
index d830d22bb540e9..4411170502ed69 100644
--- a/libc/test/UnitTest/CMakeLists.txt
+++ b/libc/test/UnitTest/CMakeLists.txt
@@ -68,6 +68,7 @@ add_unittest_framework_library(
Test.h
TestLogger.h
DEPENDS
+ libc.src.__support.big_int
libc.src.__support.c_string
libc.src.__support.CPP.string
libc.src.__support.CPP.string_view
@@ -75,7 +76,6 @@ add_unittest_framework_library(
libc.src.__support.fixed_point.fx_rep
libc.src.__support.macros.properties.types
libc.src.__support.OSUtil.osutil
- libc.src.__support.uint
libc.src.__support.uint128
)
@@ -103,9 +103,9 @@ add_header_library(
HDRS
StringUtils.h
DEPENDS
+ libc.src.__support.big_int
libc.src.__support.CPP.string
libc.src.__support.CPP.type_traits
- libc.src.__support.uint
)
add_unittest_framework_library(
diff --git a/libc/test/UnitTest/LibcTest.cpp b/libc/test/UnitTest/LibcTest.cpp
index 03cd25191ecd5c..846ad331e5237e 100644
--- a/libc/test/UnitTest/LibcTest.cpp
+++ b/libc/test/UnitTest/LibcTest.cpp
@@ -11,9 +11,9 @@
#include "include/llvm-libc-macros/stdfix-macros.h"
#include "src/__support/CPP/string.h"
#include "src/__support/CPP/string_view.h"
-#include "src/__support/UInt128.h"
#include "src/__support/fixed_point/fx_rep.h"
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128
+#include "src/__support/uint128.h"
#include "test/UnitTest/TestLogger.h"
#if __STDC_HOSTED__
diff --git a/libc/test/UnitTest/StringUtils.h b/libc/test/UnitTest/StringUtils.h
index cab0b58f969058..61d74b49d4c988 100644
--- a/libc/test/UnitTest/StringUtils.h
+++ b/libc/test/UnitTest/StringUtils.h
@@ -11,7 +11,7 @@
#include "src/__support/CPP/string.h"
#include "src/__support/CPP/type_traits.h"
-#include "src/__support/UInt.h"
+#include "src/__support/big_int.h"
namespace LIBC_NAMESPACE {
diff --git a/libc/test/UnitTest/TestLogger.cpp b/libc/test/UnitTest/TestLogger.cpp
index 4756188b46cb0b..feba4b5ddd39b4 100644
--- a/libc/test/UnitTest/TestLogger.cpp
+++ b/libc/test/UnitTest/TestLogger.cpp
@@ -1,10 +1,10 @@
#include "test/UnitTest/TestLogger.h"
#include "src/__support/CPP/string.h"
#include "src/__support/CPP/string_view.h"
-#include "src/__support/OSUtil/io.h" // write_to_stderr
-#include "src/__support/UInt.h" // is_big_int
-#include "src/__support/UInt128.h"
+#include "src/__support/OSUtil/io.h" // write_to_stderr
+#include "src/__support/big_int.h" // is_big_int
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128
+#include "src/__support/uint128.h"
#include <stdint.h>
diff --git a/libc/test/src/__support/CMakeLists.txt b/libc/test/src/__support/CMakeLists.txt
index 51b897f8b595a8..02ee91d0dc99a0 100644
--- a/libc/test/src/__support/CMakeLists.txt
+++ b/libc/test/src/__support/CMakeLists.txt
@@ -78,11 +78,11 @@ add_libc_test(
SRCS
integer_to_string_test.cpp
DEPENDS
+ libc.src.__support.big_int
libc.src.__support.CPP.limits
libc.src.__support.CPP.string_view
libc.src.__support.integer_literals
libc.src.__support.integer_to_string
- libc.src.__support.uint
libc.src.__support.uint128
)
@@ -107,9 +107,9 @@ if(NOT LIBC_TARGET_ARCHITECTURE_IS_NVPTX)
SRCS
uint_test.cpp
DEPENDS
+ libc.src.__support.big_int
libc.src.__support.CPP.optional
libc.src.__support.macros.properties.types
- libc.src.__support.uint
)
endif()
diff --git a/libc/test/src/__support/CPP/CMakeLists.txt b/libc/test/src/__support/CPP/CMakeLists.txt
index 74aa0c705ec467..708548f812c66c 100644
--- a/libc/test/src/__support/CPP/CMakeLists.txt
+++ b/libc/test/src/__support/CPP/CMakeLists.txt
@@ -17,9 +17,9 @@ add_libc_test(
SRCS
bit_test.cpp
DEPENDS
+ libc.src.__support.big_int
libc.src.__support.CPP.bit
libc.src.__support.macros.properties.types
- libc.src.__support.uint
)
add_libc_test(
@@ -59,9 +59,9 @@ add_libc_test(
SRCS
limits_test.cpp
DEPENDS
+ libc.src.__support.big_int
libc.src.__support.CPP.limits
libc.src.__support.macros.properties.types
- libc.src.__support.uint
)
add_libc_test(
diff --git a/libc/test/src/__support/CPP/bit_test.cpp b/libc/test/src/__support/CPP/bit_test.cpp
index 875b47e6a1980e..299623d2ca2407 100644
--- a/libc/test/src/__support/CPP/bit_test.cpp
+++ b/libc/test/src/__support/CPP/bit_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/CPP/bit.h"
-#include "src/__support/UInt.h"
+#include "src/__support/big_int.h"
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128
#include "test/UnitTest/Test.h"
diff --git a/libc/test/src/__support/CPP/limits_test.cpp b/libc/test/src/__support/CPP/limits_test.cpp
index efcd6839d07337..bcf7d5ed6a6e78 100644
--- a/libc/test/src/__support/CPP/limits_test.cpp
+++ b/libc/test/src/__support/CPP/limits_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/CPP/limits.h"
-#include "src/__support/UInt.h"
+#include "src/__support/big_int.h"
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128
#include "test/UnitTest/Test.h"
diff --git a/libc/test/src/__support/FPUtil/dyadic_float_test.cpp b/libc/test/src/__support/FPUtil/dyadic_float_test.cpp
index 5ee9aaad563827..809381ed47b59b 100644
--- a/libc/test/src/__support/FPUtil/dyadic_float_test.cpp
+++ b/libc/test/src/__support/FPUtil/dyadic_float_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/FPUtil/dyadic_float.h"
-#include "src/__support/UInt.h"
+#include "src/__support/big_int.h"
#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
diff --git a/libc/test/src/__support/high_precision_decimal_test.cpp b/libc/test/src/__support/high_precision_decimal_test.cpp
index 2bb28bcdab0212..7a3c323b06d511 100644
--- a/libc/test/src/__support/high_precision_decimal_test.cpp
+++ b/libc/test/src/__support/high_precision_decimal_test.cpp
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#include "src/__support/UInt128.h"
#include "src/__support/high_precision_decimal.h"
+#include "src/__support/uint128.h"
#include "test/UnitTest/Test.h"
diff --git a/libc/test/src/__support/integer_to_string_test.cpp b/libc/test/src/__support/integer_to_string_test.cpp
index 270fddd828b680..e644751b56c933 100644
--- a/libc/test/src/__support/integer_to_string_test.cpp
+++ b/libc/test/src/__support/integer_to_string_test.cpp
@@ -9,10 +9,10 @@
#include "src/__support/CPP/limits.h"
#include "src/__support/CPP/span.h"
#include "src/__support/CPP/string_view.h"
-#include "src/__support/UInt.h"
-#include "src/__support/UInt128.h"
+#include "src/__support/big_int.h"
#include "src/__support/integer_literals.h"
#include "src/__support/integer_to_string.h"
+#include "src/__support/uint128.h"
#include "test/UnitTest/Test.h"
diff --git a/libc/test/src/__support/math_extras_test.cpp b/libc/test/src/__support/math_extras_test.cpp
index 401e631ea4bac1..0047888965177e 100644
--- a/libc/test/src/__support/math_extras_test.cpp
+++ b/libc/test/src/__support/math_extras_test.cpp
@@ -6,9 +6,9 @@
//
//===----------------------------------------------------------------------===//
-#include "src/__support/UInt128.h" // UInt<128>
#include "src/__support/integer_literals.h"
#include "src/__support/math_extras.h"
+#include "src/__support/uint128.h" // UInt<128>
#include "test/UnitTest/Test.h"
namespace LIBC_NAMESPACE {
diff --git a/libc/test/src/__support/str_to_fp_test.h b/libc/test/src/__support/str_to_fp_test.h
index bddff035fdd162..8d6181cda884be 100644
--- a/libc/test/src/__support/str_to_fp_test.h
+++ b/libc/test/src/__support/str_to_fp_test.h
@@ -7,8 +7,8 @@
//===----------------------------------------------------------------------===//
#include "src/__support/FPUtil/FPBits.h"
-#include "src/__support/UInt128.h"
#include "src/__support/str_to_float.h"
+#include "src/__support/uint128.h"
#include "src/errno/libc_errno.h"
#include "test/UnitTest/Test.h"
diff --git a/libc/test/src/__support/uint_test.cpp b/libc/test/src/__support/uint_test.cpp
index 5696e54c73f363..9d12b158b41e7a 100644
--- a/libc/test/src/__support/uint_test.cpp
+++ b/libc/test/src/__support/uint_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/CPP/optional.h"
-#include "src/__support/UInt.h"
+#include "src/__support/big_int.h"
#include "src/__support/integer_literals.h" // parse_unsigned_bigint
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128
diff --git a/libc/test/src/math/smoke/nanf128_test.cpp b/libc/test/src/math/smoke/nanf128_test.cpp
index 2a9f57de5b43bc..652e35ccb53d7a 100644
--- a/libc/test/src/math/smoke/nanf128_test.cpp
+++ b/libc/test/src/math/smoke/nanf128_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/FPUtil/FPBits.h"
-#include "src/__support/UInt128.h"
+#include "src/__support/uint128.h"
#include "src/math/nanf128.h"
#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
diff --git a/libc/test/src/stdlib/strtold_test.cpp b/libc/test/src/stdlib/strtold_test.cpp
index 2066e9635aba1e..2c9f542930bf86 100644
--- a/libc/test/src/stdlib/strtold_test.cpp
+++ b/libc/test/src/stdlib/strtold_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/FPUtil/FPBits.h"
-#include "src/__support/UInt128.h"
+#include "src/__support/uint128.h"
#include "src/errno/libc_errno.h"
#include "src/stdlib/strtold.h"
diff --git a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
index 42af5cbe8f35f4..b5778dac308536 100644
--- a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
@@ -481,7 +481,7 @@ libc_support_library(
":__support_fputil_dyadic_float",
":__support_fputil_fp_bits",
":__support_libc_assert",
- ":__support_uint",
+ ":__support_big_int",
],
)
@@ -494,8 +494,8 @@ libc_support_library(
)
libc_support_library(
- name = "__support_uint",
- hdrs = ["src/__support/UInt.h"],
+ name = "__support_big_int",
+ hdrs = ["src/__support/big_int.h"],
deps = [
":__support_cpp_array",
":__support_cpp_bit",
@@ -520,11 +520,11 @@ libc_support_library(
libc_support_library(
name = "__support_uint128",
- hdrs = ["src/__support/UInt128.h"],
+ hdrs = ["src/__support/uint128.h"],
deps = [
":__support_macros_attributes",
":__support_macros_properties_types",
- ":__support_uint",
+ ":__support_big_int",
],
)
@@ -561,7 +561,7 @@ libc_support_library(
":__support_cpp_span",
":__support_cpp_string_view",
":__support_cpp_type_traits",
- ":__support_uint",
+ ":__support_big_int",
],
)
@@ -969,7 +969,7 @@ libc_support_library(
":__support_fputil_fp_bits",
":__support_fputil_multiply_add",
":__support_macros_optimization",
- ":__support_uint",
+ ":__support_big_int",
],
)
@@ -3215,7 +3215,7 @@ libc_support_library(
":__support_fputil_rounding_mode",
":__support_integer_to_string",
":__support_libc_assert",
- ":__support_uint",
+ ":__support_big_int",
":__support_uint128",
":printf_config",
":printf_core_structs",
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 d2087a3d528f44..70408c78b355a7 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
@@ -19,7 +19,7 @@ libc_support_library(
"//libc:__support_cpp_string_view",
"//libc:__support_macros_properties_types",
"//libc:__support_osutil_io",
- "//libc:__support_uint",
+ "//libc:__support_big_int",
"//libc:__support_uint128",
],
)
@@ -130,6 +130,6 @@ libc_support_library(
deps = [
"//libc:__support_cpp_string",
"//libc:__support_cpp_type_traits",
- "//libc:__support_uint",
+ "//libc:__support_big_int",
],
)
diff --git a/utils/bazel/llvm-project-overlay/libc/test/src/__support/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/__support/BUILD.bazel
index c0d402a89ea3ce..5b9644e3bb6b35 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/src/__support/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/src/__support/BUILD.bazel
@@ -69,7 +69,7 @@ libc_test(
"//libc:__support_cpp_string_view",
"//libc:__support_integer_literals",
"//libc:__support_integer_to_string",
- "//libc:__support_uint",
+ "//libc:__support_big_int",
"//libc:__support_uint128",
],
)
@@ -89,7 +89,7 @@ libc_test(
"//libc:__support_cpp_optional",
"//libc:__support_integer_literals",
"//libc:__support_macros_properties_types",
- "//libc:__support_uint",
+ "//libc:__support_big_int",
"//libc:llvm_libc_macros_math_macros",
],
)
diff --git a/utils/bazel/llvm-project-overlay/libc/test/src/__support/CPP/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/__support/CPP/BUILD.bazel
index dad1c7708e448d..ff970483efcf3a 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/src/__support/CPP/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/src/__support/CPP/BUILD.bazel
@@ -28,7 +28,7 @@ libc_test(
deps = [
"//libc:__support_cpp_bit",
"//libc:__support_macros_properties_types",
- "//libc:__support_uint",
+ "//libc:__support_big_int",
],
)
@@ -50,7 +50,7 @@ libc_test(
deps = [
"//libc:__support_cpp_limits",
"//libc:__support_macros_properties_types",
- "//libc:__support_uint",
+ "//libc:__support_big_int",
],
)
diff --git a/utils/bazel/llvm-project-overlay/libc/test/src/__support/FPUtil/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/__support/FPUtil/BUILD.bazel
index 18683e42724a54..7613f2fa083847 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/src/__support/FPUtil/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/src/__support/FPUtil/BUILD.bazel
@@ -27,7 +27,7 @@ libc_test(
copts = ["-frounding-math"],
deps = [
"//libc:__support_fputil_dyadic_float",
- "//libc:__support_uint",
+ "//libc:__support_big_int",
"//libc:__support_uint128",
"//libc/test/UnitTest:fp_test_helpers",
"//libc/utils/MPFRWrapper:mpfr_wrapper",
>From 394c9f109acc99c654c982c8b476c728c5f456c4 Mon Sep 17 00:00:00 2001
From: Guillaume Chatelet <gchatelet at google.com>
Date: Fri, 5 Apr 2024 17:35:34 +0000
Subject: [PATCH 2/2] Reformat BUILD.bazel files
---
utils/bazel/llvm-project-overlay/libc/BUILD.bazel | 10 +++++-----
.../libc/test/UnitTest/BUILD.bazel | 4 ++--
.../libc/test/src/__support/BUILD.bazel | 4 ++--
.../libc/test/src/__support/CPP/BUILD.bazel | 4 ++--
.../libc/test/src/__support/FPUtil/BUILD.bazel | 2 +-
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
index b5778dac308536..10757cc6b3b1bc 100644
--- a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
@@ -476,12 +476,12 @@ libc_support_library(
"src/__support/ryu_long_double_constants.h",
],
deps = [
+ ":__support_big_int",
":__support_common",
":__support_cpp_type_traits",
":__support_fputil_dyadic_float",
":__support_fputil_fp_bits",
":__support_libc_assert",
- ":__support_big_int",
],
)
@@ -522,9 +522,9 @@ libc_support_library(
name = "__support_uint128",
hdrs = ["src/__support/uint128.h"],
deps = [
+ ":__support_big_int",
":__support_macros_attributes",
":__support_macros_properties_types",
- ":__support_big_int",
],
)
@@ -553,6 +553,7 @@ libc_support_library(
name = "__support_integer_to_string",
hdrs = ["src/__support/integer_to_string.h"],
deps = [
+ ":__support_big_int",
":__support_common",
":__support_cpp_algorithm",
":__support_cpp_bit",
@@ -561,7 +562,6 @@ libc_support_library(
":__support_cpp_span",
":__support_cpp_string_view",
":__support_cpp_type_traits",
- ":__support_big_int",
],
)
@@ -965,11 +965,11 @@ libc_support_library(
name = "__support_fputil_dyadic_float",
hdrs = ["src/__support/FPUtil/dyadic_float.h"],
deps = [
+ ":__support_big_int",
":__support_common",
":__support_fputil_fp_bits",
":__support_fputil_multiply_add",
":__support_macros_optimization",
- ":__support_big_int",
],
)
@@ -3205,6 +3205,7 @@ libc_support_library(
],
defines = PRINTF_COPTS,
deps = [
+ ":__support_big_int",
":__support_common",
":__support_cpp_limits",
":__support_cpp_span",
@@ -3215,7 +3216,6 @@ libc_support_library(
":__support_fputil_rounding_mode",
":__support_integer_to_string",
":__support_libc_assert",
- ":__support_big_int",
":__support_uint128",
":printf_config",
":printf_core_structs",
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 70408c78b355a7..b00253adc8c48e 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
@@ -15,11 +15,11 @@ libc_support_library(
srcs = ["TestLogger.cpp"],
hdrs = ["TestLogger.h"],
deps = [
+ "//libc:__support_big_int",
"//libc:__support_cpp_string",
"//libc:__support_cpp_string_view",
"//libc:__support_macros_properties_types",
"//libc:__support_osutil_io",
- "//libc:__support_big_int",
"//libc:__support_uint128",
],
)
@@ -128,8 +128,8 @@ libc_support_library(
"StringUtils.h",
],
deps = [
+ "//libc:__support_big_int",
"//libc:__support_cpp_string",
"//libc:__support_cpp_type_traits",
- "//libc:__support_big_int",
],
)
diff --git a/utils/bazel/llvm-project-overlay/libc/test/src/__support/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/__support/BUILD.bazel
index 5b9644e3bb6b35..caa32b055a920b 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/src/__support/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/src/__support/BUILD.bazel
@@ -64,12 +64,12 @@ libc_test(
name = "integer_to_string_test",
srcs = ["integer_to_string_test.cpp"],
deps = [
+ "//libc:__support_big_int",
"//libc:__support_cpp_limits",
"//libc:__support_cpp_span",
"//libc:__support_cpp_string_view",
"//libc:__support_integer_literals",
"//libc:__support_integer_to_string",
- "//libc:__support_big_int",
"//libc:__support_uint128",
],
)
@@ -86,10 +86,10 @@ libc_test(
name = "uint_test",
srcs = ["uint_test.cpp"],
deps = [
+ "//libc:__support_big_int",
"//libc:__support_cpp_optional",
"//libc:__support_integer_literals",
"//libc:__support_macros_properties_types",
- "//libc:__support_big_int",
"//libc:llvm_libc_macros_math_macros",
],
)
diff --git a/utils/bazel/llvm-project-overlay/libc/test/src/__support/CPP/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/__support/CPP/BUILD.bazel
index ff970483efcf3a..96dafbc6da4854 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/src/__support/CPP/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/src/__support/CPP/BUILD.bazel
@@ -26,9 +26,9 @@ libc_test(
name = "bit_test",
srcs = ["bit_test.cpp"],
deps = [
+ "//libc:__support_big_int",
"//libc:__support_cpp_bit",
"//libc:__support_macros_properties_types",
- "//libc:__support_big_int",
],
)
@@ -48,9 +48,9 @@ libc_test(
name = "limits_test",
srcs = ["limits_test.cpp"],
deps = [
+ "//libc:__support_big_int",
"//libc:__support_cpp_limits",
"//libc:__support_macros_properties_types",
- "//libc:__support_big_int",
],
)
diff --git a/utils/bazel/llvm-project-overlay/libc/test/src/__support/FPUtil/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/__support/FPUtil/BUILD.bazel
index 7613f2fa083847..132c146b507b1a 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/src/__support/FPUtil/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/src/__support/FPUtil/BUILD.bazel
@@ -26,8 +26,8 @@ libc_test(
srcs = ["dyadic_float_test.cpp"],
copts = ["-frounding-math"],
deps = [
- "//libc:__support_fputil_dyadic_float",
"//libc:__support_big_int",
+ "//libc:__support_fputil_dyadic_float",
"//libc:__support_uint128",
"//libc/test/UnitTest:fp_test_helpers",
"//libc/utils/MPFRWrapper:mpfr_wrapper",
More information about the llvm-commits
mailing list