cpu: aarch64: add 1x1-convolution support for block size 8

oneapi-src · Sep 17, 2024 · da03e2f · da03e2f
1 parent ee71ec7
commit da03e2f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/include/oneapi/dnnl/dnnl_types.h b/include/oneapi/dnnl/dnnl_types.h
@@ -405,10 +405,8 @@ typedef enum {
     dnnl_AcB16a4b,
     dnnl_Acb4a,
     dnnl_Acb8a,
-    dnnl_aCBd8b8c,
     dnnl_aCBd16b16c,
     dnnl_aCBd16c16b,
-    dnnl_aCBde8b8c,
     dnnl_aCBde16b16c,
     dnnl_aCBde16c16b,
     dnnl_Acdb16a,
@@ -422,18 +420,14 @@ typedef enum {
     dnnl_Acdeb4a,
     dnnl_Acdeb8a,
     dnnl_Adcb16a,
-    dnnl_BAc8a8b,
     dnnl_BAc16a16b,
     dnnl_BAc16b16a,
-    dnnl_BAcd8a8b,
     dnnl_BAcd16a16b,
     dnnl_BAcd16b16a,
     dnnl_aCBd4c8b8c4b,
     dnnl_aCBde4c8b8c4b,
     dnnl_aCBdef4c8b8c4b,
-    dnnl_BAcde8a8b,
     dnnl_BAcde16a16b,
-    dnnl_aCBdef8b8c,
     dnnl_aCBdef16b16c,
     dnnl_ABc16b32a,
     dnnl_ABc16b64a,
@@ -1042,6 +1036,12 @@ typedef enum {
     dnnl_bcad,
     dnnl_cabd,
     dnnl_dabc,
+    dnnl_aCBd8b8c,
+    dnnl_aCBde8b8c,
+    dnnl_BAc8a8b,
+    dnnl_BAcd8a8b,
+    dnnl_BAcde8a8b,
+    dnnl_aCBdef8b8c,
 
     /// Just a sentinel, not real memory format tag. Must be changed after new
     /// format tag is added.

diff --git a/src/common/dnnl_debug_autogenerated.cpp b/src/common/dnnl_debug_autogenerated.cpp
@@ -310,10 +310,8 @@ const char *dnnl_fmt_tag2str(dnnl_format_tag_t v) {
     if (v == dnnl_AcB16a4b) return "AcB16a4b";
     if (v == dnnl_Acb4a) return "Acb4a";
     if (v == dnnl_Acb8a) return "Acb8a";
-    if (v == dnnl_aCBd8b8c) return "aCBd8b8c";
     if (v == dnnl_aCBd16b16c) return "aCBd16b16c";
     if (v == dnnl_aCBd16c16b) return "aCBd16c16b";
-    if (v == dnnl_aCBde8b8c) return "aCBde8b8c";
     if (v == dnnl_aCBde16b16c) return "aCBde16b16c";
     if (v == dnnl_aCBde16c16b) return "aCBde16c16b";
     if (v == dnnl_Acdb16a) return "Acdb16a";
@@ -327,18 +325,14 @@ const char *dnnl_fmt_tag2str(dnnl_format_tag_t v) {
     if (v == dnnl_Acdeb4a) return "Acdeb4a";
     if (v == dnnl_Acdeb8a) return "Acdeb8a";
     if (v == dnnl_Adcb16a) return "Adcb16a";
-    if (v == dnnl_BAc8a8b) return "BAc8a8b";
     if (v == dnnl_BAc16a16b) return "BAc16a16b";
     if (v == dnnl_BAc16b16a) return "BAc16b16a";
-    if (v == dnnl_BAcd8a8b) return "BAcd8a8b";
     if (v == dnnl_BAcd16a16b) return "BAcd16a16b";
     if (v == dnnl_BAcd16b16a) return "BAcd16b16a";
     if (v == dnnl_aCBd4c8b8c4b) return "aCBd4c8b8c4b";
     if (v == dnnl_aCBde4c8b8c4b) return "aCBde4c8b8c4b";
     if (v == dnnl_aCBdef4c8b8c4b) return "aCBdef4c8b8c4b";
-    if (v == dnnl_BAcde8a8b) return "BAcde8a8b";
     if (v == dnnl_BAcde16a16b) return "BAcde16a16b";
-    if (v == dnnl_aCBdef8b8c) return "aCBdef8b8c";
     if (v == dnnl_aCBdef16b16c) return "aCBdef16b16c";
     if (v == dnnl_ABc16b32a) return "ABc16b32a";
     if (v == dnnl_ABc16b64a) return "ABc16b64a";
@@ -947,6 +941,12 @@ const char *dnnl_fmt_tag2str(dnnl_format_tag_t v) {
     if (v == dnnl_bcad) return "bcad";
     if (v == dnnl_cabd) return "cabd";
     if (v == dnnl_dabc) return "dabc";
+    if (v == dnnl_aCBd8b8c) return "aCBd8b8c";
+    if (v == dnnl_aCBde8b8c) return "aCBde8b8c";
+    if (v == dnnl_BAc8a8b) return "BAc8a8b";
+    if (v == dnnl_BAcd8a8b) return "BAcd8a8b";
+    if (v == dnnl_BAcde8a8b) return "BAcde8a8b";
+    if (v == dnnl_aCBdef8b8c) return "aCBdef8b8c";
     if (v == dnnl_format_tag_last) return "format_tag_last";
     if (v == dnnl_x) return "x";
     if (v == dnnl_nc) return "nc";

diff --git a/tests/benchdnn/dnnl_debug.hpp b/tests/benchdnn/dnnl_debug.hpp
@@ -56,7 +56,7 @@ const char *fpmath_mode2str(dnnl_fpmath_mode_t mode);
 /* accumulation mode */
 const char *accumulation_mode2str(dnnl_accumulation_mode_t mode);
 
-/* accumulation mode */
+/* rounding mode */
 const char *rounding_mode2str(dnnl_rounding_mode_t mode);
 
 #endif
diff --git a/tests/benchdnn/dnnl_debug_autogenerated.cpp b/tests/benchdnn/dnnl_debug_autogenerated.cpp
@@ -287,10 +287,8 @@ dnnl_format_tag_t str2fmt_tag(const char *str) {
     CASE(AcB16a4b);
     CASE(Acb4a);
     CASE(Acb8a);
-    CASE(aCBd8b8c);
     CASE(aCBd16b16c);
     CASE(aCBd16c16b);
-    CASE(aCBde8b8c);
     CASE(aCBde16b16c);
     CASE(aCBde16c16b);
     CASE(Acdb16a);
@@ -304,17 +302,14 @@ dnnl_format_tag_t str2fmt_tag(const char *str) {
     CASE(Acdeb4a);
     CASE(Acdeb8a);
     CASE(Adcb16a);
-    CASE(BAc8a8b);
     CASE(BAc16a16b);
     CASE(BAc16b16a);
     CASE(BAcd16a16b);
     CASE(BAcd16b16a);
     CASE(aCBd4c8b8c4b);
     CASE(aCBde4c8b8c4b);
     CASE(aCBdef4c8b8c4b);
-    CASE(BAcde8a8b);
     CASE(BAcde16a16b);
-    CASE(aCBdef8b8c);
     CASE(aCBdef16b16c);
     CASE(ABc16b32a);
     CASE(ABc16b64a);
@@ -923,6 +918,12 @@ dnnl_format_tag_t str2fmt_tag(const char *str) {
     CASE(bcad);
     CASE(cabd);
     CASE(dabc);
+    CASE(aCBd8b8c);
+    CASE(aCBde8b8c);
+    CASE(BAc8a8b);
+    CASE(BAcd8a8b);
+    CASE(BAcde8a8b);
+    CASE(aCBdef8b8c);
     CASE(x);
     CASE(nc);
     CASE(cn);