Remove explicit assembly and arch attributes from YAML test specifica…

…tions - Detect assembly microkernels from "asm" in the names - Detect aarch64-only microkernels from "aarch64" in the names PiperOrigin-RevId: 493807199
google · Dec 8, 2022 · 5cbc402 · 5cbc402
1 parent e7e5c65
commit 5cbc402
Show file tree

Hide file tree

Showing 75 changed files with 78 additions and 746 deletions.
diff --git a/test/bf16-gemm-minmax.yaml b/test/bf16-gemm-minmax.yaml
@@ -23,28 +23,18 @@
 - name: xnn_bf16_gemm_minmax_ukernel_1x4c8__aarch64_neonfma_zip
   init: xnn_init_bf16_minmax_scalar_params
   k-block: 8
-  arch:
-    - aarch64
 - name: xnn_bf16_gemm_minmax_ukernel_2x4c8__aarch64_neonfma_zip
   init: xnn_init_bf16_minmax_scalar_params
   k-block: 8
-  arch:
-    - aarch64
 - name: xnn_bf16_gemm_minmax_ukernel_3x4c8__aarch64_neonfma_zip
   init: xnn_init_bf16_minmax_scalar_params
   k-block: 8
-  arch:
-    - aarch64
 - name: xnn_bf16_gemm_minmax_ukernel_4x4c8__aarch64_neonfma_zip
   init: xnn_init_bf16_minmax_scalar_params
   k-block: 8
-  arch:
-    - aarch64
 - name: xnn_bf16_gemm_minmax_ukernel_5x4c8__aarch64_neonfma_zip
   init: xnn_init_bf16_minmax_scalar_params
   k-block: 8
-  arch:
-    - aarch64
 
 - name: xnn_bf16_gemm_minmax_ukernel_1x8c2__neonbf16_bfdot_lane_ld128
   init: xnn_init_bf16_minmax_scalar_params

diff --git a/test/cs16-bfly4.cc b/test/cs16-bfly4.cc
@@ -17,7 +17,7 @@
 #include "bfly4-microkernel-tester.h"
 
 
-#if XNN_ARCH_ARM
+#if XNN_ARCH_ARM && XNN_ENABLE_ASSEMBLY
 
   TEST(CS16_BFLY4_SAMPLES1__ASM_AARCH32_NEON_X1, samples_eq_1) {
     TEST_REQUIRES_ARM_NEON;
@@ -47,10 +47,10 @@
         .Test(xnn_cs16_bfly4_samples1_ukernel__asm_aarch32_neon_x1);
     }
   }
-#endif  // XNN_ARCH_ARM
+#endif  // XNN_ARCH_ARM && XNN_ENABLE_ASSEMBLY
 
 
-#if XNN_ARCH_ARM
+#if XNN_ARCH_ARM && XNN_ENABLE_ASSEMBLY
 
   TEST(CS16_BFLY4_SAMPLES1__ASM_AARCH32_NEON_X2, samples_eq_1) {
     TEST_REQUIRES_ARM_NEON;
@@ -80,10 +80,10 @@
         .Test(xnn_cs16_bfly4_samples1_ukernel__asm_aarch32_neon_x2);
     }
   }
-#endif  // XNN_ARCH_ARM
+#endif  // XNN_ARCH_ARM && XNN_ENABLE_ASSEMBLY
 
 
-#if XNN_ARCH_ARM
+#if XNN_ARCH_ARM && XNN_ENABLE_ASSEMBLY
 
   TEST(CS16_BFLY4_SAMPLES1__ASM_AARCH32_NEON_X4, samples_eq_1) {
     TEST_REQUIRES_ARM_NEON;
@@ -113,7 +113,7 @@
         .Test(xnn_cs16_bfly4_samples1_ukernel__asm_aarch32_neon_x4);
     }
   }
-#endif  // XNN_ARCH_ARM
+#endif  // XNN_ARCH_ARM && XNN_ENABLE_ASSEMBLY
 
 
 #if XNN_ARCH_ARM || XNN_ARCH_ARM64

diff --git a/test/cs16-bfly4.yaml b/test/cs16-bfly4.yaml
@@ -6,11 +6,8 @@
 
 # NEON
 - name: xnn_cs16_bfly4_samples1_ukernel__asm_aarch32_neon_x1
