[NPU] Simplify folder structure for NPU functional tests (#32298)

### Details:
- Added `folder structure` and `developing convention` sections to the
tests README.
 - Moved headers from `overload` directory to `behavior` directory.
- Moved some infer request files from the root `behavior` directory to
`behavior/ov_infer_request` dir.
- Moved NPU test instantiations from `shared_tests_instances` directory
to `behavior` directory.
 - Added missing `#pragma once` directives to some headers.
 - Renamed `functions.h` into `functions.hpp`.
- Made small nitpicks to the test files that are already modified by one
of the actions above. Nitpicks include: removing pointless comments,
`SKIP_IF_CURRENT_TEST_IS_DISABLED()` call correctness, removing unused
headers, and wrapping test instantiations in anonymous namespaces.

### Tickets:
 - *C-174556*

---------

Signed-off-by: alexandruenache1111 <[email protected]>

Author: alexandruenache1111

src/plugins/intel_npu/tests/functional/CMakeLists.txt

@@ -33,6 +33,9 @@ ov_add_test_target(
   EXCLUDED_SOURCE_PATHS
   ${EXCLUDED_FUNC_TESTS_DIR}
   INCLUDES
+  # OpenVINO headers need to be added before the NPU headers
+  # Otherwise, the compiler may mistake OpenVINO headers for the NPU headers
+  "${OpenVINO_SOURCE_DIR}/src/tests/functional/base_func_tests/include"
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${OPTIONAL_FUNC_TESTS_INCLUDES}
   "${CMAKE_CURRENT_SOURCE_DIR}/shared_tests_instances"

src/plugins/intel_npu/tests/functional/README.md

@@ -54,3 +54,36 @@ By default, the environment variable `OV_NPU_TESTS_SKIP_CONFIG_FILE` is set to f
 Skip filters can be enabled/disabled according to rules defining the device, backend or operating system, depending on where tests are supposed to run.
 Rules are optional, multiple rules can be chained together. Users can negate a rule by using "!".
 When determining if a skip filter is active, rules across different categories (backend, device, operating_system) are combined using an AND operation. While multiple entries of the same category will use an OR operation.
+
+## Folder structure
+
+### Behavior
+The folder structure of the `behavior` directory follows the folder structure of the OpenVINO base tests.
+
+The OpenVINO convention requires the tests to be organized in at least three directories: `compiled_model`, `ov_infer_request`, and `ov_plugin`. If the scope of NPU Plugin tests becomes broader, additional directories may be created.
+
+The E2E tests reside here.
+
+### Common
+The place of utility functions and `getTestCaseName` base implementations.
+
+### Internal
+The folder structure is mirrored from the one in the `intel_npu/src` directory.
+
+The NPU implementations of test classes and their corresponding tests are located here.
+
+### Shared tests instances
+OpenVINO test instantiations using NPU Plugin's own arguments.
+
+## Test developing convention
+
+Any test should be split into a `.hpp` and `.cpp` file, with the exception of the tests from `shared_tests_instances`, which don't need `.hpp` files. A test's `.hpp` file should be located in the same directory as its `.cpp` file.
+
+The `.hpp` file should have the entirety of its contents wrapped around the `ov::test::behavior` namespace.
+The contents are:
+- class declarations
+- methods/functions definitions
+- test definitions
+- aliases
+
+The `.cpp` file contains the test instantiations and the variables passed as arguments. The contents should be wrapped around an anonymous/unnamed namespace.

src/plugins/intel_npu/tests/functional/behavior/batched_tensors_tests/batched_run.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "behavior/batched_tensors_tests/batched_run.hpp"
+#include "batched_run.hpp"
 
 #include "common/npu_test_env_cfg.hpp"
 #include "common/utils.hpp"

src/plugins/intel_npu/tests/functional/behavior/batched_tensors_tests/batched_run.hpp

@@ -10,17 +10,12 @@
 
 #include "common/npu_test_env_cfg.hpp"
 #include "common/utils.hpp"
-#include "functional_test_utils/ov_plugin_cache.hpp"
-#include "intel_npu/npu_private_properties.hpp"
 #include "openvino/core/any.hpp"
 #include "openvino/core/node_vector.hpp"
-#include "openvino/core/type/element_iterator.hpp"
-#include "openvino/op/op.hpp"
 #include "openvino/opsets/opset8.hpp"
 #include "openvino/runtime/compiled_model.hpp"
 #include "openvino/runtime/core.hpp"
 #include "openvino/runtime/intel_npu/level_zero/level_zero.hpp"
-#include "overload/overload_test_utils_npu.hpp"
 #include "shared_test_classes/base/ov_behavior_test_utils.hpp"
 
 using CompilationParams = std::tuple<std::string,  // Device name
@@ -66,9 +61,9 @@ class BatchedTensorsRunTests : public ov::test::behavior::OVPluginTestBase,
     }
 
     void SetUp() override {
-        std::tie(target_device, configuration) = this->GetParam();
+        SKIP_IF_CURRENT_TEST_IS_DISABLED();
 
-        SKIP_IF_CURRENT_TEST_IS_DISABLED()
+        std::tie(target_device, configuration) = this->GetParam();
         OVPluginTestBase::SetUp();
         ov_model = getDefaultNGraphFunctionForTheDeviceNPU();  // FIXME: E#80555
     }
@@ -80,8 +75,7 @@ class BatchedTensorsRunTests : public ov::test::behavior::OVPluginTestBase,
         auto hash = std::to_string(std::hash<std::string>()(test_name));
         std::stringstream ss;
         auto ts = duration_cast<nanoseconds>(high_resolution_clock::now().time_since_epoch());
-        ss << hash << "_"
-           << "_" << ts.count();
+        ss << hash << "_" << "_" << ts.count();
         return ss.str();
     }
 
@@ -139,8 +133,7 @@ void executeContiguousTensorBatchInfer(ov::InferRequest req,
                                        ov::RemoteContext& context);
 
 TEST_P(BatchedTensorsRunTests, SetInputRemoteTensorsMultipleInfer) {
-    // Skip test according to plugin specific disabledTestPatterns() (if any)
-    SKIP_IF_CURRENT_TEST_IS_DISABLED()
+    SKIP_IF_CURRENT_TEST_IS_DISABLED();
 
     size_t batch = 4;
     auto one_shape = Shape{1, 2, 2, 2};
@@ -173,14 +166,12 @@ TEST_P(BatchedTensorsRunTests, SetInputRemoteTensorsMultipleInfer) {
         for (size_t j = 0; j < one_shape_size * batch; ++j) {
             ASSERT_EQ(actual[j], testNum + 21) << "Infer " << testNum << ": Expected=" << testNum + 21
                                                << ", actual=" << actual[j] << " for index " << j;
-
         }
     }
 }
 
 TEST_P(BatchedTensorsRunTests, SetInputDifferentTensorsMultipleInfer) {
-    // Skip test according to plugin specific disabledTestPatterns() (if any)
-    SKIP_IF_CURRENT_TEST_IS_DISABLED()
+    SKIP_IF_CURRENT_TEST_IS_DISABLED();
 
     size_t batch = 4;
     auto one_shape = Shape{1, 2, 2, 2};
@@ -226,8 +217,7 @@ TEST_P(BatchedTensorsRunTests, SetInputDifferentTensorsMultipleInfer) {
 }
 
 TEST_P(BatchedTensorsRunTests, SetInputDifferentTensorsMultipleInferMCL) {
-    // Skip test according to plugin specific disabledTestPatterns() (if any)
-    SKIP_IF_CURRENT_TEST_IS_DISABLED()
+    SKIP_IF_CURRENT_TEST_IS_DISABLED();
 
     size_t batch = 4;
     auto one_shape = Shape{1, 16, 16, 16};
@@ -310,8 +300,7 @@ TEST_P(BatchedTensorsRunTests, SetInputDifferentTensorsMultipleInferMCL) {
 }
 
 TEST_P(BatchedTensorsRunTests, SetInputDifferentRemoteTensorsMultipleInferMCL) {
-    // Skip test according to plugin specific disabledTestPatterns() (if any)
-    SKIP_IF_CURRENT_TEST_IS_DISABLED()
+    SKIP_IF_CURRENT_TEST_IS_DISABLED();
 
     size_t batch = 4;
     auto one_shape = Shape{1, 2, 2, 2};
@@ -436,8 +425,7 @@ TEST_P(BatchedTensorsRunTests, SetInputDifferentRemoteTensorsMultipleInferMCL) {
 using DynamicBatchedTensorsRunTests = BatchedTensorsRunTests;
 
 TEST_P(DynamicBatchedTensorsRunTests, DynamicSetInputRemoteTensorsMultipleInfer) {
-    // Skip test according to plugin specific disabledTestPatterns() (if any)
-    SKIP_IF_CURRENT_TEST_IS_DISABLED()
+    SKIP_IF_CURRENT_TEST_IS_DISABLED();
 
     size_t batch = 4;
     auto one_shape = Shape{1, 2, 2, 2};
@@ -530,8 +518,7 @@ void executeMutlipleTensorsBatchInfer(ov::InferRequest req,
 }
 
 TEST_P(DynamicBatchedTensorsRunTests, DynamicSetInputRemoteTensorsDynamicBatchInflation) {
-    // Skip test according to plugin specific disabledTestPatterns() (if any)
-    SKIP_IF_CURRENT_TEST_IS_DISABLED()
+    SKIP_IF_CURRENT_TEST_IS_DISABLED();
 
     size_t batch = 4;
     auto one_shape = Shape{1, 2, 2, 2};
@@ -559,8 +546,7 @@ TEST_P(DynamicBatchedTensorsRunTests, DynamicSetInputRemoteTensorsDynamicBatchIn
 }
 
 TEST_P(DynamicBatchedTensorsRunTests, DynamicSetInputRemoteTensorsDynamicBatchDeflation) {
-    // Skip test according to plugin specific disabledTestPatterns() (if any)
-    SKIP_IF_CURRENT_TEST_IS_DISABLED()
+    SKIP_IF_CURRENT_TEST_IS_DISABLED();
 
     size_t batch = 4;
     auto one_shape = Shape{1, 2, 2, 2};
@@ -588,8 +574,7 @@ TEST_P(DynamicBatchedTensorsRunTests, DynamicSetInputRemoteTensorsDynamicBatchDe
 }
 
 TEST_P(DynamicBatchedTensorsRunTests, SetInputRemoteSingleBatchedTensorSingleInfer) {
-    // Skip test according to plugin specific disabledTestPatterns() (if any)
-    SKIP_IF_CURRENT_TEST_IS_DISABLED()
+    SKIP_IF_CURRENT_TEST_IS_DISABLED();
 
     size_t batch = 4;
     size_t tensor_batch = 3;
@@ -674,8 +659,7 @@ void executeContiguousTensorBatchInfer(ov::InferRequest req,
 }
 
 TEST_P(DynamicBatchedTensorsRunTests, SetInputRemoteSingleBatchedTensorDynamicBatchInflation) {
-    // Skip test according to plugin specific disabledTestPatterns() (if any)
-    SKIP_IF_CURRENT_TEST_IS_DISABLED()
+    SKIP_IF_CURRENT_TEST_IS_DISABLED();
 
     size_t batch = 4;
     auto one_shape = Shape{1, 2, 2, 2};
@@ -705,8 +689,7 @@ TEST_P(DynamicBatchedTensorsRunTests, SetInputRemoteSingleBatchedTensorDynamicBa
 }
 
 TEST_P(DynamicBatchedTensorsRunTests, SetInputRemoteSingleBatchedTensorDynamicBatchDeflation) {
-    // Skip test according to plugin specific disabledTestPatterns() (if any)
-    SKIP_IF_CURRENT_TEST_IS_DISABLED()
+    SKIP_IF_CURRENT_TEST_IS_DISABLED();
 
     size_t batch = 4;
     auto one_shape = Shape{1, 2, 2, 2};
@@ -736,8 +719,7 @@ TEST_P(DynamicBatchedTensorsRunTests, SetInputRemoteSingleBatchedTensorDynamicBa
 }
 
 TEST_P(DynamicBatchedTensorsRunTests, DynamicSetInputDifferentTensorsMultipleInfer) {
-    // Skip test according to plugin specific disabledTestPatterns() (if any)
-    SKIP_IF_CURRENT_TEST_IS_DISABLED()
+    SKIP_IF_CURRENT_TEST_IS_DISABLED();
 
     size_t batch = 4;
     auto one_shape = Shape{1, 2, 2, 2};

src/plugins/intel_npu/tests/functional/behavior/compiled_model/blob_compatibility.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "overload/compiled_model/blob_compatibility.hpp"
+#include "blob_compatibility.hpp"
 
 #include <gtest/gtest.h>
 

src/plugins/intel_npu/tests/functional/internal/overload/compiled_model/blob_compatibility.hpp renamed to src/plugins/intel_npu/tests/functional/behavior/compiled_model/blob_compatibility.hpp

@@ -7,23 +7,8 @@
 #include <gtest/gtest.h>
 
 #include "common/npu_test_env_cfg.hpp"
-#include "openvino/core/except.hpp"
-#include "openvino/core/version.hpp"
 #include "shared_test_classes/base/ov_behavior_test_utils.hpp"
 
-// models generation
-#include "openvino/op/abs.hpp"
-#include "openvino/op/add.hpp"
-#include "openvino/op/concat.hpp"
-#include "openvino/op/constant.hpp"
-#include "openvino/op/convolution.hpp"
-#include "openvino/op/matmul.hpp"
-#include "openvino/op/max_pool.hpp"
-#include "openvino/op/relu.hpp"
-#include "openvino/op/reshape.hpp"
-#include "openvino/op/softmax.hpp"
-#include "openvino/op/split.hpp"
-
 namespace {
 
 const char* const BLOB_PREFIX = "blob_compatibility_";

src/plugins/intel_npu/tests/functional/behavior/compiled_model/import_export.cpp

@@ -2,13 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "overload/compiled_model/import_export.hpp"
+#include "import_export.hpp"
 
 #include <gtest/gtest.h>
 
-#include <map>
-#include <string>
-
 #include "common/utils.hpp"
 
 using namespace ov::test::behavior;

src/plugins/intel_npu/tests/functional/internal/overload/compiled_model/import_export.hpp renamed to src/plugins/intel_npu/tests/functional/behavior/compiled_model/import_export.hpp

@@ -2,9 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#pragma once
+
+#include <behavior/compiled_model/import_export.hpp>
 #include <sstream>
 
-#include "behavior/compiled_model/import_export.hpp"
 #include "common_test_utils/subgraph_builders/conv_pool_relu.hpp"
 #include "intel_npu/npu_private_properties.hpp"
 #include "openvino/runtime/make_tensor.hpp"

src/plugins/intel_npu/tests/functional/behavior/compiled_model/property.cpp

@@ -2,16 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "internal/overload/compiled_model/property.hpp"
+#include "property.hpp"
 
 #include <openvino/runtime/intel_npu/properties.hpp>
 #include <vector>
 
-#include "behavior/compiled_model/properties.hpp"
 #include "common/npu_test_env_cfg.hpp"
-#include "common/utils.hpp"
-#include "common_test_utils/subgraph_builders/conv_pool_relu.hpp"
-#include "intel_npu/config/options.hpp"
 
 using namespace ov::test::behavior;
 

src/plugins/intel_npu/tests/functional/internal/overload/compiled_model/property.hpp renamed to src/plugins/intel_npu/tests/functional/behavior/compiled_model/property.hpp

@@ -2,15 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#pragma once
+
 #include <openvino/runtime/intel_npu/properties.hpp>
 #include <vector>
 
 #include "behavior/compiled_model/properties.hpp"
 #include "common/npu_test_env_cfg.hpp"
-#include "common/utils.hpp"
 #include "common_test_utils/subgraph_builders/conv_pool_relu.hpp"
-#include "intel_npu/config/options.hpp"
-#include "openvino/util/log.hpp"
 
 using namespace ov::test::behavior;