intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-19 06:24:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: don't use global GfxCoreHelper getter in shared files 1/n

Browse Source 
Related-To: NEO-6853
Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
This commit is contained in:
Kamil Kopryk
2022-12-27 15:26:22 +00:00
committed by Compute-Runtime-Automation
parent 9934a24174
commit a55680e82e
7 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
shared/source/os_interface/linux/hw_info_config_drm.cpp
View File

@@ -70,7 +70,6 @@ int ProductHelper::configureHwInfoDrm(const HardwareInfo *inHwInfo, HardwareInfo
Drm *drm = osInterface->getDriverModel()->as<Drm>(); Drm *drm = osInterface->getDriverModel()->as<Drm>();
*outHwInfo = *inHwInfo; *outHwInfo = *inHwInfo;
auto platform = &outHwInfo->platform;
auto gtSystemInfo = &outHwInfo->gtSystemInfo; auto gtSystemInfo = &outHwInfo->gtSystemInfo;
auto featureTable = &outHwInfo->featureTable; auto featureTable = &outHwInfo->featureTable;
@@ -141,7 +140,7 @@ int ProductHelper::configureHwInfoDrm(const HardwareInfo *inHwInfo, HardwareInfo
outHwInfo->capabilityTable.maxRenderFrequency = maxGpuFreq; outHwInfo->capabilityTable.maxRenderFrequency = maxGpuFreq;
outHwInfo->capabilityTable.ftrSvm = featureTable->flags.ftrSVM; outHwInfo->capabilityTable.ftrSvm = featureTable->flags.ftrSVM;
GfxCoreHelper &gfxCoreHelper = GfxCoreHelper::get(platform->eRenderCoreFamily); GfxCoreHelper &gfxCoreHelper = rootDeviceEnvironemnt.getHelper<GfxCoreHelper>();
outHwInfo->capabilityTable.ftrSupportsCoherency = false; outHwInfo->capabilityTable.ftrSupportsCoherency = false;
gfxCoreHelper.adjustDefaultEngineType(outHwInfo); gfxCoreHelper.adjustDefaultEngineType(outHwInfo);

3
shared/test/common/fixtures/memory_allocator_fixture.h
View File

@@ -32,7 +32,8 @@ class MemoryAllocatorFixture : public MemoryManagementFixture {
executionEnvironment->memoryManager.reset(memoryManager); executionEnvironment->memoryManager.reset(memoryManager);
csr = &device->getGpgpuCommandStreamReceiver(); csr = &device->getGpgpuCommandStreamReceiver();
auto &hwInfo = device->getHardwareInfo(); auto &hwInfo = device->getHardwareInfo();
auto engineType = GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily).getGpgpuEngineInstances(hwInfo)[0].first; auto &gfxCoreHelper = device->getGfxCoreHelper();
auto engineType = gfxCoreHelper.getGpgpuEngineInstances(hwInfo)[0].first;
auto osContext = memoryManager->createAndRegisterOsContext(csr, EngineDescriptorHelper::getDefaultDescriptor({engineType, EngineUsage::Regular}, auto osContext = memoryManager->createAndRegisterOsContext(csr, EngineDescriptorHelper::getDefaultDescriptor({engineType, EngineUsage::Regular},
PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo))); PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo)));
csr->setupContext(*osContext); csr->setupContext(*osContext);

3
shared/test/common/fixtures/memory_manager_fixture.cpp
View File

