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

Revert "Destroy resource handle when created" 

This reverts commit 5a6a90aa0e.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation 2022-08-01 09:58:29 +02:00 committed by Compute-Runtime-Automation
parent cf55a92b79
commit 00ff0dc337
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp
View File

@ -811,24 +811,6 @@ TEST_F(WddmMemoryManagerTest, givenWddmMemoryManagerWhenFreeAllocFromSharedHandl
EXPECT_EQ(lastDestroyed, expectedDestroyHandle); EXPECT_EQ(lastDestroyed, expectedDestroyHandle);
} }
TEST_F(WddmMemoryManagerTest, givenWddmMemoryManagerWhenFreeAllocFromHostPtrIsCalledThenDestroyResourceHandle) {
auto size = 13u;
auto hostPtr = reinterpret_cast<const void *>(0x10001);
AllocationData allocationData;
allocationData.size = size;
allocationData.hostPtr = hostPtr;
auto allocation = static_cast<WddmAllocation *>(memoryManager->allocateGraphicsMemoryForNonSvmHostPtr(allocationData));
auto expectedDestroyHandle = allocation->resourceHandle;
EXPECT_NE(0u, expectedDestroyHandle);
auto lastDestroyed = getMockLastDestroyedResHandleFcn();
EXPECT_EQ(0u, lastDestroyed);
memoryManager->freeGraphicsMemory(allocation);
lastDestroyed = getMockLastDestroyedResHandleFcn();
EXPECT_EQ(lastDestroyed, expectedDestroyHandle);
}
TEST_F(WddmMemoryManagerTest, givenWddmMemoryManagerSizeZeroWhenCreateFromSharedHandleIsCalledThenUpdateSize) { TEST_F(WddmMemoryManagerTest, givenWddmMemoryManagerSizeZeroWhenCreateFromSharedHandleIsCalledThenUpdateSize) {
auto osHandle = 1u; auto osHandle = 1u;
auto size = 4096u; auto size = 4096u;

2
shared/source/os_interface/windows/wddm_memory_manager.cpp
View File

@ -565,7 +565,7 @@ void WddmMemoryManager::freeGraphicsMemoryImpl(GraphicsAllocation *gfxAllocation
input->fragmentsStorage.fragmentCount > 0) { input->fragmentsStorage.fragmentCount > 0) {
cleanGraphicsMemoryCreatedFromHostPtr(gfxAllocation); cleanGraphicsMemoryCreatedFromHostPtr(gfxAllocation);
} else { } else {
if (input->resourceHandle != 0) { if (input->peekSharedHandle() || input->peekInternalHandle(nullptr) != 0) {
[[maybe_unused]] auto status = tryDeferDeletions(nullptr, 0, input->resourceHandle, gfxAllocation->getRootDeviceIndex()); [[maybe_unused]] auto status = tryDeferDeletions(nullptr, 0, input->resourceHandle, gfxAllocation->getRootDeviceIndex());
DEBUG_BREAK_IF(!status); DEBUG_BREAK_IF(!status);
} else { } else {