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

Fix ExecutionEnvironment test and rename hwInfoHelper to hardwareInfo

Browse Source 
Change-Id: I849b9f5a9f449f063e5717ea9758e80c6662c5a5
Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>
This commit is contained in:
Dunajski, Bartosz
2019-05-08 17:16:25 +02:00
committed by sys_ocldev
parent 4541b324a7
commit de988d067c
16 changed files with 68 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unit_tests/fixtures/buffer_enqueue_fixture.h
View File

@ -61,7 +61,7 @@ struct BufferEnqueueFixture : public HardwareParse,
protected:
const size_t bufferSizeInDwords = 64;
HardwareInfo hwInfoHelper;
HardwareInfo hardwareInfo;
HardwareInfo *hwInfo = nullptr;
ExecutionEnvironment *executionEnvironment;
cl_queue_properties properties = {};

10
unit_tests/fixtures/device_fixture.cpp
View File

@ -11,8 +11,8 @@
namespace NEO {
void DeviceFixture::SetUp() {
hwInfoHelper = *platformDevices[0];
SetUpImpl(&hwInfoHelper);
hardwareInfo = *platformDevices[0];
SetUpImpl(&hardwareInfo);
}
void DeviceFixture::SetUpImpl(const NEO::HardwareInfo *hardwareInfo) {
@ -30,8 +30,8 @@ void DeviceFixture::TearDown() {
}
MockDevice *DeviceFixture::createWithUsDeviceId(unsigned short usDeviceId) {
hwInfoHelper = *platformDevices[0];
hwInfoHelper.pPlatform.usDeviceID = usDeviceId;
return MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfoHelper);
hardwareInfo = *platformDevices[0];
hardwareInfo.pPlatform.usDeviceID = usDeviceId;
return MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hardwareInfo);
}
} // namespace NEO

2
unit_tests/fixtures/device_fixture.h
View File

@ -20,7 +20,7 @@ struct DeviceFixture {
MockDevice *pDevice = nullptr;
volatile uint32_t *pTagMemory = nullptr;
HardwareInfo hwInfoHelper = {};
HardwareInfo hardwareInfo = {};
PLATFORM platformHelper = {};
};
} // namespace NEO

6
unit_tests/fixtures/image_fixture.h
View File

@ -116,10 +116,10 @@ class ImageClearColorFixture {
using AUXILIARY_SURFACE_MODE = typename FamilyType::RENDER_SURFACE_STATE::AUXILIARY_SURFACE_MODE;
void SetUp() {
hwInfoHelper.capabilityTable.ftrRenderCompressedImages = true;
hardwareInfo.capabilityTable.ftrRenderCompressedImages = true;
NEO::platformImpl.reset();
NEO::constructPlatform()->peekExecutionEnvironment()->setHwInfo(&hwInfoHelper);
NEO::constructPlatform()->peekExecutionEnvironment()->setHwInfo(&hardwareInfo);
NEO::platform()->peekExecutionEnvironment()->initGmm();
surfaceState = FamilyType::cmdInitRenderSurfaceState;
@ -134,7 +134,7 @@ class ImageClearColorFixture {
}
RENDER_SURFACE_STATE surfaceState;
NEO::HardwareInfo hwInfoHelper = **NEO::platformDevices;
NEO::HardwareInfo hardwareInfo = **NEO::platformDevices;
protected:
MockContext context;