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

Move CompilerProductHelper ownership to RootDeviceEnvironment and Ocloc

Browse Source 
Related-To: NEO-6853
Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
This commit is contained in:
Kamil Kopryk
2023-01-31 12:34:59 +00:00
committed by Compute-Runtime-Automation
parent 4eb443f4dc
commit 7487d1450e
14 changed files with 81 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -425,7 +425,7 @@ std::string &OfflineCompiler::getBuildLog() {
return buildLog;
}
int OfflineCompiler::initHardwareInfoForDeprecatedAcronyms(std::string deviceName, int deviceId) {
int OfflineCompiler::initHardwareInfoForDeprecatedAcronyms(std::string deviceName, int deviceId, std::unique_ptr<NEO::CompilerProductHelper> &&compilerProductHelper) {
std::vector<PRODUCT_FAMILY> allSupportedProduct{ALL_SUPPORTED_PRODUCT_FAMILIES};
std::transform(deviceName.begin(), deviceName.end(), deviceName.begin(), ::tolower);
@@ -441,7 +441,8 @@ int OfflineCompiler::initHardwareInfoForDeprecatedAcronyms(std::string deviceNam
uint64_t config = hwInfoConfig ? hwInfoConfig : defaultHardwareInfoConfigTable[hwInfo.platform.eProductFamily];
setHwInfoValuesFromConfig(config, hwInfo);
hardwareInfoBaseSetup[hwInfo.platform.eProductFamily](&hwInfo, true);
compilerProductHelper = NEO::CompilerProductHelper::create(hwInfo.platform.eProductFamily);
UNRECOVERABLE_IF(compilerProductHelper == nullptr);
productFamilyName = hardwarePrefix[hwInfo.platform.eProductFamily];
return SUCCESS;
}
@@ -463,7 +464,7 @@ int OfflineCompiler::initHardwareInfoForProductConfig(std::string deviceName) {
}
if (productConfig != AOT::UNKNOWN_ISA) {
if (argHelper->getHwInfoForProductConfig(productConfig, hwInfo, hwInfoConfig)) {
if (argHelper->getHwInfoForProductConfig(productConfig, hwInfo, hwInfoConfig, std::move(compilerProductHelper))) {
if (revisionId != -1) {
hwInfo.platform.usRevId = revisionId;
}
@@ -496,7 +497,7 @@ int OfflineCompiler::initHardwareInfo(std::string deviceName) {
return retVal;
}
}
retVal = initHardwareInfoForDeprecatedAcronyms(deviceName, deviceId);
retVal = initHardwareInfoForDeprecatedAcronyms(deviceName, deviceId, std::move(compilerProductHelper));
return retVal;
}
@@ -792,8 +793,7 @@ void OfflineCompiler::unifyExcludeIrFlags() {
void OfflineCompiler::setStatelessToStatefulBufferOffsetFlag() {
bool isStatelessToStatefulBufferOffsetSupported = true;
if (!deviceName.empty()) {
const auto &compilerProductHelper = *CompilerProductHelper::get(hwInfo.platform.eProductFamily);
isStatelessToStatefulBufferOffsetSupported = compilerProductHelper.isStatelessToStatefulBufferOffsetSupported();
isStatelessToStatefulBufferOffsetSupported = compilerProductHelper->isStatelessToStatefulBufferOffsetSupported();
}
if (DebugManager.flags.EnableStatelessToStatefulBufferOffsetOpt.get() != -1) {
isStatelessToStatefulBufferOffsetSupported = DebugManager.flags.EnableStatelessToStatefulBufferOffsetOpt.get() != 0;
@@ -804,14 +804,13 @@ void OfflineCompiler::setStatelessToStatefulBufferOffsetFlag() {
}
void OfflineCompiler::appendExtraInternalOptions(std::string &internalOptions) {
const auto &compilerProductHelper = *CompilerProductHelper::get(hwInfo.platform.eProductFamily);
if (compilerProductHelper.isForceToStatelessRequired() && !forceStatelessToStatefulOptimization) {
if (compilerProductHelper->isForceToStatelessRequired() && !forceStatelessToStatefulOptimization) {
CompilerOptions::concatenateAppend(internalOptions, CompilerOptions::greaterThan4gbBuffersRequired);
}
if (compilerProductHelper.isForceEmuInt32DivRemSPRequired()) {
if (compilerProductHelper->isForceEmuInt32DivRemSPRequired()) {
CompilerOptions::concatenateAppend(internalOptions, CompilerOptions::forceEmuInt32DivRemSP);
}
CompilerOptions::concatenateAppend(internalOptions, compilerProductHelper.getCachingPolicyOptions(false));
CompilerOptions::concatenateAppend(internalOptions, compilerProductHelper->getCachingPolicyOptions(false));
}
void OfflineCompiler::parseDebugSettings() {