From e59c2e2f266c23426921bcaf1b3b8f9fae21bca0 Mon Sep 17 00:00:00 2001 From: Aleksandr Voron Date: Wed, 18 Dec 2024 13:18:25 +0100 Subject: [PATCH 01/10] changes required for oneDNN 3.6 --- .../intel_cpu/src/emitters/plugin/x64/jit_dnnl_emitters.hpp | 6 +++--- src/plugins/intel_cpu/src/utils/verbose.cpp | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/plugins/intel_cpu/src/emitters/plugin/x64/jit_dnnl_emitters.hpp b/src/plugins/intel_cpu/src/emitters/plugin/x64/jit_dnnl_emitters.hpp index 22e003ad261555..d3cd4a83fbe4f0 100644 --- a/src/plugins/intel_cpu/src/emitters/plugin/x64/jit_dnnl_emitters.hpp +++ b/src/plugins/intel_cpu/src/emitters/plugin/x64/jit_dnnl_emitters.hpp @@ -42,11 +42,11 @@ class jit_dnnl_emitter : public jit_emitter { float alpha{0.f}; float beta{0.f}; - std::shared_ptr> + std::shared_ptr> eltwise_injector_sse42; - std::shared_ptr> + std::shared_ptr> eltwise_injector_avx2; - std::shared_ptr> + std::shared_ptr> eltwise_injector_avx512_core; private: diff --git a/src/plugins/intel_cpu/src/utils/verbose.cpp b/src/plugins/intel_cpu/src/utils/verbose.cpp index 3e5bb7e8ef7930..d7fc70c929b1ff 100644 --- a/src/plugins/intel_cpu/src/utils/verbose.cpp +++ b/src/plugins/intel_cpu/src/utils/verbose.cpp @@ -105,9 +105,7 @@ void Verbose::printInfo() { prefix = colorize(BLUE, prefix); written = snprintf(portsInfo + written_total, CPU_VERBOSE_DAT_LEN - written_total, " "); shift(written); - written = snprintf(portsInfo + written_total, CPU_VERBOSE_DAT_LEN - written_total, "%s", prefix.c_str()); - shift(written); - std::string fmt_str = dnnl::impl::md2fmt_str(desc, dnnl::impl::format_kind_t::dnnl_format_kind_undef); + std::string fmt_str = dnnl::impl::md2fmt_str(prefix.c_str(), desc, dnnl::impl::format_kind_t::dnnl_format_kind_undef); written = snprintf(portsInfo + written_total, CPU_VERBOSE_DAT_LEN - written_total, "%s", fmt_str.c_str()); shift(written); written = snprintf(portsInfo + written_total, CPU_VERBOSE_DAT_LEN - written_total, ":"); From c96e0eaee3279846280a65f317adaaa0d12dad71 Mon Sep 17 00:00:00 2001 From: Aleksandr Voron Date: Wed, 18 Dec 2024 13:18:59 +0100 Subject: [PATCH 02/10] onednn submodule updated --- src/plugins/intel_cpu/thirdparty/onednn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/intel_cpu/thirdparty/onednn b/src/plugins/intel_cpu/thirdparty/onednn index c60a9946aa2386..6d362b12320a47 160000 --- a/src/plugins/intel_cpu/thirdparty/onednn +++ b/src/plugins/intel_cpu/thirdparty/onednn @@ -1 +1 @@ -Subproject commit c60a9946aa2386890e5c9f5587974facb7624227 +Subproject commit 6d362b12320a47187d1e225905335e6e632fd022 From 4b25ec9f960c992fdc2e355c2d55e5b5658cb273 Mon Sep 17 00:00:00 2001 From: Aleksandr Voron Date: Fri, 20 Dec 2024 18:15:37 +0100 Subject: [PATCH 03/10] upd onednn --- src/plugins/intel_cpu/thirdparty/onednn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/intel_cpu/thirdparty/onednn b/src/plugins/intel_cpu/thirdparty/onednn index 6d362b12320a47..8827d47cda4c71 160000 --- a/src/plugins/intel_cpu/thirdparty/onednn +++ b/src/plugins/intel_cpu/thirdparty/onednn @@ -1 +1 @@ -Subproject commit 6d362b12320a47187d1e225905335e6e632fd022 +Subproject commit 8827d47cda4c716360d335d4b23e332360074a84 From ca688884b112d22691316078dc68e5d239a32840 Mon Sep 17 00:00:00 2001 From: Aleksandr Voron Date: Fri, 20 Dec 2024 18:43:58 +0100 Subject: [PATCH 04/10] upd module --- src/plugins/intel_cpu/thirdparty/onednn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/intel_cpu/thirdparty/onednn b/src/plugins/intel_cpu/thirdparty/onednn index 8827d47cda4c71..8c82db3211296b 160000 --- a/src/plugins/intel_cpu/thirdparty/onednn +++ b/src/plugins/intel_cpu/thirdparty/onednn @@ -1 +1 @@ -Subproject commit 8827d47cda4c716360d335d4b23e332360074a84 +Subproject commit 8c82db3211296b00bc7637dc5a96a2674c4a6c0b From cef70c913f27f1ab37d943a8ee3682e5a69e605c Mon Sep 17 00:00:00 2001 From: Aleksandr Voron Date: Fri, 20 Dec 2024 19:02:47 +0100 Subject: [PATCH 05/10] upd --- src/plugins/intel_cpu/thirdparty/onednn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/intel_cpu/thirdparty/onednn b/src/plugins/intel_cpu/thirdparty/onednn index 8c82db3211296b..668fe829527e4a 160000 --- a/src/plugins/intel_cpu/thirdparty/onednn +++ b/src/plugins/intel_cpu/thirdparty/onednn @@ -1 +1 @@ -Subproject commit 8c82db3211296b00bc7637dc5a96a2674c4a6c0b +Subproject commit 668fe829527e4a941641021544d1e9d07ff04f34 From 54a006e1cb410041a84645e335c647ec266e5617 Mon Sep 17 00:00:00 2001 From: Aleksandr Voron Date: Fri, 20 Dec 2024 20:50:24 +0100 Subject: [PATCH 06/10] upd --- src/plugins/intel_cpu/thirdparty/onednn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/intel_cpu/thirdparty/onednn b/src/plugins/intel_cpu/thirdparty/onednn index 668fe829527e4a..6d9665051b8b9f 160000 --- a/src/plugins/intel_cpu/thirdparty/onednn +++ b/src/plugins/intel_cpu/thirdparty/onednn @@ -1 +1 @@ -Subproject commit 668fe829527e4a941641021544d1e9d07ff04f34 +Subproject commit 6d9665051b8b9f7f854ec7606a01b185ac26f055 From 92ac43170f923e6dfeb96f64c49fe2f32d94121d Mon Sep 17 00:00:00 2001 From: Aleksandr Voron Date: Fri, 20 Dec 2024 21:07:49 +0100 Subject: [PATCH 07/10] upd --- src/plugins/intel_cpu/thirdparty/onednn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/intel_cpu/thirdparty/onednn b/src/plugins/intel_cpu/thirdparty/onednn index 6d9665051b8b9f..bffe4ce99aeb6d 160000 --- a/src/plugins/intel_cpu/thirdparty/onednn +++ b/src/plugins/intel_cpu/thirdparty/onednn @@ -1 +1 @@ -Subproject commit 6d9665051b8b9f7f854ec7606a01b185ac26f055 +Subproject commit bffe4ce99aeb6d9bcea12e42d674124394ca7d67 From 4948630aab485f251e5c551dd6eaa919b2271305 Mon Sep 17 00:00:00 2001 From: Aleksandr Voron Date: Fri, 20 Dec 2024 21:24:37 +0100 Subject: [PATCH 08/10] ov changes --- .../emitters/plugin/x64/jit_dnnl_emitters.cpp | 8 +++---- .../emitters/plugin/x64/jit_dnnl_emitters.hpp | 6 ++--- src/plugins/intel_cpu/src/nodes/bin_conv.cpp | 13 ++++++----- .../intel_cpu/src/nodes/common/softmax.cpp | 5 ++--- .../intel_cpu/src/nodes/interpolate.cpp | 12 +++++----- .../src/nodes/kernels/x64/brgemm_kernel.cpp | 2 +- .../src/nodes/kernels/x64/mlp_kernel.cpp | 3 ++- .../nodes/kernels/x64/non_max_suppression.cpp | 3 +-- .../nodes/kernels/x64/non_max_suppression.hpp | 2 +- src/plugins/intel_cpu/src/nodes/mvn.cpp | 12 +++++----- src/plugins/intel_cpu/src/nodes/normalize.cpp | 12 +++++----- src/plugins/intel_cpu/src/nodes/reduce.cpp | 22 +++++++++---------- .../intel_cpu/src/nodes/region_yolo.cpp | 5 ++--- src/plugins/intel_cpu/src/utils/verbose.cpp | 5 ++++- .../skip_tests_config.cpp | 3 +++ 15 files changed, 56 insertions(+), 57 deletions(-) diff --git a/src/plugins/intel_cpu/src/emitters/plugin/x64/jit_dnnl_emitters.cpp b/src/plugins/intel_cpu/src/emitters/plugin/x64/jit_dnnl_emitters.cpp index 51e801208b927c..90ce7acbc766b6 100644 --- a/src/plugins/intel_cpu/src/emitters/plugin/x64/jit_dnnl_emitters.cpp +++ b/src/plugins/intel_cpu/src/emitters/plugin/x64/jit_dnnl_emitters.cpp @@ -45,14 +45,12 @@ jit_dnnl_emitter::jit_dnnl_emitter(jit_generator* host, void jit_dnnl_emitter::set_injector() { if (host_isa_ == cpu::x64::sse41) { - eltwise_injector_sse42 = - std::make_shared>(h, kind, alpha, beta, 1.f); + eltwise_injector_sse42 = std::make_shared>(h, kind, alpha, beta, 1.f); } else if (host_isa_ == cpu::x64::avx2) { - eltwise_injector_avx2 = - std::make_shared>(h, kind, alpha, beta, 1.f); + eltwise_injector_avx2 = std::make_shared>(h, kind, alpha, beta, 1.f); } else if (host_isa_ == cpu::x64::avx512_core) { eltwise_injector_avx512_core = - std::make_shared>(h, kind, alpha, beta, 1.f); + std::make_shared>(h, kind, alpha, beta, 1.f); } else { OV_CPU_JIT_EMITTER_THROW("Unsupported ISA ", host_isa_); } diff --git a/src/plugins/intel_cpu/src/emitters/plugin/x64/jit_dnnl_emitters.hpp b/src/plugins/intel_cpu/src/emitters/plugin/x64/jit_dnnl_emitters.hpp index d3cd4a83fbe4f0..3b569308c05a26 100644 --- a/src/plugins/intel_cpu/src/emitters/plugin/x64/jit_dnnl_emitters.hpp +++ b/src/plugins/intel_cpu/src/emitters/plugin/x64/jit_dnnl_emitters.hpp @@ -42,10 +42,8 @@ class jit_dnnl_emitter : public jit_emitter { float alpha{0.f}; float beta{0.f}; - std::shared_ptr> - eltwise_injector_sse42; - std::shared_ptr> - eltwise_injector_avx2; + std::shared_ptr> eltwise_injector_sse42; + std::shared_ptr> eltwise_injector_avx2; std::shared_ptr> eltwise_injector_avx512_core; diff --git a/src/plugins/intel_cpu/src/nodes/bin_conv.cpp b/src/plugins/intel_cpu/src/nodes/bin_conv.cpp index 336a370374a9f9..68952e6ccc5199 100644 --- a/src/plugins/intel_cpu/src/nodes/bin_conv.cpp +++ b/src/plugins/intel_cpu/src/nodes/bin_conv.cpp @@ -66,11 +66,12 @@ struct jit_uni_bin_conv_kernel_f32 : public jit_uni_bin_conv_kernel, public jit_ for (int i = 0; i < end_idx; i++) { auto& post_op = p.entry_[i]; if (post_op.is_eltwise()) { - eltwise_injectors.push_back(std::make_shared>(this, - post_op.eltwise, - true, - eltwise_reserved, - mask_post_op_reserved)); + eltwise_injectors.push_back(std::make_shared>(this, + post_op.eltwise, + data_type::f32, + true, + eltwise_reserved, + mask_post_op_reserved)); } else if (post_op.is_depthwise()) { depthwise_injectors.push_back( std::make_shared>(this, post_op, mask_post_op_reserved)); @@ -217,7 +218,7 @@ struct jit_uni_bin_conv_kernel_f32 : public jit_uni_bin_conv_kernel, public jit_ Xbyak::Label l_table; - nstl::vector>> eltwise_injectors; + nstl::vector>> eltwise_injectors; nstl::vector>> depthwise_injectors; void cvt2ps(dnnl::memory::data_type type_in, Vmm vmm_in, const Xbyak::Operand& op, bool scalar_load) { diff --git a/src/plugins/intel_cpu/src/nodes/common/softmax.cpp b/src/plugins/intel_cpu/src/nodes/common/softmax.cpp index 0fcc87f8978752..9433bdd56cd7d3 100644 --- a/src/plugins/intel_cpu/src/nodes/common/softmax.cpp +++ b/src/plugins/intel_cpu/src/nodes/common/softmax.cpp @@ -67,8 +67,7 @@ struct jit_uni_softmax_kernel_f32 : public jit_uni_softmax_kernel, public jit_ge } void generate() override { - exp_injector.reset( - new jit_uni_eltwise_injector_f32(this, dnnl::impl::alg_kind::eltwise_exp, 0.f, 0.f, 1.0f)); + exp_injector.reset(new jit_uni_eltwise_injector(this, dnnl::impl::alg_kind::eltwise_exp, 0.f, 0.f, 1.0f)); if (mayiuse(avx512_core)) uni_vcvtneps2bf16.reset(new jit_uni_vcvtneps2bf16(this, isa)); @@ -200,7 +199,7 @@ struct jit_uni_softmax_kernel_f32 : public jit_uni_softmax_kernel, public jit_ge std::unique_ptr uni_vcvtneps2bf16; - std::shared_ptr> exp_injector; + std::shared_ptr> exp_injector; jit_softmax_config_params jcp_; diff --git a/src/plugins/intel_cpu/src/nodes/interpolate.cpp b/src/plugins/intel_cpu/src/nodes/interpolate.cpp index beb53cb89a831e..3920e5302069c4 100644 --- a/src/plugins/intel_cpu/src/nodes/interpolate.cpp +++ b/src/plugins/intel_cpu/src/nodes/interpolate.cpp @@ -73,11 +73,11 @@ struct jit_uni_interpolate_kernel_f32 : public jit_uni_interpolate_kernel, publi for (int i = 0; i < p.len(); i++) { auto& post_op = p.entry_[i]; if (post_op.is_eltwise()) { - eltwise_injectors.push_back(std::make_shared>(this, - post_op.eltwise.alg, - post_op.eltwise.alpha, - post_op.eltwise.beta, - 1.f)); + eltwise_injectors.push_back(std::make_shared>(this, + post_op.eltwise.alg, + post_op.eltwise.alpha, + post_op.eltwise.beta, + 1.f)); } else if (post_op.is_depthwise()) { depthwise_injectors.push_back(std::make_shared>(this, post_op)); } else if (post_op.is_quantization()) { @@ -275,7 +275,7 @@ struct jit_uni_interpolate_kernel_f32 : public jit_uni_interpolate_kernel, publi std::vector store_pool_vec_idxs; std::vector load_pool_gpr_idxs; - std::vector>> eltwise_injectors; + std::vector>> eltwise_injectors; std::vector>> depthwise_injectors; std::vector>> quantization_injectors; diff --git a/src/plugins/intel_cpu/src/nodes/kernels/x64/brgemm_kernel.cpp b/src/plugins/intel_cpu/src/nodes/kernels/x64/brgemm_kernel.cpp index 7df2e2371a843a..5ef9d8df003a86 100644 --- a/src/plugins/intel_cpu/src/nodes/kernels/x64/brgemm_kernel.cpp +++ b/src/plugins/intel_cpu/src/nodes/kernels/x64/brgemm_kernel.cpp @@ -289,7 +289,7 @@ void BrgemmKernel::init_brgemm_copy_b( brgemm_matmul_conf_t brgCopyKernelConf; brgCopyKernelConf.src_dt = is_avx_f16_only ? dnnl_data_type_t::dnnl_f32 : dt_in0; brgCopyKernelConf.wei_dt = is_avx_f16_only ? dnnl_data_type_t::dnnl_f32 : dt_in1; - brgCopyKernelConf.orig_wei_dt = dt_in1; + brgCopyKernelConf.orig_wei_dt = static_cast(DnnlExtensionUtils::ElementTypeToDataType(inType)); brgCopyKernelConf.wei_n_blk = N_blk; brgCopyKernelConf.wei_tag = transpose ? dnnl_ba : dnnl_ab; brgCopyKernelConf.copy_B_wei_stride = copy_B_wei_stride; diff --git a/src/plugins/intel_cpu/src/nodes/kernels/x64/mlp_kernel.cpp b/src/plugins/intel_cpu/src/nodes/kernels/x64/mlp_kernel.cpp index 089461bc504172..16f41f7476249e 100644 --- a/src/plugins/intel_cpu/src/nodes/kernels/x64/mlp_kernel.cpp +++ b/src/plugins/intel_cpu/src/nodes/kernels/x64/mlp_kernel.cpp @@ -550,12 +550,13 @@ void GateUpCombine::generate() { const auto zmm_up = zmm0; const auto ymm_dst = ymm5; - auto injector = std::make_shared>( + auto injector = std::make_shared>( this, m_act_alg, 1.f, 1.0f, 1.f, + data_type::f32, true, // save_state, true due to additional r15 is used. Xbyak::Reg64(Xbyak::Operand::R10), // p_table Xbyak::Opmask(1), // k_mask diff --git a/src/plugins/intel_cpu/src/nodes/kernels/x64/non_max_suppression.cpp b/src/plugins/intel_cpu/src/nodes/kernels/x64/non_max_suppression.cpp index 92c1c895ffd19e..a8fe7a070c748f 100644 --- a/src/plugins/intel_cpu/src/nodes/kernels/x64/non_max_suppression.cpp +++ b/src/plugins/intel_cpu/src/nodes/kernels/x64/non_max_suppression.cpp @@ -19,8 +19,7 @@ void NonMaxSuppression::generate() { load_vector_emitter.reset(new jit_load_emitter(this, isa, ov::element::f32, ov::element::f32, vector_step)); load_scalar_emitter.reset(new jit_load_emitter(this, isa, ov::element::f32, ov::element::f32, scalar_step)); - exp_injector.reset( - new x64::jit_uni_eltwise_injector_f32(this, dnnl::impl::alg_kind::eltwise_exp, 0.f, 0.f, 1.f)); + exp_injector.reset(new x64::jit_uni_eltwise_injector(this, dnnl::impl::alg_kind::eltwise_exp, 0.f, 0.f, 1.f)); this->preamble(); diff --git a/src/plugins/intel_cpu/src/nodes/kernels/x64/non_max_suppression.hpp b/src/plugins/intel_cpu/src/nodes/kernels/x64/non_max_suppression.hpp index a47120de5a9040..a489faf9517bfa 100644 --- a/src/plugins/intel_cpu/src/nodes/kernels/x64/non_max_suppression.hpp +++ b/src/plugins/intel_cpu/src/nodes/kernels/x64/non_max_suppression.hpp @@ -110,7 +110,7 @@ class NonMaxSuppression : public JitKernel { Xbyak::Opmask k_mask = Xbyak::Opmask(7); Xbyak::Opmask k_mask_one = Xbyak::Opmask(6); - std::shared_ptr> exp_injector; + std::shared_ptr> exp_injector; inline void hard_nms(); diff --git a/src/plugins/intel_cpu/src/nodes/mvn.cpp b/src/plugins/intel_cpu/src/nodes/mvn.cpp index 6c11feee2534b9..a8b9eefa10210a 100644 --- a/src/plugins/intel_cpu/src/nodes/mvn.cpp +++ b/src/plugins/intel_cpu/src/nodes/mvn.cpp @@ -949,11 +949,11 @@ struct jit_uni_mvn_kernel_f32 : public jit_uni_mvn_kernel, public jit_generator for (int i = 0; i < p.len(); i++) { auto& post_op = p.entry_[i]; if (post_op.is_eltwise()) { - eltwise_injectors.push_back(std::make_shared>(this, - post_op.eltwise.alg, - post_op.eltwise.alpha, - post_op.eltwise.beta, - post_op.eltwise.scale)); + eltwise_injectors.push_back(std::make_shared>(this, + post_op.eltwise.alg, + post_op.eltwise.alpha, + post_op.eltwise.beta, + post_op.eltwise.scale)); } else if (post_op.is_depthwise()) { depthwise_injectors.push_back(std::make_shared>(this, post_op)); } else if (post_op.is_quantization()) { @@ -1093,7 +1093,7 @@ struct jit_uni_mvn_kernel_f32 : public jit_uni_mvn_kernel, public jit_generator const int tile_size[kTileNum] = {8, 4, 2, 1}; - std::vector>> eltwise_injectors; + std::vector>> eltwise_injectors; std::vector>> depthwise_injectors; std::vector>> quantization_injectors; diff --git a/src/plugins/intel_cpu/src/nodes/normalize.cpp b/src/plugins/intel_cpu/src/nodes/normalize.cpp index 45e4d12c7e76c6..4334f341cd4ee6 100644 --- a/src/plugins/intel_cpu/src/nodes/normalize.cpp +++ b/src/plugins/intel_cpu/src/nodes/normalize.cpp @@ -224,11 +224,11 @@ struct jit_uni_normalize_kernel_f32 : public jit_uni_normalize_kernel, public ji for (int i = 0; i < p.len(); i++) { auto& post_op = p.entry_[i]; if (post_op.is_eltwise()) { - eltwise_injectors.push_back(std::make_shared>(this, - post_op.eltwise.alg, - post_op.eltwise.alpha, - post_op.eltwise.beta, - post_op.eltwise.scale)); + eltwise_injectors.push_back(std::make_shared>(this, + post_op.eltwise.alg, + post_op.eltwise.alpha, + post_op.eltwise.beta, + post_op.eltwise.scale)); } else if (post_op.is_depthwise()) { depthwise_injectors.push_back(std::make_shared>(this, post_op)); } else if (post_op.is_quantization()) { @@ -310,7 +310,7 @@ struct jit_uni_normalize_kernel_f32 : public jit_uni_normalize_kernel, public ji std::unique_ptr uni_vcvtneps2bf16 = nullptr; - std::vector>> eltwise_injectors; + std::vector>> eltwise_injectors; std::vector>> depthwise_injectors; std::vector>> quantization_injectors; diff --git a/src/plugins/intel_cpu/src/nodes/reduce.cpp b/src/plugins/intel_cpu/src/nodes/reduce.cpp index 7828e11f9d413a..489d60b3f7cf40 100644 --- a/src/plugins/intel_cpu/src/nodes/reduce.cpp +++ b/src/plugins/intel_cpu/src/nodes/reduce.cpp @@ -142,8 +142,7 @@ struct jit_uni_reduce_kernel_f32 : public jit_uni_reduce_kernel, public jit_gene void generate() override { if (jcp_.reduce_mode == Algorithm::ReduceLogSumExp) { - exp_injector = - std::make_shared>(this, alg_kind::eltwise_exp, 0.f, 0.f, 1.f); + exp_injector = std::make_shared>(this, alg_kind::eltwise_exp, 0.f, 0.f, 1.f); } if (mayiuse(avx512_core)) @@ -244,7 +243,7 @@ struct jit_uni_reduce_kernel_f32 : public jit_uni_reduce_kernel, public jit_gene Xbyak::Label l_table; std::shared_ptr uni_vcvtneps2bf16; - std::shared_ptr> exp_injector; + std::shared_ptr> exp_injector; inline void reduce_main() { // ================================================================ @@ -1206,11 +1205,11 @@ struct jit_uni_reduce_post_kernel_f32 : public jit_uni_reduce_post_kernel, publi for (int i = 0; i < p.len(); i++) { auto& post_op = p.entry_[i]; if (post_op.is_eltwise()) { - eltwise_injectors.push_back(std::make_shared>(this, - post_op.eltwise.alg, - post_op.eltwise.alpha, - post_op.eltwise.beta, - post_op.eltwise.scale)); + eltwise_injectors.push_back(std::make_shared>(this, + post_op.eltwise.alg, + post_op.eltwise.alpha, + post_op.eltwise.beta, + post_op.eltwise.scale)); } else if (post_op.is_depthwise()) { depthwise_injectors.push_back(std::make_shared>(this, post_op)); } else if (post_op.is_quantization()) { @@ -1224,8 +1223,7 @@ struct jit_uni_reduce_post_kernel_f32 : public jit_uni_reduce_post_kernel, publi } if (jcp_.reduce_mode == Algorithm::ReduceLogSum || jcp_.reduce_mode == Algorithm::ReduceLogSumExp) { - log_injector = - std::make_shared>(this, alg_kind::eltwise_log, 0.f, 0.f, 1.f); + log_injector = std::make_shared>(this, alg_kind::eltwise_log, 0.f, 0.f, 1.f); } if (mayiuse(avx512_core)) @@ -1336,9 +1334,9 @@ struct jit_uni_reduce_post_kernel_f32 : public jit_uni_reduce_post_kernel, publi Vmm vmm_d_bias = Vmm(8); std::shared_ptr uni_vcvtneps2bf16; - std::shared_ptr> log_injector; + std::shared_ptr> log_injector; - std::vector>> eltwise_injectors; + std::vector>> eltwise_injectors; std::vector>> depthwise_injectors; std::vector>> quantization_injectors; diff --git a/src/plugins/intel_cpu/src/nodes/region_yolo.cpp b/src/plugins/intel_cpu/src/nodes/region_yolo.cpp index b7d98064713fd0..28a1325f56be77 100644 --- a/src/plugins/intel_cpu/src/nodes/region_yolo.cpp +++ b/src/plugins/intel_cpu/src/nodes/region_yolo.cpp @@ -45,8 +45,7 @@ struct jit_uni_logistic_kernel_f32 : public jit_uni_logistic_kernel, public jit_ } void generate() override { - exp_injector.reset( - new jit_uni_eltwise_injector_f32(this, dnnl::impl::alg_kind::eltwise_exp, 0.f, 0.f, 1.f)); + exp_injector.reset(new jit_uni_eltwise_injector(this, dnnl::impl::alg_kind::eltwise_exp, 0.f, 0.f, 1.f)); if (mayiuse(avx512_core)) uni_vcvtneps2bf16.reset(new jit_uni_vcvtneps2bf16(this, isa)); @@ -134,7 +133,7 @@ struct jit_uni_logistic_kernel_f32 : public jit_uni_logistic_kernel, public jit_ Xbyak::Label l_table; - std::shared_ptr> exp_injector; + std::shared_ptr> exp_injector; jit_logistic_config_params jcp_; diff --git a/src/plugins/intel_cpu/src/utils/verbose.cpp b/src/plugins/intel_cpu/src/utils/verbose.cpp index d7fc70c929b1ff..5fca200450b17d 100644 --- a/src/plugins/intel_cpu/src/utils/verbose.cpp +++ b/src/plugins/intel_cpu/src/utils/verbose.cpp @@ -105,7 +105,10 @@ void Verbose::printInfo() { prefix = colorize(BLUE, prefix); written = snprintf(portsInfo + written_total, CPU_VERBOSE_DAT_LEN - written_total, " "); shift(written); - std::string fmt_str = dnnl::impl::md2fmt_str(prefix.c_str(), desc, dnnl::impl::format_kind_t::dnnl_format_kind_undef); + written = snprintf(portsInfo + written_total, CPU_VERBOSE_DAT_LEN - written_total, "%s", prefix.c_str()); + shift(written); + std::string fmt_str = + dnnl::impl::md2fmt_str(prefix.c_str(), desc, dnnl::impl::format_kind_t::dnnl_format_kind_undef); written = snprintf(portsInfo + written_total, CPU_VERBOSE_DAT_LEN - written_total, "%s", fmt_str.c_str()); shift(written); written = snprintf(portsInfo + written_total, CPU_VERBOSE_DAT_LEN - written_total, ":"); diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp index 089a03b4d6bba7..28d38be5828c45 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp @@ -518,6 +518,9 @@ std::vector disabledTestPatterns() { // tests are useless on such platforms retVector.emplace_back(R"(.*(BF|bf)16.*)"); retVector.emplace_back(R"(.*bfloat16.*)"); + // Issue: MFDNN-12876 + retVector.emplace_back(R"(.*smoke_LPT/RecurrentCellTransformation.CompareWithRefImpl/f32_\[1,1,3\]_CPU_f32FQ_X_level=256_.*_FQ_W_level=255.*)"); + retVector.emplace_back(R"(.*smoke_static/ConvertFqRnnToQuantizedRnn.CompareWithRefs/Type=GRUSequence.*2.5.10.*2.1.4.*2.1.4.*)"); } if (!ov::with_cpu_x86_avx2()) { // MatMul in Snippets uses BRGEMM that is supported only on AVX2 (and newer) platforms From 55a427d258af2a495526d15c050144552acd1e08 Mon Sep 17 00:00:00 2001 From: Aleksandr Voron Date: Mon, 23 Dec 2024 11:07:25 +0100 Subject: [PATCH 09/10] onednn module upd --- src/plugins/intel_cpu/thirdparty/onednn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/intel_cpu/thirdparty/onednn b/src/plugins/intel_cpu/thirdparty/onednn index bffe4ce99aeb6d..b9fbe5db95f1d0 160000 --- a/src/plugins/intel_cpu/thirdparty/onednn +++ b/src/plugins/intel_cpu/thirdparty/onednn @@ -1 +1 @@ -Subproject commit bffe4ce99aeb6d9bcea12e42d674124394ca7d67 +Subproject commit b9fbe5db95f1d04201fd5dda1de9ba4c8665486d From e865a6e823d04a6640d37a567a5d916c44008f52 Mon Sep 17 00:00:00 2001 From: Aleksandr Voron Date: Mon, 23 Dec 2024 11:59:23 +0100 Subject: [PATCH 10/10] onednn upd --- src/plugins/intel_cpu/thirdparty/onednn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/intel_cpu/thirdparty/onednn b/src/plugins/intel_cpu/thirdparty/onednn index b9fbe5db95f1d0..7537c2b054b11f 160000 --- a/src/plugins/intel_cpu/thirdparty/onednn +++ b/src/plugins/intel_cpu/thirdparty/onednn @@ -1 +1 @@ -Subproject commit b9fbe5db95f1d04201fd5dda1de9ba4c8665486d +Subproject commit 7537c2b054b11f83fe18af63e2d70b8f3aac0923