thr3ads.net - opus - [opus] [PATCH 2/3] Add Aarch64 intrinsics for saturated add/subtract. [Nov 2015]

If this information is useful, please help other people find it:
Share via:

Jonathan Lennox

2015-Nov-19 21:53 UTC

[opus] [PATCH 1/3] Add configure check for Aarch64-specific Neon intrinsics.

---
 configure.ac | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/configure.ac b/configure.ac
index 90a06c8..adcb969 100644
--- a/configure.ac
+++ b/configure.ac
@@ -503,6 +503,26 @@ AS_IF([test x"$enable_intrinsics" =
x"yes"],[
                  [rtcd_support="$rtcd_support (NE10)"])
          ])
 
+         OPUS_CHECK_INTRINSICS(
+            [Aarch64 Neon],
+            [$ARM_NEON_INTR_CFLAGS],
+            [OPUS_ARM_MAY_HAVE_AARCH64_NEON_INTR],
+            [OPUS_ARM_PRESUME_AARCH64_NEON_INTR],
+            [[#include <arm_neon.h>
+            ]],
+            [[
+               static int32_t IN;
+               static int16_t OUT;
+               OUT = vqmovns_s32(IN);
+            ]]
+         )
+
+         AS_IF([test x"$OPUS_ARM_PRESUME_AARCH64_NEON_INTR" =
x"1"],
+         [
+            AC_DEFINE([OPUS_ARM_PRESUME_AARCH64_NEON_INTR], 1, [Define if
binary requires Aarch64 Neon Intrinsics])
+            intrinsics_support="$intrinsics_support (NEON [Aarch64])"
+         ])
+
          AS_IF([test x"$intrinsics_support" = x""],
             [intrinsics_support=no],
             [intrinsics_support="ARM$intrinsics_support"])
-- 
2.4.9 (Apple Git-60)

Jonathan Lennox

2015-Nov-19 21:53 UTC

head link

[opus] [PATCH 2/3] Add Aarch64 intrinsics for saturated add/subtract.

---
 silk/arm/macros_arm64.h | 39 +++++++++++++++++++++++++++++++++++++++
 silk/macros.h           |  4 ++++
 silk_headers.mk         |  1 +
 3 files changed, 44 insertions(+)
 create mode 100644 silk/arm/macros_arm64.h

diff --git a/silk/arm/macros_arm64.h b/silk/arm/macros_arm64.h
new file mode 100644
index 0000000..ed03041
--- /dev/null
+++ b/silk/arm/macros_arm64.h
@@ -0,0 +1,39 @@
+/***********************************************************************
+Copyright (C) 2015 Vidyo
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+- Neither the name of Internet Society, IETF or IETF Trust, nor the
+names of specific contributors, may be used to endorse or promote
+products derived from this software without specific prior written
+permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+***********************************************************************/
+
+#ifndef SILK_MACROS_ARM64_H
+#define SILK_MACROS_ARM64_H
+
+#include <arm_neon.h>
+
+#undef silk_ADD_SAT32
+#define silk_ADD_SAT32(a, b) (vqadds_s32((a), (b)))
+
+#undef silk_SUB_SAT32
+#define silk_SUB_SAT32(a, b) (vqsubs_s32((a), (b)))
+
+#endif /* SILK_MACROS_ARM64_H */
diff --git a/silk/macros.h b/silk/macros.h
index 7cefedc..d3ca347 100644
--- a/silk/macros.h
+++ b/silk/macros.h
@@ -151,5 +151,9 @@ static OPUS_INLINE opus_int32 silk_CLZ32(opus_int32 in32)
 #include "arm/macros_armv5e.h"
 #endif
 
+#ifdef OPUS_ARM_PRESUME_AARCH64_NEON_INTR
+#include "arm/macros_arm64.h"
+#endif
+
 #endif /* SILK_MACROS_H */
 
diff --git a/silk_headers.mk b/silk_headers.mk
index c74ab81..f8bf1d2 100644
--- a/silk_headers.mk
+++ b/silk_headers.mk
@@ -24,6 +24,7 @@ silk/SigProc_FIX.h \
 silk/x86/SigProc_FIX_sse.h \
 silk/arm/macros_armv4.h \
 silk/arm/macros_armv5e.h \
+silk/arm/macros_arm64.h \
 silk/arm/SigProc_FIX_armv4.h \
 silk/arm/SigProc_FIX_armv5e.h \
 silk/arm/NSQ_neon.h \
-- 
2.4.9 (Apple Git-60)

Jonathan Lennox

2015-Nov-19 21:53 UTC

head link

[opus] [PATCH 3/3] Add Aarch64 intrinsic for SIG2WORD16.

