Merge pull request #111 from foss-for-synopsys-dwc-arc-processors/rename_hwc

Rename hwc to hwcn and nhwc (for sa8 datatype)

Author: JaccovG

include/api/mli_kernels_api.h

@@ -112,21 +112,21 @@ mli_status mli_krn_conv2d_hwc_fx8w16d(
         const mli_conv2d_cfg * cfg,
         mli_tensor * out);
 
-mli_status mli_krn_conv2d_hwc_sa8_sa8_sa32(
+mli_status mli_krn_conv2d_nhwc_sa8_sa8_sa32(
         const mli_tensor * in,
         const mli_tensor * weights,
         const mli_tensor * bias,
         const mli_conv2d_cfg * cfg,
         mli_tensor * out);
 
-mli_status mli_krn_conv2d_hwc_sa8_sa8_sa32_generic(
+mli_status mli_krn_conv2d_nhwc_sa8_sa8_sa32_generic(
         const mli_tensor * in,
         const mli_tensor * weights,
         const mli_tensor * bias,
         const mli_conv2d_cfg * cfg,
         mli_tensor * out);
 
-char * mli_debug_krn_conv2d_hwc_sa8_sa8_sa32(
+char * mli_debug_krn_conv2d_nhwc_sa8_sa8_sa32(
         const mli_tensor * in, 
         const mli_tensor * weights, 
         const mli_tensor * bias, 
@@ -177,7 +177,7 @@ mli_status mli_krn_depthwise_conv2d_chw_fx8w16d(
         const mli_tensor * bias,
         const mli_conv2d_cfg * cfg,
         mli_tensor * out);
-mli_status mli_krn_depthwise_conv2d_hwc_sa8_sa8_sa32(
+mli_status mli_krn_depthwise_conv2d_hwcn_sa8_sa8_sa32(
         const mli_tensor * in,
         const mli_tensor * weights,
         const mli_tensor * bias,
@@ -198,14 +198,14 @@ mli_status mli_krn_depthwise_conv2d_chw_fx16_generic(
         const mli_conv2d_cfg * cfg,
         mli_tensor * out);
 
-mli_status mli_krn_depthwise_conv2d_hwc_sa8_sa8_sa32_generic(
+mli_status mli_krn_depthwise_conv2d_hwcn_sa8_sa8_sa32_generic(
         const mli_tensor * in,
         const mli_tensor * weights,
         const mli_tensor * bias,
         const mli_conv2d_cfg * cfg,
         mli_tensor * out);
 
-char * mli_debug_krn_depthwise_conv2d_hwc_sa8_sa8_sa32(
+char * mli_debug_krn_depthwise_conv2d_hwcn_sa8_sa8_sa32(
         const mli_tensor * in, 
         const mli_tensor * weights, 
         const mli_tensor * bias, 

include/api/mli_krn_conv2d_spec_api.h

@@ -772,49 +772,49 @@ mli_status mli_krn_conv2d_chw_fx8w16d_generic(
         const mli_conv2d_cfg * cfg, 
         mli_tensor * out);
 
-char * mli_debug_krn_conv2d_hwc_sa8_sa8_sa32(
+char * mli_debug_krn_conv2d_nhwc_sa8_sa8_sa32(
         const mli_tensor * in, 
         const mli_tensor * weights, 
         const mli_tensor * bias, 
         const mli_conv2d_cfg * cfg, 
         mli_tensor * out);
 
-mli_status mli_krn_conv2d_hwc_sa8_sa8_sa32_k3x3_krnpad(
+mli_status mli_krn_conv2d_nhwc_sa8_sa8_sa32_k3x3_krnpad(
         const mli_tensor * in, 
         const mli_tensor * weights, 
         const mli_tensor * bias, 
         const mli_conv2d_cfg * cfg, 
         mli_tensor * out);
 
-mli_status mli_krn_conv2d_hwc_sa8_sa8_sa32_k5x5_krnpad(
+mli_status mli_krn_conv2d_nhwc_sa8_sa8_sa32_k5x5_krnpad(
         const mli_tensor * in, 
         const mli_tensor * weights, 
         const mli_tensor * bias, 
         const mli_conv2d_cfg * cfg, 
         mli_tensor * out);
 
-mli_status mli_krn_conv2d_hwc_sa8_sa8_sa32_k3x3_nopad(
+mli_status mli_krn_conv2d_nhwc_sa8_sa8_sa32_k3x3_nopad(
         const mli_tensor * in, 
         const mli_tensor * weights, 
         const mli_tensor * bias, 
         const mli_conv2d_cfg * cfg, 
         mli_tensor * out);
 
-mli_status mli_krn_conv2d_hwc_sa8_sa8_sa32_k5x5_nopad(
+mli_status mli_krn_conv2d_nhwc_sa8_sa8_sa32_k5x5_nopad(
         const mli_tensor * in, 
         const mli_tensor * weights, 
         const mli_tensor * bias, 
         const mli_conv2d_cfg * cfg, 
         mli_tensor * out);
 
-mli_status mli_krn_conv2d_hwc_sa8_sa8_sa32_k1x1_nopad(
+mli_status mli_krn_conv2d_nhwc_sa8_sa8_sa32_k1x1_nopad(
         const mli_tensor * in, 
         const mli_tensor * weights, 
         const mli_tensor * bias, 
         const mli_conv2d_cfg * cfg, 
         mli_tensor * out);
 
-mli_status mli_krn_conv2d_hwc_sa8_sa8_sa32_generic(
+mli_status mli_krn_conv2d_nhwc_sa8_sa8_sa32_generic(
         const mli_tensor * in, 
         const mli_tensor * weights, 
         const mli_tensor * bias, 

include/api/mli_krn_depthwise_conv2d_spec_api.h

@@ -737,42 +737,42 @@ mli_status mli_krn_depthwise_conv2d_chw_fx8w16d_generic(
         const mli_conv2d_cfg * cfg, 
         mli_tensor * out);
 
-char * mli_debug_krn_depthwise_conv2d_hwc_sa8_sa8_sa32(
+char * mli_debug_krn_depthwise_conv2d_hwcn_sa8_sa8_sa32(
         const mli_tensor * in, 
         const mli_tensor * weights, 
         const mli_tensor * bias, 
         const mli_conv2d_cfg * cfg, 
         mli_tensor * out);
 
-mli_status mli_krn_depthwise_conv2d_hwc_sa8_sa8_sa32_k3x3_krnpad(
+mli_status mli_krn_depthwise_conv2d_hwcn_sa8_sa8_sa32_k3x3_krnpad(
         const mli_tensor * in, 
         const mli_tensor * weights, 
         const mli_tensor * bias, 
         const mli_conv2d_cfg * cfg, 
         mli_tensor * out);
 
-mli_status mli_krn_depthwise_conv2d_hwc_sa8_sa8_sa32_k5x5_krnpad(
+mli_status mli_krn_depthwise_conv2d_hwcn_sa8_sa8_sa32_k5x5_krnpad(
         const mli_tensor * in, 
         const mli_tensor * weights, 
         const mli_tensor * bias, 
         const mli_conv2d_cfg * cfg, 
         mli_tensor * out);
 
-mli_status mli_krn_depthwise_conv2d_hwc_sa8_sa8_sa32_k3x3_nopad(
+mli_status mli_krn_depthwise_conv2d_hwcn_sa8_sa8_sa32_k3x3_nopad(
         const mli_tensor * in, 
         const mli_tensor * weights, 
         const mli_tensor * bias, 
         const mli_conv2d_cfg * cfg, 
         mli_tensor * out);
 
-mli_status mli_krn_depthwise_conv2d_hwc_sa8_sa8_sa32_k5x5_nopad(
+mli_status mli_krn_depthwise_conv2d_hwcn_sa8_sa8_sa32_k5x5_nopad(
         const mli_tensor * in, 
         const mli_tensor * weights, 
         const mli_tensor * bias, 
         const mli_conv2d_cfg * cfg, 
         mli_tensor * out);
 
-mli_status mli_krn_depthwise_conv2d_hwc_sa8_sa8_sa32_generic(
+mli_status mli_krn_depthwise_conv2d_hwcn_sa8_sa8_sa32_generic(
         const mli_tensor * in, 
         const mli_tensor * weights, 
         const mli_tensor * bias, 

lib/gen/mli_krn_conv2d_gen.py

@@ -22,7 +22,7 @@
 # fill the basic information
 #------------------------------------------------------------
 func_body_template_file_chw = "mli_krn_conv2d_chw_func_body.txt"
-func_body_template_file_hwc = "mli_krn_conv2d_hwc_func_body.txt"
+func_body_template_file_hwc = "mli_krn_conv2d_nhwc_func_body.txt"
 file_template = "filetemplate.txt"
 file_header_template = "header_filetemplate.txt"
 function_group = "Convolution 2d"
@@ -31,10 +31,10 @@
 output_file_chw_fx16         = "..\..\lib\src\kernels\convolution\mli_krn_conv2d_chw_fx16.cc"
 output_file_chw_fx8          = "..\..\lib\src\kernels\convolution\mli_krn_conv2d_chw_fx8.cc"
 output_file_chw_fx8w16d      = "..\..\lib\src\kernels\convolution\mli_krn_conv2d_chw_fx8w16d.cc"
-output_file_hwc_sa8_sa8_sa32 = "..\..\lib\src\kernels\convolution\mli_krn_conv2d_hwc_sa8_sa8_sa32.cc"
+output_file_nhwc_sa8_sa8_sa32 = "..\..\lib\src\kernels\convolution\mli_krn_conv2d_nhwc_sa8_sa8_sa32.cc"
 
 f_list_chw_fx16 = []
-f_list_hwc_sa8 = []
+f_list_nhwc_sa8 = []
 f_args = [("const mli_tensor *", "in"),
           ("const mli_tensor *", "weights"),
           ("const mli_tensor *", "bias"),
@@ -235,29 +235,29 @@
 # Create a list of specialization functions for SA8 SA8 SA32
 #------------------------------------------------------------
 
-fbase = ("krn", "conv2d", "hwc", "sa8_sa8_sa32", f_args)
+fbase = ("krn", "conv2d", "nhwc", "sa8_sa8_sa32", f_args)
 
-corefunc = "convolution2D_hwc_krnpad"
+corefunc = "convolution2D_nhwc_krnpad"
 stride = 0
 kernel_range = range(3, 6, 2)
 ch = 0
-f_list_hwc_sa8.extend([Func(fbase, k, k, ch, stride, stride, corefunc, "krnpad") for k in kernel_range])
+f_list_nhwc_sa8.extend([Func(fbase, k, k, ch, stride, stride, corefunc, "krnpad") for k in kernel_range])
 
-corefunc = "convolution2D_hwc_nopad"
+corefunc = "convolution2D_nhwc_nopad"
 stride = 0
 kernel_range = range(3, 6, 2)
 ch = 0
-f_list_hwc_sa8.extend([Func(fbase, k, k, ch, stride, stride, corefunc, "nopad") for k in kernel_range])
+f_list_nhwc_sa8.extend([Func(fbase, k, k, ch, stride, stride, corefunc, "nopad") for k in kernel_range])
 
-corefunc = "pointwise_convolution2D_hwc_nopad"
+corefunc = "pointwise_convolution2D_nhwc_nopad"
 stride = 0
 k = 1
 ch = 0
-f_list_hwc_sa8.extend([Func(fbase, k, k, ch, stride, stride, corefunc, "nopad")])
+f_list_nhwc_sa8.extend([Func(fbase, k, k, ch, stride, stride, corefunc, "nopad")])
 
-corefunc = "convolution2D_hwc_krnpad"
+corefunc = "convolution2D_nhwc_krnpad"
 default_func_hwc = Func(fbase, 0, 0, 0, 0, 0, corefunc, generic=True)
-f_list_hwc_sa8.append(default_func_hwc)
+f_list_nhwc_sa8.append(default_func_hwc)
 
 #------------------------------------------------------------
 # Generate the HWC output file
@@ -275,8 +275,8 @@
 
 if "sa8_sa8_sa32" in sys.argv or no_args:
     #Create SA8 HWC C output file
-    f = open(output_file_hwc_sa8_sa8_sa32, "wb")
-    f.write(c.print_file(f_list_hwc_sa8, default_func_hwc, func_body_template_file_hwc, file_template, include_list_hwc, define_list))
+    f = open(output_file_nhwc_sa8_sa8_sa32, "wb")
+    f.write(c.print_file(f_list_nhwc_sa8, default_func_hwc, func_body_template_file_hwc, file_template, include_list_hwc, define_list))
     f.close()
 
 
@@ -285,6 +285,6 @@
 #------------------------------------------------------------
 if "header" in sys.argv or no_args:
     fh = open(output_header_file, "wb")
-    fh.write(c.print_proto_file([f_list_chw_fx16, f_list_chw_fx8, f_list_chw_fx8w16d, f_list_hwc_sa8], function_group, capital_header_file_name, file_header_template))
+    fh.write(c.print_proto_file([f_list_chw_fx16, f_list_chw_fx8, f_list_chw_fx8w16d, f_list_nhwc_sa8], function_group, capital_header_file_name, file_header_template))
     fh.close()
 

lib/gen/mli_krn_conv2d_hwc_func_body.txt renamed to lib/gen/mli_krn_conv2d_nhwc_func_body.txt

@@ -1,4 +1,4 @@
-    mli_status ret = MLI_CHECK_STATUS(mli_chk_conv2d_hwc_$datatype(in, weights, bias, cfg, out), __func__);
+    mli_status ret = MLI_CHECK_STATUS(mli_chk_conv2d_nhwc_$datatype(in, weights, bias, cfg, out), __func__);
     if (ret != MLI_STATUS_OK)
         return ret;
 

lib/gen/mli_krn_depthwise_conv2d_gen.py

@@ -22,7 +22,7 @@
 # fill the basic information
 #------------------------------------------------------------
 func_body_template_file_chw = "mli_krn_depthwise_conv2d_chw_func_body.txt"
-func_body_template_file_hwc = "mli_krn_depthwise_conv2d_hwc_func_body.txt"
+func_body_template_file_hwc = "mli_krn_depthwise_conv2d_hwcn_func_body.txt"
 file_template = "filetemplate.txt"
 file_header_template = "header_filetemplate.txt"
 function_group = "Depthwise convolution 2d"
@@ -31,12 +31,12 @@
 output_file_chw_fx16 = "..\..\lib\src\kernels\convolution\mli_krn_depthwise_conv2d_chw_fx16.cc"
 output_file_chw_fx8 = "..\..\lib\src\kernels\convolution\mli_krn_depthwise_conv2d_chw_fx8.cc"
 output_file_chw_fx8w16d = "..\..\lib\src\kernels\convolution\mli_krn_depthwise_conv2d_chw_fx8w16d.cc"
-output_file_hwc_sa8 = "..\..\lib\src\kernels\convolution\mli_krn_depthwise_conv2d_hwc_sa8_sa8_sa32.cc"
+output_file_hwcn_sa8 = "..\..\lib\src\kernels\convolution\mli_krn_depthwise_conv2d_hwcn_sa8_sa8_sa32.cc"
 
 f_list_chw_fx16 = []
 f_list_chw_fx8 = []
 f_list_chw_fx8w16d = []
-f_list_hwc_sa8 = []
+f_list_hwcn_sa8 = []
 
 f_args = [("const mli_tensor *", "in"),
           ("const mli_tensor *", "weights"),
@@ -170,23 +170,23 @@
 # Create a list of specialization functions for SA8 SA8 SA32
 #------------------------------------------------------------
 
-fbase = ("krn", "depthwise_conv2d", "hwc", "sa8_sa8_sa32", f_args)
+fbase = ("krn", "depthwise_conv2d", "hwcn", "sa8_sa8_sa32", f_args)
 
-corefunc = "depthwise_convolution2D_hwc_krnpad"
+corefunc = "depthwise_convolution2D_hwcn_krnpad"
 stride = 0
 kernel_range = range(3, 6, 2)
 ch = 0
-f_list_hwc_sa8.extend([Func(fbase, k, k, ch, stride, stride, corefunc, "krnpad") for k in kernel_range])
+f_list_hwcn_sa8.extend([Func(fbase, k, k, ch, stride, stride, corefunc, "krnpad") for k in kernel_range])
 
-corefunc = "depthwise_convolution2D_hwc_nopad"
+corefunc = "depthwise_convolution2D_hwcn_nopad"
 stride = 0
 kernel_range = range(3, 6, 2)
 ch = 0
-f_list_hwc_sa8.extend([Func(fbase, k, k, ch, stride, stride, corefunc, "nopad") for k in kernel_range])
+f_list_hwcn_sa8.extend([Func(fbase, k, k, ch, stride, stride, corefunc, "nopad") for k in kernel_range])
 
-corefunc = "depthwise_convolution2D_hwc_krnpad"
+corefunc = "depthwise_convolution2D_hwcn_krnpad"
 default_func_hwc = Func(fbase, 0, 0, 0, 0, 0, corefunc, generic=True)
-f_list_hwc_sa8.append(default_func_hwc)
+f_list_hwcn_sa8.append(default_func_hwc)
 
 #------------------------------------------------------------
 # Generate the HWC output file
@@ -202,8 +202,8 @@
 
 if "sa8_sa8_sa32" in sys.argv or no_args:
     #Create SA8 HWC C output file
-    f = open(output_file_hwc_sa8, "wb")
-    f.write(c.print_file(f_list_hwc_sa8, default_func_hwc, func_body_template_file_hwc, file_template, include_list_hwc, define_list))
+    f = open(output_file_hwcn_sa8, "wb")
+    f.write(c.print_file(f_list_hwcn_sa8, default_func_hwc, func_body_template_file_hwc, file_template, include_list_hwc, define_list))
     f.close()
 
 
@@ -212,6 +212,6 @@
 #------------------------------------------------------------
 if "header" in sys.argv or no_args:
     fh = open(output_header_file, "wb")
-    fh.write(c.print_proto_file([f_list_chw_fx16,f_list_chw_fx8,f_list_chw_fx8w16d, f_list_hwc_sa8], function_group, capital_header_file_name, file_header_template))
+    fh.write(c.print_proto_file([f_list_chw_fx16,f_list_chw_fx8,f_list_chw_fx8w16d, f_list_hwcn_sa8], function_group, capital_header_file_name, file_header_template))
     fh.close()
 

lib/gen/mli_krn_depthwise_conv2d_hwc_func_body.txt renamed to lib/gen/mli_krn_depthwise_conv2d_hwcn_func_body.txt

@@ -1,4 +1,4 @@
-    mli_status ret = MLI_CHECK_STATUS(mli_chk_depthwise_conv2d_hwc_$datatype(in, weights, bias, cfg, out), __func__);
+    mli_status ret = MLI_CHECK_STATUS(mli_chk_depthwise_conv2d_hwcn_$datatype(in, weights, bias, cfg, out), __func__);
     if (ret != MLI_STATUS_OK)
         return ret;