Revert "fix: configure ISA Pool params based on productHelper"

fzwolinski · Compute-Runtime-Automation · commit f5e37e725cc4 · 2025-03-10T22:41:13.000+01:00
This reverts commit bf20ae7. Signed-off-by: Fabian Zwoliński <fabian.zwolinski@intel.com>
diff --git a/level_zero/core/source/module/module_imp.cpp b/level_zero/core/source/module/module_imp.cpp
@@ -503,9 +503,10 @@ void ModuleTranslationUnit::processDebugData() {
 ModuleImp::ModuleImp(Device *device, ModuleBuildLog *moduleBuildLog, ModuleType type)
     : device(device), translationUnit(std::make_unique<ModuleTranslationUnit>(device)),
       moduleBuildLog(moduleBuildLog), type(type) {
+    auto &gfxCoreHelper = device->getGfxCoreHelper();
     auto &hwInfo = device->getHwInfo();
+    this->isaAllocationPageSize = gfxCoreHelper.useSystemMemoryPlacementForISA(hwInfo) ? MemoryConstants::pageSize : MemoryConstants::pageSize64k;
     this->productFamily = hwInfo.platform.eProductFamily;
-    this->isaAllocationPageSize = getIsaAllocationPageSize();
 }
 
 ModuleImp::~ModuleImp() {
@@ -1720,19 +1721,4 @@ NEO::GraphicsAllocation *ModuleImp::getKernelsIsaParentAllocation() const {
     return sharedIsaAllocation->getGraphicsAllocation();
 }
 
-size_t ModuleImp::getIsaAllocationPageSize() const {
-    auto &gfxCoreHelper = device->getGfxCoreHelper();
-    auto &hwInfo = device->getHwInfo();
-
-    if (gfxCoreHelper.useSystemMemoryPlacementForISA(hwInfo)) {
-        return MemoryConstants::pageSize;
-    }
-
-    if (device->getProductHelper().is2MBLocalMemAlignmentEnabled()) {
-        return MemoryConstants::pageSize2M;
-    } else {
-        return MemoryConstants::pageSize64k;
-    }
-}
-
 } // namespace L0
diff --git a/level_zero/core/source/module/module_imp.h b/level_zero/core/source/module/module_imp.h
@@ -190,7 +190,6 @@ struct ModuleImp : public Module {
     MOCKABLE_VIRTUAL size_t computeKernelIsaAllocationAlignedSizeWithPadding(size_t isaSize, bool lastKernel);
     MOCKABLE_VIRTUAL NEO::GraphicsAllocation *allocateKernelsIsaMemory(size_t size);
     StackVec<NEO::GraphicsAllocation *, 32> getModuleAllocations();
-    size_t getIsaAllocationPageSize() const;
 
     Device *device = nullptr;
     PRODUCT_FAMILY productFamily{};
diff --git a/level_zero/core/test/unit_tests/mocks/mock_module.h b/level_zero/core/test/unit_tests/mocks/mock_module.h
@@ -58,7 +58,6 @@ struct WhiteBox<::L0::Module> : public ::L0::ModuleImp {
     using BaseClass::copyPatchedSegments;
     using BaseClass::device;
     using BaseClass::exportedFunctionsSurface;
-    using BaseClass::getIsaAllocationPageSize;
     using BaseClass::importedSymbolAllocations;
     using BaseClass::isaSegmentsForPatching;
     using BaseClass::isFullyLinked;
@@ -112,7 +111,6 @@ struct MockModule : public L0::ModuleImp {
     using ModuleImp::allocateKernelsIsaMemory;
     using ModuleImp::computeKernelIsaAllocationAlignedSizeWithPadding;
     using ModuleImp::debugModuleHandle;
-    using ModuleImp::getIsaAllocationPageSize;
     using ModuleImp::getModuleAllocations;
     using ModuleImp::initializeKernelImmutableDatas;
     using ModuleImp::isaAllocationPageSize;
diff --git a/level_zero/core/test/unit_tests/sources/module/test_module.cpp b/level_zero/core/test/unit_tests/sources/module/test_module.cpp
@@ -34,7 +34,6 @@
 #include "shared/test/common/mocks/mock_l0_debugger.h"
 #include "shared/test/common/mocks/mock_memory_operations_handler.h"
 #include "shared/test/common/mocks/mock_modules_zebin.h"
-#include "shared/test/common/mocks/mock_product_helper.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
 #include "level_zero/core/source/kernel/kernel_imp.h"
@@ -175,6 +174,7 @@ HWTEST_F(ModuleTest, givenUserModuleWhenCreatedThenCorrectAllocationTypeIsUsedFo
 
 template <bool localMemEnabled>
 struct ModuleKernelIsaAllocationsFixture : public ModuleFixture {
+    static constexpr size_t isaAllocationPageSize = (localMemEnabled ? MemoryConstants::pageSize64k : MemoryConstants::pageSize);
     using Module = WhiteBox<::L0::Module>;
 
     void setUp() {
@@ -209,7 +209,7 @@ struct ModuleKernelIsaAllocationsFixture : public ModuleFixture {
     void givenSeparateIsaMemoryRegionPerKernelWhenGraphicsAllocationFailsThenProperErrorReturned() {
         mockModule->allocateKernelsIsaMemoryCallBase = false;
         mockModule->computeKernelIsaAllocationAlignedSizeWithPaddingCallBase = false;
-        mockModule->computeKernelIsaAllocationAlignedSizeWithPaddingResult = this->mockModule->getIsaAllocationPageSize();
+        mockModule->computeKernelIsaAllocationAlignedSizeWithPaddingResult = isaAllocationPageSize;
 
         auto result = module->initialize(&this->moduleDesc, device->getNEODevice());
         EXPECT_EQ(result, ZE_RESULT_ERROR_OUT_OF_DEVICE_MEMORY);
@@ -793,35 +793,6 @@ HWTEST_F(ModuleTest, whenMultipleModulesCreatedThenModulesShareIsaAllocation) {
     }
 };
 
-TEST_F(ModuleTest, GivenLocalMemoryEnabledOrDisabledAnd2MBAlignmentEnabledOrDisabledWhenGettingIsaAllocationPageSizeThenCorrectValueIsReturned) {
-    DebugManagerStateRestore restorer;
-    auto mockProductHelper = new MockProductHelper;
-
-    device->getNEODevice()->getRootDeviceEnvironmentRef().productHelper.reset(mockProductHelper);
-
-    MockModule mockModule{device, nullptr, ModuleType::user};
-    EXPECT_EQ(mockModule.getIsaAllocationPageSize(), mockModule.isaAllocationPageSize);
-
-    {
-        debugManager.flags.EnableLocalMemory.set(0);
-        mockProductHelper->is2MBLocalMemAlignmentEnabledResult = true;
-
-        EXPECT_EQ(MemoryConstants::pageSize, mockModule.getIsaAllocationPageSize());
-    }
-    {
-        debugManager.flags.EnableLocalMemory.set(1);
-        mockProductHelper->is2MBLocalMemAlignmentEnabledResult = true;
-
-        EXPECT_EQ(MemoryConstants::pageSize2M, mockModule.getIsaAllocationPageSize());
-    }
-    {
-        debugManager.flags.EnableLocalMemory.set(1);
-        mockProductHelper->is2MBLocalMemAlignmentEnabledResult = false;
-
-        EXPECT_EQ(MemoryConstants::pageSize64k, mockModule.getIsaAllocationPageSize());
-    }
-}
-
 template <typename T1, typename T2>
 struct ModuleSpecConstantsFixture : public DeviceFixture {
     void setUp() {
@@ -4077,6 +4048,7 @@ TEST_F(ModuleTest, whenContainsStatefulAccessIsCalledThenResultIsCorrect) {
 
 template <bool localMemEnabled>
 struct ModuleIsaAllocationsFixture : public DeviceFixture {
+    static constexpr size_t isaAllocationPageSize = (localMemEnabled ? MemoryConstants::pageSize64k : MemoryConstants::pageSize);
     static constexpr NEO::MemoryPool isaAllocationMemoryPool = (localMemEnabled ? NEO::MemoryPool::localMemory : NEO::MemoryPool::system4KBPagesWith32BitGpuAddressing);
 
     void setUp() {
@@ -4092,7 +4064,6 @@ struct ModuleIsaAllocationsFixture : public DeviceFixture {
         this->mockMemoryManager->localMemorySupported[this->neoDevice->getRootDeviceIndex()] = true;
         this->mockModule.reset(new MockModule{this->device, nullptr, ModuleType::user});
         this->mockModule->translationUnit.reset(new MockModuleTranslationUnit{this->device});
-        this->isaAllocationPageSize = this->mockModule->getIsaAllocationPageSize();
     }
 
     void tearDown() {
@@ -4148,8 +4119,8 @@ struct ModuleIsaAllocationsFixture : public DeviceFixture {
         EXPECT_EQ(kernelImmDatas[1]->getIsaOffsetInParentAllocation(), 0lu);
         EXPECT_EQ(kernelImmDatas[1]->getIsaSubAllocationSize(), 0lu);
         if constexpr (localMemEnabled) {
-            EXPECT_EQ(alignUp<size_t>(maxAllocationSizeInPage, MemoryConstants::pageSize64k), kernelImmDatas[0]->getIsaSize());
-            EXPECT_EQ(alignUp<size_t>(tinyAllocationSize, MemoryConstants::pageSize64k), kernelImmDatas[1]->getIsaSize());
+            EXPECT_EQ(isaAllocationPageSize, kernelImmDatas[0]->getIsaSize());
+            EXPECT_EQ(isaAllocationPageSize, kernelImmDatas[1]->getIsaSize());
         } else {
             EXPECT_EQ(this->computeKernelIsaAllocationSizeWithPadding(maxAllocationSizeInPage), kernelImmDatas[0]->getIsaSize());
             EXPECT_EQ(this->computeKernelIsaAllocationSizeWithPadding(tinyAllocationSize), kernelImmDatas[1]->getIsaSize());
@@ -4196,7 +4167,6 @@ struct ModuleIsaAllocationsFixture : public DeviceFixture {
 
     size_t isaPadding;
     size_t kernelStartPointerAlignment;
-    size_t isaAllocationPageSize;
     NEO::Device *neoDevice = nullptr;
     MockMemoryManager *mockMemoryManager = nullptr;
     std::unique_ptr<MockModule> mockModule = nullptr;
diff --git a/opencl/test/unit_test/mem_obj/buffer_pool_alloc_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_pool_alloc_tests.cpp
@@ -200,9 +200,9 @@ TEST_F(AggregatedSmallBuffersEnabledTest, givenAggregatedSmallBuffersEnabledWhen
     EXPECT_TRUE(poolAllocator->isAggregatedSmallBuffersEnabled(context.get()));
     EXPECT_EQ(1u, poolAllocator->bufferPools.size());
     EXPECT_NE(nullptr, poolAllocator->bufferPools[0].mainStorage.get());
-    EXPECT_NE(nullptr, mockMemoryManager->lastAllocationPropertiesWithPtr);
-    EXPECT_TRUE(mockMemoryManager->lastAllocationPropertiesWithPtr->makeDeviceBufferLockable);
-    EXPECT_FALSE(mockMemoryManager->lastAllocationPropertiesWithPtr->flags.preferCompressed);
+    EXPECT_NE(nullptr, mockMemoryManager->lastAllocationProperties);
+    EXPECT_TRUE(mockMemoryManager->lastAllocationProperties->makeDeviceBufferLockable);
+    EXPECT_FALSE(mockMemoryManager->lastAllocationProperties->flags.preferCompressed);
 }
 
 TEST_F(AggregatedSmallBuffersEnabledTest, givenAggregatedSmallBuffersEnabledAndSizeLargerThanThresholdWhenBufferCreateCalledThenDoNotUsePool) {
diff --git a/opencl/test/unit_test/program/kernel_info_tests.cpp b/opencl/test/unit_test/program/kernel_info_tests.cpp
@@ -10,7 +10,6 @@
 #include "shared/source/program/kernel_info.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
-#include "shared/test/common/mocks/mock_product_helper.h"
 #include "shared/test/common/mocks/mock_sip.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
 
@@ -85,62 +84,6 @@ TEST(KernelInfoTest, givenKernelInfoWhenCreatingKernelAllocationWithInternalIsaT
     device->getMemoryManager()->checkGpuUsageAndDestroyGraphicsAllocations(allocation);
 }
 
-TEST(KernelInfoTest, Given2MBAlignmentEnabledByProductHelperWhenCreatingKernelAllocationThenAllocationPropertiesAlignmentIsSetTo2M) {
-    DebugManagerStateRestore restorer;
-
-    KernelInfo kernelInfo;
-    auto factory = UltDeviceFactory{1, 0};
-    auto device = factory.rootDevices[0];
-    const size_t heapSize = 0x40;
-    char heap[heapSize];
-    kernelInfo.heapInfo.kernelHeapSize = heapSize;
-    kernelInfo.heapInfo.pKernelHeap = &heap;
-
-    auto mockProductHelper = new MockProductHelper;
-    device->getRootDeviceEnvironmentRef().productHelper.reset(mockProductHelper);
-    mockProductHelper->is2MBLocalMemAlignmentEnabledResult = true;
-    debugManager.flags.AlignLocalMemoryVaTo2MB.set(0);
-
-    auto mockMemoryManager = static_cast<MockMemoryManager *>(device->getMemoryManager());
-    mockMemoryManager->shouldStoreLastAllocationProperties = true;
-
-    auto retVal = kernelInfo.createKernelAllocation(*device, false);
-    EXPECT_TRUE(retVal);
-
-    ASSERT_NE(nullptr, mockMemoryManager->lastAllocationProperties);
-    EXPECT_EQ(MemoryConstants::pageSize2M, mockMemoryManager->lastAllocationProperties->alignment);
-
-    device->getMemoryManager()->checkGpuUsageAndDestroyGraphicsAllocations(kernelInfo.kernelAllocation);
-}
-
-TEST(KernelInfoTest, Given2MBAlignmentForcedByDebugFlagWhenCreatingKernelAllocationThenAllocationPropertiesAlignmentIsSetTo2M) {
-    DebugManagerStateRestore restorer;
-
-    KernelInfo kernelInfo;
-    auto factory = UltDeviceFactory{1, 0};
-    auto device = factory.rootDevices[0];
-    const size_t heapSize = 0x40;
-    char heap[heapSize];
-    kernelInfo.heapInfo.kernelHeapSize = heapSize;
-    kernelInfo.heapInfo.pKernelHeap = &heap;
-
-    auto mockProductHelper = new MockProductHelper;
-    device->getRootDeviceEnvironmentRef().productHelper.reset(mockProductHelper);
-    mockProductHelper->is2MBLocalMemAlignmentEnabledResult = false;
-    debugManager.flags.AlignLocalMemoryVaTo2MB.set(1);
-
-    auto mockMemoryManager = static_cast<MockMemoryManager *>(device->getMemoryManager());
-    mockMemoryManager->shouldStoreLastAllocationProperties = true;
-
-    auto retVal = kernelInfo.createKernelAllocation(*device, false);
-    EXPECT_TRUE(retVal);
-
-    ASSERT_NE(nullptr, mockMemoryManager->lastAllocationProperties);
-    EXPECT_EQ(MemoryConstants::pageSize2M, mockMemoryManager->lastAllocationProperties->alignment);
-
-    device->getMemoryManager()->checkGpuUsageAndDestroyGraphicsAllocations(kernelInfo.kernelAllocation);
-}
-
 class MyMemoryManager : public OsAgnosticMemoryManager {
   public:
     using OsAgnosticMemoryManager::OsAgnosticMemoryManager;
diff --git a/shared/source/os_interface/linux/drm_memory_manager.cpp b/shared/source/os_interface/linux/drm_memory_manager.cpp
@@ -1881,10 +1881,11 @@ void fillGmmsInAllocation(GmmHelper *gmmHelper, DrmAllocation *allocation) {
     }
 }
 
-inline uint64_t getCanonizedHeapAllocationAddress(HeapIndex heap, GmmHelper *gmmHelper, GfxPartition *gfxPartition, size_t &sizeAllocated, size_t alignment, bool packed) {
-    if (const size_t customAlignment = static_cast<size_t>(debugManager.flags.ExperimentalEnableCustomLocalMemoryAlignment.get());
-        customAlignment > 0) {
-        alignment = customAlignment;
+inline uint64_t getCanonizedHeapAllocationAddress(HeapIndex heap, GmmHelper *gmmHelper, GfxPartition *gfxPartition, size_t &sizeAllocated, bool packed) {
+    size_t alignment = 0;
+
+    if (debugManager.flags.ExperimentalEnableCustomLocalMemoryAlignment.get() != -1) {
+        alignment = static_cast<size_t>(debugManager.flags.ExperimentalEnableCustomLocalMemoryAlignment.get());
     }
     auto address = gfxPartition->heapAllocateWithCustomAlignment(heap, sizeAllocated, alignment);
     return gmmHelper->canonize(address);
@@ -1904,15 +1905,10 @@ AllocationStatus getGpuAddress(const AlignmentSelector &alignmentSelector, HeapA
     case AllocationType::kernelIsa:
     case AllocationType::kernelIsaInternal:
     case AllocationType::internalHeap:
-    case AllocationType::debugModuleArea: {
-        size_t alignment = 0;
-        if (gmmHelper->getRootDeviceEnvironment().getHelper<ProductHelper>().is2MBLocalMemAlignmentEnabled()) {
-            alignment = MemoryConstants::pageSize2M;
-        }
+    case AllocationType::debugModuleArea:
         gpuAddress = getCanonizedHeapAllocationAddress(heapAssigner.get32BitHeapIndex(allocType, true, hwInfo, allocationData.flags.use32BitFrontWindow),
-                                                       gmmHelper, gfxPartition, sizeAllocated, alignment, false);
+                                                       gmmHelper, gfxPartition, sizeAllocated, false);
         break;
-    }
     case AllocationType::writeCombined:
         sizeAllocated = 0;
         break;
diff --git a/shared/source/program/kernel_info.cpp b/shared/source/program/kernel_info.cpp
@@ -62,8 +62,7 @@ bool KernelInfo::createKernelAllocation(const Device &device, bool internalIsa)
 
     AllocationProperties properties = {device.getRootDeviceIndex(), kernelIsaSize, allocType, device.getDeviceBitfield()};
 
-    if (device.getProductHelper().is2MBLocalMemAlignmentEnabled() ||
-        debugManager.flags.AlignLocalMemoryVaTo2MB.get() == 1) {
+    if (debugManager.flags.AlignLocalMemoryVaTo2MB.get() == 1) {
         properties.alignment = MemoryConstants::pageSize2M;
     }
 
diff --git a/shared/source/utilities/isa_pool_allocator.cpp b/shared/source/utilities/isa_pool_allocator.cpp
@@ -8,7 +8,6 @@
 #include "shared/source/utilities/isa_pool_allocator.h"
 
 #include "shared/source/device/device.h"
-#include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/utilities/buffer_pool_allocator.inl"
@@ -17,9 +16,6 @@ namespace NEO {
 
 ISAPool::ISAPool(Device *device, bool isBuiltin, size_t storageSize)
     : BaseType(device->getMemoryManager(), nullptr), device(device), isBuiltin(isBuiltin) {
-    DEBUG_BREAK_IF(device->getProductHelper().is2MBLocalMemAlignmentEnabled() &&
-                   !isAligned(storageSize, MemoryConstants::pageSize2M));
-
     this->chunkAllocator.reset(new NEO::HeapAllocator(params.startingOffset, storageSize, MemoryConstants::pageSize, 0u));
 
     auto allocationType = isBuiltin ? NEO::AllocationType::kernelIsaInternal : NEO::AllocationType::kernelIsa;
@@ -59,7 +55,6 @@ const StackVec<NEO::GraphicsAllocation *, 1> &ISAPool::getAllocationsVector() {
 }
 
 ISAPoolAllocator::ISAPoolAllocator(Device *device) : device(device) {
-    initAllocParams();
 }
 
 /**
@@ -81,7 +76,7 @@ SharedIsaAllocation *ISAPoolAllocator::requestGraphicsAllocationForIsa(bool isBu
     auto maxAllocationSize = getAllocationSize(isBuiltin);
 
     if (size > maxAllocationSize) {
-        addNewBufferPool(ISAPool(device, isBuiltin, alignToPoolSize(size)));
+        addNewBufferPool(ISAPool(device, isBuiltin, size));
     }
 
     auto sharedIsaAllocation = tryAllocateISA(isBuiltin, size);
@@ -96,7 +91,7 @@ SharedIsaAllocation *ISAPoolAllocator::requestGraphicsAllocationForIsa(bool isBu
         return sharedIsaAllocation;
     }
 
-    addNewBufferPool(ISAPool(device, isBuiltin, alignToPoolSize(getAllocationSize(isBuiltin))));
+    addNewBufferPool(ISAPool(device, isBuiltin, getAllocationSize(isBuiltin)));
     return tryAllocateISA(isBuiltin, size);
 }
 
@@ -135,19 +130,4 @@ SharedIsaAllocation *ISAPoolAllocator::tryAllocateISA(bool isBuiltin, size_t siz
     return nullptr;
 }
 
-void ISAPoolAllocator::initAllocParams() {
-    if (device->getProductHelper().is2MBLocalMemAlignmentEnabled()) {
-        userAllocationSize = MemoryConstants::pageSize2M * 2;
-        buitinAllocationSize = MemoryConstants::pageSize2M;
-        poolAlignment = MemoryConstants::pageSize2M;
-    } else {
-        userAllocationSize = MemoryConstants::pageSize2M * 2;
-        buitinAllocationSize = MemoryConstants::pageSize64k;
-    }
-}
-
-size_t ISAPoolAllocator::alignToPoolSize(size_t size) const {
-    return alignUp(size, poolAlignment);
-}
-
 } // namespace NEO
diff --git a/shared/source/utilities/isa_pool_allocator.h b/shared/source/utilities/isa_pool_allocator.h
@@ -73,17 +73,15 @@ class ISAPoolAllocator : public AbstractBuffersAllocator<ISAPool, GraphicsAlloca
     void freeSharedIsaAllocation(SharedIsaAllocation *sharedIsaAllocation);
 
   private:
-    void initAllocParams();
     SharedIsaAllocation *tryAllocateISA(bool isBuiltin, size_t size);
+
     size_t getAllocationSize(bool isBuiltin) const {
         return isBuiltin ? buitinAllocationSize : userAllocationSize;
     }
-    size_t alignToPoolSize(size_t size) const;
 
     Device *device;
     size_t userAllocationSize = MemoryConstants::pageSize2M * 2;
     size_t buitinAllocationSize = MemoryConstants::pageSize64k;
-    size_t poolAlignment = 1u;
     std::mutex allocatorMtx;
 };
 
diff --git a/shared/test/common/mocks/mock_memory_manager.cpp b/shared/test/common/mocks/mock_memory_manager.cpp
@@ -72,9 +72,6 @@ void MockMemoryManager::waitForEnginesCompletion(GraphicsAllocation &graphicsAll
 
 GraphicsAllocation *MockMemoryManager::allocateGraphicsMemoryWithProperties(const AllocationProperties &properties) {
     validateAllocateProperties(properties);
-    if (shouldStoreLastAllocationProperties) {
-        lastAllocationProperties.reset(new AllocationProperties(properties));
-    }
     if (isMockHostMemoryManager) {
         allocateGraphicsMemoryWithPropertiesCount++;
         if (forceFailureInPrimaryAllocation) {
@@ -95,7 +92,7 @@ GraphicsAllocation *MockMemoryManager::allocateGraphicsMemoryWithProperties(cons
 
 GraphicsAllocation *MockMemoryManager::allocateGraphicsMemoryWithProperties(const AllocationProperties &properties, const void *ptr) {
     validateAllocateProperties(properties);
-    lastAllocationPropertiesWithPtr.reset(new AllocationProperties(properties));
+    lastAllocationProperties.reset(new AllocationProperties(properties));
     if (returnFakeAllocation) {
         return new GraphicsAllocation(properties.rootDeviceIndex, 1u /*num gmms*/, properties.allocationType, const_cast<void *>(ptr), dummyAddress, properties.size, 0, MemoryPool::system4KBPages, maxOsContextCount);
     }
diff --git a/shared/test/common/mocks/mock_memory_manager.h b/shared/test/common/mocks/mock_memory_manager.h
@@ -346,7 +346,6 @@ class MockMemoryManager : public MemoryManagerCreate<OsAgnosticMemoryManager> {
     bool failMapPhysicalToVirtualMemory = false;
     bool returnMockGAFromDevicePool = false;
     bool returnMockGAFromHostPool = false;
-    bool shouldStoreLastAllocationProperties = false;
     std::unique_ptr<MockExecutionEnvironment> mockExecutionEnvironment;
     DeviceBitfield recentlyPassedDeviceBitfield{};
     std::unique_ptr<MultiGraphicsAllocation> waitAllocations = nullptr;
@@ -355,7 +354,6 @@ class MockMemoryManager : public MemoryManagerCreate<OsAgnosticMemoryManager> {
     MemoryManager::AllocationStatus populateOsHandlesResult = MemoryManager::AllocationStatus::Success;
     GraphicsAllocation *allocateGraphicsMemoryForNonSvmHostPtrResult = nullptr;
     std::unique_ptr<AllocationProperties> lastAllocationProperties = nullptr;
-    std::unique_ptr<AllocationProperties> lastAllocationPropertiesWithPtr = nullptr;
     std::function<void(const AllocationProperties &)> validateAllocateProperties = [](const AllocationProperties &) -> void {};
     AddressRange reserveGpuAddressOnHeapResult = AddressRange{0u, 0u};
 };
diff --git a/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp
diff --git a/shared/test/unit_test/utilities/isa_pool_allocator_tests.cpp b/shared/test/unit_test/utilities/isa_pool_allocator_tests.cpp

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,7 @@ bool KernelInfo::createKernelAllocation(const Device &device, bool internalIsa)`
`62`	`62`
`63`	`63`	`AllocationProperties properties = {device.getRootDeviceIndex(), kernelIsaSize, allocType, device.getDeviceBitfield()};`
`64`	`64`
`65`		`- if (device.getProductHelper().is2MBLocalMemAlignmentEnabled() \|\|`
`66`		`- debugManager.flags.AlignLocalMemoryVaTo2MB.get() == 1) {`
	`65`	`+ if (debugManager.flags.AlignLocalMemoryVaTo2MB.get() == 1) {`
`67`	`66`	`properties.alignment = MemoryConstants::pageSize2M;`
`68`	`67`	`}`
`69`	`68`