Merge pull request #1603 from evoskuil/master

Disable non-xcode clang vectorization hack.
libbitcoin · Jan 29, 2025 · a31857c · a31857c
2 parents 486990c + f625384
commit a31857c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git a/include/bitcoin/system/impl/hash/sha/algorithm_konstant.ipp b/include/bitcoin/system/impl/hash/sha/algorithm_konstant.ipp
@@ -257,7 +257,7 @@ konstant(buffer_t& buffer) NOEXCEPT
     ////{
     ////    konstant_(buffer);
     ////}
-    ////else if constexpr (vector && !with_clang)
+    ////else if constexpr (vector)
     ////{
     ////    vector_konstant(buffer);
     ////}

diff --git a/include/bitcoin/system/impl/hash/sha/algorithm_parsing.ipp b/include/bitcoin/system/impl/hash/sha/algorithm_parsing.ipp
@@ -59,22 +59,22 @@ input(buffer_t& buffer, const block_t& block) NOEXCEPT
     else if constexpr (bc::is_little_endian)
     {
         // This optimization is neutral in 4/8/16 lane sha256 perf.
-        ////if constexpr (have_lanes<word_t, 16> && !with_clang)
+        ////if constexpr (have_lanes<word_t, 16>)
         ////{
         ////    using xword_t = to_extended<word_t, 16>;
         ////    const auto& in = array_cast<xword_t>(block);
         ////    auto& out = array_cast<xword_t>(buffer);
         ////    out[0] = byteswap<word_t>(in[0]);
         ////}
-        ////else if constexpr (have_lanes<word_t, 8> && !with_clang)
+        ////else if constexpr (have_lanes<word_t, 8>)
         ////{
         ////    using xword_t = to_extended<word_t, 8>;
         ////    const auto& in = array_cast<xword_t>(block);
         ////    auto& out = array_cast<xword_t>(buffer);
         ////    out[0] = byteswap<word_t>(in[0]);
         ////    out[1] = byteswap<word_t>(in[1]);
         ////}
-        ////else if constexpr (have_lanes<word_t, 4> && !with_clang)
+        ////else if constexpr (have_lanes<word_t, 4>)
         ////{
         ////    using xword_t = to_extended<word_t, 4>;
         ////    const auto& in = array_cast<xword_t>(block);
@@ -131,14 +131,14 @@ input_left(auto& buffer, const half_t& half) NOEXCEPT
     else if constexpr (bc::is_little_endian)
     {
         // This optimization is neutral in 4/8 lane sha256 perf.
-        ////if constexpr (have_lanes<word_t, 8> && !with_clang)
+        ////if constexpr (have_lanes<word_t, 8>)
         ////{
         ////    using xword_t = to_extended<word_t, 8>;
         ////    const auto& in = array_cast<xword_t>(half);
         ////    auto& out = array_cast<xword_t>(buffer);
         ////    out[0] = byteswap<word_t>(in[0]);
         ////}
-        ////else if constexpr (have_lanes<word_t, 4> && !with_clang)
+        ////else if constexpr (have_lanes<word_t, 4>)
         ////{
         ////    using xword_t = to_extended<word_t, 4>;
         ////    const auto& in = array_cast<xword_t>(half);
@@ -184,14 +184,14 @@ input_right(auto& buffer, const half_t& half) NOEXCEPT
     else if constexpr (bc::is_little_endian)
     {
         // This optimization is neutral in 4/8 lane sha256 perf.
-        ////if constexpr (have_lanes<word_t, 8> && !with_clang)
+        ////if constexpr (have_lanes<word_t, 8>)
         ////{
         ////    using xword_t = to_extended<word_t, 8>;
         ////    const auto& in = array_cast<xword_t>(half);
         ////    auto& out = array_cast<xword_t>(buffer);
         ////    out[1] = byteswap<word_t>(in[0]);
         ////}
-        ////else if constexpr (have_lanes<word_t, 4> && !with_clang)
+        ////else if constexpr (have_lanes<word_t, 4>)
         ////{
         ////    using xword_t = to_extended<word_t, 4>;
         ////    const auto& in = array_cast<xword_t>(half);
@@ -354,7 +354,7 @@ output(const state_t& state) NOEXCEPT
         if constexpr (SHA::strength != 160)
         {
             // This optimization is neutral in 4/8 lane sha256 perf.
-            ////if constexpr (have_lanes<word_t, 8> && !with_clang)
+            ////if constexpr (have_lanes<word_t, 8>)
             ////{
             ////    using xword_t = to_extended<word_t, 8>;
             ////    const auto& in = array_cast<xword_t>(state);
@@ -363,7 +363,7 @@ output(const state_t& state) NOEXCEPT
             ////        byteswap<word_t>(in[0])
             ////    });
             ////}
-            ////else if constexpr (have_lanes<word_t, 4> && !with_clang)
+            ////else if constexpr (have_lanes<word_t, 4>)
             ////{
             ////    using xword_t = to_extended<word_t, 4>;
             ////    const auto& in = array_cast<xword_t>(state);

diff --git a/include/bitcoin/system/intrinsics/haves.hpp b/include/bitcoin/system/intrinsics/haves.hpp
@@ -30,13 +30,6 @@
 namespace libbitcoin {
 namespace system {
 
-// HACK: work around vectorizations failing on non-xcode clang.
-#if defined(HAVE_CLANG) && !defined(HAVE_XCODE)
-    constexpr auto with_clang = true;
-#else
-    constexpr auto with_clang = false;
-#endif
-
 // Functions may only be constexpr conditionally.
 BC_PUSH_WARNING(USE_CONSTEXPR_FOR_FUNCTION)