From f094dba07b1e1dd65d8b85adcbbd98f2d77cb07a Mon Sep 17 00:00:00 2001
From: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Date: Wed, 31 Jul 2019 14:50:31 +0100
Subject: IVGCVSW-3577 Update ACL pin to include NEON convolution output
 multiplier fix

!armnn:1679

Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I09e75e8182d647bd16b25a815812ca2b03ad7614
---
 Android.bp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Android.bp b/Android.bp
index 61b55cc5..c8fc4d2c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -60,6 +60,7 @@ cc_library_static {
         "clframework/src/core/CL/CLHelpers.cpp",
         "clframework/src/core/CL/CLKernelLibrary.cpp",
         "clframework/src/core/CL/gemm/CLGEMMHelpers.cpp",
+        "clframework/src/core/CL/gemm/native/CLGEMMNativeKernelConfigurationBifrost.cpp",
         "clframework/src/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfigurationBifrost.cpp",
         "clframework/src/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationBifrost.cpp",
         "clframework/src/core/CL/ICLDistribution1D.cpp",
@@ -214,6 +215,7 @@ cc_library_static {
         "clframework/src/core/CPP/kernels/CPPCornerCandidatesKernel.cpp",
         "clframework/src/core/CPP/kernels/CPPDetectionWindowNonMaximaSuppressionKernel.cpp",
         "clframework/src/core/CPP/kernels/CPPFlipWeightsKernel.cpp",
+        "clframework/src/core/CPP/kernels/CPPNonMaximumSuppressionKernel.cpp",
         "clframework/src/core/CPP/kernels/CPPPermuteKernel.cpp",
         "clframework/src/core/CPP/kernels/CPPSortEuclideanDistanceKernel.cpp",
         "clframework/src/core/CPP/kernels/CPPTopKVKernel.cpp",
@@ -232,8 +234,11 @@ cc_library_static {
         "clframework/src/core/NEON/kernels/arm_gemm/gemm_fp32.cpp",
         "clframework/src/core/NEON/kernels/arm_gemm/gemm_int16.cpp",
         "clframework/src/core/NEON/kernels/arm_gemm/gemm_int8.cpp",
+        "clframework/src/core/NEON/kernels/arm_gemm/gemm_quint8.cpp",
         "clframework/src/core/NEON/kernels/arm_gemm/gemm_uint16.cpp",
         "clframework/src/core/NEON/kernels/arm_gemm/gemm_uint8.cpp",
+        "clframework/src/core/NEON/kernels/arm_gemm/misc.cpp",
+        "clframework/src/core/NEON/kernels/arm_gemm/quantized.cpp",
         "clframework/src/core/NEON/kernels/assembly/Helpers.cpp",
         "clframework/src/core/NEON/kernels/assembly/INEGEMMWrapperKernel.cpp",
         "clframework/src/core/NEON/kernels/assembly/NEGEMMNativeWrapperKernel.cpp",
@@ -296,6 +301,7 @@ cc_library_static {
         "clframework/src/core/NEON/kernels/NEDepthConvertLayerKernel.cpp",
         "clframework/src/core/NEON/kernels/NEDepthToSpaceLayerKernel.cpp",
         "clframework/src/core/NEON/kernels/NEDepthwiseConvolutionLayer3x3Kernel.cpp",
+        "clframework/src/core/NEON/kernels/NEDepthwiseConvolutionLayerNativeKernel.cpp",
         "clframework/src/core/NEON/kernels/NEDepthwiseIm2ColKernel.cpp",
         "clframework/src/core/NEON/kernels/NEDepthwiseVectorToTensorKernel.cpp",
         "clframework/src/core/NEON/kernels/NEDepthwiseWeightsReshapeKernel.cpp",
@@ -746,6 +752,16 @@ cc_library_static {
                 "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemm_nativeA_pretransposeB_16x4/generic.cpp",
                 "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemv_pretransposed/generic.cpp",
                 "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemv_trans/generic.cpp",
+                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_s8s32_dot_4x6/a55.cpp",
+                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_s8s32_dot_4x6/generic.cpp",
+                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_s8s32_dot_4x8/a55.cpp",
+                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_s8s32_dot_4x8/generic.cpp",
+                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_u8u32_dot_4x6/a55.cpp",
+                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_u8u32_dot_4x6/generic.cpp",
+                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_u8u32_dot_4x8/a55.cpp",
+                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_u8u32_dot_4x8/generic.cpp",
+                "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_smallK_hybrid_s8s32_dot_1VLx8/generic.cpp",
+                "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_smallK_hybrid_u8u32_dot_1VLx8/generic.cpp",
                 "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_hybrid_fp16_mla_4VLx4/generic.cpp",
                 "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_hybrid_fp32_mla_4VLx4/generic.cpp",
                 "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_hybrid_s8s32_dot_4VLx4/generic.cpp",
-- 
cgit v1.2.1