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

Revert "Change size calculating for scratch on dg2"

Browse Source 
This reverts commit adc3ab5f24.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2021-11-30 03:25:33 +01:00
committed by Compute-Runtime-Automation
parent ede0123561
commit 383daf9dbe
10 changed files with 3 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shared/source/helpers/hw_helper_xehp_and_later.inl
View File

@@ -29,9 +29,9 @@ uint32_t HwHelperHw<GfxFamily>::getComputeUnitsUsedForScratch(const HardwareInfo
if (DebugManager.flags.OverrideNumComputeUnitsForScratch.get() != -1) {
return static_cast<uint32_t>(DebugManager.flags.OverrideNumComputeUnitsForScratch.get());
}
auto maxSubSlice = HwInfoConfig::get(pHwInfo->platform.eProductFamily)->computeMaxNeededSubSliceSpace(*pHwInfo);
// XeHP and later products return physical threads
return maxSubSlice * pHwInfo->gtSystemInfo.MaxEuPerSubSlice * (pHwInfo->gtSystemInfo.ThreadCount / pHwInfo->gtSystemInfo.EUCount);
return pHwInfo->gtSystemInfo.MaxSubSlicesSupported * pHwInfo->gtSystemInfo.MaxEuPerSubSlice * (pHwInfo->gtSystemInfo.ThreadCount / pHwInfo->gtSystemInfo.EUCount);
}
template <typename GfxFamily>

2
shared/source/os_interface/hw_info_config.h
View File

@@ -77,7 +77,6 @@ class HwInfoConfig {
virtual bool isStorageInfoAdjustmentRequired() const = 0;
virtual bool isBlitterForImagesSupported() const = 0;
virtual bool isTile64With3DSurfaceOnBCSSupported(const HardwareInfo &hwInfo) const = 0;
virtual uint32_t computeMaxNeededSubSliceSpace(const HardwareInfo &hwInfo) const = 0;
protected:
virtual LocalMemoryAccessMode getDefaultLocalMemoryAccessMode(const HardwareInfo &hwInfo) const = 0;
@@ -140,7 +139,6 @@ class HwInfoConfigHw : public HwInfoConfig {
bool isStorageInfoAdjustmentRequired() const override;
bool isBlitterForImagesSupported() const override;
bool isTile64With3DSurfaceOnBCSSupported(const HardwareInfo &hwInfo) const override;
uint32_t computeMaxNeededSubSliceSpace(const HardwareInfo &hwInfo) const override;
protected:
HwInfoConfigHw() = default;

5
shared/source/os_interface/hw_info_config.inl
View File

@@ -255,9 +255,4 @@ template <PRODUCT_FAMILY gfxProduct>
bool HwInfoConfigHw<gfxProduct>::isBlitterForImagesSupported() const {
return false;
}
template <PRODUCT_FAMILY gfxProduct>
uint32_t HwInfoConfigHw<gfxProduct>::computeMaxNeededSubSliceSpace(const HardwareInfo &hwInfo) const {
return hwInfo.gtSystemInfo.MaxSubSlicesSupported;
}
} // namespace NEO

19
shared/source/xe_hpg_core/os_agnostic_hw_info_config_dg2.inl
View File

@@ -142,22 +142,3 @@ template <>
bool HwInfoConfigHw<gfxProduct>::isTile64With3DSurfaceOnBCSSupported(const HardwareInfo &hwInfo) const {
return getSteppingFromHwRevId(hwInfo) >= REVISION_C;
}
template <>
uint32_t HwInfoConfigHw<gfxProduct>::computeMaxNeededSubSliceSpace(const HardwareInfo &hwInfo) const {
auto highestEnabledSlice = 0;
for (int highestSlice = GT_MAX_SLICE - 1; highestSlice >= 0; highestSlice--) {
if (hwInfo.gtSystemInfo.SliceInfo[highestSlice].Enabled) {
highestEnabledSlice = highestSlice + 1;
break;
}
}
auto subSlicesPerSlice = hwInfo.gtSystemInfo.MaxSubSlicesSupported / hwInfo.gtSystemInfo.MaxSlicesSupported;
auto maxSubSlice = highestEnabledSlice * subSlicesPerSlice;
if (highestEnabledSlice == 0) {
UNRECOVERABLE_IF(true);
}
return maxSubSlice;
}

4
shared/test/common/mocks/mock_hw_info_config.cpp
View File

@@ -251,9 +251,5 @@ template <>
bool HwInfoConfigHw<IGFX_UNKNOWN>::isTile64With3DSurfaceOnBCSSupported(const HardwareInfo &hwInfo) const {
return false;
}
template <>
uint32_t HwInfoConfigHw<IGFX_UNKNOWN>::computeMaxNeededSubSliceSpace(const HardwareInfo &hwInfo) const {
return hwInfo.gtSystemInfo.MaxSubSlicesSupported;
}
} //namespace NEO

4
shared/test/unit_test/main.cpp
View File

@@ -341,10 +341,6 @@ int main(int argc, char **argv) {
gtSystemInfo.IsDynamicallyPopulated = false;
// clang-format on
for (uint32_t slice = 0; slice < gtSystemInfo.MaxSlicesSupported; slice++) {
gtSystemInfo.SliceInfo[slice].Enabled = true;
}
binaryNameSuffix.append(familyName[hwInfoForTests.platform.eRenderCoreFamily]);
binaryNameSuffix.append(hwInfoForTests.capabilityTable.platformType);