Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

simple reorder: disabled unused primitives #113

Open
wants to merge 2 commits into
base: v2.4_for_ie_master
Choose a base branch
from
Open

simple reorder: disabled unused primitives #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fcf8c0
simple reorder: disabled unused primitives
antonvor Jan 30, 2022
c54a056
simple reorder: disabled unused bf16 primitives
antonvor Feb 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/cpu/reorder/cpu_reorder_comp_s8_s8.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,15 @@ const impl_list_map_t comp_s8_s8_impl_list_map {
{{s8, s8, 2}, {
REG_REORDER_P(DNNL_X64_ONLY(CPU_REORDER_INSTANCE(x64_jit_uni_reorder_t)))
REG_REORDER_P(REG_SR(s8, oi, s8, OI4i16o4i, fmt_order_keep, spec_conv_req_comp))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(s8, io, s8, OI4i16o4i, fmt_order_keep, spec_conv_req_comp))
#endif
REG_REORDER_P(REG_SR(s8, oi, s8, OI4i32o4i, fmt_order_keep, spec_conv_req_comp))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(s8, io, s8, OI4i32o4i, fmt_order_keep, spec_conv_req_comp))
#endif
REG_REORDER_P(REG_SR(s8, oi, s8, OI4i64o4i, fmt_order_keep, spec_conv_req_comp))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(s8, io, s8, OI4i64o4i, fmt_order_keep, spec_conv_req_comp))
REG_REORDER_P(REG_SR(s8, ab, s8, BA16a16b4a, fmt_order_keep, spec_conv_req_comp))
REG_REORDER_P(REG_SR(s8, ab, s8, BA16a32b4a, fmt_order_keep, spec_conv_req_comp))
Expand All @@ -40,11 +45,13 @@ const impl_list_map_t comp_s8_s8_impl_list_map {
REG_REORDER_P(REG_SR(s8, ba, s8, BA16a32b4a, fmt_order_keep, spec_conv_req_comp))
REG_REORDER_P(REG_SR(s8, ba, s8, BA16a48b4a, fmt_order_keep, spec_conv_req_comp))
REG_REORDER_P(REG_SR(s8, ba, s8, BA16a64b4a, fmt_order_keep, spec_conv_req_comp))
#endif
nullptr,
}},
// s8 -> s8
{{s8, s8, 3}, {
REG_REORDER_P(DNNL_X64_ONLY(CPU_REORDER_INSTANCE(x64_jit_uni_reorder_t)))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(s8, any, s8, wio, fmt_order_keep, spec_conv_req_comp))
REG_REORDER_P(REG_SR(s8, iwo, s8, OIw4i16o4i, fmt_order_keep, spec_conv_req_comp))
REG_REORDER_P(REG_SR(s8, iwo, s8, OIw4i32o4i, fmt_order_keep, spec_conv_req_comp))
Expand All @@ -70,6 +77,7 @@ const impl_list_map_t comp_s8_s8_impl_list_map {
REG_REORDER_P(REG_SR(s8, iwo, s8, OIw16i16o4i, fmt_order_keep, spec_conv_req_comp))
REG_REORDER_P(REG_SR(s8, oiw, s8, OIw16i16o4i, fmt_order_keep, spec_conv_req_comp))
REG_REORDER_P(REG_SR(s8, wio, s8, OIw16i16o4i, fmt_order_keep, spec_conv_req_comp))
#endif
nullptr,
}},
{{s8, s8, 4}, {
Expand Down Expand Up @@ -121,8 +129,10 @@ const impl_list_map_t comp_s8_s8_impl_list_map {
REG_REORDER_P(REG_SR(s8, hwio, s8, OIhw16i16o4i, fmt_order_keep, spec_conv_req_comp))
#endif
REG_REORDER_P(REG_SR(s8, iohw, s8, OIhw4i16o4i, fmt_order_keep, spec_conv_req_comp))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(s8, iohw, s8, OIhw2i8o4i, fmt_order_keep, spec_conv_req_comp))
REG_REORDER_P(REG_SR(s8, iohw, s8, OIhw4o4i, fmt_order_keep, spec_conv_req_comp))
#endif

nullptr,
}},
Expand Down Expand Up @@ -170,13 +180,13 @@ const impl_list_map_t comp_s8_s8_impl_list_map {
REG_REORDER_P(REG_SR(s8, idhwo, s8, OIdhw16i16o4i, fmt_order_keep, spec_conv_req_comp))
REG_REORDER_P(REG_SR(s8, oidhw, s8, OIdhw16i16o4i, fmt_order_keep, spec_conv_req_comp))
REG_REORDER_P(REG_SR(s8, dhwio, s8, OIdhw16i16o4i, fmt_order_keep, spec_conv_req_comp))
#endif
REG_REORDER_P(REG_SR(s8, giohw, s8, gOIhw4i16o4i, fmt_order_keep, spec_conv_req_comp))
REG_REORDER_P(REG_SR(s8, giohw, s8, gOIhw2i8o4i, fmt_order_keep, spec_conv_req_comp))
REG_REORDER_P(REG_SR(s8, giohw, s8, gOIhw4o4i, fmt_order_keep, spec_conv_req_comp))
REG_REORDER_P(REG_SR(s8, iodhw, s8, OIdhw4i16o4i, fmt_order_keep, spec_conv_req_comp))
REG_REORDER_P(REG_SR(s8, iodhw, s8, OIdhw2i8o4i, fmt_order_keep, spec_conv_req_comp))
REG_REORDER_P(REG_SR(s8, iodhw, s8, OIdhw4o4i, fmt_order_keep, spec_conv_req_comp))
#endif

nullptr,
}},
Expand All @@ -189,10 +199,10 @@ const impl_list_map_t comp_s8_s8_impl_list_map {
REG_REORDER_P(REG_SR(s8, goidhw, s8, gOIdhw4o4i, fmt_order_keep, spec_conv_req_comp))
REG_REORDER_P(REG_SR(s8, goidhw, s8, gOdhwI16o4i, fmt_order_keep, spec_conv_req_comp))
REG_REORDER_P(REG_SR(s8, goidhw, s8, gOIdhw16i16o4i, fmt_order_keep, spec_conv_req_comp))
#endif
REG_REORDER_P(REG_SR(s8, giodhw, s8, gOIdhw4i16o4i, fmt_order_keep, spec_conv_req_comp))
REG_REORDER_P(REG_SR(s8, giodhw, s8, gOIdhw2i8o4i, fmt_order_keep, spec_conv_req_comp))
REG_REORDER_P(REG_SR(s8, giodhw, s8, gOIdhw4o4i, fmt_order_keep, spec_conv_req_comp))
#endif

nullptr,
}},
Expand Down
20 changes: 14 additions & 6 deletions src/cpu/reorder/cpu_reorder_regular_bf16.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,26 @@ const impl_list_map_t regular_bf16_impl_list_map {
REG_REORDER_P(DNNL_X64_ONLY(CPU_REORDER_INSTANCE(x64_jit_blk_reorder_t)))
REG_REORDER_P(DNNL_X64_ONLY(CPU_REORDER_INSTANCE(x64_jit_uni_reorder_t)))

REG_REORDER_P(REG_SR_BIDIR(bf16, any, f32, nCw16c))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(bf16, any, f32, nCw16c, fmt_order_keep))
#endif
REG_REORDER_P(REG_SR(bf16, any, f32, nCw16c, fmt_order_reverse))
REG_REORDER_P(REG_SR_BIDIR(bf16, any, f32, nChw16c))
REG_REORDER_P(REG_SR_BIDIR(bf16, any, f32, nCdhw16c))

