intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-08 14:02:58 +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

6
unit_tests/command_queue/enqueue_read_buffer_tests.cpp
View File

@@ -525,7 +525,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, givenEnqueueReadBufferCalledWhenLockedPtrInT
MockMemoryManager memoryManager(false, true, executionEnvironment);
MockContext ctx;
cl_int retVal;
ctx.setMemoryManager(&memoryManager);
ctx.memoryManager = &memoryManager;
auto mockCmdQ = std::make_unique<MockCommandQueueHw<FamilyType>>(context, pDevice, nullptr);
std::unique_ptr<Buffer> buffer(Buffer::create(&ctx, 0, 1, nullptr, retVal));
static_cast<MemoryAllocation *>(buffer->getGraphicsAllocation())->overrideMemoryPool(MemoryPool::SystemCpuInaccessible);
@@ -553,7 +553,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, givenForcedCpuCopyWhenEnqueueReadCompressedB
MockMemoryManager memoryManager(false, true, executionEnvironment);
MockContext ctx;
cl_int retVal;
ctx.setMemoryManager(&memoryManager);
ctx.memoryManager = &memoryManager;
auto mockCmdQ = std::make_unique<MockCommandQueueHw<FamilyType>>(context, pDevice, nullptr);
std::unique_ptr<Buffer> buffer(Buffer::create(&ctx, 0, 1, nullptr, retVal));
static_cast<MemoryAllocation *>(buffer->getGraphicsAllocation())->overrideMemoryPool(MemoryPool::SystemCpuInaccessible);
@@ -599,7 +599,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, gicenEnqueueReadBufferCalledWhenLockedPtrInT
MockMemoryManager memoryManager(false, true, executionEnvironment);
MockContext ctx;
cl_int retVal;
ctx.setMemoryManager(&memoryManager);
ctx.memoryManager = &memoryManager;
auto mockCmdQ = std::make_unique<MockCommandQueueHw<FamilyType>>(context, pDevice, nullptr);
std::unique_ptr<Buffer> buffer(Buffer::create(&ctx, 0, 1, nullptr, retVal));
static_cast<MemoryAllocation *>(buffer->getGraphicsAllocation())->overrideMemoryPool(MemoryPool::System4KBPages);

8
unit_tests/command_queue/enqueue_svm_tests.cpp
View File

