From cd95b1a38c6b49474abb51e0fc8e2b8669141228 Mon Sep 17 00:00:00 2001
From: Konstantinos Margaritis <konstantinos@vectorcamp.gr>
Date: Thu, 25 Nov 2021 06:20:53 +0000
Subject: [PATCH] use __builtin_constant_p() instead for arm as well

---
 src/util/arch/arm/simd_utils.h         |  9 ++---
 src/util/supervector/arch/arm/impl.cpp | 46 ++++++++++----------------
 2 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/src/util/arch/arm/simd_utils.h b/src/util/arch/arm/simd_utils.h
index 630cac93..4c68b485 100644
--- a/src/util/arch/arm/simd_utils.h
+++ b/src/util/arch/arm/simd_utils.h
@@ -328,11 +328,12 @@ m128 palignr_imm(m128 r, m128 l, int offset) {
 
 static really_really_inline
 m128 palignr(m128 r, m128 l, int offset) {
-#if defined(HS_OPTIMIZE)
-    return (m128)vextq_s8((int8x16_t)l, (int8x16_t)r, offset);
-#else
-    return palignr_imm(r, l, offset);
+#if defined(HAVE__BUILTIN_CONSTANT_P)
+    if (__builtin_constant_p(offset)) {
+        return (m128)vextq_s8((int8x16_t)l, (int8x16_t)r, offset);
+    }
 #endif
+    return palignr_imm(r, l, offset);
 }
 #undef CASE_ALIGN_VECTORS
 
diff --git a/src/util/supervector/arch/arm/impl.cpp b/src/util/supervector/arch/arm/impl.cpp
index f804abeb..980f0b39 100644
--- a/src/util/supervector/arch/arm/impl.cpp
+++ b/src/util/supervector/arch/arm/impl.cpp
@@ -482,34 +482,27 @@ really_inline SuperVector<16> SuperVector<16>::vshr(uint8_t const N) const
     return vshr_128(N);
 }
 
-#ifdef HS_OPTIMIZE
-template <>
-really_inline SuperVector<16> SuperVector<16>::operator>>(uint8_t const N) const
-{
-    return {vextq_u8(u.u8x16[0], vdupq_n_u8(0), N)};
-}
-#else
 template <>
 really_inline SuperVector<16> SuperVector<16>::operator>>(uint8_t const N) const
 {
+#if defined(HAVE__BUILTIN_CONSTANT_P)
+    if (__builtin_constant_p(N)) {
+         return {vextq_u8(u.u8x16[0], vdupq_n_u8(0), N)};
+    }
+#endif
     return vshr_128(N);
 }
-#endif
 
-#ifdef HS_OPTIMIZE
-template <>
-really_inline SuperVector<16> SuperVector<16>::operator<<(uint8_t const N) const
-{
-    return {vextq_u8(vdupq_n_u8(0), u.u8x16[0], 16 - N)};
-}
-#else
 template <>
 really_inline SuperVector<16> SuperVector<16>::operator<<(uint8_t const N) const
 {
+#if defined(HAVE__BUILTIN_CONSTANT_P)
+    if (__builtin_constant_p(N)) {
+        return {vextq_u8(vdupq_n_u8(0), u.u8x16[0], 16 - N)};
+    }
+#endif
     return vshl_128(N);
 }
-#endif
-
 
 template<>
 really_inline SuperVector<16> SuperVector<16>::Ones_vshr(uint8_t const N)
@@ -547,20 +540,18 @@ really_inline SuperVector<16> SuperVector<16>::loadu_maskz(void const *ptr, uint
     return mask & v;
 }
 
-#ifdef HS_OPTIMIZE
 template<>
 really_inline SuperVector<16> SuperVector<16>::alignr(SuperVector<16> &other, int8_t offset)
 {
-    if (offset == 16) {
-        return *this;
-    } else {
-        return {vextq_u8(other.u.u8x16[0], u.u8x16[0], offset)};
+#if defined(HAVE__BUILTIN_CONSTANT_P)
+    if (__builtin_constant_p(offset)) {
+        if (offset == 16) {
+            return *this;
+        } else {
+            return {vextq_u8(other.u.u8x16[0], u.u8x16[0], offset)};
+        }
     }
-}
-#else
-template<>
-really_inline SuperVector<16> SuperVector<16>::alignr(SuperVector<16> &other, int8_t offset)
-{
+#endif
     switch(offset) {
     case 0: return other; break;
     case 1: return {vextq_u8( other.u.u8x16[0], u.u8x16[0], 1)}; break;
@@ -583,7 +574,6 @@ really_inline SuperVector<16> SuperVector<16>::alignr(SuperVector<16> &other, in
     }
     return *this;
 }
-#endif
 
 template<>
 template<>