intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 14:55:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

feature: support memory policy for GEM_CREATE

Browse Source 
Modified ioctl_helper_prelim to support the extension of gem_create_ext,
i.e. prelim_drm_i915_gem_create_ext_mempolicy.

Added two debug variables to be used for the mempolicy extension.

Modified functions in memory_info and drm_memory_manager to support extension

Added numaif.h from https://github.com/numactl/numactl/tree/master,
v2.0.14

Related-To: NEO-8276
Signed-off-by: Young Jin Yoon <young.jin.yoon@intel.com>
This commit is contained in:
Young Jin Yoon
2023-12-06 19:30:05 +00:00
committed by Compute-Runtime-Automation
parent 80c2664b2a
commit 4ccae1dbb4
36 changed files with 1425 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
shared/test/common/libult/linux/drm_mock_prelim_context.cpp
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2022-2023 Intel Corporation
* Copyright (C) 2022-2024 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -164,21 +164,38 @@ int DrmMockPrelimContext::handlePrelimRequest(DrmIoctl request, void *arg) {
return EINVAL;
}
prelim_drm_i915_gem_create_ext_setparam *pairSetparamRegion = nullptr;
prelim_drm_i915_gem_create_ext_setparam *chunkingSetparamRegion = nullptr;
prelim_drm_i915_gem_create_ext_vm_private *vmPrivateExt = nullptr;
if (extension->base.next_extension != 0) {
prelim_drm_i915_gem_create_ext_setparam *pairSetparamRegion = nullptr;
pairSetparamRegion = reinterpret_cast<prelim_drm_i915_gem_create_ext_setparam *>(extension->base.next_extension);
if (pairSetparamRegion->base.name == PRELIM_I915_GEM_CREATE_EXT_SETPARAM) {
if ((pairSetparamRegion->base.name & PRELIM_I915_PARAM_SET_PAIR) == 0) {
return EINVAL;
}
} else {
vmPrivateExt = reinterpret_cast<prelim_drm_i915_gem_create_ext_vm_private *>(extension->base.next_extension);
if (vmPrivateExt->base.name != PRELIM_I915_GEM_CREATE_EXT_VM_PRIVATE) {
prelim_drm_i915_gem_create_ext_memory_policy *memPolicyExt = nullptr;
void *next_extension = reinterpret_cast<void *>(extension->base.next_extension);
while (next_extension != 0) {
auto *setparamCandidate = reinterpret_cast<prelim_drm_i915_gem_create_ext_setparam *>(next_extension);
if (setparamCandidate->base.name == PRELIM_I915_GEM_CREATE_EXT_SETPARAM) {
if ((setparamCandidate->param.param & PRELIM_I915_PARAM_SET_PAIR) != 0) {
pairSetparamRegion = setparamCandidate;
} else if ((setparamCandidate->param.param & PRELIM_I915_PARAM_SET_CHUNK_SIZE) != 0) {
chunkingSetparamRegion = setparamCandidate;
} else {
return EINVAL;
}
next_extension = reinterpret_cast<void *>(setparamCandidate->base.next_extension);
continue;
}
auto *vmPrivateCandidate = reinterpret_cast<prelim_drm_i915_gem_create_ext_vm_private *>(next_extension);
if (vmPrivateCandidate->base.name == PRELIM_I915_GEM_CREATE_EXT_VM_PRIVATE) {
vmPrivateExt = vmPrivateCandidate;
next_extension = reinterpret_cast<void *>(vmPrivateCandidate->base.next_extension);
continue;
}
auto *memPolicyCandidate = reinterpret_cast<prelim_drm_i915_gem_create_ext_memory_policy *>(next_extension);
if (memPolicyCandidate->base.name == PRELIM_I915_GEM_CREATE_EXT_MEMORY_POLICY) {
memPolicyExt = memPolicyCandidate;
next_extension = reinterpret_cast<void *>(memPolicyCandidate->base.next_extension);
continue;
}
// incorrect extension detected
return EINVAL;
}
auto data = reinterpret_cast<MemoryClassInstance *>(extension->param.data);
@@ -194,6 +211,20 @@ int DrmMockPrelimContext::handlePrelimRequest(DrmIoctl request, void *arg) {
receivedCreateGemExt->vmPrivateExt = CreateGemExt::VmPrivate{vmPrivateExt->vm_id};
}
if (memPolicyExt != nullptr) {
receivedCreateGemExt->memPolicyExt = CreateGemExt::MemPolicy{memPolicyExt->mode, std::vector<unsigned long>()};
auto *memPolicyPtr = reinterpret_cast<unsigned long *>(memPolicyExt->nodemask_ptr);
for (auto i = 0u; i < memPolicyExt->nodemask_max; i++) {
receivedCreateGemExt->memPolicyExt.nodeMask.value().push_back(memPolicyPtr[i]);
}
}
if (pairSetparamRegion != nullptr) {
receivedCreateGemExt->pairSetParamExt = CreateGemExt::SetParam{pairSetparamRegion->param.handle, pairSetparamRegion->param.size, pairSetparamRegion->param.param};
}
if (chunkingSetparamRegion != nullptr) {
receivedCreateGemExt->chunkingSetParamExt = CreateGemExt::SetParam{chunkingSetparamRegion->param.handle, chunkingSetparamRegion->param.size, chunkingSetparamRegion->param.param};
}
receivedCreateGemExt->memoryRegions.clear();
for (uint32_t i = 0; i < extension->param.size; i++) {
receivedCreateGemExt->memoryRegions.push_back({data[i].memoryClass, data[i].memoryInstance});

10
shared/test/common/libult/linux/drm_mock_prelim_context.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2022-2023 Intel Corporation
* Copyright (C) 2022-2024 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -37,6 +37,8 @@ struct CreateGemExt {
uint64_t param{0};
};
std::optional<SetParam> setParamExt{};
std::optional<SetParam> pairSetParamExt{};
std::optional<SetParam> chunkingSetParamExt{};
struct MemoryClassInstance {
uint16_t memoryClass{0};
@@ -48,6 +50,12 @@ struct CreateGemExt {
std::optional<uint32_t> vmId{};
};
VmPrivate vmPrivateExt{};
struct MemPolicy {
std::optional<uint32_t> mode{};
std::optional<std::vector<unsigned long>> nodeMask{};
};
MemPolicy memPolicyExt{};
};
struct GemContextParamAcc {