Skip to content

Commit c38773e

Browse files
MirceaDan99MirceaDan99
committed
Add backwardDrvComp keyword for tests suites that are backward compatible with PV driver
1 parent cbd06e2 commit c38773e

26 files changed

+90
-96
lines changed

‎src/plugins/intel_npu/tests/functional/behavior/infer_request_run.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const std::vector<ov::AnyMap> configsInferRequestRunTests = {
1414
{ov::log::level(ov::log::Level::INFO)}
1515
};
1616

17-
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTest, InferRequestRunTests,
17+
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTest, InferRequestRunTests,
1818
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
1919
::testing::ValuesIn(configsInferRequestRunTests)),
2020
InferRequestRunTests::getTestCaseName);

‎src/plugins/intel_npu/tests/functional/behavior/npu_driver_compiler_adapter/downgrade_interpolate11.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const std::vector<ov::AnyMap> configs = {
1313
{{ov::intel_npu::compiler_type(ov::intel_npu::CompilerType::DRIVER)}},
1414
};
1515

16-
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTest, DriverCompilerAdapterDowngradeInterpolate11TestNPU,
16+
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTest, DriverCompilerAdapterDowngradeInterpolate11TestNPU,
1717
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
1818
::testing::ValuesIn(configs)),
1919
DriverCompilerAdapterDowngradeInterpolate11TestNPU::getTestCaseName);

‎src/plugins/intel_npu/tests/functional/behavior/npu_driver_compiler_adapter/inputs_outputs.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const std::vector<ov::AnyMap> configs = {
1313
{{ov::intel_npu::compiler_type(ov::intel_npu::CompilerType::DRIVER)}},
1414
};
1515

16-
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTest, DriverCompilerAdapterInputsOutputsTestNPU,
16+
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTest, DriverCompilerAdapterInputsOutputsTestNPU,
1717
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
1818
::testing::ValuesIn(configs)),
1919
DriverCompilerAdapterInputsOutputsTestNPU::getTestCaseName);

‎src/plugins/intel_npu/tests/functional/behavior/npu_driver_compiler_adapter/query_network.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ TEST_P(QueryNetworkTestSuite1NPU, TestQueryNetworkSupported) {
122122
EXPECT_EQ(expected, actual);
123123
}
124124

125-
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTest, QueryNetworkTestSuite1NPU,
125+
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTest, QueryNetworkTestSuite1NPU,
126126
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
127127
::testing::ValuesIn(configs)),
128128
QueryNetworkTestNPU::getTestCaseName);

‎src/plugins/intel_npu/tests/functional/behavior/ov_plugin/internal_properties_tests.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,13 @@ const std::vector<ov::AnyMap> IncorrectMutablePropertiesWrongValueTypes = {
163163
{{ov::intel_npu::compilation_mode_params.name(), "not-a-param=true"}},
164164
};
165165

166-
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests,
166+
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests,
167167
OVPropertiesTestsNPU,
168168
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
169169
::testing::ValuesIn(CorrectPluginMutableProperties)),
170170
(ov::test::utils::appendPlatformTypeTestName<OVPropertiesTestsNPU>));
171171

172-
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests,
172+
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests,
173173
OVPropertiesIncorrectTestsNPU,
174174
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
175175
::testing::ValuesIn(IncorrectMutablePropertiesWrongValueTypes)),

‎src/plugins/intel_npu/tests/functional/internal/overload/compiled_model/property.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ TEST_P(ClassPluginPropertiesTestSuite0NPU, CanSetGetPublicMutableProperty) {
202202
ASSERT_EQ(retrieved_value.as<std::string>(), configValue.as<std::string>());
203203
}
204204

