Skip to content

Commit

Permalink
misc: tentative revert of AVX guard for clang-cl
Browse files Browse the repository at this point in the history
  • Loading branch information
Mishura4 committed Dec 4, 2023
1 parent f8cfc09 commit 307ae66
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 17 deletions.
8 changes: 2 additions & 6 deletions include/dpp/isa/avx.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,15 @@
************************************************************************************/
#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 <immintrin.h>
#include <numeric>

namespace dpp {

using avx_float = __m128;

/**
* @brief A class for audio mixing operations using AVX instructions.
*/
Expand Down
6 changes: 1 addition & 5 deletions include/dpp/isa/avx2.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 <immintrin.h>
#include <numeric>
Expand Down
8 changes: 2 additions & 6 deletions include/dpp/isa/avx512.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,15 @@
************************************************************************************/
#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 <immintrin.h>
#include <numeric>

namespace dpp {

using avx_512_float = __m512;

/**
* @brief A class for audio mixing operations using AVX512 instructions.
*/
Expand Down

0 comments on commit 307ae66

Please sign in to comment.