From 297f7bb5d5b54bcab14614a6ef4bec6f432c78ba Mon Sep 17 00:00:00 2001
From: Jinqing Kuang <kuangjinqingcn@gmail.com>
Date: Thu, 16 Jan 2025 15:33:08 +0800
Subject: [PATCH] fix(query)[TS-5907]: skip some decompressTest sub-cases on
 machines without AVX2 support

- Check CPU instruction set before running AVX2 tests
- Skip tests if AVX2 is not supported to avoid errors
---
 source/util/test/CMakeLists.txt     |  4 ----
 source/util/test/decompressTest.cpp | 18 ++++++------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/source/util/test/CMakeLists.txt b/source/util/test/CMakeLists.txt
index ec05a4e415..768e465fea 100644
--- a/source/util/test/CMakeLists.txt
+++ b/source/util/test/CMakeLists.txt
@@ -142,10 +142,6 @@ target_include_directories(
   PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
 )
 
-IF(COMPILER_SUPPORT_AVX2)
-    MESSAGE(STATUS "AVX2 instructions is ACTIVATED")
-    set_source_files_properties(decompressTest.cpp PROPERTIES COMPILE_FLAGS -mavx2)
-ENDIF()
 add_executable(decompressTest "decompressTest.cpp")
 target_link_libraries(decompressTest os util common gtest_main)
 add_test(
diff --git a/source/util/test/decompressTest.cpp b/source/util/test/decompressTest.cpp
index e508c489df..b1f7f7e85c 100644
--- a/source/util/test/decompressTest.cpp
+++ b/source/util/test/decompressTest.cpp
@@ -524,23 +524,20 @@ static void decompressBasicTest(size_t dataSize, const CompF& compress, const De
   decltype(origData) decompData(origData.size());
 
   // test simple implementation without SIMD instructions
-  tsSIMDEnable = 0;
+  tsAVX2Supported = 0;
   cnt = decompress(compData.data(), compData.size(), decompData.size(), decompData.data(), decompData.size(),
                    ONE_STAGE_COMP, nullptr, 0);
   ASSERT_EQ(cnt, compData.size() - 1);
   EXPECT_EQ(origData, decompData);
 
-#ifdef __AVX2__
-  if (DataTypeSupportAvx<T>::value) {
+  taosGetSystemInfo();
+  if (DataTypeSupportAvx<T>::value && tsAVX2Supported) {
     // test AVX2 implementation
-    tsSIMDEnable = 1;
-    tsAVX2Supported = 1;
     cnt = decompress(compData.data(), compData.size(), decompData.size(), decompData.data(), decompData.size(),
                      ONE_STAGE_COMP, nullptr, 0);
     ASSERT_EQ(cnt, compData.size() - 1);
     EXPECT_EQ(origData, decompData);
   }
-#endif
 }
 
 template <typename T, typename CompF, typename DecompF>
@@ -557,7 +554,7 @@ static void decompressPerfTest(const char* typname, const CompF& compress, const
             << "; Compression ratio: " << 1.0 * (compData.size() - 1) / cnt << "\n";
   decltype(origData) decompData(origData.size());
 
-  tsSIMDEnable = 0;
+  tsAVX2Supported = 0;
   auto ms = measureRunTime(
       [&]() {
         decompress(compData.data(), compData.size(), decompData.size(), decompData.data(), decompData.size(),
@@ -567,10 +564,8 @@ static void decompressPerfTest(const char* typname, const CompF& compress, const
   std::cout << "Decompression of " << NROUND * DATA_SIZE << " " << typname << " without SIMD costs " << ms
             << " ms, avg speed: " << NROUND * DATA_SIZE * 1000 / ms << " tuples/s\n";
 
-#ifdef __AVX2__
-  if (DataTypeSupportAvx<T>::value) {
-    tsSIMDEnable = 1;
-    tsAVX2Supported = 1;
+  taosGetSystemInfo();
+  if (DataTypeSupportAvx<T>::value && tsAVX2Supported) {
     ms = measureRunTime(
         [&]() {
           decompress(compData.data(), compData.size(), decompData.size(), decompData.data(), decompData.size(),
@@ -580,7 +575,6 @@ static void decompressPerfTest(const char* typname, const CompF& compress, const
     std::cout << "Decompression of " << NROUND * DATA_SIZE << " " << typname << " using AVX2 costs " << ms
               << " ms, avg speed: " << NROUND * DATA_SIZE * 1000 / ms << " tuples/s\n";
   }
-#endif
 }
 
 #define RUN_PERF_TEST(typname, comp, decomp, min, max)             \