From ec894e7cb3e0e3f9f7c880b00d44ee3b83e028ad Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sun, 24 May 2020 19:39:31 +0300
Subject: [PATCH] Check for POPCNT instruction

---
 programs/main.cpp                             | 19 ++++++++++++++++---
 ...heck_cpu_instructions_at_startup.reference |  1 +
 ...01103_check_cpu_instructions_at_startup.sh | 13 +++++++++----
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/programs/main.cpp b/programs/main.cpp
index 2eb226d3c00..b1bff1de1b0 100644
--- a/programs/main.cpp
+++ b/programs/main.cpp
@@ -127,9 +127,10 @@ enum class InstructionFail
     SSSE3 = 2,
     SSE4_1 = 3,
     SSE4_2 = 4,
-    AVX = 5,
-    AVX2 = 6,
-    AVX512 = 7
+    POPCNT = 5,
+    AVX = 6,
+    AVX2 = 7,
+    AVX512 = 8
 };
 
 const char * instructionFailToString(InstructionFail fail)
@@ -146,6 +147,8 @@ const char * instructionFailToString(InstructionFail fail)
             return "SSE4.1";
         case InstructionFail::SSE4_2:
             return "SSE4.2";
+        case InstructionFail::POPCNT:
+            return "POPCNT";
         case InstructionFail::AVX:
             return "AVX";
         case InstructionFail::AVX2:
@@ -189,6 +192,16 @@ void checkRequiredInstructionsImpl(volatile InstructionFail & fail)
     __asm__ volatile ("pcmpgtq %%xmm0, %%xmm0" : : : "xmm0");
 #endif
 
+    /// Defined by -msse4.2
+#if defined(__POPCNT__)
+    fail = InstructionFail::POPCNT;
+    {
+        uint64_t a = 0;
+        uint64_t b = 0;
+        __asm__ volatile ("popcnt %1, %0" : "=r"(a) :"r"(b) : );
+    }
+#endif
+
 #if defined(__AVX__)
     fail = InstructionFail::AVX;
     __asm__ volatile ("vaddpd %%ymm0, %%ymm0, %%ymm0" : : : "ymm0");
diff --git a/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.reference b/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.reference
index 59c88f013dd..03ed07cf1a4 100644
--- a/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.reference
+++ b/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.reference
@@ -1,4 +1,5 @@
 Instruction check fail. The CPU does not support SSSE3 instruction set.
 Instruction check fail. The CPU does not support SSE4.1 instruction set.
 Instruction check fail. The CPU does not support SSE4.2 instruction set.
+Instruction check fail. The CPU does not support POPCNT instruction set.
 1
diff --git a/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.sh b/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.sh
index 15466e1889a..5ae4f8b3dd2 100755
--- a/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.sh
+++ b/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.sh
@@ -9,8 +9,13 @@ ${CLICKHOUSE_LOCAL} --query "SELECT max(value LIKE '%sanitize%') FROM system.bui
 
 command=$(command -v ${CLICKHOUSE_LOCAL})
 
-qemu-x86_64-static -cpu qemu64                        $command --query "SELECT 1" 2>&1 | grep -v -F "warning: TCG doesn't support requested feature" ||:
-qemu-x86_64-static -cpu qemu64,+ssse3                 $command --query "SELECT 1" 2>&1 | grep -v -F "warning: TCG doesn't support requested feature" ||:
-qemu-x86_64-static -cpu qemu64,+ssse3,+sse4.1         $command --query "SELECT 1" 2>&1 | grep -v -F "warning: TCG doesn't support requested feature" ||:
-qemu-x86_64-static -cpu qemu64,+ssse3,+sse4.1,+sse4.2 $command --query "SELECT 1" 2>&1 | grep -v -F "warning: TCG doesn't support requested feature" ||:
+function run_with_cpu()
+{
+    qemu-x86_64-static -cpu "$@" $command --query "SELECT 1" 2>&1 | grep -v -F "warning: TCG doesn't support requested feature" ||:
+}
 
+run_with_cpu qemu64
+run_with_cpu qemu64,+ssse3
+run_with_cpu qemu64,+ssse3,+sse4.1
+run_with_cpu qemu64,+ssse3,+sse4.1,+sse4.2
+run_with_cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt