commit d18cec33d0456619e2154afb2ae439ee7e685837
author Marat Dukhan <maratek@google.com> Mon May 18 01:29:29 2020 -0700
committer XNNPACK Team <xnnpack-github-robot@google.com> Mon May 18 01:30:04 2020 -0700
tree 136b9620af76534d391f48523154dfc3dc55d0e2
parent ce7a3f82b67ad61bd7e9d591bc10853d0cc00166

Add more missing "assembly: true" specifications

PiperOrigin-RevId: 312035281

test/f32-dwconv-minmax.cc

diff --git a/test/f32-dwconv-minmax.cc b/test/f32-dwconv-minmax.cc
index cae6fd8..6ed58f4 100644
--- a/test/f32-dwconv-minmax.cc
+++ b/test/f32-dwconv-minmax.cc
@@ -20,7 +20,7 @@
 #include "dwconv-microkernel-tester.h"
 
 
-#if XNN_ARCH_ARM64
+#if XNN_ARCH_ARM64 && XNN_ENABLE_ASSEMBLY
   TEST(F32_DWCONV_MINMAX_UP4X9__AARCH64_NEONFMA, c_eq_4) {
     TEST_REQUIRES_ARM_NEON_FMA;
     DWConvMicrokernelTester()
@@ -203,7 +203,7 @@
       }
     }
   }
-#endif  // XNN_ARCH_ARM64
+#endif  // XNN_ARCH_ARM64 && XNN_ENABLE_ASSEMBLY
 
 
 #if XNN_ARCH_ARM64 && XNN_ENABLE_ASSEMBLY

test/f32-dwconv-minmax.yaml

diff --git a/test/f32-dwconv-minmax.yaml b/test/f32-dwconv-minmax.yaml
index 6a07f58..eff738c 100644
--- a/test/f32-dwconv-minmax.yaml
+++ b/test/f32-dwconv-minmax.yaml
@@ -3,6 +3,7 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 - name: xnn_f32_dwconv_minmax_ukernel_up4x9__aarch64_neonfma
+  assembly: true
 - name: xnn_f32_dwconv_minmax_ukernel_up4x9__aarch64_neonfma_cortex_a55
   pipelined: true
   assembly: true

test/f32-igemm-minmax.cc

diff --git a/test/f32-igemm-minmax.cc b/test/f32-igemm-minmax.cc
index 0c02c0a..2154c1d 100644
--- a/test/f32-igemm-minmax.cc
+++ b/test/f32-igemm-minmax.cc
@@ -4482,7 +4482,7 @@
 #endif  // XNN_ARCH_ARM && XNN_ENABLE_ASSEMBLY
 
 
-#if XNN_ARCH_ARM
+#if XNN_ARCH_ARM && XNN_ENABLE_ASSEMBLY
   TEST(F32_IGEMM_MINMAX_4X8__AARCH32_NEON_PLD_CORTEX_A75, k_eq_4) {
     TEST_REQUIRES_ARM_NEON;
     GemmMicrokernelTester()
@@ -4978,10 +4978,10 @@
       .cm_stride(11)
       .Test(xnn_f32_igemm_minmax_ukernel_4x8__aarch32_neon_pld_cortex_a75);
   }
-#endif  // XNN_ARCH_ARM
+#endif  // XNN_ARCH_ARM && XNN_ENABLE_ASSEMBLY
 
 
-#if XNN_ARCH_ARM
+#if XNN_ARCH_ARM && XNN_ENABLE_ASSEMBLY
   TEST(F32_IGEMM_MINMAX_4X8__AARCH32_NEON_CORTEX_A53, k_eq_4) {
     TEST_REQUIRES_ARM_NEON;
     GemmMicrokernelTester()
@@ -5477,10 +5477,10 @@
       .cm_stride(11)
       .Test(xnn_f32_igemm_minmax_ukernel_4x8__aarch32_neon_cortex_a53);
   }
-#endif  // XNN_ARCH_ARM
+#endif  // XNN_ARCH_ARM && XNN_ENABLE_ASSEMBLY
 
 
-#if XNN_ARCH_ARM
+#if XNN_ARCH_ARM && XNN_ENABLE_ASSEMBLY
   TEST(F32_IGEMM_MINMAX_4X8__AARCH32_NEON_CORTEX_A55, k_eq_4) {
     TEST_REQUIRES_ARM_NEON;
     GemmMicrokernelTester()
@@ -5976,7 +5976,7 @@
       .cm_stride(11)
       .Test(xnn_f32_igemm_minmax_ukernel_4x8__aarch32_neon_cortex_a55);
   }
-#endif  // XNN_ARCH_ARM
+#endif  // XNN_ARCH_ARM && XNN_ENABLE_ASSEMBLY
 
 
 #if XNN_ARCH_ARM64 && XNN_ENABLE_ASSEMBLY

test/f32-igemm-minmax.yaml

diff --git a/test/f32-igemm-minmax.yaml b/test/f32-igemm-minmax.yaml
index 5696034..0453265 100644
--- a/test/f32-igemm-minmax.yaml
+++ b/test/f32-igemm-minmax.yaml
@@ -41,12 +41,15 @@
 - name: xnn_f32_igemm_minmax_ukernel_4x8__aarch32_neon_pld_cortex_a75
   k-block: 4
   pipelined: true
+  assembly: true
 - name: xnn_f32_igemm_minmax_ukernel_4x8__aarch32_neon_cortex_a53
   k-block: 4
   pipelined: true
+  assembly: true
 - name: xnn_f32_igemm_minmax_ukernel_4x8__aarch32_neon_cortex_a55
   k-block: 4
   pipelined: true
+  assembly: true
 - name: xnn_f32_igemm_minmax_ukernel_5x8__aarch64_neonfma_cortex_a57
   k-block: 8
   pipelined: true