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

HostPtr allocation with life time of image object for CL_MEM_USE_HOST_PTR

Browse Source 
Related-To: NEO-3231

Change-Id: I4869e55b3c4b5217c83cc0b53d8c9f8c14b524b2
Signed-off-by: Milczarek, Slawomir <slawomir.milczarek@intel.com>
This commit is contained in:
Milczarek, Slawomir
2019-06-06 23:21:08 +02:00
committed by sys_ocldev
parent b86d8f060b
commit 8998f89886
5 changed files with 65 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
unit_tests/aub_tests/mem_obj/create_image_aub_tests.cpp
View File

@ -314,7 +314,7 @@ HWTEST_P(AUBCreateImageHostPtr, imageWithRowPitchCreatedWithUseHostPtrFlagCopied
size_t imageSlicePitch = 0;
auto ptr = pCmdQ->enqueueMapImage(
image,
false,
true,
mapFlags,
origin,
region,
@ -329,7 +329,6 @@ HWTEST_P(AUBCreateImageHostPtr, imageWithRowPitchCreatedWithUseHostPtrFlagCopied
} else {
EXPECT_NE(image->getCpuAddress(), ptr);
}
pCmdQ->flush();
size_t imageRowPitchRef = 0;
image->getImageInfo(CL_IMAGE_ROW_PITCH, sizeof(imageRowPitchRef), &imageRowPitchRef, nullptr);

4
unit_tests/command_queue/enqueue_map_image_tests.cpp
View File

@ -60,7 +60,7 @@ TEST_F(EnqueueMapImageTest, reuseMappedPtrForTiledImg) {
const size_t region[3] = {1, 1, 1};
auto mapAllocation = image->getMapAllocation();
EXPECT_EQ(nullptr, mapAllocation);
EXPECT_NE(nullptr, mapAllocation);
auto ptr1 = pCmdQ->enqueueMapImage(
image, true, mapFlags, origin,
@ -69,7 +69,7 @@ TEST_F(EnqueueMapImageTest, reuseMappedPtrForTiledImg) {
EXPECT_EQ(CL_SUCCESS, retVal);
EXPECT_NE(nullptr, image->getHostPtr());
mapAllocation = image->getMapAllocation();
EXPECT_EQ(nullptr, mapAllocation);
EXPECT_NE(nullptr, mapAllocation);
auto ptr2 = pCmdQ->enqueueMapImage(
image, true, mapFlags, origin,

1
unit_tests/mem_obj/image_tests.cpp
View File

@ -432,6 +432,7 @@ TEST(TestCreateImageUseHostPtr, givenZeroCopyImageValuesWhenUsingHostPtrThenZero
EXPECT_EQ(CL_SUCCESS, retVal);
EXPECT_TRUE(image->isMemObjZeroCopy());
EXPECT_EQ(hostPtr, image->getGraphicsAllocation()->getUnderlyingBuffer());
EXPECT_NE(nullptr, image->getMapAllocation());
alignedFree(hostPtr);
}

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

@ -1363,8 +1363,9 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenTiledImageIsBeingCreatedAn
TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenTiledImageIsBeingCreatedFromHostPtrThenallocateGraphicsMemoryForImageIsUsed) {
mock->ioctl_expected.gemCreate = 1;
mock->ioctl_expected.gemSetTiling = 1;
mock->ioctl_expected.gemWait = 1;
mock->ioctl_expected.gemClose = 1;
mock->ioctl_expected.gemUserptr = 1;
mock->ioctl_expected.gemWait = 2;
mock->ioctl_expected.gemClose = 2;
MockContext context(device);
context.setMemoryManager(memoryManager);
@ -1379,7 +1380,7 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenTiledImageIsBeingCreatedFr
imageDesc.image_width = 64u;
imageDesc.image_height = 64u;
char data[64u * 64u * 4 * 8];
auto data = alignedMalloc(64u * 64u * 4 * 8, MemoryConstants::pageSize);
auto retVal = CL_SUCCESS;
@ -1405,12 +1406,14 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenTiledImageIsBeingCreatedFr
EXPECT_EQ(tilingMode, this->mock->setTilingMode);
EXPECT_EQ(rowPitch, this->mock->setTilingStride);
EXPECT_EQ(1u, this->mock->setTilingHandle);
alignedFree(data);
}
TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenMemoryAllocatedForImageThenUnmapSizeCorrectlySetWhenLimitedRangeAllocationUsedOrNotUsed) {
mock->ioctl_expected.gemUserptr = 1;
mock->ioctl_expected.gemWait = 1;
mock->ioctl_expected.gemClose = 1;
mock->ioctl_expected.gemUserptr = 2;
mock->ioctl_expected.gemWait = 2;
mock->ioctl_expected.gemClose = 2;
MockContext context;
context.setMemoryManager(memoryManager);
@ -1424,7 +1427,7 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenMemoryAllocatedForImageThe
imageDesc.image_type = CL_MEM_OBJECT_IMAGE1D;
imageDesc.image_width = 64u;
char data[64u * 4 * 8];
auto data = alignedMalloc(64u * 4 * 8, MemoryConstants::pageSize);
auto retVal = CL_SUCCESS;
@ -1446,12 +1449,14 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenMemoryAllocatedForImageThe
} else {
EXPECT_NE(0u, drmAllocation->getBO()->peekUnmapSize());
}
alignedFree(data);
}
TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenNonTiledImgWithMipCountZeroisBeingCreatedThenAllocateGraphicsMemoryIsUsed) {
mock->ioctl_expected.gemUserptr = 1;
mock->ioctl_expected.gemWait = 1;
mock->ioctl_expected.gemClose = 1;
mock->ioctl_expected.gemUserptr = 2;
mock->ioctl_expected.gemWait = 2;
mock->ioctl_expected.gemClose = 2;
MockContext context;
context.setMemoryManager(memoryManager);
@ -1465,7 +1470,7 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenNonTiledImgWithMipCountZer
imageDesc.image_type = CL_MEM_OBJECT_IMAGE1D;
imageDesc.image_width = 64u;
char data[64u * 4 * 8];
auto data = alignedMalloc(64u * 4 * 8, MemoryConstants::pageSize);
auto retVal = CL_SUCCESS;
@ -1487,6 +1492,8 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenNonTiledImgWithMipCountZer
EXPECT_EQ(0u, this->mock->setTilingHandle);
EXPECT_EQ(Sharing::nonSharedResource, imageGraphicsAllocation->peekSharedHandle());
alignedFree(data);
}
TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenNonTiledImgWithMipCountNonZeroisBeingCreatedThenAllocateGraphicsMemoryIsUsed) {
@ -1507,7 +1514,7 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenNonTiledImgWithMipCountNon
imageDesc.image_width = 64u;
imageDesc.num_mip_levels = 1u;
char data[64u * 4 * 8];
auto data = alignedMalloc(64u * 4 * 8, MemoryConstants::pageSize);
auto retVal = CL_SUCCESS;
@ -1530,12 +1537,14 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenNonTiledImgWithMipCountNon
EXPECT_EQ(0u, this->mock->setTilingHandle);
EXPECT_EQ(Sharing::nonSharedResource, imageGraphicsAllocation->peekSharedHandle());
alignedFree(data);
}
TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhen1DarrayImageIsBeingCreatedFromHostPtrThenTilingIsNotCalled) {
mock->ioctl_expected.gemUserptr = 1;
mock->ioctl_expected.gemWait = 1;
mock->ioctl_expected.gemClose = 1;
mock->ioctl_expected.gemUserptr = 2;
mock->ioctl_expected.gemWait = 2;
mock->ioctl_expected.gemClose = 2;
MockContext context;
context.setMemoryManager(memoryManager);
@ -1549,7 +1558,7 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhen1DarrayImageIsBeingCreated
imageDesc.image_type = CL_MEM_OBJECT_IMAGE1D;
imageDesc.image_width = 64u;
char data[64u * 64u * 4 * 8];
auto data = alignedMalloc(64u * 4 * 8, MemoryConstants::pageSize);
auto retVal = CL_SUCCESS;
@ -1567,6 +1576,8 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhen1DarrayImageIsBeingCreated
EXPECT_EQ(0u, this->mock->setTilingHandle);
EXPECT_EQ(Sharing::nonSharedResource, imageGraphicsAllocation->peekSharedHandle());
alignedFree(data);
}
TEST_F(DrmMemoryManagerTest, givenHostPointerNotRequiringCopyWhenAllocateGraphicsMemoryForImageIsCalledThenGraphicsAllocationIsReturned) {