From c51429b1ef006b2bced059624312af5c1dc1f07f Mon Sep 17 00:00:00 2001
From: Robert Schulze <robert@clickhouse.com>
Date: Thu, 16 Nov 2023 15:24:47 +0000
Subject: [PATCH] Simplify more

---
 cmake/cpu_features.cmake | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/cmake/cpu_features.cmake b/cmake/cpu_features.cmake
index 484c139f1a7..cfa9c314bc0 100644
--- a/cmake/cpu_features.cmake
+++ b/cmake/cpu_features.cmake
@@ -150,6 +150,10 @@ elseif (ARCH_AMD64)
         set (COMPILER_FLAGS "${COMPILER_FLAGS} -mpclmul")
     endif ()
 
+    if (ENABLE_BMI)
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} -mbmi")
+    endif ()
+
     if (ENABLE_POPCNT)
         set (COMPILER_FLAGS "${COMPILER_FLAGS} -mpopcnt")
     endif ()
@@ -160,32 +164,20 @@ elseif (ARCH_AMD64)
 
     if (ENABLE_AVX2)
         set (COMPILER_FLAGS "${COMPILER_FLAGS} -mavx2")
+        if (ENABLE_BMI2)
+            set (COMPILER_FLAGS "${COMPILER_FLAGS} -mbmi2")
+        endif ()
     endif ()
 
     if (ENABLE_AVX512)
         set (COMPILER_FLAGS "${COMPILER_FLAGS} -mavx512f -mavx512bw -mavx512vl")
-    endif ()
-
-    if (ENABLE_AVX512 AND ENABLE_AVX512_VBMI)
-        set (COMPILER_FLAGS "${COMPILER_FLAGS} -mavx512vbmi")
-    endif ()
-
-    if (ENABLE_BMI)
-        set (COMPILER_FLAGS "${COMPILER_FLAGS} -mbmi")
-    endif ()
-
-    if (ENABLE_AVX2 AND ENABLE_BMI2)
-        set (COMPILER_FLAGS "${COMPILER_FLAGS} -mbmi2")
+        if (ENABLE_AVX512_VBMI)
+            set (COMPILER_FLAGS "${COMPILER_FLAGS} -mavx512vbmi")
+        endif ()
     endif ()
 
     if (ENABLE_AVX512_FOR_SPEC_OP)
-        set (X86_INTRINSICS_FLAGS "")
-        if (1)
-            set (X86_INTRINSICS_FLAGS "${X86_INTRINSICS_FLAGS} -mbmi")
-        endif ()
-        if (1)
-            set (X86_INTRINSICS_FLAGS "${X86_INTRINSICS_FLAGS} -mavx512f -mavx512bw -mavx512vl -mprefer-vector-width=256")
-        endif ()
+        set (X86_INTRINSICS_FLAGS "-mbmi -mavx512f -mavx512bw -mavx512vl -mprefer-vector-width=256")
     endif ()
 
 else ()