#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR_BIDIR(bf16, any, s8, nChw16c))
REG_REORDER_P(REG_SR_BIDIR(bf16, any, s8, nCdhw16c))

REG_REORDER_P(REG_SR_BIDIR(bf16, any, u8, nChw16c))
REG_REORDER_P(REG_SR_BIDIR(bf16, any, u8, nCdhw16c))

REG_REORDER_P(REG_SR_BIDIR(bf16, any, bf16, nCw16c))
#endif
REG_REORDER_P(REG_SR(bf16, any, bf16, nCw16c, fmt_order_keep))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(bf16, any, bf16, nCw16c, fmt_order_reverse))
#endif
REG_REORDER_P(REG_SR_BIDIR(bf16, any, bf16, nChw16c))
REG_REORDER_P(REG_SR_BIDIR(bf16, any, bf16, nCdhw16c))

#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR_BIDIR(bf16, any, f32, OIdhw16o16i))
REG_REORDER_P(REG_SR_BIDIR(bf16, any, f32, OIdhw16i16o))

Expand All @@ -51,11 +57,13 @@ const impl_list_map_t regular_bf16_impl_list_map {

REG_REORDER_P(REG_SR_BIDIR(bf16, any, u8, OIdhw16o16i))
REG_REORDER_P(REG_SR_BIDIR(bf16, any, u8, OIdhw16i16o))

#endif
REG_REORDER_P(REG_SR(bf16, any, bf16, any, fmt_order_any, spec_reference))
REG_REORDER_P(REG_SR(bf16, any, f32, any, fmt_order_any, spec_reference))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(bf16, any, s8, any, fmt_order_any, spec_reference))
REG_REORDER_P(REG_SR(bf16, any, u8, any, fmt_order_any, spec_reference))
#endif