-  assembly: true
 - name: xnn_cs16_bfly4_samples1_ukernel__asm_aarch32_neon_x2
-  assembly: true
 - name: xnn_cs16_bfly4_samples1_ukernel__asm_aarch32_neon_x4
-  assembly: true
 - name: xnn_cs16_bfly4_samples1_ukernel__neon
 - name: xnn_cs16_bfly4_samples4_ukernel__neon
 - name: xnn_cs16_bfly4_ukernel__neon_x1

diff --git a/test/cs16-fftr.cc b/test/cs16-fftr.cc
@@ -17,24 +17,24 @@
 #include "fftr-microkernel-tester.h"
 
 
-#if XNN_ARCH_ARM
+#if XNN_ARCH_ARM && XNN_ENABLE_ASSEMBLY
   TEST(CS16_FFTR__ASM_AARCH32_NEON_X1, samples_eq_256) {
     TEST_REQUIRES_ARM_NEON;
     FftrMicrokernelTester()
       .samples(256)
       .Test(xnn_cs16_fftr_ukernel__asm_aarch32_neon_x1);
   }
-#endif  // XNN_ARCH_ARM
+#endif  // XNN_ARCH_ARM && XNN_ENABLE_ASSEMBLY
 
 
-#if XNN_ARCH_ARM
+#if XNN_ARCH_ARM && XNN_ENABLE_ASSEMBLY
   TEST(CS16_FFTR__ASM_AARCH32_NEON_X4, samples_eq_256) {
     TEST_REQUIRES_ARM_NEON;
     FftrMicrokernelTester()
       .samples(256)
       .Test(xnn_cs16_fftr_ukernel__asm_aarch32_neon_x4);
   }
-#endif  // XNN_ARCH_ARM
+#endif  // XNN_ARCH_ARM && XNN_ENABLE_ASSEMBLY
 
 
 #if XNN_ARCH_ARM || XNN_ARCH_ARM64

diff --git a/test/cs16-fftr.yaml b/test/cs16-fftr.yaml
@@ -6,9 +6,7 @@
 
 # NEON
 - name: xnn_cs16_fftr_ukernel__asm_aarch32_neon_x1
-  assembly: true
 - name: xnn_cs16_fftr_ukernel__asm_aarch32_neon_x4
-  assembly: true
 - name: xnn_cs16_fftr_ukernel__neon_x4
 
 # Scalar

diff --git a/test/f16-gemm-minmax.yaml b/test/f16-gemm-minmax.yaml
@@ -7,55 +7,42 @@
 - name: xnn_f16_gemm_minmax_ukernel_1x8__asm_aarch64_neonfp16arith_ld64
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 4
-  assembly: true
 - name: xnn_f16_gemm_minmax_ukernel_1x16__asm_aarch64_neonfp16arith_ld32
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 2
-  assembly: true
 - name: xnn_f16_gemm_minmax_ukernel_1x16__asm_aarch64_neonfp16arith_ld64
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 4
-  assembly: true
 - name: xnn_f16_gemm_minmax_ukernel_4x8__asm_aarch64_neonfp16arith_ld64
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 4
-  assembly: true
 - name: xnn_f16_gemm_minmax_ukernel_4x16__asm_aarch64_neonfp16arith_ld32
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 2
-  assembly: true
 - name: xnn_f16_gemm_minmax_ukernel_4x16__asm_aarch64_neonfp16arith_ld64
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 4
-  assembly: true
 - name: xnn_f16_gemm_minmax_ukernel_6x8__asm_aarch64_neonfp16arith_ld64
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 4
-  assembly: true
 - name: xnn_f16_gemm_minmax_ukernel_6x16__asm_aarch64_neonfp16arith_cortex_a55
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 4
-  assembly: true
 - name: xnn_f16_gemm_minmax_ukernel_6x16__asm_aarch64_neonfp16arith_cortex_a55r0
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 4
-  assembly: true
 - name: xnn_f16_gemm_minmax_ukernel_6x16__asm_aarch64_neonfp16arith_cortex_a75
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 4
-  assembly: true
 - name: xnn_f16_gemm_minmax_ukernel_6x16__asm_aarch64_neonfp16arith_ld32
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 2
-  assembly: true
 - name: xnn_f16_gemm_minmax_ukernel_6x16__asm_aarch64_neonfp16arith_ld64
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 4
-  assembly: true
 - name: xnn_f16_gemm_minmax_ukernel_8x8__asm_aarch64_neonfp16arith_ld64
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 4
-  assembly: true
 
 # ARM NEON+FP16ARITH
 - name: xnn_f16_gemm_minmax_ukernel_1x8__neonfp16arith_ld64