@@ -1349,7 +1349,7 @@ TEST_F(EnqueueSvmTest, givenPageFaultManagerWhenEnqueueMemcpyThenAllocIsDecommit
auto mockMemoryManager = std::make_unique<MockMemoryManager>();
mockMemoryManager->pageFaultManager.reset(new MockPageFaultManager());
auto memoryManager = context->getMemoryManager();
context->setMemoryManager(mockMemoryManager.get());
context->memoryManager = mockMemoryManager.get();
auto srcSvm = context->getSVMAllocsManager()->createSVMAlloc(256, {});
mockMemoryManager->getPageFaultManager()->insertAllocation(srcSvm, 256, context->getSVMAllocsManager(), context->getSpecialQueue());
mockMemoryManager->getPageFaultManager()->insertAllocation(ptrSVM, 256, context->getSVMAllocsManager(), context->getSpecialQueue());
@@ -1363,7 +1363,7 @@ TEST_F(EnqueueSvmTest, givenPageFaultManagerWhenEnqueueMemcpyThenAllocIsDecommit
EXPECT_EQ(static_cast<MockPageFaultManager *>(mockMemoryManager->getPageFaultManager())->transferToGpuCalled, 2);
context->getSVMAllocsManager()->freeSVMAlloc(srcSvm);
context->setMemoryManager(memoryManager);
context->memoryManager = memoryManager;
}
TEST_F(EnqueueSvmTest, givenPageFaultManagerWhenEnqueueMemFillThenAllocIsDecommitted) {
@@ -1371,7 +1371,7 @@ TEST_F(EnqueueSvmTest, givenPageFaultManagerWhenEnqueueMemFillThenAllocIsDecommi
auto mockMemoryManager = std::make_unique<MockMemoryManager>();
mockMemoryManager->pageFaultManager.reset(new MockPageFaultManager());
auto memoryManager = context->getMemoryManager();
context->setMemoryManager(mockMemoryManager.get());
context->memoryManager = mockMemoryManager.get();
mockMemoryManager->getPageFaultManager()->insertAllocation(ptrSVM, 256, context->getSVMAllocsManager(), context->getSpecialQueue());
EXPECT_EQ(static_cast<MockPageFaultManager *>(mockMemoryManager->getPageFaultManager())->transferToCpuCalled, 1);
@@ -1382,5 +1382,5 @@ TEST_F(EnqueueSvmTest, givenPageFaultManagerWhenEnqueueMemFillThenAllocIsDecommi
EXPECT_EQ(static_cast<MockPageFaultManager *>(mockMemoryManager->getPageFaultManager())->transferToCpuCalled, 1);
EXPECT_EQ(static_cast<MockPageFaultManager *>(mockMemoryManager->getPageFaultManager())->transferToGpuCalled, 1);
context->setMemoryManager(memoryManager);
context->memoryManager = memoryManager;
}

6
unit_tests/command_queue/enqueue_write_buffer_tests.cpp
View File

@@ -378,7 +378,7 @@ HWTEST_F(EnqueueWriteBufferTypeTest, givenEnqueueWriteBufferCalledWhenLockedPtrI
MockMemoryManager memoryManager(false, true, executionEnvironment);
MockContext ctx;
cl_int retVal;
ctx.setMemoryManager(&memoryManager);
ctx.memoryManager = &memoryManager;
auto mockCmdQ = std::make_unique<MockCommandQueueHw<FamilyType>>(context, pDevice, nullptr);
std::unique_ptr<Buffer> buffer(Buffer::create(&ctx, 0, 1, nullptr, retVal));
static_cast<MemoryAllocation *>(buffer->getGraphicsAllocation())->overrideMemoryPool(MemoryPool::SystemCpuInaccessible);
@@ -406,7 +406,7 @@ HWTEST_F(EnqueueWriteBufferTypeTest, givenForcedCpuCopyWhenEnqueueWriteCompresse
MockMemoryManager memoryManager(false, true, executionEnvironment);
MockContext ctx;
cl_int retVal;
ctx.setMemoryManager(&memoryManager);
ctx.memoryManager = &memoryManager;
auto mockCmdQ = std::make_unique<MockCommandQueueHw<FamilyType>>(context, pDevice, nullptr);
std::unique_ptr<Buffer> buffer(Buffer::create(&ctx, 0, 1, nullptr, retVal));
static_cast<MemoryAllocation *>(buffer->getGraphicsAllocation())->overrideMemoryPool(MemoryPool::SystemCpuInaccessible);
@@ -452,7 +452,7 @@ HWTEST_F(EnqueueWriteBufferTypeTest, givenEnqueueWriteBufferCalledWhenLockedPtrI
MockMemoryManager memoryManager(false, true, executionEnvironment);
MockContext ctx;
cl_int retVal;
ctx.setMemoryManager(&memoryManager);
ctx.memoryManager = &memoryManager;
auto mockCmdQ = std::make_unique<MockCommandQueueHw<FamilyType>>(context, pDevice, nullptr);
std::unique_ptr<Buffer> buffer(Buffer::create(&ctx, 0, 1, nullptr, retVal));
static_cast<MemoryAllocation *>(buffer->getGraphicsAllocation())->overrideMemoryPool(MemoryPool::System4KBPages);

4
unit_tests/context/context_tests.cpp
View File

@@ -389,9 +389,9 @@ TEST(Context, givenContextWhenCheckIfAllocationsAreMultiStorageThenReturnProperV
MockContext context;
EXPECT_TRUE(context.areMultiStorageAllocationsPreferred());
context.setContextType(ContextType::CONTEXT_TYPE_SPECIALIZED);
context.contextType = ContextType::CONTEXT_TYPE_SPECIALIZED;
EXPECT_FALSE(context.areMultiStorageAllocationsPreferred());
context.setContextType(ContextType::CONTEXT_TYPE_UNRESTRICTIVE);
context.contextType = ContextType::CONTEXT_TYPE_UNRESTRICTIVE;
EXPECT_TRUE(context.areMultiStorageAllocationsPreferred());
}

4
unit_tests/context/driver_diagnostics_tests.cpp
View File

@@ -353,7 +353,7 @@ TEST_F(PerformanceHintTest, givenPrintDriverDiagnosticValueWhenContextIsCreatedT
auto context = Context::create<MockContext>(nullptr, DeviceVector(&clDevice, 1), nullptr, nullptr, retVal);
EXPECT_TRUE(!!context->isProvidingPerformanceHints());
auto driverDiagnostics = context->getDriverDiagnostics();
auto driverDiagnostics = context->driverDiagnostics;
ASSERT_NE(nullptr, driverDiagnostics);
EXPECT_TRUE(driverDiagnostics->validFlags(hintLevel));
context->release();
@@ -421,7 +421,7 @@ TEST_F(PerformanceHintTest, givenPrintDriverDiagnosticsDebugModeEnabledWhenConte
auto retValue = CL_SUCCESS;
auto context = Context::create<MockContext>(validProperties, DeviceVector(&clDevice, 1), callbackFunction, (void *)userData, retVal);
EXPECT_EQ(CL_SUCCESS, retValue);
auto driverDiagnostics = context->getDriverDiagnostics();
auto driverDiagnostics = context->driverDiagnostics;
ASSERT_NE(nullptr, driverDiagnostics);
EXPECT_TRUE(driverDiagnostics->validFlags(hintLevel));
EXPECT_FALSE(driverDiagnostics->validFlags(2));

4
unit_tests/d3d_sharing/d3d9_tests.cpp
View File

@@ -92,8 +92,8 @@ class D3D9Tests : public PlatformFixture, public ::testing::Test {
PlatformFixture::SetUp();
memoryManager = std::make_unique<MockMM>(*pPlatform->peekExecutionEnvironment());
context = new MockContext(pPlatform->getDevice(0));
context->forcePreferD3dSharedResources(true);
context->setMemoryManager(memoryManager.get());
context->preferD3dSharedResources = true;
context->memoryManager = memoryManager.get();
mockSharingFcns = new NiceMock<MockD3DSharingFunctions<D3D9>>();
context->setSharingFunctions(mockSharingFcns);

4
unit_tests/d3d_sharing/d3d_tests_part1.cpp
View File

@@ -472,13 +472,13 @@ TYPED_TEST_P(D3DTests, getPreferD3DSharedResources) {
size_t size = 0;
auto param = this->pickParam(CL_CONTEXT_D3D10_PREFER_SHARED_RESOURCES_KHR, CL_CONTEXT_D3D11_PREFER_SHARED_RESOURCES_KHR);
ctx->forcePreferD3dSharedResources(1u);
ctx->preferD3dSharedResources = 1u;
auto retVal = ctx->getInfo(param, sizeof(retBool), &retBool, &size);
EXPECT_EQ(CL_SUCCESS, retVal);
EXPECT_EQ(sizeof(cl_bool), size);
EXPECT_EQ(1u, retBool);
ctx->forcePreferD3dSharedResources(0u);
ctx->preferD3dSharedResources = 0u;
retVal = ctx->getInfo(param, sizeof(retBool), &retBool, &size);
EXPECT_EQ(CL_SUCCESS, retVal);
EXPECT_EQ(sizeof(cl_bool), size);

2
unit_tests/d3d_sharing/d3d_tests_part2.cpp
View File

@@ -276,7 +276,7 @@ TYPED_TEST_P(D3DTests, givenD3DDeviceParamWhenContextCreationThenSetProperValues
EXPECT_EQ(CL_SUCCESS, retVal);
ASSERT_NE(nullptr, ctx.get());
EXPECT_EQ(1u, ctx->peekPreferD3dSharedResources());
EXPECT_EQ(1u, ctx->preferD3dSharedResources);
EXPECT_NE(nullptr, ctx->getSharing<D3DSharingFunctions<TypeParam>>());
}

4
unit_tests/fixtures/d3d_test_fixture.h
View File

@@ -84,12 +84,12 @@ class D3DTests : public PlatformFixture, public ::testing::Test {
dbgRestore = new DebugManagerStateRestore();
PlatformFixture::SetUp();
context = new MockContext(pPlatform->getDevice(0));
context->forcePreferD3dSharedResources(true);
context->preferD3dSharedResources = true;
mockMM = std::make_unique<MockMM>(*context->getDevice(0)->getExecutionEnvironment());
mockSharingFcns = new NiceMock<MockD3DSharingFunctions<T>>();
context->setSharingFunctions(mockSharingFcns);
context->setMemoryManager(mockMM.get());
context->memoryManager = mockMM.get();
cmdQ = new MockCommandQueue(context, context->getDevice(0), 0);
DebugManager.injectFcn = &mockSharingFcns->mockGetDxgiDesc;

2
unit_tests/gen12lp/hw_helper_tests_gen12lp.cpp
View File

@@ -133,7 +133,7 @@ class HwHelperTestsGen12LpBuffer : public ::testing::Test {
ExecutionEnvironment *executionEnvironment = platformImpl->peekExecutionEnvironment();
device.reset(Device::create<MockDevice>(executionEnvironment, 0u));
context = std::make_unique<MockContext>(device.get(), true);
context->setContextType(ContextType::CONTEXT_TYPE_UNRESTRICTIVE);
context->contextType = ContextType::CONTEXT_TYPE_UNRESTRICTIVE;
}
cl_int retVal = CL_SUCCESS;

8
unit_tests/helpers/transfer_properties_tests.cpp
View File

@@ -29,7 +29,7 @@ TEST(TransferPropertiesTest, givenAllocationInNonSystemPoolWhenTransferPropertie
MemoryManagerCreate<OsAgnosticMemoryManager> memoryManager(false, true, executionEnvironment);
MockContext ctx;
ctx.setMemoryManager(&memoryManager);
ctx.memoryManager = &memoryManager;
cl_int retVal;
std::unique_ptr<Buffer> buffer(Buffer::create(&ctx, 0, 1, nullptr, retVal));
static_cast<MemoryAllocation *>(buffer->getGraphicsAllocation())->overrideMemoryPool(MemoryPool::SystemCpuInaccessible);
@@ -45,7 +45,7 @@ TEST(TransferPropertiesTest, givenAllocationInNonSystemPoolWhenTransferPropertie
MemoryManagerCreate<OsAgnosticMemoryManager> memoryManager(false, true, executionEnvironment);
MockContext ctx;
ctx.setMemoryManager(&memoryManager);
ctx.memoryManager = &memoryManager;
cl_int retVal;
std::unique_ptr<Buffer> buffer(Buffer::create(&ctx, 0, 1, nullptr, retVal));
static_cast<MemoryAllocation *>(buffer->getGraphicsAllocation())->overrideMemoryPool(MemoryPool::SystemCpuInaccessible);
@@ -62,7 +62,7 @@ TEST(TransferPropertiesTest, givenAllocationInSystemPoolWhenTransferPropertiesAr
MemoryManagerCreate<OsAgnosticMemoryManager> memoryManager(false, true, executionEnvironment);
MockContext ctx;
ctx.setMemoryManager(&memoryManager);
ctx.memoryManager = &memoryManager;
cl_int retVal;
std::unique_ptr<Buffer> buffer(Buffer::create(&ctx, 0, 1, nullptr, retVal));
static_cast<MemoryAllocation *>(buffer->getGraphicsAllocation())->overrideMemoryPool(MemoryPool::System4KBPages);
@@ -88,7 +88,7 @@ TEST(TransferPropertiesTest, givenTransferPropertiesWhenLockedPtrIsSetThenItIsRe
MemoryManagerCreate<OsAgnosticMemoryManager> memoryManager(false, true, executionEnvironment);
MockContext ctx;
ctx.setMemoryManager(&memoryManager);
ctx.memoryManager = &memoryManager;
cl_int retVal;
std::unique_ptr<Buffer> buffer(Buffer::create(&ctx, 0, 1, nullptr, retVal));
static_cast<MemoryAllocation *>(buffer->getGraphicsAllocation())->overrideMemoryPool(MemoryPool::SystemCpuInaccessible);

2
unit_tests/kernel/kernel_tests.cpp
View File

@@ -2626,7 +2626,7 @@ TEST(KernelTest, givenFtrRenderCompressedBuffersWhenInitializingArgsWithNonState
auto hwInfo = device->getExecutionEnvironment()->getMutableHardwareInfo();
auto &capabilityTable = hwInfo->capabilityTable;
auto context = clUniquePtr(new MockContext(device.get()));
context->setContextType(ContextType::CONTEXT_TYPE_UNRESTRICTIVE);
context->contextType = ContextType::CONTEXT_TYPE_UNRESTRICTIVE;
MockKernelWithInternals kernel(*device, context.get());
kernel.kernelInfo.kernelArgInfo.resize(1);
kernel.kernelInfo.kernelArgInfo.at(0).typeStr = "char *";

4
unit_tests/mem_obj/buffer_pin_tests.cpp
View File

@@ -58,7 +58,7 @@ TEST(BufferTests, doPinIsSet) {
auto retVal = CL_INVALID_OPERATION;
mm->expectedSize = size;
mm->HPExpectedSize = 0u;
context.setMemoryManager(mm.get());
context.memoryManager = mm.get();
auto buffer = Buffer::create(
&context,
@@ -81,7 +81,7 @@ TEST(BufferTests, doPinIsSetForHostPtr) {
auto size = MemoryConstants::pageSize * 32;
mm->expectedSize = 0u;
mm->HPExpectedSize = size;
context.setMemoryManager(mm.get());
context.memoryManager = mm.get();
// memory must be aligned to use zero-copy
void *bff = alignedMalloc(size, MemoryConstants::pageSize);

30
unit_tests/mem_obj/buffer_tests.cpp
View File

@@ -331,7 +331,7 @@ TEST(Buffer, givenAllocHostPtrFlagPassedToBufferCreateWhenNoSharedContextOrRende
TEST(Buffer, givenRenderCompressedBuffersEnabledWhenAllocationTypeIsQueriedThenBufferCompressedTypeIsReturnedIn64Bit) {
MemoryPropertiesFlags memoryProperties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags({});
MockContext context;
context.setContextType(ContextType::CONTEXT_TYPE_UNRESTRICTIVE);
context.contextType = ContextType::CONTEXT_TYPE_UNRESTRICTIVE;
context.isSharedContext = false;
auto type = MockPublicAccessBuffer::getGraphicsAllocationType(memoryProperties, context, true, false, true);
if (is32bit) {
@@ -344,7 +344,7 @@ TEST(Buffer, givenRenderCompressedBuffersEnabledWhenAllocationTypeIsQueriedThenB
TEST(Buffer, givenRenderCompressedBuffersDisabledLocalMemoryEnabledWhenAllocationTypeIsQueriedThenBufferTypeIsReturnedIn64Bit) {
MemoryPropertiesFlags memoryProperties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags({});
MockContext context;
context.setContextType(ContextType::CONTEXT_TYPE_UNRESTRICTIVE);
context.contextType = ContextType::CONTEXT_TYPE_UNRESTRICTIVE;
context.isSharedContext = false;
auto type = MockPublicAccessBuffer::getGraphicsAllocationType(memoryProperties, context, false, true, true);
if (is32bit) {
@@ -357,7 +357,7 @@ TEST(Buffer, givenRenderCompressedBuffersDisabledLocalMemoryEnabledWhenAllocatio
TEST(Buffer, givenSharedContextWhenAllocationTypeIsQueriedThenBufferHostMemoryTypeIsReturned) {
MemoryPropertiesFlags memoryProperties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags({});
MockContext context;
context.setContextType(ContextType::CONTEXT_TYPE_UNRESTRICTIVE);
context.contextType = ContextType::CONTEXT_TYPE_UNRESTRICTIVE;
context.isSharedContext = true;
auto type = MockPublicAccessBuffer::getGraphicsAllocationType(memoryProperties, context, false, false, true);
EXPECT_EQ(GraphicsAllocation::AllocationType::BUFFER_HOST_MEMORY, type);
@@ -366,7 +366,7 @@ TEST(Buffer, givenSharedContextWhenAllocationTypeIsQueriedThenBufferHostMemoryTy
TEST(Buffer, givenSharedContextAndRenderCompressedBuffersEnabledWhenAllocationTypeIsQueriedThenBufferHostMemoryTypeIsReturned) {
MemoryPropertiesFlags memoryProperties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags({});
MockContext context;
context.setContextType(ContextType::CONTEXT_TYPE_UNRESTRICTIVE);
context.contextType = ContextType::CONTEXT_TYPE_UNRESTRICTIVE;
context.isSharedContext = true;
auto type = MockPublicAccessBuffer::getGraphicsAllocationType(memoryProperties, context, true, false, true);
EXPECT_EQ(GraphicsAllocation::AllocationType::BUFFER_HOST_MEMORY, type);
@@ -377,7 +377,7 @@ TEST(Buffer, givenUseHostPtrFlagAndLocalMemoryDisabledWhenAllocationTypeIsQuerie
properties.flags = CL_MEM_USE_HOST_PTR;
MemoryPropertiesFlags memoryProperties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(properties);
MockContext context;
context.setContextType(ContextType::CONTEXT_TYPE_UNRESTRICTIVE);
context.contextType = ContextType::CONTEXT_TYPE_UNRESTRICTIVE;
context.isSharedContext = false;
auto type = MockPublicAccessBuffer::getGraphicsAllocationType(memoryProperties, context, false, false, true);
EXPECT_EQ(GraphicsAllocation::AllocationType::BUFFER_HOST_MEMORY, type);
@@ -388,7 +388,7 @@ TEST(Buffer, givenUseHostPtrFlagAndLocalMemoryEnabledWhenAllocationTypeIsQueried
properties.flags = CL_MEM_USE_HOST_PTR;
MemoryPropertiesFlags memoryProperties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(properties);
MockContext context;
context.setContextType(ContextType::CONTEXT_TYPE_UNRESTRICTIVE);
context.contextType = ContextType::CONTEXT_TYPE_UNRESTRICTIVE;
context.isSharedContext = false;
auto type = MockPublicAccessBuffer::getGraphicsAllocationType(memoryProperties, context, false, true, true);
if (is64bit) {
@@ -403,7 +403,7 @@ TEST(Buffer, givenAllocHostPtrFlagWhenAllocationTypeIsQueriedThenBufferTypeIsRet
properties.flags = CL_MEM_ALLOC_HOST_PTR;
MemoryPropertiesFlags memoryProperties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(properties);
MockContext context;
context.setContextType(ContextType::CONTEXT_TYPE_UNRESTRICTIVE);
context.contextType = ContextType::CONTEXT_TYPE_UNRESTRICTIVE;
context.isSharedContext = false;
auto type = MockPublicAccessBuffer::getGraphicsAllocationType(memoryProperties, context, false, false, true);
if (is64bit) {
@@ -418,7 +418,7 @@ TEST(Buffer, givenUseHostPtrFlagAndLocalMemoryDisabledAndRenderCompressedBuffers
properties.flags = CL_MEM_USE_HOST_PTR;
MemoryPropertiesFlags memoryProperties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(properties);
MockContext context;
context.setContextType(ContextType::CONTEXT_TYPE_UNRESTRICTIVE);
context.contextType = ContextType::CONTEXT_TYPE_UNRESTRICTIVE;
context.isSharedContext = false;
auto type = MockPublicAccessBuffer::getGraphicsAllocationType(memoryProperties, context, true, false, true);
EXPECT_EQ(GraphicsAllocation::AllocationType::BUFFER_HOST_MEMORY, type);
@@ -429,7 +429,7 @@ TEST(Buffer, givenUseHostPtrFlagAndLocalMemoryEnabledAndRenderCompressedBuffersE
properties.flags = CL_MEM_USE_HOST_PTR;
MemoryPropertiesFlags memoryProperties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(properties);
MockContext context;
context.setContextType(ContextType::CONTEXT_TYPE_UNRESTRICTIVE);
context.contextType = ContextType::CONTEXT_TYPE_UNRESTRICTIVE;
context.isSharedContext = false;
auto type = MockPublicAccessBuffer::getGraphicsAllocationType(memoryProperties, context, true, true, true);
if (is64bit) {
@@ -444,7 +444,7 @@ TEST(Buffer, givenUseHostPointerFlagAndForceSharedPhysicalStorageWhenLocalMemory
properties.flags = CL_MEM_USE_HOST_PTR | CL_MEM_FORCE_SHARED_PHYSICAL_MEMORY_INTEL;
MemoryPropertiesFlags memoryProperties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(properties);
MockContext context;
context.setContextType(ContextType::CONTEXT_TYPE_UNRESTRICTIVE);
context.contextType = ContextType::CONTEXT_TYPE_UNRESTRICTIVE;
context.isSharedContext = false;
auto type = MockPublicAccessBuffer::getGraphicsAllocationType(memoryProperties, context, true, true, true);
EXPECT_EQ(GraphicsAllocation::AllocationType::BUFFER_HOST_MEMORY, type);
@@ -455,7 +455,7 @@ TEST(Buffer, givenAllocHostPtrFlagAndRenderCompressedBuffersEnabledWhenAllocatio
properties.flags = CL_MEM_ALLOC_HOST_PTR;
MemoryPropertiesFlags memoryProperties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(properties);
MockContext context;
context.setContextType(ContextType::CONTEXT_TYPE_UNRESTRICTIVE);
context.contextType = ContextType::CONTEXT_TYPE_UNRESTRICTIVE;
context.isSharedContext = false;
auto type = MockPublicAccessBuffer::getGraphicsAllocationType(memoryProperties, context, true, false, true);
if (is64bit) {
@@ -468,7 +468,7 @@ TEST(Buffer, givenAllocHostPtrFlagAndRenderCompressedBuffersEnabledWhenAllocatio
TEST(Buffer, givenZeroFlagsNoSharedContextAndRenderCompressedBuffersDisabledWhenAllocationTypeIsQueriedThenBufferTypeIsReturned) {
MemoryPropertiesFlags memoryProperties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags({});
MockContext context;
context.setContextType(ContextType::CONTEXT_TYPE_UNRESTRICTIVE);
context.contextType = ContextType::CONTEXT_TYPE_UNRESTRICTIVE;
context.isSharedContext = false;
auto type = MockPublicAccessBuffer::getGraphicsAllocationType(memoryProperties, context, false, false, true);
if (is32bit) {
@@ -509,7 +509,7 @@ struct RenderCompressedBuffersTests : public ::testing::Test {
hwInfo = executionEnvironment->getMutableHardwareInfo();
device.reset(Device::create<MockDevice>(executionEnvironment, 0u));
context = std::make_unique<MockContext>(device.get(), true);
context->setContextType(ContextType::CONTEXT_TYPE_UNRESTRICTIVE);
context->contextType = ContextType::CONTEXT_TYPE_UNRESTRICTIVE;
}
cl_int retVal = CL_SUCCESS;
@@ -662,7 +662,7 @@ struct RenderCompressedBuffersCopyHostMemoryTests : public RenderCompressedBuffe
void SetUp() override {
RenderCompressedBuffersTests::SetUp();
device->injectMemoryManager(new MockMemoryManager(true, false, *platformImpl->peekExecutionEnvironment()));
context->setMemoryManager(device->getMemoryManager());
context->memoryManager = device->getMemoryManager();
mockCmdQ = new MockCommandQueue();
context->setSpecialQueue(mockCmdQ);
}
@@ -758,7 +758,7 @@ HWTEST_TEMPLATED_F(BcsBufferTests, givenBufferWithInitializationDataAndBcsCsrWhe
auto bcsCsr = static_cast<UltCommandStreamReceiver<FamilyType> *>(bcsMockContext->bcsCsr.get());
auto newMemoryManager = new MockMemoryManager(true, true, *device->getExecutionEnvironment());
device->getExecutionEnvironment()->memoryManager.reset(newMemoryManager);
bcsMockContext->setMemoryManager(newMemoryManager);
bcsMockContext->memoryManager = newMemoryManager;
EXPECT_EQ(0u, bcsCsr->blitBufferCalled);
auto bufferForBlt = clUniquePtr(Buffer::create(bcsMockContext.get(), CL_MEM_COPY_HOST_PTR, 2000, &hostPtr, retVal));

6
unit_tests/mem_obj/image_tests.cpp
View File

@@ -670,7 +670,7 @@ TEST_P(CreateImageHostPtr, givenLinearImageWhenFailedAtCreationThenReturnError)
TEST_P(CreateImageHostPtr, checkWritingOutsideAllocatedMemoryWhileCreatingImage) {
auto mockMemoryManager = new MockMemoryManager(*pDevice->executionEnvironment);
pDevice->injectMemoryManager(mockMemoryManager);
context->setMemoryManager(mockMemoryManager);
context->memoryManager = mockMemoryManager;
mockMemoryManager->redundancyRatio = 2;
memset(pHostPtr, 1, testImageDimensions * testImageDimensions * elementSize * 4);
imageDesc.image_type = CL_MEM_OBJECT_IMAGE1D_ARRAY;
@@ -1486,7 +1486,7 @@ HWTEST_F(HwImageTest, givenImageHwWhenSettingCCSParamsThenSetClearColorParamsIsC
MockContext context;
OsAgnosticMemoryManager memoryManager(*context.getDevice(0)->getExecutionEnvironment());
context.setMemoryManager(&memoryManager);
context.memoryManager = &memoryManager;
cl_image_desc imgDesc = {};
imgDesc.image_height = 4;
@@ -1519,7 +1519,7 @@ HWTEST_F(HwImageTest, givenImageHwWithUnifiedSurfaceAndMcsWhenSettingParamsForMu
MockContext context;
OsAgnosticMemoryManager memoryManager(*context.getDevice(0)->getExecutionEnvironment());
context.setMemoryManager(&memoryManager);
context.memoryManager = &memoryManager;
cl_image_desc imgDesc = {};
imgDesc.image_height = 1;

28
unit_tests/mem_obj/mem_obj_tests.cpp
View File

@@ -184,7 +184,7 @@ TEST(MemObj, givenNotUsedGraphicsAllocationWhenMemObjDestroysAllocationAsyncThen
MockContext context;
MockMemoryManager memoryManager(*context.getDevice(0)->getExecutionEnvironment());
context.setMemoryManager(&memoryManager);
context.memoryManager = &memoryManager;
auto allocation = memoryManager.allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize});
MemObj memObj(&context, CL_MEM_OBJECT_BUFFER, CL_MEM_COPY_HOST_PTR, CL_MEM_COPY_HOST_PTR, 0,
@@ -201,7 +201,7 @@ TEST(MemObj, givenMemoryManagerWithoutDeviceWhenMemObjDestroysAllocationAsyncThe
MockContext context;
MockMemoryManager memoryManager(*context.getDevice(0)->getExecutionEnvironment());
context.setMemoryManager(&memoryManager);
context.memoryManager = &memoryManager;
auto allocation = memoryManager.allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize});
@@ -219,7 +219,7 @@ TEST(MemObj, givenMemObjAndPointerToObjStorageWithProperCommandWhenCheckIfMemTra
MockContext context;
MockMemoryManager memoryManager(*context.getDevice(0)->getExecutionEnvironment());
context.setMemoryManager(&memoryManager);
context.memoryManager = &memoryManager;
MemObj memObj(&context, CL_MEM_OBJECT_BUFFER, CL_MEM_COPY_HOST_PTR, CL_MEM_COPY_HOST_PTR, 0,
MemoryConstants::pageSize, nullptr, nullptr, nullptr, true, false, false);
@@ -246,7 +246,7 @@ TEST(MemObj, givenMemObjAndPointerToObjStorageBadCommandWhenCheckIfMemTransferRe
MockContext context;
MockMemoryManager memoryManager(*context.getDevice(0)->getExecutionEnvironment());
context.setMemoryManager(&memoryManager);
context.memoryManager = &memoryManager;
MemObj memObj(&context, CL_MEM_OBJECT_BUFFER, CL_MEM_COPY_HOST_PTR, CL_MEM_COPY_HOST_PTR, 0,
MemoryConstants::pageSize, nullptr, nullptr, nullptr, true, false, false);
@@ -258,7 +258,7 @@ TEST(MemObj, givenMemObjAndPointerToDiffrentStorageAndProperCommandWhenCheckIfMe
MockContext context;
MockMemoryManager memoryManager(*context.getDevice(0)->getExecutionEnvironment());
context.setMemoryManager(&memoryManager);
context.memoryManager = &memoryManager;
MemObj memObj(&context, CL_MEM_OBJECT_BUFFER, CL_MEM_COPY_HOST_PTR, CL_MEM_COPY_HOST_PTR, 0,
MemoryConstants::pageSize, nullptr, nullptr, nullptr, true, false, false);
@@ -293,7 +293,7 @@ TEST(MemObj, givenRenderCompressedGmmWhenAskingForMappingOnCpuThenDisallow) {
MockContext context;
MockMemoryManager memoryManager(*context.getDevice(0)->getExecutionEnvironment());
context.setMemoryManager(&memoryManager);
context.memoryManager = &memoryManager;
auto allocation = memoryManager.allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize});
allocation->setDefaultGmm(new Gmm(nullptr, 1, false));
@@ -311,7 +311,7 @@ TEST(MemObj, givenDefaultWhenAskedForCpuMappingThenReturnTrue) {
MockContext context;
MockMemoryManager memoryManager(*context.getDevice(0)->getExecutionEnvironment());
context.setMemoryManager(&memoryManager);
context.memoryManager = &memoryManager;
auto allocation = memoryManager.allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize});
@@ -327,7 +327,7 @@ TEST(MemObj, givenNonCpuAccessibleMemoryWhenAskingForMappingOnCpuThenDisallow) {
MockContext context;
MockMemoryManager memoryManager(*context.getDevice(0)->getExecutionEnvironment());
context.setMemoryManager(&memoryManager);
context.memoryManager = &memoryManager;
auto allocation = memoryManager.allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize});
allocation->setDefaultGmm(new Gmm(nullptr, 1, false));
@@ -343,7 +343,7 @@ TEST(MemObj, givenNonCpuAccessibleMemoryWhenAskingForMappingOnCpuThenDisallow) {
TEST(MemObj, givenMultipleMemObjectsWithReusedGraphicsAllocationWhenDestroyedThenFreeAllocationOnce) {
MockContext context;
MockMemoryManager memoryManager(*context.getDevice(0)->getExecutionEnvironment());
context.setMemoryManager(&memoryManager);
context.memoryManager = &memoryManager;
auto allocation = memoryManager.allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize});
@@ -379,7 +379,7 @@ TEST(MemObj, givenMemObjectWhenContextIsNotNullThenContextOutlivesMemobjects) {
TEST(MemObj, givenSharedMemObjectWithNullGfxAllocationWhenSettingGfxAllocationThenSucceed) {
MockContext context;
MockMemoryManager memoryManager(*context.getDevice(0)->getExecutionEnvironment());
context.setMemoryManager(&memoryManager);
context.memoryManager = &memoryManager;
MockGraphicsAllocation *gfxAllocation = new MockGraphicsAllocation(nullptr, 0);
MemObj memObj(&context, CL_MEM_OBJECT_BUFFER, CL_MEM_USE_HOST_PTR, CL_MEM_USE_HOST_PTR, 0,
@@ -396,7 +396,7 @@ TEST(MemObj, givenSharedMemObjectWithNullGfxAllocationWhenSettingGfxAllocationTh
TEST(MemObj, givenSharedMemObjectAndNullGfxAllocationProvidedWhenSettingGfxAllocationThenSucceed) {
MockContext context;
MockMemoryManager memoryManager(*context.getDevice(0)->getExecutionEnvironment());
context.setMemoryManager(&memoryManager);
context.memoryManager = &memoryManager;
MockGraphicsAllocation *graphicsAllocation = new MockGraphicsAllocation(nullptr, 0);
MemObj memObj(&context, CL_MEM_OBJECT_BUFFER, CL_MEM_USE_HOST_PTR, CL_MEM_USE_HOST_PTR, 0,
@@ -412,7 +412,7 @@ TEST(MemObj, givenSharedMemObjectAndNullGfxAllocationProvidedWhenSettingGfxAlloc
TEST(MemObj, givenSharedMemObjectAndZeroReuseCountWhenChangingGfxAllocationThenOldAllocationIsDestroyed) {
MockContext context;
MockMemoryManager memoryManager(*context.getDevice(0)->getExecutionEnvironment());
context.setMemoryManager(&memoryManager);
context.memoryManager = &memoryManager;
MockGraphicsAllocation *oldGfxAllocation = new MockGraphicsAllocation(nullptr, 0);
MockGraphicsAllocation *newGfxAllocation = new MockGraphicsAllocation(nullptr, 0);
@@ -431,7 +431,7 @@ TEST(MemObj, givenSharedMemObjectAndZeroReuseCountWhenChangingGfxAllocationThenO
TEST(MemObj, givenSharedMemObjectAndNonZeroReuseCountWhenChangingGfxAllocationThenOldAllocationIsNotDestroyed) {
MockContext context;
MockMemoryManager memoryManager(*context.getDevice(0)->getExecutionEnvironment());
context.setMemoryManager(&memoryManager);
context.memoryManager = &memoryManager;
MockGraphicsAllocation *oldGfxAllocation = new MockGraphicsAllocation(nullptr, 0);
MockGraphicsAllocation *newGfxAllocation = new MockGraphicsAllocation(nullptr, 0);
@@ -450,7 +450,7 @@ TEST(MemObj, givenSharedMemObjectAndNonZeroReuseCountWhenChangingGfxAllocationTh
TEST(MemObj, givenNotSharedMemObjectWhenChangingGfxAllocationThenOldAllocationIsDestroyed) {
MockContext context;
MockMemoryManager memoryManager(*context.getDevice(0)->getExecutionEnvironment());
context.setMemoryManager(&memoryManager);
context.memoryManager = &memoryManager;
MockGraphicsAllocation *oldGfxAllocation = new MockGraphicsAllocation(nullptr, 0);
MockGraphicsAllocation *newGfxAllocation = new MockGraphicsAllocation(nullptr, 0);

4
unit_tests/mocks/mock_context.cpp
View File

@@ -75,10 +75,6 @@ void MockContext::setSharingFunctions(SharingFunctions *sharingFunctions) {
this->sharingFunctions[sharingFunctions->getId()].reset(sharingFunctions);
}
void MockContext::setContextType(ContextType contextType) {
this->contextType = contextType;
}
void MockContext::releaseSharingFunctions(SharingType sharing) {
this->sharingFunctions[sharing].release();
}

14
unit_tests/mocks/mock_context.h
View File

@@ -14,6 +14,10 @@
namespace NEO {
class MockContext : public Context {
public:
using Context::contextType;
using Context::driverDiagnostics;
using Context::memoryManager;
using Context::preferD3dSharedResources;
using Context::sharingFunctions;
using Context::svmAllocsManager;
MockContext(Device *device, bool noSpecialQueue = false);
@@ -23,22 +27,12 @@ class MockContext : public Context {
MockContext();
~MockContext();
void setMemoryManager(MemoryManager *mm) {
memoryManager = mm;
}
void clearSharingFunctions();
void setSharingFunctions(SharingFunctions *sharingFunctions);
void setContextType(ContextType contextType);
void releaseSharingFunctions(SharingType sharing);
void resetSharingFunctions(SharingType sharing);
void registerSharingWithId(SharingFunctions *sharing, SharingType sharingId);
cl_bool peekPreferD3dSharedResources() { return preferD3dSharedResources; }
void forcePreferD3dSharedResources(cl_bool value) { preferD3dSharedResources = value; }
DriverDiagnostics *getDriverDiagnostics() { return this->driverDiagnostics; }
private:
Device *device;
};

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();
}

2
unit_tests/sharings/gl/gl_create_from_texture_tests.cpp
View File

@@ -47,7 +47,7 @@ class CreateFromGlTexture : public ::testing::Test {
imgInfo = {};
clContext.setSharingFunctions(glSharing->sharingFunctions.release());
ASSERT_FALSE(overrideCommandStreamReceiverCreation);
clContext.setMemoryManager(&tempMM);
clContext.memoryManager = &tempMM;
}
void TearDown() override {

4
unit_tests/sharings/gl/gl_reused_buffers_tests.cpp
View File

@@ -207,11 +207,11 @@ TEST_F(GlReusedBufferTests, givenGraphicsAllocationCreationReturnsNullptrWhenAcq
bufferInfoOutput.globalShareHandle = 41;
dllParam->loadBuffer(bufferInfoOutput);
context.setMemoryManager(failingMemoryManager.get());
context.memoryManager = failingMemoryManager.get();
auto result = glBuffer->acquire(clBuffer.get());
EXPECT_EQ(CL_OUT_OF_RESOURCES, result);
EXPECT_EQ(nullptr, clBuffer->getGraphicsAllocation());
context.setMemoryManager(suceedingMemoryManager);
context.memoryManager = suceedingMemoryManager;
}

4
unit_tests/sharings/gl/gl_sharing_tests.cpp
View File

@@ -102,7 +102,7 @@ TEST_F(glSharingTests, givenMockGlWhenGlBufferIsCreatedFromWrongHandleThenErrorA
auto tempMemoryManager = context.getMemoryManager();
auto memoryManager = std::unique_ptr<FailingMemoryManager>(new FailingMemoryManager());
context.setMemoryManager(memoryManager.get());
context.memoryManager = memoryManager.get();
auto retVal = CL_SUCCESS;
auto glBuffer = GlBuffer::createSharedGlBuffer(&context, CL_MEM_READ_WRITE, 0, &retVal);
@@ -110,7 +110,7 @@ TEST_F(glSharingTests, givenMockGlWhenGlBufferIsCreatedFromWrongHandleThenErrorA
EXPECT_EQ(nullptr, glBuffer);
EXPECT_EQ(CL_INVALID_GL_OBJECT, retVal);
context.setMemoryManager(tempMemoryManager);
context.memoryManager = tempMemoryManager;
}
TEST_F(glSharingTests, givenContextWhenClCreateFromGlBufferIsCalledThenBufferIsReturned) {

4
unit_tests/sharings/gl/gl_texture_tests.cpp
View File

@@ -124,7 +124,7 @@ TEST_F(GlSharingTextureTests, givenMockGlWhenGlTextureIsCreatedFromWrongHandleTh
auto tempMemoryManager = clContext->getMemoryManager();
tempMM->useForcedGmm = false;
auto memoryManager = std::unique_ptr<FailingMemoryManager>(new FailingMemoryManager());
clContext->setMemoryManager(memoryManager.get());
clContext->memoryManager = memoryManager.get();
auto retVal = CL_SUCCESS;
auto glTexture = GlTexture::createSharedGlTexture(clContext.get(), (cl_mem_flags)0, GL_TEXTURE_1D, 0, textureId, &retVal);
@@ -132,7 +132,7 @@ TEST_F(GlSharingTextureTests, givenMockGlWhenGlTextureIsCreatedFromWrongHandleTh
EXPECT_EQ(nullptr, glTexture);
EXPECT_EQ(CL_INVALID_GL_OBJECT, retVal);
clContext->setMemoryManager(tempMemoryManager);
clContext->memoryManager = tempMemoryManager;
}
GLboolean OSAPI mockGLAcquireSharedTexture(GLDisplay, GLContext, GLContext, GLvoid *pResourceInfo) {