Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove magic number from set/getBatchBufferStartAddressGraphicsaddress methods

Browse Source 
rename methods to set/getBatchBufferStartAddress

Related-To: NEO-6466
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2021-12-16 18:02:45 +00:00
committed by Compute-Runtime-Automation
parent ae31fec9a7
commit 66bf806018
32 changed files with 38 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opencl/source/command_queue/gpgpu_walker_enabled_device_enqueue.inl
View File

@ -108,7 +108,7 @@ void GpgpuWalkerHelper<GfxFamily>::dispatchScheduler(
MI_BATCH_BUFFER_START cmdBbStart = GfxFamily::cmdInitBatchBufferStart;
cmdBbStart.setSecondLevelBatchBuffer(MI_BATCH_BUFFER_START::SECOND_LEVEL_BATCH_BUFFER_FIRST_LEVEL_BATCH);
uint64_t slbAddress = devQueueHw.getSlbBuffer()->getGpuAddress();
cmdBbStart.setBatchBufferStartAddressGraphicsaddress472(slbAddress);
cmdBbStart.setBatchBufferStartAddress(slbAddress);
*bbStart = cmdBbStart;
}
}

2
opencl/source/device_queue/device_queue_hw_skl_and_later.inl
View File

@ -113,7 +113,7 @@ void DeviceQueueHw<GfxFamily>::buildSlbDummyCommands() {
auto bbStartSpace = slbCS.getSpaceForCmd<MI_BATCH_BUFFER_START>();
auto bbStart = GfxFamily::cmdInitBatchBufferStart;
auto slbPtr = reinterpret_cast<uintptr_t>(slbBuffer->getUnderlyingBuffer());
bbStart.setBatchBufferStartAddressGraphicsaddress472(slbPtr);
bbStart.setBatchBufferStartAddress(slbPtr);
*bbStartSpace = bbStart;
igilCmdQueue->m_controls.m_CleanupSectionSize = 0;

2
opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.h
View File

@ -96,7 +96,7 @@ void setupAUBWithBatchBuffer(const NEO::Device *pDevice, aub_stream::EngineType
auto cur = (uint32_t *)pRing;
auto bbs = FamilyType::cmdInitBatchBufferStart;
bbs.setBatchBufferStartAddressGraphicsaddress472(gpuBatchBuffer);
bbs.setBatchBufferStartAddress(gpuBatchBuffer);
bbs.setAddressSpaceIndicator(MI_BATCH_BUFFER_START::ADDRESS_SPACE_INDICATOR_PPGTT);
*(MI_BATCH_BUFFER_START *)cur = bbs;
cur = ptrOffset(cur, sizeof(MI_BATCH_BUFFER_START));

2
opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.h
View File

@ -102,7 +102,7 @@ void setupAUBWithBatchBuffer(const NEO::Device *pDevice, aub_stream::EngineType
auto cur = (uint32_t *)pRing;
auto bbs = FamilyType::cmdInitBatchBufferStart;
bbs.setBatchBufferStartAddressGraphicsaddress472(gpuBatchBuffer);
bbs.setBatchBufferStartAddress(gpuBatchBuffer);
bbs.setAddressSpaceIndicator(MI_BATCH_BUFFER_START::ADDRESS_SPACE_INDICATOR_PPGTT);
*(MI_BATCH_BUFFER_START *)cur = bbs;
cur = ptrOffset(cur, sizeof(MI_BATCH_BUFFER_START));

2
opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h
View File

@ -98,7 +98,7 @@ void setupAUBWithBatchBuffer(const NEO::Device *pDevice, aub_stream::EngineType
auto cur = (uint32_t *)pRing;
auto bbs = FamilyType::cmdInitBatchBufferStart;
bbs.setBatchBufferStartAddressGraphicsaddress472(gpuBatchBuffer);
bbs.setBatchBufferStartAddress(gpuBatchBuffer);
bbs.setAddressSpaceIndicator(MI_BATCH_BUFFER_START::ADDRESS_SPACE_INDICATOR_PPGTT);
*(MI_BATCH_BUFFER_START *)cur = bbs;
cur = ptrOffset(cur, sizeof(MI_BATCH_BUFFER_START));

2
opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp
View File

@ -1090,7 +1090,7 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, GivenBothCsWhenFlushingTaskThenCha
// Expect to see address based on startOffset of task
auto expectedAddress = static_cast<uint64_t>(reinterpret_cast<uintptr_t>(ptrOffset(commandStream.getCpuBase(), startOffset)));
EXPECT_EQ(expectedAddress, bbs->getBatchBufferStartAddressGraphicsaddress472());
EXPECT_EQ(expectedAddress, bbs->getBatchBufferStartAddress());
// MI_BATCH_BUFFER_START from UMD must be PPGTT for security reasons
EXPECT_EQ(MI_BATCH_BUFFER_START::ADDRESS_SPACE_INDICATOR_PPGTT, bbs->getAddressSpaceIndicator());

6
opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp
View File

@ -143,7 +143,7 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, givenCsrInBatchingModeAndTwoRecord
auto batchBufferStart = genCmdCast<MI_BATCH_BUFFER_START *>(bbEndLocation);
ASSERT_NE(nullptr, batchBufferStart);
EXPECT_EQ(secondBatchBufferAddress, batchBufferStart->getBatchBufferStartAddressGraphicsaddress472());
EXPECT_EQ(secondBatchBufferAddress, batchBufferStart->getBatchBufferStartAddress());
EXPECT_EQ(mockCsr->recordedCommandBuffer->batchBuffer.endCmdPtr, lastbbEndPtr);
}
@ -208,7 +208,7 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, givenCsrInBatchingModeAndThreeReco
auto batchBufferStart = genCmdCast<MI_BATCH_BUFFER_START *>(bbEndLocation);
ASSERT_NE(nullptr, batchBufferStart);
EXPECT_EQ(lastBatchBufferAddress, batchBufferStart->getBatchBufferStartAddressGraphicsaddress472());
EXPECT_EQ(lastBatchBufferAddress, batchBufferStart->getBatchBufferStartAddress());
EXPECT_EQ(1, mockCsr->flushCalledCount);
EXPECT_EQ(mockCsr->recordedCommandBuffer->batchBuffer.endCmdPtr, lastbbEndPtr);
}
@ -1675,7 +1675,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, CommandStreamReceiverFlushTaskTests, givenEpilogueRe
EXPECT_NE(itBatchBufferStart, cmdList.end());
auto batchBufferStart = genCmdCast<typename FamilyType::MI_BATCH_BUFFER_START *>(*itBatchBufferStart);
EXPECT_EQ(batchBufferStart->getBatchBufferStartAddressGraphicsaddress472(), commandStreamReceiverStream.getGraphicsAllocation()->getGpuAddress());
EXPECT_EQ(batchBufferStart->getBatchBufferStartAddress(), commandStreamReceiverStream.getGraphicsAllocation()->getGpuAddress());
parseCommands<FamilyType>(commandStreamReceiverStream, 0);

2
opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp
View File

@ -124,7 +124,7 @@ HWTEST2_F(CommandStreamReceiverFlushTaskGmockTests,
auto batchBufferStart = genCmdCast<MI_BATCH_BUFFER_START *>(bbEndLocation);
ASSERT_NE(nullptr, batchBufferStart);
EXPECT_EQ(lastBatchBufferAddress, batchBufferStart->getBatchBufferStartAddressGraphicsaddress472());
EXPECT_EQ(lastBatchBufferAddress, batchBufferStart->getBatchBufferStartAddress());
EXPECT_EQ(1, mockCsr->flushCalledCount);
EXPECT_EQ(expectedCallsCount, mockHelper->setPatchInfoDataCalled);
EXPECT_EQ(static_cast<unsigned int>(removePatchInfoDataCount), mockHelper->removePatchInfoDataCalled);

2
opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp
View File

@ -804,7 +804,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, gi
EXPECT_NE(itBatchBufferStart, cmdList.end());
auto batchBufferStart = genCmdCast<typename FamilyType::MI_BATCH_BUFFER_START *>(*itBatchBufferStart);
EXPECT_EQ(batchBufferStart->getBatchBufferStartAddressGraphicsaddress472(), commandStreamReceiverStream.getGraphicsAllocation()->getGpuAddress());
EXPECT_EQ(batchBufferStart->getBatchBufferStartAddress(), commandStreamReceiverStream.getGraphicsAllocation()->getGpuAddress());
parseCommands<FamilyType>(commandStreamReceiverStream, 0);

2
opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp
View File

@ -1403,7 +1403,7 @@ HWTEST_F(BcsTests, givenBlitterDirectSubmissionEnabledWhenProgrammingBlitterThen
MI_BATCH_BUFFER_START *bbStart = hwParser.getCommand<MI_BATCH_BUFFER_START>();
ASSERT_NE(nullptr, bbStart);
EXPECT_EQ(csr.latestFlushedBatchBuffer.endCmdPtr, bbStart);
EXPECT_EQ(0ull, bbStart->getBatchBufferStartAddressGraphicsaddress472());
EXPECT_EQ(0ull, bbStart->getBatchBufferStartAddress());
}
HWTEST_F(BcsTests, givenBlitterDirectSubmissionEnabledWhenFlushTagUpdateThenBatchBufferStartIsProgrammed) {

8
opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp
View File

@ -81,7 +81,7 @@ HWTEST_F(MockExperimentalCommandBufferTest, givenEnabledExperimentalCmdBufferWhe
ASSERT_NE(bbList.end(), it);
bbStart = reinterpret_cast<MI_BATCH_BUFFER_START *>(*it);
ASSERT_NE(nullptr, bbStart);
EXPECT_EQ(exCmdBufferGpuAddr, bbStart->getBatchBufferStartAddressGraphicsaddress472());
EXPECT_EQ(exCmdBufferGpuAddr, bbStart->getBatchBufferStartAddress());
EXPECT_EQ(MI_BATCH_BUFFER_START::SECOND_LEVEL_BATCH_BUFFER_SECOND_LEVEL_BATCH, bbStart->getSecondLevelBatchBuffer());
MI_BATCH_BUFFER_END *bbEnd = nullptr;
@ -220,7 +220,7 @@ HWTEST_F(MockExperimentalCommandBufferTest, givenEnabledExperimentalCmdBufferWhe
ASSERT_NE(bbList.end(), it);
bbStart = reinterpret_cast<MI_BATCH_BUFFER_START *>(*it);
ASSERT_NE(nullptr, bbStart);
EXPECT_EQ(exCmdBufferGpuAddr, bbStart->getBatchBufferStartAddressGraphicsaddress472());
EXPECT_EQ(exCmdBufferGpuAddr, bbStart->getBatchBufferStartAddress());
EXPECT_EQ(MI_BATCH_BUFFER_START::SECOND_LEVEL_BATCH_BUFFER_SECOND_LEVEL_BATCH, bbStart->getSecondLevelBatchBuffer());
PIPE_CONTROL *pipeControl = nullptr;
@ -317,7 +317,7 @@ HWTEST_F(MockExperimentalCommandBufferTest, givenEnabledExperimentalCmdBufferWhe
ASSERT_NE(bbList.end(), it);
bbStart = reinterpret_cast<MI_BATCH_BUFFER_START *>(*it);
ASSERT_NE(nullptr, bbStart);
EXPECT_EQ(oldExCmdBufferGpuAddr, bbStart->getBatchBufferStartAddressGraphicsaddress472());
EXPECT_EQ(oldExCmdBufferGpuAddr, bbStart->getBatchBufferStartAddress());
EXPECT_EQ(MI_BATCH_BUFFER_START::SECOND_LEVEL_BATCH_BUFFER_SECOND_LEVEL_BATCH, bbStart->getSecondLevelBatchBuffer());
flushTask(commandStreamReceiver);
@ -339,7 +339,7 @@ HWTEST_F(MockExperimentalCommandBufferTest, givenEnabledExperimentalCmdBufferWhe
ASSERT_NE(bbList.end(), it);
bbStart = reinterpret_cast<MI_BATCH_BUFFER_START *>(*it);
ASSERT_NE(nullptr, bbStart);
EXPECT_EQ(newExCmdBufferGpuAddr, bbStart->getBatchBufferStartAddressGraphicsaddress472());
EXPECT_EQ(newExCmdBufferGpuAddr, bbStart->getBatchBufferStartAddress());
EXPECT_EQ(MI_BATCH_BUFFER_START::SECOND_LEVEL_BATCH_BUFFER_SECOND_LEVEL_BATCH, bbStart->getSecondLevelBatchBuffer());
}

2
opencl/test/unit_test/execution_model/scheduler_dispatch_tests.cpp
View File

@ -155,7 +155,7 @@ HWTEST2_F(ExecutionModelSchedulerFixture, WhenDispatchingSchedulerThenProgrammin
auto *bbStart = (MI_BATCH_BUFFER_START *)*hwParser.itorBBStartAfterWalker;
uint64_t slbAddress = pDevQueueHw->getSlbBuffer()->getGpuAddress();
EXPECT_EQ(slbAddress, bbStart->getBatchBufferStartAddressGraphicsaddress472());
EXPECT_EQ(slbAddress, bbStart->getBatchBufferStartAddress());
}
HWTEST2_F(ExecutionModelSchedulerFixture, WhenDispatchingSchedulerThenStandardCmdqIohIsNotUsed, DeviceEnqueueSupport) {

2
opencl/test/unit_test/mocks/mock_device_queue.h
View File

@ -168,7 +168,7 @@ class MockDeviceQueueHw : public DeviceQueueHw<GfxFamily> {
memset(expectedCmds.prefetch, 0x0, DeviceQueueHw<GfxFamily>::getCSPrefetchSize());
expectedCmds.bbStart = GfxFamily::cmdInitBatchBufferStart;
auto slbPtr = reinterpret_cast<uintptr_t>(this->getSlbBuffer()->getUnderlyingBuffer());
expectedCmds.bbStart.setBatchBufferStartAddressGraphicsaddress472(slbPtr);
expectedCmds.bbStart.setBatchBufferStartAddress(slbPtr);
}
IGIL_CommandQueue *getIgilQueue() {