diff --git a/src/plugins/intel_cpu/src/emitters/snippets/x64/cpu_generator.cpp b/src/plugins/intel_cpu/src/emitters/snippets/x64/cpu_generator.cpp index 32d3d2b68c11b8..703acf1ae4b05a 100644 --- a/src/plugins/intel_cpu/src/emitters/snippets/x64/cpu_generator.cpp +++ b/src/plugins/intel_cpu/src/emitters/snippets/x64/cpu_generator.cpp @@ -23,7 +23,7 @@ #include "transformations/cpu_opset/common/op/swish_cpu.hpp" #include "transformations/snippets/common/op/fused_mul_add.hpp" #include "transformations/snippets/x64/op/brgemm_copy_b.hpp" -#include "transformations/snippets/x64/op/brgemm_cpu.hpp" +#include "transformations/snippets/x64/op/gemm_cpu.h" #include "transformations/snippets/x64/op/load_convert.hpp" #include "transformations/snippets/x64/op/perf_count_rdtsc.hpp" #include "transformations/snippets/x64/op/store_convert.hpp" diff --git a/src/plugins/intel_cpu/src/emitters/snippets/x64/jit_brgemm_copy_b_emitter.cpp b/src/plugins/intel_cpu/src/emitters/snippets/x64/jit_brgemm_copy_b_emitter.cpp index f68ff469577720..d57faeaf9c1cd2 100644 --- a/src/plugins/intel_cpu/src/emitters/snippets/x64/jit_brgemm_copy_b_emitter.cpp +++ b/src/plugins/intel_cpu/src/emitters/snippets/x64/jit_brgemm_copy_b_emitter.cpp @@ -10,7 +10,7 @@ #include "emitters/plugin/x64/utils.hpp" #include "emitters/snippets/x64/utils.hpp" #include "snippets/utils/utils.hpp" -#include "transformations/snippets/x64/op/brgemm_cpu.hpp" +#include "transformations/snippets/x64/op/gemm_cpu.h" using namespace Xbyak; using namespace dnnl::impl; diff --git a/src/plugins/intel_cpu/src/emitters/snippets/x64/jit_brgemm_emitter.cpp b/src/plugins/intel_cpu/src/emitters/snippets/x64/jit_brgemm_emitter.cpp index 2526c394534434..09da83c3462c4c 100644 --- a/src/plugins/intel_cpu/src/emitters/snippets/x64/jit_brgemm_emitter.cpp +++ b/src/plugins/intel_cpu/src/emitters/snippets/x64/jit_brgemm_emitter.cpp @@ -9,7 +9,7 @@ #include "emitters/snippets/x64/kernel_executors/brgemm_amx.hpp" #include "emitters/snippets/x64/kernel_executors/brgemm_batched.hpp" #include "snippets/utils/utils.hpp" -#include "transformations/snippets/x64/op/brgemm_cpu.hpp" +#include "transformations/snippets/x64/op/gemm_cpu.h" #include "transformations/snippets/x64/op/brgemm_utils.hpp" #include "utils.hpp" diff --git a/src/plugins/intel_cpu/src/emitters/snippets/x64/kernel_executors/brgemm.cpp b/src/plugins/intel_cpu/src/emitters/snippets/x64/kernel_executors/brgemm.cpp index 3cf6c27689119f..39835b6564953d 100644 --- a/src/plugins/intel_cpu/src/emitters/snippets/x64/kernel_executors/brgemm.cpp +++ b/src/plugins/intel_cpu/src/emitters/snippets/x64/kernel_executors/brgemm.cpp @@ -7,7 +7,7 @@ #include "common/utils.hpp" #include "dnnl_extension_utils.h" #include "snippets/lowered/pass/insert_specific_iterations.hpp" -#include "transformations/snippets/x64/op/brgemm_cpu.hpp" +#include "transformations/snippets/x64/op/gemm_cpu.h" #include "transformations/snippets/x64/op/brgemm_utils.hpp" using namespace Xbyak; diff --git a/src/plugins/intel_cpu/src/emitters/snippets/x64/kernel_executors/brgemm_amx.cpp b/src/plugins/intel_cpu/src/emitters/snippets/x64/kernel_executors/brgemm_amx.cpp index 07c448bc83510f..3fcc4e5fa04898 100644 --- a/src/plugins/intel_cpu/src/emitters/snippets/x64/kernel_executors/brgemm_amx.cpp +++ b/src/plugins/intel_cpu/src/emitters/snippets/x64/kernel_executors/brgemm_amx.cpp @@ -6,7 +6,7 @@ #include -#include "transformations/snippets/x64/op/brgemm_cpu.hpp" +#include "transformations/snippets/x64/op/gemm_cpu.h" #include "transformations/snippets/x64/op/brgemm_utils.hpp" #define INNER_K_BLK(dtype) static_cast((brgemm_utils::repacking::compute_inner_k_block(in0_dtype))) diff --git a/src/plugins/intel_cpu/src/emitters/snippets/x64/kernel_executors/brgemm_base.cpp b/src/plugins/intel_cpu/src/emitters/snippets/x64/kernel_executors/brgemm_base.cpp index 4b7d71fd3a879e..bf5dbf4d08b20b 100644 --- a/src/plugins/intel_cpu/src/emitters/snippets/x64/kernel_executors/brgemm_base.cpp +++ b/src/plugins/intel_cpu/src/emitters/snippets/x64/kernel_executors/brgemm_base.cpp @@ -6,7 +6,7 @@ #include "common/utils.hpp" #include "dnnl_extension_utils.h" -#include "transformations/snippets/x64/op/brgemm_cpu.hpp" +#include "transformations/snippets/x64/op/gemm_cpu.h" #include "transformations/snippets/x64/op/brgemm_utils.hpp" #define DIM_CAST(X) static_cast(X) diff --git a/src/plugins/intel_cpu/src/emitters/snippets/x64/kernel_executors/brgemm_batched.cpp b/src/plugins/intel_cpu/src/emitters/snippets/x64/kernel_executors/brgemm_batched.cpp index 034437e5db1d2d..95987be7b43f6c 100644 --- a/src/plugins/intel_cpu/src/emitters/snippets/x64/kernel_executors/brgemm_batched.cpp +++ b/src/plugins/intel_cpu/src/emitters/snippets/x64/kernel_executors/brgemm_batched.cpp @@ -7,7 +7,7 @@ #include "common/utils.hpp" #include "dnnl_extension_utils.h" #include "snippets/lowered/pass/insert_specific_iterations.hpp" -#include "transformations/snippets/x64/op/brgemm_cpu.hpp" +#include "transformations/snippets/x64/op/gemm_cpu.h" #include "transformations/snippets/x64/op/brgemm_utils.hpp" using namespace Xbyak; diff --git a/src/plugins/intel_cpu/src/extension.cpp b/src/plugins/intel_cpu/src/extension.cpp index 999e4be595ce4b..a8c2ab4200d62d 100644 --- a/src/plugins/intel_cpu/src/extension.cpp +++ b/src/plugins/intel_cpu/src/extension.cpp @@ -31,7 +31,7 @@ #include "transformations/cpu_opset/x64/op/mha.hpp" #include "transformations/cpu_opset/x64/op/qkv_proj.hpp" #include "transformations/snippets/x64/op/brgemm_copy_b.hpp" -#include "transformations/snippets/x64/op/brgemm_cpu.hpp" +#include "transformations/snippets/x64/op/gemm_cpu.h" #include "transformations/snippets/x64/op/load_convert.hpp" #include "transformations/snippets/x64/op/perf_count_rdtsc.hpp" #include "transformations/snippets/x64/op/store_convert.hpp" diff --git a/src/plugins/intel_cpu/src/nodes/subgraph.cpp b/src/plugins/intel_cpu/src/nodes/subgraph.cpp index 0bfe7489a0900f..d6adda354d86e9 100644 --- a/src/plugins/intel_cpu/src/nodes/subgraph.cpp +++ b/src/plugins/intel_cpu/src/nodes/subgraph.cpp @@ -32,7 +32,7 @@ #else # include "emitters/snippets/x64/cpu_generator.hpp" # include "executors/x64/subgraph.hpp" -# include "transformations/snippets/x64/pass/brgemm_to_brgemm_cpu.hpp" +# include "transformations/snippets/x64/pass/brgemm_to_gemm_cpu.h" # include "transformations/snippets/x64/pass/eliminate_brgemm_copy_b.hpp" # include "transformations/snippets/x64/pass/enforce_precision.hpp" # include "transformations/snippets/x64/pass/lowered/adjust_brgemm_copy_b_loop_ports.hpp" diff --git a/src/plugins/intel_cpu/src/transformations/snippets/x64/op/brgemm_utils.cpp b/src/plugins/intel_cpu/src/transformations/snippets/x64/op/brgemm_utils.cpp index cfa9018e1b9801..8bdefd3cad2113 100644 --- a/src/plugins/intel_cpu/src/transformations/snippets/x64/op/brgemm_utils.cpp +++ b/src/plugins/intel_cpu/src/transformations/snippets/x64/op/brgemm_utils.cpp @@ -9,7 +9,7 @@ #include "snippets/lowered/expressions/buffer_expression.hpp" #include "snippets/op/buffer.hpp" #include "transformations/snippets/x64/op/brgemm_copy_b.hpp" -#include "transformations/snippets/x64/op/brgemm_cpu.hpp" +#include "transformations/snippets/x64/op/gemm_cpu.h" #include "utils/general_utils.h" using namespace Xbyak; diff --git a/src/plugins/intel_cpu/src/transformations/snippets/x64/op/brgemm_cpu.cpp b/src/plugins/intel_cpu/src/transformations/snippets/x64/op/gemm_cpu.cpp similarity index 85% rename from src/plugins/intel_cpu/src/transformations/snippets/x64/op/brgemm_cpu.cpp rename to src/plugins/intel_cpu/src/transformations/snippets/x64/op/gemm_cpu.cpp index b994ef4fa2d5df..4cda4764c9eb3d 100644 --- a/src/plugins/intel_cpu/src/transformations/snippets/x64/op/brgemm_cpu.cpp +++ b/src/plugins/intel_cpu/src/transformations/snippets/x64/op/gemm_cpu.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "brgemm_cpu.hpp" +#include "gemm_cpu.hpp" #include "snippets/itt.hpp" #include "snippets/lowered/port_descriptor.hpp" @@ -14,7 +14,7 @@ namespace ov { namespace intel_cpu { using namespace brgemm_utils; -BrgemmCPU::BrgemmCPU(const Output& A, +GemmCPU::GemmCPU(const Output& A, const Output& B, BRGEMM_TYPE type, const size_t offset_a, @@ -35,7 +35,7 @@ BrgemmCPU::BrgemmCPU(const Output& A, custom_constructor_validate_and_infer_types(layout_a, layout_b, layout_c); } -BrgemmCPU::BrgemmCPU(const Output& A, +GemmCPU::GemmCPU(const Output& A, const Output& B, const Output& scratch, BRGEMM_TYPE type, @@ -58,7 +58,7 @@ BrgemmCPU::BrgemmCPU(const Output& A, custom_constructor_validate_and_infer_types(layout_a, layout_b, layout_c); } -BrgemmCPU::BrgemmCPU(const Output& A, +GemmCPU::GemmCPU(const Output& A, const Output& B, BRGEMM_TYPE type, const PortDescriptor& desc_a, @@ -76,7 +76,7 @@ BrgemmCPU::BrgemmCPU(const Output& A, custom_constructor_validate_and_infer_types(layout_a, layout_b, layout_c); } -BrgemmCPU::BrgemmCPU(const Output& A, +GemmCPU::GemmCPU(const Output& A, const Output& B, const Output& scratch, BRGEMM_TYPE type, @@ -96,10 +96,10 @@ BrgemmCPU::BrgemmCPU(const Output& A, custom_constructor_validate_and_infer_types(layout_a, layout_b, layout_c); } -void BrgemmCPU::custom_constructor_validate_and_infer_types(const std::vector& layout_a, +void GemmCPU::custom_constructor_validate_and_infer_types(const std::vector& layout_a, const std::vector& layout_b, const std::vector& layout_c) { - INTERNAL_OP_SCOPE(BrgemmCPU_constructor_validate_and_infer_types); + INTERNAL_OP_SCOPE(GemmCPU_constructor_validate_and_infer_types); validate_inputs(); const std::vector planar_input_shapes{ @@ -112,8 +112,8 @@ void BrgemmCPU::custom_constructor_validate_and_infer_types(const std::vector BrgemmCPU::clone_with_new_inputs(const OutputVector& new_args) const { - INTERNAL_OP_SCOPE(BrgemmCPU_clone_with_new_inputs); +std::shared_ptr GemmCPU::clone_with_new_inputs(const OutputVector& new_args) const { + INTERNAL_OP_SCOPE(GemmCPU_clone_with_new_inputs); check_new_args_count(this, new_args); - std::shared_ptr brgemm; + std::shared_ptr brgemm; if (!with_scratchpad(m_type)) { - return std::make_shared( + return std::make_shared( new_args.at(0), new_args.at(1), m_type, @@ -160,7 +160,7 @@ std::shared_ptr BrgemmCPU::clone_with_new_inputs(const OutputVector& new_a snippets::lowered::PortDescriptorUtils::get_port_descriptor_ptr(input(1))->get_layout(), snippets::lowered::PortDescriptorUtils::get_port_descriptor_ptr(output(0))->get_layout()); } else { - return std::make_shared( + return std::make_shared( new_args.at(0), new_args.at(1), new_args.at(2), @@ -175,13 +175,13 @@ std::shared_ptr BrgemmCPU::clone_with_new_inputs(const OutputVector& new_a } } -size_t BrgemmCPU::get_offset_scratch() const { +size_t GemmCPU::get_offset_scratch() const { OPENVINO_ASSERT(with_scratchpad(m_type) && get_input_size() == 3, "Offset of scratchpad must be only in Brgemm with scratchpad on 3rd input"); return get_input_offset(2); } -bool BrgemmCPU::visit_attributes(AttributeVisitor& visitor) { +bool GemmCPU::visit_attributes(AttributeVisitor& visitor) { Brgemm::visit_attributes(visitor); visitor.on_attribute("type", m_type); return true; diff --git a/src/plugins/intel_cpu/src/transformations/snippets/x64/op/brgemm_cpu.hpp b/src/plugins/intel_cpu/src/transformations/snippets/x64/op/gemm_cpu.hpp similarity index 86% rename from src/plugins/intel_cpu/src/transformations/snippets/x64/op/brgemm_cpu.hpp rename to src/plugins/intel_cpu/src/transformations/snippets/x64/op/gemm_cpu.hpp index b70e8fe122aea7..81e61a6f109540 100644 --- a/src/plugins/intel_cpu/src/transformations/snippets/x64/op/brgemm_cpu.hpp +++ b/src/plugins/intel_cpu/src/transformations/snippets/x64/op/gemm_cpu.hpp @@ -13,17 +13,17 @@ namespace ov { namespace intel_cpu { /** - * @interface BrgemmCPU - * @brief BrgemmCPU is a batch-reduced matrix multiplication with the support of arbitrary strides between matrices rows + * @interface GemmCPU + * @brief GemmCPU is a batch-reduced matrix multiplication with the support of arbitrary strides between matrices rows * with support of several precisions on plugin level * @ingroup snippets */ -class BrgemmCPU : public snippets::op::Brgemm { +class GemmCPU : public snippets::op::Brgemm { public: using BRGEMM_TYPE = brgemm_utils::BRGEMM_TYPE; - OPENVINO_OP("BrgemmCPU", "SnippetsOpset", snippets::op::Brgemm); + OPENVINO_OP("GemmCPU", "SnippetsOpset", snippets::op::Brgemm); - BrgemmCPU(const Output& A, + GemmCPU(const Output& A, const Output& B, BRGEMM_TYPE type, const size_t offset_a = 0, @@ -32,7 +32,7 @@ class BrgemmCPU : public snippets::op::Brgemm { const std::vector& layout_a = {}, const std::vector& layout_b = {}, const std::vector& layout_c = {}); - BrgemmCPU(const Output& A, + GemmCPU(const Output& A, const Output& B, const Output& scratch, BRGEMM_TYPE type, @@ -43,7 +43,7 @@ class BrgemmCPU : public snippets::op::Brgemm { const std::vector& layout_a = {}, const std::vector& layout_b = {}, const std::vector& layout_c = {}); - BrgemmCPU(const Output& A, + GemmCPU(const Output& A, const Output& B, BRGEMM_TYPE type, const PortDescriptor& desc_a, @@ -52,7 +52,7 @@ class BrgemmCPU : public snippets::op::Brgemm { const std::vector& layout_a = {}, const std::vector& layout_b = {}, const std::vector& layout_c = {}); - BrgemmCPU(const Output& A, + GemmCPU(const Output& A, const Output& B, const Output& scratch, BRGEMM_TYPE type, @@ -63,7 +63,7 @@ class BrgemmCPU : public snippets::op::Brgemm { const std::vector& layout_a = {}, const std::vector& layout_b = {}, const std::vector& layout_c = {}); - BrgemmCPU() = default; + GemmCPU() = default; void validate_and_infer_types() override; std::shared_ptr clone_with_new_inputs(const OutputVector& new_args) const override; diff --git a/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/brgemm_to_brgemm_cpu.cpp b/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/brgemm_to_gemm_cpu.cpp similarity index 90% rename from src/plugins/intel_cpu/src/transformations/snippets/x64/pass/brgemm_to_brgemm_cpu.cpp rename to src/plugins/intel_cpu/src/transformations/snippets/x64/pass/brgemm_to_gemm_cpu.cpp index cb6f5d3f6a9199..be19227ec354dc 100644 --- a/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/brgemm_to_brgemm_cpu.cpp +++ b/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/brgemm_to_gemm_cpu.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "brgemm_to_brgemm_cpu.hpp" +#include "brgemm_to_gemm_cpu.hpp" #include "cpu/x64/cpu_isa_traits.hpp" #include "cpu_shape.h" @@ -14,7 +14,7 @@ #include "snippets/op/buffer.hpp" #include "snippets/utils/utils.hpp" #include "transformations/snippets/x64/op/brgemm_copy_b.hpp" -#include "transformations/snippets/x64/op/brgemm_cpu.hpp" +#include "transformations/snippets/x64/op/gemm_cpu.hpp" #include "transformations/snippets/x64/op/brgemm_utils.hpp" #include "transformations/tpp/x64/op/modifiers.hpp" #include "utils/general_utils.h" @@ -34,8 +34,8 @@ void set_full_port_desc(const T& port) { } } // namespace -pass::BrgemmToBrgemmCPU::BrgemmToBrgemmCPU() { - MATCHER_SCOPE(BrgemmToBrgemmCPU); +pass::BrgemmToGemmCPU::BrgemmToGemmCPU() { + MATCHER_SCOPE(BrgemmToGemmCPU); auto is_not_tpp = [](const Output& out) { return !std::dynamic_pointer_cast( out.get_node_shared_ptr()); @@ -43,12 +43,12 @@ pass::BrgemmToBrgemmCPU::BrgemmToBrgemmCPU() { auto m_brgemm = ov::pass::pattern::wrap_type(is_not_tpp); auto callback = [=](ov::pass::pattern::Matcher& m) { - OV_ITT_SCOPED_TASK(ov::pass::itt::domains::SnippetsTransform, "ov::intel_cpu::pass::BrgemmToBrgemmCPU") + OV_ITT_SCOPED_TASK(ov::pass::itt::domains::SnippetsTransform, "ov::intel_cpu::pass::BrgemmToGemmCPU") const auto node = m.get_match_root(); const auto brgemm = ov::as_type_ptr(node); - const auto brgemm_plugin = ov::as_type_ptr(node); + const auto brgemm_plugin = ov::as_type_ptr(node); if (!brgemm || brgemm_plugin) { - OPENVINO_THROW("BrgemmCPU cannot be in body before BrgemmToBrgemmCPU pass"); + OPENVINO_THROW("GemmCPU cannot be in body before BrgemmToGemmCPU pass"); } const auto& brgemm_in0_desc = PortDescriptorUtils::get_port_descriptor_ptr(brgemm->input(0)); @@ -69,10 +69,10 @@ pass::BrgemmToBrgemmCPU::BrgemmToBrgemmCPU() { const auto offset_b = brgemm->get_offset_b(); const auto offset_c = brgemm->get_offset_c(); - std::shared_ptr brgemm_cpu = nullptr; + std::shared_ptr brgemm_cpu = nullptr; std::shared_ptr brgemm_repacking = nullptr; if (stand_alone(brgemm_type)) { - brgemm_cpu = std::make_shared(brgemm->input_value(0), + brgemm_cpu = std::make_shared(brgemm->input_value(0), brgemm->input_value(1), brgemm_type, offset_a, @@ -99,8 +99,8 @@ pass::BrgemmToBrgemmCPU::BrgemmToBrgemmCPU() { } if (with_amx(brgemm_type)) { - const auto scratch = std::make_shared(ov::Shape{BrgemmCPU::SCRATCH_BYTE_SIZE}); - brgemm_cpu = std::make_shared(brgemm->input_value(0), + const auto scratch = std::make_shared(ov::Shape{GemmCPU::SCRATCH_BYTE_SIZE}); + brgemm_cpu = std::make_shared(brgemm->input_value(0), brgemm_repacking->output(0), scratch, brgemm_type, @@ -114,7 +114,7 @@ pass::BrgemmToBrgemmCPU::BrgemmToBrgemmCPU() { set_full_port_desc(scratch->output(0)); set_full_port_desc(brgemm_cpu->input(2)); } else if (with_compensations(brgemm_type)) { - brgemm_cpu = std::make_shared(brgemm->input_value(0), + brgemm_cpu = std::make_shared(brgemm->input_value(0), brgemm_repacking->output(0), brgemm_repacking->output(1), brgemm_type, @@ -126,7 +126,7 @@ pass::BrgemmToBrgemmCPU::BrgemmToBrgemmCPU() { std::vector{}, layout_c); } else if (repacking_only(brgemm_type)) { - brgemm_cpu = std::make_shared(brgemm->input_value(0), + brgemm_cpu = std::make_shared(brgemm->input_value(0), brgemm_repacking->output(0), brgemm_type, offset_a, diff --git a/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/brgemm_to_brgemm_cpu.hpp b/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/brgemm_to_gemm_cpu.hpp similarity index 80% rename from src/plugins/intel_cpu/src/transformations/snippets/x64/pass/brgemm_to_brgemm_cpu.hpp rename to src/plugins/intel_cpu/src/transformations/snippets/x64/pass/brgemm_to_gemm_cpu.hpp index 177c6a466765e4..404bf14697adf5 100644 --- a/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/brgemm_to_brgemm_cpu.hpp +++ b/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/brgemm_to_gemm_cpu.hpp @@ -11,31 +11,31 @@ namespace intel_cpu { namespace pass { /** - * @interface BrgemmToBrgemmCPU + * @interface BrgemmToGemmCPU * @brief The pass decompose Snippets Brgemm to specific subgraph that depends on ISA and input precisions: * - f32|f32 without transpose_b: - * BrgemmCPU + * GemmCPU * - u8|i8 or bf16|bf16 (non-AMX system) or i8|i8 (with avx2_vnni_2 support) or with `transpose_b=True`: * \ BrgemmCopyB (the operation for data repacking) * \ Buffer - * BrgemmCPU + * GemmCPU * - i8|i8 (non-AMX system and without avx2_vnni_2) - needs compensations: * \ BrgemmCopyB * \ / \ * \ Buffer (with repacked data) Buffer (with compensations) * \ | / - * BrgemmCPU + * GemmCPU * - f32|f32 with transpose_b, u8|i8, i8|i8 or bf16|bf16 on AMX system or fp16|fp16 on AMX_FP16 system: * \ BrgemmCopyB * \ Buffer (with repacked data) Buffer (with new memory) * \ | / - * BrgemmCPU + * GemmCPU * @ingroup snippets */ -class BrgemmToBrgemmCPU : public ov::pass::MatcherPass { +class BrgemmToGemmCPU : public ov::pass::MatcherPass { public: - OPENVINO_MATCHER_PASS_RTTI("BrgemmToBrgemmCPU"); - BrgemmToBrgemmCPU(); + OPENVINO_MATCHER_PASS_RTTI("BrgemmToGemmCPU"); + BrgemmToGemmCPU(); }; } // namespace pass diff --git a/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/adjust_brgemm_copy_b_loop_ports.cpp b/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/adjust_brgemm_copy_b_loop_ports.cpp index f283d05881d24f..4e6ac9e46dfca1 100644 --- a/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/adjust_brgemm_copy_b_loop_ports.cpp +++ b/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/adjust_brgemm_copy_b_loop_ports.cpp @@ -9,7 +9,7 @@ #include "snippets/lowered/loop_manager.hpp" #include "snippets/utils/utils.hpp" #include "transformations/snippets/x64/op/brgemm_copy_b.hpp" -#include "transformations/snippets/x64/op/brgemm_cpu.hpp" +#include "transformations/snippets/x64/op/gemm_cpu.h" namespace ov { namespace intel_cpu { diff --git a/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/brgemm_cpu_blocking.cpp b/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/brgemm_cpu_blocking.cpp index 017c7e75d35e42..9694214508bcb2 100644 --- a/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/brgemm_cpu_blocking.cpp +++ b/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/brgemm_cpu_blocking.cpp @@ -10,7 +10,7 @@ #include "snippets/lowered/pass/pass.hpp" #include "snippets/snippets_isa.hpp" #include "snippets/utils/utils.hpp" -#include "transformations/snippets/x64/op/brgemm_cpu.hpp" +#include "transformations/snippets/x64/op/gemm_cpu.h" #include "transformations/snippets/x64/op/brgemm_utils.hpp" namespace ov { diff --git a/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/brgemm_cpu_blocking.hpp b/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/brgemm_cpu_blocking.hpp index 2700a28b6d674c..0b559a2be5ebca 100644 --- a/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/brgemm_cpu_blocking.hpp +++ b/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/brgemm_cpu_blocking.hpp @@ -5,7 +5,7 @@ #pragma once #include "snippets/lowered/pass/brgemm_blocking.hpp" -#include "transformations/snippets/x64/op/brgemm_cpu.hpp" +#include "transformations/snippets/x64/op/gemm_cpu.h" namespace ov { namespace intel_cpu { diff --git a/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/build_brgemm.cpp b/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/build_brgemm.cpp index c2419726a75d95..3b2ca441e1c7ed 100644 --- a/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/build_brgemm.cpp +++ b/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/build_brgemm.cpp @@ -16,7 +16,7 @@ #include "snippets/op/buffer.hpp" #include "snippets/utils/utils.hpp" #include "transformations/snippets/x64/op/brgemm_copy_b.hpp" -#include "transformations/snippets/x64/op/brgemm_cpu.hpp" +#include "transformations/snippets/x64/op/gemm_cpu.h" #include "transformations/snippets/x64/op/brgemm_utils.hpp" #include "transformations/tpp/x64/op/modifiers.hpp" #include "utils/general_utils.h" diff --git a/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/external_repacking_adjuster.cpp b/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/external_repacking_adjuster.cpp index add7c66d3d7ffc..f5f20764c7a7f0 100644 --- a/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/external_repacking_adjuster.cpp +++ b/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/external_repacking_adjuster.cpp @@ -9,7 +9,7 @@ #include "memory_desc/cpu_blocked_memory_desc.h" #include "snippets/itt.hpp" #include "snippets/utils/utils.hpp" -#include "transformations/snippets/x64/op/brgemm_cpu.hpp" +#include "transformations/snippets/x64/op/gemm_cpu.h" #include "transformations/snippets/x64/op/brgemm_utils.hpp" namespace ov { diff --git a/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/insert_brgemm_copy_buffers.cpp b/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/insert_brgemm_copy_buffers.cpp index b38562fa088bb1..434e2b4fb7c58b 100644 --- a/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/insert_brgemm_copy_buffers.cpp +++ b/src/plugins/intel_cpu/src/transformations/snippets/x64/pass/lowered/insert_brgemm_copy_buffers.cpp @@ -8,7 +8,7 @@ #include "snippets/itt.hpp" #include "snippets/lowered/loop_manager.hpp" #include "transformations/snippets/x64/op/brgemm_copy_b.hpp" -#include "transformations/snippets/x64/op/brgemm_cpu.hpp" +#include "transformations/snippets/x64/op/gemm_cpu.h" using namespace ov::intel_cpu::brgemm_utils::repacking; using namespace ov::snippets::lowered; diff --git a/src/plugins/intel_cpu/src/transformations/snippets/x64/shape_inference.cpp b/src/plugins/intel_cpu/src/transformations/snippets/x64/shape_inference.cpp index 5f6515b25759ad..c0af9f0b7a6010 100644 --- a/src/plugins/intel_cpu/src/transformations/snippets/x64/shape_inference.cpp +++ b/src/plugins/intel_cpu/src/transformations/snippets/x64/shape_inference.cpp @@ -7,7 +7,7 @@ #include #include "op/brgemm_copy_b.hpp" -#include "op/brgemm_cpu.hpp" +#include "op/gemm_cpu.h" #include "op/load_convert.hpp" #include "op/perf_count_rdtsc.hpp" #include "op/store_convert.hpp" diff --git a/src/plugins/intel_cpu/src/transformations/tpp/x64/op/brgemm.hpp b/src/plugins/intel_cpu/src/transformations/tpp/x64/op/brgemm.hpp index cda7f58afebea8..06fd869ee02c32 100644 --- a/src/plugins/intel_cpu/src/transformations/tpp/x64/op/brgemm.hpp +++ b/src/plugins/intel_cpu/src/transformations/tpp/x64/op/brgemm.hpp @@ -5,7 +5,7 @@ #pragma once #include "modifiers.hpp" -#include "transformations/snippets/x64/op/brgemm_cpu.hpp" +#include "transformations/snippets/x64/op/gemm_cpu.h" namespace ov { namespace intel_cpu { diff --git a/src/plugins/intel_cpu/tests/unit/snippets_transformations/x64/lowered/brgemm_blocking.cpp b/src/plugins/intel_cpu/tests/unit/snippets_transformations/x64/lowered/brgemm_blocking.cpp index fc6783f3b3ca45..3dd339d106446d 100644 --- a/src/plugins/intel_cpu/tests/unit/snippets_transformations/x64/lowered/brgemm_blocking.cpp +++ b/src/plugins/intel_cpu/tests/unit/snippets_transformations/x64/lowered/brgemm_blocking.cpp @@ -12,7 +12,7 @@ #include "snippets/lowered/loop_info.hpp" #include "snippets/snippets_isa.hpp" #include "transformations/snippets/x64/op/brgemm_copy_b.hpp" -#include "transformations/snippets/x64/op/brgemm_cpu.hpp" +#include "transformations/snippets/x64/op/gemm_cpu.h" #include "transformations/tpp/x64/op/brgemm.hpp" #include "cpu/x64/cpu_isa_traits.hpp" diff --git a/src/plugins/intel_cpu/tests/unit/snippets_transformations/x64/lowered/buffer_allocation.cpp b/src/plugins/intel_cpu/tests/unit/snippets_transformations/x64/lowered/buffer_allocation.cpp index 7c425b0bca6781..645ff3e684e5a6 100644 --- a/src/plugins/intel_cpu/tests/unit/snippets_transformations/x64/lowered/buffer_allocation.cpp +++ b/src/plugins/intel_cpu/tests/unit/snippets_transformations/x64/lowered/buffer_allocation.cpp @@ -19,7 +19,7 @@ #include "transformations/snippets/x64/shape_inference.hpp" #include "transformations/snippets/x64/pass/lowered/brgemm_cpu_blocking.hpp" #include "transformations/snippets/x64/pass/lowered/insert_brgemm_copy_buffers.hpp" -#include "transformations/snippets/x64/op/brgemm_cpu.hpp" +#include "transformations/snippets/x64/op/gemm_cpu.h" #include "transformations/snippets/x64/op/brgemm_copy_b.hpp" #include "common_test_utils/ov_test_utils.hpp"