Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove redundant DualSubSliceCount checks" 

This reverts commit 5e85fe5042.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation 2021-06-17 13:11:29 +02:00 committed by Compute-Runtime-Automation
parent ad18099ed8
commit 3137e82fca
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
level_zero/core/source/kernel/kernel_imp.cpp
View File

@ -400,6 +400,9 @@ ze_result_t KernelImp::suggestMaxCooperativeGroupCount(uint32_t *totalGroupCount
auto &hardwareInfo = module->getDevice()->getHwInfo(); auto &hardwareInfo = module->getDevice()->getHwInfo();
auto dssCount = hardwareInfo.gtSystemInfo.DualSubSliceCount; auto dssCount = hardwareInfo.gtSystemInfo.DualSubSliceCount;
if (dssCount == 0) {
dssCount = hardwareInfo.gtSystemInfo.SubSliceCount;
}
auto &hwHelper = NEO::HwHelper::get(hardwareInfo.platform.eRenderCoreFamily); auto &hwHelper = NEO::HwHelper::get(hardwareInfo.platform.eRenderCoreFamily);
auto &descriptor = kernelImmData->getDescriptor(); auto &descriptor = kernelImmData->getDescriptor();
auto availableThreadCount = hwHelper.calculateAvailableThreadCount( auto availableThreadCount = hwHelper.calculateAvailableThreadCount(

3
opencl/source/kernel/kernel.cpp
View File

@ -1022,6 +1022,9 @@ uint32_t Kernel::getMaxWorkGroupCount(const cl_uint workDim, const size_t *local
const auto &kernelDescriptor = kernelInfo.kernelDescriptor; const auto &kernelDescriptor = kernelInfo.kernelDescriptor;
auto dssCount = hardwareInfo.gtSystemInfo.DualSubSliceCount; auto dssCount = hardwareInfo.gtSystemInfo.DualSubSliceCount;
if (dssCount == 0) {
dssCount = hardwareInfo.gtSystemInfo.SubSliceCount;
}
auto availableThreadCount = hwHelper.calculateAvailableThreadCount( auto availableThreadCount = hwHelper.calculateAvailableThreadCount(
hardwareInfo.platform.eProductFamily, hardwareInfo.platform.eProductFamily,
kernelDescriptor.kernelAttributes.numGrfRequired, kernelDescriptor.kernelAttributes.numGrfRequired,

2
shared/source/device/device.cpp
View File

@ -194,8 +194,6 @@ bool Device::createDeviceImpl() {
setAsEngineInstanced(); setAsEngineInstanced();
auto &hwInfo = getHardwareInfo(); auto &hwInfo = getHardwareInfo();
UNRECOVERABLE_IF(0 == hwInfo.gtSystemInfo.DualSubSliceCount);
preemptionMode = PreemptionHelper::getDefaultPreemptionMode(hwInfo); preemptionMode = PreemptionHelper::getDefaultPreemptionMode(hwInfo);
auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily); auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);