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

simple reorder: disabled unused primitives #113

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

simple reorder: disabled unused primitives #113

Changes from 1 commit
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
Prev Previous commit
simple reorder: disabled unused bf16 primitives
@antonvor
antonvor committed Feb 10, 2022
commit c54a05626aae0a1780e29826a9041789e586aee4
2 changes: 2 additions & 0 deletions src/cpu/reorder/cpu_reorder_comp_s8_s8.cpp
View file
Original file line number Diff line number Diff line change
@@ -127,7 +127,9 @@ const impl_list_map_t comp_s8_s8_impl_list_map {
REG_REORDER_P(REG_SR(s8, ihwo, s8, OIhw16i16o4i, fmt_order_keep, spec_conv_req_comp))
REG_REORDER_P(REG_SR(s8, oihw, s8, OIhw16i16o4i, fmt_order_keep, spec_conv_req_comp))
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
21 changes: 14 additions & 7 deletions src/cpu/reorder/cpu_reorder_regular_bf16.cpp
View file
Original file line number Diff line number Diff line change
@@ -29,21 +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)))

// todo: [AV] disable unused simple reorder primitives
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))

@@ -52,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,
}},
20 changes: 16 additions & 4 deletions src/cpu/reorder/cpu_reorder_regular_f32_bf16.cpp
View file
Original file line number Diff line number Diff line change
@@ -30,20 +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)))

// todo: [AV] disable unused simple reorder primitives
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))

4 changes: 1 addition & 3 deletions src/cpu/reorder/cpu_reorder_regular_u8.cpp
View file
Original file line number Diff line number Diff line change
@@ -57,10 +57,8 @@ const impl_list_map_t regular_u8_impl_list_map {
REG_REORDER_P(REG_SR_BIDIR(u8, any, s32, nChw16c))
REG_REORDER_P(REG_SR_BIDIR(u8, any, bf16, nChw16c))
REG_REORDER_P(REG_SR_BIDIR(u8, any, s8, nChw16c))

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