@@ -25,7 +25,8 @@ void MemoryManagerWithCsrFixture::setUp() {
executionEnvironment.memoryManager.reset(memoryManager); executionEnvironment.memoryManager.reset(memoryManager);
csr->tagAddress = &currentGpuTag; csr->tagAddress = &currentGpuTag;
auto hwInfo = executionEnvironment.rootDeviceEnvironments[0]->getHardwareInfo(); auto hwInfo = executionEnvironment.rootDeviceEnvironments[0]->getHardwareInfo();
auto engine = GfxCoreHelper::get(hwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*hwInfo)[0]; auto &gfxCoreHelper = executionEnvironment.rootDeviceEnvironments[0]->getHelper<GfxCoreHelper>();
auto engine = gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0];
auto osContext = memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor({engine.first, EngineUsage::Regular}, auto osContext = memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor({engine.first, EngineUsage::Regular},
PreemptionHelper::getDefaultPreemptionMode(*hwInfo))); PreemptionHelper::getDefaultPreemptionMode(*hwInfo)));
csr->setupContext(*osContext); csr->setupContext(*osContext);

2
shared/test/common/helpers/sip_init.cpp
View File

@@ -128,7 +128,7 @@ std::vector<char> createStateSaveAreaHeader(uint32_t version) {
bool SipKernel::initSipKernel(SipKernelType type, Device &device) { bool SipKernel::initSipKernel(SipKernelType type, Device &device) {
if (MockSipData::useMockSip) { if (MockSipData::useMockSip) {
auto &gfxCoreHelper = GfxCoreHelper::get(device.getRootDeviceEnvironment().getHardwareInfo()->platform.eRenderCoreFamily); auto &gfxCoreHelper = device.getGfxCoreHelper();
if (gfxCoreHelper.isSipKernelAsHexadecimalArrayPreferred()) { if (gfxCoreHelper.isSipKernelAsHexadecimalArrayPreferred()) {
SipKernel::classType = SipClassType::HexadecimalHeaderFile; SipKernel::classType = SipClassType::HexadecimalHeaderFile;
} else { } else {

3
shared/test/common/mocks/ult_device_factory.cpp
View File

@@ -69,7 +69,8 @@ void UltDeviceFactory::prepareDeviceEnvironments(ExecutionEnvironment &execution
} }
bool UltDeviceFactory::initializeMemoryManager(ExecutionEnvironment &executionEnvironment) { bool UltDeviceFactory::initializeMemoryManager(ExecutionEnvironment &executionEnvironment) {
if (executionEnvironment.memoryManager == nullptr) { if (executionEnvironment.memoryManager == nullptr) {
bool enableLocalMemory = GfxCoreHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getEnableLocalMemory(*defaultHwInfo); auto &gfxCoreHelper = executionEnvironment.rootDeviceEnvironments[0]->getHelper<GfxCoreHelper>();
bool enableLocalMemory = gfxCoreHelper.getEnableLocalMemory(*defaultHwInfo);
bool aubUsage = (testMode == TestMode::AubTests) || (testMode == TestMode::AubTestsWithTbx); bool aubUsage = (testMode == TestMode::AubTests) || (testMode == TestMode::AubTestsWithTbx);
executionEnvironment.memoryManager.reset(new MockMemoryManager(false, enableLocalMemory, aubUsage, executionEnvironment)); executionEnvironment.memoryManager.reset(new MockMemoryManager(false, enableLocalMemory, aubUsage, executionEnvironment));
} }

9
shared/test/common/os_interface/linux/device_command_stream_fixture.cpp
View File

@@ -72,7 +72,7 @@ void DrmMockCustom::testIoctls() {
int DrmMockCustom::ioctl(DrmIoctl request, void *arg) { int DrmMockCustom::ioctl(DrmIoctl request, void *arg) {
auto ext = ioctl_res_ext.load(); auto ext = ioctl_res_ext.load();
//store flags // store flags
switch (request) { switch (request) {
case DrmIoctl::GemExecbuffer2: { case DrmIoctl::GemExecbuffer2: {
auto execbuf = static_cast<NEO::MockExecBuffer *>(arg); auto execbuf = static_cast<NEO::MockExecBuffer *>(arg);
@@ -111,7 +111,7 @@ int DrmMockCustom::ioctl(DrmIoctl request, void *arg) {
} break; } break;
case DrmIoctl::PrimeFdToHandle: { case DrmIoctl::PrimeFdToHandle: {
auto *primeToHandleParams = static_cast<NEO::PrimeHandle *>(arg); auto *primeToHandleParams = static_cast<NEO::PrimeHandle *>(arg);
//return BO // return BO
primeToHandleParams->handle = outputHandle; primeToHandleParams->handle = outputHandle;
inputFd = primeToHandleParams->fileDescriptor; inputFd = primeToHandleParams->fileDescriptor;
ioctl_cnt.primeFdToHandle++; ioctl_cnt.primeFdToHandle++;
@@ -121,7 +121,7 @@ int DrmMockCustom::ioctl(DrmIoctl request, void *arg) {
} break; } break;
case DrmIoctl::PrimeHandleToFd: { case DrmIoctl::PrimeHandleToFd: {
auto *handleToPrimeParams = static_cast<NEO::PrimeHandle *>(arg); auto *handleToPrimeParams = static_cast<NEO::PrimeHandle *>(arg);
//return FD // return FD
inputHandle = handleToPrimeParams->handle; inputHandle = handleToPrimeParams->handle;
inputFlags = handleToPrimeParams->flags; inputFlags = handleToPrimeParams->flags;
handleToPrimeParams->fileDescriptor = outputFd; handleToPrimeParams->fileDescriptor = outputFd;
@@ -220,7 +220,8 @@ int DrmMockCustom::ioctl(DrmIoctl request, void *arg) {
DrmMockCustom::DrmMockCustom(RootDeviceEnvironment &rootDeviceEnvironment) DrmMockCustom::DrmMockCustom(RootDeviceEnvironment &rootDeviceEnvironment)
: Drm(std::make_unique<HwDeviceIdDrm>(mockFd, mockPciPath), rootDeviceEnvironment) { : Drm(std::make_unique<HwDeviceIdDrm>(mockFd, mockPciPath), rootDeviceEnvironment) {
reset(); reset();
ioctl_expected.contextCreate = static_cast<int>(NEO::GfxCoreHelper::get(NEO::defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*NEO::defaultHwInfo).size()); auto &gfxCoreHelper = rootDeviceEnvironment.getHelper<NEO::GfxCoreHelper>();
ioctl_expected.contextCreate = static_cast<int>(gfxCoreHelper.getGpgpuEngineInstances(*NEO::defaultHwInfo).size());
ioctl_expected.contextDestroy = ioctl_expected.contextCreate.load(); ioctl_expected.contextDestroy = ioctl_expected.contextCreate.load();
setupIoctlHelper(rootDeviceEnvironment.getHardwareInfo()->platform.eProductFamily); setupIoctlHelper(rootDeviceEnvironment.getHardwareInfo()->platform.eProductFamily);
createVirtualMemoryAddressSpace(NEO::GfxCoreHelper::getSubDevicesCount(rootDeviceEnvironment.getHardwareInfo())); createVirtualMemoryAddressSpace(NEO::GfxCoreHelper::getSubDevicesCount(rootDeviceEnvironment.getHardwareInfo()));

12
shared/test/common/os_interface/windows/wddm_fixture.h
View File

@@ -46,7 +46,8 @@ struct WddmFixture : public Test<MockExecutionEnvironmentGmmFixture> {
auto preemptionMode = PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo); auto preemptionMode = PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo);
wddm->init(); wddm->init();
auto hwInfo = rootDeviceEnvironment->getHardwareInfo(); auto hwInfo = rootDeviceEnvironment->getHardwareInfo();
auto engine = GfxCoreHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*hwInfo)[0]; auto &gfxCoreHelper = rootDeviceEnvironment->getHelper<GfxCoreHelper>();
auto engine = gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0];
osContext = std::make_unique<OsContextWin>(*osInterface->getDriverModel()->as<Wddm>(), 0, 0u, EngineDescriptorHelper::getDefaultDescriptor(engine, preemptionMode)); osContext = std::make_unique<OsContextWin>(*osInterface->getDriverModel()->as<Wddm>(), 0, 0u, EngineDescriptorHelper::getDefaultDescriptor(engine, preemptionMode));
osContext->ensureContextInitialized(); osContext->ensureContextInitialized();
mockTemporaryResources = static_cast<MockWddmResidentAllocationsContainer *>(wddm->temporaryResources.get()); mockTemporaryResources = static_cast<MockWddmResidentAllocationsContainer *>(wddm->temporaryResources.get());
@@ -77,7 +78,8 @@ struct WddmFixtureLuid : public Test<MockExecutionEnvironmentGmmFixture> {
auto preemptionMode = PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo); auto preemptionMode = PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo);
wddm->init(); wddm->init();
auto hwInfo = rootDeviceEnvironment->getHardwareInfo(); auto hwInfo = rootDeviceEnvironment->getHardwareInfo();
auto engine = GfxCoreHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*hwInfo)[0]; auto &gfxCoreHelper = rootDeviceEnvironment->getHelper<GfxCoreHelper>();
auto engine = gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0];
osContext = std::make_unique<OsContextWin>(*osInterface->getDriverModel()->as<Wddm>(), 0, 0u, EngineDescriptorHelper::getDefaultDescriptor(engine, preemptionMode)); osContext = std::make_unique<OsContextWin>(*osInterface->getDriverModel()->as<Wddm>(), 0, 0u, EngineDescriptorHelper::getDefaultDescriptor(engine, preemptionMode));
osContext->ensureContextInitialized(); osContext->ensureContextInitialized();
mockTemporaryResources = static_cast<MockWddmResidentAllocationsContainer *>(wddm->temporaryResources.get()); mockTemporaryResources = static_cast<MockWddmResidentAllocationsContainer *>(wddm->temporaryResources.get());
@@ -114,7 +116,8 @@ struct WddmFixtureWithMockGdiDll : public GdiDllFixture, public MockExecutionEnv
wddm->wddmInterface.reset(wddmMockInterface); wddm->wddmInterface.reset(wddmMockInterface);
auto hwInfo = rootDeviceEnvironment->getHardwareInfo(); auto hwInfo = rootDeviceEnvironment->getHardwareInfo();
auto engine = GfxCoreHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*hwInfo)[0]; auto &gfxCoreHelper = rootDeviceEnvironment->getHelper<GfxCoreHelper>();
auto engine = gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0];
osContext = std::make_unique<OsContextWin>(*osInterface->getDriverModel()->as<Wddm>(), 0, 0u, EngineDescriptorHelper::getDefaultDescriptor(engine, preemptionMode)); osContext = std::make_unique<OsContextWin>(*osInterface->getDriverModel()->as<Wddm>(), 0, 0u, EngineDescriptorHelper::getDefaultDescriptor(engine, preemptionMode));
osContext->ensureContextInitialized(); osContext->ensureContextInitialized();
} }
@@ -162,7 +165,8 @@ struct WddmFixtureWithMockGdiDllWddmNoCleanup : public GdiDllFixture, public Moc
wddm->wddmInterface.reset(wddmMockInterface); wddm->wddmInterface.reset(wddmMockInterface);
auto hwInfo = rootDeviceEnvironment->getHardwareInfo(); auto hwInfo = rootDeviceEnvironment->getHardwareInfo();
auto engine = GfxCoreHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*hwInfo)[0]; auto &gfxCoreHelper = rootDeviceEnvironment->getHelper<GfxCoreHelper>();
auto engine = gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0];
osContext = std::make_unique<OsContextWin>(*osInterface->getDriverModel()->as<Wddm>(), 0, 0u, EngineDescriptorHelper::getDefaultDescriptor(engine, preemptionMode)); osContext = std::make_unique<OsContextWin>(*osInterface->getDriverModel()->as<Wddm>(), 0, 0u, EngineDescriptorHelper::getDefaultDescriptor(engine, preemptionMode));
osContext->ensureContextInitialized(); osContext->ensureContextInitialized();
} }