Moved legacy library and deprecated tests to GNA (#15244)

.ci/azure/linux.yml

@@ -403,6 +403,12 @@ jobs:
   - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_transformations_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Transformations.xml
     displayName: 'Transformations Tests'
 
+  - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_legacy_transformations_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-LegacyTransformations.xml
+    displayName: 'Legacy Transformations Tests'
+
+  - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/commonUtilsTests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-CommonUtilTests.xml
+    displayName: 'Common Utils Tests'
+
   - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/InferenceEngineUnitTests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-InferenceEngineUnitTests.xml
     displayName: 'IE UT old'
 

.ci/azure/linux_debian.yml

@@ -320,8 +320,7 @@ jobs:
       LD_LIBRARY_PATH: $(INSTALL_TEST_DIR)
     displayName: 'Paddle Frontend UT'
 
-  - script: |
-      $(INSTALL_TEST_DIR)/ov_tensorflow_frontend_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Tensorflow.xml
+  - script: $(INSTALL_TEST_DIR)/ov_tensorflow_frontend_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Tensorflow.xml
     env:
       LD_LIBRARY_PATH: $(INSTALL_TEST_DIR)
     displayName: 'TensorFlow Frontend Unit Tests'

.ci/azure/windows.yml

@@ -286,6 +286,12 @@ jobs:
 
   - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ov_transformations_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)\Transformations.xml
     displayName: 'Transformations Tests'
+    
+  - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ov_legacy_transformations_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)\LegacyTransformations.xml
+    displayName: 'Legacy Transformations Tests'
+    
+  - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\commonUtilsTests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)\CommonUtilTests.xml
+    displayName: 'Common Utils Tests'
 
   - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\InferenceEngineUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-InferenceEngineUnitTests.xml
     displayName: 'IE UT old'

.github/CODEOWNERS

@@ -42,7 +42,6 @@
 
 # OpenVINO Func Tests:
 /src/tests/  @openvinotoolkit/openvino-ie-tests-maintainers @openvinotoolkit/openvino-ie-test-developers
-/src/tests_deprecated/  @openvinotoolkit/openvino-ie-tests-maintainers @openvinotoolkit/openvino-ie-test-developers
 /src/frontends/tests/frontend/shared/ @openvinotoolkit/openvino-ie-tests-maintainers
 /thirdparty/gtest/ @openvinotoolkit/openvino-ie-tests-maintainers
 
@@ -61,7 +60,6 @@
 
 # OpenVINO GNA:
 /src/plugins/intel_gna/  @openvinotoolkit/openvino-ie-gna-maintainers
-/src/common/legacy/ @openvinotoolkit/openvino-ie-gna-maintainers
 
 # OpenVINO Auto (MULTI) plugin:
 /src/plugins/auto/  @openvinotoolkit/openvino-ie-auto-multi-maintainers

.github/labeler.yml

@@ -56,7 +56,6 @@
 
 'category: GNA':
 - 'src/plugins/intel_gna/**/*'
-- 'src/common/legacy/**/*'
 
 'category: GPU':
 - 'src/plugins/intel_gpu/**/*'

cmake/coverage.cmake

