Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GEM_MMAP removal 

Signed-off-by: Bartosz Dunajski <bartosz.dunajski@intel.com>
This commit is contained in:
Bartosz Dunajski 2022-06-02 11:52:15 +00:00 committed by Compute-Runtime-Automation
parent a44f1b43aa
commit d3da44c9aa
12 changed files with 3 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp
View File

@ -2627,7 +2627,6 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenLockUnlockIsCalledOnAlloca
TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenLockUnlockIsCalledOnAllocationWithoutCpuPtrThenReturnLockedPtrAndSetCpuDomain) {
mock->ioctl_expected.gemCreate = 1;
mock->ioctl_expected.gemMmapOffset = 1;
mock->ioctl_expected.gemMmap = 0;
mock->ioctl_expected.gemSetDomain = 0;
mock->ioctl_expected.gemSetTiling = 1;
mock->ioctl_expected.gemWait = 1;
@ -2656,12 +2655,10 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenLockUnlockIsCalledOnAlloca
auto drmAllocation = static_cast<DrmAllocation *>(allocation);
EXPECT_NE(nullptr, drmAllocation->getBO()->peekLockedAddress());
// check DRM_IOCTL_I915_GEM_MMAP input params
// check DRM_IOCTL_I915_GEM_MMAP_OFFSET input params
EXPECT_EQ((uint32_t)drmAllocation->getBO()->peekHandle(), mock->mmapOffsetHandle);
EXPECT_EQ(0u, mock->mmapPad);
EXPECT_EQ(0u, mock->mmapOffset);
EXPECT_EQ(0u, mock->mmapSize);
EXPECT_EQ(0u, mock->mmapFlags);
EXPECT_EQ(0u, mock->mmapOffsetPad);
EXPECT_EQ(static_cast<uint32_t>(I915_MMAP_OFFSET_WC), mock->mmapOffsetFlags);
memoryManager->unlockResource(allocation);
EXPECT_EQ(nullptr, drmAllocation->getBO()->peekLockedAddress());

8
shared/source/os_interface/linux/drm_wrappers.cpp
View File

@ -87,14 +87,6 @@ static_assert(offsetof(GemMmapOffset, offset) == offsetof(drm_i915_gem_mmap_offs
static_assert(offsetof(GemMmapOffset, flags) == offsetof(drm_i915_gem_mmap_offset, flags));
static_assert(offsetof(GemMmapOffset, extensions) == offsetof(drm_i915_gem_mmap_offset, extensions));
static_assert(sizeof(GemMmap) == sizeof(drm_i915_gem_mmap));
static_assert(offsetof(GemMmap, handle) == offsetof(drm_i915_gem_mmap, handle));
static_assert(offsetof(GemMmap, pad) == offsetof(drm_i915_gem_mmap, pad));
static_assert(offsetof(GemMmap, offset) == offsetof(drm_i915_gem_mmap, offset));
static_assert(offsetof(GemMmap, size) == offsetof(drm_i915_gem_mmap, size));
static_assert(offsetof(GemMmap, addrPtr) == offsetof(drm_i915_gem_mmap, addr_ptr));
static_assert(offsetof(GemMmap, flags) == offsetof(drm_i915_gem_mmap, flags));
static_assert(sizeof(GemSetDomain) == sizeof(drm_i915_gem_set_domain));
static_assert(offsetof(GemSetDomain, handle) == offsetof(drm_i915_gem_set_domain, handle));
static_assert(offsetof(GemSetDomain, readDomains) == offsetof(drm_i915_gem_set_domain, read_domains));

10
shared/source/os_interface/linux/drm_wrappers.h
View File

@ -100,15 +100,6 @@ struct GemMmapOffset {
uint64_t extensions;
};
struct GemMmap {
uint32_t handle;
uint32_t pad;
uint64_t offset;
uint64_t size;
uint64_t addrPtr;
uint64_t flags;
};
struct GemSetDomain {
uint32_t handle;
uint32_t readDomains;
@ -216,7 +207,6 @@ enum class DrmIoctl {
GemContextGetparam,
GemContextSetparam,
Query,
GemMmap,
GemMmapOffset,
GemVmCreate,
GemVmDestroy,

4
shared/source/os_interface/linux/ioctl_helper.cpp
View File

@ -166,8 +166,6 @@ unsigned int IoctlHelper::getIoctlRequestValueBase(DrmIoctl ioctlRequest) const
return DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM;
case DrmIoctl::Query:
return DRM_IOCTL_I915_QUERY;
case DrmIoctl::GemMmap:
return DRM_IOCTL_I915_GEM_MMAP;
case DrmIoctl::PrimeFdToHandle:
return DRM_IOCTL_PRIME_FD_TO_HANDLE;
case DrmIoctl::PrimeHandleToFd:
@ -290,8 +288,6 @@ std::string getIoctlString(DrmIoctl ioctlRequest) {
return "DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM";
case DrmIoctl::Query:
return "DRM_IOCTL_I915_QUERY";
case DrmIoctl::GemMmap:
return "DRM_IOCTL_I915_GEM_MMAP";
case DrmIoctl::PrimeFdToHandle:
return "DRM_IOCTL_PRIME_FD_TO_HANDLE";
case DrmIoctl::PrimeHandleToFd:

6
shared/test/common/libult/linux/drm_mock.cpp
View File

@ -209,12 +209,6 @@ int DrmMock::ioctl(DrmIoctl request, void *arg) {
primeToFdParams->fileDescriptor = outputFd;
return 0;
}
if (request == DrmIoctl::GemMmap) {
ioctlCount.gemMmap++;
auto mmapArg = static_cast<GemMmap *>(arg);
mmapArg->addrPtr = reinterpret_cast<uint64_t>(lockedPtr);
return 0;
}
if (request == DrmIoctl::GemWait) {
ioctlCount.gemWait++;
receivedGemWait = *static_cast<GemWait *>(arg);

2
shared/test/common/libult/linux/drm_mock.h
View File

@ -229,8 +229,6 @@ class DrmMock : public Drm {
//DRM_IOCTL_I915_GEM_USERPTR
uint32_t returnHandle = 0;
uint64_t gpuMemSize = 3u * MemoryConstants::gigaByte;
//DRM_IOCTL_I915_GEM_MMAP
uint64_t lockedPtr[4];
//DRM_IOCTL_I915_QUERY
QueryItem storedQueryItem = {};
//DRM_IOCTL_I915_GEM_WAIT

12
shared/test/common/os_interface/linux/device_command_stream_fixture.cpp
View File

@ -22,7 +22,6 @@ void Ioctls::reset() {
gemVmCreate = 0;
primeFdToHandle = 0;
handleToPrimeFd = 0;
gemMmap = 0;
gemMmapOffset = 0;
gemSetDomain = 0;
gemWait = 0;
@ -52,7 +51,6 @@ void DrmMockCustom::testIoctls() {
NEO_IOCTL_EXPECT_EQ(gemGetTiling);
NEO_IOCTL_EXPECT_EQ(primeFdToHandle);
NEO_IOCTL_EXPECT_EQ(handleToPrimeFd);
NEO_IOCTL_EXPECT_EQ(gemMmap);
NEO_IOCTL_EXPECT_EQ(gemMmapOffset);
NEO_IOCTL_EXPECT_EQ(gemSetDomain);
NEO_IOCTL_EXPECT_EQ(gemWait);
@ -123,16 +121,6 @@ int DrmMockCustom::ioctl(DrmIoctl request, void *arg) {
handleToPrimeParams->fileDescriptor = outputFd;
ioctl_cnt.handleToPrimeFd++;
} break;
case DrmIoctl::GemMmap: {
auto mmapParams = static_cast<NEO::GemMmap *>(arg);
mmapHandle = mmapParams->handle;
mmapPad = mmapParams->pad;
mmapOffset = mmapParams->offset;
mmapSize = mmapParams->size;
mmapFlags = mmapParams->flags;
mmapParams->addrPtr = mmapAddrPtr;
ioctl_cnt.gemMmap++;
} break;
case DrmIoctl::GemSetDomain: {
auto setDomainParams = static_cast<NEO::GemSetDomain *>(arg);
setDomainHandle = setDomainParams->handle;

8
shared/test/common/os_interface/linux/device_command_stream_fixture.h
View File

@ -44,7 +44,6 @@ class Ioctls {
std::atomic<int32_t> gemVmCreate;
std::atomic<int32_t> primeFdToHandle;
std::atomic<int32_t> handleToPrimeFd;
std::atomic<int32_t> gemMmap;
std::atomic<int32_t> gemMmapOffset;
std::atomic<int32_t> gemSetDomain;
std::atomic<int32_t> gemWait;
@ -188,13 +187,6 @@ class DrmMockCustom : public Drm {
int32_t inputFlags = 0;
//DRM_IOCTL_I915_GEM_USERPTR
uint32_t returnHandle = 0;
//DRM_IOCTL_I915_GEM_MMAP
uint32_t mmapHandle = 0;
uint32_t mmapPad = 0;
uint64_t mmapOffset = 0;
uint64_t mmapSize = 0;
uint64_t mmapAddrPtr = 0x7F4000001000;
uint64_t mmapFlags = 0;
//DRM_IOCTL_I915_GEM_SET_DOMAIN
uint32_t setDomainHandle = 0;
uint32_t setDomainReadDomains = 0;

1
shared/test/unit_test/os_interface/linux/drm_tests.cpp
View File

@ -1218,7 +1218,6 @@ TEST(DrmWrapperTest, WhenGettingIoctlStringValueThenProperStringIsReturned) {
{DrmIoctl::GemContextGetparam, "DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM"},
{DrmIoctl::GemContextSetparam, "DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM"},
{DrmIoctl::Query, "DRM_IOCTL_I915_QUERY"},
{DrmIoctl::GemMmap, "DRM_IOCTL_I915_GEM_MMAP"},
{DrmIoctl::PrimeFdToHandle, "DRM_IOCTL_PRIME_FD_TO_HANDLE"},
{DrmIoctl::GemVmBind, "PRELIM_DRM_IOCTL_I915_GEM_VM_BIND"},
{DrmIoctl::GemVmUnbind, "PRELIM_DRM_IOCTL_I915_GEM_VM_UNBIND"},

1
shared/test/unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp
View File

@ -115,7 +115,6 @@ DG1TEST_F(IoctlHelperTestsDg1, whenGettingIoctlRequestValueThenPropertValueIsRet
EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemContextGetparam), static_cast<unsigned int>(DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM));
EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemContextSetparam), static_cast<unsigned int>(DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM));
EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::Query), static_cast<unsigned int>(DRM_IOCTL_I915_QUERY));
EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemMmap), static_cast<unsigned int>(DRM_IOCTL_I915_GEM_MMAP));
EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::PrimeFdToHandle), static_cast<unsigned int>(DRM_IOCTL_PRIME_FD_TO_HANDLE));
EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::PrimeHandleToFd), static_cast<unsigned int>(DRM_IOCTL_PRIME_HANDLE_TO_FD));
EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemContextCreateExt), static_cast<unsigned int>(DRM_IOCTL_I915_GEM_CONTEXT_CREATE_EXT));

1
shared/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp
View File

@ -38,7 +38,6 @@ TEST_F(IoctlPrelimHelperTests, whenGettingIoctlRequestValueThenPropertValueIsRet
EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemContextGetparam), static_cast<unsigned int>(DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM));
EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemContextSetparam), static_cast<unsigned int>(DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM));
EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::Query), static_cast<unsigned int>(DRM_IOCTL_I915_QUERY));
EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemMmap), static_cast<unsigned int>(DRM_IOCTL_I915_GEM_MMAP));
EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::PrimeFdToHandle), static_cast<unsigned int>(DRM_IOCTL_PRIME_FD_TO_HANDLE));
EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::PrimeHandleToFd), static_cast<unsigned int>(DRM_IOCTL_PRIME_HANDLE_TO_FD));
EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemVmBind), static_cast<unsigned int>(PRELIM_DRM_IOCTL_I915_GEM_VM_BIND));

1
shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp
View File

@ -39,7 +39,6 @@ TEST(IoctlHelperUpstreamTest, whenGettingIoctlRequestValueThenPropertValueIsRetu
EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemContextGetparam), static_cast<unsigned int>(DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM));
EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemContextSetparam), static_cast<unsigned int>(DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM));
EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::Query), static_cast<unsigned int>(DRM_IOCTL_I915_QUERY));
EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemMmap), static_cast<unsigned int>(DRM_IOCTL_I915_GEM_MMAP));
EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::PrimeFdToHandle), static_cast<unsigned int>(DRM_IOCTL_PRIME_FD_TO_HANDLE));
EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::PrimeHandleToFd), static_cast<unsigned int>(DRM_IOCTL_PRIME_HANDLE_TO_FD));
EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemCreateExt), static_cast<unsigned int>(DRM_IOCTL_I915_GEM_CREATE_EXT));