[libc-commits] [libc] 7623d91 - Revert "[libc][stdfix] Fix buildbot failure because of a typo. (#126291)"
Joseph Huber via libc-commits
libc-commits at lists.llvm.org
Fri Feb 7 12:34:47 PST 2025
Author: Joseph Huber
Date: 2025-02-07T14:34:40-06:00
New Revision: 7623d917849daf6d796e497d125e48026b0247cf
URL: https://github.com/llvm/llvm-project/commit/7623d917849daf6d796e497d125e48026b0247cf
DIFF: https://github.com/llvm/llvm-project/commit/7623d917849daf6d796e497d125e48026b0247cf.diff
LOG: Revert "[libc][stdfix] Fix buildbot failure because of a typo. (#126291)"
This reverts commit bada9220b87e73c0f4a498b82f883e17eda928d1.
Revert "[libc][stdfix] Implement fixed point `countlsfx` functions in llvm-libc (#125356)"
This reverts commit f2a1103b323492160d7d27a1575fbda709b49036.
Added:
Modified:
libc/config/baremetal/arm/entrypoints.txt
libc/config/baremetal/riscv/entrypoints.txt
libc/config/linux/riscv/entrypoints.txt
libc/config/linux/x86_64/entrypoints.txt
libc/docs/headers/math/stdfix.rst
libc/include/stdfix.yaml
libc/src/__support/fixed_point/CMakeLists.txt
libc/src/__support/fixed_point/fx_bits.h
libc/src/stdfix/CMakeLists.txt
libc/test/src/stdfix/CMakeLists.txt
Removed:
libc/src/stdfix/countlshk.cpp
libc/src/stdfix/countlshk.h
libc/src/stdfix/countlshr.cpp
libc/src/stdfix/countlshr.h
libc/src/stdfix/countlsk.cpp
libc/src/stdfix/countlsk.h
libc/src/stdfix/countlslk.cpp
libc/src/stdfix/countlslk.h
libc/src/stdfix/countlslr.cpp
libc/src/stdfix/countlslr.h
libc/src/stdfix/countlsr.cpp
libc/src/stdfix/countlsr.h
libc/src/stdfix/countlsuhk.cpp
libc/src/stdfix/countlsuhk.h
libc/src/stdfix/countlsuhr.cpp
libc/src/stdfix/countlsuhr.h
libc/src/stdfix/countlsuk.cpp
libc/src/stdfix/countlsuk.h
libc/src/stdfix/countlsulk.cpp
libc/src/stdfix/countlsulk.h
libc/src/stdfix/countlsulr.cpp
libc/src/stdfix/countlsulr.h
libc/src/stdfix/countlsur.cpp
libc/src/stdfix/countlsur.h
libc/test/src/stdfix/CountlsTest.h
libc/test/src/stdfix/countlshk_test.cpp
libc/test/src/stdfix/countlshr_test.cpp
libc/test/src/stdfix/countlsk_test.cpp
libc/test/src/stdfix/countlslk_test.cpp
libc/test/src/stdfix/countlslr_test.cpp
libc/test/src/stdfix/countlsr_test.cpp
libc/test/src/stdfix/countlsuhk_test.cpp
libc/test/src/stdfix/countlsuhr_test.cpp
libc/test/src/stdfix/countlsuk_test.cpp
libc/test/src/stdfix/countlsulk_test.cpp
libc/test/src/stdfix/countlsulr_test.cpp
libc/test/src/stdfix/countlsur_test.cpp
################################################################################
diff --git a/libc/config/baremetal/arm/entrypoints.txt b/libc/config/baremetal/arm/entrypoints.txt
index 351f727389e3abb..694cd7b1993ca22 100644
--- a/libc/config/baremetal/arm/entrypoints.txt
+++ b/libc/config/baremetal/arm/entrypoints.txt
@@ -469,18 +469,6 @@ if(LIBC_COMPILER_HAS_FIXED_POINT)
libc.src.stdfix.ukbits
libc.src.stdfix.lkbits
libc.src.stdfix.ulkbits
- libc.src.stdfix.countlshr
- libc.src.stdfix.countlsr
- libc.src.stdfix.countlslr
- libc.src.stdfix.countlshk
- libc.src.stdfix.countlsk
- libc.src.stdfix.countlslk
- libc.src.stdfix.countlsuhr
- libc.src.stdfix.countlsur
- libc.src.stdfix.countlsulr
- libc.src.stdfix.countlsuhk
- libc.src.stdfix.countlsuk
- libc.src.stdfix.countlsulk
)
endif()
diff --git a/libc/config/baremetal/riscv/entrypoints.txt b/libc/config/baremetal/riscv/entrypoints.txt
index 39c70a22a21e0eb..667ab40dca99985 100644
--- a/libc/config/baremetal/riscv/entrypoints.txt
+++ b/libc/config/baremetal/riscv/entrypoints.txt
@@ -464,18 +464,6 @@ if(LIBC_COMPILER_HAS_FIXED_POINT)
libc.src.stdfix.ukbits
libc.src.stdfix.lkbits
libc.src.stdfix.ulkbits
- libc.src.stdfix.countlshr
- libc.src.stdfix.countlsr
- libc.src.stdfix.countlslr
- libc.src.stdfix.countlshk
- libc.src.stdfix.countlsk
- libc.src.stdfix.countlslk
- libc.src.stdfix.countlsuhr
- libc.src.stdfix.countlsur
- libc.src.stdfix.countlsulr
- libc.src.stdfix.countlsuhk
- libc.src.stdfix.countlsuk
- libc.src.stdfix.countlsulk
)
endif()
diff --git a/libc/config/linux/riscv/entrypoints.txt b/libc/config/linux/riscv/entrypoints.txt
index a9ba0c257755b7f..6e67ea559d57b0e 100644
--- a/libc/config/linux/riscv/entrypoints.txt
+++ b/libc/config/linux/riscv/entrypoints.txt
@@ -749,18 +749,6 @@ if(LIBC_COMPILER_HAS_FIXED_POINT)
# TODO: https://github.com/llvm/llvm-project/issues/115778
libc.src.stdfix.lkbits
libc.src.stdfix.ulkbits
- libc.src.stdfix.countlshr
- libc.src.stdfix.countlsr
- libc.src.stdfix.countlslr
- libc.src.stdfix.countlshk
- libc.src.stdfix.countlsk
- libc.src.stdfix.countlslk
- libc.src.stdfix.countlsuhr
- libc.src.stdfix.countlsur
- libc.src.stdfix.countlsulr
- libc.src.stdfix.countlsuhk
- libc.src.stdfix.countlsuk
- libc.src.stdfix.countlsulk
)
endif()
diff --git a/libc/config/linux/x86_64/entrypoints.txt b/libc/config/linux/x86_64/entrypoints.txt
index 2a4c17a56f377fa..81dceb74a1774bc 100644
--- a/libc/config/linux/x86_64/entrypoints.txt
+++ b/libc/config/linux/x86_64/entrypoints.txt
@@ -874,18 +874,6 @@ if(LIBC_COMPILER_HAS_FIXED_POINT)
libc.src.stdfix.ukbits
libc.src.stdfix.lkbits
libc.src.stdfix.ulkbits
- libc.src.stdfix.countlshr
- libc.src.stdfix.countlsr
- libc.src.stdfix.countlslr
- libc.src.stdfix.countlshk
- libc.src.stdfix.countlsk
- libc.src.stdfix.countlslk
- libc.src.stdfix.countlsuhr
- libc.src.stdfix.countlsur
- libc.src.stdfix.countlsulr
- libc.src.stdfix.countlsuhk
- libc.src.stdfix.countlsuk
- libc.src.stdfix.countlsulk
)
endif()
diff --git a/libc/docs/headers/math/stdfix.rst b/libc/docs/headers/math/stdfix.rst
index 4507f2b608bf1f8..58052f000995cd9 100644
--- a/libc/docs/headers/math/stdfix.rst
+++ b/libc/docs/headers/math/stdfix.rst
@@ -73,7 +73,7 @@ The following functions are included in the ISO/IEC TR 18037:2008 standard.
+---------------+----------------+-------------+---------------+------------+----------------+-------------+----------------+-------------+---------------+------------+----------------+-------------+
| \*bits | | | | | | | | | | | | |
+---------------+----------------+-------------+---------------+------------+----------------+-------------+----------------+-------------+---------------+------------+----------------+-------------+
-| countls | |check| | |check| | |check| | |check| | |check| | |check| | |check| | |check| | |check| | |check| | |check| | |check| |
+| countls | | | | | | | | | | | | |
+---------------+----------------+-------------+---------------+------------+----------------+-------------+----------------+-------------+---------------+------------+----------------+-------------+
| divi | | | | | | | | | | | | |
+---------------+----------------+-------------+---------------+------------+----------------+-------------+----------------+-------------+---------------+------------+----------------+-------------+
diff --git a/libc/include/stdfix.yaml b/libc/include/stdfix.yaml
index 0abf2f3a9b3b6de..9663ac0c7df4dce 100644
--- a/libc/include/stdfix.yaml
+++ b/libc/include/stdfix.yaml
@@ -306,87 +306,3 @@ functions:
arguments:
- type: unsigned int
guard: LIBC_COMPILER_HAS_FIXED_POINT
- - name: countlshr
- standards:
- - stdc_ext
- return_type: int
- arguments:
- - type: short fract
- guard: LIBC_COMPILER_HAS_FIXED_POINT
- - name: countlsr
- standards:
- - stdc_ext
- return_type: int
- arguments:
- - type: fract
- guard: LIBC_COMPILER_HAS_FIXED_POINT
- - name: countlslr
- standards:
- - stdc_ext
- return_type: int
- arguments:
- - type: long fract
- guard: LIBC_COMPILER_HAS_FIXED_POINT
- - name: countlshk
- standards:
- - stdc_ext
- return_type: int
- arguments:
- - type: short accum
- guard: LIBC_COMPILER_HAS_FIXED_POINT
- - name: countlsk
- standards:
- - stdc_ext
- return_type: int
- arguments:
- - type: accum
- guard: LIBC_COMPILER_HAS_FIXED_POINT
- - name: countlslk
- standards:
- - stdc_ext
- return_type: int
- arguments:
- - type: long accum
- guard: LIBC_COMPILER_HAS_FIXED_POINT
- - name: countlsuhr
- standards:
- - stdc_ext
- return_type: int
- arguments:
- - type: unsigned short fract
- guard: LIBC_COMPILER_HAS_FIXED_POINT
- - name: countlsur
- standards:
- - stdc_ext
- return_type: int
- arguments:
- - type: unsigned fract
- guard: LIBC_COMPILER_HAS_FIXED_POINT
- - name: countlsulr
- standards:
- - stdc_ext
- return_type: int
- arguments:
- - type: unsigned long fract
- guard: LIBC_COMPILER_HAS_FIXED_POINT
- - name: countlsuhk
- standards:
- - stdc_ext
- return_type: int
- arguments:
- - type: unsigned short accum
- guard: LIBC_COMPILER_HAS_FIXED_POINT
- - name: countlsuk
- standards:
- - stdc_ext
- return_type: int
- arguments:
- - type: unsigned accum
- guard: LIBC_COMPILER_HAS_FIXED_POINT
- - name: countlsulk
- standards:
- - stdc_ext
- return_type: int
- arguments:
- - type: unsigned long accum
- guard: LIBC_COMPILER_HAS_FIXED_POINT
diff --git a/libc/src/__support/fixed_point/CMakeLists.txt b/libc/src/__support/fixed_point/CMakeLists.txt
index b415e2c00c488c8..3b744081765e4fa 100644
--- a/libc/src/__support/fixed_point/CMakeLists.txt
+++ b/libc/src/__support/fixed_point/CMakeLists.txt
@@ -19,7 +19,6 @@ add_header_library(
libc.src.__support.macros.optimization
libc.src.__support.CPP.type_traits
libc.src.__support.CPP.bit
- libc.src.__support.CPP.limits
libc.src.__support.math_extras
)
diff --git a/libc/src/__support/fixed_point/fx_bits.h b/libc/src/__support/fixed_point/fx_bits.h
index 4b87a9018d67089..225ea417760a031 100644
--- a/libc/src/__support/fixed_point/fx_bits.h
+++ b/libc/src/__support/fixed_point/fx_bits.h
@@ -11,10 +11,9 @@
#include "include/llvm-libc-macros/stdfix-macros.h"
#include "src/__support/CPP/bit.h"
-#include "src/__support/CPP/limits.h" // numeric_limits
#include "src/__support/CPP/type_traits.h"
-#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
+#include "src/__support/macros/attributes.h" // LIBC_INLINE
+#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/__support/math_extras.h"
@@ -51,12 +50,6 @@ template <typename T> struct FXBits {
static constexpr StorageType SIGN_MASK =
(fx_rep::SIGN_LEN == 0 ? 0 : StorageType(1) << SIGN_OFFSET);
- // mask for <integral | fraction>
- static constexpr StorageType VALUE_MASK = INTEGRAL_MASK | FRACTION_MASK;
-
- // mask for <sign | integral | fraction>
- static constexpr StorageType TOTAL_MASK = SIGN_MASK | VALUE_MASK;
-
public:
LIBC_INLINE constexpr FXBits() = default;
@@ -81,12 +74,6 @@ template <typename T> struct FXBits {
return (value & INTEGRAL_MASK) >> INTEGRAL_OFFSET;
}
- // returns complete bitstring representation the fixed point number
- // the bitstring is of the form: padding | sign | integral | fraction
- LIBC_INLINE constexpr StorageType get_bits() {
- return (value & TOTAL_MASK) >> FRACTION_OFFSET;
- }
-
// TODO: replace bool with Sign
LIBC_INLINE constexpr bool get_sign() {
return static_cast<bool>((value & SIGN_MASK) >> SIGN_OFFSET);
@@ -176,25 +163,6 @@ template <typename T> LIBC_INLINE constexpr T round(T x, int n) {
return bit_and((x + round_bit), rounding_mask);
}
-// count leading sign bits
-template <typename T>
-LIBC_INLINE constexpr cpp::enable_if_t<cpp::is_fixed_point_v<T>, int>
-countls(T f) {
- using FXRep = FXRep<T>;
- using BitType = typename FXRep::StorageType;
- using FXBits = FXBits<T>;
-
- constexpr int CONTAIN_LEN = cpp::numeric_limits<BitType>::digits;
- constexpr int PADDING_LEN = CONTAIN_LEN - FXRep::TOTAL_LEN;
-
- if constexpr (FXRep::SIGN_LEN != 0)
- if (f < 0)
- f = bit_not(f);
-
- BitType value_bits = FXBits(f)::get_bits();
- return cpp::countl_zero(value_bits) - PADDING_LEN;
-}
-
} // namespace fixed_point
} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/CMakeLists.txt b/libc/src/stdfix/CMakeLists.txt
index 3f6f9125a086b58..815f739d23efa40 100644
--- a/libc/src/stdfix/CMakeLists.txt
+++ b/libc/src/stdfix/CMakeLists.txt
@@ -53,18 +53,6 @@ foreach(suffix IN ITEMS hr r lr hk k lk uhr ur ulr uhk uk ulk)
libc.src.__support.CPP.bit
libc.src.__support.fixed_point.fx_bits
)
-
- add_entrypoint_object(
- countls${suffix}
- HDRS
- countls${suffix}.h
- SRCS
- countls${suffix}.cpp
- COMPILE_OPTIONS
- ${libc_opt_high_flag}
- DEPENDS
- libc.src.__support.fixed_point.fx_bits
- )
endforeach()
add_entrypoint_object(
diff --git a/libc/src/stdfix/countlshk.cpp b/libc/src/stdfix/countlshk.cpp
deleted file mode 100644
index f94728beff1cb0f..000000000000000
--- a/libc/src/stdfix/countlshk.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===-- Implementation for countlshk function ----------------------------===//
-//
-// 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 "countlshk.h"
-#include "src/__support/common.h"
-#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-LLVM_LIBC_FUNCTION(int, countlshk, (short accum f)) {
- return fixed_point::countls(f);
-}
-
-} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/countlshk.h b/libc/src/stdfix/countlshk.h
deleted file mode 100644
index ab334244e166a75..000000000000000
--- a/libc/src/stdfix/countlshk.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//===-- Implementation header for countlshk function ------------*- 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_STDFIX_COUNTLSHK_H
-#define LLVM_LIBC_SRC_STDFIX_COUNTLSHK_H
-
-#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-int countlshk(short accum f);
-
-} // namespace LIBC_NAMESPACE_DECL
-
-#endif // LLVM_LIBC_SRC_STDFIX_COUNTLSHK_H
diff --git a/libc/src/stdfix/countlshr.cpp b/libc/src/stdfix/countlshr.cpp
deleted file mode 100644
index d77d3e9a3c22ad1..000000000000000
--- a/libc/src/stdfix/countlshr.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===-- Implementation for countlshr function ----------------------------===//
-//
-// 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 "countlshr.h"
-#include "src/__support/common.h"
-#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-LLVM_LIBC_FUNCTION(int, countlshr, (short fract f)) {
- return fixed_point::countls(f);
-}
-
-} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/countlshr.h b/libc/src/stdfix/countlshr.h
deleted file mode 100644
index 579b7b680406ec1..000000000000000
--- a/libc/src/stdfix/countlshr.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//===-- Implementation header for countlshr function ------------*- 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_STDFIX_COUNTLSHR_H
-#define LLVM_LIBC_SRC_STDFIX_COUNTLSHR_H
-
-#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-int countlshr(short fract f);
-
-} // namespace LIBC_NAMESPACE_DECL
-
-#endif // LLVM_LIBC_SRC_STDFIX_COUNTLSHR_H
diff --git a/libc/src/stdfix/countlsk.cpp b/libc/src/stdfix/countlsk.cpp
deleted file mode 100644
index b6f56adee16a6cb..000000000000000
--- a/libc/src/stdfix/countlsk.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-//===-- Implementation for countlsk function -----------------------------===//
-//
-// 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 "countlsk.h"
-#include "src/__support/common.h"
-#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-LLVM_LIBC_FUNCTION(int, countlsk, (accum f)) { return fixed_point::countls(f); }
-
-} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/countlsk.h b/libc/src/stdfix/countlsk.h
deleted file mode 100644
index d0c893bc078d5b5..000000000000000
--- a/libc/src/stdfix/countlsk.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//===-- Implementation header for countlsk function -------------*- 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_STDFIX_COUNTLSK_H
-#define LLVM_LIBC_SRC_STDFIX_COUNTLSK_H
-
-#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-int countlsk(accum f);
-
-} // namespace LIBC_NAMESPACE_DECL
-
-#endif // LLVM_LIBC_SRC_STDFIX_COUNTLSK_H
diff --git a/libc/src/stdfix/countlslk.cpp b/libc/src/stdfix/countlslk.cpp
deleted file mode 100644
index 9bf30ff34c6ee76..000000000000000
--- a/libc/src/stdfix/countlslk.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===-- Implementation for countlslk function ----------------------------===//
-//
-// 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 "countlslk.h"
-#include "src/__support/common.h"
-#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-LLVM_LIBC_FUNCTION(int, countlslk, (long accum f)) {
- return fixed_point::countls(f);
-}
-
-} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/countlslk.h b/libc/src/stdfix/countlslk.h
deleted file mode 100644
index 60fa469797b7a36..000000000000000
--- a/libc/src/stdfix/countlslk.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//===-- Implementation header for countlslk function ------------*- 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_STDFIX_COUNTLSLK_H
-#define LLVM_LIBC_SRC_STDFIX_COUNTLSLK_H
-
-#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-int countlslk(long accum f);
-
-} // namespace LIBC_NAMESPACE_DECL
-
-#endif // LLVM_LIBC_SRC_STDFIX_COUNTLSLK_H
diff --git a/libc/src/stdfix/countlslr.cpp b/libc/src/stdfix/countlslr.cpp
deleted file mode 100644
index 774023c734a37eb..000000000000000
--- a/libc/src/stdfix/countlslr.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===-- Implementation for countlslr function ----------------------------===//
-//
-// 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 "countlslr.h"
-#include "src/__support/common.h"
-#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-LLVM_LIBC_FUNCTION(int, countlslr, (long fract f)) {
- return fixed_point::countls(f);
-}
-
-} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/countlslr.h b/libc/src/stdfix/countlslr.h
deleted file mode 100644
index c909551e77a1ad2..000000000000000
--- a/libc/src/stdfix/countlslr.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//===-- Implementation header for countlslr function ------------*- 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_STDFIX_COUNTLSLR_H
-#define LLVM_LIBC_SRC_STDFIX_COUNTLSLR_H
-
-#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-int countlslr(long fract f);
-
-} // namespace LIBC_NAMESPACE_DECL
-
-#endif // LLVM_LIBC_SRC_STDFIX_COUNTLSLR_H
diff --git a/libc/src/stdfix/countlsr.cpp b/libc/src/stdfix/countlsr.cpp
deleted file mode 100644
index 14563127ad5e9dc..000000000000000
--- a/libc/src/stdfix/countlsr.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-//===-- Implementation for countlsr function -----------------------------===//
-//
-// 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 "countlsr.h"
-#include "src/__support/common.h"
-#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-LLVM_LIBC_FUNCTION(int, countlsr, (fract f)) { return fixed_point::countls(f); }
-
-} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/countlsr.h b/libc/src/stdfix/countlsr.h
deleted file mode 100644
index 75dcf4aff0ca35b..000000000000000
--- a/libc/src/stdfix/countlsr.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//===-- Implementation header for countlsr function -------------*- 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_STDFIX_COUNTLSR_H
-#define LLVM_LIBC_SRC_STDFIX_COUNTLSR_H
-
-#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-int countlsr(fract f);
-
-} // namespace LIBC_NAMESPACE_DECL
-
-#endif // LLVM_LIBC_SRC_STDFIX_COUNTLSR_H
diff --git a/libc/src/stdfix/countlsuhk.cpp b/libc/src/stdfix/countlsuhk.cpp
deleted file mode 100644
index 2cc266f47da1fc4..000000000000000
--- a/libc/src/stdfix/countlsuhk.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===-- Implementation for countlsuhk function ---------------------------===//
-//
-// 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 "countlsuhk.h"
-#include "src/__support/common.h"
-#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-LLVM_LIBC_FUNCTION(int, countlsuhk, (unsigned short accum f)) {
- return fixed_point::countls(f);
-}
-
-} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/countlsuhk.h b/libc/src/stdfix/countlsuhk.h
deleted file mode 100644
index fcb2fec3500d4c0..000000000000000
--- a/libc/src/stdfix/countlsuhk.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//===-- Implementation header for countlsuhk function -----------*- 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_STDFIX_COUNTLSUHK_H
-#define LLVM_LIBC_SRC_STDFIX_COUNTLSUHK_H
-
-#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-int countlsuhk(unsigned short accum f);
-
-} // namespace LIBC_NAMESPACE_DECL
-
-#endif // LLVM_LIBC_SRC_STDFIX_COUNTLSUHK_H
diff --git a/libc/src/stdfix/countlsuhr.cpp b/libc/src/stdfix/countlsuhr.cpp
deleted file mode 100644
index f30b0dd731aa94c..000000000000000
--- a/libc/src/stdfix/countlsuhr.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===-- Implementation for countlsuhr function ---------------------------===//
-//
-// 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 "countlsuhr.h"
-#include "src/__support/common.h"
-#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-LLVM_LIBC_FUNCTION(int, countlsuhr, (unsigned short fract f)) {
- return fixed_point::countls(f);
-}
-
-} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/countlsuhr.h b/libc/src/stdfix/countlsuhr.h
deleted file mode 100644
index c6ce001d38b1108..000000000000000
--- a/libc/src/stdfix/countlsuhr.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//===-- Implementation header for countlsuhr function -----------*- 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_STDFIX_COUNTLSUHR_H
-#define LLVM_LIBC_SRC_STDFIX_COUNTLSUHR_H
-
-#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-int countlsuhr(unsigned long fract f);
-
-} // namespace LIBC_NAMESPACE_DECL
-
-#endif // LLVM_LIBC_SRC_STDFIX_COUNTLSUHR_H
diff --git a/libc/src/stdfix/countlsuk.cpp b/libc/src/stdfix/countlsuk.cpp
deleted file mode 100644
index 3f32ba0815b6ec0..000000000000000
--- a/libc/src/stdfix/countlsuk.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===-- Implementation for countlsuhk function ---------------------------===//
-//
-// 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 "countlsuhk.h"
-#include "src/__support/common.h"
-#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-LLVM_LIBC_FUNCTION(int, countlsuhk, (unsigned accum f)) {
- return fixed_point::countls(f);
-}
-
-} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/countlsuk.h b/libc/src/stdfix/countlsuk.h
deleted file mode 100644
index 7ad0e701b927b2d..000000000000000
--- a/libc/src/stdfix/countlsuk.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//===-- Implementation header for countlsuk function ------------*- 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_STDFIX_COUNTLSUK_H
-#define LLVM_LIBC_SRC_STDFIX_COUNTLSUK_H
-
-#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-int countlsuk(unsigned accum f);
-
-} // namespace LIBC_NAMESPACE_DECL
-
-#endif // LLVM_LIBC_SRC_STDFIX_COUNTLSUK_H
diff --git a/libc/src/stdfix/countlsulk.cpp b/libc/src/stdfix/countlsulk.cpp
deleted file mode 100644
index 04090dd86c73201..000000000000000
--- a/libc/src/stdfix/countlsulk.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===-- Implementation for countlsulk function ---------------------------===//
-//
-// 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 "countlsulk.h"
-#include "src/__support/common.h"
-#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-LLVM_LIBC_FUNCTION(int, countlsulk, (unsigned long accum f)) {
- return fixed_point::countls(f);
-}
-
-} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/countlsulk.h b/libc/src/stdfix/countlsulk.h
deleted file mode 100644
index 55ca9d2e20ff0fc..000000000000000
--- a/libc/src/stdfix/countlsulk.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//===-- Implementation header for countlsulk function -----------*- 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_STDFIX_COUNTLSULK_H
-#define LLVM_LIBC_SRC_STDFIX_COUNTLSULK_H
-
-#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-int countlsulk(unsigned long accum f);
-
-} // namespace LIBC_NAMESPACE_DECL
-
-#endif // LLVM_LIBC_SRC_STDFIX_COUNTLSULK_H
diff --git a/libc/src/stdfix/countlsulr.cpp b/libc/src/stdfix/countlsulr.cpp
deleted file mode 100644
index d9d6ff404c2110c..000000000000000
--- a/libc/src/stdfix/countlsulr.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===-- Implementation for countlsulr function ---------------------------===//
-//
-// 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 "countlsulr.h"
-#include "src/__support/common.h"
-#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-LLVM_LIBC_FUNCTION(int, countlsulr, (unsigned long fract f)) {
- return fixed_point::countls(f);
-}
-
-} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/countlsulr.h b/libc/src/stdfix/countlsulr.h
deleted file mode 100644
index 59e7d726d01b924..000000000000000
--- a/libc/src/stdfix/countlsulr.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//===-- Implementation header for countlsulr function -----------*- 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_STDFIX_COUNTLSULR_H
-#define LLVM_LIBC_SRC_STDFIX_COUNTLSULR_H
-
-#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-int countlsulr(unsigned long fract f);
-
-} // namespace LIBC_NAMESPACE_DECL
-
-#endif // LLVM_LIBC_SRC_STDFIX_COUNTLSULR_H
diff --git a/libc/src/stdfix/countlsur.cpp b/libc/src/stdfix/countlsur.cpp
deleted file mode 100644
index 777e5f387aadf1e..000000000000000
--- a/libc/src/stdfix/countlsur.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===-- Implementation for countlsur function ----------------------------===//
-//
-// 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 "countlsur.h"
-#include "src/__support/common.h"
-#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-LLVM_LIBC_FUNCTION(int, countlsur, (unsigned fract f)) {
- return fixed_point::countls(f);
-}
-
-} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/countlsur.h b/libc/src/stdfix/countlsur.h
deleted file mode 100644
index 1d34e971a52b391..000000000000000
--- a/libc/src/stdfix/countlsur.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//===-- Implementation header for countlsur function ------------*- 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_STDFIX_COUNTLSUR_H
-#define LLVM_LIBC_SRC_STDFIX_COUNTLSUR_H
-
-#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
-
-namespace LIBC_NAMESPACE_DECL {
-
-int countlsur(unsigned fract f);
-
-} // namespace LIBC_NAMESPACE_DECL
-
-#endif // LLVM_LIBC_SRC_STDFIX_COUNTLSUR_H
diff --git a/libc/test/src/stdfix/CMakeLists.txt b/libc/test/src/stdfix/CMakeLists.txt
index c8c4fd96bc2b381..90d20438edb4bec 100644
--- a/libc/test/src/stdfix/CMakeLists.txt
+++ b/libc/test/src/stdfix/CMakeLists.txt
@@ -73,22 +73,6 @@ foreach(suffix IN ITEMS hr r lr hk k lk uhr ur ulr uhk uk ulk)
libc.src.__support.CPP.bit
libc.src.__support.fixed_point.fx_bits
)
-
- add_libc_test(
- countls${suffix}_test
- SUITE
- libc-stdfix-tests
- HDRS
- CountlsTest.h
- SRCS
- countls${suffix}_test.cpp
- COMPILE_OPTIONS
- -O3
- DEPENDS
- libc.src.stdfix.countls${suffix}
- libc.src.__support.fixed_point.fx_rep
- libc.src.__support.fixed_point.fx_bits
- )
endforeach()
add_libc_test(
diff --git a/libc/test/src/stdfix/CountlsTest.h b/libc/test/src/stdfix/CountlsTest.h
deleted file mode 100644
index fe3917754a2514d..000000000000000
--- a/libc/test/src/stdfix/CountlsTest.h
+++ /dev/null
@@ -1,62 +0,0 @@
-//===-- Utility class to test countls -------------------*- 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
-//
-//===----------------------------------------------------------------------===//
-
-#include "test/UnitTest/Test.h"
-
-#include "src/__support/fixed_point/fx_rep.h"
-
-template <typename T> class CountlsTest : public LIBC_NAMESPACE::testing::Test {
-
- using FXRep = LIBC_NAMESPACE::fixed_point::FXRep<T>;
- static constexpr T zero = FXRep::ZERO();
- static constexpr T max = FXRep::MAX();
- static constexpr T min = FXRep::MIN();
- static constexpr T one_half = FXRep::ONE_HALF();
- static constexpr T one_fourth = FXRep::ONE_FOURTH();
- static constexpr T eps = FXRep::EPS();
-
- static constexpr auto value_len = FXRep::INTEGRAL_LEN + FXRep::FRACTION_LEN;
-
-public:
- typedef int (*CountlsFunc)(T);
-
- void testSpecialNumbers(CountlsFunc func) {
- constexpr bool is_signed = (FXRep::SIGN_LEN > 0);
-
- EXPECT_EQ(FXRep::INTEGRAL_LEN, func(one_half));
- EXPECT_EQ(FXRep::INTEGRAL_LEN + 1, func(one_fourth));
- EXPECT_EQ(value_len, func(zero));
- EXPECT_EQ(value_len - 1, func(eps));
- EXPECT_EQ(0, func(max));
- // If signed, left shifting the minimum value will overflow, so countls = 0.
- // If unsigned, the minimum value is zero, so countls is the number of value
- // bits according to ISO/IEC TR 18037.
- EXPECT_EQ(is_signed ? 0 : value_len, func(min));
-
- if (10 <= static_cast<int>(max)) {
- EXPECT_EQ(FXRep::INTEGRAL_LEN - 4, func(10));
- }
-
- if (static_cast<int>(min) <= -10) {
- EXPECT_EQ(FXRep::INTEGRAL_LEN - 4, func(-10));
- }
-
- if constexpr (is_signed) {
- EXPECT_EQ(value_len, func(-eps));
- EXPECT_EQ(FXRep::INTEGRAL_LEN + 1, func(-one_half));
- if (FXRep::FRACTION_LEN >= 2) {
- EXPECT_EQ(FXRep::INTEGRAL_LEN + 2, func(-one_fourth));
- }
- }
- }
-};
-
-#define LIST_COUNTLS_TESTS(T, func) \
- using LlvmLibcCountlsTest = CountlsTest<T>; \
- TEST_F(LlvmLibcCountlsTest, SpecialNumbers) { testSpecialNumbers(&func); } \
- static_assert(true, "Require semicolon.")
diff --git a/libc/test/src/stdfix/countlshk_test.cpp b/libc/test/src/stdfix/countlshk_test.cpp
deleted file mode 100644
index 659f869706b5f7d..000000000000000
--- a/libc/test/src/stdfix/countlshk_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-//===-- Unittests for countlshk -------------------------------------------===//
-//
-// 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 "CountlsTest.h"
-
-#include "src/stdfix/countlshk.h"
-
-LIST_COUNTLS_TESTS(short accum, LIBC_NAMESPACE::countlshk);
diff --git a/libc/test/src/stdfix/countlshr_test.cpp b/libc/test/src/stdfix/countlshr_test.cpp
deleted file mode 100644
index 361d4acab3b1145..000000000000000
--- a/libc/test/src/stdfix/countlshr_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-//===-- Unittests for countlshr -------------------------------------------===//
-//
-// 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 "CountlsTest.h"
-
-#include "src/stdfix/countlshr.h"
-
-LIST_COUNTLS_TESTS(short fract, LIBC_NAMESPACE::countlshr);
diff --git a/libc/test/src/stdfix/countlsk_test.cpp b/libc/test/src/stdfix/countlsk_test.cpp
deleted file mode 100644
index 74cb519ec78de19..000000000000000
--- a/libc/test/src/stdfix/countlsk_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-//===-- Unittests for countlsk --------------------------------------------===//
-//
-// 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 "CountlsTest.h"
-
-#include "src/stdfix/countlsk.h"
-
-LIST_COUNTLS_TESTS(accum, LIBC_NAMESPACE::countlsk);
diff --git a/libc/test/src/stdfix/countlslk_test.cpp b/libc/test/src/stdfix/countlslk_test.cpp
deleted file mode 100644
index 006939db3c87e48..000000000000000
--- a/libc/test/src/stdfix/countlslk_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-//===-- Unittests for countlslk -------------------------------------------===//
-//
-// 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 "CountlsTest.h"
-
-#include "src/stdfix/countlslk.h"
-
-LIST_COUNTLS_TESTS(long accum, LIBC_NAMESPACE::countlslk);
diff --git a/libc/test/src/stdfix/countlslr_test.cpp b/libc/test/src/stdfix/countlslr_test.cpp
deleted file mode 100644
index 896cf9259c3ea30..000000000000000
--- a/libc/test/src/stdfix/countlslr_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-//===-- Unittests for countlslr -------------------------------------------===//
-//
-// 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 "CountlsTest.h"
-
-#include "src/stdfix/countlslr.h"
-
-LIST_COUNTLS_TESTS(long fract, LIBC_NAMESPACE::countlslr);
diff --git a/libc/test/src/stdfix/countlsr_test.cpp b/libc/test/src/stdfix/countlsr_test.cpp
deleted file mode 100644
index d7ae91ccd6a920b..000000000000000
--- a/libc/test/src/stdfix/countlsr_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-//===-- Unittests for countlsr --------------------------------------------===//
-//
-// 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 "CountlsTest.h"
-
-#include "src/stdfix/countlsr.h"
-
-LIST_COUNTLS_TESTS(fract, LIBC_NAMESPACE::countlsr);
diff --git a/libc/test/src/stdfix/countlsuhk_test.cpp b/libc/test/src/stdfix/countlsuhk_test.cpp
deleted file mode 100644
index d8e68d65160e7e3..000000000000000
--- a/libc/test/src/stdfix/countlsuhk_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-//===-- Unittests for countlsuhk ------------------------------------------===//
-//
-// 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 "CountlsTest.h"
-
-#include "src/stdfix/countlsuhk.h"
-
-LIST_COUNTLS_TESTS(unsigned short accum, LIBC_NAMESPACE::countlsuhk);
diff --git a/libc/test/src/stdfix/countlsuhr_test.cpp b/libc/test/src/stdfix/countlsuhr_test.cpp
deleted file mode 100644
index 7dbc590d4a552ff..000000000000000
--- a/libc/test/src/stdfix/countlsuhr_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-//===-- Unittests for countlsuhr ------------------------------------------===//
-//
-// 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 "CountlsTest.h"
-
-#include "src/stdfix/countlsuhr.h"
-
-LIST_COUNTLS_TESTS(unsigned short fract, LIBC_NAMESPACE::countlsuhr);
diff --git a/libc/test/src/stdfix/countlsuk_test.cpp b/libc/test/src/stdfix/countlsuk_test.cpp
deleted file mode 100644
index 20f78d8c942b64b..000000000000000
--- a/libc/test/src/stdfix/countlsuk_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-//===-- Unittests for countlsuk -------------------------------------------===//
-//
-// 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 "CountlsTest.h"
-
-#include "src/stdfix/countlsuk.h"
-
-LIST_COUNTLS_TESTS(unsigned accum, LIBC_NAMESPACE::countlsuk);
diff --git a/libc/test/src/stdfix/countlsulk_test.cpp b/libc/test/src/stdfix/countlsulk_test.cpp
deleted file mode 100644
index 81ae208055cd942..000000000000000
--- a/libc/test/src/stdfix/countlsulk_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-//===-- Unittests for countlsulk ------------------------------------------===//
-//
-// 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 "CountlsTest.h"
-
-#include "src/stdfix/countlsulk.h"
-
-LIST_COUNTLS_TESTS(unsigned long accum, LIBC_NAMESPACE::countlsulk);
diff --git a/libc/test/src/stdfix/countlsulr_test.cpp b/libc/test/src/stdfix/countlsulr_test.cpp
deleted file mode 100644
index 5b9b047f7fd747a..000000000000000
--- a/libc/test/src/stdfix/countlsulr_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-//===-- Unittests for countlsulr ------------------------------------------===//
-//
-// 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 "CountlsTest.h"
-
-#include "src/stdfix/countlsulr.h"
-
-LIST_COUNTLS_TESTS(unsigned long fract, LIBC_NAMESPACE::countlsulr);
diff --git a/libc/test/src/stdfix/countlsur_test.cpp b/libc/test/src/stdfix/countlsur_test.cpp
deleted file mode 100644
index 67e32d7b562173f..000000000000000
--- a/libc/test/src/stdfix/countlsur_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-//===-- Unittests for countlsur -------------------------------------------===//
-//
-// 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 "CountlsTest.h"
-
-#include "src/stdfix/countlsur.h"
-
-LIST_COUNTLS_TESTS(unsigned fract, LIBC_NAMESPACE::countlsur);
More information about the libc-commits
mailing list