From 307ae66dad50c740084be0d2f63fdbd6eeaf0207 Mon Sep 17 00:00:00 2001 From: Amber Ehrlich Date: Mon, 4 Dec 2023 12:01:22 -0500 Subject: [PATCH] misc: tentative revert of AVX guard for clang-cl --- include/dpp/isa/avx.h | 8 ++------ include/dpp/isa/avx2.h | 6 +----- include/dpp/isa/avx512.h | 8 ++------ 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/include/dpp/isa/avx.h b/include/dpp/isa/avx.h index a4c771b0d4..367980bd9e 100644 --- a/include/dpp/isa/avx.h +++ b/include/dpp/isa/avx.h @@ -20,11 +20,7 @@ ************************************************************************************/ #pragma once -/* - * If the user is using clang-cl, both _MSC_VER and __clang__ are defined. However, clang-cl breaks using this as it knows nothing above __m128. - * So, we make sure that both aren't defined, and only do this if _MSC_VER, __GNUC__, or __clang__, is defined. - */ -#if (!defined _MSC_VER && !defined __clang__) && (defined _MSC_VER || defined __GNUC__ || defined __clang__) +#if defined _MSC_VER || defined __GNUC__ || defined __clang__ #include #include @@ -32,7 +28,7 @@ namespace dpp { using avx_float = __m128; - + /** * @brief A class for audio mixing operations using AVX instructions. */ diff --git a/include/dpp/isa/avx2.h b/include/dpp/isa/avx2.h index 9fb233d0c0..1e02eaa935 100644 --- a/include/dpp/isa/avx2.h +++ b/include/dpp/isa/avx2.h @@ -20,11 +20,7 @@ ************************************************************************************/ #pragma once -/* - * If the user is using clang-cl, both _MSC_VER and __clang__ are defined. However, clang-cl breaks using this as it knows nothing above __m128. - * So, we make sure that both aren't defined, and only do this if _MSC_VER, __GNUC__, or __clang__, is defined. - */ -#if (!defined _MSC_VER && !defined __clang__) && (defined _MSC_VER || defined __GNUC__ || defined __clang__) +#if defined _MSC_VER || defined __GNUC__ || defined __clang__ #include #include diff --git a/include/dpp/isa/avx512.h b/include/dpp/isa/avx512.h index 4902298573..68f3583801 100644 --- a/include/dpp/isa/avx512.h +++ b/include/dpp/isa/avx512.h @@ -20,11 +20,7 @@ ************************************************************************************/ #pragma once -/* - * If the user is using clang-cl, both _MSC_VER and __clang__ are defined. However, clang-cl breaks using this as it knows nothing above __m128. - * So, we make sure that both aren't defined, and only do this if _MSC_VER, __GNUC__, or __clang__, is defined. - */ -#if (!defined _MSC_VER && !defined __clang__) && (defined _MSC_VER || defined __GNUC__ || defined __clang__) +#if defined _MSC_VER || defined __GNUC__ || defined __clang__ #include #include @@ -32,7 +28,7 @@ namespace dpp { using avx_512_float = __m512; - + /** * @brief A class for audio mixing operations using AVX512 instructions. */