Merge branch 'avx512' into devel

sadko4u · sadko4u · commit eade5a422fc7 · 2024-07-30T12:44:58.000+03:00
* Implemented AVX-512 optimized minimum and maximum search functions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -3,6 +3,7 @@
 *******************************************************************************
 
 === 1.0.25 ===
+* Implemented AVX-512 optimized minimum and maximum search functions.
 * Implemented AVX-512 optimized direct convolution function.
 * Updated build scripts.
 
diff --git a/include/private/dsp/arch/x86/avx512/search.h b/include/private/dsp/arch/x86/avx512/search.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
+ *           (C) 2024 Vladimir Sadovnikov <sadko4u@gmail.com>
+ *
+ * This file is part of lsp-dsp-lib
+ * Created on: 29 июл. 2024 г.
+ *
+ * lsp-dsp-lib is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * lsp-dsp-lib is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with lsp-dsp-lib. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef PRIVATE_DSP_ARCH_X86_AVX512_SEARCH_H_
+#define PRIVATE_DSP_ARCH_X86_AVX512_SEARCH_H_
+
+#include <lsp-plug.in/dsp/common/types.h>
+
+#include <private/dsp/arch/x86/avx512/search/minmax.h>
+#include <private/dsp/arch/x86/avx512/search/iminmax.h>
+
+#endif /* PRIVATE_DSP_ARCH_X86_AVX512_SEARCH_H_ */
diff --git a/include/private/dsp/arch/x86/avx512/search/iminmax.h b/include/private/dsp/arch/x86/avx512/search/iminmax.h
diff --git a/include/private/dsp/arch/x86/avx512/search/minmax.h b/include/private/dsp/arch/x86/avx512/search/minmax.h
diff --git a/src/main/x86/avx512.cpp b/src/main/x86/avx512.cpp
@@ -50,6 +50,7 @@
         #include <private/dsp/arch/x86/avx512/msmatrix.h>
         #include <private/dsp/arch/x86/avx512/pcomplex.h>
         #include <private/dsp/arch/x86/avx512/pmath.h>
+        #include <private/dsp/arch/x86/avx512/search.h>
 
         #include <private/dsp/arch/x86/avx512/correlation.h>
     #undef PRIVATE_DSP_ARCH_X86_AVX512_IMPL
@@ -260,6 +261,20 @@
                 CEXPORT1(vl, pcomplex_r2c_div2);
                 CEXPORT1(vl, pcomplex_c2r);
 
+                CEXPORT1(vl, min);
+                CEXPORT1(vl, max);
+                CEXPORT1(vl, minmax);
+                CEXPORT1(vl, abs_min);
+                CEXPORT1(vl, abs_max);
+                CEXPORT1(vl, abs_minmax);
+
+                CEXPORT1(vl, min_index);
+                CEXPORT1(vl, max_index);
+                CEXPORT1(vl, minmax_index);
+                CEXPORT1(vl, abs_min_index);
+                CEXPORT1(vl, abs_max_index);
+                CEXPORT1(vl, abs_minmax_index);
+
                 CEXPORT1(vl, lr_to_ms);
                 CEXPORT1(vl, lr_to_mid);
                 CEXPORT1(vl, lr_to_side);
diff --git a/src/test/ptest/search/abs_max_index.cpp b/src/test/ptest/search/abs_max_index.cpp
@@ -44,6 +44,11 @@ namespace lsp
         {
             size_t  abs_max_index(const float *src, size_t count);
         }