diff --git a/test/f16-igemm-minmax.yaml b/test/f16-igemm-minmax.yaml
@@ -7,39 +7,30 @@
 - name: xnn_f16_igemm_minmax_ukernel_1x16__asm_aarch64_neonfp16arith_ld32
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 2
-  assembly: true
 - name: xnn_f16_igemm_minmax_ukernel_1x16__asm_aarch64_neonfp16arith_ld64
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 4
-  assembly: true
 - name: xnn_f16_igemm_minmax_ukernel_4x16__asm_aarch64_neonfp16arith_ld32
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 2
-  assembly: true
 - name: xnn_f16_igemm_minmax_ukernel_4x16__asm_aarch64_neonfp16arith_ld64
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 4
-  assembly: true
 - name: xnn_f16_igemm_minmax_ukernel_6x16__asm_aarch64_neonfp16arith_cortex_a55
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 2
-  assembly: true
 - name: xnn_f16_igemm_minmax_ukernel_6x16__asm_aarch64_neonfp16arith_cortex_a55r0
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 4
-  assembly: true
 - name: xnn_f16_igemm_minmax_ukernel_6x16__asm_aarch64_neonfp16arith_cortex_a75
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 4
-  assembly: true
 - name: xnn_f16_igemm_minmax_ukernel_6x16__asm_aarch64_neonfp16arith_ld32
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 2
-  assembly: true
 - name: xnn_f16_igemm_minmax_ukernel_6x16__asm_aarch64_neonfp16arith_ld64
   init: xnn_init_f16_minmax_fp16arith_params
   k-block: 4
-  assembly: true
 
 # ARM NEON+FP16ARITH
 - name: xnn_f16_igemm_minmax_ukernel_1x8__neonfp16arith_ld64

diff --git a/test/f16-vdiv-minmax.yaml b/test/f16-vdiv-minmax.yaml
@@ -6,12 +6,8 @@
 # ARM NEON+FP16ARITH
 - name: xnn_f16_vdiv_minmax_ukernel__aarch64_neonfp16arith_x8
   init: xnn_init_f16_minmax_fp16arith_params
-  arch:
-  - aarch64
 - name: xnn_f16_vdiv_minmax_ukernel__aarch64_neonfp16arith_x16
   init: xnn_init_f16_minmax_fp16arith_params
-  arch:
-  - aarch64
 
 # ARM FP16ARITH
 - name: xnn_f16_vdiv_minmax_ukernel__fp16arith_x1

diff --git a/test/f16-vdivc-minmax.yaml b/test/f16-vdivc-minmax.yaml
@@ -6,12 +6,8 @@
 # ARM NEON+FP16ARITH
 - name: xnn_f16_vdivc_minmax_ukernel__aarch64_neonfp16arith_x8
   init: xnn_init_f16_minmax_fp16arith_params
-  arch:
-  - aarch64
 - name: xnn_f16_vdivc_minmax_ukernel__aarch64_neonfp16arith_x16
   init: xnn_init_f16_minmax_fp16arith_params
-  arch:
-  - aarch64
 
 # ARM FP16ARITH
 - name: xnn_f16_vdivc_minmax_ukernel__fp16arith_x1

diff --git a/test/f16-vrdivc-minmax.yaml b/test/f16-vrdivc-minmax.yaml
@@ -6,12 +6,8 @@
 # ARM NEON+FP16ARITH
 - name: xnn_f16_vrdivc_minmax_ukernel__aarch64_neonfp16arith_x8
   init: xnn_init_f16_minmax_fp16arith_params
