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

change config storage from string to uint

Browse Source 
Change-Id: If206fe823541fb2a64f0a555934788eef5a05da7
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
This commit is contained in:
Artur Harasimiuk
2020-01-24 17:19:06 +01:00
committed by sys_ocldev
parent 4b9dc77db3
commit 8fd1e8c511
38 changed files with 297 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
runtime/gen11/hw_info_ehl.inl
View File

@@ -233,23 +233,23 @@ void EHL_1x4x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
};
const HardwareInfo EHL::hwInfo = EHL_1x4x8::hwInfo;
const std::string EHL::defaultHardwareInfoConfig = "1x4x8";
const uint64_t EHL::defaultHardwareInfoConfig = 0x100040008;
void setupEHLHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const std::string &hwInfoConfig) {
if (hwInfoConfig == "1x4x8") {
void setupEHLHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
if (hwInfoConfig == 0x100040008) {
EHL_1x4x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "1x4x6") {
} else if (hwInfoConfig == 0x100040006) {
EHL_1x4x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "1x4x4") {
} else if (hwInfoConfig == 0x100040004) {
EHL_1x4x4::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "1x2x4") {
} else if (hwInfoConfig == 0x100020004) {
EHL_1x2x4::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "default") {
} else if (hwInfoConfig == 0x0) {
// Default config
EHL_1x4x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else {
UNRECOVERABLE_IF(true);
}
}
void (*EHL::setupHardwareInfo)(HardwareInfo *, bool, const std::string &) = setupEHLHardwareInfoImpl;
void (*EHL::setupHardwareInfo)(HardwareInfo *, bool, uint64_t) = setupEHLHardwareInfoImpl;
} // namespace NEO

14
runtime/gen11/hw_info_icllp.inl
View File

@@ -205,16 +205,16 @@ void ICLLP_1x6x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTable
};
const HardwareInfo ICLLP::hwInfo = ICLLP_1x8x8::hwInfo;
const std::string ICLLP::defaultHardwareInfoConfig = "1x8x8";
const uint64_t ICLLP::defaultHardwareInfoConfig = 0x100080008;
void setupICLLPHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const std::string &hwInfoConfig) {
if (hwInfoConfig == "1x8x8") {
void setupICLLPHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
if (hwInfoConfig == 0x100080008) {
ICLLP_1x8x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "1x4x8") {
} else if (hwInfoConfig == 0x100040008) {
ICLLP_1x4x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "1x6x8") {
} else if (hwInfoConfig == 0x100060008) {
ICLLP_1x6x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "default") {
} else if (hwInfoConfig == 0x0) {
// Default config
ICLLP_1x8x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else {
@@ -222,5 +222,5 @@ void setupICLLPHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndW
}
}
void (*ICLLP::setupHardwareInfo)(HardwareInfo *, bool, const std::string &) = setupICLLPHardwareInfoImpl;
void (*ICLLP::setupHardwareInfo)(HardwareInfo *, bool, uint64_t) = setupICLLPHardwareInfoImpl;
} // namespace NEO

12
runtime/gen11/hw_info_lkf.inl
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2019 Intel Corporation
* Copyright (C) 2018-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -140,12 +140,12 @@ void LKF_1x8x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
};
const HardwareInfo LKF::hwInfo = LKF_1x8x8::hwInfo;
const std::string LKF::defaultHardwareInfoConfig = "1x8x8";
const uint64_t LKF::defaultHardwareInfoConfig = 0x100080008;
void setupLKFHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const std::string &hwInfoConfig) {
if (hwInfoConfig == "1x8x8") {
void setupLKFHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
if (hwInfoConfig == 0x100080008) {
LKF_1x8x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "default") {
} else if (hwInfoConfig == 0x0) {
// Default config
LKF_1x8x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else {
@@ -153,5 +153,5 @@ void setupLKFHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWor
}
}
void (*LKF::setupHardwareInfo)(HardwareInfo *, bool, const std::string &) = setupLKFHardwareInfoImpl;
void (*LKF::setupHardwareInfo)(HardwareInfo *, bool, uint64_t) = setupLKFHardwareInfoImpl;
} // namespace NEO

14
runtime/gen12lp/hw_info_tgllp.inl
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2019 Intel Corporation
* Copyright (C) 2019-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -182,14 +182,14 @@ void TGLLP_1x2x16::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTabl
};
const HardwareInfo TGLLP::hwInfo = TGLLP_1x6x16::hwInfo;
const std::string TGLLP::defaultHardwareInfoConfig = "1x6x16";
const uint64_t TGLLP::defaultHardwareInfoConfig = 0x100060016;
void setupTGLLPHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const std::string &hwInfoConfig) {
if (hwInfoConfig == "1x6x16") {
void setupTGLLPHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
if (hwInfoConfig == 0x100060016) {
TGLLP_1x6x16::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "1x2x16") {
} else if (hwInfoConfig == 0x100020016) {
TGLLP_1x2x16::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "default") {
} else if (hwInfoConfig == 0x0) {
// Default config
TGLLP_1x6x16::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else {
@@ -197,5 +197,5 @@ void setupTGLLPHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndW
}
}
void (*TGLLP::setupHardwareInfo)(HardwareInfo *, bool, const std::string &) = setupTGLLPHardwareInfoImpl;
void (*TGLLP::setupHardwareInfo)(HardwareInfo *, bool, uint64_t) = setupTGLLPHardwareInfoImpl;
} // namespace NEO

18
runtime/gen8/hw_info_bdw.inl
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2019 Intel Corporation
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -225,18 +225,18 @@ void BDW_2x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
};
const HardwareInfo BDW::hwInfo = BDW_1x3x8::hwInfo;
const std::string BDW::defaultHardwareInfoConfig = "1x3x8";
const uint64_t BDW::defaultHardwareInfoConfig = 0x100030008;
void setupBDWHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const std::string &hwInfoConfig) {
if (hwInfoConfig == "2x3x8") {
void setupBDWHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
if (hwInfoConfig == 0x200030008) {
BDW_2x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "1x3x8") {
} else if (hwInfoConfig == 0x100030008) {
BDW_1x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "1x3x6") {
} else if (hwInfoConfig == 0x100030006) {
BDW_1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "1x2x6") {
} else if (hwInfoConfig == 0x100020006) {
BDW_1x2x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "default") {
} else if (hwInfoConfig == 0x0) {
// Default config
BDW_1x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else {
@@ -244,5 +244,5 @@ void setupBDWHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWor
}
}
void (*BDW::setupHardwareInfo)(HardwareInfo *, bool, const std::string &) = setupBDWHardwareInfoImpl;
void (*BDW::setupHardwareInfo)(HardwareInfo *, bool, uint64_t) = setupBDWHardwareInfoImpl;
} // namespace NEO

14
runtime/gen9/hw_info_bxt.inl
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2019 Intel Corporation
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -180,14 +180,14 @@ void BXT_1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
};
const HardwareInfo BXT::hwInfo = BXT_1x3x6::hwInfo;
const std::string BXT::defaultHardwareInfoConfig = "1x3x6";
const uint64_t BXT::defaultHardwareInfoConfig = 0x100030006;
void setupBXTHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const std::string &hwInfoConfig) {
if (hwInfoConfig == "1x2x6") {
void setupBXTHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
if (hwInfoConfig == 0x100020006) {
BXT_1x2x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "1x3x6") {
} else if (hwInfoConfig == 0x100030006) {
BXT_1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "default") {
} else if (hwInfoConfig == 0x0) {
// Default config
BXT_1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else {
@@ -195,5 +195,5 @@ void setupBXTHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWor
}
}
void (*BXT::setupHardwareInfo)(HardwareInfo *, bool, const std::string &) = setupBXTHardwareInfoImpl;
void (*BXT::setupHardwareInfo)(HardwareInfo *, bool, uint64_t) = setupBXTHardwareInfoImpl;
} // namespace NEO

20
runtime/gen9/hw_info_cfl.inl
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2019 Intel Corporation
* Copyright (C) 2018-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -261,20 +261,20 @@ void CFL_3x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
};
const HardwareInfo CFL::hwInfo = CFL_1x3x6::hwInfo;
const std::string CFL::defaultHardwareInfoConfig = "1x3x6";
const uint64_t CFL::defaultHardwareInfoConfig = 0x100030006;
void setupCFLHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const std::string &hwInfoConfig) {
if (hwInfoConfig == "1x3x8") {
void setupCFLHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
if (hwInfoConfig == 0x100030008) {
CFL_1x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "2x3x8") {
} else if (hwInfoConfig == 0x200030008) {
CFL_2x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "3x3x8") {
} else if (hwInfoConfig == 0x300030008) {
CFL_3x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "1x2x6") {
} else if (hwInfoConfig == 0x100020006) {
CFL_1x2x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "1x3x6") {
} else if (hwInfoConfig == 0x100030006) {
CFL_1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "default") {
} else if (hwInfoConfig == 0x0) {
// Default config
CFL_1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else {
@@ -282,5 +282,5 @@ void setupCFLHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWor
}
}
void (*CFL::setupHardwareInfo)(HardwareInfo *, bool, const std::string &) = setupCFLHardwareInfoImpl;
void (*CFL::setupHardwareInfo)(HardwareInfo *, bool, uint64_t) = setupCFLHardwareInfoImpl;
} // namespace NEO

14
runtime/gen9/hw_info_glk.inl
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2019 Intel Corporation
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -168,14 +168,14 @@ void GLK_1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
};
const HardwareInfo GLK::hwInfo = GLK_1x3x6::hwInfo;
const std::string GLK::defaultHardwareInfoConfig = "1x3x6";
const uint64_t GLK::defaultHardwareInfoConfig = 0x100030006;
void setupGLKHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const std::string &hwInfoConfig) {
if (hwInfoConfig == "1x2x6") {
void setupGLKHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
if (hwInfoConfig == 0x100020006) {
GLK_1x2x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "1x3x6") {
} else if (hwInfoConfig == 0x100030006) {
GLK_1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "default") {
} else if (hwInfoConfig == 0x0) {
// Default config
GLK_1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else {
@@ -183,5 +183,5 @@ void setupGLKHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWor
}
}
void (*GLK::setupHardwareInfo)(HardwareInfo *, bool, const std::string &) = setupGLKHardwareInfoImpl;
void (*GLK::setupHardwareInfo)(HardwareInfo *, bool, uint64_t) = setupGLKHardwareInfoImpl;
} // namespace NEO

20
runtime/gen9/hw_info_kbl.inl
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2019 Intel Corporation
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -271,20 +271,20 @@ void KBL_3x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
};
const HardwareInfo KBL::hwInfo = KBL_1x3x6::hwInfo;
const std::string KBL::defaultHardwareInfoConfig = "1x3x6";
const uint64_t KBL::defaultHardwareInfoConfig = 0x100030006;
void setupKBLHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const std::string &hwInfoConfig) {
if (hwInfoConfig == "1x3x8") {
void setupKBLHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
if (hwInfoConfig == 0x100030008) {
KBL_1x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "2x3x8") {
} else if (hwInfoConfig == 0x200030008) {
KBL_2x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "3x3x8") {
} else if (hwInfoConfig == 0x300030008) {
KBL_3x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "1x2x6") {
} else if (hwInfoConfig == 0x100020006) {
KBL_1x2x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "1x3x6") {
} else if (hwInfoConfig == 0x100030006) {
KBL_1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "default") {
} else if (hwInfoConfig == 0x0) {
// Default config
KBL_1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else {
@@ -292,5 +292,5 @@ void setupKBLHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWor
}
}
void (*KBL::setupHardwareInfo)(HardwareInfo *, bool, const std::string &) = setupKBLHardwareInfoImpl;
void (*KBL::setupHardwareInfo)(HardwareInfo *, bool, uint64_t) = setupKBLHardwareInfoImpl;
} // namespace NEO

20
runtime/gen9/hw_info_skl.inl
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2019 Intel Corporation
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -283,20 +283,20 @@ void SKL_3x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
};
const HardwareInfo SKL::hwInfo = SKL_1x3x8::hwInfo;
const std::string SKL::defaultHardwareInfoConfig = "1x3x8";
const uint64_t SKL::defaultHardwareInfoConfig = 0x000100030008;
void setupSKLHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const std::string &hwInfoConfig) {
if (hwInfoConfig == "1x3x8") {
void setupSKLHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
if (hwInfoConfig == 0x100030008) {
SKL_1x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "2x3x8") {
} else if (hwInfoConfig == 0x200030008) {
SKL_2x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "3x3x8") {
} else if (hwInfoConfig == 0x300030008) {
SKL_3x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "1x2x6") {
} else if (hwInfoConfig == 0x100020006) {
SKL_1x2x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "1x3x6") {
} else if (hwInfoConfig == 0x100030006) {
SKL_1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == "default") {
} else if (hwInfoConfig == 0x0) {
// Default config
SKL_1x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else {
@@ -304,5 +304,5 @@ void setupSKLHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWor
}
}
void (*SKL::setupHardwareInfo)(HardwareInfo *, bool, const std::string &) = setupSKLHardwareInfoImpl;
void (*SKL::setupHardwareInfo)(HardwareInfo *, bool, uint64_t) = setupSKLHardwareInfoImpl;
} // namespace NEO

4
runtime/helpers/enable_product.inl
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2019 Intel Corporation
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -17,7 +17,7 @@ struct EnableGfxProductHw {
EnableGfxFamilyHw<static_cast<GFXCORE_FAMILY>(gfxFamily)> enableFamily;
hardwarePrefix[gfxProduct] = HwMapper<gfxProduct>::abbreviation;
defaultHardwareInfoConfigTable[gfxProduct] = &GfxProduct::defaultHardwareInfoConfig;
defaultHardwareInfoConfigTable[gfxProduct] = GfxProduct::defaultHardwareInfoConfig;
hardwareInfoTable[gfxProduct] = &GfxProduct::hwInfo;
hardwareInfoSetup[gfxProduct] = GfxProduct::setupHardwareInfo;
}

16
runtime/os_interface/device_factory.cpp
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2019 Intel Corporation
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -27,19 +27,19 @@ bool DeviceFactory::getDevicesForProductFamilyOverride(size_t &numDevices, Execu
auto hwInfoConst = *platformDevices;
getHwInfoForPlatformString(productFamily, hwInfoConst);
numDevices = 0;
std::string hwInfoConfig;
DebugManager.getHardwareInfoOverride(hwInfoConfig);
std::string hwInfoConfigStr;
uint64_t hwInfoConfig = 0x0;
DebugManager.getHardwareInfoOverride(hwInfoConfigStr);
auto hardwareInfo = executionEnvironment.getMutableHardwareInfo();
*hardwareInfo = *hwInfoConst;
if (hwInfoConfig == "default") {
hwInfoConfig = *defaultHardwareInfoConfigTable[hwInfoConst->platform.eProductFamily];
}
if (!setHwInfoValuesFromConfigString(hwInfoConfig, *hardwareInfo)) {
if (hwInfoConfigStr == "default") {
hwInfoConfig = defaultHardwareInfoConfigTable[hwInfoConst->platform.eProductFamily];
} else if (!parseHwInfoConfigString(hwInfoConfigStr, hwInfoConfig)) {
return false;
}
setHwInfoValuesFromConfig(hwInfoConfig, *hardwareInfo);
hardwareInfoSetup[hwInfoConst->platform.eProductFamily](hardwareInfo, true, hwInfoConfig);