Menu
▾
▴
[OMPT-svn-commit] OpenMPT r23068 - in trunk/OpenMPT: mptrack sounddsp tracklib
|
From: <sv...@op...> - 2025-03-21 09:07:02
|
Author: manx Date: Fri Mar 21 10:06:31 2025 New Revision: 23068 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23068 Log: [Imp] Check if intrinsics are actually supported by the current compiler instead of just relying on MPT_WANT_ARCH_INTRINSICS_??? macros. Modified: trunk/OpenMPT/mptrack/Autotune.cpp trunk/OpenMPT/sounddsp/EQ.cpp trunk/OpenMPT/sounddsp/Reverb.cpp trunk/OpenMPT/tracklib/SampleEdit.cpp Modified: trunk/OpenMPT/mptrack/Autotune.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Autotune.cpp Fri Mar 21 10:04:30 2025 (r23067) +++ trunk/OpenMPT/mptrack/Autotune.cpp Fri Mar 21 10:06:31 2025 (r23068) @@ -18,7 +18,10 @@ #include <cmath> #include <execution> #include <numeric> -#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) +#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) && defined(MPT_ARCH_INTRINSICS_X86_SSE2) +#if MPT_COMPILER_MSVC +#include <intrin.h> +#endif #include <emmintrin.h> #endif @@ -179,7 +182,7 @@ uint32 sampleFreq; }; -#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) +#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) && defined(MPT_ARCH_INTRINSICS_X86_SSE2) static inline AutotuneHistogramEntry CalculateNoteHistogramSSE2(int note, AutotuneContext ctx) { @@ -317,7 +320,7 @@ std::iota(notes.begin(), notes.end(), START_NOTE); AutotuneHistogram autocorr = -#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) +#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) && defined(MPT_ARCH_INTRINSICS_X86_SSE2) (CPU::HasFeatureSet(CPU::feature::sse2) && CPU::HasModesEnabled(CPU::mode::xmm128sse)) ? std::transform_reduce(std::execution::par_unseq, std::begin(notes), std::end(notes), AutotuneHistogram{}, AutotuneHistogramReduce{}, [ctx](int note) { return CalculateNoteHistogramSSE2(note, ctx); } ) : #endif std::transform_reduce(std::execution::par_unseq, std::begin(notes), std::end(notes), AutotuneHistogram{}, AutotuneHistogramReduce{}, [ctx](int note) { return CalculateNoteHistogram(note, ctx); } ); Modified: trunk/OpenMPT/sounddsp/EQ.cpp ============================================================================== --- trunk/OpenMPT/sounddsp/EQ.cpp Fri Mar 21 10:04:30 2025 (r23067) +++ trunk/OpenMPT/sounddsp/EQ.cpp Fri Mar 21 10:06:31 2025 (r23068) @@ -19,18 +19,16 @@ #include "openmpt/soundbase/MixSample.hpp" #include "openmpt/soundbase/MixSampleConvert.hpp" -#ifndef NO_EQ #if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE) #include "../common/mptCPU.h" #endif -#endif #include <algorithm> #include <array> #include <cstddef> -#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE) +#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE) && defined(MPT_ARCH_INTRINSICS_X86_SSE) #if MPT_COMPILER_MSVC #include <intrin.h> #endif @@ -100,7 +98,7 @@ template <typename TMixSample> void CEQ::ProcessTemplate(TMixSample *frontBuffer, TMixSample *rearBuffer, std::size_t countFrames, std::size_t numChannels) { -#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE) +#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE) && defined(MPT_ARCH_INTRINSICS_X86_SSE) unsigned int old_csr = 0; if(CPU::HasFeatureSet(CPU::feature::sse) && CPU::HasModesEnabled(CPU::mode::xmm128sse)) { @@ -122,7 +120,7 @@ mpt::audio_span_planar_strided<TMixSample> buf{ buffers.data(), 4, countFrames, 2 }; EQFilter<4>(buf, m_Bands, m_ChannelState); } -#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE) +#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE) && defined(MPT_ARCH_INTRINSICS_X86_SSE) if(CPU::HasFeatureSet(CPU::feature::sse) && CPU::HasModesEnabled(CPU::mode::xmm128sse)) { _mm_setcsr(old_csr); Modified: trunk/OpenMPT/sounddsp/Reverb.cpp ============================================================================== --- trunk/OpenMPT/sounddsp/Reverb.cpp Fri Mar 21 10:04:30 2025 (r23067) +++ trunk/OpenMPT/sounddsp/Reverb.cpp Fri Mar 21 10:06:31 2025 (r23068) @@ -19,7 +19,7 @@ #include "../soundlib/MixerLoops.h" #include "mpt/base/numbers.hpp" -#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) +#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) && defined(MPT_ARCH_INTRINSICS_X86_SSE2) #if MPT_COMPILER_MSVC #include <intrin.h> #endif @@ -35,7 +35,7 @@ #ifndef NO_REVERB -#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) +#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) && defined(MPT_ARCH_INTRINSICS_X86_SSE2) // Load two 32-bit values static MPT_FORCEINLINE __m128i Load64SSE(const int32 *x) { return _mm_loadl_epi64(reinterpret_cast<const __m128i *>(x)); } // Load four 16-bit values @@ -594,7 +594,7 @@ // Stereo Add + DC removal void CReverb::ReverbProcessPostFiltering1x(const int32 * MPT_RESTRICT pRvb, int32 * MPT_RESTRICT pDry, uint32 nSamples) { -#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) +#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) && defined(MPT_ARCH_INTRINSICS_X86_SSE2) if(CPU::HasFeatureSet(CPU::feature::sse2) && CPU::HasModesEnabled(CPU::mode::xmm128sse)) { __m128i nDCRRvb_Y1 = Load64SSE(gnDCRRvb_Y1); @@ -656,7 +656,7 @@ void CReverb::ReverbDCRemoval(int32 * MPT_RESTRICT pBuffer, uint32 nSamples) { -#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) +#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) && defined(MPT_ARCH_INTRINSICS_X86_SSE2) if(CPU::HasFeatureSet(CPU::feature::sse2) && CPU::HasModesEnabled(CPU::mode::xmm128sse)) { __m128i nDCRRvb_Y1 = Load64SSE(gnDCRRvb_Y1); @@ -721,7 +721,7 @@ { uint32 preDifPos = pPreDelay->nPreDifPos; uint32 delayPos = pPreDelay->nDelayPos - 1; -#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) +#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) && defined(MPT_ARCH_INTRINSICS_X86_SSE2) if(CPU::HasFeatureSet(CPU::feature::sse2) && CPU::HasModesEnabled(CPU::mode::xmm128sse)) { __m128i coeffs = _mm_cvtsi32_si128(pPreDelay->nCoeffs.lr); @@ -793,7 +793,7 @@ void CReverb::ProcessReflections(SWRvbRefDelay * MPT_RESTRICT pPreDelay, LR16 * MPT_RESTRICT pRefOut, int32 * MPT_RESTRICT pOut, uint32 nSamples) { -#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) +#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) && defined(MPT_ARCH_INTRINSICS_X86_SSE2) if(CPU::HasFeatureSet(CPU::feature::sse2) && CPU::HasModesEnabled(CPU::mode::xmm128sse)) { union @@ -888,7 +888,7 @@ // Calculate delay line offset from current delay position #define DELAY_OFFSET(x) ((delayPos - (x)) & RVBDLY_MASK) -#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) +#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) && defined(MPT_ARCH_INTRINSICS_X86_SSE2) if(CPU::HasFeatureSet(CPU::feature::sse2) && CPU::HasModesEnabled(CPU::mode::xmm128sse)) { int delayPos = pReverb->nDelayPos & RVBDLY_MASK; Modified: trunk/OpenMPT/tracklib/SampleEdit.cpp ============================================================================== --- trunk/OpenMPT/tracklib/SampleEdit.cpp Fri Mar 21 10:04:30 2025 (r23067) +++ trunk/OpenMPT/tracklib/SampleEdit.cpp Fri Mar 21 10:06:31 2025 (r23068) @@ -31,7 +31,7 @@ #pragma warning(pop) #endif // MPT_COMPILER_MSVC -#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) +#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) && defined(MPT_ARCH_INTRINSICS_X86_SSE2) #if MPT_COMPILER_MSVC #include <intrin.h> #endif @@ -43,7 +43,7 @@ namespace SampleEdit { -#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) +#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) && defined(MPT_ARCH_INTRINSICS_X86_SSE2) // SSE2 implementation for min/max finder, packs 8*int16 in a 128-bit XMM register. // scanlen = How many samples to process on this channel @@ -187,7 +187,7 @@ { int minVal = 127; int maxVal = -128; -#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) +#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) && defined(MPT_ARCH_INTRINSICS_X86_SSE2) if(CPU::HasFeatureSet(CPU::feature::sse2) && CPU::HasModesEnabled(CPU::mode::xmm128sse) && numSamples >= 16) { sse2_findminmax8(p, numSamples, numChannels, minVal, maxVal); @@ -211,7 +211,7 @@ { int minVal = 32767; int maxVal = -32768; -#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) +#if defined(MPT_WANT_ARCH_INTRINSICS_X86_SSE2) && defined(MPT_ARCH_INTRINSICS_X86_SSE2) if(CPU::HasFeatureSet(CPU::feature::sse2) && CPU::HasModesEnabled(CPU::mode::xmm128sse) && numSamples >= 8) { sse2_findminmax16(p, numSamples, numChannels, minVal, maxVal); |