-  arch:
-  - aarch64
 - name: xnn_f16_vrdivc_minmax_ukernel__aarch64_neonfp16arith_x16
   init: xnn_init_f16_minmax_fp16arith_params
-  arch:
-  - aarch64
 
 # ARM NEON+FP16ARITH
 - name: xnn_f16_vrdivc_minmax_ukernel__fp16arith_x1

diff --git a/test/f16-vsigmoid.yaml b/test/f16-vsigmoid.yaml
@@ -6,36 +6,20 @@
 # ARM NEON+FP16ARITH
 - name: xnn_f16_vsigmoid_ukernel__aarch64_neonfp16arith_rr2_p2_div_x8
   init: xnn_init_f16_sigmoid_fp16arith_rr2_p2_params
-  arch:
-  - aarch64
 - name: xnn_f16_vsigmoid_ukernel__aarch64_neonfp16arith_rr2_p2_div_x16
   init: xnn_init_f16_sigmoid_fp16arith_rr2_p2_params
-  arch:
-  - aarch64
 - name: xnn_f16_vsigmoid_ukernel__aarch64_neonfp16arith_rr2_p2_div_x24
   init: xnn_init_f16_sigmoid_fp16arith_rr2_p2_params
-  arch:
-  - aarch64
 - name: xnn_f16_vsigmoid_ukernel__aarch64_neonfp16arith_rr2_p2_div_x32
   init: xnn_init_f16_sigmoid_fp16arith_rr2_p2_params
-  arch:
-  - aarch64
 - name: xnn_f16_vsigmoid_ukernel__aarch64_neonfp16arith_rr2_p2_div_x40
   init: xnn_init_f16_sigmoid_fp16arith_rr2_p2_params
-  arch:
-  - aarch64
 - name: xnn_f16_vsigmoid_ukernel__aarch64_neonfp16arith_rr2_p2_div_x48
   init: xnn_init_f16_sigmoid_fp16arith_rr2_p2_params
-  arch:
-  - aarch64
 - name: xnn_f16_vsigmoid_ukernel__aarch64_neonfp16arith_rr2_p2_div_x56
   init: xnn_init_f16_sigmoid_fp16arith_rr2_p2_params
-  arch:
-  - aarch64
 - name: xnn_f16_vsigmoid_ukernel__aarch64_neonfp16arith_rr2_p2_div_x64
   init: xnn_init_f16_sigmoid_fp16arith_rr2_p2_params
-  arch:
-  - aarch64
 - name: xnn_f16_vsigmoid_ukernel__neonfp16arith_rr2_p2_nr1fma_x8
   init: xnn_init_f16_sigmoid_fp16arith_rr2_p2_params
 - name: xnn_f16_vsigmoid_ukernel__neonfp16arith_rr2_p2_nr1fma_x16

diff --git a/test/f16-vsqrt.yaml b/test/f16-vsqrt.yaml
@@ -5,11 +5,7 @@
 
 # ARM NEON+FP16ARITH: hardware square root
 - name: xnn_f16_vsqrt_ukernel__aarch64_neonfp16arith_sqrt_x8
-  arch:
-  - aarch64
 - name: xnn_f16_vsqrt_ukernel__aarch64_neonfp16arith_sqrt_x16
-  arch:
-  - aarch64
 
 # ARM NEON+FP16ARITH: Newton-Raphson algorithm
 - name: xnn_f16_vsqrt_ukernel__neonfp16arith_nr1fma1adj_x8

diff --git a/test/f32-dwconv-unipass-minmax.yaml b/test/f32-dwconv-unipass-minmax.yaml
@@ -6,11 +6,9 @@
 # AArch64 assembly
 - name: xnn_f32_dwconv_minmax_ukernel_9p4c__asm_aarch64_neonfma
   init: xnn_init_f32_minmax_scalar_params
-  assembly: true
 - name: xnn_f32_dwconv_minmax_ukernel_9p4c__asm_aarch64_neonfma_cortex_a55
   init: xnn_init_f32_minmax_scalar_params
   pipelined: true
-  assembly: true
 # ARM NEON
 - name: xnn_f32_dwconv_minmax_ukernel_3p4c__neon
   init: xnn_init_f32_minmax_scalar_params