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 90ce7acbc766b6..76ee7f9740c8c1 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,12 +45,19 @@ 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, data_type::f32); } 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, data_type::f32); } 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, + data_type::f32); } else { OV_CPU_JIT_EMITTER_THROW("Unsupported ISA ", host_isa_); } diff --git a/src/plugins/intel_cpu/src/nodes/common/softmax.cpp b/src/plugins/intel_cpu/src/nodes/common/softmax.cpp index 9433bdd56cd7d3..888bc40412401b 100644 --- a/src/plugins/intel_cpu/src/nodes/common/softmax.cpp +++ b/src/plugins/intel_cpu/src/nodes/common/softmax.cpp @@ -16,6 +16,7 @@ #include "utils/bfloat16.hpp" using namespace dnnl; +using namespace dnnl::impl; using namespace dnnl::impl::cpu; using namespace dnnl::impl::cpu::x64; using namespace dnnl::impl::utils; @@ -67,7 +68,8 @@ 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(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, data_type::f32)); if (mayiuse(avx512_core)) uni_vcvtneps2bf16.reset(new jit_uni_vcvtneps2bf16(this, isa)); diff --git a/src/plugins/intel_cpu/src/nodes/interpolate.cpp b/src/plugins/intel_cpu/src/nodes/interpolate.cpp index 3920e5302069c4..0cc3c71cf0319b 100644 --- a/src/plugins/intel_cpu/src/nodes/interpolate.cpp +++ b/src/plugins/intel_cpu/src/nodes/interpolate.cpp @@ -77,7 +77,8 @@ struct jit_uni_interpolate_kernel_f32 : public jit_uni_interpolate_kernel, publi post_op.eltwise.alg, post_op.eltwise.alpha, post_op.eltwise.beta, - 1.f)); + 1.f, + data_type::f32)); } else if (post_op.is_depthwise()) { depthwise_injectors.push_back(std::make_shared>(this, post_op)); } else if (post_op.is_quantization()) { 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 a8fe7a070c748f..ab5d89f3d68c48 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 @@ -6,6 +6,7 @@ #include "utils/general_utils.h" +using namespace dnnl::impl; using namespace dnnl::impl::cpu; #define GET_OFF(field) offsetof(NmsCallArgs, field) @@ -19,7 +20,8 @@ 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(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, data_type::f32)); this->preamble(); diff --git a/src/plugins/intel_cpu/src/nodes/mvn.cpp b/src/plugins/intel_cpu/src/nodes/mvn.cpp index a8b9eefa10210a..bab6a3ed1b8091 100644 --- a/src/plugins/intel_cpu/src/nodes/mvn.cpp +++ b/src/plugins/intel_cpu/src/nodes/mvn.cpp @@ -953,7 +953,8 @@ struct jit_uni_mvn_kernel_f32 : public jit_uni_mvn_kernel, public jit_generator post_op.eltwise.alg, post_op.eltwise.alpha, post_op.eltwise.beta, - post_op.eltwise.scale)); + post_op.eltwise.scale, + data_type::f32)); } else if (post_op.is_depthwise()) { depthwise_injectors.push_back(std::make_shared>(this, post_op)); } else if (post_op.is_quantization()) { diff --git a/src/plugins/intel_cpu/src/nodes/normalize.cpp b/src/plugins/intel_cpu/src/nodes/normalize.cpp index 4334f341cd4ee6..e6a730027929a9 100644 --- a/src/plugins/intel_cpu/src/nodes/normalize.cpp +++ b/src/plugins/intel_cpu/src/nodes/normalize.cpp @@ -228,7 +228,8 @@ struct jit_uni_normalize_kernel_f32 : public jit_uni_normalize_kernel, public ji post_op.eltwise.alg, post_op.eltwise.alpha, post_op.eltwise.beta, - post_op.eltwise.scale)); + post_op.eltwise.scale, + data_type::f32)); } else if (post_op.is_depthwise()) { depthwise_injectors.push_back(std::make_shared>(this, post_op)); } else if (post_op.is_quantization()) { diff --git a/src/plugins/intel_cpu/src/nodes/reduce.cpp b/src/plugins/intel_cpu/src/nodes/reduce.cpp index 489d60b3f7cf40..3a209ac132c560 100644 --- a/src/plugins/intel_cpu/src/nodes/reduce.cpp +++ b/src/plugins/intel_cpu/src/nodes/reduce.cpp @@ -142,7 +142,12 @@ 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, + data_type::f32); } if (mayiuse(avx512_core)) @@ -1209,7 +1214,8 @@ struct jit_uni_reduce_post_kernel_f32 : public jit_uni_reduce_post_kernel, publi post_op.eltwise.alg, post_op.eltwise.alpha, post_op.eltwise.beta, - post_op.eltwise.scale)); + post_op.eltwise.scale, + data_type::f32)); } else if (post_op.is_depthwise()) { depthwise_injectors.push_back(std::make_shared>(this, post_op)); } else if (post_op.is_quantization()) { @@ -1223,7 +1229,12 @@ 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, + data_type::f32); } if (mayiuse(avx512_core)) diff --git a/src/plugins/intel_cpu/src/nodes/region_yolo.cpp b/src/plugins/intel_cpu/src/nodes/region_yolo.cpp index 28a1325f56be77..56f600c7f8ac29 100644 --- a/src/plugins/intel_cpu/src/nodes/region_yolo.cpp +++ b/src/plugins/intel_cpu/src/nodes/region_yolo.cpp @@ -18,6 +18,7 @@ #include "openvino/opsets/opset1.hpp" #include "utils/bfloat16.hpp" +using namespace dnnl::impl; using namespace dnnl::impl::cpu; using namespace dnnl::impl::cpu::x64; using namespace dnnl::impl::utils; @@ -45,7 +46,8 @@ struct jit_uni_logistic_kernel_f32 : public jit_uni_logistic_kernel, public jit_ } void generate() override { - exp_injector.reset(new jit_uni_eltwise_injector(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, data_type::f32)); if (mayiuse(avx512_core)) uni_vcvtneps2bf16.reset(new jit_uni_vcvtneps2bf16(this, isa)); diff --git a/src/plugins/intel_cpu/src/utils/verbose.cpp b/src/plugins/intel_cpu/src/utils/verbose.cpp index 5fca200450b17d..c9283a130e3d6e 100644 --- a/src/plugins/intel_cpu/src/utils/verbose.cpp +++ b/src/plugins/intel_cpu/src/utils/verbose.cpp @@ -107,8 +107,7 @@ void Verbose::printInfo() { 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(prefix.c_str(), desc, dnnl::impl::format_kind_t::dnnl_format_kind_undef); + std::string fmt_str = dnnl::impl::md2fmt_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 28d38be5828c45..4edd1081134bfe 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,7 +518,7 @@ std::vector disabledTestPatterns() { // tests are useless on such platforms retVector.emplace_back(R"(.*(BF|bf)16.*)"); retVector.emplace_back(R"(.*bfloat16.*)"); - // Issue: MFDNN-12876 + // Issue: MFDNN-12818 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.*)"); } diff --git a/src/plugins/intel_cpu/thirdparty/onednn b/src/plugins/intel_cpu/thirdparty/onednn index 480742da43c5f5..97d588c5295a78 160000 --- a/src/plugins/intel_cpu/thirdparty/onednn +++ b/src/plugins/intel_cpu/thirdparty/onednn @@ -1 +1 @@ -Subproject commit 480742da43c5f58129543d0f8c84627fb5a17b68 +Subproject commit 97d588c5295a781c5c81f3ce100e00e13ec23ec2