205-
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests_ClassPluginPropertiesTestNPU, ClassPluginPropertiesTestSuite0NPU,
205+
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests_ClassPluginPropertiesTestNPU, ClassPluginPropertiesTestSuite0NPU,
206206
::testing::Combine(::testing::Values(ov::test::utils::getDeviceName()),
207207
::testing::ValuesIn(plugin_public_mutable_properties)),
208208
ClassPluginPropertiesTestNPU::getTestCaseName);
@@ -218,7 +218,7 @@ TEST_P(ClassPluginPropertiesTestSuite1NPU, CanSetGetInternalMutableProperty) {
218218
ASSERT_EQ(retrieved_value.as<std::string>(), configValue.as<std::string>());
219219
}
220220

221-
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests_ClassPluginPropertiesTestNPU, ClassPluginPropertiesTestSuite1NPU,
221+
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests_ClassPluginPropertiesTestNPU, ClassPluginPropertiesTestSuite1NPU,
222222
::testing::Combine(::testing::Values(ov::test::utils::getDeviceName()),
223223
::testing::ValuesIn(plugin_internal_mutable_properties)),
224224
ClassPluginPropertiesTestNPU::getTestCaseName);
@@ -279,7 +279,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests_ClassPluginPropertiesOptsTest1NPU,
279279
::testing::ValuesIn(plugin_public_immutable_properties)),
280280
ClassPluginPropertiesTestNPU::getTestCaseName);
281281

282-
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests_ClassPluginPropertiesOptsTest2NPU, ClassPluginPropertiesTestSuite3NPU,
282+
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests_ClassPluginPropertiesOptsTest2NPU, ClassPluginPropertiesTestSuite3NPU,
283283
::testing::Combine(::testing::Values(ov::test::utils::getDeviceName()),
284284
::testing::ValuesIn(plugin_public_mutable_properties)),
285285
ClassPluginPropertiesTestNPU::getTestCaseName);

‎src/plugins/intel_npu/tests/functional/internal/overload/ov_plugin/core_integration.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ TEST_P(OVClassLoadNetworkTestNPU, LoadNetworkHETEROWithDeviceIDNoThrow) {
154154
}
155155
}
156156

157-
TEST(OVClassBasicPropsTestNPU, smoke_SetConfigDevicePropertiesThrows) {
157+
TEST(backwardDrvComp_OVClassBasicPropsTestNPU, smoke_SetConfigDevicePropertiesThrows) {
158158
ov::Core core;
159159
ASSERT_THROW(core.set_property("", ov::device::properties(ov::test::utils::DEVICE_NPU, ov::enable_profiling(true))),
160160
ov::Exception);

‎src/plugins/intel_npu/tests/functional/shared_tests_instances/behavior/compiled_model/compiled_model_base.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVCompiledModelBaseTestOpti
4848
::testing::ValuesIn(heteroCompiledModelConfigs)),
4949
ov::test::utils::appendPlatformTypeTestName<OVCompiledModelBaseTestOptional>);
5050

51-
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVAutoExecutableNetworkTest,
51+
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVAutoExecutableNetworkTest,
5252
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
5353
::testing::ValuesIn(compiledModelConfigs)),
5454
ov::test::utils::appendPlatformTypeTestName<OVAutoExecutableNetworkTest>);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ auto heteroCompiledModelConfigs = []() -> std::vector<ov::AnyMap> {
3838
return heteroPluginConfigs;
3939
}();
4040

41-
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVCompiledGraphImportExportTest,
41+
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVCompiledGraphImportExportTest,
4242
::testing::Combine(::testing::ValuesIn(convertModelTypes),
4343
::testing::Values(ov::test::utils::DEVICE_NPU),
4444
::testing::ValuesIn(compiledModelConfigs)),
@@ -51,7 +51,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVCompiledGraphImportExport
5151
::testing::ValuesIn(heteroCompiledModelConfigs)),
5252
ov::test::utils::appendPlatformTypeTestName<OVCompiledGraphImportExportTest>);
5353

54-
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVClassCompiledModelImportExportTestP,
54+
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVClassCompiledModelImportExportTestP,
5555
::testing::Values(ov::test::utils::DEVICE_NPU),
5656
ov::test::utils::appendPlatformTypeTestName<OVClassCompiledModelImportExportTestP>);
5757

