Handle host pointer not meeting memory manager criteria

Change-Id: I65eec6083f1d8bb7b5f46e1a2e015aa6fd7f3d9f
This commit is contained in:
Zdanowicz, Zbigniew
2018-01-26 16:53:18 +01:00
parent e42d43953d
commit f5513b6a1d
10 changed files with 207 additions and 34 deletions

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Intel Corporation
* Copyright (c) 2017 - 2018, Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@ -24,7 +24,9 @@
#include "runtime/command_queue/command_queue.h"
#include "runtime/helpers/options.h"
#include "unit_tests/mocks/mock_context.h"
#include "unit_tests/mocks/mock_device.h"
#include "unit_tests/mocks/mock_kernel.h"
#include "unit_tests/mocks/mock_memory_manager.h"
namespace OCLRT {
@ -63,4 +65,39 @@ void api_fixture::TearDown() {
PlatformFixture::TearDown();
MemoryManagementFixture::TearDown();
}
void api_fixture_using_aligned_memory_manager::SetUp() {
retVal = CL_SUCCESS;
retSize = 0;
MemoryManagementFixture::SetUp();
device = Device::create<MockAlignedMallocManagerDevice>(*platformDevices);
Device *devPtr = reinterpret_cast<Device *>(device);
cl_device_id clDevice = devPtr;
context = Context::create<MockContext>(nullptr, DeviceVector(&clDevice, 1), nullptr, nullptr, retVal);
EXPECT_EQ(CL_SUCCESS, retVal);
Context *ctxPtr = reinterpret_cast<Context *>(context);
commandQueue = new CommandQueue(context, devPtr, 0);
program = new MockProgram(ctxPtr);
Program *prgPtr = reinterpret_cast<Program *>(program);
kernel = new MockKernel(prgPtr, *program->MockProgram::getKernelInfo(), *devPtr);
ASSERT_NE(nullptr, kernel);
BuiltInFixture::SetUp(devPtr);
}
void api_fixture_using_aligned_memory_manager::TearDown() {
delete kernel;
delete commandQueue;
context->release();
program->release();
delete device;
BuiltInFixture::TearDown();
MemoryManagementFixture::TearDown();
}
} // namespace OCLRT

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Intel Corporation
* Copyright (c) 2017 - 2018, Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@ -26,6 +26,9 @@
#include "unit_tests/fixtures/platform_fixture.h"
#include "unit_tests/fixtures/built_in_fixture.h"
#include "runtime/api/api.h"
#include "test.h"
#include <memory>
namespace OCLRT {
@ -33,6 +36,7 @@ class CommandQueue;
class Context;
class MockKernel;
class MockProgram;
class MockAlignedMallocManagerDevice;
struct api_fixture : public MemoryManagementFixture,
public PlatformFixture,
@ -65,4 +69,25 @@ struct api_tests : public api_fixture,
api_fixture::TearDown();
}
};
struct api_fixture_using_aligned_memory_manager : public MemoryManagementFixture,
public BuiltInFixture {
using BuiltInFixture::SetUp;
public:
virtual void SetUp();
virtual void TearDown();
cl_int retVal;
size_t retSize;
CommandQueue *commandQueue;
Context *context;
MockKernel *kernel;
MockProgram *program;
MockAlignedMallocManagerDevice *device;
};
using api_test_using_aligned_memory_manager = Test<api_fixture_using_aligned_memory_manager>;
} // namespace OCLRT

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Intel Corporation
* Copyright (c) 2017 - 2018, Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@ -22,6 +22,12 @@
#include "cl_api_tests.h"
#include "runtime/context/context.h"
#include "runtime/command_queue/command_queue.h"
#include "runtime/mem_obj/buffer.h"
#include "unit_tests/mocks/mock_device.h"
#include "unit_tests/mocks/mock_kernel.h"
#include "unit_tests/mocks/mock_memory_manager.h"
#include "unit_tests/mocks/mock_program.h"
using namespace OCLRT;
@ -174,4 +180,68 @@ TEST_F(clCreateBufferTests, noRet) {
delete[] pHostMem;
}
using clCreateBufferTestsWithRestrictions = api_test_using_aligned_memory_manager;
TEST_F(clCreateBufferTestsWithRestrictions, givenMemoryManagerRestrictionsWhenMinIsLesserThanHostPtrThenUseZeroCopy) {
std::unique_ptr<unsigned char[]> hostMem(nullptr);
unsigned char *destMem = nullptr;
cl_mem_flags flags = CL_MEM_USE_HOST_PTR;
const unsigned int bufferSize = MemoryConstants::pageSize * 3;
const unsigned int destBufferSize = MemoryConstants::pageSize;
cl_mem buffer = nullptr;
uintptr_t minAddress = 0;
MockAllocSysMemAgnosticMemoryManager *memMngr = reinterpret_cast<MockAllocSysMemAgnosticMemoryManager *>(device->getMemoryManager());
memMngr->ptrRestrictions = &memMngr->testRestrictions;
EXPECT_EQ(minAddress, memMngr->ptrRestrictions->minAddress);
hostMem.reset(new unsigned char[bufferSize]);
destMem = hostMem.get();
destMem += MemoryConstants::pageSize;
destMem -= (reinterpret_cast<uintptr_t>(destMem) % MemoryConstants::pageSize);
buffer = clCreateBuffer(context, flags, destBufferSize, destMem, &retVal);
ASSERT_EQ(CL_SUCCESS, retVal);
EXPECT_NE(nullptr, buffer);
Buffer *bufferObj = OCLRT::castToObject<Buffer>(buffer);
EXPECT_TRUE(bufferObj->isMemObjZeroCopy());
retVal = clReleaseMemObject(buffer);
EXPECT_EQ(CL_SUCCESS, retVal);
}
TEST_F(clCreateBufferTestsWithRestrictions, givenMemoryManagerRestrictionsWhenMinIsLesserThanHostPtrThenCreateCopy) {
std::unique_ptr<unsigned char[]> hostMem(nullptr);
unsigned char *destMem = nullptr;
cl_mem_flags flags = CL_MEM_USE_HOST_PTR;
const unsigned int realBufferSize = MemoryConstants::pageSize * 3;
const unsigned int destBufferSize = MemoryConstants::pageSize;
cl_mem buffer = nullptr;
MockAllocSysMemAgnosticMemoryManager *memMngr = reinterpret_cast<MockAllocSysMemAgnosticMemoryManager *>(device->getMemoryManager());
memMngr->ptrRestrictions = &memMngr->testRestrictions;
hostMem.reset(new unsigned char[realBufferSize]);
destMem = hostMem.get();
destMem += MemoryConstants::pageSize;
destMem -= (reinterpret_cast<uintptr_t>(destMem) % MemoryConstants::pageSize);
memMngr->ptrRestrictions->minAddress = reinterpret_cast<uintptr_t>(destMem) + 1;
buffer = clCreateBuffer(context, flags, destBufferSize, destMem, &retVal);
ASSERT_EQ(CL_SUCCESS, retVal);
EXPECT_NE(nullptr, buffer);
Buffer *bufferObj = OCLRT::castToObject<Buffer>(buffer);
EXPECT_FALSE(bufferObj->isMemObjZeroCopy());
retVal = clReleaseMemObject(buffer);
EXPECT_EQ(CL_SUCCESS, retVal);
}
} // namespace ULT