Merge pull request ERGO-Code#2790 from ERGO-Code/valgrind-avx

Better handling of AVX512 for Valgrind

Author: galabovaa

.github/workflows/valgrind-hipo.yml

@@ -21,6 +21,7 @@ jobs:
         run: |
           cmake $GITHUB_WORKSPACE -DHIPO=ON \
           -DBUILD_OPENBLAS=ON \
+          -DNO_AVX512=ON \
           -DCMAKE_BUILD_TYPE=Debug \
           -DALL_TESTS=ON
 

CMakeLists.txt

@@ -152,6 +152,10 @@ option(HIPO "Build HIPO" OFF)
 message(STATUS "Build HIPO: ${HIPO}")
 option(BUILD_OPENBLAS "Build OpenBLAS" OFF)
 message(STATUS "Build OpenBLAS: ${BUILD_OPENBLAS}")
+option(NO_AVX512 "Build OpenBLAS without AVX512" OFF)
+if (NO_AVX512)
+  message(STATUS "Build OpenBLAS without AVX512: ON")
+endif()
 
 if (HIPO AND CSHARP)
   message(ERROR "HIPO is only available in C++. Not yet supported in C#.")

cmake/FindHipoDeps.cmake

@@ -125,7 +125,13 @@ if (BUILD_OPENBLAS)
             set(NO_AVX512 ON CACHE BOOL "Disable AVX512" FORCE)
             # set(CMAKE_C_FLAGS_OPENBLAS "-DTARGET=HASWELL -DNO_AVX512=1")
         else()
-            message(STATUS " NOT Skylake")
+            message(STATUS "NOT Skylake")
+        endif()
+
+        if(NO_AVX512)
+            message(STATUS "NO_AVX512 - adjusting OpenBLAS possibly for valgrind")
+            set(NO_AVX512 ON CACHE BOOL "Disable AVX512" FORCE)
+            # set(CMAKE_C_FLAGS_OPENBLAS "-DTARGET=HASWELL -DNO_AVX512=1")
         endif()
     endif()