Refactor CHW micro-kernels

Rename SpCHW -> CHW

PiperOrigin-RevId: 311861144
diff --git a/src/xnnpack/conv.h b/src/xnnpack/conv.h
index 892e12c..43b0cf9 100644
--- a/src/xnnpack/conv.h
+++ b/src/xnnpack/conv.h
@@ -43,7 +43,7 @@
 DECLARE_F32_CONV_HWC_UKERNEL_FUNCTION(xnn_f32_conv_hwc_ukernel_3x3s2p1c3x4__scalar_1x1)
 
 
-#define DECLARE_F32_CONV_HWC2SPCHW_UKERNEL_FUNCTION(fn_name) \
+#define DECLARE_F32_CONV_HWC2CHW_UKERNEL_FUNCTION(fn_name) \
   XNN_INTERNAL void fn_name(                                 \
       size_t input_height,                                   \
       size_t input_width,                                    \
@@ -59,8 +59,8 @@
       size_t output_channel_stride,                          \
       const union xnn_f32_minmax_params* params);
 
-DECLARE_F32_CONV_HWC2SPCHW_UKERNEL_FUNCTION(xnn_f32_conv_hwc2spchw_ukernel_3x3s2p1c3x4__neonfma_2x2)
-DECLARE_F32_CONV_HWC2SPCHW_UKERNEL_FUNCTION(xnn_f32_conv_hwc2spchw_ukernel_3x3s2p1c3x4__scalar_1x1)
+DECLARE_F32_CONV_HWC2CHW_UKERNEL_FUNCTION(xnn_f32_conv_hwc2chw_ukernel_3x3s2p1c3x4__neonfma_2x2)
+DECLARE_F32_CONV_HWC2CHW_UKERNEL_FUNCTION(xnn_f32_conv_hwc2chw_ukernel_3x3s2p1c3x4__scalar_1x1)
 
 
 #ifdef __cplusplus