From 43c2b0eb5594bbcb0c48882965a6d655b0f99bc5 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Sun, 23 Dec 2018 17:16:43 +0100
Subject: [PATCH 1/3] Add -mavx2 to TARGET=HASWELL builds

to leverage improvements from PR#1921
---
 Makefile.x86_64 | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Makefile.x86_64 b/Makefile.x86_64
index dbee28079..1b7fe3ef4 100644
--- a/Makefile.x86_64
+++ b/Makefile.x86_64
@@ -25,6 +25,17 @@ endif
 endif
 endif
 
+ifeq ($(CORE), HASWELL)
+ifndef DYNAMIC_ARCH
+ifndef NO_AVX2
+CCOMMON_OPT += -mavx2
+FCOMMON_OPT += -mavx2
+endif
+endif
+endif
+
+
+
 ifeq ($(OSNAME), Interix)
 ARFLAGS		= -m x64
 endif

From 49e0f485dac263e3b26cff01ed1759e46880e497 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Sun, 23 Dec 2018 17:26:09 +0100
Subject: [PATCH 2/3] Add -mavx2 for TARGET=HASWELL if compiler supports and
 requires it

---
 cmake/system.cmake | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cmake/system.cmake b/cmake/system.cmake
index d803bb9eb..ba2c4f351 100644
--- a/cmake/system.cmake
+++ b/cmake/system.cmake
@@ -45,6 +45,12 @@ if (DEFINED TARGET)
 if (${TARGET} STREQUAL "SKYLAKEX" AND NOT NO_AVX512)
   set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -march=skylake-avx512")
 endif()
+if (${TARGET} STREQUAL "HASWELL" AND NOT NO_AVX2)
+   execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
+   if (${GCC_VERSION} VERSION_GREATER 4.7 OR ${GCC_VERSION} VERSION_EQUAL 4.7)
+     set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -mavx2")
+   endif()
+endif()
 endif()
 
 if (DEFINED TARGET)

From 76b4b8980f7cec3ad0dde05d3c0ef2f395d04622 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Sun, 23 Dec 2018 19:08:19 +0100
Subject: [PATCH 3/3] Use -dumpversion with gcc only

---
 cmake/system.cmake | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/cmake/system.cmake b/cmake/system.cmake
index ba2c4f351..a060d98cb 100644
--- a/cmake/system.cmake
+++ b/cmake/system.cmake
@@ -42,15 +42,19 @@ if (DEFINED BINARY AND DEFINED TARGET AND BINARY EQUAL 32)
 endif ()
 
 if (DEFINED TARGET)
-if (${TARGET} STREQUAL "SKYLAKEX" AND NOT NO_AVX512)
-  set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -march=skylake-avx512")
-endif()
-if (${TARGET} STREQUAL "HASWELL" AND NOT NO_AVX2)
-   execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
-   if (${GCC_VERSION} VERSION_GREATER 4.7 OR ${GCC_VERSION} VERSION_EQUAL 4.7)
-     set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -mavx2")
-   endif()
-endif()
+  if (${TARGET} STREQUAL "SKYLAKEX" AND NOT NO_AVX512)
+    set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -march=skylake-avx512")
+  endif()
+  if (${TARGET} STREQUAL "HASWELL" AND NOT NO_AVX2)
+    if (${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
+      execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
+      if (${GCC_VERSION} VERSION_GREATER 4.7 OR ${GCC_VERSION} VERSION_EQUAL 4.7)
+        set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -mavx2")
+      endif()
+    elseif (${CMAKE_C_COMPILER_ID} STREQUAL "CLANG")
+      set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -mavx2")
+    endif()
+  endif()
 endif()
 
 if (DEFINED TARGET)