Rename igcFeWa to igcFtrWa

It references features and workarounds

Signed-off-by: Dominik Dabek <dominik.dabek@intel.com>
This commit is contained in:
Dominik Dabek
2021-12-28 14:40:47 +00:00
committed by Compute-Runtime-Automation
parent e07b27c0e2
commit 67fff7fc51
4 changed files with 57 additions and 57 deletions

View File

@ -594,47 +594,47 @@ int OfflineCompiler::initialize(size_t numArgs, const std::vector<std::string> &
this->igcDeviceCtx->SetProfilingTimerResolution(static_cast<float>(hwInfo.capabilityTable.defaultProfilingTimerResolution));
auto igcPlatform = this->igcDeviceCtx->GetPlatformHandle();
auto igcGtSystemInfo = this->igcDeviceCtx->GetGTSystemInfoHandle();
auto igcFeWa = this->igcDeviceCtx->GetIgcFeaturesAndWorkaroundsHandle();
if ((igcPlatform == nullptr) || (igcGtSystemInfo == nullptr) || (igcFeWa == nullptr)) {
auto igcFtrWa = this->igcDeviceCtx->GetIgcFeaturesAndWorkaroundsHandle();
if ((igcPlatform == nullptr) || (igcGtSystemInfo == nullptr) || (igcFtrWa == nullptr)) {
return OUT_OF_HOST_MEMORY;
}
IGC::PlatformHelper::PopulateInterfaceWith(*igcPlatform.get(), hwInfo.platform);
IGC::GtSysInfoHelper::PopulateInterfaceWith(*igcGtSystemInfo.get(), hwInfo.gtSystemInfo);
// populate with features
igcFeWa.get()->SetFtrDesktop(hwInfo.featureTable.flags.ftrDesktop);
igcFeWa.get()->SetFtrChannelSwizzlingXOREnabled(hwInfo.featureTable.flags.ftrChannelSwizzlingXOREnabled);
igcFtrWa.get()->SetFtrDesktop(hwInfo.featureTable.flags.ftrDesktop);
igcFtrWa.get()->SetFtrChannelSwizzlingXOREnabled(hwInfo.featureTable.flags.ftrChannelSwizzlingXOREnabled);
igcFeWa.get()->SetFtrGtBigDie(hwInfo.featureTable.flags.ftrGtBigDie);
igcFeWa.get()->SetFtrGtMediumDie(hwInfo.featureTable.flags.ftrGtMediumDie);
igcFeWa.get()->SetFtrGtSmallDie(hwInfo.featureTable.flags.ftrGtSmallDie);
igcFtrWa.get()->SetFtrGtBigDie(hwInfo.featureTable.flags.ftrGtBigDie);
igcFtrWa.get()->SetFtrGtMediumDie(hwInfo.featureTable.flags.ftrGtMediumDie);
igcFtrWa.get()->SetFtrGtSmallDie(hwInfo.featureTable.flags.ftrGtSmallDie);
igcFeWa.get()->SetFtrGT1(hwInfo.featureTable.flags.ftrGT1);
igcFeWa.get()->SetFtrGT1_5(hwInfo.featureTable.flags.ftrGT1_5);
igcFeWa.get()->SetFtrGT2(hwInfo.featureTable.flags.ftrGT2);
igcFeWa.get()->SetFtrGT3(hwInfo.featureTable.flags.ftrGT3);
igcFeWa.get()->SetFtrGT4(hwInfo.featureTable.flags.ftrGT4);
igcFtrWa.get()->SetFtrGT1(hwInfo.featureTable.flags.ftrGT1);
igcFtrWa.get()->SetFtrGT1_5(hwInfo.featureTable.flags.ftrGT1_5);
igcFtrWa.get()->SetFtrGT2(hwInfo.featureTable.flags.ftrGT2);
igcFtrWa.get()->SetFtrGT3(hwInfo.featureTable.flags.ftrGT3);
igcFtrWa.get()->SetFtrGT4(hwInfo.featureTable.flags.ftrGT4);
igcFeWa.get()->SetFtrIVBM0M1Platform(hwInfo.featureTable.flags.ftrIVBM0M1Platform);
igcFeWa.get()->SetFtrGTL(hwInfo.featureTable.flags.ftrGT1);
igcFeWa.get()->SetFtrGTM(hwInfo.featureTable.flags.ftrGT2);
igcFeWa.get()->SetFtrGTH(hwInfo.featureTable.flags.ftrGT3);
igcFtrWa.get()->SetFtrIVBM0M1Platform(hwInfo.featureTable.flags.ftrIVBM0M1Platform);
igcFtrWa.get()->SetFtrGTL(hwInfo.featureTable.flags.ftrGT1);
igcFtrWa.get()->SetFtrGTM(hwInfo.featureTable.flags.ftrGT2);
igcFtrWa.get()->SetFtrGTH(hwInfo.featureTable.flags.ftrGT3);
igcFeWa.get()->SetFtrSGTPVSKUStrapPresent(hwInfo.featureTable.flags.ftrSGTPVSKUStrapPresent);
igcFeWa.get()->SetFtrGTA(hwInfo.featureTable.flags.ftrGTA);
igcFeWa.get()->SetFtrGTC(hwInfo.featureTable.flags.ftrGTC);
igcFeWa.get()->SetFtrGTX(hwInfo.featureTable.flags.ftrGTX);
igcFeWa.get()->SetFtr5Slice(hwInfo.featureTable.flags.ftr5Slice);
igcFtrWa.get()->SetFtrSGTPVSKUStrapPresent(hwInfo.featureTable.flags.ftrSGTPVSKUStrapPresent);
igcFtrWa.get()->SetFtrGTA(hwInfo.featureTable.flags.ftrGTA);
igcFtrWa.get()->SetFtrGTC(hwInfo.featureTable.flags.ftrGTC);
igcFtrWa.get()->SetFtrGTX(hwInfo.featureTable.flags.ftrGTX);
igcFtrWa.get()->SetFtr5Slice(hwInfo.featureTable.flags.ftr5Slice);
auto compilerHwInfoConfig = CompilerHwInfoConfig::get(hwInfo.platform.eProductFamily);
if (compilerHwInfoConfig) {
igcFeWa.get()->SetFtrGpGpuMidThreadLevelPreempt(compilerHwInfoConfig->isMidThreadPreemptionSupported(hwInfo));
igcFtrWa.get()->SetFtrGpGpuMidThreadLevelPreempt(compilerHwInfoConfig->isMidThreadPreemptionSupported(hwInfo));
}
igcFeWa.get()->SetFtrIoMmuPageFaulting(hwInfo.featureTable.flags.ftrIoMmuPageFaulting);
igcFeWa.get()->SetFtrWddm2Svm(hwInfo.featureTable.flags.ftrWddm2Svm);
igcFeWa.get()->SetFtrPooledEuEnabled(hwInfo.featureTable.flags.ftrPooledEuEnabled);
igcFtrWa.get()->SetFtrIoMmuPageFaulting(hwInfo.featureTable.flags.ftrIoMmuPageFaulting);
igcFtrWa.get()->SetFtrWddm2Svm(hwInfo.featureTable.flags.ftrWddm2Svm);
igcFtrWa.get()->SetFtrPooledEuEnabled(hwInfo.featureTable.flags.ftrPooledEuEnabled);
igcFeWa.get()->SetFtrResourceStreamer(hwInfo.featureTable.flags.ftrResourceStreamer);
igcFtrWa.get()->SetFtrResourceStreamer(hwInfo.featureTable.flags.ftrResourceStreamer);
return retVal;
}

View File

@ -425,8 +425,8 @@ IGC::IgcOclDeviceCtxTagOCL *CompilerInterface::getIgcDeviceCtx(const Device &dev
newDeviceCtx->SetProfilingTimerResolution(static_cast<float>(device.getDeviceInfo().outProfilingTimerResolution));
auto igcPlatform = newDeviceCtx->GetPlatformHandle();
auto igcGtSystemInfo = newDeviceCtx->GetGTSystemInfoHandle();
auto igcFeWa = newDeviceCtx->GetIgcFeaturesAndWorkaroundsHandle();
if (false == NEO::areNotNullptr(igcPlatform.get(), igcGtSystemInfo.get(), igcFeWa.get())) {
auto igcFtrWa = newDeviceCtx->GetIgcFeaturesAndWorkaroundsHandle();
if (false == NEO::areNotNullptr(igcPlatform.get(), igcGtSystemInfo.get(), igcFtrWa.get())) {
DEBUG_BREAK_IF(true); // could not acquire handles to device descriptors
return nullptr;
}
@ -438,36 +438,36 @@ IGC::IgcOclDeviceCtxTagOCL *CompilerInterface::getIgcDeviceCtx(const Device &dev
IGC::PlatformHelper::PopulateInterfaceWith(*igcPlatform, hwInfo->platform);
IGC::GtSysInfoHelper::PopulateInterfaceWith(*igcGtSystemInfo, hwInfo->gtSystemInfo);
igcFeWa.get()->SetFtrDesktop(device.getHardwareInfo().featureTable.flags.ftrDesktop);
igcFeWa.get()->SetFtrChannelSwizzlingXOREnabled(device.getHardwareInfo().featureTable.flags.ftrChannelSwizzlingXOREnabled);
igcFtrWa.get()->SetFtrDesktop(device.getHardwareInfo().featureTable.flags.ftrDesktop);
igcFtrWa.get()->SetFtrChannelSwizzlingXOREnabled(device.getHardwareInfo().featureTable.flags.ftrChannelSwizzlingXOREnabled);
igcFeWa.get()->SetFtrGtBigDie(device.getHardwareInfo().featureTable.flags.ftrGtBigDie);
igcFeWa.get()->SetFtrGtMediumDie(device.getHardwareInfo().featureTable.flags.ftrGtMediumDie);
igcFeWa.get()->SetFtrGtSmallDie(device.getHardwareInfo().featureTable.flags.ftrGtSmallDie);
igcFtrWa.get()->SetFtrGtBigDie(device.getHardwareInfo().featureTable.flags.ftrGtBigDie);
igcFtrWa.get()->SetFtrGtMediumDie(device.getHardwareInfo().featureTable.flags.ftrGtMediumDie);
igcFtrWa.get()->SetFtrGtSmallDie(device.getHardwareInfo().featureTable.flags.ftrGtSmallDie);
igcFeWa.get()->SetFtrGT1(device.getHardwareInfo().featureTable.flags.ftrGT1);
igcFeWa.get()->SetFtrGT1_5(device.getHardwareInfo().featureTable.flags.ftrGT1_5);
igcFeWa.get()->SetFtrGT2(device.getHardwareInfo().featureTable.flags.ftrGT2);
igcFeWa.get()->SetFtrGT3(device.getHardwareInfo().featureTable.flags.ftrGT3);
igcFeWa.get()->SetFtrGT4(device.getHardwareInfo().featureTable.flags.ftrGT4);
igcFtrWa.get()->SetFtrGT1(device.getHardwareInfo().featureTable.flags.ftrGT1);
igcFtrWa.get()->SetFtrGT1_5(device.getHardwareInfo().featureTable.flags.ftrGT1_5);
igcFtrWa.get()->SetFtrGT2(device.getHardwareInfo().featureTable.flags.ftrGT2);
igcFtrWa.get()->SetFtrGT3(device.getHardwareInfo().featureTable.flags.ftrGT3);
igcFtrWa.get()->SetFtrGT4(device.getHardwareInfo().featureTable.flags.ftrGT4);
igcFeWa.get()->SetFtrIVBM0M1Platform(device.getHardwareInfo().featureTable.flags.ftrIVBM0M1Platform);
igcFeWa.get()->SetFtrGTL(device.getHardwareInfo().featureTable.flags.ftrGT1);
igcFeWa.get()->SetFtrGTM(device.getHardwareInfo().featureTable.flags.ftrGT2);
igcFeWa.get()->SetFtrGTH(device.getHardwareInfo().featureTable.flags.ftrGT3);
igcFtrWa.get()->SetFtrIVBM0M1Platform(device.getHardwareInfo().featureTable.flags.ftrIVBM0M1Platform);
igcFtrWa.get()->SetFtrGTL(device.getHardwareInfo().featureTable.flags.ftrGT1);
igcFtrWa.get()->SetFtrGTM(device.getHardwareInfo().featureTable.flags.ftrGT2);
igcFtrWa.get()->SetFtrGTH(device.getHardwareInfo().featureTable.flags.ftrGT3);
igcFeWa.get()->SetFtrSGTPVSKUStrapPresent(device.getHardwareInfo().featureTable.flags.ftrSGTPVSKUStrapPresent);
igcFeWa.get()->SetFtrGTA(device.getHardwareInfo().featureTable.flags.ftrGTA);
igcFeWa.get()->SetFtrGTC(device.getHardwareInfo().featureTable.flags.ftrGTC);
igcFeWa.get()->SetFtrGTX(device.getHardwareInfo().featureTable.flags.ftrGTX);
igcFeWa.get()->SetFtr5Slice(device.getHardwareInfo().featureTable.flags.ftr5Slice);
igcFtrWa.get()->SetFtrSGTPVSKUStrapPresent(device.getHardwareInfo().featureTable.flags.ftrSGTPVSKUStrapPresent);
igcFtrWa.get()->SetFtrGTA(device.getHardwareInfo().featureTable.flags.ftrGTA);
igcFtrWa.get()->SetFtrGTC(device.getHardwareInfo().featureTable.flags.ftrGTC);
igcFtrWa.get()->SetFtrGTX(device.getHardwareInfo().featureTable.flags.ftrGTX);
igcFtrWa.get()->SetFtr5Slice(device.getHardwareInfo().featureTable.flags.ftr5Slice);
igcFeWa.get()->SetFtrGpGpuMidThreadLevelPreempt(CompilerHwInfoConfig::get(hwInfo->platform.eProductFamily)->isMidThreadPreemptionSupported(*hwInfo));
igcFeWa.get()->SetFtrIoMmuPageFaulting(device.getHardwareInfo().featureTable.flags.ftrIoMmuPageFaulting);
igcFeWa.get()->SetFtrWddm2Svm(device.getHardwareInfo().featureTable.flags.ftrWddm2Svm);
igcFeWa.get()->SetFtrPooledEuEnabled(device.getHardwareInfo().featureTable.flags.ftrPooledEuEnabled);
igcFtrWa.get()->SetFtrGpGpuMidThreadLevelPreempt(CompilerHwInfoConfig::get(hwInfo->platform.eProductFamily)->isMidThreadPreemptionSupported(*hwInfo));
igcFtrWa.get()->SetFtrIoMmuPageFaulting(device.getHardwareInfo().featureTable.flags.ftrIoMmuPageFaulting);
igcFtrWa.get()->SetFtrWddm2Svm(device.getHardwareInfo().featureTable.flags.ftrWddm2Svm);
igcFtrWa.get()->SetFtrPooledEuEnabled(device.getHardwareInfo().featureTable.flags.ftrPooledEuEnabled);
igcFeWa.get()->SetFtrResourceStreamer(device.getHardwareInfo().featureTable.flags.ftrResourceStreamer);
igcFtrWa.get()->SetFtrResourceStreamer(device.getHardwareInfo().featureTable.flags.ftrResourceStreamer);
igcDeviceContexts[&device] = std::move(newDeviceCtx);
return igcDeviceContexts[&device].get();

View File

@ -465,7 +465,7 @@ void translate(bool usingIgc, CIF::Builtins::BufferSimple *src, CIF::Builtins::B
MockIgcOclDeviceCtx::MockIgcOclDeviceCtx() {
platform = new MockCIFPlatform;
gtSystemInfo = new MockGTSystemInfo;
igcFeWa = new MockIgcFeaturesAndWorkarounds;
igcFtrWa = new MockIgcFeaturesAndWorkarounds;
}
MockIgcOclDeviceCtx::~MockIgcOclDeviceCtx() {
@ -475,8 +475,8 @@ MockIgcOclDeviceCtx::~MockIgcOclDeviceCtx() {
if (gtSystemInfo != nullptr) {
gtSystemInfo->Release();
}
if (igcFeWa != nullptr) {
igcFeWa->Release();
if (igcFtrWa != nullptr) {
igcFtrWa->Release();
}
}

View File

@ -209,7 +209,7 @@ struct MockIgcOclDeviceCtx : MockCIF<IGC::IgcOclDeviceCtxTagOCL> {
if (getIgcDebugVars().failCreateIgcFeWaInterface) {
return nullptr;
}
return igcFeWa;
return igcFtrWa;
}
IGC::IgcOclTranslationCtxBase *CreateTranslationCtxImpl(CIF::Version_t ver,
@ -227,7 +227,7 @@ struct MockIgcOclDeviceCtx : MockCIF<IGC::IgcOclDeviceCtxTagOCL> {
MockCIFPlatform *platform = nullptr;
MockGTSystemInfo *gtSystemInfo = nullptr;
MockIgcFeaturesAndWorkarounds *igcFeWa = nullptr;
MockIgcFeaturesAndWorkarounds *igcFtrWa = nullptr;
MockCompilerDebugVars debugVars;
using TranslationOpT = std::pair<IGC::CodeType::CodeType_t, IGC::CodeType::CodeType_t>;