Resolve #472: intrinsic header mix cross-compilation issue + reconsolidate them again

Author: pinterf

avs_core/convert/intel/convert_audio_avx2.cpp

@@ -11,9 +11,9 @@
 
 // Intrinsics base header + really required extension headers
 #if defined(_MSC_VER)
-#include <intrin.h> // MSVC, Clang-CL, and Intel C++ (in MSVC mode)
+#include <intrin.h> // MSVC
 #else 
-#include <x86intrin.h> // GCC/MinGW, Clang (Linux/GNU mode), and Intel C++ (in non-MSVC mode) (__GNUC__, __clang__, __INTEL_COMPILER, etc.)
+#include <x86intrin.h> // GCC/MinGW/Clang/LLVM
 #endif
 #include <immintrin.h> // AVX2
 

avs_core/convert/intel/convert_audio_sse.cpp

@@ -11,12 +11,10 @@
 
 // Intrinsics base header + really required extension headers
 #if defined(_MSC_VER)
-#include <intrin.h> // MSVC, Clang-CL, and Intel C++ (in MSVC mode)
+#include <intrin.h> // MSVC
 #else 
-#include <x86intrin.h> // GCC/MinGW, Clang (Linux/GNU mode), and Intel C++ (in non-MSVC mode) (__GNUC__, __clang__, __INTEL_COMPILER, etc.)
+#include <x86intrin.h> // GCC/MinGW/Clang/LLVM
 #endif
-#include <emmintrin.h> // SSE2
-#include <tmmintrin.h> // SSSE3
 #include <smmintrin.h> // SSE4.1
 
 #if defined(GCC) || defined(CLANG)

avs_core/convert/intel/convert_bits_avx2.cpp

@@ -36,11 +36,12 @@
 #include <avs/alignment.h>
 #include <avs/minmax.h>
 
-#ifdef AVS_WINDOWS
+#ifdef _MSC_VER
     #include <intrin.h>
 #else
     #include <x86intrin.h>
 #endif
+#include <immintrin.h>
 
 #ifndef _mm256_set_m128i
 #define _mm256_set_m128i(v0, v1) _mm256_insertf128_si256(_mm256_castsi128_si256(v1), (v0), 1)
@@ -60,9 +61,6 @@
 #endif
 
 template<typename pixel_t, bool chroma, bool fulls, bool fulld>
