mirror of
https://github.com/intel/compute-runtime.git
synced 2025-12-27 07:44:16 +08:00
Refactor: don't use global ProductHelper getter in ocl files 1/n
Related-To: NEO-6853 Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
This commit is contained in:
committed by
Compute-Runtime-Automation
parent
929e03ad8a
commit
14d524fe26
@@ -50,7 +50,7 @@ void EventsRequest::fillCsrDependenciesForTimestampPacketContainer(CsrDependenci
|
||||
csrDeps.timestampPacketContainer.push_back(timestampPacketContainer);
|
||||
|
||||
if (!sameCsr) {
|
||||
const auto &productHelper = *NEO::ProductHelper::get(event->getCommandQueue()->getDevice().getHardwareInfo().platform.eProductFamily);
|
||||
const auto &productHelper = event->getCommandQueue()->getDevice().getProductHelper();
|
||||
if (productHelper.isDcFlushAllowed()) {
|
||||
if (!dependentCsr.isLatestTaskCountFlushed()) {
|
||||
flushDependentCsr(dependentCsr, csrDeps);
|
||||
|
||||
@@ -45,7 +45,7 @@ void setupAUB(const NEO::Device *pDevice, aub_stream::EngineType engineType) {
|
||||
// Header
|
||||
auto &hwInfo = pDevice->getHardwareInfo();
|
||||
auto deviceId = hwInfo.capabilityTable.aubDeviceId;
|
||||
const auto &productHelper = *NEO::ProductHelper::get(hwInfo.platform.eProductFamily);
|
||||
const auto &productHelper = pDevice->getProductHelper();
|
||||
aubFile.init(productHelper.getAubStreamSteppingFromHwRevId(hwInfo), deviceId);
|
||||
|
||||
aubFile.writeMMIO(mmioBase + 0x229c, 0xffff8280);
|
||||
|
||||
@@ -30,7 +30,7 @@ void setupAUBWithBatchBuffer(const NEO::Device *pDevice, aub_stream::EngineType
|
||||
|
||||
// Header
|
||||
auto &hwInfo = pDevice->getHardwareInfo();
|
||||
const auto &productHelper = *NEO::ProductHelper::get(hwInfo.platform.eProductFamily);
|
||||
const auto &productHelper = pDevice->getProductHelper();
|
||||
aubFile.init(productHelper.getAubStreamSteppingFromHwRevId(hwInfo), AUB::Traits::device);
|
||||
|
||||
aubFile.writeMMIO(AubMemDump::computeRegisterOffset(mmioBase, 0x229c), 0xffff8280);
|
||||
@@ -152,7 +152,7 @@ void setupAUBWithBatchBuffer(const NEO::Device *pDevice, aub_stream::EngineType
|
||||
// Poll until HW complete
|
||||
using AubMemDump::CmdServicesMemTraceRegisterPoll;
|
||||
aubFile.registerPoll(
|
||||
AubMemDump::computeRegisterOffset(mmioBase, 0x2234), //EXECLIST_STATUS
|
||||
AubMemDump::computeRegisterOffset(mmioBase, 0x2234), // EXECLIST_STATUS
|
||||
0x00008000,
|
||||
0x00008000,
|
||||
false,
|
||||
|
||||
@@ -72,7 +72,7 @@ class SyncBufferHandlerTest : public SyncBufferEnqueueHandlerTest {
|
||||
kernel->executionType = KernelExecutionType::Concurrent;
|
||||
commandQueue = reinterpret_cast<MockCommandQueue *>(new MockCommandQueueHw<FamilyType>(context, pClDevice, 0));
|
||||
auto &hwInfo = pClDevice->getHardwareInfo();
|
||||
auto &productHelper = *NEO::ProductHelper::get(hwInfo.platform.eProductFamily);
|
||||
auto &productHelper = pClDevice->getProductHelper();
|
||||
if (productHelper.isCooperativeEngineSupported(hwInfo)) {
|
||||
commandQueue->gpgpuEngine = &pClDevice->getEngine(aub_stream::EngineType::ENGINE_CCS, EngineUsage::Cooperative);
|
||||
}
|
||||
|
||||
@@ -123,7 +123,7 @@ HWTEST_F(TimestampPacketTests, givenCrossCsrDependenciesWhenFillCsrDepsThenFlush
|
||||
|
||||
eventsRequest.fillCsrDependenciesForTimestampPacketContainer(csrDeps, mockCmdQ->getGpgpuCommandStreamReceiver(), CsrDependencies::DependenciesType::All);
|
||||
|
||||
const auto &productHelper = *NEO::ProductHelper::get(device->getHardwareInfo().platform.eProductFamily);
|
||||
const auto &productHelper = device->getProductHelper();
|
||||
if (productHelper.isDcFlushAllowed()) {
|
||||
EXPECT_TRUE(mockCmdQ2->getUltCommandStreamReceiver().flushBatchedSubmissionsCalled);
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user