Use root device index when accessing graphics allocation from buffer

Related-To: NEO-4672
Change-Id: I31ed0aa567276b606f4b09733ca2a8d678f9786f
Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp

@@ -909,11 +909,11 @@ HWTEST2_F(AUBBindlessKernel, givenBindlessCopyKernelWhenEnqueuedThenResultsValid
 
     auto simulatedCsr = AUBFixture::getSimulatedCsr<FamilyType>();
 
-    memcpy(pBufferSrc->getGraphicsAllocation()->getUnderlyingBuffer(), bufferDataSrc, bufferSize);
-    memcpy(pBufferDst->getGraphicsAllocation()->getUnderlyingBuffer(), bufferDataDst, bufferSize);
+    memcpy(pBufferSrc->getGraphicsAllocation(device->getRootDeviceIndex())->getUnderlyingBuffer(), bufferDataSrc, bufferSize);
+    memcpy(pBufferDst->getGraphicsAllocation(device->getRootDeviceIndex())->getUnderlyingBuffer(), bufferDataDst, bufferSize);
 
-    simulatedCsr->writeMemory(*pBufferSrc->getGraphicsAllocation());
-    simulatedCsr->writeMemory(*pBufferDst->getGraphicsAllocation());
+    simulatedCsr->writeMemory(*pBufferSrc->getGraphicsAllocation(device->getRootDeviceIndex()));
+    simulatedCsr->writeMemory(*pBufferDst->getGraphicsAllocation(device->getRootDeviceIndex()));
 
     //Src
     kernel->setArg(0, pBufferSrc.get());
@@ -948,7 +948,7 @@ HWTEST2_F(AUBBindlessKernel, givenBindlessCopyKernelWhenEnqueuedThenResultsValid
     EXPECT_TRUE(this->kernel->getKernelInfo().kernelArgInfo[0].pureStatefulBufferAccess);
 
     this->pCmdQ->finish();
-    expectMemory<FamilyType>(reinterpret_cast<void *>(pBufferDst->getGraphicsAllocation()->getGpuAddress()),
+    expectMemory<FamilyType>(reinterpret_cast<void *>(pBufferDst->getGraphicsAllocation(device->getRootDeviceIndex())->getGpuAddress()),
                              bufferDataSrc, bufferSize);
 }
 
@@ -1012,13 +1012,13 @@ HWTEST2_F(AUBBindlessKernel, DISABLED_givenBindlessCopyImageKernelWhenEnqueuedTh
                                                             retVal));
     ASSERT_NE(nullptr, bufferSrc);
 
-    memcpy(image->getGraphicsAllocation()->getUnderlyingBuffer(), imageDataDst, imageSize);
-    memcpy(bufferSrc->getGraphicsAllocation()->getUnderlyingBuffer(), imageDataSrc, imageSize);
+    memcpy(image->getGraphicsAllocation(device->getRootDeviceIndex())->getUnderlyingBuffer(), imageDataDst, imageSize);
+    memcpy(bufferSrc->getGraphicsAllocation(device->getRootDeviceIndex())->getUnderlyingBuffer(), imageDataSrc, imageSize);
 
     auto simulatedCsr = AUBFixture::getSimulatedCsr<FamilyType>();
 
-    simulatedCsr->writeMemory(*bufferSrc->getGraphicsAllocation());
-    simulatedCsr->writeMemory(*image->getGraphicsAllocation());
+    simulatedCsr->writeMemory(*bufferSrc->getGraphicsAllocation(device->getRootDeviceIndex()));
+    simulatedCsr->writeMemory(*image->getGraphicsAllocation(device->getRootDeviceIndex()));
 
     kernel->setArg(0, bufferSrc.get());
     kernel->setArg(1, image.get());
@@ -1045,6 +1045,6 @@ HWTEST2_F(AUBBindlessKernel, DISABLED_givenBindlessCopyImageKernelWhenEnqueuedTh
     retVal = this->pCmdQ->finish();
     EXPECT_EQ(CL_SUCCESS, retVal);
 
-    expectMemory<FamilyType>(reinterpret_cast<void *>(image->getGraphicsAllocation()->getGpuAddress()),
+    expectMemory<FamilyType>(reinterpret_cast<void *>(image->getGraphicsAllocation(device->getRootDeviceIndex())->getGpuAddress()),
                              imageDataSrc, imageSize);
 }

opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp

@@ -116,22 +116,22 @@ HWTEST_F(AUBReadBuffer, reserveCanonicalGpuAddress) {
 
     cl_float srcMemory[] = {1.0f, 2.0f, 3.0f, 4.0f};
     cl_float dstMemory[] = {0.0f, 0.0f, 0.0f, 0.0f};
-    GraphicsAllocation *srcAlocation = new MockGraphicsAllocation(0, GraphicsAllocation::AllocationType::UNKNOWN,
-                                                                  srcMemory,
-                                                                  0xFFFF800400001000,
-                                                                  0xFFFF800400001000,
-                                                                  sizeof(srcMemory),
-                                                                  MemoryPool::MemoryNull);
+    GraphicsAllocation *srcAllocation = new MockGraphicsAllocation(0, GraphicsAllocation::AllocationType::UNKNOWN,
+                                                                   srcMemory,
+                                                                   0xFFFF800400001000,
+                                                                   0xFFFF800400001000,
+                                                                   sizeof(srcMemory),
+                                                                   MemoryPool::MemoryNull);
 
     std::unique_ptr<Buffer> srcBuffer(Buffer::createBufferHw(
         &context,
         MemoryPropertiesHelper::createMemoryProperties(CL_MEM_USE_HOST_PTR, 0, 0, &context.getDevice(0)->getDevice()),
         CL_MEM_USE_HOST_PTR,
         0,
         sizeof(srcMemory),
-        srcAlocation->getUnderlyingBuffer(),
+        srcAllocation->getUnderlyingBuffer(),
         srcMemory,
-        srcAlocation,
+        srcAllocation,
         false,
         false,
         false));

opencl/test/unit_test/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp

@@ -32,6 +32,7 @@ TEST_F(EnqueueKernelTest, givenKernelWithSharedObjArgsWhenEnqueueIsCalledThenRes
     pContext->setSharingFunctions(glSharing.sharingFunctions.release());
     auto retVal = CL_SUCCESS;
     auto sharedBuffer = GlBuffer::createSharedGlBuffer(pContext, CL_MEM_READ_WRITE, 1, &retVal);
+    auto graphicsAllocation = sharedBuffer->getGraphicsAllocation(pContext->getDevice(0)->getRootDeviceIndex());
     auto sharedMem = static_cast<cl_mem>(sharedBuffer);
     auto nonSharedMem = static_cast<cl_mem>(nonSharedBuffer);
 
@@ -45,8 +46,8 @@ TEST_F(EnqueueKernelTest, givenKernelWithSharedObjArgsWhenEnqueueIsCalledThenRes
 
     auto address1 = static_cast<uint64_t>(*pKernelArg);
     auto sharedBufferGpuAddress =
-        pKernel->isBuiltIn ? sharedBuffer->getGraphicsAllocation()->getGpuAddress()
-                           : sharedBuffer->getGraphicsAllocation()->getGpuAddressToPatch();
+        pKernel->isBuiltIn ? graphicsAllocation->getGpuAddress()
+                           : graphicsAllocation->getGpuAddressToPatch();
     EXPECT_EQ(sharedBufferGpuAddress, address1);
 
     // update address
@@ -58,8 +59,8 @@ TEST_F(EnqueueKernelTest, givenKernelWithSharedObjArgsWhenEnqueueIsCalledThenRes
     auto address2 = static_cast<uint64_t>(*pKernelArg);
     EXPECT_NE(address1, address2);
     sharedBufferGpuAddress =
-        pKernel->isBuiltIn ? sharedBuffer->getGraphicsAllocation()->getGpuAddress()
-                           : sharedBuffer->getGraphicsAllocation()->getGpuAddressToPatch();
+        pKernel->isBuiltIn ? graphicsAllocation->getGpuAddress()
+                           : graphicsAllocation->getGpuAddressToPatch();
     EXPECT_EQ(sharedBufferGpuAddress, address2);
 
     delete sharedBuffer;

opencl/test/unit_test/command_queue/read_write_buffer_cpu_copy.cpp

@@ -22,8 +22,8 @@ HWTEST_F(ReadWriteBufferCpuCopyTest, givenRenderCompressedGmmWhenAskingForCpuOpe
     std::unique_ptr<Buffer> buffer(Buffer::create(context, CL_MEM_READ_WRITE, 1, nullptr, retVal));
     auto gmm = new Gmm(pDevice->getGmmClientContext(), nullptr, 1, false);
     gmm->isRenderCompressed = false;
-    buffer->getGraphicsAllocation()->setDefaultGmm(gmm);
-    auto allocation = buffer->getGraphicsAllocation();
+    auto allocation = buffer->getGraphicsAllocation(context->getDevice(0)->getRootDeviceIndex());
+    allocation->setDefaultGmm(gmm);
 
     auto alignedPtr = alignedMalloc(2, MemoryConstants::cacheLineSize);
     auto unalignedPtr = ptrOffset(alignedPtr, 1);
@@ -255,7 +255,7 @@ TEST(ReadWriteBufferOnCpu, givenNoHostPtrAndAlignedSizeWhenMemoryAllocationIsInN
 
     EXPECT_TRUE(buffer->isReadWriteOnCpuAllowed());
     EXPECT_TRUE(buffer->isReadWriteOnCpuPreffered(reinterpret_cast<void *>(0x1000), MemoryConstants::pageSize));
-    reinterpret_cast<MemoryAllocation *>(buffer->getGraphicsAllocation())->overrideMemoryPool(MemoryPool::SystemCpuInaccessible);
+    reinterpret_cast<MemoryAllocation *>(buffer->getGraphicsAllocation(device->getRootDeviceIndex()))->overrideMemoryPool(MemoryPool::SystemCpuInaccessible);
     //read write on CPU is allowed, but not preffered. We can access this memory via Lock.
     EXPECT_TRUE(buffer->isReadWriteOnCpuAllowed());
     EXPECT_FALSE(buffer->isReadWriteOnCpuPreffered(reinterpret_cast<void *>(0x1000), MemoryConstants::pageSize));
@@ -309,7 +309,7 @@ TEST(ReadWriteBufferOnCpu, whenLocalMemoryPoolAllocationIsAskedForPreferenceThen
     cl_int retVal = 0;
     std::unique_ptr<Buffer> buffer(Buffer::create(&ctx, CL_MEM_READ_WRITE, MemoryConstants::pageSize, nullptr, retVal));
     ASSERT_NE(nullptr, buffer.get());
-    reinterpret_cast<MemoryAllocation *>(buffer->getGraphicsAllocation())->overrideMemoryPool(MemoryPool::LocalMemory);
+    reinterpret_cast<MemoryAllocation *>(buffer->getGraphicsAllocation(device->getRootDeviceIndex()))->overrideMemoryPool(MemoryPool::LocalMemory);
 
     EXPECT_TRUE(buffer->isReadWriteOnCpuAllowed());
     EXPECT_FALSE(buffer->isReadWriteOnCpuPreffered(reinterpret_cast<void *>(0x1000), MemoryConstants::pageSize));

opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp

@@ -448,7 +448,7 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, handleTagAndScratchAllocationsResi
     EXPECT_TRUE(commandStreamReceiver->isMadeNonResident(scratchAllocation));
 }
 
-HWTEST_F(CommandStreamReceiverFlushTaskTests, givenCommandStreamReceiverWhenFenceAllocationIsRequiredAndFlushTaskIsCalledThenFenceAlocationIsMadeResident) {
+HWTEST_F(CommandStreamReceiverFlushTaskTests, givenCommandStreamReceiverWhenFenceAllocationIsRequiredAndFlushTaskIsCalledThenFenceAllocationIsMadeResident) {
     RAIIHwHelperFactory<MockHwHelperWithFenceAllocation<FamilyType>> hwHelperBackup{pDevice->getHardwareInfo().platform.eRenderCoreFamily};
 
     auto commandStreamReceiver = new MockCsrHw<FamilyType>(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex());