mirror of
https://github.com/intel/compute-runtime.git
synced 2025-12-30 01:35:20 +08:00
Add dedicated map allocation
Related-To: NEO-2917 Change-Id: Ieeca40f5faf29433a5c464d2c3ca3b8910695a9b Signed-off-by: Zbigniew Zdanowicz <zbigniew.zdanowicz@intel.com>
This commit is contained in:
committed by
sys_ocldev
parent
91a64c8518
commit
e201725dd5
@@ -994,7 +994,7 @@ HWTEST_F(CommandQueueHwTest, givenKernelSplitEnqueueReadBufferWhenBlockedThenEnq
|
||||
|
||||
cl_event blockedEvent = &userEvent;
|
||||
|
||||
cl_int status = pCmdQ->enqueueReadBuffer(buffer.get(), CL_FALSE, 0, MemoryConstants::cacheLineSize, ptr, 1, &blockedEvent, nullptr);
|
||||
cl_int status = pCmdQ->enqueueReadBuffer(buffer.get(), CL_FALSE, 0, MemoryConstants::cacheLineSize, ptr, nullptr, 1, &blockedEvent, nullptr);
|
||||
EXPECT_EQ(CL_SUCCESS, status);
|
||||
|
||||
userEvent.setStatus(CL_COMPLETE);
|
||||
|
||||
@@ -760,7 +760,7 @@ HWTEST_F(WaitForQueueCompletionTests, givenBlockingCallAndUnblockedQueueWhenEnqu
|
||||
std::unique_ptr<MyCmdQueue<FamilyType>> cmdQ(new MyCmdQueue<FamilyType>(context.get(), device.get()));
|
||||
uint32_t tmpPtr = 0;
|
||||
auto buffer = std::unique_ptr<Buffer>(BufferHelper<>::create(context.get()));
|
||||
cmdQ->enqueueReadBuffer(buffer.get(), CL_TRUE, 0, 1, &tmpPtr, 0, nullptr, nullptr);
|
||||
cmdQ->enqueueReadBuffer(buffer.get(), CL_TRUE, 0, 1, &tmpPtr, nullptr, 0, nullptr, nullptr);
|
||||
EXPECT_EQ(1u, cmdQ->waitUntilCompleteCounter);
|
||||
EXPECT_FALSE(cmdQ->requestedUseQuickKmdSleep);
|
||||
}
|
||||
@@ -771,7 +771,7 @@ HWTEST_F(WaitForQueueCompletionTests, givenBlockingCallAndBlockedQueueWhenEnqueu
|
||||
cl_event clBlockingEvent = blockingEvent.get();
|
||||
uint32_t tmpPtr = 0;
|
||||
auto buffer = std::unique_ptr<Buffer>(BufferHelper<>::create(context.get()));
|
||||
cmdQ->enqueueReadBuffer(buffer.get(), CL_TRUE, 0, 1, &tmpPtr, 1, &clBlockingEvent, nullptr);
|
||||
cmdQ->enqueueReadBuffer(buffer.get(), CL_TRUE, 0, 1, &tmpPtr, nullptr, 1, &clBlockingEvent, nullptr);
|
||||
EXPECT_EQ(1u, cmdQ->waitUntilCompleteCounter);
|
||||
EXPECT_FALSE(cmdQ->requestedUseQuickKmdSleep);
|
||||
}
|
||||
|
||||
@@ -77,11 +77,12 @@ cl_int *EnqueueMapBufferTraits::errcodeRet = nullptr;
|
||||
cl_command_type EnqueueMapBufferTraits::cmdType = CL_COMMAND_MAP_BUFFER;
|
||||
|
||||
// EnqueueReadBufferTraits
|
||||
const cl_bool EnqueueReadBufferTraits::blocking = CL_TRUE;
|
||||
const size_t EnqueueReadBufferTraits::offset = 0;
|
||||
const size_t EnqueueReadBufferTraits::sizeInBytes = negOne;
|
||||
void *EnqueueReadBufferTraits::hostPtr = ptrOutput;
|
||||
cl_command_type EnqueueReadBufferTraits::cmdType = CL_COMMAND_READ_BUFFER;
|
||||
const cl_bool EnqueueReadBufferTraits::blocking = CL_TRUE;
|
||||
const size_t EnqueueReadBufferTraits::offset = 0;
|
||||
const size_t EnqueueReadBufferTraits::sizeInBytes = negOne;
|
||||
void *EnqueueReadBufferTraits::hostPtr = ptrOutput;
|
||||
cl_command_type EnqueueReadBufferTraits::cmdType = CL_COMMAND_READ_BUFFER;
|
||||
GraphicsAllocation *EnqueueReadBufferTraits::mapAllocation = nullptr;
|
||||
|
||||
// EnqueueReadImageTraits
|
||||
const cl_bool EnqueueReadImageTraits::blocking = CL_TRUE;
|
||||
@@ -93,12 +94,13 @@ void *EnqueueReadImageTraits::hostPtr = ptrOutput;
|
||||
cl_command_type EnqueueReadImageTraits::cmdType = CL_COMMAND_READ_IMAGE;
|
||||
|
||||
// EnqueueWriteBufferTraits
|
||||
const bool EnqueueWriteBufferTraits::zeroCopy = true;
|
||||
const cl_bool EnqueueWriteBufferTraits::blocking = CL_TRUE;
|
||||
const size_t EnqueueWriteBufferTraits::offset = 0;
|
||||
const size_t EnqueueWriteBufferTraits::sizeInBytes = negOne;
|
||||
void *EnqueueWriteBufferTraits::hostPtr = ptrGarbage;
|
||||
cl_command_type EnqueueWriteBufferTraits::cmdType = CL_COMMAND_WRITE_BUFFER;
|
||||
const bool EnqueueWriteBufferTraits::zeroCopy = true;
|
||||
const cl_bool EnqueueWriteBufferTraits::blocking = CL_TRUE;
|
||||
const size_t EnqueueWriteBufferTraits::offset = 0;
|
||||
const size_t EnqueueWriteBufferTraits::sizeInBytes = negOne;
|
||||
void *EnqueueWriteBufferTraits::hostPtr = ptrGarbage;
|
||||
cl_command_type EnqueueWriteBufferTraits::cmdType = CL_COMMAND_WRITE_BUFFER;
|
||||
GraphicsAllocation *EnqueueWriteBufferTraits::mapAllocation = nullptr;
|
||||
|
||||
// EnqueueWriteBufferRectTraits
|
||||
const bool EnqueueWriteBufferRectTraits::zeroCopy = true;
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
#include "runtime/command_queue/command_queue.h"
|
||||
#include "runtime/event/user_event.h"
|
||||
#include "runtime/kernel/kernel.h"
|
||||
#include "runtime/memory_manager/graphics_allocation.h"
|
||||
#include "unit_tests/fixtures/buffer_fixture.h"
|
||||
#include "unit_tests/fixtures/image_fixture.h"
|
||||
|
||||
@@ -390,6 +391,7 @@ struct EnqueueReadBufferTraits : public EnqueueTraits {
|
||||
static const size_t sizeInBytes;
|
||||
static void *hostPtr;
|
||||
static cl_command_type cmdType;
|
||||
static GraphicsAllocation *mapAllocation;
|
||||
};
|
||||
|
||||
template <typename T = EnqueueReadBufferTraits>
|
||||
@@ -404,6 +406,7 @@ struct EnqueueReadBufferHelper {
|
||||
size_t offset = Traits::offset,
|
||||
size_t size = Traits::sizeInBytes,
|
||||
void *ptr = Traits::hostPtr,
|
||||
GraphicsAllocation *mapAllocation = Traits::mapAllocation,
|
||||
cl_uint numEventsInWaitList = Traits::numEventsInWaitList,
|
||||
const cl_event *eventWaitList = Traits::eventWaitList,
|
||||
cl_event *event = Traits::event) {
|
||||
@@ -415,6 +418,7 @@ struct EnqueueReadBufferHelper {
|
||||
offset,
|
||||
size,
|
||||
ptr,
|
||||
mapAllocation,
|
||||
numEventsInWaitList,
|
||||
eventWaitList,
|
||||
event);
|
||||
@@ -490,6 +494,7 @@ struct EnqueueWriteBufferTraits : public EnqueueTraits {
|
||||
static const size_t sizeInBytes;
|
||||
static void *hostPtr;
|
||||
static cl_command_type cmdType;
|
||||
static GraphicsAllocation *mapAllocation;
|
||||
};
|
||||
|
||||
template <typename T = EnqueueWriteBufferTraits>
|
||||
@@ -504,6 +509,7 @@ struct EnqueueWriteBufferHelper {
|
||||
size_t offset = Traits::offset,
|
||||
size_t size = Traits::sizeInBytes,
|
||||
void *ptr = Traits::hostPtr,
|
||||
GraphicsAllocation *mapAllocation = Traits::mapAllocation,
|
||||
cl_uint numEventsInWaitList = Traits::numEventsInWaitList,
|
||||
const cl_event *eventWaitList = Traits::eventWaitList,
|
||||
cl_event *event = Traits::event) {
|
||||
@@ -515,6 +521,7 @@ struct EnqueueWriteBufferHelper {
|
||||
offset,
|
||||
size,
|
||||
ptr,
|
||||
mapAllocation,
|
||||
numEventsInWaitList,
|
||||
eventWaitList,
|
||||
event);
|
||||
|
||||
@@ -209,6 +209,7 @@ HWTEST_F(EnqueueMapImageTest, givenTiledImageWhenMapImageIsCalledThenStorageIsSe
|
||||
region, nullptr, nullptr, 0,
|
||||
nullptr, nullptr, retVal);
|
||||
EXPECT_TRUE(mockImage.ownershipTaken);
|
||||
pDevice->getMemoryManager()->freeGraphicsMemory(mockImage.getMapAllocation());
|
||||
mockImage.releaseAllocatedMapPtr();
|
||||
}
|
||||
|
||||
|
||||
@@ -35,6 +35,7 @@ TEST_F(EnqueueReadBuffer, eventShouldBeReturned) {
|
||||
offset,
|
||||
size,
|
||||
pDestMemory,
|
||||
nullptr,
|
||||
numEventsInWaitList,
|
||||
eventWaitList,
|
||||
&event);
|
||||
@@ -85,6 +86,7 @@ TEST_F(EnqueueReadBuffer, eventReturnedShouldBeMaxOfInputEventsAndCmdQPlus1) {
|
||||
offset,
|
||||
size,
|
||||
pDestMemory,
|
||||
nullptr,
|
||||
numEventsInWaitList,
|
||||
eventWaitList,
|
||||
&event);
|
||||
@@ -123,6 +125,7 @@ TEST_F(EnqueueReadBuffer, givenInOrderQueueAndForcedCpuCopyOnReadBufferAndDstPtr
|
||||
0,
|
||||
size,
|
||||
ptr,
|
||||
nullptr,
|
||||
numEventsInWaitList,
|
||||
eventWaitList,
|
||||
&event);
|
||||
@@ -155,6 +158,7 @@ TEST_F(EnqueueReadBuffer, givenInOrderQueueAndForcedCpuCopyOnReadBufferAndDstPtr
|
||||
0,
|
||||
size,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
&event);
|
||||
@@ -197,6 +201,7 @@ TEST_F(EnqueueReadBuffer, givenOutOfOrderQueueAndForcedCpuCopyOnReadBufferAndDst
|
||||
0,
|
||||
size,
|
||||
ptr,
|
||||
nullptr,
|
||||
numEventsInWaitList,
|
||||
eventWaitList,
|
||||
&event);
|
||||
@@ -233,6 +238,7 @@ TEST_F(EnqueueReadBuffer, givenInOrderQueueAndForcedCpuCopyOnReadBufferAndEventN
|
||||
0,
|
||||
size,
|
||||
mem,
|
||||
nullptr,
|
||||
numEventsInWaitList,
|
||||
eventWaitList,
|
||||
&event);
|
||||
@@ -277,6 +283,7 @@ TEST_F(EnqueueReadBuffer, givenInOrderQueueAndDisabledSupportCpuCopiesAndDstPtrE
|
||||
0,
|
||||
size,
|
||||
ptr,
|
||||
nullptr,
|
||||
numEventsInWaitList,
|
||||
eventWaitList,
|
||||
&event);
|
||||
@@ -318,6 +325,7 @@ TEST_F(EnqueueReadBuffer, givenOutOfOrderQueueAndDisabledSupportCpuCopiesAndDstP
|
||||
0,
|
||||
size,
|
||||
ptr,
|
||||
nullptr,
|
||||
numEventsInWaitList,
|
||||
eventWaitList,
|
||||
&event);
|
||||
|
||||
@@ -287,6 +287,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, givenAlignedPointerAndAlignedSizeWhenReadBuf
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -304,6 +305,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, givenNotAlignedPointerAndAlignedSizeWhenRead
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -320,6 +322,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, givenNotAlignedPointerAndAlignedSizeWhenRead
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr2,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -340,6 +343,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, givenOOQWithEnabledSupportCpuCopiesAndDstPtr
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -359,6 +363,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, givenOOQWithDisabledSupportCpuCopiesAndDstPt
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -377,6 +382,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, givenInOrderQueueAndEnabledSupportCpuCopiesA
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -395,6 +401,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, givenInOrderQueueAndDisabledSupportCpuCopies
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -413,6 +420,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, givenInOrderQueueAndDisabledSupportCpuCopies
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -431,6 +439,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, givenInOrderQueueAndEnabledSupportCpuCopiesA
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -447,6 +456,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, givenCommandQueueWhenEnqueueReadBufferIsCall
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -474,6 +484,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, givenEnqueueReadBufferCalledWhenLockedPtrInT
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -502,6 +513,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, givenForcedCpuCopyWhenEnqueueReadCompressedB
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -517,6 +529,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, givenForcedCpuCopyWhenEnqueueReadCompressedB
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -545,6 +558,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, gicenEnqueueReadBufferCalledWhenLockedPtrInT
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -565,6 +579,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, givenEnqueueReadBufferBlockingWhenAUBDumpAll
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -586,6 +601,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, givenEnqueueReadBufferNonBlockingWhenAUBDump
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -604,6 +620,7 @@ HWTEST_F(NegativeFailAllocationTest, givenEnqueueReadBufferWhenHostPtrAllocation
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
|
||||
@@ -135,6 +135,7 @@ HWTEST_F(EnqueueThreading, enqueueReadBuffer) {
|
||||
0,
|
||||
1024u,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -158,6 +159,7 @@ HWTEST_F(EnqueueThreading, enqueueWriteBuffer) {
|
||||
0,
|
||||
1024u,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
|
||||
@@ -35,6 +35,7 @@ TEST_F(EnqueueWriteBufferTypeTest, eventShouldBeReturned) {
|
||||
offset,
|
||||
size,
|
||||
pDestMemory,
|
||||
nullptr,
|
||||
numEventsInWaitList,
|
||||
eventWaitList,
|
||||
&event);
|
||||
@@ -85,6 +86,7 @@ TEST_F(EnqueueWriteBufferTypeTest, eventReturnedShouldBeMaxOfInputEventsAndCmdQP
|
||||
offset,
|
||||
size,
|
||||
pDestMemory,
|
||||
nullptr,
|
||||
numEventsInWaitList,
|
||||
eventWaitList,
|
||||
&event);
|
||||
@@ -124,6 +126,7 @@ TEST_F(EnqueueWriteBufferTypeTest, givenInOrderQueueAndForcedCpuCopyOnWriteBuffe
|
||||
0,
|
||||
size,
|
||||
ptr,
|
||||
nullptr,
|
||||
numEventsInWaitList,
|
||||
eventWaitList,
|
||||
&event);
|
||||
@@ -160,6 +163,7 @@ TEST_F(EnqueueWriteBufferTypeTest, givenInOrderQueueAndForcedCpuCopyOnWriteBuffe
|
||||
0,
|
||||
size,
|
||||
mem,
|
||||
nullptr,
|
||||
numEventsInWaitList,
|
||||
eventWaitList,
|
||||
&event);
|
||||
@@ -194,6 +198,7 @@ TEST_F(EnqueueWriteBufferTypeTest, givenInOrderQueueAndForcedCpuCopyOnWriteBuffe
|
||||
0,
|
||||
size,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
&event);
|
||||
@@ -236,6 +241,7 @@ TEST_F(EnqueueWriteBufferTypeTest, givenOutOfOrderQueueAndForcedCpuCopyOnWriteBu
|
||||
0,
|
||||
size,
|
||||
ptr,
|
||||
nullptr,
|
||||
numEventsInWaitList,
|
||||
eventWaitList,
|
||||
&event);
|
||||
@@ -276,6 +282,7 @@ TEST_F(EnqueueWriteBufferTypeTest, givenInOrderQueueAndDisabledSupportCpuCopiesA
|
||||
0,
|
||||
size,
|
||||
ptr,
|
||||
nullptr,
|
||||
numEventsInWaitList,
|
||||
eventWaitList,
|
||||
&event);
|
||||
@@ -317,6 +324,7 @@ TEST_F(EnqueueWriteBufferTypeTest, givenOutOfOrderQueueAndDisabledSupportCpuCopi
|
||||
0,
|
||||
size,
|
||||
ptr,
|
||||
nullptr,
|
||||
numEventsInWaitList,
|
||||
eventWaitList,
|
||||
&event);
|
||||
|
||||
@@ -263,6 +263,7 @@ HWTEST_F(EnqueueWriteBufferTypeTest, givenOOQWithEnabledSupportCpuCopiesAndDstPt
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -283,6 +284,7 @@ HWTEST_F(EnqueueWriteBufferTypeTest, givenOOQWithDisabledSupportCpuCopiesAndDstP
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -302,6 +304,7 @@ HWTEST_F(EnqueueWriteBufferTypeTest, givenInOrderQueueAndEnabledSupportCpuCopies
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -320,6 +323,7 @@ HWTEST_F(EnqueueWriteBufferTypeTest, givenInOrderQueueAndDisabledSupportCpuCopie
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -338,6 +342,7 @@ HWTEST_F(EnqueueWriteBufferTypeTest, givenInOrderQueueAndDisabledSupportCpuCopie
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -356,6 +361,7 @@ HWTEST_F(EnqueueWriteBufferTypeTest, givenInOrderQueueAndEnabledSupportCpuCopies
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -383,6 +389,7 @@ HWTEST_F(EnqueueWriteBufferTypeTest, givenEnqueueWriteBufferCalledWhenLockedPtrI
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -411,6 +418,7 @@ HWTEST_F(EnqueueWriteBufferTypeTest, givenForcedCpuCopyWhenEnqueueWriteCompresse
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -426,6 +434,7 @@ HWTEST_F(EnqueueWriteBufferTypeTest, givenForcedCpuCopyWhenEnqueueWriteCompresse
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -454,6 +463,7 @@ HWTEST_F(EnqueueWriteBufferTypeTest, givenEnqueueWriteBufferCalledWhenLockedPtrI
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -471,6 +481,7 @@ HWTEST_F(NegativeFailAllocationTest, givenEnqueueWriteBufferWhenHostPtrAllocatio
|
||||
0,
|
||||
MemoryConstants::cacheLineSize,
|
||||
ptr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
|
||||
@@ -90,6 +90,7 @@ TEST_F(IOQ, enqueueReadBuffer_blockingAndNonBlockedOnUserEvent) {
|
||||
0,
|
||||
BufferDefaults::sizeInBytes,
|
||||
alignedReadPtr,
|
||||
nullptr,
|
||||
1,
|
||||
&userEvent,
|
||||
nullptr);
|
||||
|
||||
@@ -42,6 +42,7 @@ TEST_F(IOQTaskTestsMt, enqueueReadBuffer_blockingAndBlockedOnUserEvent) {
|
||||
0,
|
||||
BufferDefaults::sizeInBytes,
|
||||
alignedReadPtr,
|
||||
nullptr,
|
||||
1,
|
||||
&userEvent,
|
||||
nullptr);
|
||||
|
||||
@@ -46,18 +46,21 @@ struct MultipleMapBufferTest : public DeviceFixture, public ::testing::Test {
|
||||
MockCmdQ(Context *context, Device *device) : CommandQueueHw<T>(context, device, 0) {}
|
||||
|
||||
cl_int enqueueReadBuffer(Buffer *buffer, cl_bool blockingRead, size_t offset, size_t size, void *ptr,
|
||||
cl_uint numEventsInWaitList, const cl_event *eventWaitList, cl_event *event) override {
|
||||
GraphicsAllocation *mapAllocation, cl_uint numEventsInWaitList, const cl_event *eventWaitList,
|
||||
cl_event *event) override {
|
||||
enqueueSize = size;
|
||||
enqueueOffset = offset;
|
||||
readBufferCalled++;
|
||||
if (failOnReadBuffer) {
|
||||
return CL_OUT_OF_RESOURCES;
|
||||
}
|
||||
return CommandQueueHw<T>::enqueueReadBuffer(buffer, blockingRead, offset, size, ptr, numEventsInWaitList, eventWaitList, event);
|
||||
return CommandQueueHw<T>::enqueueReadBuffer(buffer, blockingRead, offset, size, ptr, mapAllocation,
|
||||
numEventsInWaitList, eventWaitList, event);
|
||||
}
|
||||
|
||||
cl_int enqueueWriteBuffer(Buffer *buffer, cl_bool blockingWrite, size_t offset, size_t cb, const void *ptr,
|
||||
cl_uint numEventsInWaitList, const cl_event *eventWaitList, cl_event *event) override {
|
||||
GraphicsAllocation *mapAllocation, cl_uint numEventsInWaitList, const cl_event *eventWaitList,
|
||||
cl_event *event) override {
|
||||
enqueueSize = cb;
|
||||
enqueueOffset = offset;
|
||||
unmapPtr = ptr;
|
||||
@@ -65,7 +68,8 @@ struct MultipleMapBufferTest : public DeviceFixture, public ::testing::Test {
|
||||
if (failOnWriteBuffer) {
|
||||
return CL_OUT_OF_RESOURCES;
|
||||
}
|
||||
return CommandQueueHw<T>::enqueueWriteBuffer(buffer, blockingWrite, offset, cb, ptr, numEventsInWaitList, eventWaitList, event);
|
||||
return CommandQueueHw<T>::enqueueWriteBuffer(buffer, blockingWrite, offset, cb, ptr, mapAllocation,
|
||||
numEventsInWaitList, eventWaitList, event);
|
||||
}
|
||||
|
||||
cl_int enqueueMarkerWithWaitList(cl_uint numEventsInWaitList, const cl_event *eventWaitList, cl_event *event) override {
|
||||
|
||||
@@ -252,6 +252,7 @@ TEST_F(OOQTaskTests, enqueueReadBuffer_blockingAndNonBlockedOnUserEvent) {
|
||||
0,
|
||||
BufferDefaults::sizeInBytes,
|
||||
alignedReadPtr,
|
||||
nullptr,
|
||||
1,
|
||||
&userEvent,
|
||||
nullptr);
|
||||
|
||||
@@ -48,6 +48,7 @@ TEST_F(OOQTaskTestsMt, enqueueReadBuffer_blockingAndBlockedOnUserEvent) {
|
||||
0,
|
||||
BufferDefaults::sizeInBytes,
|
||||
alignedReadPtr,
|
||||
nullptr,
|
||||
1,
|
||||
&userEvent,
|
||||
nullptr);
|
||||
|
||||
@@ -60,6 +60,7 @@ HWTEST_F(ReadWriteBufferCpuCopyTest, simpleRead) {
|
||||
offset,
|
||||
size - offset,
|
||||
unalignedReadPtr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -100,6 +101,7 @@ HWTEST_F(ReadWriteBufferCpuCopyTest, givenDeviceThatDoesntSupportCpuCopiesWhenRe
|
||||
offset,
|
||||
size - offset,
|
||||
unalignedReadPtr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -142,6 +144,7 @@ HWTEST_F(ReadWriteBufferCpuCopyTest, givenDeviceThatDoesntSupportCpuCopiesWhenWr
|
||||
offset,
|
||||
size - offset,
|
||||
unalignedWritePtr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
@@ -186,6 +189,7 @@ HWTEST_F(ReadWriteBufferCpuCopyTest, simpleWrite) {
|
||||
offset,
|
||||
size - offset,
|
||||
unalignedWritePtr,
|
||||
nullptr,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr);
|
||||
|
||||
@@ -118,7 +118,7 @@ HWTEST_F(ZeroSizeEnqueueHandlerTest, enqueueReadBufferWhenZeroSizeEnqueueIsDetec
|
||||
MockBuffer buffer;
|
||||
size_t memory[1];
|
||||
size_t zeroSize = 0;
|
||||
mockCmdQ->enqueueReadBuffer(&buffer, CL_FALSE, 0, zeroSize, memory, 0, nullptr, nullptr);
|
||||
mockCmdQ->enqueueReadBuffer(&buffer, CL_FALSE, 0, zeroSize, memory, nullptr, 0, nullptr, nullptr);
|
||||
EXPECT_EQ(static_cast<cl_command_type>(CL_COMMAND_MARKER), mockCmdQ->lastCommandType);
|
||||
}
|
||||
|
||||
@@ -129,7 +129,7 @@ HWTEST_F(ZeroSizeEnqueueHandlerTest, enqueueReadBufferWhenZeroSizeEnqueueIsDetec
|
||||
MockBuffer buffer;
|
||||
size_t memory[1];
|
||||
size_t zeroSize = 0;
|
||||
mockCmdQ->enqueueReadBuffer(&buffer, CL_FALSE, 0, zeroSize, memory, 0, nullptr, &event);
|
||||
mockCmdQ->enqueueReadBuffer(&buffer, CL_FALSE, 0, zeroSize, memory, nullptr, 0, nullptr, &event);
|
||||
EXPECT_EQ(static_cast<cl_command_type>(CL_COMMAND_MARKER), mockCmdQ->lastCommandType);
|
||||
|
||||
auto pEvent = (Event *)event;
|
||||
@@ -207,7 +207,7 @@ HWTEST_F(ZeroSizeEnqueueHandlerTest, enqueueWriteBufferWhenZeroSizeEnqueueIsDete
|
||||
MockBuffer buffer;
|
||||
size_t memory[1];
|
||||
size_t zeroSize = 0;
|
||||
mockCmdQ->enqueueWriteBuffer(&buffer, CL_FALSE, 0, zeroSize, memory, 0, nullptr, nullptr);
|
||||
mockCmdQ->enqueueWriteBuffer(&buffer, CL_FALSE, 0, zeroSize, memory, nullptr, 0, nullptr, nullptr);
|
||||
EXPECT_EQ(static_cast<cl_command_type>(CL_COMMAND_MARKER), mockCmdQ->lastCommandType);
|
||||
}
|
||||
|
||||
@@ -218,7 +218,7 @@ HWTEST_F(ZeroSizeEnqueueHandlerTest, enqueueWriteBufferWhenZeroSizeEnqueueIsDete
|
||||
MockBuffer buffer;
|
||||
size_t memory[1];
|
||||
size_t zeroSize = 0;
|
||||
mockCmdQ->enqueueWriteBuffer(&buffer, CL_FALSE, 0, zeroSize, memory, 0, nullptr, &event);
|
||||
mockCmdQ->enqueueWriteBuffer(&buffer, CL_FALSE, 0, zeroSize, memory, nullptr, 0, nullptr, &event);
|
||||
EXPECT_EQ(static_cast<cl_command_type>(CL_COMMAND_MARKER), mockCmdQ->lastCommandType);
|
||||
|
||||
auto pEvent = (Event *)event;
|
||||
|
||||
Reference in New Issue
Block a user