Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move test configuration files to shared/common directory

Browse Source 
Signed-off-by: Kacper Nowak <kacper.nowak@intel.com>
This commit is contained in:
Kacper Nowak
2021-05-24 14:47:23 +02:00
committed by Compute-Runtime-Automation
parent 128c994821
commit f883376e61
18 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opencl/test/unit_test/CMakeLists.txt
View File

@ -47,8 +47,8 @@ add_dependencies(unit_tests copy_test_files_per_product)
set(IGDRCL_SRCS_tests_local
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/libult/os_interface.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ult_configuration.cpp
${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp
${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp
)

2
opencl/test/unit_test/aub_tests/CMakeLists.txt
View File

@ -9,11 +9,11 @@ project(igdrcl_aub_tests)
set(OPENCL_AUB_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
list(APPEND IGDRCL_AUB_TESTS__TARGET_OBJECTS
${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/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_macros/test_checks_shared.cpp
${NEO_SOURCE_DIR}/shared/test/common/test_configuration/aub_tests/aub_tests_configuration.cpp
$<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}>
$<TARGET_OBJECTS:${SCHEDULER_BINARY_LIB_NAME}>
$<TARGET_OBJECTS:igdrcl_libult>

16
opencl/test/unit_test/aub_tests/aub_tests_configuration.cpp
View File

@ -1,16 +0,0 @@
/*
* Copyright (C) 2018-2021 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "test_mode.h"
namespace NEO {
// max time per single test iteration
unsigned int ultIterationMaxTime = 180;
bool useMockGmm = false;
const char *executionDirectorySuffix = "_aub";
TestMode testMode = defaultTestMode;
} // namespace NEO

15
opencl/test/unit_test/aub_tests/aub_tests_configuration.h
View File

@ -1,15 +0,0 @@
/*
* Copyright (C) 2018-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#pragma once
struct AubTestsConfig {
bool testCanonicalAddress;
};
template <typename GfxFamily>
AubTestsConfig GetAubTestsConfig();

16
opencl/test/unit_test/aub_tests/aub_tests_configuration.inl
View File

@ -1,16 +0,0 @@
/*
* Copyright (C) 2018-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#pragma once
#include "opencl/test/unit_test/aub_tests/aub_tests_configuration.h"
template <typename GfxFamily>
AubTestsConfig GetAubTestsConfig() {
AubTestsConfig aubTestsConfig;
aubTestsConfig.testCanonicalAddress = true;
return aubTestsConfig;
}

2
opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp
View File

@ -8,9 +8,9 @@
#include "shared/source/command_stream/command_stream_receiver.h"
#include "shared/source/helpers/ptr_math.h"
#include "shared/test/common/mocks/mock_graphics_allocation.h"
#include "shared/test/common/test_configuration/aub_tests/aub_tests_configuration.h"
#include "opencl/source/mem_obj/buffer.h"
#include "opencl/test/unit_test/aub_tests/aub_tests_configuration.h"
#include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
#include "test.h"

2
opencl/test/unit_test/aub_tests/gen11/aub_tests_configuration_gen11.cpp
View File

@ -5,7 +5,7 @@
*
*/
#include "opencl/test/unit_test/aub_tests/aub_tests_configuration.inl"
#include "shared/test/common/test_configuration/aub_tests/aub_tests_configuration.inl"
#include "hw_cmds.h"

4
opencl/test/unit_test/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp
View File

@ -1,11 +1,11 @@
/*
* Copyright (C) 2019-2020 Intel Corporation
* Copyright (C) 2019-2021 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "opencl/test/unit_test/aub_tests/aub_tests_configuration.h"
#include "shared/test/common/test_configuration/aub_tests/aub_tests_configuration.h"
#include "hw_cmds.h"

4
opencl/test/unit_test/aub_tests/gen8/aub_tests_configuration_gen8.cpp
View File

@ -1,11 +1,11 @@
/*
* Copyright (C) 2018-2020 Intel Corporation
* Copyright (C) 2018-2021 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "opencl/test/unit_test/aub_tests/aub_tests_configuration.inl"
#include "shared/test/common/test_configuration/aub_tests/aub_tests_configuration.inl"
#include "hw_cmds.h"

4
opencl/test/unit_test/aub_tests/gen9/aub_tests_configuration_gen9.cpp
View File

@ -1,11 +1,11 @@
/*
* Copyright (C) 2018-2020 Intel Corporation
* Copyright (C) 2018-2021 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "opencl/test/unit_test/aub_tests/aub_tests_configuration.inl"
#include "shared/test/common/test_configuration/aub_tests/aub_tests_configuration.inl"
#include "hw_cmds.h"

2
opencl/test/unit_test/mt_tests/CMakeLists.txt
View File

@ -20,10 +20,10 @@ add_executable(igdrcl_mt_tests EXCLUDE_FROM_ALL
${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/os_interface.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/ult_configuration.cpp
${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp
${NEO_SOURCE_DIR}/shared/test/common/test_macros/test_checks_shared.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp
$<TARGET_OBJECTS:igdrcl_libult>
$<TARGET_OBJECTS:igdrcl_libult_cs>
$<TARGET_OBJECTS:igdrcl_libult_env>

15
opencl/test/unit_test/ult_configuration.cpp
View File

@ -1,15 +0,0 @@
/*
* Copyright (C) 2018-2021 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "test_mode.h"
namespace NEO {
unsigned int ultIterationMaxTime = 45;
bool useMockGmm = true;
const char *executionDirectorySuffix = "";
TestMode testMode = defaultTestMode;
} // namespace NEO

2
opencl/test/unit_test/windows/CMakeLists.txt
View File

@ -21,13 +21,13 @@ if(WIN32)
${NEO_SOURCE_DIR}/opencl/source/dll/windows/os_interface.cpp
${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/ult_configuration.cpp
${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp
${NEO_SOURCE_DIR}/shared/test/common/test_macros/test_checks_shared.cpp
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/wddm_create_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp
)
target_link_libraries(igdrcl_windows_dll_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} igdrcl_mocks gmock-gtest ${IGDRCL_EXTRA_LIBS})