nullptr,
}},
Expand Down
6 changes: 4 additions & 2 deletions src/cpu/reorder/cpu_reorder_regular_bin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@ namespace cpu {
const impl_list_map_t regular_bin_impl_list_map {
// bin ->
{{bin, data_type::undef, 4}, {
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR_DIRECT_COPY(bin, bin))

#endif
REG_REORDER_P(REG_SR(bin, any, bin, OIhw8o32i, fmt_order_keep))

REG_REORDER_P(REG_SR(bin, any, bin, OIhw16o32i, fmt_order_keep))

#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR_BIDIR(u8, any, u8, nChw8c))
#endif

nullptr,
}},
Expand Down
2 changes: 2 additions & 0 deletions src/cpu/reorder/cpu_reorder_regular_f16.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ namespace cpu {
const impl_list_map_t regular_f16_impl_list_map {
// f16 ->
{{f16, data_type::undef, 0}, {
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f16, any, f16, any, fmt_order_any, spec_reference))
REG_REORDER_P(REG_SR(f16, any, f32, any, fmt_order_any, spec_reference))
#endif

nullptr,
}},
Expand Down
19 changes: 16 additions & 3 deletions src/cpu/reorder/cpu_reorder_regular_f32_bf16.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,32 @@ const impl_list_map_t regular_f32_bf16_impl_list_map {
REG_REORDER_P(DNNL_X64_ONLY(CPU_REORDER_INSTANCE(x64_jit_blk_reorder_t)))
REG_REORDER_P(DNNL_X64_ONLY(CPU_REORDER_INSTANCE(x64_jit_uni_reorder_t)))

REG_REORDER_P(REG_SR_BIDIR(f32, ncw, bf16, nCw16c))
REG_REORDER_P(REG_SR_BIDIR(f32, nchw, bf16, nChw16c))
REG_REORDER_P(REG_SR(f32, ncw, bf16, nCw16c, fmt_order_keep))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f32, ncw, bf16, nCw16c, fmt_order_reverse))
#endif
REG_REORDER_P(REG_SR(f32, nchw, bf16, nChw16c, fmt_order_keep))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f32, nchw, bf16, nChw16c, fmt_order_reverse))
#endif
REG_REORDER_P(REG_SR_BIDIR(f32, any, bf16, nChw16c))
REG_REORDER_P(REG_SR_BIDIR(f32, any, bf16, nCdhw16c))
REG_REORDER_P(REG_SR(f32, any, bf16, nCdhw16c, fmt_order_keep))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f32, any, bf16, nCdhw16c, fmt_order_reverse))
#endif

REG_REORDER_P(REG_SR(f32, oihw, bf16, OIhw8i16o2i, fmt_order_keep))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f32, goihw, bf16, gOIhw8i16o2i, fmt_order_keep))
#endif
REG_REORDER_P(REG_SR(f32, oihw, bf16, OIhw8o16i2o, fmt_order_keep))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f32, goihw, bf16, gOIhw8o16i2o, fmt_order_keep))
REG_REORDER_P(REG_SR(f32, oihw, bf16, IOhw8o16i2o, fmt_order_keep))
REG_REORDER_P(REG_SR(f32, goihw, bf16, gIOhw8o16i2o, fmt_order_keep))
REG_REORDER_P(REG_SR(f32, oihw, bf16, OIhw16i16o, fmt_order_keep))
REG_REORDER_P(REG_SR(f32, goihw, bf16, gOIhw16i16o, fmt_order_keep))
#endif

