Remove inline assembly optimizations that give no speedup

These inline assembly versions are about as fast as what the
compiler itself can do. However, when the compiler emits it
by itself instead of via inline assembly, it can interleave the
instructions with other instructions, improving scheduling.

Silence the warnings in fixmul.h though, since the compiler
is able to produce good enough code for the C version of these
functions.

This gives a speedup on both GCC and clang.

libFDK/include/FDK_archdef.h

@@ -213,6 +213,14 @@ amm-info@iis.fraunhofer.de
 #define LDCOEFF_16BIT
 #define WINDOWTABLE_16BIT
 
+#elif defined(__aarch64__) || defined(__AARCH64EL__)
+#define ARCH_PREFER_MULT_32x32
+#define ARCH_PREFER_MULT_32x16
+#define SINETABLE_16BIT
+#define POW2COEFF_16BIT
+#define LDCOEFF_16BIT
+#define WINDOWTABLE_16BIT
+
 #else
 
   #warning  >>>> Please set architecture characterization defines for your platform (FDK_HIGH_PERFORMANCE)! <<<<

libFDK/include/aarch64/clz_aarch64.h

@@ -0,0 +1,122 @@
+
+/* -----------------------------------------------------------------------------------------------------------
+Software License for The Fraunhofer FDK AAC Codec Library for Android
+
+© Copyright  1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
+  All rights reserved.
+
+ 1.    INTRODUCTION
+The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software that implements
+the MPEG Advanced Audio Coding ("AAC") encoding and decoding scheme for digital audio.
+This FDK AAC Codec software is intended to be used on a wide variety of Android devices.
+
+AAC's HE-AAC and HE-AAC v2 versions are regarded as today's most efficient general perceptual
+audio codecs. AAC-ELD is considered the best-performing full-bandwidth communications codec by
+independent studies and is widely deployed. AAC has been standardized by ISO and IEC as part
+of the MPEG specifications.
+
+Patent licenses for necessary patent claims for the FDK AAC Codec (including those of Fraunhofer)
+may be obtained through Via Licensing (www.vialicensing.com) or through the respective patent owners
+individually for the purpose of encoding or decoding bit streams in products that are compliant with
+the ISO/IEC MPEG audio standards. Please note that most manufacturers of Android devices already license
+these patent claims through Via Licensing or directly from the patent owners, and therefore FDK AAC Codec
+software may already be covered under those patent licenses when it is used for those licensed purposes only.
+
+Commercially-licensed AAC software libraries, including floating-point versions with enhanced sound quality,
+are also available from Fraunhofer. Users are encouraged to check the Fraunhofer website for additional
+applications information and documentation.
+
+2.    COPYRIGHT LICENSE
+
+Redistribution and use in source and binary forms, with or without modification, are permitted without
+payment of copyright license fees provided that you satisfy the following conditions:
+
+You must retain the complete text of this software license in redistributions of the FDK AAC Codec or
+your modifications thereto in source code form.
+
+You must retain the complete text of this software license in the documentation and/or other materials
+provided with redistributions of the FDK AAC Codec or your modifications thereto in binary form.
+You must make available free of charge copies of the complete source code of the FDK AAC Codec and your
+modifications thereto to recipients of copies in binary form.
+
+The name of Fraunhofer may not be used to endorse or promote products derived from this library without
+prior written permission.
+
+You may not charge copyright license fees for anyone to use, copy or distribute the FDK AAC Codec
+software or your modifications thereto.
+
+Your modified versions of the FDK AAC Codec must carry prominent notices stating that you changed the software
+and the date of any change. For modified versions of the FDK AAC Codec, the term
+"Fraunhofer FDK AAC Codec Library for Android" must be replaced by the term
+"Third-Party Modified Version of the Fraunhofer FDK AAC Codec Library for Android."
+
+3.    NO PATENT LICENSE
+
+NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without limitation the patents of Fraunhofer,
+ARE GRANTED BY THIS SOFTWARE LICENSE. Fraunhofer provides no warranty of patent non-infringement with
+respect to this software.
+
+You may use this FDK AAC Codec software or modifications thereto only for purposes that are authorized
+by appropriate patent licenses.
+
+4.    DISCLAIMER
+
+This FDK AAC Codec software is provided by Fraunhofer on behalf of the copyright holders and contributors
+"AS IS" and WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, including but not limited to the implied warranties
+of merchantability and fitness for a particular purpose. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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), arising in any way out of the use of this software, even if
+advised of the possibility of such damage.
+
+5.    CONTACT INFORMATION
+
+Fraunhofer Institute for Integrated Circuits IIS
+Attention: Audio and Multimedia Departments - FDK AAC LL
+Am Wolfsmantel 33
+91058 Erlangen, Germany
+
+www.iis.fraunhofer.de/amm
+amm-info@iis.fraunhofer.de
+----------------------------------------------------------------------------------------------------------- */
+
+/***************************  Fraunhofer IIS FDK Tools  **********************
+
+   Author(s):
+   Description: fixed point intrinsics
+
+******************************************************************************/
+
+#if defined(__aarch64__) || defined(__AARCH64EL__)
+
+#if defined(__GNUC__)
+  /* aarch64 gcc*/
+
+  #define FUNCTION_fixnormz_D
+  #define FUNCTION_fixnorm_D
+
+  inline INT fixnormz_D(LONG value)
+  {
+    INT result;
+    asm("clz %w0, %w1 ": "=r"(result) : "r"(value) );
+    return result;
+  }
+
+  inline INT fixnorm_D(LONG value)
+  {
+    INT result;
+    if (value == 0) {
+      return 0;
+    }
+    if (value < 0) {
+      value = ~value;
+    }
+    result =  fixnormz_D(value);
+    return result - 1;
+  }
+
+#endif /* aarch64 toolchain */
+
+#endif /* __aarch64__ */
+