---
 celt/arch.h            |  4 +++-
 celt/arm/fixed_arm64.h | 35 +++++++++++++++++++++++++++++++++++
 celt_headers.mk        |  1 +
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 celt/arm/fixed_arm64.h

diff --git a/celt/arch.h b/celt/arch.h
index 670527b..9a06359 100644
--- a/celt/arch.h
+++ b/celt/arch.h
@@ -123,7 +123,9 @@ static OPUS_INLINE opus_int16 SAT16(opus_int32 x) {
 
 #include "fixed_generic.h"
 
-#ifdef OPUS_ARM_INLINE_EDSP
+#ifdef OPUS_ARM_PRESUME_AARCH64_NEON_INTR
+#include "arm/fixed_arm64.h"
+#elif OPUS_ARM_INLINE_EDSP
 #include "arm/fixed_armv5e.h"
 #elif defined (OPUS_ARM_INLINE_ASM)
 #include "arm/fixed_armv4.h"
diff --git a/celt/arm/fixed_arm64.h b/celt/arm/fixed_arm64.h
new file mode 100644
index 0000000..075a6b3
--- /dev/null
+++ b/celt/arm/fixed_arm64.h
@@ -0,0 +1,35 @@
+/* Copyright (C) 2015 Vidyo */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef FIXED_ARM64_H
+#define FIXED_ARM64_H
+
+#include <arm_neon.h>
+
+#undef SIG2WORD16
+#define SIG2WORD16(x) (vqmovns_s32((x)))
+
+#endif
diff --git a/celt_headers.mk b/celt_headers.mk
index 0eca6e6..c9df94b 100644
--- a/celt_headers.mk
+++ b/celt_headers.mk
@@ -36,6 +36,7 @@ celt/static_modes_fixed_arm_ne10.h \
 celt/arm/armcpu.h \
 celt/arm/fixed_armv4.h \
 celt/arm/fixed_armv5e.h \
+celt/arm/fixed_arm64.h \
 celt/arm/kiss_fft_armv4.h \
 celt/arm/kiss_fft_armv5e.h \
 celt/arm/pitch_arm.h \
-- 
2.4.9 (Apple Git-60)

Jonathan Lennox

2015-Nov-19 21:55 UTC

head link

[opus] [PATCH 1/3] Add configure check for Aarch64-specific Neon intrinsics.

Note that these patches conflict with my (withdrawn) inline assembly for Aarch64
patches, since I?m reusing the same files to hold the optimized functions.
> On Nov 19, 2015, at 4:53 PM, Jonathan Lennox <jonathan at vidyo.com>
wrote:
> 
> ---
> configure.ac | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
> 
> diff --git a/configure.ac b/configure.ac
> index 90a06c8..adcb969 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -503,6 +503,26 @@ AS_IF([test x"$enable_intrinsics" =
x"yes"],[
>                  [rtcd_support="$rtcd_support (NE10)"])
>          ])
> 
> +         OPUS_CHECK_INTRINSICS(
> +            [Aarch64 Neon],
> +            [$ARM_NEON_INTR_CFLAGS],
> +            [OPUS_ARM_MAY_HAVE_AARCH64_NEON_INTR],
> +            [OPUS_ARM_PRESUME_AARCH64_NEON_INTR],
> +            [[#include <arm_neon.h>
> +            ]],
> +            [[
> +               static int32_t IN;
> +               static int16_t OUT;
> +               OUT = vqmovns_s32(IN);
> +            ]]
> +         )
> +
> +         AS_IF([test x"$OPUS_ARM_PRESUME_AARCH64_NEON_INTR" =
x"1"],
> +         [
> +            AC_DEFINE([OPUS_ARM_PRESUME_AARCH64_NEON_INTR], 1, [Define if
binary requires Aarch64 Neon Intrinsics])
> +            intrinsics_support="$intrinsics_support (NEON
[Aarch64])"
> +         ])
> +
>          AS_IF([test x"$intrinsics_support" = x""],
>             [intrinsics_support=no],
>             [intrinsics_support="ARM$intrinsics_support"])
> -- 
> 2.4.9 (Apple Git-60)
> 
> _______________________________________________
> opus mailing list
> opus at xiph.org
> http://lists.xiph.org/mailman/listinfo/opus

Seemingly Similar Threads

Search for more possibly parallel threads

opus - Nov 2015 - [PATCH 2/3] Add Aarch64 intrinsics for saturated add/subtract.

[opus] [PATCH 1/3] Add configure check for Aarch64-specific Neon intrinsics.

[opus] [PATCH 2/3] Add Aarch64 intrinsics for saturated add/subtract.

[opus] [PATCH 3/3] Add Aarch64 intrinsic for SIG2WORD16.

[opus] [PATCH 1/3] Add configure check for Aarch64-specific Neon intrinsics.

Seemingly Similar Threads