chore: update macro define of SSE4.2

alibaba · Dec 17, 2024 · 2c8459f · 2c8459f
1 parent 5f11f21
commit 2c8459f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -51,9 +51,7 @@ else ()
 endif ()
 
 if (NOT WITHSPL)
-    add_definitions(-D__EXCLUDE_SPL__)
-else ()
-    add_definitions(-D__ENABLE_SSE4_2__)
+    add_definitions(-D__EXCLUDE_SSE4_2__)
 endif()
 
 # Default C/CXX flags.

diff --git a/core/pipeline/plugin/PluginRegistry.cpp b/core/pipeline/plugin/PluginRegistry.cpp
@@ -61,7 +61,7 @@
 #include "plugin/processor/inner/ProcessorSplitLogStringNative.h"
 #include "plugin/processor/inner/ProcessorSplitMultilineLogStringNative.h"
 #include "plugin/processor/inner/ProcessorTagNative.h"
-#if defined(__linux__) && !defined(__ANDROID__) && !defined(__EXCLUDE_SPL__)
+#if defined(__linux__) && !defined(__ANDROID__) && !defined(__EXCLUDE_SSE4_2__)
 #include "plugin/processor/ProcessorSPL.h"
 #endif
 
@@ -154,7 +154,7 @@ void PluginRegistry::LoadStaticPlugins() {
     RegisterProcessorCreator(new StaticProcessorCreator<ProcessorFilterNative>());
     RegisterProcessorCreator(new StaticProcessorCreator<ProcessorPromParseMetricNative>());
     RegisterProcessorCreator(new StaticProcessorCreator<ProcessorPromRelabelMetricNative>());
-#if defined(__linux__) && !defined(__ANDROID__) && !defined(__EXCLUDE_SPL__)
+#if defined(__linux__) && !defined(__ANDROID__) && !defined(__EXCLUDE_SSE4_2__)
     if (BOOL_FLAG(enable_processor_spl)) {
         RegisterProcessorCreator(new StaticProcessorCreator<ProcessorSPL>());
     }

diff --git a/core/prometheus/labels/TextParser.cpp b/core/prometheus/labels/TextParser.cpp
@@ -76,7 +76,7 @@ bool TextParser::ParseLine(StringView line, MetricEvent& metricEvent) {
 
 std::optional<size_t> TextParser::FindFirstLetter(const char* s, size_t len, char target) {
     size_t res = 0;
-#if defined(__ENABLE_SSE4_2__)
+#if !defined(__EXCLUDE_SSE4_2__)
     __m128i targetVec = _mm_set1_epi8(target);
 
     while (res + 16 < len) {
@@ -106,7 +106,7 @@ std::optional<size_t> TextParser::FindFirstLetter(const char* s, size_t len, cha
 std::optional<size_t> TextParser::FindFirstWhiteSpace(const char* s, size_t len) {
     size_t res = 0;
 
-#if defined(__ENABLE_SSE4_2__)
+#if !defined(__EXCLUDE_SSE4_2__)
     static __m128i sTargetVec1 = _mm_set1_epi8(' ');
     static __m128i sTargetVec2 = _mm_set1_epi8('\t');
 
@@ -142,7 +142,7 @@ std::optional<size_t> TextParser::FindFirstWhiteSpace(const char* s, size_t len)
 std::optional<size_t> TextParser::FindWhiteSpaceAndExemplar(const char* s, size_t len) {
     size_t res = 0;
 
-#if defined(__ENABLE_SSE4_2__)
+#if !defined(__EXCLUDE_SSE4_2__)
     static __m128i sTargetVec1 = _mm_set1_epi8(' ');
     static __m128i sTargetVec2 = _mm_set1_epi8('\t');
     static __m128i sTargetVec3 = _mm_set1_epi8('#');

diff --git a/core/unittest/CMakeLists.txt b/core/unittest/CMakeLists.txt
@@ -91,7 +91,7 @@ if (UNIX)
         endif()
         # add core subdir
         set(UT_BASE_TARGET "unittest_base")
-        add_definitions(-D__EXCLUDE_SPL__)
+        add_definitions(-D__EXCLUDE_SSE4_2__)
         add_library(${UT_BASE_TARGET} SHARED ${SOURCE_FILES_CORE})
         target_compile_options(${UT_BASE_TARGET} PRIVATE -Werror)
         add_core_subdir()