From 0d1012a4a39bba7f0f9a66f36eca3056948e6873 Mon Sep 17 00:00:00 2001
From: xiedeyantu <czjourney@163.com>
Date: Sat, 20 Jul 2024 07:54:27 +0800
Subject: [PATCH] Revert "[branch-2.1](compile) fix compile failed caused by
 <immintrin.h>"

This reverts commit 8d56ded384801475213c0d5add423b73c81b75c5.
---
 be/src/util/simd/vstring_function.h | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/be/src/util/simd/vstring_function.h b/be/src/util/simd/vstring_function.h
index 579da50d2df230..4fff59a01df2d8 100644
--- a/be/src/util/simd/vstring_function.h
+++ b/be/src/util/simd/vstring_function.h
@@ -17,11 +17,7 @@
 
 #pragma once
 
-#ifdef __AVX2__
 #include <immintrin.h>
-
-#include "gutil/macros.h"
-#endif
 #include <unistd.h>
 
 #include <array>
@@ -116,7 +112,7 @@ class VStringFunctions {
 
         if constexpr (trim_single) {
             const auto ch = remove_str.data[0];
-#if defined(__AVX2__)
+#if defined(__AVX2__) || defined(__aarch64__)
             constexpr auto AVX2_BYTES = sizeof(__m256i);
             const auto size = end - begin;
             const auto* const avx2_begin = end - size / AVX2_BYTES * AVX2_BYTES;
@@ -157,7 +153,7 @@ class VStringFunctions {
 
         if constexpr (trim_single) {
             const auto ch = remove_str.data[0];
-#if defined(__AVX2__)
+#if defined(__AVX2__) || defined(__aarch64__)
             constexpr auto AVX2_BYTES = sizeof(__m256i);
             const auto size = end - begin;
             const auto* const avx2_end = begin + size / AVX2_BYTES * AVX2_BYTES;