commit efc47b8c72a6de830837dfd90cebb96a2ccc2ce3
author Marat Dukhan <maratek@google.com> Mon Nov 18 09:25:38 2019 -0800
committer XNNPACK Team <xnnpack-github-robot@google.com> Mon Nov 18 09:26:10 2019 -0800
tree 9be5efade034787625d109a7525bd7aaca945970
parent 1b0922923a7333ebb8671cc2829241b58c9b394b

Unify operator implementations filenames and tests

- Always include layout in operator name
- Standardize layout names
- Prepare for greater variability in supported layouts
- Merge testers for different layouts of the same operator

PiperOrigin-RevId: 281084963

src/init.c

diff --git a/src/init.c b/src/init.c
index 72fecb9..bec4f39 100644
--- a/src/init.c
+++ b/src/init.c
@@ -480,7 +480,7 @@
       .channel_tile = 4,
       .row_tile = 2,
     };
-    #ifndef XNN_NO_SPNCHW_OPERATORS
+    #ifndef XNN_NO_NCHW_OPERATORS
       xnn_params.f32.spmm = (struct spmm_parameters) {
         .ukernel = (xnn_spmm_ukernel_function) xnn_f32_spmm_ukernel_16x1__neonfma_pipelined,
         .mr = 16,
@@ -531,7 +531,7 @@
         .ukernel = (xnn_gavgpool_spchw_ukernel_function) xnn_f32_gavgpool_spchw_ukernel__neon_x4,
         .channel_tile = 4,
       };
-    #endif  // XNN_NO_SPNCHW_OPERATORS
+    #endif  // XNN_NO_NCHW_OPERATORS
   #endif  // XNN_NO_F32_OPERATORS
 
   /**************************** X32 micro-kernels ****************************/
@@ -697,7 +697,7 @@
       .channel_tile = 4,
       .row_tile = 2,
     };
-    #ifndef XNN_NO_SPNCHW_OPERATORS
+    #ifndef XNN_NO_NCHW_OPERATORS
       xnn_params.f32.spmm = (struct spmm_parameters) {
         .ukernel = (xnn_spmm_ukernel_function) xnn_f32_spmm_ukernel_4x1__sse,
         .mr = 4,
@@ -719,7 +719,7 @@
         .ukernel = (xnn_gavgpool_spchw_ukernel_function) xnn_f32_gavgpool_spchw_ukernel__sse_x4,
         .channel_tile = 4,
       };
-    #endif  // XNN_NO_SPNCHW_OPERATORS
+    #endif  // XNN_NO_NCHW_OPERATORS
   #endif  // XNN_NO_F32_OPERATORS
 
   /**************************** X32 micro-kernels ****************************/
@@ -1074,7 +1074,7 @@
       .channel_tile = 1,
       .row_tile = 2,
     };
-    #ifndef XNN_NO_SPNCHW_OPERATORS
+    #ifndef XNN_NO_NCHW_OPERATORS
       xnn_params.f32.spmm = (struct spmm_parameters) {
         .ukernel = (xnn_spmm_ukernel_function) xnn_f32_spmm_ukernel_8x1__scalar,
         .mr = 8,
@@ -1125,7 +1125,7 @@
         .ukernel = (xnn_gavgpool_spchw_ukernel_function) xnn_f32_gavgpool_spchw_ukernel__scalar_x1,
         .channel_tile = 1,
       };
-    #endif  // XNN_NO_SPNCHW_OPERATORS
+    #endif  // XNN_NO_NCHW_OPERATORS
   #endif  // XNN_NO_F32_OPERATORS
 
   /**************************** X32 micro-kernels ****************************/