intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-04 23:56:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Initialize hwInfo in ocloc before passing it to IGC

Browse Source 
Related-To: NEO-3735

Change-Id: Ice69f6b21b960bda8fe4aa9667bc03cc3dbbc086
Signed-off-by: Pawel Wilma <pawel.wilma@intel.com>
This commit is contained in:
Pawel Wilma
2020-07-01 00:22:10 +02:00
committed by sys_ocldev
parent be5364ac2f
commit 2e6fc92372
3 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
shared/offline_compiler/source/offline_compiler.cpp
View File

@@ -216,10 +216,11 @@ int OfflineCompiler::getHardwareInfo(const char *pDeviceName) {
for (unsigned int productId = 0; productId < IGFX_MAX_PRODUCT; ++productId) {
if (hardwarePrefix[productId] && (0 == strcmp(pDeviceName, hardwarePrefix[productId]))) {
if (hardwareInfoTable[productId]) {
hwInfo = hardwareInfoTable[productId];
hwInfo = *hardwareInfoTable[productId];
hardwareInfoSetup[hwInfo.platform.eProductFamily](&hwInfo, true, 0x0);
familyNameWithType.clear();
familyNameWithType.append(familyName[hwInfo->platform.eRenderCoreFamily]);
familyNameWithType.append(hwInfo->capabilityTable.platformType);
familyNameWithType.append(familyName[hwInfo.platform.eRenderCoreFamily]);
familyNameWithType.append(hwInfo.capabilityTable.platformType);
retVal = SUCCESS;
break;
}
@@ -352,7 +353,7 @@ int OfflineCompiler::initialize(size_t numArgs, const std::vector<std::string> &
return OUT_OF_HOST_MEMORY;
}
fclDeviceCtx->SetOclApiVersion(hwInfo->capabilityTable.clVersionSupport * 10);
fclDeviceCtx->SetOclApiVersion(hwInfo.capabilityTable.clVersionSupport * 10);
preferredIntermediateRepresentation = fclDeviceCtx->GetPreferredIntermediateRepresentation();
} else {
if (!isQuiet()) {
@@ -393,46 +394,46 @@ int OfflineCompiler::initialize(size_t numArgs, const std::vector<std::string> &
if (this->igcDeviceCtx == nullptr) {
return OUT_OF_HOST_MEMORY;
}
this->igcDeviceCtx->SetProfilingTimerResolution(static_cast<float>(hwInfo->capabilityTable.defaultProfilingTimerResolution));
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)) {
return OUT_OF_HOST_MEMORY;
}
IGC::PlatformHelper::PopulateInterfaceWith(*igcPlatform.get(), hwInfo->platform);
IGC::GtSysInfoHelper::PopulateInterfaceWith(*igcGtSystemInfo.get(), hwInfo->gtSystemInfo);
IGC::PlatformHelper::PopulateInterfaceWith(*igcPlatform.get(), hwInfo.platform);
IGC::GtSysInfoHelper::PopulateInterfaceWith(*igcGtSystemInfo.get(), hwInfo.gtSystemInfo);
// populate with features
igcFeWa.get()->SetFtrDesktop(hwInfo->featureTable.ftrDesktop);
igcFeWa.get()->SetFtrChannelSwizzlingXOREnabled(hwInfo->featureTable.ftrChannelSwizzlingXOREnabled);
igcFeWa.get()->SetFtrDesktop(hwInfo.featureTable.ftrDesktop);
igcFeWa.get()->SetFtrChannelSwizzlingXOREnabled(hwInfo.featureTable.ftrChannelSwizzlingXOREnabled);
igcFeWa.get()->SetFtrGtBigDie(hwInfo->featureTable.ftrGtBigDie);
igcFeWa.get()->SetFtrGtMediumDie(hwInfo->featureTable.ftrGtMediumDie);
igcFeWa.get()->SetFtrGtSmallDie(hwInfo->featureTable.ftrGtSmallDie);
igcFeWa.get()->SetFtrGtBigDie(hwInfo.featureTable.ftrGtBigDie);
igcFeWa.get()->SetFtrGtMediumDie(hwInfo.featureTable.ftrGtMediumDie);
igcFeWa.get()->SetFtrGtSmallDie(hwInfo.featureTable.ftrGtSmallDie);
igcFeWa.get()->SetFtrGT1(hwInfo->featureTable.ftrGT1);
igcFeWa.get()->SetFtrGT1_5(hwInfo->featureTable.ftrGT1_5);
igcFeWa.get()->SetFtrGT2(hwInfo->featureTable.ftrGT2);
igcFeWa.get()->SetFtrGT3(hwInfo->featureTable.ftrGT3);
igcFeWa.get()->SetFtrGT4(hwInfo->featureTable.ftrGT4);
igcFeWa.get()->SetFtrGT1(hwInfo.featureTable.ftrGT1);
igcFeWa.get()->SetFtrGT1_5(hwInfo.featureTable.ftrGT1_5);
igcFeWa.get()->SetFtrGT2(hwInfo.featureTable.ftrGT2);
igcFeWa.get()->SetFtrGT3(hwInfo.featureTable.ftrGT3);
igcFeWa.get()->SetFtrGT4(hwInfo.featureTable.ftrGT4);
igcFeWa.get()->SetFtrIVBM0M1Platform(hwInfo->featureTable.ftrIVBM0M1Platform);
igcFeWa.get()->SetFtrGTL(hwInfo->featureTable.ftrGT1);
igcFeWa.get()->SetFtrGTM(hwInfo->featureTable.ftrGT2);
igcFeWa.get()->SetFtrGTH(hwInfo->featureTable.ftrGT3);
igcFeWa.get()->SetFtrIVBM0M1Platform(hwInfo.featureTable.ftrIVBM0M1Platform);
igcFeWa.get()->SetFtrGTL(hwInfo.featureTable.ftrGT1);
igcFeWa.get()->SetFtrGTM(hwInfo.featureTable.ftrGT2);
igcFeWa.get()->SetFtrGTH(hwInfo.featureTable.ftrGT3);
igcFeWa.get()->SetFtrSGTPVSKUStrapPresent(hwInfo->featureTable.ftrSGTPVSKUStrapPresent);
igcFeWa.get()->SetFtrGTA(hwInfo->featureTable.ftrGTA);
igcFeWa.get()->SetFtrGTC(hwInfo->featureTable.ftrGTC);
igcFeWa.get()->SetFtrGTX(hwInfo->featureTable.ftrGTX);
igcFeWa.get()->SetFtr5Slice(hwInfo->featureTable.ftr5Slice);
igcFeWa.get()->SetFtrSGTPVSKUStrapPresent(hwInfo.featureTable.ftrSGTPVSKUStrapPresent);
igcFeWa.get()->SetFtrGTA(hwInfo.featureTable.ftrGTA);
igcFeWa.get()->SetFtrGTC(hwInfo.featureTable.ftrGTC);
igcFeWa.get()->SetFtrGTX(hwInfo.featureTable.ftrGTX);
igcFeWa.get()->SetFtr5Slice(hwInfo.featureTable.ftr5Slice);
igcFeWa.get()->SetFtrGpGpuMidThreadLevelPreempt(hwInfo->featureTable.ftrGpGpuMidThreadLevelPreempt);
igcFeWa.get()->SetFtrIoMmuPageFaulting(hwInfo->featureTable.ftrIoMmuPageFaulting);
igcFeWa.get()->SetFtrWddm2Svm(hwInfo->featureTable.ftrWddm2Svm);
igcFeWa.get()->SetFtrPooledEuEnabled(hwInfo->featureTable.ftrPooledEuEnabled);
igcFeWa.get()->SetFtrGpGpuMidThreadLevelPreempt(hwInfo.featureTable.ftrGpGpuMidThreadLevelPreempt);
igcFeWa.get()->SetFtrIoMmuPageFaulting(hwInfo.featureTable.ftrIoMmuPageFaulting);
igcFeWa.get()->SetFtrWddm2Svm(hwInfo.featureTable.ftrWddm2Svm);
igcFeWa.get()->SetFtrPooledEuEnabled(hwInfo.featureTable.ftrPooledEuEnabled);
igcFeWa.get()->SetFtrResourceStreamer(hwInfo->featureTable.ftrResourceStreamer);
igcFeWa.get()->SetFtrResourceStreamer(hwInfo.featureTable.ftrResourceStreamer);
return retVal;
}
@@ -525,11 +526,11 @@ int OfflineCompiler::parseCommandLine(size_t numArgs, const std::vector<std::str
if (retVal != SUCCESS) {
argHelper->printf("Error: Cannot get HW Info for device %s.\n", deviceName.c_str());
} else {
std::string extensionsList = getExtensionsList(*hwInfo);
std::string extensionsList = getExtensionsList(hwInfo);
CompilerOptions::concatenateAppend(internalOptions, convertEnabledExtensionsToCompilerInternalOptions(extensionsList.c_str()));
StackVec<cl_name_version, 12> openclCFeatures;
getOpenclCFeaturesList(*hwInfo, openclCFeatures);
getOpenclCFeaturesList(hwInfo, openclCFeatures);
CompilerOptions::concatenateAppend(internalOptions, convertEnabledOclCFeaturesToCompilerInternalOptions(openclCFeatures));
}
}

5
shared/offline_compiler/source/offline_compiler.h
View File

@@ -8,6 +8,7 @@
#pragma once
#include "shared/offline_compiler/source/ocloc_arg_helper.h"
#include "shared/source/helpers/hw_info.h"
#include "shared/source/os_interface/os_library.h"
#include "shared/source/utilities/arrayref.h"
#include "shared/source/utilities/const_stringref.h"
@@ -66,7 +67,7 @@ class OfflineCompiler {
static std::string getFileNameTrunk(std::string &filePath);
const HardwareInfo &getHardwareInfo() const {
return *hwInfo;
return hwInfo;
}
protected:
@@ -94,7 +95,7 @@ class OfflineCompiler {
return suffix;
}
MOCKABLE_VIRTUAL void writeOutAllFiles();
const HardwareInfo *hwInfo = nullptr;
HardwareInfo hwInfo;
std::string deviceName;
std::string familyNameWithType;