commit c9e519d2ea4780297d71e68cccc5de9c7bb7c0b4
author alerah01 <alex.rahlis@arm.com> Mon Jan 31 19:04:10 2022 +0200
committer Alex Rahlis <alex.rahlis@arm.com> Tue Feb 22 09:26:32 2022 +0000
tree 933427df414593e4a40d4c269c8065858a635d65
parent 0597b7b55ba0c1aa2cc58e80f95dc918b92afe68

Decouple CpuDirectConv2dKernel

Resolves COMPMID-4626

Exclude SVE & SVE2 paths from android.bp
NDK version does not support these extensions.

Change-Id: I49b147d2a84819975d3225f2920106fa1a0d742f
Signed-off-by: alerah01 <alex.rahlis@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/7136
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>

filelist.json

diff --git a/filelist.json b/filelist.json
index 185ef6d..7e47df9 100644
--- a/filelist.json
+++ b/filelist.json
@@ -848,7 +848,9 @@
           },
           "sve": {
             "fp16": [ "src/cpu/kernels/activation/generic/sve/fp16.cpp" ],
-            "fp32": [ "src/cpu/kernels/activation/generic/sve/fp32.cpp" ],
+            "fp32": [ "src/cpu/kernels/activation/generic/sve/fp32.cpp" ]
+          }, 
+          "sve2":{
             "qasymm8": [ "src/cpu/kernels/activation/generic/sve2/qasymm8.cpp" ],
             "qasymm8_signed": [ "src/cpu/kernels/activation/generic/sve2/qasymm8_signed.cpp" ],
             "qsymm16": [ "src/cpu/kernels/activation/generic/sve2/qsymm16.cpp" ]
@@ -1052,7 +1054,12 @@
               "src/core/NEON/kernels/convolution/winograd/winograd_transforms/weights_4_5_fp32_fp32_integers.cpp",
               "src/core/NEON/kernels/convolution/winograd/winograd_transforms/weights_4x4_3x3_fp16_fp16_integers.cpp",
               "src/core/NEON/kernels/convolution/winograd/winograd_transforms/weights_4x4_3x3_fp32_fp32_integers.cpp",
-              "src/core/NEON/kernels/convolution/winograd/winograd_transforms/weights_6_3_fp32_fp32_integers.cpp" 
+              "src/core/NEON/kernels/convolution/winograd/winograd_transforms/weights_6_3_fp32_fp32_integers.cpp",
+              "src/cpu/kernels/directconv2d/nhwc/neon/impl.cpp",
+              "src/cpu/kernels/directconv2d/nchw/all.cpp"
+            ],
+            "fp32": [
+              "src/cpu/kernels/directconv2d/nhwc/neon/fp32.cpp"
             ]
           }
         }