L0 debugger - decanonize SDI address before adding to buffer

Signed-off-by: Yates, Brandon <[email protected]>

Author: bmyates

shared/source/debugger/debugger_l0_tgllp_and_later.inl

@@ -109,13 +109,16 @@ void DebuggerL0Hw<GfxFamily>::programSbaTrackingCommandsSingleAddressSpace(NEO::
         auto miStoreSbaField = cmdStream.getSpaceForCmd<MI_STORE_DATA_IMM>();
 
         auto gpuVaOfAddress = addressOfSDI + offsetToAddress;
+
         auto gpuVaOfData = addressOfSDI + offsetToData;
-        const auto gpuVaOfDataDWORD1 = gpuVaOfData + 4;
+        const auto gmmHelper = device->getGmmHelper();
+        const auto gpuVaOfDataDWORD1 = gmmHelper->decanonize(gpuVaOfData + 4);
 
         NEO::EncodeStoreMMIO<GfxFamily>::encode(miStoreRegMemLow, CS_GPR_R1, gpuVaOfAddress, false);
         NEO::EncodeStoreMMIO<GfxFamily>::encode(miStoreRegMemHigh, CS_GPR_R1 + 4, gpuVaOfAddress + 4, false);
 
         MI_STORE_DATA_IMM setSbaBufferAddress = GfxFamily::cmdInitStoreDataImm;
+        gpuVaOfData = gmmHelper->decanonize(gpuVaOfData);
         setSbaBufferAddress.setAddress(gpuVaOfData);
         setSbaBufferAddress.setStoreQword(false);
         setSbaBufferAddress.setDataDword0(pair.second & 0xffffffff);

shared/test/unit_test/debugger/test_l0_debugger_single_address_space.cpp

@@ -188,9 +188,13 @@ HWTEST2_F(SingleAddressSpaceFixture, GivenNonZeroSbaAddressesWhenProgrammingSbaT
 
         itor = find<MI_STORE_DATA_IMM *>(itor, cmdList.end());
         ASSERT_NE(cmdList.end(), itor);
+        auto cmdSdi = genCmdCast<MI_STORE_DATA_IMM *>(*itor);
+        EXPECT_LT(cmdSdi->TheStructure.Common.Address, 0xfffffffffffcuL);
 
         itor = find<MI_STORE_DATA_IMM *>(itor, cmdList.end());
         ASSERT_NE(cmdList.end(), itor);
+        cmdSdi = genCmdCast<MI_STORE_DATA_IMM *>(*itor);
+        EXPECT_LT(cmdSdi->TheStructure.Common.Address, 0xfffffffffffcuL);
 
         itor = find<MI_ARB_CHECK *>(itor, cmdList.end());
         ASSERT_NE(cmdList.end(), itor);