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

[1/n] Move Hardware Info to Execution Environment

Browse Source 
- remove gmm_environment_fixture
- remove hwInfo parameter from ExecutionEnvironment methods

Change-Id: Ieb0f9b5b89191fbbaf7676685c77644d42d69c26
Signed-off-by: Adam Stefanowski <adam.stefanowski@intel.com>
This commit is contained in:
Stefanowski, Adam
2019-01-23 11:59:54 +01:00
committed by sys_ocldev
parent a1bfbcf293
commit 341fcfc091
61 changed files with 480 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
unit_tests/fixtures/CMakeLists.txt
View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2018 Intel Corporation
# Copyright (C) 2018-2019 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
@ -15,7 +15,6 @@ set(IGDRCL_SRCS_tests_fixtures
${CMAKE_CURRENT_SOURCE_DIR}/enqueue_handler_fixture.h
${CMAKE_CURRENT_SOURCE_DIR}/execution_model_fixture.h
${CMAKE_CURRENT_SOURCE_DIR}/execution_model_kernel_fixture.h
${CMAKE_CURRENT_SOURCE_DIR}/gmm_environment_fixture.h
${CMAKE_CURRENT_SOURCE_DIR}/hello_world_fixture.h
${CMAKE_CURRENT_SOURCE_DIR}/hello_world_kernel_fixture.h
${CMAKE_CURRENT_SOURCE_DIR}/image_fixture.cpp

3
unit_tests/fixtures/device_fixture.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2018 Intel Corporation
* Copyright (C) 2017-2019 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -22,6 +22,5 @@ struct DeviceFixture {
volatile uint32_t *pTagMemory = nullptr;
HardwareInfo hwInfoHelper = {};
PLATFORM platformHelper = {};
ExecutionEnvironment executionEnvironment;
};
} // namespace OCLRT

22
unit_tests/fixtures/gmm_environment_fixture.h
View File

@ -1,22 +0,0 @@
/*
* Copyright (C) 2018 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#pragma once
#include "runtime/execution_environment/execution_environment.h"
#include "runtime/helpers/options.h"
namespace OCLRT {
struct GmmEnvironmentFixture {
virtual void SetUp() {
executionEnvironment.initGmm(*platformDevices);
}
virtual void TearDown(){};
ExecutionEnvironment executionEnvironment;
};
} // namespace OCLRT

3
unit_tests/fixtures/image_fixture.h
View File

@ -120,7 +120,8 @@ class ImageClearColorFixture {
hwInfoHelper.hwInfo.capabilityTable.ftrRenderCompressedImages = true;
OCLRT::platformImpl.reset();
OCLRT::constructPlatform()->peekExecutionEnvironment()->initGmm(&hwInfoHelper.hwInfo);
OCLRT::constructPlatform()->peekExecutionEnvironment()->setHwInfo(&hwInfoHelper.hwInfo);
OCLRT::platform()->peekExecutionEnvironment()->initGmm();
surfaceState = FamilyType::cmdInitRenderSurfaceState;
surfaceState.setAuxiliarySurfaceMode(AUXILIARY_SURFACE_MODE::AUXILIARY_SURFACE_MODE_AUX_CCS_E);

3
unit_tests/fixtures/memory_allocator_fixture.h
View File

@ -22,7 +22,8 @@ class MemoryAllocatorFixture : public MemoryManagementFixture {
void SetUp() override {
MemoryManagementFixture::SetUp();
executionEnvironment = std::make_unique<ExecutionEnvironment>();
executionEnvironment->initializeCommandStreamReceiver(*platformDevices, 0, 0);
executionEnvironment->setHwInfo(*platformDevices);
executionEnvironment->initializeCommandStreamReceiver(0, 0);
memoryManager = new MockMemoryManager(false, false, *executionEnvironment);
executionEnvironment->memoryManager.reset(memoryManager);
csr = memoryManager->getDefaultCommandStreamReceiver(0);