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

fix: handle in-order allocator destruction 

Related-To: NEO-10572

Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>
This commit is contained in:
Dunajski, Bartosz 2024-03-04 09:17:20 +00:00 committed by Compute-Runtime-Automation
parent 0f8dd5e6c9
commit 1d59ffba82
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
level_zero/core/source/device/device_imp.cpp
View File

@ -1465,6 +1465,7 @@ void DeviceImp::releaseResources() {
metricContext.reset(); metricContext.reset();
builtins.reset(); builtins.reset();
cacheReservation.reset(); cacheReservation.reset();
deviceInOrderCounterAllocator.reset();
if (allocationsForReuse.get()) { if (allocationsForReuse.get()) {
allocationsForReuse->freeAllGraphicsAllocations(neoDevice); allocationsForReuse->freeAllGraphicsAllocations(neoDevice);

44
level_zero/core/test/unit_tests/sources/device/test_l0_device.cpp
View File

@ -30,8 +30,10 @@
#include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_memory_manager.h"
#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/mock_os_context.h"
#include "shared/test/common/mocks/mock_sip.h" #include "shared/test/common/mocks/mock_sip.h"
#include "shared/test/common/mocks/mock_timestamp_container.h"
#include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/mocks/ult_device_factory.h"
#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/common/test_macros/hw_test.h"
#include "shared/test/common/utilities/destructor_counted.h"
#include "level_zero/core/source/cache/cache_reservation.h" #include "level_zero/core/source/cache/cache_reservation.h"
#include "level_zero/core/source/cmdqueue/cmdqueue_imp.h" #include "level_zero/core/source/cmdqueue/cmdqueue_imp.h"
@ -831,32 +833,34 @@ TEST_F(DeviceHostPointerTest, givenHostPointerNotAcceptedByKernelAndHostPointerC
delete[] buffer; delete[] buffer;
} }
TEST_F(DeviceTest, whenCreatingDeviceThenCreateInOrderCounterAllocatorOnDemand) { TEST_F(DeviceTest, whenCreatingDeviceThenCreateInOrderCounterAllocatorOnDemandAndHandleDestruction) {
uint32_t destructorId = 0u;
class MyMockDevice : public DestructorCounted<NEO::MockDevice, 1> {
public:
MyMockDevice(NEO::ExecutionEnvironment *executionEnvironment, uint32_t rootDeviceIndex, uint32_t &destructorId) : DestructorCounted(destructorId, executionEnvironment, rootDeviceIndex) {}
};
class MyMockTagAllocator : public DestructorCounted<MockTagAllocator<NEO::DeviceAllocNodeType<true>>, 0> {
public:
MyMockTagAllocator(uint32_t rootDeviceIndex, MemoryManager *memoryManager, uint32_t &destructorId) : DestructorCounted(destructorId, rootDeviceIndex, memoryManager, 10) {}
};
const uint32_t rootDeviceIndex = 0u; const uint32_t rootDeviceIndex = 0u;
auto hwInfo = *NEO::defaultHwInfo; auto hwInfo = *NEO::defaultHwInfo;
auto *neoMockDevice = NEO::MockDevice::createWithNewExecutionEnvironment<NEO::MockDevice>(&hwInfo, rootDeviceIndex);
neoMockDevice->incRefInternal(); auto executionEnvironment = MyMockDevice::prepareExecutionEnvironment(&hwInfo, rootDeviceIndex);
neoMockDevice->deviceBitfield = 0b111; executionEnvironment->rootDeviceEnvironments[rootDeviceIndex]->setHwInfoAndInitHelpers(&hwInfo);
auto *neoMockDevice = new MyMockDevice(executionEnvironment, rootDeviceIndex, destructorId);
neoMockDevice->createDeviceImpl();
{ {
auto allocator = new MyMockTagAllocator(0, neoMockDevice->getMemoryManager(), destructorId);
MockDeviceImp deviceImp(neoMockDevice, neoMockDevice->getExecutionEnvironment()); MockDeviceImp deviceImp(neoMockDevice, neoMockDevice->getExecutionEnvironment());
EXPECT_EQ(nullptr, deviceImp.deviceInOrderCounterAllocator.get()); deviceImp.deviceInOrderCounterAllocator.reset(allocator);
EXPECT_EQ(allocator, deviceImp.getDeviceInOrderCounterAllocator());
auto allocator = deviceImp.getDeviceInOrderCounterAllocator();
EXPECT_NE(nullptr, deviceImp.deviceInOrderCounterAllocator.get());
auto expectedOffset = alignUp(sizeof(uint64_t) * neoMockDevice->deviceBitfield.count() * 2, MemoryConstants::cacheLineSize);
auto node1 = allocator->getTag();
auto node2 = allocator->getTag();
EXPECT_EQ(node1->getGpuAddress() + expectedOffset, node2->getGpuAddress());
EXPECT_EQ(ptrOffset(node1->getCpuBase(), expectedOffset), node2->getCpuBase());
node1->returnTag();
node2->returnTag();
} }
neoMockDevice->decRefInternal();
} }
TEST_F(DeviceTest, givenMoreThanOneExtendedPropertiesStructuresWhenKernelPropertiesCalledThenSuccessIsReturnedAndPropertiesAreSet) { TEST_F(DeviceTest, givenMoreThanOneExtendedPropertiesStructuresWhenKernelPropertiesCalledThenSuccessIsReturnedAndPropertiesAreSet) {