[libc][NFC] split standalone_cpp into single headers

[michaelrj]

Summary

Previously, the entire support/CPP folder was in one header library,
which meant that a lot of headers were included where they shouldn't be.
This patch splits each header into its own target, as well as adjusting
each place they were included to only include what is used.

[lntue]

libc/src/__support/FPUtil/CMakeLists.txt

2

nit: separate

libc/src/string/memory_utils/CMakeLists.txt

12

nit: alignment

[michaelrj]

address comments

libc/fuzzing/math/CMakeLists.txt

DEPENDS
     libc.src.math.remquol
     libc.src.math.round
     libc.src.math.roundf
     libc.src.math.roundl
     libc.src.math.trunc
     libc.src.math.truncf
     libc.src.math.truncl
     libc.src.__support.FPUtil.fputil
-    libc.src.__support.CPP.standalone_cpp
+    libc.src.__support.CPP.type_traits
 )
 
 add_libc_fuzzer(
   nextafter_differential_fuzz
   SRCS
     nextafter_differential_fuzz.cpp
   HDRS
     TwoInputSingleOutputDiff.h
   DEPENDS
     libc.src.math.nextafter
     libc.src.math.nextafterf
     libc.src.math.nextafterl
 )

libc/src/__support/CMakeLists.txt

 add_header_library(
   str_to_integer
   HDRS
     str_to_integer.h
   DEPENDS
     .ctype_utils
     libc.include.errno
     libc.src.errno.errno
-    libc.src.__support.CPP.standalone_cpp
+    libc.src.__support.CPP.limits
 )
 
 add_header_library(
   high_precision_decimal
   HDRS
     high_precision_decimal.h
   DEPENDS
     .str_to_integer
 )
 
 add_header_library(
   str_to_float
   HDRS
     str_to_float.h
   DEPENDS
     .str_to_integer
     .ctype_utils
     .high_precision_decimal
     libc.include.errno
     libc.src.errno.errno
-    libc.src.__support.CPP.standalone_cpp
+    libc.src.__support.CPP.limits
     libc.src.__support.FPUtil.fputil
 )
 
 add_header_library(
   integer_operations
   HDRS
     integer_operations.h
 )
 
 add_subdirectory(File)
 add_subdirectory(FPUtil)
 add_subdirectory(OSUtil)
 add_subdirectory(threads)

libc/src/__support/CPP/CMakeLists.txt

-# TODO(michaelrj): separate the standalone_cpp library into individual targets.
 add_header_library(
-  standalone_cpp
+  array
   HDRS
     Array.h
+)
+
+add_header_library(
+  array_ref
+  HDRS
     ArrayRef.h
+)
+
+
+add_header_library(
+  bit
+  HDRS
     Bit.h
+)
+
+
+add_header_library(
+  bitset
+  HDRS
     Bitset.h
+)
+
+add_header_library(
+  functional
+  HDRS
     Functional.h
+)
+
+add_header_library(
+  limits
+  HDRS
     Limits.h
+)
+
+add_header_library(
+  string_view
+  HDRS
     StringView.h
+)
+
+add_header_library(
+  type_traits
+  HDRS
     TypeTraits.h
+)
+
+add_header_library(
+  utility
+  HDRS
     Utility.h
 )
 
 add_header_library(
   vector
   HDRS
     vector.h
   DEPENDS
     libc.include.stdlib
 )
 
 add_header_library(
   atomic
   HDRS
     atomic.h
 )

libc/src/__support/FPUtil/CMakeLists.txt

+#TODO(michaelrj): separate the fputil library into individual targets.
 add_header_library(
   fputil
   HDRS
     FEnvImpl.h
     BasicOperations.h
     DivisionAndRemainderOperations.h
     FloatProperties.h
     FPBits.h
     BasicOperations.h
     ManipulationFunctions.h
     NearestIntegerOperations.h
     NormalFloat.h
     PlatformDefs.h
     PolyEval.h
     UInt.h
     XFloat.h
   DEPENDS
     libc.include.math
     libc.include.errno
     libc.include.fenv
     libc.src.__support.common
-    libc.src.__support.CPP.standalone_cpp
+    libc.src.__support.CPP.type_traits
+    libc.src.__support.CPP.bit
     libc.src.errno.errno
 )
 
 add_header_library(
   sqrt
   HDRS
     sqrt.h
   DEPENDS
     .fputil
     libc.src.__support.FPUtil.generic.sqrt
 )
 
 add_subdirectory(generic)