libFDK/include/clz.h

@@ -106,6 +106,9 @@ amm-info@iis.fraunhofer.de
 #elif defined(__powerpc__)
 #include "ppc/clz_ppc.h"
 
+#elif defined(__aarch64__) || defined(__AARCH64EL__)
+#include "aarch64/clz_aarch64.h"
+
 #endif /* all cores */
 
 

libFDK/include/fixmul.h

@@ -107,6 +107,9 @@ amm-info@iis.fraunhofer.de
 #elif defined(__powerpc__)
 #include "ppc/fixmul_ppc.h"
 
+#elif defined(__aarch64__) || defined(__AARCH64EL__)
+#define NO_WARN_FIXMUL
+
 #endif /* all cores */
 
 /*************************************************************************
@@ -117,11 +120,13 @@ amm-info@iis.fraunhofer.de
 
 #if !defined(FUNCTION_fixmuldiv2_DD)
 #define FUNCTION_fixmuldiv2_DD
+#ifndef NO_WARN_FIXMUL
 #if defined(_MSC_VER) || defined(__CC_ARM) || defined(__ANALOG_EXTENSIONS__) || defined(__TI_COMPILER_VERSION__)
 #pragma message ("Extremely slow implementation of fixmuldiv2_DD !!")
 #else
 #warning Extremely slow implementation of fixmuldiv2_DD !!
 #endif
+#endif
 inline LONG fixmuldiv2_DD (const LONG a, const LONG b)
 {
   return (LONG) ((((INT64)a) * b) >> 32) ;
@@ -130,11 +135,13 @@ inline LONG fixmuldiv2_DD (const LONG a, const LONG b)
 
 #if !defined(FUNCTION_fixmuldiv2BitExact_DD)
 #define FUNCTION_fixmuldiv2BitExact_DD
+#ifndef NO_WARN_FIXMUL
 #if defined(_MSC_VER) || defined(__CC_ARM) || defined(__ANALOG_EXTENSIONS__) || defined(__TI_COMPILER_VERSION__)
 #pragma message ("Extremely slow implementation of fixmuldiv2BitExact_DD !!")
 #else
 #warning Extremely slow implementation of fixmuldiv2BitExact_DD !!
 #endif
+#endif
 inline LONG fixmuldiv2BitExact_DD (const LONG a, const LONG b)
 {
   return (LONG) ((((INT64)a) * b) >> 32) ;
@@ -149,11 +156,13 @@ inline LONG fixmul_DD (const LONG a, const LONG b)
 
 #if !defined(FUNCTION_fixmulBitExact_DD)
 #define FUNCTION_fixmulBitExact_DD
+#ifndef NO_WARN_FIXMUL
 #if defined(_MSC_VER) || defined(__CC_ARM) || defined(__ANALOG_EXTENSIONS__) || defined(__TI_COMPILER_VERSION__) || defined(__XTENSA__)
 #pragma message ("Extremely slow implementation of fixmulBitExact_DD !!")
 #else
 #warning Extremely slow implementation of fixmulBitExact_DD !!
 #endif
+#endif
 inline LONG fixmulBitExact_DD (const LONG a, const LONG b)
 {
   return ( (LONG) ((((INT64)a) * b) >> 32) ) << 1;