From a1a734746445fe669962a85fc413a311183fb025 Mon Sep 17 00:00:00 2001 From: Daniel Lemire Date: Tue, 22 Dec 2020 15:55:48 -0500 Subject: [PATCH] Minor tweaks to better handle cygwin/clang. --- include/fast_float/float_common.h | 14 +++---- tests/exhaustive32.cpp | 10 ++--- tests/exhaustive32_64.cpp | 12 +++--- tests/exhaustive32_midpoint.cpp | 62 +++++++++++++++++++++---------- tests/long_exhaustive32.cpp | 12 +++--- tests/long_random64.cpp | 12 +++--- tests/long_test.cpp | 3 +- tests/powersoffive_hardround.cpp | 22 +++++++++-- tests/random64.cpp | 12 +++--- tests/random_string.cpp | 30 ++++++++++++--- tests/short_random_string.cpp | 28 +++++++++++--- tests/string_test.cpp | 31 +++++++++++++--- 12 files changed, 171 insertions(+), 77 deletions(-) diff --git a/include/fast_float/float_common.h b/include/fast_float/float_common.h index 90a111a..6900100 100644 --- a/include/fast_float/float_common.h +++ b/include/fast_float/float_common.h @@ -5,18 +5,18 @@ #include #include -#if (defined(__i386) || defined(__i386__) || defined(_M_IX86) \ - || defined(__arm__) \ - || defined(__MINGW32__)) -#define FASTFLOAT_32BIT -#elif (defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) \ +#if (defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) \ || defined(__amd64) || defined(__aarch64__) || defined(_M_ARM64) \ || defined(__MINGW64__) \ || defined(__s390x__) \ || (defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || defined(__PPC64LE__))) #define FASTFLOAT_64BIT +#elif (defined(__i386) || defined(__i386__) || defined(_M_IX86) \ + || defined(__arm__) \ + || defined(__MINGW32__)) +#define FASTFLOAT_32BIT #else -#error Unknown platform +#error Unknown platform (not 32-bit, not 64-bit?) #endif #if ((defined(_WIN32) || defined(_WIN64)) && !defined(__clang__)) @@ -164,7 +164,7 @@ fastfloat_really_inline value128 full_multiplication(uint64_t a, // ARM64 has native support for 64-bit multiplications, no need to emulate answer.high = __umulh(a, b); answer.low = a * b; -#elif defined(FASTFLOAT_32BIT) || (defined(_WIN64)) +#elif defined(FASTFLOAT_32BIT) || (defined(_WIN64) && !defined(__clang__)) answer.low = _umul128(a, b, &answer.high); // _umul128 not available on ARM64 #elif defined(FASTFLOAT_64BIT) __uint128_t r = ((__uint128_t)a) * b; diff --git a/tests/exhaustive32.cpp b/tests/exhaustive32.cpp index bcbce79..879d1e2 100644 --- a/tests/exhaustive32.cpp +++ b/tests/exhaustive32.cpp @@ -30,15 +30,15 @@ void allvalues() { std::cerr << "parsing error ? " << buffer << std::endl; abort(); } - if(copysign(1,result_value) != copysign(1,v)) { - std::cerr << "I got " << std::hexfloat << result_value << " but I was expecting " << v - << std::endl; - abort(); - } else if (std::isnan(v)) { + if (std::isnan(v)) { if (!std::isnan(result_value)) { std::cerr << "not nan" << buffer << std::endl; abort(); } + } else if(copysign(1,result_value) != copysign(1,v)) { + std::cerr << "I got " << std::hexfloat << result_value << " but I was expecting " << v + << std::endl; + abort(); } else if (result_value != v) { std::cerr << "no match ? " << buffer << std::endl; std::cout << "started with " << std::hexfloat << v << std::endl; diff --git a/tests/exhaustive32_64.cpp b/tests/exhaustive32_64.cpp index 46a35b0..50aebd7 100644 --- a/tests/exhaustive32_64.cpp +++ b/tests/exhaustive32_64.cpp @@ -20,16 +20,16 @@ bool basic_test_64bit(std::string vals, double val) { std::cerr << " I could not parse " << vals << std::endl; return false; } - if(copysign(1,result_value) != copysign(1,val)) { - std::cerr << "I got " << std::hexfloat << result_value << " but I was expecting " << val - << std::endl; - return false; - } else if (std::isnan(val)) { + if (std::isnan(val)) { if (!std::isnan(result_value)) { std::cerr << vals << std::endl; std::cerr << "not nan" << result_value << std::endl; return false; - } + } + } else if(copysign(1,result_value) != copysign(1,val)) { + std::cerr << "I got " << std::hexfloat << result_value << " but I was expecting " << val + << std::endl; + return false; } else if (result_value != val) { std::cerr << vals << std::endl; std::cerr << "I got " << std::hexfloat << result_value << " but I was expecting " << val diff --git a/tests/exhaustive32_midpoint.cpp b/tests/exhaustive32_midpoint.cpp index 828655f..cfcb541 100644 --- a/tests/exhaustive32_midpoint.cpp +++ b/tests/exhaustive32_midpoint.cpp @@ -17,7 +17,21 @@ double cygwin_strtod_l(const char* start, char** end) { ss.imbue(std::locale::classic()); ss << start; ss >> d; - size_t nread = ss.tellg(); + if(ss.fail()) { *end = nullptr; } + if(ss.eof()) { ss.clear(); } + auto nread = ss.tellg(); + *end = const_cast(start) + nread; + return d; +} +float cygwin_strtof_l(const char* start, char** end) { + float d; + std::stringstream ss; + ss.imbue(std::locale::classic()); + ss << start; + ss >> d; + if(ss.fail()) { *end = nullptr; } + if(ss.eof()) { ss.clear(); } + auto nread = ss.tellg(); *end = const_cast(start) + nread; return d; } @@ -29,10 +43,10 @@ template char *to_string(T d, char *buffer) { return buffer + written; } -void strtod_from_string(const char * st, float& d) { +void strtof_from_string(const char * st, float& d) { char *pr = (char *)st; #if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(sun) || defined(__sun) - d = cygwin_strtod_l(st, &pr); + d = cygwin_strtof_l(st, &pr); #elif defined(_WIN32) static _locale_t c_locale = _create_locale(LC_ALL, "C"); d = _strtof_l(st, &pr, c_locale); @@ -45,7 +59,7 @@ void strtod_from_string(const char * st, float& d) { } } -void allvalues() { +bool allvalues() { char buffer[64]; for (uint64_t w = 0; w <= 0xFFFFFFFF; w++) { float v; @@ -68,15 +82,24 @@ void allvalues() { const char *string_end = to_string(midv, buffer); float str_answer; - strtod_from_string(buffer, str_answer); + strtof_from_string(buffer, str_answer); float result_value; auto result = fast_float::from_chars(buffer, string_end, result_value); if (result.ec != std::errc()) { std::cerr << "parsing error ? " << buffer << std::endl; - abort(); + return false; } - if(copysign(1,result_value) != copysign(1,v)) { + if (std::isnan(v)) { + if (!std::isnan(result_value)) { + std::cerr << "not nan" << buffer << std::endl; + std::cerr << "v " << std::hexfloat << v << std::endl; + std::cerr << "v2 " << std::hexfloat << v2 << std::endl; + std::cerr << "midv " << std::hexfloat << midv << std::endl; + std::cerr << "expected_midv " << std::hexfloat << expected_midv << std::endl; + return false; + } + } else if(copysign(1,result_value) != copysign(1,v)) { std::cerr << buffer << std::endl; std::cerr << "v " << std::hexfloat << v << std::endl; std::cerr << "v2 " << std::hexfloat << v2 << std::endl; @@ -84,16 +107,7 @@ void allvalues() { std::cerr << "expected_midv " << std::hexfloat << expected_midv << std::endl; std::cerr << "I got " << std::hexfloat << result_value << " but I was expecting " << v << std::endl; - abort(); - } else if (std::isnan(v)) { - if (!std::isnan(result_value)) { - std::cerr << "not nan" << buffer << std::endl; - std::cerr << "v " << std::hexfloat << v << std::endl; - std::cerr << "v2 " << std::hexfloat << v2 << std::endl; - std::cerr << "midv " << std::hexfloat << midv << std::endl; - std::cerr << "expected_midv " << std::hexfloat << expected_midv << std::endl; - abort(); - } + return false; } else if (result_value != str_answer) { std::cerr << "no match ? " << buffer << std::endl; std::cerr << "v " << std::hexfloat << v << std::endl; @@ -104,18 +118,26 @@ void allvalues() { std::cout << "round down to " << std::hexfloat << str_answer << std::endl; std::cout << "got back " << std::hexfloat << result_value << std::endl; std::cout << std::dec; - abort(); + return false; } } } std::cout << std::endl; + return true; } +inline void Assert(bool Assertion) { +#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(sun) || defined(__sun) + if (!Assertion) { std::cerr << "Omitting hard falure on msys/cygwin/sun systems."; } +#else + if (!Assertion) { throw std::runtime_error("bug"); } +#endif +} int main() { #if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(sun) || defined(__sun) - std::cout << "Warning: msys/cygwin or solaris detected. This particular test is likely to generate false failures due to our reliance on the underlying runtime library." << std::endl; + std::cout << "Warning: msys/cygwin or solaris detected. This particular test is likely to generate false failures due to our reliance on the underlying runtime library as a gold standard." << std::endl; #endif - allvalues(); + Assert(allvalues()); std::cout << std::endl; std::cout << "all ok" << std::endl; return EXIT_SUCCESS; diff --git a/tests/long_exhaustive32.cpp b/tests/long_exhaustive32.cpp index 19ea3f3..683200c 100644 --- a/tests/long_exhaustive32.cpp +++ b/tests/long_exhaustive32.cpp @@ -30,16 +30,16 @@ void allvalues() { std::cerr << "parsing error ? " << buffer << std::endl; abort(); } - if(copysign(1,result_value) != copysign(1,v)) { - std::cerr << buffer << std::endl; - std::cerr << "I got " << std::hexfloat << result_value << " but I was expecting " << v - << std::endl; - abort(); - } else if (std::isnan(v)) { + if (std::isnan(v)) { if (!std::isnan(result_value)) { std::cerr << "not nan" << buffer << std::endl; abort(); } + } else if(copysign(1,result_value) != copysign(1,v)) { + std::cerr << buffer << std::endl; + std::cerr << "I got " << std::hexfloat << result_value << " but I was expecting " << v + << std::endl; + abort(); } else if (result_value != v) { std::cerr << "no match ? " << buffer << " got " << result_value << " expected " << v << std::endl; std::cout << "started with " << std::hexfloat << v << std::endl; diff --git a/tests/long_random64.cpp b/tests/long_random64.cpp index 38dce21..e5abe8f 100644 --- a/tests/long_random64.cpp +++ b/tests/long_random64.cpp @@ -60,12 +60,7 @@ void random_values(size_t N) { abort(); } } - if(copysign(1,result_value) != copysign(1,v)) { - std::cerr << buffer << std::endl; - std::cerr << "I got " << std::hexfloat << result_value << " but I was expecting " << v - << std::endl; - abort(); - } else if (std::isnan(v)) { + if (std::isnan(v)) { if (!std::isnan(result_value)) { std::cerr << "not nan" << buffer << std::endl; errors++; @@ -73,6 +68,11 @@ void random_values(size_t N) { abort(); } } + } else if(copysign(1,result_value) != copysign(1,v)) { + std::cerr << buffer << std::endl; + std::cerr << "I got " << std::hexfloat << result_value << " but I was expecting " << v + << std::endl; + abort(); } else if (result_value != v) { std::cerr << "no match ? '" << buffer << "'" << std::endl; std::cout << "started with " << std::hexfloat << v << std::endl; diff --git a/tests/long_test.cpp b/tests/long_test.cpp index 301c606..1ab370a 100644 --- a/tests/long_test.cpp +++ b/tests/long_test.cpp @@ -3,8 +3,7 @@ #include inline void Assert(bool Assertion) { - if (!Assertion) - throw std::runtime_error("bug"); + if (!Assertion) { throw std::runtime_error("bug"); } } template diff --git a/tests/powersoffive_hardround.cpp b/tests/powersoffive_hardround.cpp index 9288beb..6258be5 100644 --- a/tests/powersoffive_hardround.cpp +++ b/tests/powersoffive_hardround.cpp @@ -19,7 +19,21 @@ double cygwin_strtod_l(const char* start, char** end) { ss.imbue(std::locale::classic()); ss << start; ss >> d; - size_t nread = ss.tellg(); + if(ss.fail()) { *end = nullptr; } + if(ss.eof()) { ss.clear(); } + auto nread = ss.tellg(); + *end = const_cast(start) + nread; + return d; +} +float cygwin_strtof_l(const char* start, char** end) { + float d; + std::stringstream ss; + ss.imbue(std::locale::classic()); + ss << start; + ss >> d; + if(ss.fail()) { *end = nullptr; } + if(ss.eof()) { ss.clear(); } + auto nread = ss.tellg(); *end = const_cast(start) + nread; return d; } @@ -29,7 +43,9 @@ double cygwin_strtod_l(const char* start, char** end) { std::pair strtod_from_string(const char *st) { double d; char *pr; -#ifdef _WIN32 +#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(sun) || defined(__sun) + d = cygwin_strtod_l(st, &pr); +#elif defined(_WIN32) static _locale_t c_locale = _create_locale(LC_ALL, "C"); d = _strtod_l(st, &pr, c_locale); #else @@ -47,7 +63,7 @@ std::pair strtof_from_string(char *st) { float d; char *pr; #if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(sun) || defined(__sun) - d = cygwin_strtod_l(st, &pr); + d = cygwin_strtof_l(st, &pr); #elif defined(_WIN32) static _locale_t c_locale = _create_locale(LC_ALL, "C"); d = _strtof_l(st, &pr, c_locale); diff --git a/tests/random64.cpp b/tests/random64.cpp index 8d5c59d..5abc4f8 100644 --- a/tests/random64.cpp +++ b/tests/random64.cpp @@ -62,12 +62,7 @@ void random_values(size_t N) { abort(); } } - if(copysign(1,result_value) != copysign(1,v)) { - std::cerr << buffer << std::endl; - std::cerr << "I got " << std::hexfloat << result_value << " but I was expecting " << v - << std::endl; - abort(); - } else if (std::isnan(v)) { + if (std::isnan(v)) { if (!std::isnan(result_value)) { std::cerr << "not nan" << buffer << std::endl; errors++; @@ -75,6 +70,11 @@ void random_values(size_t N) { abort(); } } + } else if(copysign(1,result_value) != copysign(1,v)) { + std::cerr << buffer << std::endl; + std::cerr << "I got " << std::hexfloat << result_value << " but I was expecting " << v + << std::endl; + abort(); } else if (result_value != v) { std::cerr << "no match ? " << buffer << std::endl; std::cout << "started with " << std::hexfloat << v << std::endl; diff --git a/tests/random_string.cpp b/tests/random_string.cpp index ed9fb6b..8f367e0 100644 --- a/tests/random_string.cpp +++ b/tests/random_string.cpp @@ -17,7 +17,21 @@ double cygwin_strtod_l(const char* start, char** end) { ss.imbue(std::locale::classic()); ss << start; ss >> d; - size_t nread = ss.tellg(); + if(ss.fail()) { *end = nullptr; } + if(ss.eof()) { ss.clear(); } + auto nread = ss.tellg(); + *end = const_cast(start) + nread; + return d; +} +float cygwin_strtof_l(const char* start, char** end) { + float d; + std::stringstream ss; + ss.imbue(std::locale::classic()); + ss << start; + ss >> d; + if(ss.fail()) { *end = nullptr; } + if(ss.eof()) { ss.clear(); } + auto nread = ss.tellg(); *end = const_cast(start) + nread; return d; } @@ -111,7 +125,9 @@ size_t build_random_string(RandomEngine &rand, char *buffer) { std::pair strtod_from_string(char *st) { double d; char *pr; -#ifdef _WIN32 +#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(sun) || defined(__sun) + d = cygwin_strtod_l(st, &pr); +#elif defined(_WIN32) static _locale_t c_locale = _create_locale(LC_ALL, "C"); d = _strtod_l(st, &pr, c_locale); #else @@ -129,7 +145,7 @@ std::pair strtof_from_string(char *st) { float d; char *pr; #if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(sun) || defined(__sun) - d = cygwin_strtod_l(st, &pr); + d = cygwin_strtof_l(st, &pr); #elif defined(_WIN32) static _locale_t c_locale = _create_locale(LC_ALL, "C"); d = _strtof_l(st, &pr, c_locale); @@ -205,13 +221,17 @@ bool tester(uint64_t seed, size_t volume) { } int main() { + #if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(sun) || defined(__sun) - std::cout << "Warning: msys/cygwin or solaris detected. This particular test is likely to generate false failures due to our reliance on the underlying runtime library." << std::endl; -#endif + std::cout << "Warning: msys/cygwin or solaris detected." << std::endl; + return EXIT_SUCCESS; +#else if (tester(1234344, 100000000)) { std::cout << "All tests ok." << std::endl; return EXIT_SUCCESS; } std::cout << "Failure." << std::endl; return EXIT_FAILURE; + +#endif } diff --git a/tests/short_random_string.cpp b/tests/short_random_string.cpp index 9bec659..c71fbe4 100644 --- a/tests/short_random_string.cpp +++ b/tests/short_random_string.cpp @@ -16,7 +16,21 @@ double cygwin_strtod_l(const char* start, char** end) { ss.imbue(std::locale::classic()); ss << start; ss >> d; - size_t nread = ss.tellg(); + if(ss.fail()) { *end = nullptr; } + if(ss.eof()) { ss.clear(); } + auto nread = ss.tellg(); + *end = const_cast(start) + nread; + return d; +} +float cygwin_strtof_l(const char* start, char** end) { + float d; + std::stringstream ss; + ss.imbue(std::locale::classic()); + ss << start; + ss >> d; + if(ss.fail()) { *end = nullptr; } + if(ss.eof()) { ss.clear(); } + auto nread = ss.tellg(); *end = const_cast(start) + nread; return d; } @@ -106,7 +120,9 @@ size_t build_random_string(RandomEngine &rand, char *buffer) { std::pair strtod_from_string(char *st) { double d; char *pr; -#ifdef _WIN32 +#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(sun) || defined(__sun) + d = cygwin_strtod_l(st, &pr); +#elif defined(_WIN32) static _locale_t c_locale = _create_locale(LC_ALL, "C"); d = _strtod_l(st, &pr, c_locale); #else @@ -124,7 +140,7 @@ std::pair strtof_from_string(char *st) { float d; char *pr; #if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(sun) || defined(__sun) - d = cygwin_strtod_l(st, &pr); + d = cygwin_strtof_l(st, &pr); #elif defined(_WIN32) static _locale_t c_locale = _create_locale(LC_ALL, "C"); d = _strtof_l(st, &pr, c_locale); @@ -202,11 +218,13 @@ bool tester(uint64_t seed, size_t volume) { int main() { #if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(sun) || defined(__sun) std::cout << "Warning: msys/cygwin detected. This particular test is likely to generate false failures due to our reliance on the underlying runtime library." << std::endl; -#endif + return EXIT_SUCCESS; +#else if (tester(1234344, 100000000)) { std::cout << "All tests ok." << std::endl; return EXIT_SUCCESS; } - std::cout << "Failure." << std::endl; return EXIT_FAILURE; + +#endif } diff --git a/tests/string_test.cpp b/tests/string_test.cpp index ebc4b35..e1d7e1f 100644 --- a/tests/string_test.cpp +++ b/tests/string_test.cpp @@ -15,15 +15,32 @@ double cygwin_strtod_l(const char* start, char** end) { ss.imbue(std::locale::classic()); ss << start; ss >> d; - size_t nread = ss.tellg(); + if(ss.fail()) { *end = nullptr; } + if(ss.eof()) { ss.clear(); } + auto nread = ss.tellg(); + *end = const_cast(start) + nread; + return d; +} +float cygwin_strtof_l(const char* start, char** end) { + float d; + std::stringstream ss; + ss.imbue(std::locale::classic()); + ss << start; + ss >> d; + if(ss.fail()) { *end = nullptr; } + if(ss.eof()) { ss.clear(); } + auto nread = ss.tellg(); *end = const_cast(start) + nread; return d; } #endif inline void Assert(bool Assertion) { - if (!Assertion) - throw std::runtime_error("bug"); +#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(sun) || defined(__sun) + if (!Assertion) { std::cerr << "Omitting hard falure on msys/cygwin/sun systems."; } +#else + if (!Assertion) { throw std::runtime_error("bug"); } +#endif } template std::string to_string(T d) { @@ -70,7 +87,9 @@ void strtod_from_string(const std::string &st, T& d); template <> void strtod_from_string(const std::string &st, double& d) { char *pr = (char *)st.c_str(); -#ifdef _WIN32 +#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(sun) || defined(__sun) + d = cygwin_strtod_l(pr, &pr); +#elif defined(_WIN32) static _locale_t c_locale = _create_locale(LC_ALL, "C"); d = _strtod_l(st.c_str(), &pr, c_locale); #else @@ -86,7 +105,7 @@ template <> void strtod_from_string(const std::string &st, float& d) { char *pr = (char *)st.c_str(); #if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(sun) || defined(__sun) - d = cygwin_strtod_l(st.c_str(), &pr); + d = cygwin_strtof_l(st.c_str(), &pr); #elif defined(_WIN32) static _locale_t c_locale = _create_locale(LC_ALL, "C"); d = _strtof_l(st.c_str(), &pr, c_locale); @@ -237,7 +256,7 @@ bool partow_test() { int main() { #if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(sun) || defined(__sun) - std::cout << "Warning: msys/cygwin detected. This particular test is likely to generate false failures due to our reliance on the underlying runtime library." << std::endl; + std::cout << "Warning: msys/cygwin or solaris detected." << std::endl; #endif std::cout << "32 bits checks" << std::endl; Assert(partow_test());