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

Unlock multi device setup for shared allocation

Browse Source 
Related-To: NEO-5422
Signed-off-by: Krzysztof Gibala <krzysztof.gibala@intel.com>
This commit is contained in:
Krzysztof Gibala
2021-01-14 13:51:14 +00:00
committed by Compute-Runtime-Automation
parent 60ee8cc701
commit ae1e5a91b4
2 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl
View File

@@ -1083,3 +1083,37 @@ TEST_F(MultiRootDeviceClUnifiedSharedMemoryTests, WhenClHostMemAllocIntelIsCalle
retVal = clMemFreeINTEL(context.get(), unifiedMemoryHostAllocation);
EXPECT_EQ(CL_SUCCESS, retVal);
}
TEST_F(MultiRootDeviceClUnifiedSharedMemoryTests, WhenClSharedMemAllocIntelIsCalledWithoutDeviceInMultiRootDeviceEnvironmentThenItAllocatesHostUnifiedMemoryAllocations) {
cl_int retVal = CL_SUCCESS;
auto unifiedMemorySharedAllocation = clSharedMemAllocINTEL(context.get(), nullptr, nullptr, 4, 0, &retVal);
EXPECT_EQ(CL_SUCCESS, retVal);
ASSERT_NE(nullptr, unifiedMemorySharedAllocation);
auto allocationsManager = context.get()->getSVMAllocsManager();
EXPECT_EQ(allocationsManager->getNumAllocs(), 1u);
auto svmAllocation = allocationsManager->getSVMAlloc(unifiedMemorySharedAllocation);
auto graphicsAllocation1 = svmAllocation->gpuAllocations.getGraphicsAllocation(1u);
auto graphicsAllocation2 = svmAllocation->gpuAllocations.getGraphicsAllocation(2u);
EXPECT_EQ(svmAllocation->size, 4u);
EXPECT_EQ(svmAllocation->memoryType, InternalMemoryType::SHARED_UNIFIED_MEMORY);
EXPECT_NE(graphicsAllocation1, nullptr);
EXPECT_NE(graphicsAllocation2, nullptr);
EXPECT_EQ(graphicsAllocation1->getRootDeviceIndex(), 1u);
EXPECT_EQ(graphicsAllocation2->getRootDeviceIndex(), 2u);
EXPECT_EQ(graphicsAllocation1->getAllocationType(), GraphicsAllocation::AllocationType::BUFFER_HOST_MEMORY);
EXPECT_EQ(graphicsAllocation2->getAllocationType(), GraphicsAllocation::AllocationType::BUFFER_HOST_MEMORY);
EXPECT_EQ(graphicsAllocation1->getGpuAddress(), castToUint64(unifiedMemorySharedAllocation));
EXPECT_EQ(graphicsAllocation2->getGpuAddress(), castToUint64(unifiedMemorySharedAllocation));
retVal = clMemFreeINTEL(context.get(), unifiedMemorySharedAllocation);
EXPECT_EQ(CL_SUCCESS, retVal);
}

4
shared/source/memory_manager/unified_memory_manager.cpp
View File

@@ -209,6 +209,10 @@ void *SVMAllocsManager::createUnifiedMemoryAllocation(size_t size,
void *SVMAllocsManager::createSharedUnifiedMemoryAllocation(size_t size,
const UnifiedMemoryProperties &memoryProperties,
void *cmdQ) {
if (memoryProperties.rootDeviceIndices.size() > 1 && !memoryProperties.device) {
return createHostUnifiedMemoryAllocation(size, memoryProperties);
}
auto supportDualStorageSharedMemory = memoryManager->isLocalMemorySupported(*memoryProperties.rootDeviceIndices.begin());
if (DebugManager.flags.AllocateSharedAllocationsWithCpuAndGpuStorage.get() != -1) {