AUB CSR to use a common AUB and TBX gpu domain handler

Related-To: NEO-5667

Signed-off-by: Milczarek, Slawomir <[email protected]>

Author: smilczar

shared/source/page_fault_manager/cpu_page_fault_manager.cpp

@@ -95,7 +95,7 @@ void PageFaultManager::handleGpuDomainTransferForHw(PageFaultManager *pageFaultH
     pageFaultHandler->allowCPUMemoryAccess(allocPtr, pageFaultData.size);
 }
 
-void PageFaultManager::handleGpuDomainTransferForTbx(PageFaultManager *pageFaultHandler, void *allocPtr, PageFaultData &pageFaultData) {
+void PageFaultManager::handleGpuDomainTransferForAubAndTbx(PageFaultManager *pageFaultHandler, void *allocPtr, PageFaultData &pageFaultData) {
     pageFaultHandler->allowCPUMemoryAccess(allocPtr, pageFaultData.size);
 
     if (pageFaultData.domain == AllocationDomain::Gpu) {
@@ -105,9 +105,10 @@ void PageFaultManager::handleGpuDomainTransferForTbx(PageFaultManager *pageFault
 }
 
 void PageFaultManager::selectGpuDomainHandler() {
-    if (DebugManager.flags.SetCommandStreamReceiver.get() == CommandStreamReceiverType::CSR_TBX ||
+    if (DebugManager.flags.SetCommandStreamReceiver.get() == CommandStreamReceiverType::CSR_AUB ||
+        DebugManager.flags.SetCommandStreamReceiver.get() == CommandStreamReceiverType::CSR_TBX ||
         DebugManager.flags.SetCommandStreamReceiver.get() == CommandStreamReceiverType::CSR_TBX_WITH_AUB) {
-        this->gpuDomainHandler = &PageFaultManager::handleGpuDomainTransferForTbx;
+        this->gpuDomainHandler = &PageFaultManager::handleGpuDomainTransferForAubAndTbx;
     }
 }
 

shared/source/page_fault_manager/cpu_page_fault_manager.h

@@ -56,7 +56,7 @@ class PageFaultManager : public NonCopyableOrMovableClass {
     MOCKABLE_VIRTUAL void setAubWritable(bool writable, void *ptr, SVMAllocsManager *unifiedMemoryManager);
 
     static void handleGpuDomainTransferForHw(PageFaultManager *pageFaultHandler, void *alloc, PageFaultData &pageFaultData);
-    static void handleGpuDomainTransferForTbx(PageFaultManager *pageFaultHandler, void *alloc, PageFaultData &pageFaultData);
+    static void handleGpuDomainTransferForAubAndTbx(PageFaultManager *pageFaultHandler, void *alloc, PageFaultData &pageFaultData);
     void selectGpuDomainHandler();
 
     decltype(&handleGpuDomainTransferForHw) gpuDomainHandler = &handleGpuDomainTransferForHw;

shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests.cpp

@@ -275,7 +275,7 @@ TEST_F(PageFaultManagerTest, givenInitialPlacementGpuWhenVerifyingPagefaultThenF
 TEST_F(PageFaultManagerTest, givenTbxWhenVerifyingPagefaultThenVerifyPagefaultUnprotectsAndTransfersMemory) {
     void *alloc = reinterpret_cast<void *>(0x1);
 
-    pageFaultManager->gpuDomainHandler = &MockPageFaultManager::handleGpuDomainTransferForTbx;
+    pageFaultManager->gpuDomainHandler = &MockPageFaultManager::handleGpuDomainTransferForAubAndTbx;
 
     MemoryProperties memoryProperties{};
     memoryProperties.allocFlags.usmInitialPlacementGpu = 1;
@@ -300,7 +300,7 @@ TEST_F(PageFaultManagerTest, givenTbxWhenVerifyingPagefaultThenVerifyPagefaultUn
 TEST_F(PageFaultManagerTest, givenTbxAndInitialPlacementGpuWhenVerifyingPagefaultThenMemoryIsUnprotectedOnly) {
     void *alloc = reinterpret_cast<void *>(0x1);
 
-    pageFaultManager->gpuDomainHandler = &MockPageFaultManager::handleGpuDomainTransferForTbx;
+    pageFaultManager->gpuDomainHandler = &MockPageFaultManager::handleGpuDomainTransferForAubAndTbx;
 
     MemoryProperties memoryProperties{};
     memoryProperties.allocFlags.usmInitialPlacementGpu = 1;
@@ -419,41 +419,35 @@ TEST_F(PageFaultManagerTest, givenUnifiedMemoryAllocWhenSetAubWritableIsCalledTh
     unifiedMemoryManager->freeSVMAlloc(alloc1);
 }
 
-TEST(PageFaultManager, givenTbxCsrWhenSelectingHandlerThenTbxGpuDomainHandlerIsSet) {
+TEST(PageFaultManager, givenAubOrTbxCsrWhenSelectingHandlerThenAubAndTbxGpuDomainHandlerIsSet) {
     DebugManagerStateRestore restorer;
 
     auto pageFaultManager = std::make_unique<MockPageFaultManager>();
-    DebugManager.flags.SetCommandStreamReceiver.set(2);
 
-    pageFaultManager = std::make_unique<MockPageFaultManager>();
-    pageFaultManager->selectGpuDomainHandler();
+    for (auto csrType : {CommandStreamReceiverType::CSR_AUB, CommandStreamReceiverType::CSR_TBX, CommandStreamReceiverType::CSR_TBX_WITH_AUB}) {
+        DebugManager.flags.SetCommandStreamReceiver.set(csrType);
 
-    EXPECT_EQ(pageFaultManager->getTbxHandlerAddress(), reinterpret_cast<void *>(pageFaultManager->gpuDomainHandler));
+        pageFaultManager = std::make_unique<MockPageFaultManager>();
+        pageFaultManager->selectGpuDomainHandler();
 
-    DebugManager.flags.SetCommandStreamReceiver.set(4);
-
-    pageFaultManager->selectGpuDomainHandler();
-
-    EXPECT_EQ(pageFaultManager->getTbxHandlerAddress(), reinterpret_cast<void *>(pageFaultManager->gpuDomainHandler));
+        EXPECT_EQ(pageFaultManager->getAubAndTbxHandlerAddress(), reinterpret_cast<void *>(pageFaultManager->gpuDomainHandler));
+    }
 }
 
-TEST(PageFaultManager, givenNonTbxCsrWhenSelectingHandlerThenHwGpuDomainHandlerIsSet) {
+TEST(PageFaultManager, givenHwCsrWhenSelectingHandlerThenHwGpuDomainHandlerIsSet) {
     DebugManagerStateRestore restorer;
-    DebugManager.flags.SetCommandStreamReceiver.set(0);
 
     auto pageFaultManager = std::make_unique<MockPageFaultManager>();
     auto defaultHandler = pageFaultManager->gpuDomainHandler;
 
     EXPECT_EQ(pageFaultManager->getHwHandlerAddress(), reinterpret_cast<void *>(pageFaultManager->gpuDomainHandler));
 
-    pageFaultManager->selectGpuDomainHandler();
-
-    EXPECT_EQ(defaultHandler, pageFaultManager->gpuDomainHandler);
+    for (auto csrType : {CommandStreamReceiverType::CSR_HW, CommandStreamReceiverType::CSR_HW_WITH_AUB}) {
+        DebugManager.flags.SetCommandStreamReceiver.set(csrType);
 
-    DebugManager.flags.SetCommandStreamReceiver.set(3);
+        pageFaultManager = std::make_unique<MockPageFaultManager>();
+        pageFaultManager->selectGpuDomainHandler();
 
-    pageFaultManager = std::make_unique<MockPageFaultManager>();
-    pageFaultManager->selectGpuDomainHandler();
-
-    EXPECT_EQ(defaultHandler, pageFaultManager->gpuDomainHandler);
-}
+        EXPECT_EQ(defaultHandler, reinterpret_cast<void *>(pageFaultManager->gpuDomainHandler));
+    }
+}

shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h

@@ -14,8 +14,8 @@ using namespace NEO;
 class MockPageFaultManager : public PageFaultManager {
   public:
     using PageFaultManager::gpuDomainHandler;
+    using PageFaultManager::handleGpuDomainTransferForAubAndTbx;
     using PageFaultManager::handleGpuDomainTransferForHw;
-    using PageFaultManager::handleGpuDomainTransferForTbx;
     using PageFaultManager::memoryData;
     using PageFaultManager::PageFaultData;
     using PageFaultManager::PageFaultManager;
@@ -59,8 +59,8 @@ class MockPageFaultManager : public PageFaultManager {
         return reinterpret_cast<void *>(PageFaultManager::handleGpuDomainTransferForHw);
     }
 
-    void *getTbxHandlerAddress() {
-        return reinterpret_cast<void *>(PageFaultManager::handleGpuDomainTransferForTbx);
+    void *getAubAndTbxHandlerAddress() {
+        return reinterpret_cast<void *>(PageFaultManager::handleGpuDomainTransferForAubAndTbx);
     }
 
     int allowMemoryAccessCalled = 0;