[libc][NFC] Sink "PlatformDefs.h" into "FloatProperties.h" (#73226)

gchatelet · web-flow · commit d924c5d721f0 · 2023-11-23T11:23:18.000+01:00
`PlatformDefs.h` does not bring a lot of value as a separate file.
It is transitively included in `FloatProperties.h` and `FPBits.h`. This
patch sinks it into `FloatProperties.h` and removes the associated build
targets.
diff --git a/libc/src/__support/FPUtil/CMakeLists.txt b/libc/src/__support/FPUtil/CMakeLists.txt
@@ -23,20 +23,11 @@ add_header_library(
     libc.src.errno.errno
 )
 
-add_header_library(
-  platform_defs
-  HDRS
-    PlatformDefs.h
-  DEPENDS
-    libc.src.__support.common
-)
-
 add_header_library(
   float_properties
   HDRS
     FloatProperties.h
   DEPENDS
-    .platform_defs
     libc.src.__support.uint128
 )
 
@@ -46,7 +37,6 @@ add_header_library(
     FPBits.h
   DEPENDS
     .float_properties
-    .platform_defs
     libc.src.__support.common
     libc.src.__support.CPP.bit
     libc.src.__support.CPP.type_traits
@@ -100,7 +90,6 @@ add_header_library(
     .fp_bits
     .nearest_integer_operations
     .normal_float
-    .platform_defs
     libc.src.__support.CPP.bit
     libc.src.__support.CPP.type_traits
     libc.src.__support.common
diff --git a/libc/src/__support/FPUtil/FPBits.h b/libc/src/__support/FPUtil/FPBits.h
@@ -9,8 +9,6 @@
 #ifndef LLVM_LIBC_SRC___SUPPORT_FPUTIL_FPBITS_H
 #define LLVM_LIBC_SRC___SUPPORT_FPUTIL_FPBITS_H
 
-#include "PlatformDefs.h"
-
 #include "src/__support/CPP/bit.h"
 #include "src/__support/CPP/type_traits.h"
 #include "src/__support/bit.h"
diff --git a/libc/src/__support/FPUtil/FloatProperties.h b/libc/src/__support/FPUtil/FloatProperties.h
@@ -9,12 +9,23 @@
 #ifndef LLVM_LIBC_SRC___SUPPORT_FPUTIL_FLOATPROPERTIES_H
 #define LLVM_LIBC_SRC___SUPPORT_FPUTIL_FLOATPROPERTIES_H
 
-#include "PlatformDefs.h"
-
 #include "src/__support/UInt128.h"
+#include "src/__support/macros/properties/architectures.h" // LIBC_TARGET_ARCH_XXX
 
 #include <stdint.h>
 
+// https://developer.arm.com/documentation/dui0491/i/C-and-C---Implementation-Details/Basic-data-types
+// https://developer.apple.com/documentation/xcode/writing-arm64-code-for-apple-platforms
+// https://docs.amd.com/bundle/HIP-Programming-Guide-v5.1/page/Programming_with_HIP.html
+#if defined(_WIN32) || defined(__arm__) || defined(__NVPTX__) ||               \
+    defined(__AMDGPU__) || (defined(__APPLE__) && defined(__aarch64__))
+#define LONG_DOUBLE_IS_DOUBLE
+#endif
+
+#if !defined(LONG_DOUBLE_IS_DOUBLE) && defined(LIBC_TARGET_ARCH_IS_X86)
+#define SPECIAL_X86_LONG_DOUBLE
+#endif
+
 namespace LIBC_NAMESPACE {
 namespace fputil {
 
diff --git a/libc/src/__support/FPUtil/ManipulationFunctions.h b/libc/src/__support/FPUtil/ManipulationFunctions.h
@@ -13,7 +13,6 @@
 #include "FloatProperties.h"
 #include "NearestIntegerOperations.h"
 #include "NormalFloat.h"
-#include "PlatformDefs.h"
 
 #include "src/__support/CPP/bit.h"
 #include "src/__support/CPP/type_traits.h"
diff --git a/libc/src/__support/FPUtil/PlatformDefs.h b/libc/src/__support/FPUtil/PlatformDefs.h
diff --git a/libc/src/__support/FPUtil/generic/CMakeLists.txt b/libc/src/__support/FPUtil/generic/CMakeLists.txt
@@ -10,7 +10,6 @@ add_header_library(
     libc.src.__support.CPP.type_traits
     libc.src.__support.FPUtil.fenv_impl
     libc.src.__support.FPUtil.fp_bits
-    libc.src.__support.FPUtil.platform_defs
     libc.src.__support.FPUtil.rounding_mode
     libc.src.__support.bit
     libc.src.__support.uint128
diff --git a/libc/src/__support/FPUtil/generic/sqrt.h b/libc/src/__support/FPUtil/generic/sqrt.h
@@ -14,7 +14,6 @@
 #include "src/__support/CPP/type_traits.h"
 #include "src/__support/FPUtil/FEnvImpl.h"
 #include "src/__support/FPUtil/FPBits.h"
-#include "src/__support/FPUtil/PlatformDefs.h"
 #include "src/__support/FPUtil/rounding_mode.h"
 #include "src/__support/UInt128.h"
 #include "src/__support/bit.h"
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
@@ -11,7 +11,6 @@
 
 #include "src/__support/FPUtil/FEnvImpl.h"
 #include "src/__support/FPUtil/FPBits.h"
-#include "src/__support/FPUtil/PlatformDefs.h"
 #include "src/__support/FPUtil/rounding_mode.h"
 #include "src/__support/UInt128.h"
 #include "src/__support/bit.h"
diff --git a/libc/test/src/stdio/CMakeLists.txt b/libc/test/src/stdio/CMakeLists.txt
@@ -132,7 +132,6 @@ add_fp_unittest(
   DEPENDS
     libc.src.stdio.sprintf
     libc.src.__support.FPUtil.fp_bits
-    libc.src.__support.FPUtil.platform_defs
   COMPILE_OPTIONS
     ${sprintf_test_copts}
 )
diff --git a/libc/test/src/stdio/sprintf_test.cpp b/libc/test/src/stdio/sprintf_test.cpp
@@ -9,7 +9,6 @@
 #include "src/stdio/sprintf.h"
 
 #include "src/__support/FPUtil/FPBits.h"
-#include "src/__support/FPUtil/PlatformDefs.h"
 #include "test/UnitTest/RoundingModeUtils.h"
 #include "test/UnitTest/Test.h"
 
diff --git a/libc/test/src/stdio/sscanf_test.cpp b/libc/test/src/stdio/sscanf_test.cpp
@@ -8,7 +8,6 @@
 
 #include "src/__support/CPP/limits.h"
 #include "src/__support/FPUtil/FPBits.h"
-#include "src/__support/FPUtil/PlatformDefs.h"
 
 #include "src/stdio/sscanf.h"
 
diff --git a/libc/utils/MPFRWrapper/CMakeLists.txt b/libc/utils/MPFRWrapper/CMakeLists.txt
@@ -14,7 +14,6 @@ if(LIBC_TESTS_CAN_USE_MPFR)
     libc.src.__support.FPUtil.fp_bits
     libc.src.__support.FPUtil.float_properties
     libc.src.__support.FPUtil.fpbits_str
-    libc.src.__support.FPUtil.platform_defs
     LibcTest.unit
   )
   if(EXISTS ${LLVM_LIBC_MPFR_INSTALL_PATH})
diff --git a/libc/utils/MPFRWrapper/MPFRUtils.cpp b/libc/utils/MPFRWrapper/MPFRUtils.cpp
@@ -12,7 +12,6 @@
 #include "src/__support/CPP/string_view.h"
 #include "src/__support/FPUtil/FPBits.h"
 #include "src/__support/FPUtil/FloatProperties.h"
-#include "src/__support/FPUtil/PlatformDefs.h"
 #include "src/__support/FPUtil/fpbits_str.h"
 #include "test/UnitTest/FPMatcher.h"
 
diff --git a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
@@ -657,7 +657,6 @@ libc_support_library(
     name = "__support_fputil_float_properties",
     hdrs = ["src/__support/FPUtil/FloatProperties.h"],
     deps = [
-        ":__support_fputil_platform_defs",
         ":__support_uint128",
     ],
 )
@@ -672,7 +671,6 @@ libc_support_library(
         ":__support_cpp_bit",
         ":__support_cpp_type_traits",
         ":__support_fputil_float_properties",
-        ":__support_fputil_platform_defs",
         ":__support_uint128",
     ],
 )
@@ -686,7 +684,6 @@ libc_support_library(
         ":__support_cpp_type_traits",
         ":__support_fputil_float_properties",
         ":__support_fputil_fp_bits",
-        ":__support_fputil_platform_defs",
         ":__support_integer_to_string",
         ":__support_uint128",
     ],
@@ -719,7 +716,6 @@ libc_support_library(
         ":__support_fputil_fp_bits",
         ":__support_fputil_nearest_integer_operations",
         ":__support_fputil_normal_float",
-        ":__support_fputil_platform_defs",
         ":__support_macros_optimization",
         ":__support_uint128",
     ],
@@ -747,14 +743,6 @@ libc_support_library(
     ],
 )
 
-libc_support_library(
-    name = "__support_fputil_platform_defs",
-    hdrs = ["src/__support/FPUtil/PlatformDefs.h"],
-    deps = [
-        ":__support_common",
-    ],
-)
-
 sqrt_common_hdrs = [
     "src/__support/FPUtil/sqrt.h",
     "src/__support/FPUtil/generic/sqrt.h",
@@ -781,7 +769,6 @@ libc_support_library(
         ":__support_cpp_type_traits",
         ":__support_fputil_fenv_impl",
         ":__support_fputil_fp_bits",
-        ":__support_fputil_platform_defs",
         ":__support_fputil_rounding_mode",
         ":__support_uint128",
     ],
diff --git a/utils/bazel/llvm-project-overlay/libc/libc_build_rules.bzl b/utils/bazel/llvm-project-overlay/libc/libc_build_rules.bzl
@@ -144,7 +144,6 @@ def libc_math_function(
         ":__support_fputil_manipulation_functions",
         ":__support_fputil_nearest_integer_operations",
         ":__support_fputil_normal_float",
-        ":__support_fputil_platform_defs",
         ":__support_math_extras",
         ":__support_fputil_except_value_utils",
     ]
diff --git a/utils/bazel/llvm-project-overlay/libc/test/src/stdio/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/stdio/BUILD.bazel
@@ -61,7 +61,6 @@ libc_test(
     ],
     deps = [
         "//libc:__support_fputil_fp_bits",
-        "//libc:__support_fputil_platform_defs",
         "//libc/test/UnitTest:fp_test_helpers",
     ],
 )
diff --git a/utils/bazel/llvm-project-overlay/libc/utils/MPFRWrapper/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/utils/MPFRWrapper/BUILD.bazel
@@ -47,7 +47,6 @@ libc_support_library(
         "//libc:__support_fputil_float_properties",
         "//libc:__support_fputil_fp_bits",
         "//libc:__support_fputil_fpbits_str",
-        "//libc:__support_fputil_platform_defs",
         "//libc/test/UnitTest:fp_test_helpers",
         "//libc/utils/MPFRWrapper:mpfr_impl",
     ],

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,6 @@ add_fp_unittest(`
`132`	`132`	`DEPENDS`
`133`	`133`	`libc.src.stdio.sprintf`
`134`	`134`	`libc.src.__support.FPUtil.fp_bits`
`135`		`- libc.src.__support.FPUtil.platform_defs`
`136`	`135`	`COMPILE_OPTIONS`
`137`	`136`	`${sprintf_test_copts}`
`138`	`137`	`)`