‎src/plugins/intel_npu/tests/functional/shared_tests_instances/behavior/compiled_model/properties.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ const auto& combineHeteroParamsExecDevices = []() -> std::vector<std::pair<ov::A
122122
return execHeteroParams;
123123
}();
124124

125-
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVClassCompiledModelGetIncorrectPropertyTest,
125+
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVClassCompiledModelGetIncorrectPropertyTest,
126126
::testing::Values(ov::test::utils::DEVICE_NPU),
127127
ov::test::utils::appendPlatformTypeTestName<OVClassCompiledModelGetIncorrectPropertyTest>);
128128

@@ -131,7 +131,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVClassCompiledModelGetInco
131131
ov::test::utils::DEVICE_NPU),
132132
ov::test::utils::appendPlatformTypeTestName<OVClassCompiledModelGetIncorrectPropertyTest>);
133133

134-
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVClassCompiledModelGetPropertyTest,
134+
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVClassCompiledModelGetPropertyTest,
135135
::testing::Values(ov::test::utils::DEVICE_NPU),
136136
ov::test::utils::appendPlatformTypeTestName<OVClassCompiledModelGetPropertyTest>);
137137

@@ -140,7 +140,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVClassCompiledModelGetProp
140140
ov::test::utils::DEVICE_NPU),
141141
ov::test::utils::appendPlatformTypeTestName<OVClassCompiledModelGetPropertyTest>);
142142

143-
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVClassCompiledModelGetConfigTest,
143+
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVClassCompiledModelGetConfigTest,
144144
::testing::Values(ov::test::utils::DEVICE_NPU),
145145
ov::test::utils::appendPlatformTypeTestName<OVClassCompiledModelGetConfigTest>);
146146

@@ -166,20 +166,20 @@ INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVClassCompileModelWithCorr
166166
::testing::ValuesIn(heteroCompiledModelConfigs)),
167167
ov::test::utils::appendPlatformTypeTestName<OVClassCompileModelWithCorrectPropertiesTest>);
168168

169-
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVClassCompiledModelPropertiesIncorrectTests,
169+
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVClassCompiledModelPropertiesIncorrectTests,
170170
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
171171
::testing::ValuesIn(compiledModelIncorrectConfigs)),
172172
ov::test::utils::appendPlatformTypeTestName<OVClassCompiledModelPropertiesIncorrectTests>);
173173

174-
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVCompiledModelIncorrectDevice,
174+
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVCompiledModelIncorrectDevice,
175175
::testing::Values(ov::test::utils::DEVICE_NPU),
176176
ov::test::utils::appendPlatformTypeTestName<OVCompiledModelIncorrectDevice>);
177177

178178
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVCompiledModelPropertiesDefaultSupportedTests,
179179
::testing::Values(ov::test::utils::DEVICE_NPU),
180180
ov::test::utils::appendPlatformTypeTestName<OVCompiledModelPropertiesDefaultSupportedTests>);
181181

182-
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVClassCompiledModelPropertiesDefaultTests,
182+
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVClassCompiledModelPropertiesDefaultTests,
183183
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
184184
::testing::ValuesIn(publicCompiledModelConfigs)),
185185
ov::test::utils::appendPlatformTypeTestName<OVClassCompiledModelPropertiesDefaultTests>);
@@ -195,7 +195,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVClassCompiledModelSetCorr
195195
::testing::ValuesIn(compiledModelPropertiesAnyToString)),
196196
ov::test::utils::appendPlatformTypeTestName<OVClassCompiledModelSetCorrectConfigTest>);
197197

198-
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVClassCompiledModelSetIncorrectConfigTest,
198+
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVClassCompiledModelSetIncorrectConfigTest,
199199
::testing::Values(ov::test::utils::DEVICE_NPU),
200200
ov::test::utils::appendPlatformTypeTestName<OVClassCompiledModelSetIncorrectConfigTest>);
201201

0 commit comments

Comments
 (0)