-#if defined(GCC) || defined(CLANG)
-__attribute__((__target__("avx2")))
-#endif
 void convert_32_to_uintN_avx2(const BYTE *srcp, BYTE *dstp, int src_rowsize, int src_height, int src_pitch, int dst_pitch, int source_bitdepth, int target_bitdepth, int dither_target_bitdepth)
 {
   const float* srcp0 = reinterpret_cast<const float*>(srcp);

avs_core/convert/intel/convert_bits_sse.cpp

@@ -51,12 +51,10 @@
 
 // Intrinsics base header + really required extension headers
 #if defined(_MSC_VER)
-#include <intrin.h> // MSVC, Clang-CL, and Intel C++ (in MSVC mode)
+#include <intrin.h> // MSVC
 #else 
-#include <x86intrin.h> // GCC/MinGW, Clang (Linux/GNU mode), and Intel C++ (in non-MSVC mode) (__GNUC__, __clang__, __INTEL_COMPILER, etc.)
+#include <x86intrin.h> // GCC/MinGW/Clang/LLVM
 #endif
-#include <emmintrin.h> // SSE2
-#include <tmmintrin.h> // SSSE3
 #include <smmintrin.h> // SSE4.1
 
 // float to 8 bit, float to 10/12/14/16 bit

avs_core/convert/intel/convert_planar_avx2.cpp

@@ -36,11 +36,12 @@
 
 
 #include <avs/alignment.h>
-#ifdef AVS_WINDOWS
+#ifdef _MSC_VER
     #include <intrin.h>
 #else
     #include <x86intrin.h>
 #endif
+#include <immintrin.h>
 
 #include "convert_planar_avx2.h"
 

avs_core/convert/intel/convert_planar_sse.cpp

@@ -54,12 +54,10 @@
 
 // Intrinsics base header + really required extension headers
 #if defined(_MSC_VER)
-#include <intrin.h> // MSVC, Clang-CL, and Intel C++ (in MSVC mode)
+#include <intrin.h> // MSVC
 #else 
-#include <x86intrin.h> // GCC/MinGW, Clang (Linux/GNU mode), and Intel C++ (in non-MSVC mode) (__GNUC__, __clang__, __INTEL_COMPILER, etc.)
+#include <x86intrin.h> // GCC/MinGW/Clang/LLVM
 #endif
-#include <emmintrin.h> // SSE2
-#include <tmmintrin.h> // SSSE3
 #include <smmintrin.h> // SSE4.1
 
 #include <algorithm>

avs_core/convert/intel/convert_rgb_avx2.cpp

@@ -33,11 +33,12 @@
 // import and export plugins, or graphical user interfaces.
 
 #include <avs/alignment.h>
-#ifdef AVS_WINDOWS
+#ifdef _MSC_VER
     #include <intrin.h>
 #else
     #include <x86intrin.h>
 #endif
+#include <immintrin.h>
 
 #ifndef _mm256_set_m128i
 #define _mm256_set_m128i(v0, v1) _mm256_insertf128_si256(_mm256_castsi128_si256(v1), (v0), 1)

avs_core/convert/intel/convert_rgb_sse.cpp

@@ -37,13 +37,11 @@
 
 // Intrinsics base header + really required extension headers
 #if defined(_MSC_VER)
-#include <intrin.h> // MSVC, Clang-CL, and Intel C++ (in MSVC mode)
+#include <intrin.h> // MSVC
 #else 
-#include <x86intrin.h> // GCC/MinGW, Clang (Linux/GNU mode), and Intel C++ (in non-MSVC mode) (__GNUC__, __clang__, __INTEL_COMPILER, etc.)
+#include <x86intrin.h> // GCC/MinGW/Clang/LLVM
 #endif
-#include <emmintrin.h> // SSE2
 #include <tmmintrin.h> // SSSE3
-#include <smmintrin.h> // SSE4.1
 
 #include <avs/alignment.h>
 

avs_core/convert/intel/convert_sse.cpp

@@ -36,13 +36,10 @@
 
 // Intrinsics base header + really required extension headers
 #if defined(_MSC_VER)
-#include <intrin.h> // MSVC, Clang-CL, and Intel C++ (in MSVC mode)
+#include <intrin.h> // MSVC
 #else 
-#include <x86intrin.h> // GCC/MinGW, Clang (Linux/GNU mode), and Intel C++ (in non-MSVC mode) (__GNUC__, __clang__, __INTEL_COMPILER, etc.)
+#include <x86intrin.h> // GCC/MinGW/Clang/LLVM
 #endif
-#include <emmintrin.h> // SSE2
-#include <tmmintrin.h> // SSSE3
-#include <smmintrin.h> // SSE4.1
 
 
 template<int rgb_size>

avs_core/convert/intel/convert_yuy2_sse.cpp

@@ -37,14 +37,10 @@
 
 // Intrinsics base header + really required extension headers
 #if defined(_MSC_VER)
-#include <intrin.h> // MSVC, Clang-CL, and Intel C++ (in MSVC mode)
+#include <intrin.h> // MSVC
 #else 
-#include <x86intrin.h> // GCC/MinGW, Clang (Linux/GNU mode), and Intel C++ (in non-MSVC mode) (__GNUC__, __clang__, __INTEL_COMPILER, etc.)
+#include <x86intrin.h> // GCC/MinGW/Clang/LLVM
 #endif
-#include <emmintrin.h> // SSE2
-#include <tmmintrin.h> // SSSE3
-#include <smmintrin.h> // SSE4.1
-
 
 
 template<int rgb_bytes>