REG_REORDER_P(REG_SR(f32, any, bf16, any, fmt_order_any, spec_reference))

Expand Down
2 changes: 2 additions & 0 deletions src/cpu/reorder/cpu_reorder_regular_f32_bin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ namespace cpu {
const impl_list_map_t regular_f32_bin_impl_list_map {
// f32 -> bin
{{f32, bin, 4}, {
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR_BIDIR(f32, nchw, bin, nhwc))

REG_REORDER_P(REG_SR_BIDIR(f32, nhwc, bin, nhwc))
#endif

nullptr,
}},
Expand Down
2 changes: 2 additions & 0 deletions src/cpu/reorder/cpu_reorder_regular_f32_f16.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ namespace cpu {
const impl_list_map_t regular_f32_f16_impl_list_map {
// f32 -> f16
{{f32, f16, 0}, {
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f32, any, f16, any, fmt_order_any, spec_reference))
#endif

nullptr,
}},
Expand Down
90 changes: 74 additions & 16 deletions src/cpu/reorder/cpu_reorder_regular_f32_f32.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,27 @@ const impl_list_map_t regular_f32_f32_impl_list_map {

REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, nCw16c))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, nCw8c))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, nCw4c))

REG_REORDER_P(REG_SR_BIDIR(f32, nCw4c, f32, nCw16c))
REG_REORDER_P(REG_SR_BIDIR(f32, nCw8c, f32, nCw16c))

REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, OIw4i4o))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, OIw4o4i))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, OIw8i8o))
#endif
REG_REORDER_P(REG_SR(f32, any, f32, OIw8i8o, fmt_order_keep))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f32, any, f32, OIw8i8o, fmt_order_reverse))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, OIw8o8i))

REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, OIw16o16i))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, OIw16i16o))
#endif
REG_REORDER_P(REG_SR(f32, any, f32, OIw16i16o, fmt_order_keep))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f32, any, f32, OIw16i16o, fmt_order_reverse))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, IOw16o16i))
#endif

REG_REORDER_P(REG_SR(f32, any, f32, any, fmt_order_any, spec_reference))

Expand All @@ -78,10 +86,14 @@ const impl_list_map_t regular_f32_f32_impl_list_map {

REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, nChw16c))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, nChw8c))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, nChw4c))

REG_REORDER_P(REG_SR_BIDIR(f32, nChw4c, f32, nChw16c))
REG_REORDER_P(REG_SR_BIDIR(f32, nChw8c, f32, nChw16c))
#endif
REG_REORDER_P(REG_SR(f32, nChw8c, f32, nChw16c, fmt_order_keep))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f32, nChw8c, f32, nChw16c, fmt_order_reverse))

REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, gOIw4i4o))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, gOIw4o4i))
Expand All @@ -94,20 +106,44 @@ const impl_list_map_t regular_f32_f32_impl_list_map {

REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, OIhw4i4o))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, OIhw4o4i))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, Ohwi8o))

REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, OIhw8i8o))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, OIhw8o8i))
#endif
REG_REORDER_P(REG_SR(f32, any, f32, Ohwi8o, fmt_order_keep))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f32, any, f32, Ohwi8o, fmt_order_reverse))
#endif

REG_REORDER_P(REG_SR(f32, any, f32, OIhw8i8o, fmt_order_keep))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f32, any, f32, OIhw8i8o, fmt_order_reverse))
#endif
REG_REORDER_P(REG_SR(f32, any, f32, OIhw8o8i, fmt_order_keep))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f32, any, f32, OIhw8o8i, fmt_order_reverse))

REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, Oihw4o))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, Oihw16o))
#endif
REG_REORDER_P(REG_SR(f32, any, f32, Oihw16o, fmt_order_keep))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f32, any, f32, Oihw16o, fmt_order_reverse))

REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, Ohwi4o))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, Ohwi16o))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, OIhw16o16i))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, OIhw16i16o))
#endif
REG_REORDER_P(REG_SR(f32, any, f32, Ohwi16o, fmt_order_keep))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f32, any, f32, Ohwi16o, fmt_order_reverse))
#endif
REG_REORDER_P(REG_SR(f32, any, f32, OIhw16o16i, fmt_order_keep))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f32, any, f32, OIhw16o16i,fmt_order_reverse))
#endif
REG_REORDER_P(REG_SR(f32, any, f32, OIhw16i16o, fmt_order_keep))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f32, any, f32, OIhw16i16o, fmt_order_reverse))

REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, IOhw16o16i))

REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, OIhw4i16o4i))
#endif

REG_REORDER_P(REG_SR(f32, any, f32, any, fmt_order_any, spec_reference))

Expand All @@ -126,6 +162,7 @@ const impl_list_map_t regular_f32_f32_impl_list_map {

REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, nCdhw16c))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, nCdhw8c))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, nCdhw4c))

REG_REORDER_P(REG_SR_BIDIR(f32, nCdhw4c, f32, nCdhw16c))
Expand All @@ -147,18 +184,37 @@ const impl_list_map_t regular_f32_f32_impl_list_map {

REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, OIdhw4i4o))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, OIdhw4o4i))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, Odhwi8o))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, OIdhw8i8o))
#endif
REG_REORDER_P(REG_SR(f32, any, f32, Odhwi8o, fmt_order_keep))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f32, any, f32, Odhwi8o, fmt_order_reverse))
#endif
REG_REORDER_P(REG_SR(f32, any, f32, OIdhw8i8o, fmt_order_keep))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f32, any, f32, OIdhw8i8o, fmt_order_reverse))

REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, OIdhw8o8i))

REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, Oidhw4o))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, Oidhw16o))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, Odhwi16o))
#endif
REG_REORDER_P(REG_SR(f32, any, f32, Oidhw16o, fmt_order_keep))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f32, any, f32, Oidhw16o, fmt_order_reverse))
#endif
REG_REORDER_P(REG_SR(f32, any, f32, Odhwi16o, fmt_order_keep))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f32, any, f32, Odhwi16o, fmt_order_reverse))

REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, OIdhw16o16i))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, OIdhw16i16o))
#endif
REG_REORDER_P(REG_SR(f32, any, f32, OIdhw16i16o, fmt_order_keep))
#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR(f32, any, f32, OIdhw16i16o, fmt_order_reverse))

REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, IOdhw16o16i))

REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, gOIhw4i16o4i))
#endif

REG_REORDER_P(REG_SR(f32, any, f32, any, fmt_order_any, spec_reference))

Expand All @@ -172,6 +228,7 @@ const impl_list_map_t regular_f32_f32_impl_list_map {

DNNL_AARCH64_ONLY(CPU_REORDER_INSTANCE(aarch64_jit_uni_reorder_t))

#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, gOIdhw4i4o))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, gOIdhw4o4i))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, gOdhwi8o))
Expand All @@ -184,6 +241,7 @@ const impl_list_map_t regular_f32_f32_impl_list_map {
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, gOIdhw16o16i))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, gOIdhw16i16o))
REG_REORDER_P(REG_SR_BIDIR(f32, any, f32, gIOdhw16o16i))
#endif

REG_REORDER_P(REG_SR(f32, any, f32, any, fmt_order_any, spec_reference))

Expand Down
3 changes: 2 additions & 1 deletion src/cpu/reorder/cpu_reorder_regular_f32_s32.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,12 @@ const impl_list_map_t regular_f32_s32_impl_list_map {
REG_REORDER_P(DNNL_X64_ONLY(CPU_REORDER_INSTANCE(x64_jit_uni_reorder_t)))

DNNL_AARCH64_ONLY(CPU_REORDER_INSTANCE(aarch64_jit_uni_reorder_t))

#ifdef ENABLE_UNUSED_PRIM
REG_REORDER_P(REG_SR_BIDIR(f32, any, s32, nChw16c))
REG_REORDER_P(REG_SR_BIDIR(f32, any, s32, nChw8c))

REG_REORDER_P(REG_SR(f32, any, s32, any, fmt_order_any, spec_reference))
#endif

nullptr,
}},
Expand Down
Loading