+
+        namespace avx512
+        {
+            size_t  abs_max_index(const float *src, size_t count);
+        }
     )
 
     IF_ARCH_ARM(
@@ -101,6 +106,7 @@ PTEST_BEGIN("dsp.search", abs_max_index, 5, 1000)
             CALL(generic::abs_max_index);
             IF_ARCH_X86(CALL(sse2::abs_max_index));
             IF_ARCH_X86(CALL(avx2::abs_max_index));
+            IF_ARCH_X86(CALL(avx512::abs_max_index));
             IF_ARCH_ARM(CALL(neon_d32::abs_max_index));
             IF_ARCH_AARCH64(CALL(asimd::abs_max_index));
             PTEST_SEPARATOR;
diff --git a/src/test/ptest/search/abs_min_index.cpp b/src/test/ptest/search/abs_min_index.cpp
@@ -44,6 +44,11 @@ namespace lsp
         {
             size_t  abs_min_index(const float *src, size_t count);
         }
+
+        namespace avx512
+        {
+            size_t  abs_min_index(const float *src, size_t count);
+        }
     )
 
     IF_ARCH_ARM(
@@ -101,6 +106,7 @@ PTEST_BEGIN("dsp.search", abs_min_index, 5, 1000)
             CALL(generic::abs_min_index);
             IF_ARCH_X86(CALL(sse2::abs_min_index));
             IF_ARCH_X86(CALL(avx2::abs_min_index));
+            IF_ARCH_X86(CALL(avx512::abs_min_index));
             IF_ARCH_ARM(CALL(neon_d32::abs_min_index));
             IF_ARCH_AARCH64(CALL(asimd::abs_min_index));
             PTEST_SEPARATOR;
diff --git a/src/test/ptest/search/abs_minmax_index.cpp b/src/test/ptest/search/abs_minmax_index.cpp
@@ -44,6 +44,11 @@ namespace lsp
         {
             void    abs_minmax_index(const float *src, size_t count, size_t *min, size_t *max);
         }
+
+        namespace avx512
+        {
+            void    abs_minmax_index(const float *src, size_t count, size_t *min, size_t *max);
+        }
     )
 
     IF_ARCH_ARM(
@@ -101,6 +106,7 @@ PTEST_BEGIN("dsp.search", abs_minmax_index, 5, 1000)
             CALL(generic::abs_minmax_index);
             IF_ARCH_X86(CALL(sse2::abs_minmax_index));
             IF_ARCH_X86(CALL(avx2::abs_minmax_index));
+            IF_ARCH_X86(CALL(avx512::abs_minmax_index));
             IF_ARCH_ARM(CALL(neon_d32::abs_minmax_index));
             IF_ARCH_AARCH64(CALL(asimd::abs_minmax_index));
             PTEST_SEPARATOR;
diff --git a/src/test/ptest/search/max_index.cpp b/src/test/ptest/search/max_index.cpp
@@ -44,6 +44,11 @@ namespace lsp
         {
             size_t  max_index(const float *src, size_t count);
         }
+
+        namespace avx512
+        {
+            size_t  max_index(const float *src, size_t count);
+        }
     )
 
     IF_ARCH_ARM(
@@ -101,6 +106,7 @@ PTEST_BEGIN("dsp.search", max_index, 5, 1000)
             CALL(generic::max_index);
             IF_ARCH_X86(CALL(sse2::max_index));
             IF_ARCH_X86(CALL(avx2::max_index));
+            IF_ARCH_X86(CALL(avx512::max_index));
             IF_ARCH_ARM(CALL(neon_d32::max_index));
             IF_ARCH_AARCH64(CALL(asimd::max_index));
             PTEST_SEPARATOR;
diff --git a/src/test/ptest/search/min_index.cpp b/src/test/ptest/search/min_index.cpp
@@ -44,6 +44,11 @@ namespace lsp
         {
             size_t  min_index(const float *src, size_t count);
         }
+
+        namespace avx512
+        {
+            size_t  min_index(const float *src, size_t count);
+        }
     )
 
     IF_ARCH_ARM(
@@ -101,6 +106,7 @@ PTEST_BEGIN("dsp.search", min_index, 5, 1000)
             CALL(generic::min_index);
             IF_ARCH_X86(CALL(sse2::min_index));
             IF_ARCH_X86(CALL(avx2::min_index));
+            IF_ARCH_X86(CALL(avx512::min_index));
             IF_ARCH_ARM(CALL(neon_d32::min_index));
             IF_ARCH_AARCH64(CALL(asimd::min_index));
             PTEST_SEPARATOR;
diff --git a/src/test/ptest/search/minmax.cpp b/src/test/ptest/search/minmax.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
- *           (C) 2020 Vladimir Sadovnikov <sadko4u@gmail.com>
+ * Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
+ *           (C) 2024 Vladimir Sadovnikov <sadko4u@gmail.com>
  *
  * This file is part of lsp-dsp-lib
  * Created on: 31 мар. 2020 г.
@@ -62,6 +62,17 @@ namespace lsp
             float   abs_max(const float *src, size_t count);
             void    abs_minmax(const float *src, size_t count, float *min, float *max);
         }
