cpu: ip: add formats for gemv cases properly

Author: densamoilov

src/common/format_traits.hpp

@@ -119,6 +119,7 @@ DECL_TRAITS(io, wei, _, 2, 0);
 /* wei: 3D */
 DECL_TRAITS(oiw, wei, _, 3, 1);
 DECL_TRAITS(wio, wei, _, 3, 1);
+DECL_TRAITS(owi, wei, _, 3, 1);
 DECL_TRAITS(Owi4o, wei, _4o, 3, 1);
 DECL_TRAITS(OIw4i4o, wei, _4i4o, 3, 1);
 DECL_TRAITS(Owi8o, wei, _8o, 3, 1);
@@ -140,6 +141,7 @@ DECL_TRAITS(OIw4i16o4i_s8s8, wei, _4i16o4i_s8s8, 3, 1);
 DECL_TRAITS(oihw, wei, _, 4, 2);
 DECL_TRAITS(ihwo, wei, _, 4, 2);
 DECL_TRAITS(hwio, wei, _, 4, 2);
+DECL_TRAITS(ohwi, wei, _, 4, 2);
 DECL_TRAITS(iohw, wei, _, 4, 2);
 DECL_TRAITS(hwio_s8s8, wei, _, 4, 2);
 DECL_TRAITS(oIhw8i, wei, _8i, 4, 2);
@@ -164,6 +166,7 @@ DECL_TRAITS(Ohwi16o, wei, _16o, 4, 2);
 
 /* wei: 5D */
 DECL_TRAITS(dhwio, wei, _, 5, 3);
+DECL_TRAITS(odhwi, wei, _, 5, 3);
 DECL_TRAITS(oidhw, wei, _, 5, 3);
 DECL_TRAITS(OIdhw4i4o, wei, _4i4o, 5, 3);
 DECL_TRAITS(Odhwi4o, wei, _4o, 5, 3);

src/common/memory_desc_wrapper.cpp

@@ -294,6 +294,13 @@ status_t fill_wio(memory_desc_t &md) {
     return fill_nonblocked(md, perm);
 }
 
+status_t fill_owi(memory_desc_t &md) {
+    if (md.ndims != 3) return invalid_arguments;
+
+    const int perm[3] = {0, 2, 1};
+    return fill_nonblocked(md, perm);
+}
+
 status_t fill_Owi4o(memory_desc_t &md) {
     if (md.ndims != 3) return invalid_arguments;
 
@@ -455,6 +462,13 @@ status_t fill_hwio(memory_desc_t &md) {
     return fill_nonblocked(md, perm);
 }
 
+status_t fill_ohwi(memory_desc_t &md) {
+    if (md.ndims != 4) return invalid_arguments;
+
+    const int perm[4] = {0, 2, 3, 1};
+    return fill_nonblocked(md, perm);
+}
+
 status_t fill_iohw(memory_desc_t &md) {
     if (md.ndims != 4) return invalid_arguments;
 
@@ -469,6 +483,13 @@ status_t fill_dhwio(memory_desc_t &md) {
     return fill_nonblocked(md, perm);
 }
 
+status_t fill_odhwi(memory_desc_t &md) {
+    if (md.ndims != 5) return invalid_arguments;
+
+    const int perm[5] = {0, 2, 3, 4, 1};
+    return fill_nonblocked(md, perm);
+}
+
 status_t fill_OIhw4i4o(memory_desc_t &md) {
     if (md.ndims != 4) return invalid_arguments;
 
@@ -1331,6 +1352,7 @@ status_t memory_desc_wrapper::compute_blocking(memory_desc_t &memory_desc)
     case io: return fill_io(memory_desc);
     case oiw: return fill_oiw(memory_desc);
     case wio: return fill_wio(memory_desc);
+    case owi: return fill_owi(memory_desc);
     case Owi4o: return fill_Owi4o(memory_desc);
     case OIw4i4o: return fill_OIw4i4o(memory_desc);
     case Owi8o: return fill_Owi8o(memory_desc);
@@ -1348,9 +1370,11 @@ status_t memory_desc_wrapper::compute_blocking(memory_desc_t &memory_desc)
     case oihw: return fill_oihw(memory_desc);
     case ihwo: return fill_ihwo(memory_desc);
     case hwio: return fill_hwio(memory_desc);
+    case ohwi: return fill_ohwi(memory_desc);
     case iohw: return fill_iohw(memory_desc);
     case hwio_s8s8: return fill_hwio(memory_desc);
     case dhwio: return fill_dhwio(memory_desc);
+    case odhwi: return fill_odhwi(memory_desc);
     case OIhw4i4o: return fill_OIhw4i4o(memory_desc);
     case OIhw8i8o: return fill_OIhw8i8o(memory_desc);
     case OIhw16i16o: return fill_OIhw16i16o(memory_desc);

src/common/mkldnn_debug.cpp

@@ -71,12 +71,15 @@ const char *mkldnn_fmt2str(mkldnn_memory_format_t v) {
     if (v == mkldnn_io) return "io";
     if (v == mkldnn_oiw) return "oiw";
     if (v == mkldnn_wio) return "wio";
+    if (v == mkldnn_owi) return "owi";
     if (v == mkldnn_oihw) return "oihw";
     if (v == mkldnn_hwio) return "hwio";
+    if (v == mkldnn_ohwi) return "ohwi";
     if (v == mkldnn_ihwo) return "ihwo";
     if (v == mkldnn_iohw) return "iohw";
     if (v == mkldnn_oidhw) return "oidhw";
     if (v == mkldnn_dhwio) return "dhwio";
+    if (v == mkldnn_odhwi) return "odhwi";
     if (v == mkldnn_goiw) return "goiw";
     if (v == mkldnn_goihw) return "goihw";
     if (v == mkldnn_hwigo) return "hwigo";

src/common/type_helpers.hpp

@@ -113,6 +113,7 @@ inline memory_format_t format_normalize(const memory_format_t fmt) {
             io,
             oiw,
             wio,
+            owi,
             Owi4o,
             OIw4i4o,
             Owi8o,
@@ -130,9 +131,11 @@ inline memory_format_t format_normalize(const memory_format_t fmt) {
             oihw,
             ihwo,
             hwio,
+            ohwi,
             iohw,
             hwio_s8s8,
             dhwio,
+            odhwi,
             oidhw,
             OIdhw4i4o,
             Odhwi4o,

src/cpu/cpu_inner_product_pd.hpp

@@ -57,7 +57,7 @@ inline memory_format_t src_compatible_fmt(int ndims, memory_format_t wei_fmt) {
         return nc;
     else if (one_of(wei_fmt, oiw, oihw, oidhw))
         return utils::pick(ndims - 3, ncw, nchw, ncdhw);
-    else if (one_of(wei_fmt, wio, hwio, dhwio))
+    else if (one_of(wei_fmt, wio, owi, hwio, ohwi, dhwio, odhwi))
         return utils::pick(ndims - 3, nwc, nhwc, ndhwc);
     else if (one_of(wei_fmt, oIhw8i, oIdhw8i))
         return utils::pick(ndims - 4, nChw8c, nCdhw8c);