More work on FloatVectorOperations

Author: kunitoki

modules/yup_audio_basics/buffers/yup_FloatVectorOperations.cpp

@@ -83,6 +83,10 @@ struct BasicOps32
 
     static forcedinline void storeU (Type* dest, ParallelType a) noexcept { _mm_storeu_ps (dest, a); }
 
+    static forcedinline void storeU (int* dest, ParallelType a) noexcept { _mm_storeu_si128 (reinterpret_cast<__m128i*> (dest), _mm_castps_si128 (a)); }
+
+    static forcedinline void storeA (int* dest, ParallelType a) noexcept { _mm_store_si128 (reinterpret_cast<__m128i*> (dest), _mm_castps_si128 (a)); }
+
     static forcedinline ParallelType add (ParallelType a, ParallelType b) noexcept { return _mm_add_ps (a, b); }
 
     static forcedinline ParallelType sub (ParallelType a, ParallelType b) noexcept { return _mm_sub_ps (a, b); }
@@ -335,6 +339,10 @@ struct BasicOps32
 
     static forcedinline void storeU (Type* dest, ParallelType a) noexcept { vst1q_f32 (dest, a); }
 
+    static forcedinline void storeU (int* dest, ParallelType a) noexcept { vst1q_f32 (reinterpret_cast<float*> (dest), a); }
+
+    static forcedinline void storeA (int* dest, ParallelType a) noexcept { vst1q_f32 (reinterpret_cast<float*> (dest), a); }
+
     static forcedinline ParallelType add (ParallelType a, ParallelType b) noexcept { return vaddq_f32 (a, b); }
 
     static forcedinline ParallelType sub (ParallelType a, ParallelType b) noexcept { return vsubq_f32 (a, b); }
@@ -1509,12 +1517,37 @@ void convertFixedToFloat (float* dest, const int* src, float multiplier, Size nu
                                  vmulq_n_f32 (vcvtq_f32_s32 (vld1q_s32 (src)), multiplier),
                                  YUP_LOAD_NONE,
                                  YUP_INCREMENT_SRC_DEST, )
-#else
+#elif YUP_USE_SSE_INTRINSICS
     YUP_PERFORM_VEC_OP_SRC_DEST (dest[i] = (float) src[i] * multiplier,
                                  Mode::mul (mult, _mm_cvtepi32_ps (_mm_loadu_si128 (reinterpret_cast<const __m128i*> (src)))),
                                  YUP_LOAD_NONE,
                                  YUP_INCREMENT_SRC_DEST,
                                  const Mode::ParallelType mult = Mode::load1 (multiplier);)
+#else
+    for (Size i = 0; i < num; ++i)
+        dest[i] = (float) src[i] * multiplier;
+#endif
+}
+
+template <typename Size>
+void convertFloatToFixed (int* dest, const float* src, float multiplier, Size num) noexcept
+{
+#if YUP_USE_ARM_NEON
+    YUP_PERFORM_VEC_OP_SRC_DEST (dest[i] = (int) (src[i] * multiplier),
+                                 vreinterpretq_f32_s32 (vcvtq_s32_f32 (vmulq_n_f32 (vld1q_f32 (src), multiplier))),
+                                 YUP_LOAD_NONE,
+                                 YUP_INCREMENT_SRC_DEST, )
+
+#elif YUP_USE_SSE_INTRINSICS
+    YUP_PERFORM_VEC_OP_SRC_DEST (dest[i] = (int) (src[i] * multiplier),
+                                 _mm_castsi128_ps (_mm_cvtps_epi32 (_mm_mul_ps (_mm_loadu_ps (src), mult))),
+                                 YUP_LOAD_NONE,
+                                 YUP_INCREMENT_SRC_DEST,
+                                 const Mode::ParallelType mult = Mode::load1 (multiplier);)
+
+#else
+    for (Size i = 0; i < num; ++i)
+        dest[i] = (int) (src[i] * multiplier);
 #endif
 }
 
