Revert "Add adjustPlatformCoreFamilyForIgc helper"

This reverts commit 8fffdcc111.

Change-Id: I0415b004ef0a1465bc2658cadc66f21a99302eca
This commit is contained in:
Kamil Kopryk
2020-08-24 10:54:15 +02:00
committed by sys_ocldev
parent e910e28819
commit 145fd87f5d
12 changed files with 19 additions and 58 deletions

View File

@@ -11,7 +11,6 @@
#include "shared/source/compiler_interface/compiler_interface.inl"
#include "shared/source/debug_settings/debug_settings_manager.h"
#include "shared/source/device/device.h"
#include "shared/source/helpers/hw_helper.h"
#include "shared/source/helpers/hw_info.h"
#include "opencl/source/os_interface/os_inc_base.h"
@@ -331,6 +330,7 @@ TranslationOutput::ErrorCode CompilerInterface::getSipKernelBinary(NEO::Device &
bool CompilerInterface::loadFcl() {
return NEO::loadCompiler<IGC::FclOclDeviceCtx>(Os::frontEndDllName, fclLib, fclMain);
;
}
bool CompilerInterface::loadIgc() {
@@ -400,13 +400,8 @@ IGC::IgcOclDeviceCtxTagOCL *CompilerInterface::getIgcDeviceCtx(const Device &dev
if (productFamily != "unk") {
getHwInfoForPlatformString(productFamily, hwInfo);
}
auto &hwHelper = NEO::HwHelper::get(hwInfo->platform.eRenderCoreFamily);
auto copyHwInfo = *hwInfo;
hwHelper.adjustPlatformCoreFamilyForIgc(copyHwInfo);
IGC::PlatformHelper::PopulateInterfaceWith(*igcPlatform, copyHwInfo.platform);
IGC::GtSysInfoHelper::PopulateInterfaceWith(*igcGtSystemInfo, copyHwInfo.gtSystemInfo);
IGC::PlatformHelper::PopulateInterfaceWith(*igcPlatform, hwInfo->platform);
IGC::GtSysInfoHelper::PopulateInterfaceWith(*igcGtSystemInfo, hwInfo->gtSystemInfo);
igcFeWa.get()->SetFtrDesktop(device.getHardwareInfo().featureTable.ftrDesktop);
igcFeWa.get()->SetFtrChannelSwizzlingXOREnabled(device.getHardwareInfo().featureTable.ftrChannelSwizzlingXOREnabled);

View File

@@ -122,7 +122,6 @@ class HwHelper {
virtual bool isSpecialWorkgroupSizeRequired(const HardwareInfo &hwInfo, bool isSimulation) const = 0;
virtual uint32_t getGlobalTimeStampBits() const = 0;
virtual uint32_t getDefaultThreadArbitrationPolicy() const = 0;
virtual void adjustPlatformCoreFamilyForIgc(HardwareInfo &hwInfo) = 0;
virtual bool heapInLocalMem(const HardwareInfo &hwInfo) const = 0;
virtual bool useOnlyGlobalTimestamps() const = 0;
@@ -315,8 +314,6 @@ class HwHelperHw : public HwHelper {
uint32_t getDefaultThreadArbitrationPolicy() const override;
void adjustPlatformCoreFamilyForIgc(HardwareInfo &hwInfo) override;
bool useOnlyGlobalTimestamps() const override;
protected:

View File

@@ -179,10 +179,6 @@ bool HwHelperHw<Family>::getEnableLocalMemory(const HardwareInfo &hwInfo) const
return OSInterface::osEnableLocalMemory && isLocalMemoryEnabled(hwInfo);
}
template <typename Family>
void HwHelperHw<Family>::adjustPlatformCoreFamilyForIgc(HardwareInfo &hwInfo) {
}
template <typename Family>
AuxTranslationMode HwHelperHw<Family>::getAuxTranslationMode() {
if (DebugManager.flags.ForceAuxTranslationMode.get() != -1) {