From 69f562d8a559dc078e9c66da5eb7d60749f8a648 Mon Sep 17 00:00:00 2001
From: Michael Kuron <mkuron@icp.uni-stuttgart.de>
Date: Mon, 16 Sep 2019 10:15:47 +0200
Subject: [PATCH] AES-NI: correct AVX512 guards
---
pystencils/include/aesni_rand.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pystencils/include/aesni_rand.h b/pystencils/include/aesni_rand.h
index 9ab64b6a4..1e2b05bd2 100644
--- a/pystencils/include/aesni_rand.h
+++ b/pystencils/include/aesni_rand.h
@@ -4,7 +4,7 @@
#include <emmintrin.h> // SSE2
#include <wmmintrin.h> // AES
-#if defined(__AVX512VL__) || defined(__AVX512F__)
+#ifdef __AVX512VL__
#include <immintrin.h> // AVX*
#else
#include <smmintrin.h> // SSE4
@@ -38,7 +38,7 @@ QUALIFIERS __m128i aesni1xm128i(const __m128i & in, const __m128i & k) {
QUALIFIERS __m128 _my_cvtepu32_ps(const __m128i v)
{
-#if defined(__AVX512VL__) || defined(__AVX512F__)
+#ifdef __AVX512VL__
return _mm_cvtepu32_ps(v);
#else
__m128i v2 = _mm_srli_epi32(v, 1);
@@ -49,12 +49,12 @@ QUALIFIERS __m128 _my_cvtepu32_ps(const __m128i v)
#endif
}
-#if !defined(__AVX512VL__) && !defined(__AVX512F__) && defined(__GNUC__) && __GNUC__ >= 5
+#if !defined(__AVX512VL__) && defined(__GNUC__) && __GNUC__ >= 5
__attribute__((optimize("no-associative-math")))
#endif
QUALIFIERS __m128d _my_cvtepu64_pd(const __m128i x)
{
-#if defined(__AVX512VL__) || defined(__AVX512F__)
+#ifdef __AVX512VL__
return _mm_cvtepu64_pd(x);
#else
__m128i xH = _mm_srli_epi64(x, 32);
--
GitLab