@@ -1829,6 +1862,16 @@ void YUP_CALLTYPE FloatVectorOperations::convertFixedToFloat (float* dest, const
     FloatVectorHelpers::convertFixedToFloat (dest, src, multiplier, num);
 }
 
+void YUP_CALLTYPE FloatVectorOperations::convertFloatToFixed (int* dest, const float* src, float multiplier, size_t num) noexcept
+{
+   FloatVectorHelpers::convertFloatToFixed (dest, src, multiplier, num);
+}
+
+void YUP_CALLTYPE FloatVectorOperations::convertFloatToFixed (int* dest, const float* src, float multiplier, int num) noexcept
+{
+    FloatVectorHelpers::convertFloatToFixed (dest, src, multiplier, num);
+}
+
 //==============================================================================
 
 intptr_t YUP_CALLTYPE FloatVectorOperations::getFpStatusRegister() noexcept

modules/yup_audio_basics/buffers/yup_FloatVectorOperations.h

@@ -220,11 +220,13 @@ struct NameForwarder : public Bases...
 class YUP_API FloatVectorOperations : public detail::NameForwarder<FloatVectorOperationsBase<float, int>, FloatVectorOperationsBase<float, size_t>, FloatVectorOperationsBase<double, int>, FloatVectorOperationsBase<double, size_t>>
 {
 public:
-    /** */
-    static void JUCE_CALLTYPE convertFixedToFloat (float* dest, const int* src, float multiplier, int num) noexcept;
+    /** Convert fixed integer signal to float applying a multiplier. */
+    static void YUP_CALLTYPE convertFixedToFloat (float* dest, const int* src, float multiplier, int num) noexcept;
+    static void YUP_CALLTYPE convertFixedToFloat (float* dest, const int* src, float multiplier, size_t num) noexcept;
 
-    /** */
-    static void JUCE_CALLTYPE convertFixedToFloat (float* dest, const int* src, float multiplier, size_t num) noexcept;
+    /** Convert float signal to int applying a multiplier. */
+    static void YUP_CALLTYPE convertFloatToFixed (int* dest, const float* src, float multiplier, int num) noexcept;
+    static void YUP_CALLTYPE convertFloatToFixed (int* dest, const float* src, float multiplier, size_t num) noexcept;
 
     /** This method enables or disables the SSE/NEON flush-to-zero mode. */
     static void YUP_CALLTYPE enableFlushToZeroMode (bool shouldEnable) noexcept;

tests/yup_audio_basics/yup_FloatVectorOperations.cpp

@@ -154,6 +154,28 @@ class FloatVectorOperationsTests : public ::testing::Test
             FloatVectorOperations::fill (data1, (ValueType) 18, num);
             FloatVectorOperations::divide (data2, data1, (ValueType) 6, num);
             EXPECT_TRUE (areAllValuesEqual (data2, num, (ValueType) 3));
+
+            fillRandomly (random, int1, num);
+            const ValueType multiplier = (ValueType) (1.0 / (1 << 16));
+
+            if constexpr (std::is_same_v<ValueType, float>)
+            {
+                convertFixed (data1, int1, multiplier, num);
+                FloatVectorOperations::convertFixedToFloat (data2, int1, multiplier, num);
+                EXPECT_TRUE (buffersMatch (data1, data2, num));
+
+                convertFloatToFixed (int1, data1, 1.0f / multiplier, num);
+                HeapBlock<int> int2 (num + 16);
+#if YUP_ARM
+                int* const intData = int2;
+#else
+                int* const intData = addBytesToPointer (int2.get(), random.nextInt (16));
+#endif
+                FloatVectorOperations::convertFloatToFixed (intData, data1, 1.0f / multiplier, num);
+
+                for (int i = 0; i < num; ++i)
+                    EXPECT_EQ (int1[i], intData[i]);
+            }
         }
 
         static void fillRandomly (Random& random, ValueType* d, int num)