intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-22 11:21:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant getters/setters from MockContext class

Browse Source 
Change-Id: I4283c1b5805141bf573fd433190e08d853ec7275
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2019-10-16 10:59:10 +02:00
committed by sys_ocldev
parent c46e886649
commit dccce00711
25 changed files with 93 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
unit_tests/os_interface/linux/drm_memory_manager_tests.cpp
View File

@@ -737,7 +737,7 @@ TEST_F(DrmMemoryManagerTest, Given32bitAllocatorWhenAskedForBufferAllocationThen
DebugManager.flags.Force32bitAddressing.set(true);
MockContext context;
memoryManager->setForce32BitAllocations(true);
context.setMemoryManager(memoryManager);
context.memoryManager = memoryManager;
memoryManager->setForce32BitAllocations(true);
auto size = MemoryConstants::pageSize;
@@ -769,7 +769,7 @@ TEST_F(DrmMemoryManagerTest, Given32bitAllocatorWhenAskedForBufferCreatedFromHos
DebugManager.flags.Force32bitAddressing.set(true);
MockContext context;
memoryManager->setForce32BitAllocations(true);
context.setMemoryManager(memoryManager);
context.memoryManager = memoryManager;
auto size = MemoryConstants::pageSize;
void *ptr = reinterpret_cast<void *>(0x1000);
@@ -830,7 +830,7 @@ TEST_F(DrmMemoryManagerTest, Given32bitAllocatorWhenAskedForBufferCreatedFrom64B
DebugManager.flags.Force32bitAddressing.set(true);
MockContext context;
memoryManager->setForce32BitAllocations(true);
context.setMemoryManager(memoryManager);
context.memoryManager = memoryManager;
auto size = MemoryConstants::pageSize;
void *ptr = reinterpret_cast<void *>(0x100000000000);
@@ -950,7 +950,7 @@ TEST_F(DrmMemoryManagerTest, GivenSizeAbove2GBWhenUseHostPtrAndAllocHostPtrAreCr
DebugManager.flags.Force32bitAddressing.set(true);
MockContext context;
memoryManager->setForce32BitAllocations(true);
context.setMemoryManager(memoryManager);
context.memoryManager = memoryManager;
size_t size = 2 * GB;
void *ptr = reinterpret_cast<void *>(0x100000000000);
@@ -992,7 +992,7 @@ TEST_F(DrmMemoryManagerTest, GivenSizeAbove2GBWhenAllocHostPtrAndUseHostPtrAreCr
DebugManager.flags.Force32bitAddressing.set(true);
MockContext context;
memoryManager->setForce32BitAllocations(true);
context.setMemoryManager(memoryManager);
context.memoryManager = memoryManager;
size_t size = 2 * GB;
void *ptr = reinterpret_cast<void *>(0x100000000000);
@@ -1034,7 +1034,7 @@ TEST_F(DrmMemoryManagerTest, givenDrmBufferWhenItIsQueriedForInternalAllocationT
mock->ioctl_expected.total = -1;
mock->outputFd = 1337;
MockContext context;
context.setMemoryManager(memoryManager);
context.memoryManager = memoryManager;
size_t size = 1u;
auto retVal = CL_SUCCESS;
@@ -1119,7 +1119,7 @@ HWTEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenTiledImageWithMipCountZe
mock->ioctl_expected.gemClose = 1;
MockContext context;
context.setMemoryManager(memoryManager);
context.memoryManager = memoryManager;
cl_image_format imageFormat;
imageFormat.image_channel_data_type = CL_UNORM_INT8;
@@ -1165,7 +1165,7 @@ HWTEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenTiledImageWithMipCountNo
mock->ioctl_expected.gemClose = 1;
MockContext context;
context.setMemoryManager(memoryManager);
context.memoryManager = memoryManager;
cl_image_format imageFormat;
imageFormat.image_channel_data_type = CL_UNORM_INT8;
@@ -1205,7 +1205,7 @@ HWTEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenTiledImageWithMipCountNo
TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenTiledImageIsBeingCreatedAndAllocationFailsThenReturnNullptr) {
MockContext context;
context.setMemoryManager(memoryManager);
context.memoryManager = memoryManager;
cl_image_format imageFormat;
imageFormat.image_channel_data_type = CL_UNORM_INT8;
@@ -1246,7 +1246,7 @@ HWTEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenTiledImageIsBeingCreated
mock->ioctl_expected.gemClose = 2;
MockContext context(device);
context.setMemoryManager(memoryManager);
context.memoryManager = memoryManager;
cl_image_format imageFormat;
imageFormat.image_channel_data_type = CL_UNORM_INT8;
@@ -1292,7 +1292,7 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenMemoryAllocatedForImageThe
mock->ioctl_expected.gemClose = 2;
MockContext context;
context.setMemoryManager(memoryManager);
context.memoryManager = memoryManager;
cl_image_format imageFormat;
imageFormat.image_channel_data_type = CL_UNORM_INT8;
@@ -1324,7 +1324,7 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenNonTiledImgWithMipCountZer
mock->ioctl_expected.gemClose = 2;
MockContext context;
context.setMemoryManager(memoryManager);
context.memoryManager = memoryManager;
cl_image_format imageFormat;
imageFormat.image_channel_data_type = CL_UNORM_INT8;
@@ -1367,7 +1367,7 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenNonTiledImgWithMipCountNon
mock->ioctl_expected.gemClose = 1;
MockContext context;
context.setMemoryManager(memoryManager);
context.memoryManager = memoryManager;
cl_image_format imageFormat;
imageFormat.image_channel_data_type = CL_UNORM_INT8;
@@ -1412,7 +1412,7 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhen1DarrayImageIsBeingCreated
mock->ioctl_expected.gemClose = 2;
MockContext context;
context.setMemoryManager(memoryManager);
context.memoryManager = memoryManager;
cl_image_format imageFormat;
imageFormat.image_channel_data_type = CL_UNORM_INT8;

10
unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp
View File

@@ -583,7 +583,7 @@ HWTEST_F(WddmMemoryManagerTest, givenWddmMemoryManagerWhenTiledImageWithMipCount
GTEST_SKIP();
}
MockContext context;
context.setMemoryManager(memoryManager.get());
context.memoryManager = memoryManager.get();
cl_image_format imageFormat;
imageFormat.image_channel_data_type = CL_UNORM_INT8;
@@ -610,7 +610,7 @@ HWTEST_F(WddmMemoryManagerTest, givenWddmMemoryManagerWhenTiledImageWithMipCount
TEST_F(WddmMemoryManagerTest, givenWddmMemoryManagerWhenTiledImageWithMipCountNonZeroIsBeingCreatedThenallocateGraphicsMemoryForImageIsUsed) {
MockContext context;
context.setMemoryManager(memoryManager.get());
context.memoryManager = memoryManager.get();
cl_image_format imageFormat;
imageFormat.image_channel_data_type = CL_UNORM_INT8;
@@ -643,7 +643,7 @@ HWTEST_F(WddmMemoryManagerTest, givenWddmMemoryManagerWhenTiledImageIsBeingCreat
}
std::unique_ptr<Device> device(MockDevice::createWithExecutionEnvironment<MockDevice>(*platformDevices, executionEnvironment, 0u));
MockContext context(device.get());
context.setMemoryManager(memoryManager.get());
context.memoryManager = memoryManager.get();
cl_image_format imageFormat;
imageFormat.image_channel_data_type = CL_UNORM_INT8;
@@ -672,7 +672,7 @@ HWTEST_F(WddmMemoryManagerTest, givenWddmMemoryManagerWhenTiledImageIsBeingCreat
TEST_F(WddmMemoryManagerTest, givenWddmMemoryManagerWhenNonTiledImgWithMipCountZeroisBeingCreatedThenAllocateGraphicsMemoryIsUsed) {
MockContext context;
context.setMemoryManager(memoryManager.get());
context.memoryManager = memoryManager.get();
cl_image_format imageFormat;
imageFormat.image_channel_data_type = CL_UNORM_INT8;
@@ -700,7 +700,7 @@ TEST_F(WddmMemoryManagerTest, givenWddmMemoryManagerWhenNonTiledImgWithMipCountZ
TEST_F(WddmMemoryManagerTest, givenWddmMemoryManagerWhenNonTiledImgWithMipCountNonZeroisBeingCreatedThenAllocateGraphicsMemoryForImageIsUsed) {
MockContext context;
context.setMemoryManager(memoryManager.get());
context.memoryManager = memoryManager.get();
cl_image_format imageFormat;
imageFormat.image_channel_data_type = CL_UNORM_INT8;

4
unit_tests/os_interface/windows/wddm_memory_manager_tests.h
View File

@@ -134,12 +134,12 @@ class BufferWithWddmMemory : public ::testing::Test,
void SetUp() {
WddmMemoryManagerFixture::SetUp();
tmp = context.getMemoryManager();
context.setMemoryManager(memoryManager.get());
context.memoryManager = memoryManager.get();
flags = 0;
}
void TearDown() {
context.setMemoryManager(tmp);
context.memoryManager = tmp;
WddmMemoryManagerFixture::TearDown();
}