@@ -41,13 +41,8 @@ ov_coverage_extract(INPUT "openvino" OUTPUT "low_precision_transformations"
 ov_coverage_genhtml(INFO_FILE "low_precision_transformations"
                     PREFIX "${OV_COVERAGE_BASE_DIRECTORY}")
 
-ov_coverage_extract(INPUT "openvino" OUTPUT "legacy"
-                    PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/src/common/legacy/*")
-ov_coverage_genhtml(INFO_FILE "legacy"
-                    PREFIX "${OV_COVERAGE_BASE_DIRECTORY}")
-
 ov_coverage_extract(INPUT "openvino" OUTPUT "preprocessing"
-                    PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}src/common/preprocessing/*")
+                    PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}src/common/preprocessing/src/*")
 ov_coverage_genhtml(INFO_FILE "preprocessing"
                     PREFIX "${OV_COVERAGE_BASE_DIRECTORY}")
 

cmake/developer_package/IEDevScriptsConfig.cmake

@@ -215,6 +215,8 @@ set(CMAKE_POLICY_DEFAULT_CMP0026 NEW)
 set(CMAKE_POLICY_DEFAULT_CMP0042 NEW)
 # CMake 3.9+: `RPATH` settings on macOS do not affect `install_name`.
 set(CMAKE_POLICY_DEFAULT_CMP0068 NEW)
+# CMake 3.12+: find_package() uses <PackageName>_ROOT variables.
+set(CMAKE_POLICY_DEFAULT_CMP0074 NEW)
 # CMake 3.13+: option() honors normal variables.
 set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 # CMake 3.19+: An imported target missing its location property fails during generation.

cmake/features.cmake

@@ -98,9 +98,7 @@ ie_option (ENABLE_HETERO "Enables Hetero Device Plugin" ON)
 
 ie_option (ENABLE_TEMPLATE "Enable template plugin" ON)
 
-ie_dependent_option (ENABLE_GAPI_TESTS "tests for GAPI kernels" ON "ENABLE_GAPI_PREPROCESSING;ENABLE_TESTS" OFF)
-
-ie_dependent_option (GAPI_TEST_PERF "if GAPI unit tests should examine performance" OFF "ENABLE_GAPI_TESTS" OFF)
+ie_dependent_option (GAPI_TEST_PERF "if GAPI unit tests should examine performance" OFF "ENABLE_TESTS;ENABLE_GAPI_PREPROCESSING" OFF)
 
 ie_dependent_option (ENABLE_DATA "fetch models from testdata repo" ON "ENABLE_FUNCTIONAL_TESTS;NOT ANDROID" OFF)
 

docs/Doxyfile.config

@@ -833,17 +833,9 @@ INPUT                  = "@MARKDOWN_INPUT@" \
                          "@OpenVINO_SOURCE_DIR@/src/frontends/common/include/" \
                          "@OpenVINO_SOURCE_DIR@/src/common/conditional_compilation/include/" \
                          "@OpenVINO_SOURCE_DIR@/src/common/itt/include/" \
-                         "@OpenVINO_SOURCE_DIR@/src/common/legacy/include/" \
-                         "@OpenVINO_SOURCE_DIR@/src/common/legacy/include/" \
                          "@OpenVINO_SOURCE_DIR@/src/common/low_precision_transformations/include/" \
                          "@OpenVINO_SOURCE_DIR@/src/common/low_precision_transformations/include/" \
                          "@OpenVINO_SOURCE_DIR@/src/common/offline_transformations/include/" \
-                         "@OpenVINO_SOURCE_DIR@/src/common/preprocessing/" \
-                         "@OpenVINO_SOURCE_DIR@/src/common/preprocessing/arm_neon/" \
-                         "@OpenVINO_SOURCE_DIR@/src/common/preprocessing/cpu_x86_avx2/" \
-                         "@OpenVINO_SOURCE_DIR@/src/common/preprocessing/cpu_x86_avx512/" \
-                         "@OpenVINO_SOURCE_DIR@/src/common/preprocessing/cpu_x86_sse42/" \
-                         "@OpenVINO_SOURCE_DIR@/src/common/snippets/include/" \
                          "@OpenVINO_SOURCE_DIR@/src/common/transformations/include/" \
                          "@OpenVINO_SOURCE_DIR@/src/common/util/include/" \
                          "@OpenVINO_SOURCE_DIR@/src/core/include/" \

docs/dev/test_coverage.md

@@ -65,7 +65,6 @@ coverage/paddle_frontend/index.html
 coverage/tf_frontend/index.html
 coverage/openvino/index.html
 coverage/onnx_frontend/index.html
-coverage/legacy/index.html
 coverage/ir_frontend/index.html
 coverage/low_precision_transformations/index.html
 coverage/template_plugin/index.html

docs/snippets/CMakeLists.txt

@@ -92,7 +92,7 @@ target_include_directories(${TARGET_NAME} PRIVATE "${OpenVINO_SOURCE_DIR}/src/in
                                                   "${OpenVINO_SOURCE_DIR}/src/core/include"
                                                   "${OpenVINO_SOURCE_DIR}/src/bindings/c/include"
                                                   "${OpenVINO_SOURCE_DIR}/src/common/transformations/include"
-                                                  "${OpenVINO_SOURCE_DIR}/src/common/preprocessing"
+                                                  "${OpenVINO_SOURCE_DIR}/src/common/preprocessing/src"
                                                   "${OpenVINO_SOURCE_DIR}/src/common/util/include"
                                                   "${OpenVINO_SOURCE_DIR}/src/common/low_precision_transformations/include"
                                                   "${OpenVINO_SOURCE_DIR}/src/frontends/common/include"

src/CMakeLists.txt

@@ -29,6 +29,5 @@ add_subdirectory(common/preprocessing)
 add_subdirectory(bindings)
 
 if(ENABLE_TESTS)
-    add_subdirectory(tests_deprecated)
     add_subdirectory(tests)
 endif()

src/README.md

@@ -11,7 +11,6 @@ frontends/          // OpenVINO frontends
 inference/          // Provides API for model inference
 plugins/            // OpenVINO plugins
 tests/              // A backed of tests binaries for core and plugins
-tests_deprecated/   // Deprecated tests
 ```
 
 ## OpenVINO Runtime library

src/cmake/openvino.cmake

@@ -50,6 +50,12 @@ endif()
 
 if(NOT BUILD_SHARED_LIBS)
     target_compile_definitions(${TARGET_NAME} PUBLIC OPENVINO_STATIC_LIBRARY)
+
+    # TODO: remove together we GNA plugin
+    # for static linkage the dependencies are in opposite order
+    if(TARGET inference_engine_ir_v7_reader)
+        target_link_libraries(${TARGET_NAME} PRIVATE inference_engine_ir_v7_reader)
+    endif()
 endif()
 
 if(WIN32)

src/common/CMakeLists.txt

@@ -7,7 +7,6 @@ add_subdirectory(conditional_compilation)
 add_subdirectory(util)
 
 add_subdirectory(snippets)
-add_subdirectory(legacy)
 add_subdirectory(transformations)
 add_subdirectory(offline_transformations)
 add_subdirectory(low_precision_transformations)

src/common/preprocessing/CMakeLists.txt

@@ -2,223 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-set (TARGET_NAME "openvino_gapi_preproc")
+add_subdirectory(src)
 
-file(GLOB LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
-file(GLOB LIBRARY_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp)
-
-#
-# Provides compilation flags for AVX512F, AVX512BW, AVX512DQ
-# instructions support depending on an OS and a compiler
-#
-macro(ie_avx512_core_optimization_flags flags)
-    if(WIN32)
-        if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-            set(${flags} /QxCORE-AVX512)
-        elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-            set(${flags} /arch:AVX512)
-        else()
-            message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
-        endif()
-    else()
-        if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-            set(${flags} -xCORE-AVX512)
-        else()
-            set(${flags} -mavx512f -mavx512bw -mavx512dq -mfma)
-            if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12)
-                list(APPEND ${flags} -Wno-error=maybe-uninitialized -Wno-maybe-uninitialized)
-            endif()
-        endif()
-    endif()
-endmacro()
-
-if(ENABLE_SSE42)
-    file(GLOB SSE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_sse42/*.cpp)
-    file(GLOB SSE_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_sse42/*.hpp)
-
-    list(APPEND LIBRARY_HEADERS ${SSE_HEADERS})
-    list(APPEND LIBRARY_SRC ${SSE_SRC})
-
-    ie_sse42_optimization_flags(sse4_2_flags)
-    set_source_files_properties(${SSE_SRC} PROPERTIES COMPILE_OPTIONS "${sse4_2_flags}")
-    add_definitions(-DHAVE_SSE=1)
-endif()
-
-if(ENABLE_AVX2)
-    file(GLOB AVX2_SRC ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_avx2/*.cpp)
-    file(GLOB AVX2_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_avx2/*.hpp)
-
-    list(APPEND LIBRARY_HEADERS ${AVX2_HEADERS})
-    list(APPEND LIBRARY_SRC ${AVX2_SRC})
-
-    ie_avx2_optimization_flags(avx2_flags)
-    set_source_files_properties(${AVX2_SRC} PROPERTIES COMPILE_OPTIONS "${avx2_flags}")
-    add_definitions(-DHAVE_AVX2=1)
-endif()
-
-
-# Workaround for GCC version 5.4 and 5.5 bugs in Debug configuration.
-if (CMAKE_COMPILER_IS_GNUCXX AND
-    (CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 5.5) AND
-    (CMAKE_BUILD_TYPE STREQUAL Debug))
-    set(GNU_5_DEBUG_CASE ON)
-endif()
-
-if(ENABLE_AVX512F AND NOT GNU_5_DEBUG_CASE)
-    file(GLOB AVX512_SRC ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_avx512/*.cpp)
-    file(GLOB AVX512_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_avx512/*.hpp)
-
-    list(APPEND LIBRARY_HEADERS ${AVX512_HEADERS})
-    list(APPEND LIBRARY_SRC ${AVX512_SRC})
-
-    ie_avx512_core_optimization_flags(avx512_flags)
-    set_source_files_properties(${AVX512_SRC} PROPERTIES COMPILE_OPTIONS "${avx512_flags}")
-    add_definitions(-DHAVE_AVX512=1)
-endif()
-
-if(ARM OR AARCH64)
-    ie_arm_neon_optimization_flags(neon_flags)
-
-    file(GLOB NEON_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/arm_neon/*.hpp)
-    file(GLOB NEON_SRC ${CMAKE_CURRENT_SOURCE_DIR}/arm_neon/*.cpp)
-
-    list(APPEND LIBRARY_HEADERS ${NEON_HEADERS})
-    list(APPEND LIBRARY_SRC ${NEON_SRC})
-
-    if(neon_flags)
-        set_source_files_properties(${NEON_SRC} PROPERTIES COMPILE_OPTIONS "${neon_flags}")
-    endif()
-
-    add_definitions(-DHAVE_NEON=1)
-endif()
-
-# Create object library
-
-if(ENABLE_GAPI_PREPROCESSING)
-    add_library(${TARGET_NAME}_obj OBJECT
-                ${LIBRARY_SRC}
-                ${LIBRARY_HEADERS})
-    ie_faster_build(${TARGET_NAME}_obj UNITY)
-
-    target_compile_definitions(${TARGET_NAME}_obj PRIVATE
-        IMPLEMENT_INFERENCE_ENGINE_PLUGIN
-        $<TARGET_PROPERTY:openvino::runtime,INTERFACE_COMPILE_DEFINITIONS>
-        $<TARGET_PROPERTY:fluid,INTERFACE_COMPILE_DEFINITIONS>
-        ENABLE_GAPI_PREPROCESSING)
-
-    target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE
-        $<TARGET_PROPERTY:ocv_hal,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:fluid,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>)
-
-    target_include_directories(${TARGET_NAME}_obj PRIVATE
-        "${CMAKE_CURRENT_SOURCE_DIR}"
-        $<TARGET_PROPERTY:openvino::util,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:openvino::itt,INTERFACE_INCLUDE_DIRECTORIES>)
-
-    set_ie_threading_interface_for(${TARGET_NAME}_obj)
-
-    add_cpplint_target(${TARGET_NAME}_obj_cpplint FOR_TARGETS ${TARGET_NAME}_obj)
-
-    set(library_sources $<TARGET_OBJECTS:${TARGET_NAME}_obj>)
-endif()
-
-# Create module library file from object library
-
-if(ENABLE_GAPI_PREPROCESSING)
-    if(BUILD_SHARED_LIBS)
-        set(library_type MODULE)
-    else()
-        set(library_type STATIC)
-    endif()
-else()
-    set(library_type INTERFACE)
-endif()
-
-add_library(${TARGET_NAME} ${library_type} ${library_sources})
-
-set_ie_threading_interface_for(${TARGET_NAME})
-
-if(ENABLE_GAPI_PREPROCESSING)
-    target_compile_definitions(${TARGET_NAME} PUBLIC ENABLE_GAPI_PREPROCESSING)
-    target_link_libraries(${TARGET_NAME} PRIVATE fluid openvino::itt openvino::util)
-
-    if(BUILD_SHARED_LIBS)
-        target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime)
-        # make plugin to depend on preprocessing library
-        foreach(plugin IN LISTS PLUGIN_FILES)
-            string(REPLACE ":" ";" plugin "${plugin}")
-            list(REMOVE_AT plugin 0)
-            add_dependencies(${plugin} openvino_gapi_preproc)
-        endforeach()
-        add_dependencies(ov_plugins openvino_gapi_preproc)
-    else()
-        # for static linkage the dependencies are in opposite order
-        target_link_libraries(openvino PRIVATE ${TARGET_NAME})
-    endif()
-
-    # Workaround to avoid warnings caused with bug in the avx512intrin.h of GCC5
-    if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND
-       (CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 5.5))
-        set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS_RELEASE "-Wno-error=maybe-uninitialized -Wno-maybe-uninitialized")
-    endif()
-
-    if(WIN32 AND NOT library_type STREQUAL "INTERFACE")
-        set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
-    endif()
-
-    ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})
-
-    ie_add_vs_version_file(NAME ${TARGET_NAME}
-                           FILEDESCRIPTION "OpenVINO Preprocessing plugin")
-endif()
-
-target_include_directories(${TARGET_NAME} INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-    $<TARGET_PROPERTY:openvino,INTERFACE_INCLUDE_DIRECTORIES>)
-
-# Static library used for unit tests which are always built
-
-if(ENABLE_GAPI_PREPROCESSING)
-    add_library(${TARGET_NAME}_s STATIC EXCLUDE_FROM_ALL
-                $<TARGET_OBJECTS:${TARGET_NAME}_obj>)
-
-    set_ie_threading_interface_for(${TARGET_NAME}_s)
-
-    target_include_directories(${TARGET_NAME}_s INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
-
-    if(WIN32)
-        set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s)
-    endif()
-
-    target_link_libraries(${TARGET_NAME}_s PRIVATE fluid openvino::itt openvino::runtime)
-
-    target_compile_definitions(${TARGET_NAME}_s INTERFACE USE_STATIC_IE)
-
-    set_target_properties(${TARGET_NAME}_s PROPERTIES EXCLUDE_FROM_ALL ON)
-endif()
-
-# LTO
-
-if(TARGET ${TARGET_NAME}_obj)
-    set_target_properties(${TARGET_NAME}_obj ${TARGET_NAME}_s
-                        PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
-endif()
-
-if(NOT library_type STREQUAL "INTERFACE")
-    set_target_properties(${TARGET_NAME}
-                          PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
-endif()
-
-# developer package
-
-openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME})
-
-# install
-
-if(BUILD_SHARED_LIBS)
-    install(TARGETS ${TARGET_NAME}
-            LIBRARY DESTINATION ${OV_CPACK_PLUGINSDIR} COMPONENT ${OV_CPACK_COMP_CORE})
-else()
-    ov_install_static_lib(${TARGET_NAME} ${OV_CPACK_COMP_CORE})
+if(ENABLE_TESTS)
+    add_subdirectory(tests)
 endif()

src/common/preprocessing/src/CMakeLists.txt

@@ -0,0 +1,224 @@
+# Copyright (C) 2018-2023 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set (TARGET_NAME "openvino_gapi_preproc")
+
+file(GLOB LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
+file(GLOB LIBRARY_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp)
+
+#
+# Provides compilation flags for AVX512F, AVX512BW, AVX512DQ
+# instructions support depending on an OS and a compiler
+#
+macro(ie_avx512_core_optimization_flags flags)
+    if(WIN32)
+        if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+            set(${flags} /QxCORE-AVX512)
+        elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+            set(${flags} /arch:AVX512)
+        else()
+            message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
+        endif()
+    else()
+        if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+            set(${flags} -xCORE-AVX512)
+        else()
+            set(${flags} -mavx512f -mavx512bw -mavx512dq -mfma)
+            if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12)
+                list(APPEND ${flags} -Wno-error=maybe-uninitialized -Wno-maybe-uninitialized)
+            endif()
+        endif()
+    endif()
+endmacro()
+
+if(ENABLE_SSE42)
+    file(GLOB SSE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_sse42/*.cpp)
+    file(GLOB SSE_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_sse42/*.hpp)
+
+    list(APPEND LIBRARY_HEADERS ${SSE_HEADERS})
+    list(APPEND LIBRARY_SRC ${SSE_SRC})
+
+    ie_sse42_optimization_flags(sse4_2_flags)
+    set_source_files_properties(${SSE_SRC} PROPERTIES COMPILE_OPTIONS "${sse4_2_flags}")
+    add_definitions(-DHAVE_SSE=1)
+endif()
+
+if(ENABLE_AVX2)
+    file(GLOB AVX2_SRC ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_avx2/*.cpp)
+    file(GLOB AVX2_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_avx2/*.hpp)
+
+    list(APPEND LIBRARY_HEADERS ${AVX2_HEADERS})
+    list(APPEND LIBRARY_SRC ${AVX2_SRC})
+
+    ie_avx2_optimization_flags(avx2_flags)
+    set_source_files_properties(${AVX2_SRC} PROPERTIES COMPILE_OPTIONS "${avx2_flags}")
+    add_definitions(-DHAVE_AVX2=1)
+endif()
+
+
+# Workaround for GCC version 5.4 and 5.5 bugs in Debug configuration.
+if (CMAKE_COMPILER_IS_GNUCXX AND
+    (CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 5.5) AND
+    (CMAKE_BUILD_TYPE STREQUAL Debug))
+    set(GNU_5_DEBUG_CASE ON)
+endif()
+
+if(ENABLE_AVX512F AND NOT GNU_5_DEBUG_CASE)
+    file(GLOB AVX512_SRC ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_avx512/*.cpp)
+    file(GLOB AVX512_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_avx512/*.hpp)
+
+    list(APPEND LIBRARY_HEADERS ${AVX512_HEADERS})
+    list(APPEND LIBRARY_SRC ${AVX512_SRC})
+
+    ie_avx512_core_optimization_flags(avx512_flags)
+    set_source_files_properties(${AVX512_SRC} PROPERTIES COMPILE_OPTIONS "${avx512_flags}")
+    add_definitions(-DHAVE_AVX512=1)
+endif()
+
+if(ARM OR AARCH64)
+    ie_arm_neon_optimization_flags(neon_flags)
+
+    file(GLOB NEON_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/arm_neon/*.hpp)
+    file(GLOB NEON_SRC ${CMAKE_CURRENT_SOURCE_DIR}/arm_neon/*.cpp)
+
+    list(APPEND LIBRARY_HEADERS ${NEON_HEADERS})
+    list(APPEND LIBRARY_SRC ${NEON_SRC})
+
+    if(neon_flags)
+        set_source_files_properties(${NEON_SRC} PROPERTIES COMPILE_OPTIONS "${neon_flags}")
+    endif()
+
+    add_definitions(-DHAVE_NEON=1)
+endif()
+
+# Create object library
+
+if(ENABLE_GAPI_PREPROCESSING)
+    add_library(${TARGET_NAME}_obj OBJECT
+                ${LIBRARY_SRC}
+                ${LIBRARY_HEADERS})
+    ie_faster_build(${TARGET_NAME}_obj UNITY)
+
+    target_compile_definitions(${TARGET_NAME}_obj PRIVATE
+        IMPLEMENT_INFERENCE_ENGINE_PLUGIN
+        $<TARGET_PROPERTY:openvino::runtime,INTERFACE_COMPILE_DEFINITIONS>
+        $<TARGET_PROPERTY:fluid,INTERFACE_COMPILE_DEFINITIONS>
+        ENABLE_GAPI_PREPROCESSING)
+
+    target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE
+        $<TARGET_PROPERTY:ocv_hal,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:fluid,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>)
+
+    target_include_directories(${TARGET_NAME}_obj PRIVATE
+        "${CMAKE_CURRENT_SOURCE_DIR}"
+        $<TARGET_PROPERTY:openvino::util,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:openvino::itt,INTERFACE_INCLUDE_DIRECTORIES>)
+
+    set_ie_threading_interface_for(${TARGET_NAME}_obj)
+
+    add_cpplint_target(${TARGET_NAME}_obj_cpplint FOR_TARGETS ${TARGET_NAME}_obj)
+
+    set(library_sources $<TARGET_OBJECTS:${TARGET_NAME}_obj>)
+endif()
+
+# Create module library file from object library
+
+if(ENABLE_GAPI_PREPROCESSING)
+    if(BUILD_SHARED_LIBS)
+        set(library_type MODULE)
+    else()
+        set(library_type STATIC)
+    endif()
+else()
+    set(library_type INTERFACE)
+endif()
+
+add_library(${TARGET_NAME} ${library_type} ${library_sources})
+
+set_ie_threading_interface_for(${TARGET_NAME})
+
+if(ENABLE_GAPI_PREPROCESSING)
+    target_compile_definitions(${TARGET_NAME} PUBLIC ENABLE_GAPI_PREPROCESSING)
+    target_link_libraries(${TARGET_NAME} PRIVATE fluid openvino::itt openvino::util)
+
+    if(BUILD_SHARED_LIBS)
+        target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime)
+        # make plugin to depend on preprocessing library
+        foreach(plugin IN LISTS PLUGIN_FILES)
+            string(REPLACE ":" ";" plugin "${plugin}")
+            list(REMOVE_AT plugin 0)
+            add_dependencies(${plugin} openvino_gapi_preproc)
+        endforeach()
+        add_dependencies(ov_plugins openvino_gapi_preproc)
+    else()
+        # for static linkage the dependencies are in opposite order
+        target_link_libraries(openvino PRIVATE ${TARGET_NAME})
+    endif()
+
+    # Workaround to avoid warnings caused with bug in the avx512intrin.h of GCC5
+    if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND
+       (CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 5.5))
+        set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS_RELEASE "-Wno-error=maybe-uninitialized -Wno-maybe-uninitialized")
+    endif()
+
+    if(WIN32 AND NOT library_type STREQUAL "INTERFACE")
+        set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
+    endif()
+
+    ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})
+
+    ie_add_vs_version_file(NAME ${TARGET_NAME}
+                           FILEDESCRIPTION "OpenVINO Preprocessing plugin")
+endif()
+
+target_include_directories(${TARGET_NAME} INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<TARGET_PROPERTY:openvino,INTERFACE_INCLUDE_DIRECTORIES>)
+
+# Static library used for unit tests which are always built
+
+if(ENABLE_GAPI_PREPROCESSING)
+    add_library(${TARGET_NAME}_s STATIC EXCLUDE_FROM_ALL
+                $<TARGET_OBJECTS:${TARGET_NAME}_obj>)
+
+    set_ie_threading_interface_for(${TARGET_NAME}_s)
+
+    target_include_directories(${TARGET_NAME}_s INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
+
+    if(WIN32)
+        set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s)
+    endif()
+
+    target_link_libraries(${TARGET_NAME}_s PRIVATE fluid openvino::itt openvino::runtime)
+
+    target_compile_definitions(${TARGET_NAME}_s INTERFACE USE_STATIC_IE)
+
+    set_target_properties(${TARGET_NAME}_s PROPERTIES EXCLUDE_FROM_ALL ON)
+endif()
+
+# LTO
+
+if(TARGET ${TARGET_NAME}_obj)
+    set_target_properties(${TARGET_NAME}_obj ${TARGET_NAME}_s
+                        PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
+endif()
+
+if(NOT library_type STREQUAL "INTERFACE")
+    set_target_properties(${TARGET_NAME}
+                          PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
+endif()
+
+# developer package
+
+openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME})
+
+# install
+
+if(BUILD_SHARED_LIBS)
+    install(TARGETS ${TARGET_NAME}
+            LIBRARY DESTINATION ${OV_CPACK_PLUGINSDIR} COMPONENT ${OV_CPACK_COMP_CORE})
+else()
+    ov_install_static_lib(${TARGET_NAME} ${OV_CPACK_COMP_CORE})
+endif()

src/common/transformations/tests/CMakeLists.txt

@@ -21,13 +21,6 @@ ov_add_test_target(
         TRANSFORMATIONS
 )
 
-file(GLOB_RECURSE legacy_tests
-    "${CMAKE_CURRENT_SOURCE_DIR}/legacy/*.cpp" # CVS-55385
-    )
-
-set_source_files_properties(${legacy_tests} PROPERTIES INCLUDE_DIRECTORIES
-    $<TARGET_PROPERTY:inference_engine_legacy,INTERFACE_INCLUDE_DIRECTORIES>)
-
 if(WIN32)
     string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
     string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")

src/inference/CMakeLists.txt

@@ -19,18 +19,18 @@ file (GLOB LIBRARY_SRC
       )
 
 # TODO: WA for OneHot pass usage in reshape
-set(LEGACY_SRC_ROOT "${OpenVINO_SOURCE_DIR}/src/common/legacy/src")
+set(LEGACY_ROOT "${OpenVINO_SOURCE_DIR}/src/plugins/intel_gna/legacy")
 set(LEGACY_LIBRARY_SHARED_SRCS
-    "${LEGACY_SRC_ROOT}/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp"
-    "${LEGACY_SRC_ROOT}/transformations/convert_opset1_to_legacy/convert_nms_5_to_legacy.cpp"
-    "${LEGACY_SRC_ROOT}/ngraph_ops/nms_ie.cpp"
-    "${LEGACY_SRC_ROOT}/ngraph_ops/onehot_ie.cpp")
+    "${LEGACY_ROOT}/src/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp"
+    "${LEGACY_ROOT}/src/transformations/convert_opset1_to_legacy/convert_nms_5_to_legacy.cpp"
+    "${LEGACY_ROOT}/src/ngraph_ops/nms_ie.cpp"
+    "${LEGACY_ROOT}/src/ngraph_ops/onehot_ie.cpp")
 
 set_source_files_properties(${LEGACY_LIBRARY_SHARED_SRCS} PROPERTIES
     COMPILE_DEFINITIONS "USE_STATIC_IE"
-    INCLUDE_DIRECTORIES $<TARGET_PROPERTY:${TARGET_NAME}_legacy,INTERFACE_INCLUDE_DIRECTORIES>)
+    INCLUDE_DIRECTORIES "${LEGACY_ROOT}/include")
 set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/src/cnn_network_ngraph_impl.cpp" PROPERTIES
-    INCLUDE_DIRECTORIES $<TARGET_PROPERTY:${TARGET_NAME}_legacy,INTERFACE_INCLUDE_DIRECTORIES>)
+    INCLUDE_DIRECTORIES "${LEGACY_ROOT}/include")
 
 set(IE_STATIC_DEPENDENT_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/file_utils.cpp)
 list(REMOVE_ITEM LIBRARY_SRC ${IE_STATIC_DEPENDENT_FILES})
@@ -153,7 +153,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE
     "${CMAKE_CURRENT_BINARY_DIR}"
     # for ie_ir_version.hpp
     $<$<TARGET_EXISTS:inference_engine_ir_v7_reader>:$<TARGET_PROPERTY:inference_engine_ir_v7_reader,SOURCE_DIR>>
-    $<TARGET_PROPERTY:${TARGET_NAME}_legacy,INTERFACE_INCLUDE_DIRECTORIES>
+    "${LEGACY_ROOT}/include"
     $<TARGET_PROPERTY:${TARGET_NAME}_transformations,INTERFACE_INCLUDE_DIRECTORIES>
     $<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>)
 
@@ -180,14 +180,7 @@ ov_ncc_naming_style(FOR_TARGET ${TARGET_NAME}_obj
 
 # Static library used for unit tests which are always built
 
-file(GLOB_RECURSE legacy_src "${LEGACY_SRC_ROOT}/*.cpp"
-                             "${LEGACY_SRC_ROOT}/*.hpp")
-
-set_source_files_properties(${legacy_src} PROPERTIES
-    INCLUDE_DIRECTORIES $<TARGET_PROPERTY:${TARGET_NAME}_legacy,INTERFACE_INCLUDE_DIRECTORIES>)
-
 add_library(${TARGET_NAME}_s STATIC EXCLUDE_FROM_ALL
-            ${legacy_src}
             $<TARGET_OBJECTS:${TARGET_NAME}_obj>)
 
 set_ie_threading_interface_for(${TARGET_NAME}_s)
@@ -197,8 +190,7 @@ endif()
 
 target_include_directories(${TARGET_NAME}_s PUBLIC
     $<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
-    $<BUILD_INTERFACE:$<TARGET_PROPERTY:${TARGET_NAME}_legacy,SOURCE_DIR>/src>)
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
 
 if(WIN32)
     set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s)
@@ -231,5 +223,5 @@ install(DIRECTORY "${PUBLIC_HEADERS_DIR}/"
         COMPONENT ${OV_CPACK_COMP_CORE_DEV})
 
 if(ENABLE_TESTS)
-add_subdirectory(tests)
+    add_subdirectory(tests)
 endif()

src/inference/tests/functional/CMakeLists.txt

@@ -2,6 +2,10 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
+if(SUGGEST_OVERRIDE_SUPPORTED)
+    ie_add_compiler_flags(-Wno-suggest-override)
+endif()
+
 set(TARGET_NAME ov_inference_functional_tests)
 
 set(DEPENDENCIES
@@ -32,7 +36,6 @@ if(ENABLE_AUTO_BATCH)
     list(APPEND COMPILE_DEFINITIONS ENABLE_AUTO_BATCH)
 endif()
 
-
 ov_add_test_target(
         NAME ${TARGET_NAME}
         ROOT ${CMAKE_CURRENT_SOURCE_DIR}
@@ -50,11 +53,3 @@ ov_add_test_target(
 
 add_compile_definitions(${TARGET_NAME} ${COMPILE_DEFINITIONS})
 
-check_cxx_compiler_flag(-Wno-suggest-override SUPPORT_WNO_SUGGEST_OVERRIDE)
-if (SUPPORT_WNO_SUGGEST_OVERRIDE)
-    ie_add_compiler_flags(-Wno-suggest-override)
-endif()
-
-set(legacy_tests "${CMAKE_CURRENT_SOURCE_DIR}/cnn_ngraph_impl_tests.cpp") #CVS-55375
-set_source_files_properties(${legacy_tests} PROPERTIES INCLUDE_DIRECTORIES
-    $<TARGET_PROPERTY:inference_engine_legacy,INTERFACE_INCLUDE_DIRECTORIES>)

src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/conv_eltwise_fusion.cpp

@@ -19,7 +19,7 @@ namespace {
     INSTANTIATE_TEST_SUITE_P(smoke_Convolution_1D, ConvEltwiseFusion,
                             ::testing::Combine(
                                     ::testing::Values(ngraph::opset4::Convolution::get_type_info_static()),
-                                    ::testing::ValuesIn(IN({MUL(4), ADD(5)})),
+                                    ::testing::ValuesIn(IN({ MUL(4), /* ADD(5) */})),
                                     ::testing::Values(ngraph::Shape{1, 8, 64}),
                                     ::testing::Values(ngraph::Shape{64, 8, 1}),
                                     ::testing::Values(ngraph::Shape{64, 1}),
