Fixed compressed Gather optimization

Author: dmitry-gorokhov

src/plugins/intel_cpu/src/graph_optimizer.cpp

@@ -543,10 +543,18 @@ void GraphOptimizer::FuseGatherAndWeightsDecompression(Graph &graph) {
         NodePtr subtractNode = mulParent;
         if (!expectedNode(subtractNode, Type::Eltwise))
             continue;
-        auto subtractConstNode = subtractNode->getParentEdgeAt(1)->getParent();
+        NodePtr subtractConvertNode, subtractConstNode;
+        NodePtr subtractParent = subtractNode->getParentEdgeAt(1)->getParent();
+        if (expectedNode(subtractParent, Type::Convert)) {
+            subtractConvertNode = subtractParent;
+            subtractParent = subtractConvertNode->getParentEdgeAt(0)->getParent();
+        }
+        subtractConstNode = subtractParent;
         if (!expectedNode(subtractConstNode, Type::Input))
             continue;
 
+        const bool withSubtractConvert = subtractConvertNode != nullptr;
+
         auto convertNode = subtractNode->getParentEdgeAt(0)->getParent();
         if (!expectedNode(convertNode, Type::Convert))
             continue;
@@ -597,13 +605,20 @@ void GraphOptimizer::FuseGatherAndWeightsDecompression(Graph &graph) {
         gatherNode->addOriginalLayer(multiplyNode->getOriginalLayers());
         gatherNode->addOriginalLayer(convertNode->getOriginalLayers());
 
+        if (withSubtractConvert) {
+            gatherNode->addOriginalLayer(subtractConvertNode->getOriginalLayers());
+            auto subtractConvertEdge = subtractConvertNode->getChildEdges()[0].lock();
+            graph.RemoveEdge(subtractConvertEdge);
+        }
         gatherNode->addOriginalLayer(subtractNode->getOriginalLayers());
         auto subtractConstEdge = subtractConstNode->getChildEdges()[0].lock();
         graph.RemoveEdge(subtractConstEdge);
 
         auto multiplyConstEdge = multiplyConstNode->getChildEdges()[0].lock();
         graph.RemoveEdge(multiplyConstEdge);
 
+        if (withSubtractConvert)
+            graph.DropNode(subtractConvertNode);
         graph.DropNode(convertNode);
         graph.DropNode(subtractNode);
         graph.DropNode(multiplyNode);

src/plugins/intel_cpu/src/nodes/gather.cpp

@@ -715,12 +715,7 @@ void Gather::fuseDecompressionConstant(const MemoryCPtr& memory, MemoryCPtr& dec
     } else {
         DnnlBlockedMemoryDesc memoryDesc(decompression_prc, memory->getShape());
         decompressionValuesPtr = std::make_shared<Memory>(getEngine(), memoryDesc, nullptr, false);
-        const auto elementsCount = memory->getDescWithType<BlockedMemoryDesc>()->getPaddedElementsCount();
-        cpu_convert(memory->getData(),
-                    decompressionValuesPtr->getData(),
-                    DnnlExtensionUtils::DataTypeToElementType(memory->getDataType()),
-                    ov::element::f32,
-                    elementsCount);
+        decompressionValuesPtr->load(*memory);
     }
 }