Skip to content

Commit

Permalink
[RTTI] Apply OPENVINO_MATCHER_PASS_RTTI in Plugins (#28124)
Browse files Browse the repository at this point in the history
### Details:
 - Applied OPENVINO_MATCHER_PASS_RTTI helper macro in Plugins.

### Tickets:
 - CVS-159567

---------

Signed-off-by: Tomasz Jankowski <[email protected]>
Co-authored-by: Michal Lukaszewski <[email protected]>
  • Loading branch information
t-jankowski and mlukasze authored Dec 19, 2024
1 parent e9400c5 commit 83a55df
Show file tree
Hide file tree
Showing 66 changed files with 123 additions and 69 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ namespace intel_cpu {

class ConvertGroupConvolution : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("ConvertGroupConvolution", "0");
OPENVINO_MATCHER_PASS_RTTI("ConvertGroupConvolution");
ConvertGroupConvolution();
};
} // namespace intel_cpu
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ namespace ov {
namespace intel_cpu {
class ConvertConv1DBase : public ov::pass::MatcherPass {
protected:
OPENVINO_RTTI("ConvertConv1DBase", "0");
OPENVINO_MATCHER_PASS_RTTI("ConvertConv1DBase");
template <class Conv>
ov::matcher_pass_callback convert_conv1d_to_conv2d();
};
Expand All @@ -71,4 +71,4 @@ class ConvertGroupConv1D : public ConvertConv1DBase {
ConvertGroupConv1D();
};
} // namespace intel_cpu
} // namespace ov
} // namespace ov
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ namespace intel_cpu {

class ConvertReduceMultiAxisBase : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("ConvertReduceMultiAxisBase", "0");
OPENVINO_MATCHER_PASS_RTTI("ConvertReduceMultiAxisBase");
template <class T>
ov::matcher_pass_callback convert_reduce();
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace intel_cpu {

class ConvertReduceNoKeepDimsBase : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("ConvertReduceNoKeepDims", "0");
OPENVINO_MATCHER_PASS_RTTI("ConvertReduceNoKeepDimsBase");
template <class T>
ov::matcher_pass_callback convert_reduce();
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace intel_cpu {

class MishDecomposition : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("MishDecomposition", "0");
OPENVINO_MATCHER_PASS_RTTI("MishDecomposition");
MishDecomposition();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace intel_cpu {

class AlignMatMulInputRanks : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("AlignMatMulInputRanks", "0");
OPENVINO_MATCHER_PASS_RTTI("AlignMatMulInputRanks");
AlignMatMulInputRanks();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ using namespace ov::gen_pattern;

class CausalMaskPreprocess : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("CausalMaskPreprocess", "0");
OPENVINO_MATCHER_PASS_RTTI("CausalMaskPreprocess");
CausalMaskPreprocess();

private:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace intel_cpu {

class ConvertBroadcastToTiles : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("ConvertBroadcastToTiles", "0");
OPENVINO_MATCHER_PASS_RTTI("ConvertBroadcastToTiles");
ConvertBroadcastToTiles();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ namespace intel_cpu {

class ConvertFqRnnToQuantizedRnn : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("ConvertFqRnnToQuantizedRnn", "0");
OPENVINO_MATCHER_PASS_RTTI("ConvertFqRnnToQuantizedRnn");
ConvertFqRnnToQuantizedRnn();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace intel_cpu {

class ConvertMatMulToFC : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("ConvertMatMulToFC", "0");
OPENVINO_MATCHER_PASS_RTTI("ConvertMatMulToFC");
ConvertMatMulToFC();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace intel_cpu {

class ConvertTileToSeqTiles : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("ConvertTileToSeqTiles", "0");
OPENVINO_MATCHER_PASS_RTTI("ConvertTileToSeqTiles");
ConvertTileToSeqTiles();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace intel_cpu {

class ConvertToLeakyRelu : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("ConvertToLeakyRelu", "0");
OPENVINO_MATCHER_PASS_RTTI("ConvertToLeakyRelu");
ConvertToLeakyRelu();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace intel_cpu {

class ConvertToPowerStatic : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("ConvertToPowerStatic", "0");
OPENVINO_MATCHER_PASS_RTTI("ConvertToPowerStatic");
ConvertToPowerStatic();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace intel_cpu {

class ConvertToSwishCPU : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("ConvertToSwishCPU", "0");
OPENVINO_MATCHER_PASS_RTTI("ConvertToSwishCPU");
ConvertToSwishCPU();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace intel_cpu {

class DecomposeIntegerDivide : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("DecomposeIntegerDivide", "0");
OPENVINO_MATCHER_PASS_RTTI("DecomposeIntegerDivide");
DecomposeIntegerDivide();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace intel_cpu {

class DecomposeRMSNorm : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("DecomposeRMSNorm", "0");
OPENVINO_MATCHER_PASS_RTTI("DecomposeRMSNorm");
DecomposeRMSNorm();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace intel_cpu {

class FullyConnectedBiasFusion : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("FullyConnectedBiasFusion", "0");
OPENVINO_MATCHER_PASS_RTTI("FullyConnectedBiasFusion");
FullyConnectedBiasFusion();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace pass {

class InsertConvertAfterExtension : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("InsertConvertAfterExtension", "0");
OPENVINO_MATCHER_PASS_RTTI("InsertConvertAfterExtension");
InsertConvertAfterExtension(bool convert_output_precision = true);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace intel_cpu {
*/
class MoveFCReshapeToWeights : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("MoveFCReshapeToWeights", "0");
OPENVINO_MATCHER_PASS_RTTI("MoveFCReshapeToWeights");
MoveFCReshapeToWeights();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace intel_cpu {

class NgramFusion : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("NgramFusion", "0");
OPENVINO_MATCHER_PASS_RTTI("NgramFusion");
NgramFusion();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace intel_cpu {

class PermuteSliceAndInterpolation : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("PermuteSliceAndInterpolation", "0");
OPENVINO_MATCHER_PASS_RTTI("PermuteSliceAndInterpolation");
PermuteSliceAndInterpolation();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ namespace intel_cpu {

class OptimizeGRUSequenceTransposes : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("OptimizeGRUSequenceTransposes", "0");
OPENVINO_MATCHER_PASS_RTTI("OptimizeGRUSequenceTransposes");
OptimizeGRUSequenceTransposes();
};

class OptimizeLSTMSequenceTransposes : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("OptimizeLSTMSequenceTransposes", "0");
OPENVINO_MATCHER_PASS_RTTI("OptimizeLSTMSequenceTransposes");
OptimizeLSTMSequenceTransposes();
};

class OptimizeRNNSequenceTransposes : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("OptimizeRNNSequenceTransposes", "0");
OPENVINO_MATCHER_PASS_RTTI("OptimizeRNNSequenceTransposes");
OptimizeRNNSequenceTransposes();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace ov {
namespace intel_cpu {
class StatefulSDPAFusion : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("StatefulSDPAFusion", "0");
OPENVINO_MATCHER_PASS_RTTI("StatefulSDPAFusion");
StatefulSDPAFusion();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ namespace intel_cpu {

class SwapConvertTranspose : public ov::pass::MatcherPass {
public:
OPENVINO_MATCHER_PASS_RTTI("SwapConvertTranspose");
SwapConvertTranspose();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ namespace intel_cpu {

class ConvertToInteraction : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("ConvertToInteraction", "0");
OPENVINO_MATCHER_PASS_RTTI("ConvertToInteraction");
ConvertToInteraction();
};

class FuseFQtoInteraction : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("FuseFQtoInteraction", "0");
OPENVINO_MATCHER_PASS_RTTI("FuseFQtoInteraction");
FuseFQtoInteraction();
};

class ConvertInteractionInt8 : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("ConvertInteractionInt8", "0");
OPENVINO_MATCHER_PASS_RTTI("ConvertInteractionInt8");
ConvertInteractionInt8();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ namespace ov {
namespace intel_cpu {

class MHAFusionBase : public ov::pass::MatcherPass {
public:
OPENVINO_MATCHER_PASS_RTTI("MHAFusionBase");

protected:
bool valid_transpose_order(const std::shared_ptr<ov::Node>& node, const std::vector<int64_t>& expected_order) {
if (auto transpose_pattern = ov::as_type_ptr<ov::opset4::Constant>(node)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ namespace intel_cpu {

class MLPFusion : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("MLPFusion", "0");
OPENVINO_MATCHER_PASS_RTTI("MLPFusion");
MLPFusion();
};

} // namespace intel_cpu
} // namespace ov
} // namespace ov
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ namespace intel_cpu {

class QKVProjFusion : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("QKVProjFusion", "0");
OPENVINO_MATCHER_PASS_RTTI("QKVProjFusion");
QKVProjFusion();
};

class QKVProjFusion2 : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("QKVProjFusion2", "0");
OPENVINO_MATCHER_PASS_RTTI("QKVProjFusion2");
QKVProjFusion2();
};

} // namespace intel_cpu
} // namespace ov
} // namespace ov
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace ov {
namespace intel_cpu {
class SDPAFuseTransposeReshape : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("SDPAFuseTransposeReshape", "0");
OPENVINO_MATCHER_PASS_RTTI("SDPAFuseTransposeReshape");
SDPAFuseTransposeReshape();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ namespace pass {
*/
class MulAddToFMA : public ov::pass::MatcherPass {
public:
OPENVINO_MATCHER_PASS_RTTI("MulAddToFMA");
MulAddToFMA();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ namespace pass {
*/
class BrgemmToBrgemmCPU : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("BrgemmToBrgemmCPU", "0");
OPENVINO_MATCHER_PASS_RTTI("BrgemmToBrgemmCPU");
BrgemmToBrgemmCPU();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace pass {
*/
class EliminateBrgemmCopyB : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("EliminateBrgemmCopyB", "0");
OPENVINO_MATCHER_PASS_RTTI("EliminateBrgemmCopyB");
EliminateBrgemmCopyB();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace pass {
*/
class RemoveConverts : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("RemoveConverts", "0");
OPENVINO_MATCHER_PASS_RTTI("RemoveConverts");
RemoveConverts();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace pass {
*/
class BrgemmToBrgemmTPP: public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("BrgemmToBrgemmTPP", "0");
OPENVINO_MATCHER_PASS_RTTI("BrgemmToBrgemmTPP");
BrgemmToBrgemmTPP();

static bool is_supported_brgemm_configuration(const std::vector<std::vector<size_t>>& layouts,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace pass {
*/
class EltwiseToEltwiseTPP: public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("EltwiseToEltwiseTPP", "0");
OPENVINO_MATCHER_PASS_RTTI("EltwiseToEltwiseTPP");
EltwiseToEltwiseTPP();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace pass {
*/
class ScalarToScalarTPP: public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("ScalarToScalarTPP", "0");
OPENVINO_MATCHER_PASS_RTTI("ScalarToScalarTPP");
ScalarToScalarTPP();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace intel_gpu {
// and adds optional padding to align elements count to `alignment` value
class BroadcastAndPadZeroPointBuffers : public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("BroadcastAndPadZeroPointBuffers", "0");
OPENVINO_MATCHER_PASS_RTTI("BroadcastAndPadZeroPointBuffers");
BroadcastAndPadZeroPointBuffers(size_t alignment = 1, bool supports_immad = false);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace intel_gpu {

class ConvertBinaryConvolutionToConvolution: public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("ConvertBinaryConvolutionToConvolution", "0");
OPENVINO_MATCHER_PASS_RTTI("ConvertBinaryConvolutionToConvolution");
ConvertBinaryConvolutionToConvolution();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace intel_gpu {
*/
class ClampFP16Output: public ov::pass::MatcherPass {
public:
OPENVINO_RTTI("ov::intel_gpu::ClampFP16Output");
OPENVINO_MATCHER_PASS_RTTI("ov::intel_gpu::ClampFP16Output");

ClampFP16Output();
};
Expand Down
Loading

0 comments on commit 83a55df

Please sign in to comment.