Merge branch 'main' into users/meinersbur/flang_runtime_split-headersusers/meinersbur/flang_runtime_split-headers

8 files changed, 4 insertions, 402 deletions

diff --git a/libc/test/src/string/CMakeLists.txt b/libc/test/src/string/CMakeLists.txt
index b6b59a689cc8..a675373938e9 100644
--- a/libc/test/src/string/CMakeLists.txt
+++ b/libc/test/src/string/CMakeLists.txt
@@ -2,18 +2,6 @@ add_custom_target(libc-string-tests)
 
 add_subdirectory(memory_utils)
 
-add_libc_test(
-  bcopy_test
-  SUITE
-    libc-string-tests
-  SRCS
-    bcopy_test.cpp
-  DEPENDS
-    libc.src.string.bcopy
-  LINK_LIBRARIES
-    LibcMemoryHelpers
-)
-
 add_header_library(
   strchr_test_support
   HDRS
@@ -21,17 +9,6 @@ add_header_library(
 )
 
 add_libc_test(
-  index_test
-  SUITE
-    libc-string-tests
-  SRCS
-    index_test.cpp
-  DEPENDS
-    libc.src.string.index
-    .strchr_test_support
-)
-
-add_libc_test(
   memccpy_test
   SUITE
     libc-string-tests
@@ -82,17 +59,6 @@ add_libc_test(
 )
 
 add_libc_test(
-  rindex_test
-  SUITE
-    libc-string-tests
-  SRCS
-    rindex_test.cpp
-  DEPENDS
-    libc.src.string.rindex
-    .strchr_test_support
-)
-
-add_libc_test(
   stpcpy_test
   SUITE
     libc-string-tests
@@ -154,16 +120,6 @@ add_libc_test(
 )
 
 add_libc_test(
-  strcasecmp_test
-  SUITE
-    libc-string-tests
-  SRCS
-    strcasecmp_test.cpp
-  DEPENDS
-    libc.src.string.strcasecmp
-)
-
-add_libc_test(
   strcasestr_test
   SUITE
     libc-string-tests
@@ -288,16 +244,6 @@ add_libc_test(
 )
 
 add_libc_test(
-  strncasecmp_test
-  SUITE
-    libc-string-tests
-  SRCS
-    strncasecmp_test.cpp
-  DEPENDS
-    libc.src.string.strncasecmp
-)
-
-add_libc_test(
   strncpy_test
   SUITE
     libc-string-tests
@@ -428,39 +374,7 @@ add_libc_test(
     libc.src.string.memset_explicit
 )
 
-# Tests all implementations that can run on the target CPU.
-function(add_libc_multi_impl_test name)
-  get_property(fq_implementations GLOBAL PROPERTY ${name}_implementations)
-  foreach(fq_config_name IN LISTS fq_implementations)
-    get_target_property(required_cpu_features ${fq_config_name} REQUIRE_CPU_FEATURES)
-    cpu_supports(can_run "${required_cpu_features}")
-    if(can_run)
-      string(FIND ${fq_config_name} "." last_dot_loc REVERSE)
-      math(EXPR name_loc "${last_dot_loc} + 1")
-      string(SUBSTRING ${fq_config_name} ${name_loc} -1 target_name)
-      add_libc_test(
-        ${target_name}_test
-        SUITE
-          libc-string-tests
-        COMPILE_OPTIONS
-          ${LIBC_COMPILE_OPTIONS_NATIVE}
-        LINK_LIBRARIES
-          LibcMemoryHelpers
-        ${ARGN}
-        DEPENDS
-          ${fq_config_name}
-          libc.src.__support.macros.sanitizer
-      )
-      get_fq_target_name(${fq_config_name}_test fq_target_name)
-    else()
-      message(STATUS "Skipping test for '${fq_config_name}' insufficient host cpu features '${required_cpu_features}'")
-    endif()
-  endforeach()
-endfunction()
-
-add_libc_multi_impl_test(bcmp SRCS bcmp_test.cpp)
-add_libc_multi_impl_test(bzero SRCS bzero_test.cpp)
-add_libc_multi_impl_test(memcmp SRCS memcmp_test.cpp)
-add_libc_multi_impl_test(memcpy SRCS memcpy_test.cpp)
-add_libc_multi_impl_test(memmove SRCS memmove_test.cpp)
-add_libc_multi_impl_test(memset SRCS memset_test.cpp)
+add_libc_multi_impl_test(memcmp libc-string-tests SRCS memcmp_test.cpp)
+add_libc_multi_impl_test(memcpy libc-string-tests SRCS memcpy_test.cpp)
+add_libc_multi_impl_test(memmove libc-string-tests SRCS memmove_test.cpp)
+add_libc_multi_impl_test(memset libc-string-tests SRCS memset_test.cpp)
diff --git a/libc/test/src/string/bcmp_test.cpp b/libc/test/src/string/bcmp_test.cpp
deleted file mode 100644
index c639040685e1..000000000000
--- a/libc/test/src/string/bcmp_test.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-//===-- Unittests for bcmp ------------------------------------------------===//
-//
-// 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 "memory_utils/memory_check_utils.h"
-#include "src/__support/macros/config.h"
-#include "src/string/bcmp.h"
-#include "test/UnitTest/Test.h"
-#include "test/UnitTest/TestLogger.h"
-
-namespace LIBC_NAMESPACE_DECL {
-
-TEST(LlvmLibcBcmpTest, CmpZeroByte) {
-  const char *lhs = "ab";
-  const char *rhs = "bc";
-  ASSERT_EQ(LIBC_NAMESPACE::bcmp(lhs, rhs, 0), 0);
-}
-
-TEST(LlvmLibcBcmpTest, LhsRhsAreTheSame) {
-  const char *lhs = "ab";
-  const char *rhs = "ab";
-  ASSERT_EQ(LIBC_NAMESPACE::bcmp(lhs, rhs, 2), 0);
-}
-
-TEST(LlvmLibcBcmpTest, LhsBeforeRhsLexically) {
-  const char *lhs = "ab";
-  const char *rhs = "ac";
-  ASSERT_NE(LIBC_NAMESPACE::bcmp(lhs, rhs, 2), 0);
-}
-
-TEST(LlvmLibcBcmpTest, LhsAfterRhsLexically) {
-  const char *lhs = "ac";
-  const char *rhs = "ab";
-  ASSERT_NE(LIBC_NAMESPACE::bcmp(lhs, rhs, 2), 0);
-}
-
-// Adapt CheckBcmp signature to bcmp.
-static inline int Adaptor(cpp::span<char> p1, cpp::span<char> p2, size_t size) {
-  return LIBC_NAMESPACE::bcmp(p1.begin(), p2.begin(), size);
-}
-
-TEST(LlvmLibcBcmpTest, SizeSweep) {
-  static constexpr size_t kMaxSize = 400;
-  Buffer Buffer1(kMaxSize);
-  Buffer Buffer2(kMaxSize);
-  Randomize(Buffer1.span());
-  for (size_t size = 0; size < kMaxSize; ++size) {
-    auto span1 = Buffer1.span().subspan(0, size);
-    auto span2 = Buffer2.span().subspan(0, size);
-    const bool OK = CheckBcmp<Adaptor>(span1, span2, size);
-    if (!OK)
-      testing::tlog << "Failed at size=" << size << '\n';
-    ASSERT_TRUE(OK);
-  }
-}
-
-} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/test/src/string/bcopy_test.cpp b/libc/test/src/string/bcopy_test.cpp
deleted file mode 100644
index 04772bb5d8ad..000000000000
--- a/libc/test/src/string/bcopy_test.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-//===-- Unittests for bcopy -----------------------------------------------===//
-//
-// 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/__support/macros/config.h"
-#include "src/string/bcopy.h"
-
-#include "memory_utils/memory_check_utils.h"
-#include "src/__support/CPP/span.h"
-#include "test/UnitTest/MemoryMatcher.h"
-#include "test/UnitTest/Test.h"
-
-using LIBC_NAMESPACE::cpp::array;
-using LIBC_NAMESPACE::cpp::span;
-
-namespace LIBC_NAMESPACE_DECL {
-
-TEST(LlvmLibcBcopyTest, MoveZeroByte) {
-  char Buffer[] = {'a', 'b', 'y', 'z'};
-  const char Expected[] = {'a', 'b', 'y', 'z'};
-  void *const Dst = Buffer;
-  LIBC_NAMESPACE::bcopy(Buffer + 2, Dst, 0);
-  ASSERT_MEM_EQ(Buffer, testing::MemoryView(Expected));
-}
-
-TEST(LlvmLibcBcopyTest, DstAndSrcPointToSameAddress) {
-  char Buffer[] = {'a', 'b'};
-  const char Expected[] = {'a', 'b'};
-  void *const Dst = Buffer;
-  LIBC_NAMESPACE::bcopy(Buffer, Dst, 1);
-  ASSERT_MEM_EQ(Buffer, testing::MemoryView(Expected));
-}
-
-TEST(LlvmLibcBcopyTest, DstStartsBeforeSrc) {
-  // Set boundary at beginning and end for not overstepping when
-  // copy forward or backward.
-  char Buffer[] = {'z', 'a', 'b', 'c', 'z'};
-  const char Expected[] = {'z', 'b', 'c', 'c', 'z'};
-  void *const Dst = Buffer + 1;
-  LIBC_NAMESPACE::bcopy(Buffer + 2, Dst, 2);
-  ASSERT_MEM_EQ(Buffer, testing::MemoryView(Expected));
-}
-
-TEST(LlvmLibcBcopyTest, DstStartsAfterSrc) {
-  char Buffer[] = {'z', 'a', 'b', 'c', 'z'};
-  const char Expected[] = {'z', 'a', 'a', 'b', 'z'};
-  void *const Dst = Buffer + 2;
-  LIBC_NAMESPACE::bcopy(Buffer + 1, Dst, 2);
-  ASSERT_MEM_EQ(Buffer, testing::MemoryView(Expected));
-}
-
-// e.g. `Dst` follow `src`.
-// str: [abcdefghij]
-//      [__src_____]
-//      [_____Dst__]
-TEST(LlvmLibcBcopyTest, SrcFollowDst) {
-  char Buffer[] = {'z', 'a', 'b', 'z'};
-  const char Expected[] = {'z', 'b', 'b', 'z'};
-  void *const Dst = Buffer + 1;
-  LIBC_NAMESPACE::bcopy(Buffer + 2, Dst, 1);
-  ASSERT_MEM_EQ(Buffer, testing::MemoryView(Expected));
-}
-
-TEST(LlvmLibcBcopyTest, DstFollowSrc) {
-  char Buffer[] = {'z', 'a', 'b', 'z'};
-  const char Expected[] = {'z', 'a', 'a', 'z'};
-  void *const Dst = Buffer + 2;
-  LIBC_NAMESPACE::bcopy(Buffer + 1, Dst, 1);
-  ASSERT_MEM_EQ(Buffer, testing::MemoryView(Expected));
-}
-
-// Adapt CheckMemmove signature to bcopy.
-static inline void Adaptor(cpp::span<char> dst, cpp::span<char> src,
-                           size_t size) {
-  LIBC_NAMESPACE::bcopy(src.begin(), dst.begin(), size);
-}
-
-TEST(LlvmLibcBcopyTest, SizeSweep) {
-  static constexpr int kMaxSize = 400;
-  static constexpr int kDenseOverlap = 15;
-  using LargeBuffer = array<char, 2 * kMaxSize + 1>;
-  LargeBuffer Buffer;
-  Randomize(Buffer);
-  for (int Size = 0; Size < kMaxSize; ++Size)
-    for (int Overlap = -1; Overlap < Size;) {
-      ASSERT_TRUE(CheckMemmove<Adaptor>(Buffer, Size, Overlap));
-      // Prevent quadratic behavior by skipping offset above kDenseOverlap.
-      if (Overlap > kDenseOverlap)
-        Overlap *= 2;
-      else
-        ++Overlap;
-    }
-}
-
-} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/test/src/string/bzero_test.cpp b/libc/test/src/string/bzero_test.cpp
deleted file mode 100644
index a24043613bed..000000000000
--- a/libc/test/src/string/bzero_test.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-//===-- Unittests for bzero -----------------------------------------------===//
-//
-// 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 "memory_utils/memory_check_utils.h"
-#include "src/__support/macros/config.h"
-#include "src/string/bzero.h"
-#include "test/UnitTest/Test.h"
-
-namespace LIBC_NAMESPACE_DECL {
-
-// Adapt CheckMemset signature to bzero.
-static inline void Adaptor(cpp::span<char> p1, uint8_t value, size_t size) {
-  LIBC_NAMESPACE::bzero(p1.begin(), size);
-}
-
-TEST(LlvmLibcBzeroTest, SizeSweep) {
-  static constexpr size_t kMaxSize = 400;
-  Buffer DstBuffer(kMaxSize);
-  for (size_t size = 0; size < kMaxSize; ++size) {
-    auto dst = DstBuffer.span().subspan(0, size);
-    ASSERT_TRUE((CheckMemset<Adaptor>(dst, 0, size)));
-  }
-}
-
-} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/test/src/string/index_test.cpp b/libc/test/src/string/index_test.cpp
deleted file mode 100644
index 88953205009d..000000000000
--- a/libc/test/src/string/index_test.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-//===-- Unittests for index -----------------------------------------------===//
-//
-// 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 "StrchrTest.h"
-
-#include "src/string/index.h"
-#include "test/UnitTest/Test.h"
-
-STRCHR_TEST(Index, LIBC_NAMESPACE::index)
diff --git a/libc/test/src/string/rindex_test.cpp b/libc/test/src/string/rindex_test.cpp
deleted file mode 100644
index 10513919cffa..000000000000
--- a/libc/test/src/string/rindex_test.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-//===-- Unittests for rindex ----------------------------------------------===//
-//
-// 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 "StrchrTest.h"
-
-#include "src/string/rindex.h"
-#include "test/UnitTest/Test.h"
-
-STRRCHR_TEST(Rindex, LIBC_NAMESPACE::rindex)
diff --git a/libc/test/src/string/strcasecmp_test.cpp b/libc/test/src/string/strcasecmp_test.cpp
deleted file mode 100644
index df7888168c69..000000000000
--- a/libc/test/src/string/strcasecmp_test.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-//===-- Unittests for strcasecmp ------------------------------------------===//
-//
-// 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/string/strcasecmp.h"
-#include "test/UnitTest/Test.h"
-
-TEST(LlvmLibcStrCaseCmpTest, EmptyStringsShouldReturnZero) {
-  const char *s1 = "";
-  const char *s2 = "";
-  int result = LIBC_NAMESPACE::strcasecmp(s1, s2);
-  ASSERT_EQ(result, 0);
-
-  // Verify operands reversed.
-  result = LIBC_NAMESPACE::strcasecmp(s2, s1);
-  ASSERT_EQ(result, 0);
-}
-
-TEST(LlvmLibcStrCaseCmpTest, EmptyStringShouldNotEqualNonEmptyString) {
-  const char *empty = "";
-  const char *s2 = "abc";
-  int result = LIBC_NAMESPACE::strcasecmp(empty, s2);
-  // This should be '\0' - 'a' = -97
-  ASSERT_LT(result, 0);
-
-  // Similar case if empty string is second argument.
-  const char *s3 = "123";
-  result = LIBC_NAMESPACE::strcasecmp(s3, empty);
-  // This should be '1' - '\0' = 49
-  ASSERT_GT(result, 0);
-}
-
-TEST(LlvmLibcStrCaseCmpTest, Case) {
-  const char *s1 = "aB";
-  const char *s2 = "ab";
-  int result = LIBC_NAMESPACE::strcasecmp(s1, s2);
-  ASSERT_EQ(result, 0);
-
-  // Verify operands reversed.
-  result = LIBC_NAMESPACE::strcasecmp(s2, s1);
-  ASSERT_EQ(result, 0);
-}
diff --git a/libc/test/src/string/strncasecmp_test.cpp b/libc/test/src/string/strncasecmp_test.cpp
deleted file mode 100644
index b4173c455de9..000000000000
--- a/libc/test/src/string/strncasecmp_test.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-//===-- Unittests for strncasecmp -----------------------------------------===//
-//
-// 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/string/strncasecmp.h"
-#include "test/UnitTest/Test.h"
-
-TEST(LlvmLibcStrNCaseCmpTest,
-     EmptyStringsShouldReturnZeroWithSufficientLength) {
-  const char *s1 = "";
-  const char *s2 = "";
-  int result = LIBC_NAMESPACE::strncasecmp(s1, s2, 1);
-  ASSERT_EQ(result, 0);
-
-  // Verify operands reversed.
-  result = LIBC_NAMESPACE::strncasecmp(s2, s1, 1);
-  ASSERT_EQ(result, 0);
-}
-
-TEST(LlvmLibcStrNCaseCmpTest,
-     EmptyStringShouldNotEqualNonEmptyStringWithSufficientLength) {
-  const char *empty = "";
-  const char *s2 = "abc";
-  int result = LIBC_NAMESPACE::strncasecmp(empty, s2, 3);
-  // This should be '\0' - 'a' = -97
-  ASSERT_LT(result, 0);
-
-  // Similar case if empty string is second argument.
-  const char *s3 = "123";
-  result = LIBC_NAMESPACE::strncasecmp(s3, empty, 3);
-  // This should be '1' - '\0' = 49
-  ASSERT_GT(result, 0);
-}
-
-TEST(LlvmLibcStrNCaseCmpTest, Case) {
-  const char *s1 = "aB";
-  const char *s2 = "ab";
-  int result = LIBC_NAMESPACE::strncasecmp(s1, s2, 2);
-  ASSERT_EQ(result, 0);
-
-  // Verify operands reversed.
-  result = LIBC_NAMESPACE::strncasecmp(s2, s1, 2);
-  ASSERT_EQ(result, 0);
-}