+
+        namespace avx512
+        {
+            float   min(const float *src, size_t count);
+            float   max(const float *src, size_t count);
+            void    minmax(const float *src, size_t count, float *min, float *max);
+
+            float   abs_min(const float *src, size_t count);
+            float   abs_max(const float *src, size_t count);
+            void    abs_minmax(const float *src, size_t count, float *min, float *max);
+        }
     )
 
     IF_ARCH_ARM(
@@ -147,12 +158,14 @@ PTEST_BEGIN("dsp.search", minmax, 5, 1000)
             CALL(generic::min);
             IF_ARCH_X86(CALL(sse::min));
             IF_ARCH_X86(CALL(avx::min));
+            IF_ARCH_X86(CALL(avx512::min));
             IF_ARCH_ARM(CALL(neon_d32::min));
             IF_ARCH_AARCH64(CALL(asimd::min));
 
             CALL(generic::abs_min);
             IF_ARCH_X86(CALL(sse::abs_min));
             IF_ARCH_X86(CALL(avx::abs_min));
+            IF_ARCH_X86(CALL(avx512::abs_min));
             IF_ARCH_ARM(CALL(neon_d32::abs_min));
             IF_ARCH_AARCH64(CALL(asimd::abs_min));
             PTEST_SEPARATOR;
@@ -161,12 +174,14 @@ PTEST_BEGIN("dsp.search", minmax, 5, 1000)
             CALL(generic::max);
             IF_ARCH_X86(CALL(sse::max));
             IF_ARCH_X86(CALL(avx::max));
+            IF_ARCH_X86(CALL(avx512::max));
             IF_ARCH_ARM(CALL(neon_d32::max));
             IF_ARCH_AARCH64(CALL(asimd::max));
 
             CALL(generic::abs_max);
             IF_ARCH_X86(CALL(sse::abs_max));
             IF_ARCH_X86(CALL(avx::abs_max));
+            IF_ARCH_X86(CALL(avx512::abs_max));
             IF_ARCH_ARM(CALL(neon_d32::abs_max));
             IF_ARCH_AARCH64(CALL(asimd::abs_max));
             PTEST_SEPARATOR;
@@ -175,12 +190,14 @@ PTEST_BEGIN("dsp.search", minmax, 5, 1000)
             CALL(generic::minmax);
             IF_ARCH_X86(CALL(sse::minmax));
             IF_ARCH_X86(CALL(avx::minmax));
+            IF_ARCH_X86(CALL(avx512::minmax));
             IF_ARCH_ARM(CALL(neon_d32::minmax));
             IF_ARCH_AARCH64(CALL(asimd::minmax));
 
             CALL(generic::abs_minmax);
             IF_ARCH_X86(CALL(sse::abs_minmax));
             IF_ARCH_X86(CALL(avx::abs_minmax));
+            IF_ARCH_X86(CALL(avx512::abs_minmax));
             IF_ARCH_ARM(CALL(neon_d32::abs_minmax));
             IF_ARCH_AARCH64(CALL(asimd::abs_minmax));
             PTEST_SEPARATOR2;
diff --git a/src/test/ptest/search/minmax_index.cpp b/src/test/ptest/search/minmax_index.cpp
@@ -44,6 +44,11 @@ namespace lsp
         {
             void    minmax_index(const float *src, size_t count, size_t *min, size_t *max);
         }
+
+        namespace avx512
+        {
+            void    minmax_index(const float *src, size_t count, size_t *min, size_t *max);
+        }
     )
 
     IF_ARCH_ARM(
@@ -102,6 +107,7 @@ PTEST_BEGIN("dsp.search", minmax_index, 5, 1000)
             CALL(generic::minmax_index);
             IF_ARCH_X86(CALL(sse2::minmax_index));
             IF_ARCH_X86(CALL(avx2::minmax_index));
+            IF_ARCH_X86(CALL(avx512::minmax_index));
             IF_ARCH_ARM(CALL(neon_d32::minmax_index));
             IF_ARCH_AARCH64(CALL(asimd::minmax_index));
             PTEST_SEPARATOR;
diff --git a/src/test/utest/search/abs_max_index.cpp b/src/test/utest/search/abs_max_index.cpp
@@ -41,6 +41,11 @@ namespace lsp
         {
             size_t  abs_max_index(const float *src, size_t count);
         }
+
+        namespace avx512
+        {
+            size_t  abs_max_index(const float *src, size_t count);
+        }
     )
 
     IF_ARCH_ARM(
@@ -70,7 +75,7 @@ UTEST_BEGIN("dsp.search", abs_max_index)
             return;
 
         UTEST_FOREACH(count, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-                32, 33, 34, 35, 36, 37, 64, 65, 66, 67, 68, 69, 100, 768, 999, 1024)
+                16, 32, 33, 34, 35, 36, 37, 64, 65, 66, 67, 68, 69, 100, 768, 999, 1024)
         {
             for (size_t mask=0; mask <= 0x01; ++mask)
             {
@@ -102,6 +107,7 @@ UTEST_BEGIN("dsp.search", abs_max_index)
 
         IF_ARCH_X86(CALL(generic::abs_max_index, sse2::abs_max_index, 16));
         IF_ARCH_X86(CALL(generic::abs_max_index, avx2::abs_max_index, 32));
+        IF_ARCH_X86(CALL(generic::abs_max_index, avx512::abs_max_index, 64));
         IF_ARCH_ARM(CALL(generic::abs_max_index, neon_d32::abs_max_index, 16));
         IF_ARCH_AARCH64(CALL(generic::abs_max_index, asimd::abs_max_index, 16));
     }
diff --git a/src/test/utest/search/abs_min_index.cpp b/src/test/utest/search/abs_min_index.cpp
@@ -41,6 +41,11 @@ namespace lsp
         {
             size_t  abs_min_index(const float *src, size_t count);
         }
+
+        namespace avx512
+        {
+            size_t  abs_min_index(const float *src, size_t count);
+        }
     )
 
     IF_ARCH_ARM(
@@ -70,7 +75,7 @@ UTEST_BEGIN("dsp.search", abs_min_index)
             return;
 
         UTEST_FOREACH(count, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-                32, 33, 34, 35, 36, 37, 64, 65, 66, 67, 68, 69, 100, 768, 999, 1024)
+                16, 32, 33, 34, 35, 36, 37, 64, 65, 66, 67, 68, 69, 100, 768, 999, 1024)
         {
             for (size_t mask=0; mask <= 0x01; ++mask)
             {
@@ -102,6 +107,7 @@ UTEST_BEGIN("dsp.search", abs_min_index)
 
         IF_ARCH_X86(CALL(generic::abs_min_index, sse2::abs_min_index, 16));
         IF_ARCH_X86(CALL(generic::abs_min_index, avx2::abs_min_index, 32));
+        IF_ARCH_X86(CALL(generic::abs_min_index, avx512::abs_min_index, 64));
         IF_ARCH_ARM(CALL(generic::abs_min_index, neon_d32::abs_min_index, 16));
         IF_ARCH_AARCH64(CALL(generic::abs_min_index, asimd::abs_min_index, 16));
     }
diff --git a/src/test/utest/search/abs_minmax_index.cpp b/src/test/utest/search/abs_minmax_index.cpp
@@ -41,6 +41,11 @@ namespace lsp
         {
             void    abs_minmax_index(const float *src, size_t count, size_t *min, size_t *max);
         }
+
+        namespace avx512
+        {
+            void    abs_minmax_index(const float *src, size_t count, size_t *min, size_t *max);
+        }
     )
 
     IF_ARCH_ARM(
@@ -70,7 +75,7 @@ UTEST_BEGIN("dsp.search", abs_minmax_index)
             return;
 
         UTEST_FOREACH(count, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-                32, 33, 34, 35, 36, 37, 64, 65, 66, 67, 68, 69, 100, 768, 999, 1024)
+                16, 32, 33, 34, 35, 36, 37, 64, 65, 66, 67, 68, 69, 100, 768, 999, 1024)
         {
             for (size_t mask=0; mask <= 0x01; ++mask)
             {
@@ -107,11 +112,9 @@ UTEST_BEGIN("dsp.search", abs_minmax_index)
             call(#func, align, generic, func)
 
         IF_ARCH_X86(CALL(generic::abs_minmax_index, sse2::abs_minmax_index, 16));
-
         IF_ARCH_X86(CALL(generic::abs_minmax_index, avx2::abs_minmax_index, 32));
-
+        IF_ARCH_X86(CALL(generic::abs_minmax_index, avx512::abs_minmax_index, 64));
         IF_ARCH_ARM(CALL(generic::abs_minmax_index, neon_d32::abs_minmax_index, 16));
-
         IF_ARCH_AARCH64(CALL(generic::abs_minmax_index, asimd::abs_minmax_index, 16));
     }
 UTEST_END
diff --git a/src/test/utest/search/max_index.cpp b/src/test/utest/search/max_index.cpp
@@ -41,6 +41,11 @@ namespace lsp
         {
             size_t  max_index(const float *src, size_t count);
         }
+
+        namespace avx512
+        {
+            size_t  max_index(const float *src, size_t count);
+        }
     )
 
     IF_ARCH_ARM(
@@ -70,7 +75,7 @@ UTEST_BEGIN("dsp.search", max_index)
             return;
 
         UTEST_FOREACH(count, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-                32, 33, 34, 35, 36, 37, 64, 65, 66, 67, 68, 69, 100, 768, 999, 1024)
+                16, 32, 33, 34, 35, 36, 37, 64, 65, 66, 67, 68, 69, 100, 768, 999, 1024)
         {
             for (size_t mask=0; mask <= 0x01; ++mask)
             {
@@ -102,6 +107,7 @@ UTEST_BEGIN("dsp.search", max_index)
 
         IF_ARCH_X86(CALL(generic::max_index, sse2::max_index, 16));
         IF_ARCH_X86(CALL(generic::max_index, avx2::max_index, 32));
+        IF_ARCH_X86(CALL(generic::max_index, avx512::max_index, 64));
         IF_ARCH_ARM(CALL(generic::max_index, neon_d32::max_index, 16));
         IF_ARCH_AARCH64(CALL(generic::max_index, asimd::max_index, 16));
     }
diff --git a/src/test/utest/search/min_index.cpp b/src/test/utest/search/min_index.cpp
diff --git a/src/test/utest/search/minmax.cpp b/src/test/utest/search/minmax.cpp
diff --git a/src/test/utest/search/minmax_index.cpp b/src/test/utest/search/minmax_index.cpp

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,11 @@ namespace lsp`
`44`	`44`	`{`
`45`	`45`	`size_t abs_max_index(const float *src, size_t count);`
`46`	`46`	`}`
	`47`	`+`
	`48`	`+ namespace avx512`
	`49`	`+ {`
	`50`	`+ size_t abs_max_index(const float *src, size_t count);`
	`51`	`+ }`
`47`	`52`	`)`
`48`	`53`
`49`	`54`	`IF_ARCH_ARM(`
`@@ -101,6 +106,7 @@ PTEST_BEGIN("dsp.search", abs_max_index, 5, 1000)`
`101`	`106`	`CALL(generic::abs_max_index);`
`102`	`107`	`IF_ARCH_X86(CALL(sse2::abs_max_index));`
`103`	`108`	`IF_ARCH_X86(CALL(avx2::abs_max_index));`
	`109`	`+ IF_ARCH_X86(CALL(avx512::abs_max_index));`
`104`	`110`	`IF_ARCH_ARM(CALL(neon_d32::abs_max_index));`
`105`	`111`	`IF_ARCH_AARCH64(CALL(asimd::abs_max_index));`
`106`	`112`	`PTEST_SEPARATOR;`