diff options
author | Phoebe Wang <phoebe.wang@intel.com> | 2022-07-30 09:41:33 +0800 |
---|---|---|
committer | Phoebe Wang <phoebe.wang@intel.com> | 2022-07-30 09:41:33 +0800 |
commit | b17c89d1511f14b864ee680577a7b68363d672f9 (patch) | |
tree | 56999fc427c925594f2bb70c1660f60ce2c6c5f8 /compiler-rt | |
parent | 2ff187fbc9f234303fa8905d74faef24643411e0 (diff) |
Revert "[compiler-rt] [builtins] Detect _Float16 support at compile time"
This reverts commit ce6d40f5c23923a807388c58b82b4c343eced0ce.
Revert due to it broke the sanitizer-windows buildbot: https://lab.llvm.org/buildbot/#/builders/127/builds/33583/steps/4/logs/stdio
Diffstat (limited to 'compiler-rt')
-rw-r--r-- | compiler-rt/cmake/builtin-config-ix.cmake | 8 | ||||
-rw-r--r-- | compiler-rt/lib/builtins/CMakeLists.txt | 2 | ||||
-rw-r--r-- | compiler-rt/lib/builtins/extendhftf2.c | 2 | ||||
-rw-r--r-- | compiler-rt/lib/builtins/fp_extend.h | 2 | ||||
-rw-r--r-- | compiler-rt/lib/builtins/fp_trunc.h | 2 | ||||
-rw-r--r-- | compiler-rt/lib/builtins/int_types.h | 4 | ||||
-rw-r--r-- | compiler-rt/lib/builtins/trunctfhf2.c | 2 | ||||
-rw-r--r-- | compiler-rt/test/builtins/CMakeLists.txt | 13 | ||||
-rw-r--r-- | compiler-rt/test/builtins/Unit/extendhftf2_test.c | 4 | ||||
-rw-r--r-- | compiler-rt/test/builtins/Unit/fp_test.h | 19 | ||||
-rw-r--r-- | compiler-rt/test/builtins/Unit/trunctfhf2_test.c | 4 |
11 files changed, 40 insertions, 22 deletions
diff --git a/compiler-rt/cmake/builtin-config-ix.cmake b/compiler-rt/cmake/builtin-config-ix.cmake index ce7e0a7f400e..9cbadf33e257 100644 --- a/compiler-rt/cmake/builtin-config-ix.cmake +++ b/compiler-rt/cmake/builtin-config-ix.cmake @@ -22,6 +22,14 @@ int foo(int x, int y) { } ") +builtin_check_c_compiler_source(COMPILER_RT_HAS_FLOAT16 +" +_Float16 foo(_Float16 x) { + return x; +} +" +) + builtin_check_c_compiler_source(COMPILER_RT_HAS_ASM_LSE " asm(\".arch armv8-a+lse\"); diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt index 8efc6d13aa08..0b91b4ce7993 100644 --- a/compiler-rt/lib/builtins/CMakeLists.txt +++ b/compiler-rt/lib/builtins/CMakeLists.txt @@ -695,6 +695,8 @@ else () append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS) endif() + append_list_if(COMPILER_RT_HAS_FLOAT16 -DCOMPILER_RT_HAS_FLOAT16 BUILTIN_CFLAGS) + append_list_if(COMPILER_RT_HAS_STD_C11_FLAG -std=c11 BUILTIN_CFLAGS) # These flags would normally be added to CMAKE_C_FLAGS by the llvm diff --git a/compiler-rt/lib/builtins/extendhftf2.c b/compiler-rt/lib/builtins/extendhftf2.c index 196f8c9abb3b..aefe9737d34f 100644 --- a/compiler-rt/lib/builtins/extendhftf2.c +++ b/compiler-rt/lib/builtins/extendhftf2.c @@ -11,7 +11,7 @@ #include "fp_lib.h" #if defined(CRT_HAS_128BIT) && defined(CRT_LDBL_128BIT) && \ - defined(CRT_HAS_FLOAT16) + defined(COMPILER_RT_HAS_FLOAT16) #define SRC_HALF #define DST_QUAD #include "fp_extend_impl.inc" diff --git a/compiler-rt/lib/builtins/fp_extend.h b/compiler-rt/lib/builtins/fp_extend.h index 7ba89f7f0a15..eee4722bf90e 100644 --- a/compiler-rt/lib/builtins/fp_extend.h +++ b/compiler-rt/lib/builtins/fp_extend.h @@ -40,7 +40,7 @@ static __inline int src_rep_t_clz(src_rep_t a) { } #elif defined SRC_HALF -#ifdef CRT_HAS_FLOAT16 +#ifdef COMPILER_RT_HAS_FLOAT16 typedef _Float16 src_t; #else typedef uint16_t src_t; diff --git a/compiler-rt/lib/builtins/fp_trunc.h b/compiler-rt/lib/builtins/fp_trunc.h index b92acd8070f5..7a54564a3520 100644 --- a/compiler-rt/lib/builtins/fp_trunc.h +++ b/compiler-rt/lib/builtins/fp_trunc.h @@ -50,7 +50,7 @@ typedef uint32_t dst_rep_t; static const int dstSigBits = 23; #elif defined DST_HALF -#ifdef CRT_HAS_FLOAT16 +#ifdef COMPILER_RT_HAS_FLOAT16 typedef _Float16 dst_t; #else typedef uint16_t dst_t; diff --git a/compiler-rt/lib/builtins/int_types.h b/compiler-rt/lib/builtins/int_types.h index 8bbdab5c2ecc..9ee5a327b28a 100644 --- a/compiler-rt/lib/builtins/int_types.h +++ b/compiler-rt/lib/builtins/int_types.h @@ -165,10 +165,6 @@ typedef struct { #define HAS_80_BIT_LONG_DOUBLE 0 #endif -#ifdef __FLT16_MAX__ -#define CRT_HAS_FLOAT16 -#endif - #if CRT_HAS_FLOATING_POINT typedef union { uqwords u; diff --git a/compiler-rt/lib/builtins/trunctfhf2.c b/compiler-rt/lib/builtins/trunctfhf2.c index b66b4351f0c1..e3a2309d954b 100644 --- a/compiler-rt/lib/builtins/trunctfhf2.c +++ b/compiler-rt/lib/builtins/trunctfhf2.c @@ -11,7 +11,7 @@ #include "fp_lib.h" #if defined(CRT_HAS_128BIT) && defined(CRT_LDBL_128BIT) && \ - defined(CRT_HAS_FLOAT16) + defined(COMPILER_RT_HAS_FLOAT16) #define SRC_QUAD #define DST_HALF #include "fp_trunc_impl.inc" diff --git a/compiler-rt/test/builtins/CMakeLists.txt b/compiler-rt/test/builtins/CMakeLists.txt index 2a69f5981214..ceacbd833580 100644 --- a/compiler-rt/test/builtins/CMakeLists.txt +++ b/compiler-rt/test/builtins/CMakeLists.txt @@ -44,6 +44,19 @@ foreach(arch ${BUILTIN_TEST_ARCH}) string(REPLACE ";" " " BUILTINS_TEST_TARGET_CFLAGS "${BUILTINS_TEST_TARGET_CFLAGS}") endif() + if(APPLE) + # TODO: Support the new ABI on Apple platforms. + if (${arch} MATCHES "arm|aarch64|arm64" AND COMPILER_RT_HAS_FLOAT16) + list(APPEND BUILTINS_TEST_TARGET_CFLAGS -DCOMPILER_RT_HAS_FLOAT16) + string(REPLACE ";" " " BUILTINS_TEST_TARGET_CFLAGS "${BUILTINS_TEST_TARGET_CFLAGS}") + endif() + else() + if (${arch} MATCHES "arm|aarch64|arm64|i?86|x86_64|AMD64|riscv32|riscv64" AND COMPILER_RT_HAS_FLOAT16) + list(APPEND BUILTINS_TEST_TARGET_CFLAGS -DCOMPILER_RT_HAS_FLOAT16) + string(REPLACE ";" " " BUILTINS_TEST_TARGET_CFLAGS "${BUILTINS_TEST_TARGET_CFLAGS}") + endif() + endif() + if(COMPILER_RT_ENABLE_CET) if(NOT arch MATCHES "i?86|x86_64|AMD64") message(SEND_ERROR "${arch} does not support CET") diff --git a/compiler-rt/test/builtins/Unit/extendhftf2_test.c b/compiler-rt/test/builtins/Unit/extendhftf2_test.c index 43a5d44a38ec..7d3ea3049e8a 100644 --- a/compiler-rt/test/builtins/Unit/extendhftf2_test.c +++ b/compiler-rt/test/builtins/Unit/extendhftf2_test.c @@ -4,7 +4,7 @@ #include "int_lib.h" #include <stdio.h> -#if __LDBL_MANT_DIG__ == 113 && defined(CRT_HAS_FLOAT16) +#if __LDBL_MANT_DIG__ == 113 && defined(COMPILER_RT_HAS_FLOAT16) #include "fp_test.h" @@ -28,7 +28,7 @@ char assumption_1[sizeof(TYPE_FP16) * CHAR_BIT == 16] = {0}; #endif int main() { -#if __LDBL_MANT_DIG__ == 113 && defined(CRT_HAS_FLOAT16) +#if __LDBL_MANT_DIG__ == 113 && defined(COMPILER_RT_HAS_FLOAT16) // qNaN if (test__extendhftf2(makeQNaN16(), UINT64_C(0x7fff800000000000), diff --git a/compiler-rt/test/builtins/Unit/fp_test.h b/compiler-rt/test/builtins/Unit/fp_test.h index 6fc80ac88011..e54dfc108e71 100644 --- a/compiler-rt/test/builtins/Unit/fp_test.h +++ b/compiler-rt/test/builtins/Unit/fp_test.h @@ -1,11 +1,10 @@ -#include "int_lib.h" -#include <limits.h> -#include <stdint.h> #include <stdlib.h> +#include <limits.h> #include <string.h> +#include <stdint.h> -#ifdef CRT_HAS_FLOAT16 -# define TYPE_FP16 _Float16 +#ifdef COMPILER_RT_HAS_FLOAT16 +#define TYPE_FP16 _Float16 #else #define TYPE_FP16 uint16_t #endif @@ -16,10 +15,10 @@ enum EXPECTED_RESULT { static inline TYPE_FP16 fromRep16(uint16_t x) { -#ifdef CRT_HAS_FLOAT16 - TYPE_FP16 ret; - memcpy(&ret, &x, sizeof(ret)); - return ret; +#ifdef COMPILER_RT_HAS_FLOAT16 + TYPE_FP16 ret; + memcpy(&ret, &x, sizeof(ret)); + return ret; #else return x; #endif @@ -51,7 +50,7 @@ static inline long double fromRep128(uint64_t hi, uint64_t lo) static inline uint16_t toRep16(TYPE_FP16 x) { -#ifdef CRT_HAS_FLOAT16 +#ifdef COMPILER_RT_HAS_FLOAT16 uint16_t ret; memcpy(&ret, &x, sizeof(ret)); return ret; diff --git a/compiler-rt/test/builtins/Unit/trunctfhf2_test.c b/compiler-rt/test/builtins/Unit/trunctfhf2_test.c index e4489d2741d1..9c8c4afd1b83 100644 --- a/compiler-rt/test/builtins/Unit/trunctfhf2_test.c +++ b/compiler-rt/test/builtins/Unit/trunctfhf2_test.c @@ -4,7 +4,7 @@ #include "int_lib.h" #include <stdio.h> -#if __LDBL_MANT_DIG__ == 113 && defined(CRT_HAS_FLOAT16) +#if __LDBL_MANT_DIG__ == 113 && defined(COMPILER_RT_HAS_FLOAT16) #include "fp_test.h" @@ -27,7 +27,7 @@ char assumption_1[sizeof(TYPE_FP16) * CHAR_BIT == 16] = {0}; #endif int main() { -#if __LDBL_MANT_DIG__ == 113 && defined(CRT_HAS_FLOAT16) +#if __LDBL_MANT_DIG__ == 113 && defined(COMPILER_RT_HAS_FLOAT16) // qNaN if (test__trunctfhf2(makeQNaN128(), UINT16_C(0x7e00))) |