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

Cleanup includes in mock_device.h

Browse Source 
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2022-11-16 15:50:07 +00:00
committed by Compute-Runtime-Automation
parent 0cea7fe6d1
commit 4882f51721
30 changed files with 60 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
shared/test/common/fixtures/command_stream_receiver_fixture.cpp
View File

@ -8,6 +8,7 @@
#include "shared/test/common/fixtures/command_stream_receiver_fixture.h"
#include "shared/source/command_stream/preemption.h"
#include "shared/test/common/mocks/mock_graphics_allocation.h"
using namespace NEO;

14
shared/test/common/mocks/mock_device.cpp
View File

@ -10,6 +10,7 @@
#include "shared/source/command_stream/command_stream_receiver.h"
#include "shared/source/command_stream/preemption.h"
#include "shared/source/os_interface/os_context.h"
#include "shared/test/common/fixtures/mock_aub_center_fixture.h"
#include "shared/test/common/mocks/mock_execution_environment.h"
#include "shared/test/common/mocks/mock_memory_manager.h"
#include "shared/test/common/mocks/mock_ostime.h"
@ -105,6 +106,19 @@ bool MockDevice::verifyAdapterLuid() {
return verifyAdapterLuidReturnValue;
}
ExecutionEnvironment *MockDevice::prepareExecutionEnvironment(const HardwareInfo *pHwInfo) {
auto executionEnvironment = new ExecutionEnvironment();
executionEnvironment->prepareRootDeviceEnvironments(1);
auto hwInfo = pHwInfo ? pHwInfo : defaultHwInfo.get();
executionEnvironment->rootDeviceEnvironments[0]->setHwInfo(hwInfo);
MockAubCenterFixture::setMockAubCenter(*executionEnvironment->rootDeviceEnvironments[0]);
executionEnvironment->initializeMemoryManager();
return executionEnvironment;
}
bool MockSubDevice::createEngine(uint32_t deviceCsrIndex, EngineTypeUsage engineTypeUsage) {
if (failOnCreateEngine) {
return false;

15
shared/test/common/mocks/mock_device.h
View File

@ -10,11 +10,8 @@
#include "shared/source/command_stream/command_stream_receiver.h"
#include "shared/source/device/root_device.h"
#include "shared/source/device/sub_device.h"
#include "shared/source/memory_manager/memory_manager.h"
#include "shared/test/common/fixtures/mock_aub_center_fixture.h"
#include "shared/test/common/helpers/default_hw_info.h"
#include "shared/test/common/helpers/variable_backup.h"
#include "shared/test/common/mocks/mock_graphics_allocation.h"
namespace NEO {
class CommandStreamReceiver;
@ -186,7 +183,7 @@ class MockDevice : public RootDevice {
void setRTDispatchGlobalsForceAllocation() {
rtDispatchGlobalsForceAllocation = true;
}
static ExecutionEnvironment *prepareExecutionEnvironment(const HardwareInfo *pHwInfo);
static decltype(&createCommandStream) createCommandStreamReceiverFunc;
bool isDebuggerActiveParentCall = true;
@ -200,15 +197,7 @@ class MockDevice : public RootDevice {
template <>
inline Device *MockDevice::createWithNewExecutionEnvironment<Device>(const HardwareInfo *pHwInfo, uint32_t rootDeviceIndex) {
auto executionEnvironment = new ExecutionEnvironment();
executionEnvironment->prepareRootDeviceEnvironments(1);
auto hwInfo = pHwInfo ? pHwInfo : defaultHwInfo.get();
executionEnvironment->rootDeviceEnvironments[0]->setHwInfo(hwInfo);
MockAubCenterFixture::setMockAubCenter(*executionEnvironment->rootDeviceEnvironments[0]);
executionEnvironment->initializeMemoryManager();
auto executionEnvironment = MockDevice::prepareExecutionEnvironment(pHwInfo);
return Device::create<RootDevice>(executionEnvironment, 0u);
}

1
shared/test/unit_test/built_ins/builtin_tests.cpp
View File

@ -6,6 +6,7 @@
*/
#include "shared/source/built_ins/built_ins.h"
#include "shared/source/helpers/hw_helper.h"
#include "shared/test/common/fixtures/device_fixture.h"
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/mocks/mock_builtinslib.h"

1
shared/test/unit_test/command_container/command_encoder_tests_xe_hpg_core_and_later.cpp
View File

@ -7,6 +7,7 @@
#include "shared/source/command_container/command_encoder.h"
#include "shared/source/gmm_helper/gmm_helper.h"
#include "shared/source/memory_manager/memory_manager.h"
#include "shared/test/common/fixtures/device_fixture.h"
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/test_macros/hw_test.h"

1
shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp
View File

@ -19,6 +19,7 @@
#include "shared/test/common/helpers/variable_backup.h"
#include "shared/test/common/mocks/mock_csr.h"
#include "shared/test/common/mocks/mock_direct_submission_hw.h"
#include "shared/test/common/mocks/mock_graphics_allocation.h"
#include "shared/test/common/mocks/mock_io_functions.h"
#include "shared/test/common/test_macros/hw_test.h"
#include "shared/test/unit_test/fixtures/direct_submission_fixture.h"

1
shared/test/unit_test/direct_submission/dispatchers/render_dispatcher_tests.cpp
View File

@ -6,6 +6,7 @@
*/
#include "shared/source/direct_submission/dispatchers/render_dispatcher.h"
#include "shared/source/helpers/hw_helper.h"
#include "shared/test/common/cmd_parse/hw_parse.h"
#include "shared/test/common/helpers/unit_test_helper.h"
#include "shared/test/common/test_macros/test.h"

1
shared/test/unit_test/direct_submission/linux/drm_direct_submission_tests.cpp
View File

@ -20,6 +20,7 @@
#include "shared/test/common/libult/ult_command_stream_receiver.h"
#include "shared/test/common/mocks/linux/mock_drm_allocation.h"
#include "shared/test/common/mocks/mock_device.h"
#include "shared/test/common/mocks/mock_graphics_allocation.h"
#include "shared/test/common/os_interface/linux/drm_memory_manager_fixture.h"
#include "shared/test/common/test_macros/hw_test.h"

1
shared/test/unit_test/encoders/test_command_encoder.cpp
View File

@ -9,6 +9,7 @@
#include "shared/source/command_container/command_encoder.h"
#include "shared/test/common/cmd_parse/gen_cmd_parse.h"
#include "shared/test/common/fixtures/device_fixture.h"
#include "shared/test/common/mocks/mock_graphics_allocation.h"
#include "shared/test/common/test_macros/hw_test.h"
using namespace NEO;

1
shared/test/unit_test/fixtures/direct_submission_fixture.h
View File

@ -7,6 +7,7 @@
#pragma once
#include "shared/source/memory_manager/memory_manager.h"
#include "shared/source/os_interface/device_factory.h"
#include "shared/source/os_interface/os_context.h"
#include "shared/test/common/fixtures/device_fixture.h"

1
shared/test/unit_test/gen12lp/rkl/test_hw_helper_rkl.cpp
View File

@ -6,6 +6,7 @@
*/
#include "shared/source/gen12lp/hw_cmds_rkl.h"
#include "shared/source/helpers/hw_helper.h"
#include "shared/source/os_interface/hw_info_config.h"
#include "shared/test/common/helpers/hw_helper_tests.h"
#include "shared/test/common/test_macros/header/per_product_test_definitions.h"

1
shared/test/unit_test/gen12lp/test_command_encoder_gen12lp.cpp
View File

@ -8,6 +8,7 @@
#include "shared/source/command_container/cmdcontainer.h"
#include "shared/source/command_container/command_encoder.h"
#include "shared/source/gmm_helper/gmm_helper.h"
#include "shared/source/helpers/hw_helper.h"
#include "shared/source/helpers/pipeline_select_helper.h"
#include "shared/source/helpers/preamble.h"
#include "shared/source/os_interface/os_context.h"

1
shared/test/unit_test/gen12lp/tgllp/test_hw_helper_tgllp.cpp
View File

@ -6,6 +6,7 @@
*/
#include "shared/source/gen12lp/hw_cmds_tgllp.h"
#include "shared/source/helpers/hw_helper.h"
#include "shared/source/os_interface/hw_info_config.h"
#include "shared/test/common/helpers/hw_helper_tests.h"
#include "shared/test/common/test_macros/header/per_product_test_definitions.h"

4
shared/test/unit_test/heap_assigner/heap_assigner_tests.cpp
View File

@ -6,6 +6,8 @@
*/
#include "shared/source/helpers/heap_assigner.h"
#include "shared/source/memory_manager/allocation_type.h"
#include "shared/source/memory_manager/gfx_partition.h"
#include "shared/test/common/fixtures/device_fixture.h"
#include "shared/test/common/test_macros/hw_test.h"
@ -48,4 +50,4 @@ HWTEST_F(AlocationHelperTests, givenNotInternalHeapTypeWhenUseInternalAllocatorC
EXPECT_FALSE(heapAssigner.useInternal32BitHeap(AllocationType::BUFFER));
}
} // namespace NEO
} // namespace NEO

1
shared/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp
View File

@ -6,6 +6,7 @@
*/
#include "shared/source/helpers/engine_node_helper.h"
#include "shared/source/helpers/hw_helper.h"
#include "shared/test/common/fixtures/device_fixture.h"
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/test_macros/hw_test.h"

1
shared/test/unit_test/helpers/hw_helper_default_tests.cpp
View File

@ -5,6 +5,7 @@
*
*/
#include "shared/source/helpers/hw_helper.h"
#include "shared/source/helpers/hw_info.h"
#include "shared/test/common/helpers/hw_helper_tests.h"
#include "shared/test/common/test_macros/hw_test.h"

1
shared/test/unit_test/helpers/hw_helper_tests_pvc_and_later.cpp
View File

@ -7,6 +7,7 @@
#include "shared/source/gmm_helper/gmm_helper.h"
#include "shared/source/helpers/engine_node_helper.h"
#include "shared/source/helpers/hw_helper.h"
#include "shared/source/os_interface/hw_info_config.h"
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/helpers/hw_helper_tests.h"

3
shared/test/unit_test/memory_manager/unified_memory_manager_cache_tests.cpp
View File

@ -7,6 +7,7 @@
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/mocks/mock_device.h"
#include "shared/test/common/mocks/mock_graphics_allocation.h"
#include "shared/test/common/mocks/mock_memory_manager.h"
#include "shared/test/common/mocks/mock_svm_manager.h"
#include "shared/test/common/mocks/ult_device_factory.h"
@ -346,4 +347,4 @@ TEST(SvmDeviceAllocationCacheTest, givenCachedAllocationsWhenDestructorIsCalledT
ASSERT_EQ(memoryManager->freeGraphicsMemoryCalled, 0u);
svmManager.reset();
EXPECT_EQ(memoryManager->freeGraphicsMemoryCalled, testDataset.size());
}
}

2
shared/test/unit_test/xe_hpg_core/hw_helper_tests_xe_hpg_core.cpp
View File

@ -6,6 +6,8 @@
*/
#include "shared/source/command_stream/stream_properties.h"
#include "shared/source/helpers/hw_helper.h"
#include "shared/source/memory_manager/allocation_properties.h"
#include "shared/source/os_interface/hw_info_config.h"
#include "shared/test/common/cmd_parse/gen_cmd_parse.h"
#include "shared/test/common/cmd_parse/hw_parse.h"