Use specific address for Allocator32Bit in AUB CSR

Change-Id: If3fd466fcfea21c1967b10def57acf67ccfdc5e6

Author: HoppeMateusz

Jenkinsfile

@@ -1,5 +1,5 @@
 #!groovy
 neoDependenciesRev='800243-1090'
 strategy='EQUAL'
-allowedCD=272
+allowedCD=274
 allowedF=4

runtime/command_stream/aub_command_stream_receiver_hw.h

@@ -69,7 +69,7 @@ class AUBCommandStreamReceiverHw : public CommandStreamReceiverSimulatedHw<GfxFa
     void freeEngineInfoTable();
 
     MemoryManager *createMemoryManager(bool enable64kbPages, bool enableLocalMemory) override {
-        this->memoryManager = new OsAgnosticMemoryManager(enable64kbPages, enableLocalMemory);
+        this->memoryManager = new OsAgnosticMemoryManager(enable64kbPages, enableLocalMemory, true);
         this->flatBatchBufferHelper->setMemoryManager(this->memoryManager);
         return this->memoryManager;
     }

runtime/memory_manager/os_agnostic_memory_manager.cpp

@@ -89,10 +89,11 @@ GraphicsAllocation *OsAgnosticMemoryManager::allocate32BitGraphicsMemory(size_t
 
     auto allocationSize = alignUp(size, MemoryConstants::pageSize);
     void *ptrAlloc = nullptr;
+    auto gpuAddress = allocator32Bit->allocate(allocationSize);
 
-    if (size < 0xfffff000)
+    if (size < 0xfffff000) {
         ptrAlloc = alignedMallocWrapper(allocationSize, MemoryConstants::allocationAlignment);
-    auto gpuAddress = allocator32Bit->allocate(allocationSize);
+    }
 
     MemoryAllocation *memoryAllocation = nullptr;
     if (ptrAlloc != nullptr) {
@@ -227,4 +228,18 @@ GraphicsAllocation *OsAgnosticMemoryManager::allocateGraphicsMemoryForImage(Imag
 
     return alloc;
 }
+
+Allocator32bit *OsAgnosticMemoryManager::create32BitAllocator(bool aubUsage) {
+    uint64_t allocatorSize = MemoryConstants::gigaByte - 2 * 4096;
+    uint64_t heap32Base = 0x80000000000ul;
+
+    if (is64bit && this->localMemorySupported && aubUsage) {
+        heap32Base = 0x40000000000ul;
+    }
+
+    if (is32bit) {
+        heap32Base = 0x0;
+    }
+    return new Allocator32bit(heap32Base, allocatorSize);
+}
 } // namespace OCLRT

runtime/memory_manager/os_agnostic_memory_manager.h

@@ -38,13 +38,12 @@ class OsAgnosticMemoryManager : public MemoryManager {
     using MemoryManager::createGraphicsAllocationFromSharedHandle;
 
     OsAgnosticMemoryManager() : OsAgnosticMemoryManager(false, false){};
-    OsAgnosticMemoryManager(bool enable64kbPages, bool enableLocalMemory) : MemoryManager(enable64kbPages, enableLocalMemory) {
-        uint64_t heap32Base = 0x80000000000ul;
-        if (sizeof(uintptr_t) == 4) {
-            heap32Base = 0x0;
-        }
-        allocator32Bit = std::unique_ptr<Allocator32bit>(new Allocator32bit(heap32Base, GB - 2 * 4096));
+    OsAgnosticMemoryManager(bool enable64kbPages, bool enableLocalMemory) : OsAgnosticMemoryManager(enable64kbPages, enableLocalMemory, false){};
+
+    OsAgnosticMemoryManager(bool enable64kbPages, bool enableLocalMemory, bool aubUsage) : MemoryManager(enable64kbPages, enableLocalMemory) {
+        allocator32Bit = std::unique_ptr<Allocator32bit>(create32BitAllocator(aubUsage));
     };
+
     ~OsAgnosticMemoryManager() override;
     GraphicsAllocation *allocateGraphicsMemory(size_t size, size_t alignment, bool forcePin, bool uncacheable) override;
     GraphicsAllocation *allocateGraphicsMemory64kb(size_t size, size_t alignment, bool forcePin, bool preferRenderCompressed) override;
@@ -72,6 +71,8 @@ class OsAgnosticMemoryManager : public MemoryManager {
 
     void turnOnFakingBigAllocations();
 
+    Allocator32bit *create32BitAllocator(bool enableLocalMemory);
+
   private:
     unsigned long long counter = 0;
     bool fakeBigAllocations = false;

unit_tests/memory_manager/memory_manager_tests.cpp

@@ -8,6 +8,7 @@
 #include "runtime/event/event.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/helpers/timestamp_packet.h"
+#include "runtime/memory_manager/memory_constants.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/os_interface/os_context.h"
 #include "runtime/os_interface/os_interface.h"
@@ -1288,6 +1289,48 @@ TEST(OsAgnosticMemoryManager, givenFullGpuAddressSpaceWhenAllocateGraphicsMemory
     memoryManager.freeGraphicsMemory(allocation);
 }
 
+TEST(OsAgnosticMemoryManager, givenLocalMemoryNotSupportedWhenMemoryManagerIsCreatedThenAllocator32BitHasCorrectBaseAddress) {
+    MockMemoryManager memoryManager(false, false, false);
+    uint64_t heap32Base = 0x80000000000ul;
+
+    if (is32bit) {
+        heap32Base = 0;
+    }
+    EXPECT_EQ(heap32Base, memoryManager.allocator32Bit->getBase());
+}
+
+TEST(OsAgnosticMemoryManager, givenLocalMemorySupportedAndNotAubUsageWhenMemoryManagerIsCreatedThenAllocator32BitHasCorrectBaseAddress) {
+    MockMemoryManager memoryManager(false, true, false);
+    uint64_t heap32Base = 0x80000000000ul;
+
+    if (is32bit) {
+        heap32Base = 0;
+    }
+    EXPECT_EQ(heap32Base, memoryManager.allocator32Bit->getBase());
+}
+
+TEST(OsAgnosticMemoryManager, givenLocalMemoryNotSupportedAndAubUsageWhenMemoryManagerIsCreatedThenAllocator32BitHasCorrectBaseAddress) {
+    MockMemoryManager memoryManager(false, false, true);
+    uint64_t heap32Base = 0x80000000000ul;
+
+    if (is32bit) {
+        heap32Base = 0;
+    }
+    EXPECT_EQ(heap32Base, memoryManager.allocator32Bit->getBase());
+}
+
+TEST(OsAgnosticMemoryManager, givenLocalMemorySupportedAndAubUsageWhenMemoryManagerIsCreatedThenAllocator32BitHasCorrectBaseAddress) {
+    MockMemoryManager memoryManager(false, true, true);
+    uint64_t heap32Base = 0x80000000000ul;
+
+    if (is32bit) {
+        heap32Base = 0;
+    } else {
+        heap32Base = 0x40000000000ul;
+    }
+    EXPECT_EQ(heap32Base, memoryManager.allocator32Bit->getBase());
+}
+
 TEST_F(MemoryAllocatorTest, GivenSizeWhenGmmIsCreatedThenSuccess) {
     Gmm *gmm = new Gmm(nullptr, 65536, false);
     EXPECT_NE(nullptr, gmm);

unit_tests/mocks/mock_memory_manager.h

@@ -21,6 +21,8 @@ class MockMemoryManager : public OsAgnosticMemoryManager {
 
     MockMemoryManager() : OsAgnosticMemoryManager(false, false){};
     MockMemoryManager(bool enable64pages) : OsAgnosticMemoryManager(enable64pages, false) {}
+    MockMemoryManager(bool enable64kbPages, bool enableLocalMemory, bool aubUsage) : OsAgnosticMemoryManager(enable64kbPages, enableLocalMemory, aubUsage) {}
+
     GraphicsAllocation *allocateGraphicsMemory64kb(size_t size, size_t alignment, bool forcePin, bool preferRenderCompressed) override;
     void setDeferredDeleter(DeferredDeleter *deleter);
     void overrideAsyncDeleterFlag(bool newValue);