修正了CMSISNN兼容性问题

Author: QingChuanWS

examples/SConscript examples/audio_example/SConscriptexamples/SConscript renamed to examples/audio_example/SConscript

@@ -2,39 +2,38 @@ from building import *
 import os
 
 src = Split('''
-kernels/activations.cc
-kernels/arg_min_max.cc
-kernels/ceil.cc
-kernels/circular_buffer.cc
-kernels/comparisons.cc
-kernels/concatenation.cc
-kernels/dequantize.cc
-kernels/elementwise.cc
-kernels/ethosu.cc
-kernels/floor.cc
-kernels/hard_swish.cc
-kernels/kernel_runner.cc
-kernels/kernel_util.cc
-kernels/l2norm.cc
-kernels/logical.cc
-kernels/logistic.cc
-kernels/maximum_minimum.cc
-kernels/neg.cc
-kernels/pack.cc
-kernels/pad.cc
-kernels/prelu.cc
-kernels/quantize.cc
-kernels/reduce.cc
-kernels/reshape.cc
-kernels/resize_nearest_neighbor.cc
-kernels/round.cc
-kernels/split.cc
-kernels/strided_slice.cc
-kernels/sub.cc
-kernels/svdf.cc
-kernels/tanh.cc
-kernels/unpack.cc
-''') + Glob('*.c') + Glob('*.cc') + Glob('benchmarks/*.cc') \
+    kernels/activations.cc
+    kernels/arg_min_max.cc
+    kernels/ceil.cc
+    kernels/circular_buffer.cc
+    kernels/comparisons.cc
+    kernels/concatenation.cc
+    kernels/dequantize.cc
+    kernels/elementwise.cc
+    kernels/ethosu.cc
+    kernels/floor.cc
+    kernels/hard_swish.cc
+    kernels/kernel_runner.cc
+    kernels/kernel_util.cc
+    kernels/l2norm.cc
+    kernels/logical.cc
+    kernels/logistic.cc
+    kernels/maximum_minimum.cc
+    kernels/neg.cc
+    kernels/pack.cc
+    kernels/pad.cc
+    kernels/prelu.cc
+    kernels/quantize.cc
+    kernels/reduce.cc
+    kernels/reshape.cc
+    kernels/resize_nearest_neighbor.cc
+    kernels/round.cc
+    kernels/split.cc
+    kernels/strided_slice.cc
+    kernels/sub.cc
+    kernels/svdf.cc
+    kernels/tanh.cc
+    kernels/unpack.cc''') + Glob('*.c') + Glob('*.cc') + Glob('benchmarks/*.cc') \
     + Glob('examples/micro_speech/*.cc') + Glob('examples/micro_speech/micro_features/*.cc') \
     + Glob('memory_planner/*.cc') + Glob('testing/*.cc')
 
@@ -48,6 +47,7 @@ if GetDepend(['PKG_USING_TENSORFLOWLITEMICRO_REFERENCE']):
     kernels/pooling.cc
     kernels/softmax.cc
     ''')
+
 if GetDepend(['PKG_USING_TENSORFLOWLITEMICRO_CMSISNN']):
     src += Split('''
     kernels/cmsis-nn/add.cc

examples/audio_main.cc examples/audio_example/audio_main.ccexamples/audio_main.cc renamed to examples/audio_example/audio_main.cc

@@ -33,11 +33,12 @@
 #include "cmsis/CMSIS/NN/Include/arm_nnsupportfunctions.h"
 
 // Work around for https://github.com/ARMmbed/mbed-os/issues/12568
-__STATIC_FORCEINLINE uint32_t __patched_SXTB16_RORn(uint32_t op1, uint32_t rotate) {
-  uint32_t result;
-  __ASM ("sxtb16 %0, %1, ROR %2" : "=r" (result) : "r" (op1), "i" (rotate) );
-  return result;
-}
+#define __patched_SXTB16_RORn(op1, rotate) \
+({ \
+  uint32_t result; \ 
+  __ASM ("sxtb16 %0, %1, ROR %2" : "=r" (result) : "r" (op1), "i" (rotate) ); \
+  result;\
+})
 
 /**
  * @ingroup groupSupport