@@ -30,7 +30,7 @@ namespace {
     INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolution_1D, ConvEltwiseFusion,
                             ::testing::Combine(
                                     ::testing::Values(ngraph::opset4::GroupConvolution::get_type_info_static()),
-                                    ::testing::ValuesIn(IN({MUL(4), ADD(5)})),
+                                    ::testing::ValuesIn(IN({ MUL(4), /* ADD(5) */})),
                                     ::testing::Values(ngraph::Shape{1, 12, 5}),
                                     ::testing::Values(ngraph::Shape{4, 5, 3, 2}),
                                     ::testing::Values(ngraph::Shape{20, 1}),
@@ -41,7 +41,7 @@ namespace {
     INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData_1D, ConvEltwiseFusion,
                             ::testing::Combine(
                                     ::testing::Values(ngraph::opset4::ConvolutionBackpropData::get_type_info_static()),
-                                    ::testing::ValuesIn(IN({MUL(4), ADD(5)})),
+                                    ::testing::ValuesIn(IN({ MUL(4), /* ADD(5) */})),
                                     ::testing::Values(ngraph::Shape{1, 12, 64}),
                                     ::testing::Values(ngraph::Shape{12, 20, 1}),
                                     ::testing::Values(ngraph::Shape{20, 1}),
@@ -52,7 +52,7 @@ namespace {
     INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolutionBackpropData_1D, ConvEltwiseFusion,
                             ::testing::Combine(
                                     ::testing::Values(ngraph::opset4::GroupConvolutionBackpropData::get_type_info_static()),
-                                    ::testing::ValuesIn(IN({MUL(4), ADD(5)})),
+                                    ::testing::ValuesIn(IN({ MUL(4), /* ADD(5) */})),
                                     ::testing::Values(ngraph::Shape{1, 12, 64}),
                                     ::testing::Values(ngraph::Shape{4, 3, 5, 1}),
                                     ::testing::Values(ngraph::Shape{1, 20, 1}),
@@ -71,7 +71,7 @@ namespace {
     INSTANTIATE_TEST_SUITE_P(smoke_Convolution_2D, ConvEltwiseFusion,
                             ::testing::Combine(
                                     ::testing::Values(ngraph::opset4::Convolution::get_type_info_static()),
-                                    ::testing::ValuesIn(IN({MUL(4), ADD(5)})),
+                                    ::testing::ValuesIn(IN({ MUL(4), /* ADD(5) */})),
                                     ::testing::Values(ngraph::Shape{1, 3, 64, 64}),
                                     ::testing::Values(ngraph::Shape{20, 3, 1, 1}),
                                     ::testing::ValuesIn(const_shapes_2d),
@@ -82,7 +82,7 @@ namespace {
     INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolution_2D, ConvEltwiseFusion,
                             ::testing::Combine(
                                     ::testing::Values(ngraph::opset4::GroupConvolution::get_type_info_static()),
-                                    ::testing::ValuesIn(IN({MUL(4), ADD(5)})),
+                                    ::testing::ValuesIn(IN({ MUL(4), /* ADD(5) */})),
                                     ::testing::Values(ngraph::Shape{1, 12, 64, 64}),
                                     ::testing::Values(ngraph::Shape{4, 5, 3, 1, 2}),
                                     ::testing::ValuesIn(const_shapes_2d),
@@ -93,7 +93,7 @@ namespace {
     INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData_2D, ConvEltwiseFusion,
                             ::testing::Combine(
                                     ::testing::Values(ngraph::opset4::ConvolutionBackpropData::get_type_info_static()),
-                                    ::testing::ValuesIn(IN({MUL(4), ADD(5)})),
+                                    ::testing::ValuesIn(IN({ MUL(4), /* ADD(5) */})),
                                     ::testing::Values(ngraph::Shape{1, 3, 64, 64}),
                                     ::testing::Values(ngraph::Shape{3, 20, 3, 3}),
                                     ::testing::ValuesIn(const_shapes_2d),
@@ -104,7 +104,7 @@ namespace {
     INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolutionBackpropData_2D, ConvEltwiseFusion,
                             ::testing::Combine(
                                     ::testing::Values(ngraph::opset4::GroupConvolutionBackpropData::get_type_info_static()),
-                                    ::testing::ValuesIn(IN({MUL(4), ADD(5)})),
+                                    ::testing::ValuesIn(IN({ MUL(4), /* ADD(5) */})),
                                     ::testing::Values(ngraph::Shape{1, 12, 64, 64}),
                                     ::testing::Values(ngraph::Shape{4, 3, 5, 1, 1}),
                                     ::testing::ValuesIn(const_shapes_2d),
@@ -120,7 +120,7 @@ namespace {
     INSTANTIATE_TEST_SUITE_P(smoke_Convolution_2D_Negative, ConvEltwiseFusion,
                             ::testing::Combine(
                                     ::testing::Values(ngraph::opset4::Convolution::get_type_info_static()),
-                                    ::testing::ValuesIn(IN({MUL(6), ADD(6)})),
+                                    ::testing::ValuesIn(IN({MUL(6), /* ADD(6) */})),
                                     ::testing::Values(ngraph::Shape{1, 3, 3, 3}),
                                     ::testing::Values(ngraph::Shape{3, 3, 1, 1}),
                                     ::testing::ValuesIn(neg_const_shapes_2d),
@@ -131,7 +131,7 @@ namespace {
     INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolution_2D_Negative, ConvEltwiseFusion,
                             ::testing::Combine(
                                     ::testing::Values(ngraph::opset4::GroupConvolution::get_type_info_static()),
-                                    ::testing::ValuesIn(IN({MUL(6), ADD(6)})),
+                                    ::testing::ValuesIn(IN({MUL(6), /* ADD(6) */})),
                                     ::testing::Values(ngraph::Shape{1, 12, 3, 3}),
                                     ::testing::Values(ngraph::Shape{4, 5, 3, 1, 1}),
                                     ::testing::ValuesIn(neg_const_shapes_2d),
@@ -142,7 +142,7 @@ namespace {
     INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData_2D_Negative, ConvEltwiseFusion,
                             ::testing::Combine(
                                     ::testing::Values(ngraph::opset4::ConvolutionBackpropData::get_type_info_static()),
-                                    ::testing::ValuesIn(IN({MUL(6), ADD(6)})),
+                                    ::testing::ValuesIn(IN({MUL(6), /* ADD(6) */})),
                                     ::testing::Values(ngraph::Shape{1, 12, 3, 3}),
                                     ::testing::Values(ngraph::Shape{12, 3, 1, 1}),
                                     ::testing::ValuesIn(neg_const_shapes_2d),
@@ -153,7 +153,7 @@ namespace {
     INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolutionBackpropData_2D_Negative, ConvEltwiseFusion,
                             ::testing::Combine(
                                     ::testing::Values(ngraph::opset4::GroupConvolutionBackpropData::get_type_info_static()),
-                                    ::testing::ValuesIn(IN({MUL(6), ADD(6)})),
+                                    ::testing::ValuesIn(IN({MUL(6), /* ADD(6) */})),
                                     ::testing::Values(ngraph::Shape{1, 12, 3, 3}),
                                     ::testing::Values(ngraph::Shape{4, 3, 5, 1, 1}),
                                     ::testing::ValuesIn(neg_const_shapes_2d),

src/plugins/intel_gna/CMakeLists.txt

@@ -6,6 +6,8 @@ if (NOT ENABLE_INTEL_GNA)
     return()
 endif()
 
+add_subdirectory(legacy)
+
 set(TARGET_NAME "openvino_intel_gna_plugin")
 
 if (ENABLE_INTEL_GNA_DEBUG)
@@ -90,7 +92,6 @@ target_include_directories(${TARGET_NAME}_test_static
         $<TARGET_PROPERTY:inference_engine_legacy,INTERFACE_INCLUDE_DIRECTORIES>
     PRIVATE
         $<TARGET_PROPERTY:openvino::conditional_compilation,INTERFACE_INCLUDE_DIRECTORIES>)
-set_target_properties(${TARGET_NAME}_test_static PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_test_static)
 
 set_target_properties(${TARGET_NAME} ${TARGET_NAME}_test_static
                       PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})

src/plugins/intel_gna/legacy/CMakeLists.txt

@@ -55,6 +55,34 @@ target_link_libraries(${TARGET_NAME} PUBLIC openvino::runtime
 target_include_directories(${TARGET_NAME} INTERFACE
     $<BUILD_INTERFACE:${PUBLIC_HEADERS_DIR}>)
 
+# Compile with USE_STATIC_IE
+
+set(LEGACY_LIBRARY_SHARED_SRCS
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/transformations/convert_opset1_to_legacy/convert_nms_5_to_legacy.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/ngraph_ops/nms_ie.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/ngraph_ops/onehot_ie.cpp")
+list(REMOVE_ITEM LIBRARY_SRC ${LEGACY_LIBRARY_SHARED_SRCS})
+
+add_library(${TARGET_NAME}_s STATIC EXCLUDE_FROM_ALL
+            ${LIBRARY_SRC}
+            ${PUBLIC_HEADERS})
+
+target_compile_definitions(${TARGET_NAME}_s PUBLIC USE_STATIC_IE)
+
+target_include_directories(${TARGET_NAME}_s
+    PUBLIC
+        $<BUILD_INTERFACE:${PUBLIC_HEADERS_DIR}>
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/src
+        $<TARGET_PROPERTY:inference_engine_obj,SOURCE_DIR>/src # For CNNNetworkNGraphImpl
+        $<TARGET_PROPERTY:openvino::runtime::dev,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:openvino::pugixml,INTERFACE_INCLUDE_DIRECTORIES>)
+
+set_target_properties(${TARGET_NAME}_s PROPERTIES
+    EXCLUDE_FROM_ALL ON
+    INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
+
 # LTO
 
 set_target_properties(${TARGET_NAME} ${TARGET_NAME}_obj
@@ -67,3 +95,7 @@ openvino_developer_export_targets(COMPONENT core_legacy TARGETS ${TARGET_NAME})
 # install
 
 ov_install_static_lib(${TARGET_NAME} ${OV_CPACK_COMP_CORE} OPTIONAL)
+
+if(ENABLE_TESTS)
+    add_subdirectory(tests)
+endif()