Add gpuAddressSpace param to AubManager::create()

Related-To: NEO-2941

Change-Id: I5d6a35748ec4752c830a6ed329b5ca4a3d6627f8
Signed-off-by: Igor Venevtsev <igor.venevtsev@intel.com>

Author: ivvenevt

opencl/source/aub/aub_center.cpp

@@ -17,7 +17,7 @@
 #include "third_party/aub_stream/headers/aubstream.h"
 
 namespace NEO {
-extern aub_stream::AubManager *createAubManager(uint32_t productFamily, uint32_t devicesCount, uint64_t memoryBankSize, bool localMemorySupported, uint32_t streamMode);
+extern aub_stream::AubManager *createAubManager(uint32_t productFamily, uint32_t devicesCount, uint64_t memoryBankSize, bool localMemorySupported, uint32_t streamMode, uint64_t gpuAddressSpace);
 
 AubCenter::AubCenter(const HardwareInfo *pHwInfo, bool localMemoryEnabled, const std::string &aubFileName, CommandStreamReceiverType csrType) {
     if (DebugManager.flags.UseAubStream.get()) {
@@ -37,7 +37,7 @@ AubCenter::AubCenter(const HardwareInfo *pHwInfo, bool localMemoryEnabled, const
         aub_stream::setTbxServerIp(DebugManager.flags.TbxServer.get());
         aub_stream::setTbxServerPort(DebugManager.flags.TbxPort.get());
 
-        aubManager.reset(createAubManager(pHwInfo->platform.eProductFamily, devicesCount, memoryBankSize, localMemoryEnabled, aubStreamMode));
+        aubManager.reset(createAubManager(pHwInfo->platform.eProductFamily, devicesCount, memoryBankSize, localMemoryEnabled, aubStreamMode, pHwInfo->capabilityTable.gpuAddressSpace));
     }
     addressMapper = std::make_unique<AddressMapper>();
     streamProvider = std::make_unique<AubFileStreamProvider>();

opencl/source/aub/aub_stream_interface.cpp

@@ -8,7 +8,7 @@
 #include "opencl/source/aub/aub_center.h"
 using namespace aub_stream;
 namespace NEO {
-AubManager *createAubManager(uint32_t gfxFamily, uint32_t devicesCount, uint64_t memoryBankSize, bool localMemorySupported, uint32_t streamMode) {
-    return AubManager::create(gfxFamily, devicesCount, memoryBankSize, localMemorySupported, streamMode);
+AubManager *createAubManager(uint32_t gfxFamily, uint32_t devicesCount, uint64_t memoryBankSize, bool localMemorySupported, uint32_t streamMode, uint64_t gpuAddressSpace) {
+    return AubManager::create(gfxFamily, devicesCount, memoryBankSize, localMemorySupported, streamMode, gpuAddressSpace);
 }
 } // namespace NEO

opencl/source/aub_mem_dump/aub_stream_stubs.cpp

@@ -15,7 +15,7 @@ std::string tbxServerIp = "127.0.0.1";
 
 namespace aub_stream {
 
-AubManager *AubManager::create(uint32_t productFamily, uint32_t devicesCount, uint64_t memoryBankSizeInGB, bool localMemorySupported, uint32_t streamMode) {
+AubManager *AubManager::create(uint32_t productFamily, uint32_t devicesCount, uint64_t memoryBankSizeInGB, bool localMemorySupported, uint32_t streamMode, uint64_t gpuAddressSpace) {
     return nullptr;
 }
 

opencl/test/unit_test/aub/aub_center_tests.cpp

@@ -31,7 +31,7 @@ TEST(AubCenter, GivenUseAubStreamDebugVariableSetWhenAubCenterIsCreatedThenCreat
     DebugManagerStateRestore restorer;
     DebugManager.flags.UseAubStream.set(false);
 
-    MockAubManager *mockAubManager = new MockAubManager(platformDevices[0]->platform.eProductFamily, 4, 8 * MB, true, aub_stream::mode::aubFile);
+    MockAubManager *mockAubManager = new MockAubManager(platformDevices[0]->platform.eProductFamily, 4, 8 * MB, true, aub_stream::mode::aubFile, platformDevices[0]->capabilityTable.gpuAddressSpace);
     MockAubCenter mockAubCenter(platformDevices[0], false, "", CommandStreamReceiverType::CSR_AUB);
     mockAubCenter.aubManager = std::unique_ptr<MockAubManager>(mockAubManager);
 

opencl/test/unit_test/aub_stream_mocks/aub_stream_interface_mock.cpp

@@ -8,7 +8,7 @@
 #include "opencl/test/unit_test/mocks/mock_aub_manager.h"
 
 namespace NEO {
-aub_stream::AubManager *createAubManager(uint32_t productFamily, uint32_t devicesCount, uint64_t memoryBankSize, bool localMemorySupported, uint32_t streamMode) {
-    return new MockAubManager(productFamily, devicesCount, memoryBankSize, localMemorySupported, streamMode);
+aub_stream::AubManager *createAubManager(uint32_t productFamily, uint32_t devicesCount, uint64_t memoryBankSize, bool localMemorySupported, uint32_t streamMode, uint64_t gpuAddressSpace) {
+    return new MockAubManager(productFamily, devicesCount, memoryBankSize, localMemorySupported, streamMode, gpuAddressSpace);
 }
 } // namespace NEO

opencl/test/unit_test/mocks/mock_aub_manager.h

@@ -55,12 +55,13 @@ class MockAubManager : public aub_stream::AubManager {
 
   public:
     MockAubManager(){};
-    MockAubManager(uint32_t productFamily, uint32_t devicesCount, uint64_t memoryBankSize, bool localMemorySupported, uint32_t streamMode) {
+    MockAubManager(uint32_t productFamily, uint32_t devicesCount, uint64_t memoryBankSize, bool localMemorySupported, uint32_t streamMode, uint64_t gpuAddressSpace) {
         mockAubManagerParams.productFamily = productFamily;
         mockAubManagerParams.devicesCount = devicesCount;
         mockAubManagerParams.memoryBankSize = memoryBankSize;
         mockAubManagerParams.localMemorySupported = localMemorySupported;
         mockAubManagerParams.streamMode = streamMode;
+        mockAubManagerParams.gpuAddressSpace = gpuAddressSpace;
     }
     ~MockAubManager() override {}
 
@@ -136,6 +137,7 @@ class MockAubManager : public aub_stream::AubManager {
         uint64_t memoryBankSize = 0;
         bool localMemorySupported = false;
         uint32_t streamMode = 0xFFFFFFFF;
+        uint64_t gpuAddressSpace = 0xFFFFFFFFFFFF;
     } mockAubManagerParams;
 
   protected:

third_party/aub_stream/headers/aub_manager.h

@@ -35,7 +35,8 @@ class AubManager {
     virtual void writePhysicalMemoryPages(const void *memory, std::vector<PageInfo> &pages, size_t size, int hint) = 0;
     virtual void freeMemory(uint64_t gfxAddress, size_t size) = 0;
 
-    static AubManager *create(uint32_t productFamily, uint32_t devicesCount, uint64_t memoryBankSize, bool localMemorySupported, uint32_t streamMode);
+    static AubManager *create(uint32_t productFamily, uint32_t devicesCount, uint64_t memoryBankSize,
+                              bool localMemorySupported, uint32_t streamMode, uint64_t gpuAddressSpace);
 };
 
 } // namespace aub_stream