diff --git a/opencl/test/unit_test/aub_tests/CMakeLists.txt b/opencl/test/unit_test/aub_tests/CMakeLists.txt index cb99ff9de0..152cb75de0 100644 --- a/opencl/test/unit_test/aub_tests/CMakeLists.txt +++ b/opencl/test/unit_test/aub_tests/CMakeLists.txt @@ -8,12 +8,14 @@ project(igdrcl_aub_tests) set(OPENCL_AUB_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +get_property(NEO_SHARED_aub_tests_configurations GLOBAL PROPERTY NEO_SHARED_aub_tests_configurations) + list(APPEND IGDRCL_AUB_TESTS__TARGET_OBJECTS ${NEO_SHARED_TEST_DIRECTORY}/common/libult/os_interface.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp ${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp - ${NEO_SOURCE_DIR}/shared/test/common/test_configuration/aub_tests/aub_tests_configuration.cpp ${NEO_SOURCE_DIR}/shared/test/common/test_macros/test_checks_shared.cpp + ${NEO_SHARED_aub_tests_configurations} $ $ $ diff --git a/opencl/test/unit_test/aub_tests/gen11/CMakeLists.txt b/opencl/test/unit_test/aub_tests/gen11/CMakeLists.txt index 79215bacd7..8157952ba1 100644 --- a/opencl/test/unit_test/aub_tests/gen11/CMakeLists.txt +++ b/opencl/test/unit_test/aub_tests/gen11/CMakeLists.txt @@ -7,7 +7,6 @@ if(TESTS_GEN11) target_sources(igdrcl_aub_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen11.cpp ${NEO_SOURCE_DIR}/shared/test/common/gen11/unit_test_helper_gen11.cpp ) add_subdirectories() diff --git a/opencl/test/unit_test/aub_tests/gen12lp/CMakeLists.txt b/opencl/test/unit_test/aub_tests/gen12lp/CMakeLists.txt index bca90852d8..8cf252c2d7 100644 --- a/opencl/test/unit_test/aub_tests/gen12lp/CMakeLists.txt +++ b/opencl/test/unit_test/aub_tests/gen12lp/CMakeLists.txt @@ -8,7 +8,6 @@ if(TESTS_GEN12LP) target_sources(igdrcl_aub_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/aub_mem_dump_tests_gen12lp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen12lp.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.cpp ${NEO_SOURCE_DIR}/shared/test/common/gen12lp/unit_test_helper_gen12lp.cpp ) diff --git a/opencl/test/unit_test/aub_tests/gen8/CMakeLists.txt b/opencl/test/unit_test/aub_tests/gen8/CMakeLists.txt index bb8624a72c..bd27c5906e 100644 --- a/opencl/test/unit_test/aub_tests/gen8/CMakeLists.txt +++ b/opencl/test/unit_test/aub_tests/gen8/CMakeLists.txt @@ -7,7 +7,6 @@ if(TESTS_GEN8) target_sources(igdrcl_aub_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen8.cpp ${NEO_SOURCE_DIR}/shared/test/common/gen8/unit_test_helper_gen8.cpp ) add_subdirectories() diff --git a/opencl/test/unit_test/aub_tests/gen9/CMakeLists.txt b/opencl/test/unit_test/aub_tests/gen9/CMakeLists.txt index 0436103cbf..348bc9766e 100644 --- a/opencl/test/unit_test/aub_tests/gen9/CMakeLists.txt +++ b/opencl/test/unit_test/aub_tests/gen9/CMakeLists.txt @@ -6,7 +6,6 @@ if(TESTS_GEN9) target_sources(igdrcl_aub_tests PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen9.cpp ${NEO_SOURCE_DIR}/shared/test/common/gen9/unit_test_helper_gen9.cpp ) add_subdirectories() diff --git a/shared/test/common/test_configuration/CMakeLists.txt b/shared/test/common/test_configuration/CMakeLists.txt new file mode 100644 index 0000000000..cef68e2de8 --- /dev/null +++ b/shared/test/common/test_configuration/CMakeLists.txt @@ -0,0 +1,7 @@ +# +# Copyright (C) 2021 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +add_subdirectories() diff --git a/shared/test/common/test_configuration/aub_tests/CMakeLists.txt b/shared/test/common/test_configuration/aub_tests/CMakeLists.txt new file mode 100644 index 0000000000..1a12d9f8c1 --- /dev/null +++ b/shared/test/common/test_configuration/aub_tests/CMakeLists.txt @@ -0,0 +1,15 @@ +# +# Copyright (C) 2021 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +set(NEO_SHARED_aub_tests_configurations + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.h + ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.inl +) + +add_subdirectories() +set_property(GLOBAL PROPERTY NEO_SHARED_aub_tests_configurations ${NEO_SHARED_aub_tests_configurations}) diff --git a/shared/test/common/test_configuration/aub_tests/gen11/CMakeLists.txt b/shared/test/common/test_configuration/aub_tests/gen11/CMakeLists.txt new file mode 100644 index 0000000000..3a6e3c35f4 --- /dev/null +++ b/shared/test/common/test_configuration/aub_tests/gen11/CMakeLists.txt @@ -0,0 +1,15 @@ +# +# Copyright (C) 2021 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +if(TESTS_GEN11) + set(NEO_SHARED_aub_tests_configurations + ${NEO_SHARED_aub_tests_configurations} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen11.cpp + ) + + set(NEO_SHARED_aub_tests_configurations ${NEO_SHARED_aub_tests_configurations} PARENT_SCOPE) +endif() diff --git a/opencl/test/unit_test/aub_tests/gen11/aub_tests_configuration_gen11.cpp b/shared/test/common/test_configuration/aub_tests/gen11/aub_tests_configuration_gen11.cpp similarity index 100% rename from opencl/test/unit_test/aub_tests/gen11/aub_tests_configuration_gen11.cpp rename to shared/test/common/test_configuration/aub_tests/gen11/aub_tests_configuration_gen11.cpp diff --git a/shared/test/common/test_configuration/aub_tests/gen12lp/CMakeLists.txt b/shared/test/common/test_configuration/aub_tests/gen12lp/CMakeLists.txt new file mode 100644 index 0000000000..fe0a526dc3 --- /dev/null +++ b/shared/test/common/test_configuration/aub_tests/gen12lp/CMakeLists.txt @@ -0,0 +1,15 @@ +# +# Copyright (C) 2021 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +if(TESTS_GEN12LP) + set(NEO_SHARED_aub_tests_configurations + ${NEO_SHARED_aub_tests_configurations} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen12lp.cpp + ) + + set(NEO_SHARED_aub_tests_configurations ${NEO_SHARED_aub_tests_configurations} PARENT_SCOPE) +endif() diff --git a/opencl/test/unit_test/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp b/shared/test/common/test_configuration/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp similarity index 100% rename from opencl/test/unit_test/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp rename to shared/test/common/test_configuration/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp diff --git a/shared/test/common/test_configuration/aub_tests/gen8/CMakeLists.txt b/shared/test/common/test_configuration/aub_tests/gen8/CMakeLists.txt new file mode 100644 index 0000000000..2e547f0815 --- /dev/null +++ b/shared/test/common/test_configuration/aub_tests/gen8/CMakeLists.txt @@ -0,0 +1,15 @@ +# +# Copyright (C) 2021 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +if(TESTS_GEN8) + set(NEO_SHARED_aub_tests_configurations + ${NEO_SHARED_aub_tests_configurations} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen8.cpp + ) + + set(NEO_SHARED_aub_tests_configurations ${NEO_SHARED_aub_tests_configurations} PARENT_SCOPE) +endif() diff --git a/opencl/test/unit_test/aub_tests/gen8/aub_tests_configuration_gen8.cpp b/shared/test/common/test_configuration/aub_tests/gen8/aub_tests_configuration_gen8.cpp similarity index 100% rename from opencl/test/unit_test/aub_tests/gen8/aub_tests_configuration_gen8.cpp rename to shared/test/common/test_configuration/aub_tests/gen8/aub_tests_configuration_gen8.cpp diff --git a/shared/test/common/test_configuration/aub_tests/gen9/CMakeLists.txt b/shared/test/common/test_configuration/aub_tests/gen9/CMakeLists.txt new file mode 100644 index 0000000000..80e1579ebf --- /dev/null +++ b/shared/test/common/test_configuration/aub_tests/gen9/CMakeLists.txt @@ -0,0 +1,15 @@ +# +# Copyright (C) 2021 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +if(TESTS_GEN9) + set(NEO_SHARED_aub_tests_configurations + ${NEO_SHARED_aub_tests_configurations} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen9.cpp + ) + + set(NEO_SHARED_aub_tests_configurations ${NEO_SHARED_aub_tests_configurations} PARENT_SCOPE) +endif() diff --git a/opencl/test/unit_test/aub_tests/gen9/aub_tests_configuration_gen9.cpp b/shared/test/common/test_configuration/aub_tests/gen9/aub_tests_configuration_gen9.cpp similarity index 100% rename from opencl/test/unit_test/aub_tests/gen9/aub_tests_configuration_gen9.cpp rename to shared/test/common/test_configuration/aub_tests/gen9/aub_tests_configuration_gen9.cpp