[CPU ]Fix bf16 marking logic & remove useless convert (#15404)

2023-03-07 10:02:14 +00:00
parent 4cea80915d
commit 6fbaf4745a
7 changed files with 161 additions and 2 deletions
@@ -0,0 +1,92 @@
+// Copyright (C) 2022 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#include "ngraph_functions/builders.hpp"
+#include "ngraph_functions/utils/ngraph_helpers.hpp"
+#include "shared_test_classes/base/layer_test_utils.hpp"
+#include "shared_test_classes/base/ov_subgraph.hpp"
+#include "test_utils/cpu_test_utils.hpp"
+#include "test_utils/fusing_test_utils.hpp"
+
+using namespace ov::test;
+using namespace ngraph;
+using namespace CPUTestUtils;
+using namespace InferenceEngine;
+
+namespace SubgraphTestsDefinitions {
+using RemoveConvertCPUTestParams = std::tuple<ElementType, InputShape>;
+
+class RemoveUselessBF16ConvertCPUTest : public testing::WithParamInterface<RemoveConvertCPUTestParams>,
+                             virtual public SubgraphBaseTest,
+                             public CPUTestsBase {
+public:
+    static std::string getTestCaseName(const testing::TestParamInfo<RemoveConvertCPUTestParams>& obj) {
+        ElementType inType;
+        InputShape inputShape;
+        std::tie(inType, inputShape) = obj.param;
+        std::ostringstream result;
+        result << "IS=" << inputShape << "_";
+        result << "Prc=" << inType;
+        return result.str();
+    }
+
+    void SetUp() override {
+        ElementType inType;
+        InputShape inputShape;
+        std::tie(inType, inputShape) = this->GetParam();
+        targetDevice = CommonTestUtils::DEVICE_CPU;
+        if (inType == ElementType::bf16) {
+            configuration.insert({"ENFORCE_BF16", "YES"});
+        }
+        std::tie(inFmts, outFmts, priority, selectedType) =
+            CPUSpecificParams{{}, {}, {}, makeSelectedTypeStr("ref", inType)};
+        init_input_shapes({inputShape});
+        auto input_params = builder::makeDynamicParams(inType, {inputShape.first});
+        auto convert = builder::makeConversion(input_params[0], element::f32, ::helpers::ConversionTypes::CONVERT);
+        auto begin = builder::makeConstant(element::i64, ov::Shape{4}, std::vector<int64_t>{0, 0, 0, 0});
+        auto end = builder::makeConstant(element::i64, ov::Shape{4}, std::vector<int64_t>{0, 0, 16, 0});
+        auto stride = builder::makeConstant(element::i64, ov::Shape{4}, std::vector<int64_t>{1, 1, 1, 1});
+        auto slice = builder::makeStridedSlice(convert,
+                                               begin,
+                                               end,
+                                               stride,
+                                               element::f32,
+                                               {0, 0, 0, 0},
+                                               {1, 1, 0, 1},
+                                               {},
+                                               {},
+                                               {});
+        auto convert2 = builder::makeConversion(slice, inType, ::helpers::ConversionTypes::CONVERT);
+        function = std::make_shared<ov::Model>(convert2, input_params, "remove_convert");
+    };
+};
+
+TEST_P(RemoveUselessBF16ConvertCPUTest, CompareWithRefs) {
+    run();
+    //Convert is removed by graph_optimizer
+    CheckNumberOfNodesWithType(compiledModel, "Convert", 0);
+    //Disable Convert with Snippet
+    CheckNumberOfNodesWithType(compiledModel, "Subgraph", 0);
+    CheckPluginRelatedResults(compiledModel, "StridedSlice");
+}
+namespace {
+const std::vector<ElementType> inPrecisions = {
+    // only bf16 could match this pattern
+    ElementType::bf16,
+};
+
+const std::vector<InputShape> inputShapes = {
+    // dynamic batch
+    {{-1, 4, 32, 64}, {{1, 4, 32, 64}, {2, 4, 32, 64}, {3, 4, 32, 64}}},
+    {{-1, -1, -1, -1}, {{1, 4, 32, 64}, {2, 4, 32, 64}, {3, 4, 32, 64}}},
+    // static shape
+    {{1, 4, 32, 64}, {{1, 4, 32, 64}}},
+};
+
+INSTANTIATE_TEST_SUITE_P(smoke_RemoveConvert,
+                         RemoveUselessBF16ConvertCPUTest,
+                         ::testing::Combine(::testing::ValuesIn(inPrecisions), ::testing::ValuesIn(inputShapes)),
+                         RemoveUselessBF16ConvertCPUTest::getTestCaseName);
+}  // namespace
+}  // namespace SubgraphTestsDefinitions