libc/src/string/CMakeLists.txt

 add_subdirectory(memory_utils)
 
 add_header_library(
   string_utils
   HDRS
     string_utils.h
   DEPENDS
-    libc.src.__support.CPP.standalone_cpp
+    libc.src.__support.CPP.bitset
 )
 
 add_entrypoint_object(
   memccpy
   SRCS
     memccpy.cpp
   HDRS
     memccpy.h

 
 add_entrypoint_object(
   strspn
   SRCS
     strspn.cpp
   HDRS
     strspn.h
   DEPENDS
-    libc.src.__support.CPP.standalone_cpp
+    libc.src.__support.CPP.bitset
 )
 
 add_entrypoint_object(
   strstr
   SRCS
     strstr.cpp
   HDRS
     strstr.h

libc/src/string/memory_utils/CMakeLists.txt

+#TODO(michaelrj): split out the implementations from memory_utils
 add_header_library(
   memory_utils
   HDRS
     utils.h
     elements.h
     bcmp_implementations.h
     memcmp_implementations.h
     memcpy_implementations.h
     memset_implementations.h
   DEPS
-    standalone_cpp
+    libc.src.__support.CPP.bit
 )
 
 add_header_library(
   memcpy_implementation
   HDRS
     memcpy_implementations.h
   DEPS
     .memory_utils

libc/test/src/__support/CPP/CMakeLists.txt

 add_libc_testsuite(libc_cpp_utils_unittests)
 
 add_libc_unittest(
   bitset_test
   SUITE
     libc_cpp_utils_unittests
   SRCS
     bitset_test.cpp
   DEPENDS
-    libc.src.__support.CPP.standalone_cpp
+    libc.src.__support.CPP.bitset
 )
 
 add_libc_unittest(
   stringview_test
   SUITE
     libc_cpp_utils_unittests
   SRCS
     stringview_test.cpp
   DEPENDS
-    libc.src.__support.CPP.standalone_cpp
+    libc.src.__support.CPP.string_view
 )
 
 add_libc_unittest(
   limits_test
   SUITE
     libc_cpp_utils_unittests
   SRCS
     limits_test.cpp
   DEPENDS
-    libc.src.__support.CPP.standalone_cpp
+    libc.src.__support.CPP.limits
 )
 
 add_libc_unittest(
   arrayref_test
   SUITE
     libc_cpp_utils_unittests
   SRCS
     arrayref_test.cpp
   DEPENDS
-    libc.src.__support.CPP.standalone_cpp
+    libc.src.__support.CPP.array_ref
 )
 
 add_libc_unittest(
   vector_test
   SUITE
     libc_cpp_utils_unittests
   SRCS
     vector_test.cpp
   DEPENDS
     libc.src.__support.CPP.vector
 )
 
 add_libc_unittest(
   int_seq_test
   SUITE
     libc_cpp_utils_unittests
   SRCS
     integer_sequence_test.cpp
   DEPENDS
-    libc.src.__support.CPP.standalone_cpp
+    libc.src.__support.CPP.utility
 )
 
 add_libc_unittest(
   atomic_test
   SUITE
     libc_cpp_utils_unittests
   SRCS
     atomic_test.cpp
   DEPENDS
     libc.src.__support.CPP.atomic
 )

libc/test/src/math/CMakeLists.txt

 add_libc_testsuite(libc_math_unittests)
 
 add_fp_unittest(
   cosf_test
   NEED_MPFR
   SUITE
     libc_math_unittests
   SRCS
     cosf_test.cpp
   HDRS
     sdcomp26094.h
   DEPENDS
     libc.include.errno
     libc.src.math.cosf
-    libc.src.__support.CPP.standalone_cpp
+    libc.src.__support.CPP.array
     libc.src.__support.FPUtil.fputil
 )
 
 add_fp_unittest(
   cos_test
   NEED_MPFR
   SUITE
     libc_math_unittests
SUITE
     libc_math_unittests
   SRCS
     sinf_test.cpp
   HDRS
     sdcomp26094.h
   DEPENDS
     libc.include.errno
     libc.src.math.sinf
-    libc.src.__support.CPP.standalone_cpp
+    libc.src.__support.CPP.array
     libc.src.__support.FPUtil.fputil
 )
 
 add_fp_unittest(
   sin_test
   NEED_MPFR
   SUITE
     libc_math_unittests
SUITE
     libc_math_unittests
   SRCS
     sincosf_test.cpp
   HDRS
     sdcomp26094.h
   DEPENDS
     libc.include.errno
     libc.src.math.sincosf
-    libc.src.__support.CPP.standalone_cpp
+    libc.src.__support.CPP.array
     libc.src.__support.FPUtil.fputil
 )
 
 add_fp_unittest(
   fabs_test
   NEED_MPFR
   SUITE
     libc_math_unittests

libc/test/src/math/exhaustive/CMakeLists.txt

 add_libc_exhaustive_testsuite(libc_math_exhaustive_tests)
 
 add_object_library(
   exhaustive_test
   HDRS
     exhaustive_test.h
   SRCS
     exhaustive_test.cpp
-  DEPENDS
-    libc.src.__support.CPP.standalone_cpp
 )
 
 add_fp_unittest(
   sqrtf_test
   NEED_MPFR
   SUITE
     libc_math_exhaustive_tests
   SRCS

libc/test/src/stdlib/CMakeLists.txt

SUITE
       libc_stdlib_unittests
     SRCS
       atexit_test.cpp
     DEPENDS
       libc.include.stdlib
       libc.src.stdlib._Exit
       libc.src.stdlib.exit
       libc.src.stdlib.atexit
-      libc.src.__support.CPP.standalone_cpp
+      libc.src.__support.CPP.array
+      libc.src.__support.CPP.utility
   )
 
   # add_libc_unittest(
   #   abort_test
   #   SUITE
   #     libc_stdlib_unittests
   #   SRCS
   #     abort_test.cpp

libc/test/src/string/memory_utils/CMakeLists.txt

 add_libc_unittest(
   utils_test
   SUITE
     libc_string_unittests
   SRCS
     elements_test.cpp
     memory_access_test.cpp
     utils_test.cpp
   DEPENDS
     libc.src.string.memory_utils.memory_utils
-    libc.src.__support.CPP.standalone_cpp
+    libc.src.__support.CPP.array
+    libc.src.__support.CPP.array_ref
   COMPILE_OPTIONS
     ${LIBC_COMPILE_OPTIONS_NATIVE}
     -ffreestanding
 )

libc/test/utils/UnitTest/CMakeLists.txt

 add_libc_testsuite(libc_unittest_tests)
 
 add_libc_unittest(
   testfilter_test
   SUITE
     libc_unittest_tests
   SRCS
     testfilter_test.cpp
   DEPENDS
-    libc.src.__support.CPP.standalone_cpp
+    # TODO(michaelrj): Remove this dependancy. It's only here because all unit 
+    # tests must have at least one dependancy.
+    libc.src.__support.CPP.bit 
 )

libc/utils/MPFRWrapper/CMakeLists.txt

 if(LIBC_TESTS_CAN_USE_MPFR)
   add_library(libcMPFRWrapper
     MPFRUtils.cpp
     MPFRUtils.h
   )
   add_compile_options(
     -O3
   )
-  add_dependencies(libcMPFRWrapper libc.src.__support.CPP.standalone_cpp libc.src.__support.FPUtil.fputil LibcUnitTest)
+  add_dependencies(
+    libcMPFRWrapper 
+    libc.src.__support.CPP.string_view 
+    libc.src.__support.CPP.type_traits 
+    libc.src.__support.FPUtil.fputil 
+    LibcUnitTest
+  )
   if(EXISTS ${LLVM_LIBC_MPFR_INSTALL_PATH})
     target_include_directories(libcMPFRWrapper PUBLIC ${LLVM_LIBC_MPFR_INSTALL_PATH}/include)
     target_link_directories(libcMPFRWrapper PUBLIC ${LLVM_LIBC_MPFR_INSTALL_PATH}/lib)
   endif()
   target_link_libraries(libcMPFRWrapper LibcFPTestHelpers LibcUnitTest mpfr gmp)
 else()
   message(WARNING "Math tests using MPFR will be skipped.")
 endif()

libc/utils/UnitTest/CMakeLists.txt

 add_library(
   LibcUnitTest
   Test.h
   LibcTest.cpp
   LibcTest.h
 )
 target_include_directories(LibcUnitTest PUBLIC ${LIBC_SOURCE_DIR})
-add_dependencies(LibcUnitTest libc.src.__support.CPP.standalone_cpp)
+add_dependencies(LibcUnitTest libc.src.__support.CPP.type_traits)
 target_link_libraries(LibcUnitTest PUBLIC libc_test_utils)
 
 add_library(
   LibcUnitTestMain
   LibcTestMain.cpp
 )
 
 target_include_directories(LibcUnitTestMain PUBLIC ${LIBC_SOURCE_DIR})
-add_dependencies(LibcUnitTestMain LibcUnitTest libc.src.__support.CPP.standalone_cpp)
+add_dependencies(LibcUnitTestMain LibcUnitTest)
 target_link_libraries(LibcUnitTestMain PUBLIC LibcUnitTest libc_test_utils)
 
 add_library(
   LibcFPTestHelpers
     FPExceptMatcher.cpp
     FPExceptMatcher.h
     FPMatcher.cpp
     FPMatcher.h
 )
 target_include_directories(LibcFPTestHelpers PUBLIC ${LIBC_SOURCE_DIR})
 target_link_libraries(LibcFPTestHelpers LibcUnitTest)
 add_dependencies(
   LibcFPTestHelpers
   LibcUnitTest
-  libc.src.__support.CPP.standalone_cpp
   libc.src.__support.FPUtil.fputil
 )
 
 add_library(
   LibcMemoryHelpers
     MemoryMatcher.h
     MemoryMatcher.cpp
 )
 target_include_directories(LibcMemoryHelpers PUBLIC ${LIBC_SOURCE_DIR})
 target_link_libraries(LibcMemoryHelpers LibcUnitTest)
 add_dependencies(
   LibcMemoryHelpers
   LibcUnitTest
-  libc.src.__support.CPP.standalone_cpp
+  libc.src.__support.CPP.array_ref
 )