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

Rename HwHelper -> GfxCoreHelper

Browse Source 
Related-To: NEO-6853
Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
This commit is contained in:
Kamil Kopryk
2022-12-08 12:22:35 +00:00
committed by Compute-Runtime-Automation
parent 15b6d94555
commit 03b687881f
344 changed files with 2184 additions and 2176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
level_zero/core/source/cmdlist/cmdlist_hw.inl
View File

@@ -1766,7 +1766,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendBlitFill(void *ptr,
uint32_t numWaitEvents,
ze_event_handle_t *phWaitEvents) {
auto neoDevice = device->getNEODevice();
if (NEO::HwHelper::get(device->getHwInfo().platform.eRenderCoreFamily).getMaxFillPaternSizeForCopyEngine() < patternSize) {
if (NEO::GfxCoreHelper::get(device->getHwInfo().platform.eRenderCoreFamily).getMaxFillPaternSizeForCopyEngine() < patternSize) {
return ZE_RESULT_ERROR_INVALID_SIZE;
} else {
ze_result_t ret = addEventsToCmdList(numWaitEvents, phWaitEvents, true);
@@ -2313,7 +2313,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendQueryKernelTimestamps(
UNRECOVERABLE_IF(!result);
Kernel *builtinKernel = nullptr;
auto useOnlyGlobalTimestamps = NEO::HwHelper::get(device->getHwInfo().platform.eRenderCoreFamily).useOnlyGlobalTimestamps() ? 1u : 0u;
auto useOnlyGlobalTimestamps = NEO::GfxCoreHelper::get(device->getHwInfo().platform.eRenderCoreFamily).useOnlyGlobalTimestamps() ? 1u : 0u;
auto lock = device->getBuiltinFunctionsLib()->obtainUniqueOwnership();
if (pOffsets == nullptr) {

2
level_zero/core/source/cmdlist/cmdlist_hw_base.inl
View File

@@ -29,7 +29,7 @@ struct DeviceImp;
template <GFXCORE_FAMILY gfxCoreFamily>
size_t CommandListCoreFamily<gfxCoreFamily>::getReserveSshSize() {
auto &helper = NEO::HwHelper::get(device->getHwInfo().platform.eRenderCoreFamily);
auto &helper = NEO::GfxCoreHelper::get(device->getHwInfo().platform.eRenderCoreFamily);
return helper.getRenderSurfaceStateSize();
}

2
level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl
View File

@@ -631,7 +631,7 @@ bool CommandListCoreFamilyImmediate<gfxCoreFamily>::preferCopyThroughLockedPtr(N
if (NEO::DebugManager.flags.ExperimentalD2HCpuCopyThreshold.get() != -1) {
d2HThreshold = NEO::DebugManager.flags.ExperimentalD2HCpuCopyThreshold.get();
}
if (NEO::HwHelper::get(this->device->getHwInfo().platform.eRenderCoreFamily).copyThroughLockedPtrEnabled(this->device->getHwInfo())) {
if (NEO::GfxCoreHelper::get(this->device->getHwInfo().platform.eRenderCoreFamily).copyThroughLockedPtrEnabled(this->device->getHwInfo())) {
return (!srcFound && isSuitableUSMDeviceAlloc(dstAlloc, dstFound) && size <= h2DThreshold) ||
(!dstFound && isSuitableUSMDeviceAlloc(srcAlloc, srcFound) && size <= d2HThreshold);
}

6
level_zero/core/source/cmdlist/cmdlist_imp.cpp
View File

@@ -108,7 +108,7 @@ CommandList *CommandList::createImmediate(uint32_t productFamily, Device *device
NEO::CommandStreamReceiver *csr = nullptr;
auto deviceImp = static_cast<DeviceImp *>(device);
const auto &hwInfo = device->getHwInfo();
auto &hwHelper = NEO::HwHelper::get(hwInfo.platform.eRenderCoreFamily);
auto &gfxCoreHelper = NEO::GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily);
if (internalUsage) {
if (NEO::EngineHelper::isCopyOnlyEngineType(engineGroupType) && deviceImp->getActiveDevice()->getInternalCopyEngine()) {
csr = deviceImp->getActiveDevice()->getInternalCopyEngine()->commandStreamReceiver;
@@ -117,7 +117,7 @@ CommandList *CommandList::createImmediate(uint32_t productFamily, Device *device
csr = internalEngine.commandStreamReceiver;
auto internalEngineType = internalEngine.getEngineType();
auto internalEngineUsage = internalEngine.getEngineUsage();
engineGroupType = hwHelper.getEngineGroupType(internalEngineType, internalEngineUsage, hwInfo);
engineGroupType = gfxCoreHelper.getEngineGroupType(internalEngineType, internalEngineUsage, hwInfo);
}
} else {
returnValue = device->getCsrForOrdinalAndIndex(&csr, desc->ordinal, desc->index);
@@ -134,7 +134,7 @@ CommandList *CommandList::createImmediate(uint32_t productFamily, Device *device
commandList->cmdListType = CommandListType::TYPE_IMMEDIATE;
commandList->isSyncModeQueue = (desc->mode == ZE_COMMAND_QUEUE_MODE_SYNCHRONOUS);
if (!internalUsage) {
commandList->isFlushTaskSubmissionEnabled = hwHelper.isPlatformFlushTaskEnabled(hwInfo);
commandList->isFlushTaskSubmissionEnabled = gfxCoreHelper.isPlatformFlushTaskEnabled(hwInfo);
if (NEO::DebugManager.flags.EnableFlushTaskSubmission.get() != -1) {
commandList->isFlushTaskSubmissionEnabled = !!NEO::DebugManager.flags.EnableFlushTaskSubmission.get();
}

6
level_zero/core/source/cmdqueue/cmdqueue_hw.inl
View File

@@ -347,9 +347,9 @@ template <GFXCORE_FAMILY gfxCoreFamily>
void CommandQueueHw<gfxCoreFamily>::programFrontEnd(uint64_t scratchAddress, uint32_t perThreadScratchSpaceSize, NEO::LinearStream &cmdStream, NEO::StreamProperties &streamProperties) {
UNRECOVERABLE_IF(csr == nullptr);
auto &hwInfo = device->getHwInfo();
auto &hwHelper = NEO::HwHelper::get(hwInfo.platform.eRenderCoreFamily);
auto engineGroupType = hwHelper.getEngineGroupType(csr->getOsContext().getEngineType(),
csr->getOsContext().getEngineUsage(), hwInfo);
auto &gfxCoreHelper = NEO::GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily);
auto engineGroupType = gfxCoreHelper.getEngineGroupType(csr->getOsContext().getEngineType(),
csr->getOsContext().getEngineUsage(), hwInfo);
auto pVfeState = NEO::PreambleHelper<GfxFamily>::getSpaceForVfeState(&cmdStream, hwInfo, engineGroupType);
NEO::PreambleHelper<GfxFamily>::programVfeState(pVfeState,
hwInfo,

4
level_zero/core/source/context/context_imp.cpp
View File

@@ -926,10 +926,10 @@ ze_result_t ContextImp::createImage(ze_device_handle_t hDevice,
bool ContextImp::isAllocationSuitableForCompression(const StructuresLookupTable &structuresLookupTable, Device &device, size_t allocSize) {
auto &hwInfo = device.getHwInfo();
auto &hwHelper = device.getHwHelper();
auto &gfxCoreHelper = device.getGfxCoreHelper();
auto &l0GfxCoreHelper = device.getNEODevice()->getRootDeviceEnvironment().getHelper<L0GfxCoreHelper>();
if (!l0GfxCoreHelper.usmCompressionSupported(hwInfo) || !hwHelper.isBufferSizeSuitableForCompression(allocSize, hwInfo) || structuresLookupTable.uncompressedHint) {
if (!l0GfxCoreHelper.usmCompressionSupported(hwInfo) || !gfxCoreHelper.isBufferSizeSuitableForCompression(allocSize, hwInfo) || structuresLookupTable.uncompressedHint) {
return false;
}

4
level_zero/core/source/device/device.h
View File

@@ -21,7 +21,7 @@ namespace NEO {
class CommandStreamReceiver;
class DebuggerL0;
class Device;
class HwHelper;
class GfxCoreHelper;
class MemoryManager;
class SourceLevelDebugger;
struct DeviceInfo;
@@ -91,7 +91,7 @@ struct Device : _ze_device_handle_t {
virtual uint32_t getMOCS(bool l3enabled, bool l1enabled) = 0;
virtual uint32_t getMaxNumHwThreads() const = 0;
virtual NEO::HwHelper &getHwHelper() = 0;
virtual NEO::GfxCoreHelper &getGfxCoreHelper() = 0;
bool isImplicitScalingCapable() const {
return implicitScalingCapable;
}

36
level_zero/core/source/device/device_imp.cpp
View File

@@ -223,10 +223,10 @@ void DeviceImp::adjustCommandQueueDesc(uint32_t &ordinal, uint32_t &index) {
auto nodeOrdinal = NEO::DebugManager.flags.NodeOrdinal.get();
if (nodeOrdinal != -1) {
const NEO::HardwareInfo &hwInfo = neoDevice->getHardwareInfo();
const NEO::HwHelper &hwHelper = NEO::HwHelper::get(hwInfo.platform.eRenderCoreFamily);
const NEO::GfxCoreHelper &gfxCoreHelper = NEO::GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily);
auto &engineGroups = getActiveDevice()->getRegularEngineGroups();
auto engineGroupType = hwHelper.getEngineGroupType(static_cast<aub_stream::EngineType>(nodeOrdinal), NEO::EngineUsage::Regular, hwInfo);
auto engineGroupType = gfxCoreHelper.getEngineGroupType(static_cast<aub_stream::EngineType>(nodeOrdinal), NEO::EngineUsage::Regular, hwInfo);
uint32_t currentEngineIndex = 0u;
for (const auto &engine : engineGroups) {
if (engine.engineGroupType == engineGroupType) {
@@ -304,13 +304,13 @@ uint32_t DeviceImp::getCopyQueueGroupsFromSubDevice(uint32_t numberOfSubDeviceCo
return numSubDeviceCopyEngineGroups;
}
auto &coreHelper = this->neoDevice->getRootDeviceEnvironment().getHelper<NEO::CoreHelper>();
auto &gfxCoreHelper = this->neoDevice->getRootDeviceEnvironment().getHelper<NEO::GfxCoreHelper>();
auto &l0GfxCoreHelper = this->neoDevice->getRootDeviceEnvironment().getHelper<L0GfxCoreHelper>();
uint32_t subDeviceQueueGroupsIter = 0;
for (; subDeviceQueueGroupsIter < std::min(numSubDeviceCopyEngineGroups, numberOfSubDeviceCopyEngineGroupsRequested); subDeviceQueueGroupsIter++) {
pCommandQueueGroupProperties[subDeviceQueueGroupsIter].flags = ZE_COMMAND_QUEUE_GROUP_PROPERTY_FLAG_COPY;
pCommandQueueGroupProperties[subDeviceQueueGroupsIter].maxMemoryFillPatternSize = coreHelper.getMaxFillPaternSizeForCopyEngine();
pCommandQueueGroupProperties[subDeviceQueueGroupsIter].maxMemoryFillPatternSize = gfxCoreHelper.getMaxFillPaternSizeForCopyEngine();
l0GfxCoreHelper.setAdditionalGroupProperty(pCommandQueueGroupProperties[subDeviceQueueGroupsIter], this->subDeviceCopyEngineGroups[subDeviceQueueGroupsIter]);
pCommandQueueGroupProperties[subDeviceQueueGroupsIter].numQueues = static_cast<uint32_t>(this->subDeviceCopyEngineGroups[subDeviceQueueGroupsIter].engines.size());
@@ -334,7 +334,7 @@ ze_result_t DeviceImp::getCommandQueueGroupProperties(uint32_t *pCount,
return ZE_RESULT_SUCCESS;
}
auto &coreHelper = this->neoDevice->getRootDeviceEnvironment().getHelper<NEO::CoreHelper>();
auto &gfxCoreHelper = this->neoDevice->getRootDeviceEnvironment().getHelper<NEO::GfxCoreHelper>();
auto &l0GfxCoreHelper = this->neoDevice->getRootDeviceEnvironment().getHelper<L0GfxCoreHelper>();
*pCount = std::min(totalEngineGroups, *pCount);
@@ -354,7 +354,7 @@ ze_result_t DeviceImp::getCommandQueueGroupProperties(uint32_t *pCount,
}
if (engineGroups[i].engineGroupType == NEO::EngineGroupType::Copy) {
pCommandQueueGroupProperties[i].flags = ZE_COMMAND_QUEUE_GROUP_PROPERTY_FLAG_COPY;
pCommandQueueGroupProperties[i].maxMemoryFillPatternSize = coreHelper.getMaxFillPaternSizeForCopyEngine();
pCommandQueueGroupProperties[i].maxMemoryFillPatternSize = gfxCoreHelper.getMaxFillPaternSizeForCopyEngine();
}
l0GfxCoreHelper.setAdditionalGroupProperty(pCommandQueueGroupProperties[i], engineGroups[i]);
pCommandQueueGroupProperties[i].numQueues = static_cast<uint32_t>(engineGroups[i].engines.size());
@@ -643,7 +643,7 @@ static constexpr ze_device_fp_flags_t defaultFpFlags = static_cast<ze_device_fp_
ze_result_t DeviceImp::getKernelProperties(ze_device_module_properties_t *pKernelProperties) {
const auto &hardwareInfo = this->neoDevice->getHardwareInfo();
const auto &deviceInfo = this->neoDevice->getDeviceInfo();
auto &hwHelper = NEO::HwHelper::get(hardwareInfo.platform.eRenderCoreFamily);
auto &gfxCoreHelper = NEO::GfxCoreHelper::get(hardwareInfo.platform.eRenderCoreFamily);
std::string ilVersion = deviceInfo.ilVersion;
size_t majorVersionPos = ilVersion.find('_');
@@ -683,7 +683,7 @@ ze_result_t DeviceImp::getKernelProperties(ze_device_module_properties_t *pKerne
pKernelProperties->nativeKernelSupported.id[0] = 0;
processAdditionalKernelProperties(hwHelper, pKernelProperties);
processAdditionalKernelProperties(gfxCoreHelper, pKernelProperties);
pKernelProperties->maxArgumentsSize = static_cast<uint32_t>(this->neoDevice->getDeviceInfo().maxParameterSize);
@@ -741,7 +741,7 @@ ze_result_t DeviceImp::getKernelProperties(ze_device_module_properties_t *pKerne
ze_result_t DeviceImp::getProperties(ze_device_properties_t *pDeviceProperties) {
const auto &deviceInfo = this->neoDevice->getDeviceInfo();
const auto &hardwareInfo = this->neoDevice->getHardwareInfo();
auto &hwHelper = NEO::HwHelper::get(hardwareInfo.platform.eRenderCoreFamily);
auto &gfxCoreHelper = NEO::GfxCoreHelper::get(hardwareInfo.platform.eRenderCoreFamily);
pDeviceProperties->type = ZE_DEVICE_TYPE_GPU;
@@ -769,7 +769,7 @@ ze_result_t DeviceImp::getProperties(ze_device_properties_t *pDeviceProperties)
pDeviceProperties->numThreadsPerEU = deviceInfo.numThreadsPerEU;
pDeviceProperties->physicalEUSimdWidth = hwHelper.getMinimalSIMDSize();
pDeviceProperties->physicalEUSimdWidth = gfxCoreHelper.getMinimalSIMDSize();
pDeviceProperties->numEUsPerSubslice = hardwareInfo.gtSystemInfo.MaxEuPerSubSlice;
@@ -1042,12 +1042,12 @@ void *DeviceImp::getExecEnvironment() { return execEnvironment; }
BuiltinFunctionsLib *DeviceImp::getBuiltinFunctionsLib() { return builtins.get(); }
uint32_t DeviceImp::getMOCS(bool l3enabled, bool l1enabled) {
return getHwHelper().getMocsIndex(*getNEODevice()->getGmmHelper(), l3enabled, l1enabled) << 1;
return getGfxCoreHelper().getMocsIndex(*getNEODevice()->getGmmHelper(), l3enabled, l1enabled) << 1;
}
NEO::HwHelper &DeviceImp::getHwHelper() {
NEO::GfxCoreHelper &DeviceImp::getGfxCoreHelper() {
const auto &hardwareInfo = neoDevice->getHardwareInfo();
return NEO::HwHelper::get(hardwareInfo.platform.eRenderCoreFamily);
return NEO::GfxCoreHelper::get(hardwareInfo.platform.eRenderCoreFamily);
}
NEO::OSInterface &DeviceImp::getOsInterface() { return *neoDevice->getRootDeviceEnvironment().osInterface; }
@@ -1103,22 +1103,22 @@ Device *Device::create(DriverHandle *driverHandle, NEO::Device *neoDevice, bool
neoDevice->incRefInternal();
auto &hwInfo = neoDevice->getHardwareInfo();
auto &coreHelper = neoDevice->getRootDeviceEnvironment().getHelper<NEO::CoreHelper>();
auto &gfxCoreHelper = neoDevice->getRootDeviceEnvironment().getHelper<NEO::GfxCoreHelper>();
device->execEnvironment = (void *)neoDevice->getExecutionEnvironment();
device->allocationsForReuse = std::make_unique<NEO::AllocationsList>();
bool platformImplicitScaling = coreHelper.platformSupportsImplicitScaling(hwInfo);
bool platformImplicitScaling = gfxCoreHelper.platformSupportsImplicitScaling(hwInfo);
device->implicitScalingCapable = NEO::ImplicitScalingHelper::isImplicitScalingEnabled(neoDevice->getDeviceBitfield(), platformImplicitScaling);
device->metricContext = MetricDeviceContext::create(*device);
device->builtins = BuiltinFunctionsLib::create(
device, neoDevice->getBuiltIns());
device->cacheReservation = CacheReservation::create(*device);
device->maxNumHwThreads = NEO::HwHelper::getMaxThreadsForVfe(hwInfo);
device->maxNumHwThreads = NEO::GfxCoreHelper::getMaxThreadsForVfe(hwInfo);
auto osInterface = neoDevice->getRootDeviceEnvironment().osInterface.get();
device->driverInfo.reset(NEO::DriverInfo::create(&hwInfo, osInterface));
auto debugSurfaceSize = coreHelper.getSipKernelMaxDbgSurfaceSize(hwInfo);
auto debugSurfaceSize = gfxCoreHelper.getSipKernelMaxDbgSurfaceSize(hwInfo);
std::vector<char> stateSaveAreaHeader;
if (neoDevice->getDebugger() || neoDevice->getPreemptionMode() == NEO::PreemptionMode::MidThread) {
@@ -1474,7 +1474,7 @@ void DeviceImp::setDebugSession(DebugSession *session) {
}
bool DeviceImp::toPhysicalSliceId(const NEO::TopologyMap &topologyMap, uint32_t &slice, uint32_t &subslice, uint32_t &deviceIndex) {
auto hwInfo = neoDevice->getRootDeviceEnvironment().getHardwareInfo();
uint32_t subDeviceCount = NEO::HwHelper::getSubDevicesCount(hwInfo);
uint32_t subDeviceCount = NEO::GfxCoreHelper::getSubDevicesCount(hwInfo);
auto deviceBitfield = neoDevice->getDeviceBitfield();
if (topologyMap.size() == subDeviceCount && !isSubdevice) {

4
level_zero/core/source/device/device_imp.h
View File

@@ -70,7 +70,7 @@ struct DeviceImp : public Device {
void *getExecEnvironment() override;
BuiltinFunctionsLib *getBuiltinFunctionsLib() override;
uint32_t getMOCS(bool l3enabled, bool l1enabled) override;
NEO::HwHelper &getHwHelper() override;
NEO::GfxCoreHelper &getGfxCoreHelper() override;
const NEO::HardwareInfo &getHwInfo() const override;
NEO::OSInterface &getOsInterface() override;
uint32_t getPlatformInfo() const override;
@@ -90,7 +90,7 @@ struct DeviceImp : public Device {
const NEO::DeviceInfo &getDeviceInfo() const override;
void activateMetricGroups() override;
void processAdditionalKernelProperties(NEO::HwHelper &hwHelper, ze_device_module_properties_t *pKernelProperties);
void processAdditionalKernelProperties(NEO::GfxCoreHelper &gfxCoreHelper, ze_device_module_properties_t *pKernelProperties);
NEO::GraphicsAllocation *getDebugSurface() const override { return debugSurface; }
void setDebugSurface(NEO::GraphicsAllocation *debugSurface) { this->debugSurface = debugSurface; };
~DeviceImp() override;

2
level_zero/core/source/device/device_imp_helper.cpp
View File

@@ -12,7 +12,7 @@
namespace L0 {
void DeviceImp::processAdditionalKernelProperties(NEO::HwHelper &hwHelper, ze_device_module_properties_t *pKernelProperties) {
void DeviceImp::processAdditionalKernelProperties(NEO::GfxCoreHelper &gfxCoreHelper, ze_device_module_properties_t *pKernelProperties) {
}
DeviceImp::CmdListCreateFunPtrT DeviceImp::getCmdListCreateFunc(const ze_command_list_desc_t *desc) {

6
level_zero/core/source/event/event.cpp
View File

@@ -162,16 +162,16 @@ ze_result_t EventPoolImp::createEvent(const ze_event_desc_t *desc, ze_event_hand
void EventPoolImp::initializeSizeParameters(uint32_t numDevices, ze_device_handle_t *deviceHandles, DriverHandleImp &driver, const NEO::HardwareInfo &hwInfo) {
auto &l0GfxCoreHelper = L0GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily);
auto &hwHelper = NEO::HwHelper::get(hwInfo.platform.eRenderCoreFamily);
auto &gfxCoreHelper = NEO::GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily);
setEventAlignment(static_cast<uint32_t>(hwHelper.getTimestampPacketAllocatorAlignment()));
setEventAlignment(static_cast<uint32_t>(gfxCoreHelper.getTimestampPacketAllocatorAlignment()));
bool useDynamicEventPackets = l0GfxCoreHelper.useDynamicEventPacketsCount(hwInfo);
eventPackets = EventPacketsCount::eventPackets;
if (useDynamicEventPackets) {
eventPackets = driver.getEventMaxPacketCount(numDevices, deviceHandles);
}
setEventSize(static_cast<uint32_t>(alignUp(eventPackets * hwHelper.getSingleTimestampPacketSize(), eventAlignment)));
setEventSize(static_cast<uint32_t>(alignUp(eventPackets * gfxCoreHelper.getSingleTimestampPacketSize(), eventAlignment)));
eventPoolSize = alignUp<size_t>(this->numEvents * eventSize, MemoryConstants::pageSize64k);
}

2
level_zero/core/source/event/event_impl.inl
View File

@@ -386,7 +386,7 @@ ze_result_t EventImp<TagSizeT>::queryKernelTimestamp(ze_kernel_timestamp_result_
memcpy_s(&(timestampFieldForWriting), sizeof(uint64_t), static_cast<void *>(&timestampFieldToCopy), sizeof(uint64_t));
};
if (!NEO::HwHelper::get(device->getHwInfo().platform.eRenderCoreFamily).useOnlyGlobalTimestamps()) {
if (!NEO::GfxCoreHelper::get(device->getHwInfo().platform.eRenderCoreFamily).useOnlyGlobalTimestamps()) {
eventTsSetFunc(contextStartTS, result.context.kernelStart);
eventTsSetFunc(globalStartTS, result.global.kernelStart);
eventTsSetFunc(contextEndTS, result.context.kernelEnd);

4
level_zero/core/source/hw_helpers/l0_hw_helper_pvc_and_later.inl
View File

@@ -23,7 +23,7 @@ void L0GfxCoreHelperHw<Family>::getAttentionBitmaskForSingleThreads(const std::v
const uint32_t numThreadsPerEu = (hwInfo.gtSystemInfo.ThreadCount / hwInfo.gtSystemInfo.EUCount);
const uint32_t bytesPerEu = alignUp(numThreadsPerEu, 8) / 8;
const uint32_t threadsSizePerSlice = numSubslicesPerSlice * numEuPerSubslice * bytesPerEu;
const uint32_t highestEnabledSlice = NEO::HwHelper::getHighestEnabledSlice(hwInfo);
const uint32_t highestEnabledSlice = NEO::GfxCoreHelper::getHighestEnabledSlice(hwInfo);
bitmaskSize = std::max(highestEnabledSlice, hwInfo.gtSystemInfo.MaxSlicesSupported) * numSubslicesPerSlice * numEuPerSubslice * bytesPerEu;
bitmask = std::make_unique<uint8_t[]>(bitmaskSize);
@@ -47,7 +47,7 @@ std::vector<EuThread::ThreadId> L0GfxCoreHelperHw<Family>::getThreadsFromAttenti
const uint32_t bytesPerEu = alignUp(numThreadsPerEu, 8) / 8;
const uint32_t threadsSizePerSlice = numSubslicesPerSlice * numEuPerSubslice * bytesPerEu;
const uint32_t threadsSizePerSubSlice = numEuPerSubslice * bytesPerEu;
const uint32_t highestEnabledSlice = NEO::HwHelper::getHighestEnabledSlice(hwInfo);
const uint32_t highestEnabledSlice = NEO::GfxCoreHelper::getHighestEnabledSlice(hwInfo);
UNRECOVERABLE_IF(bytesPerEu != 1);
std::vector<EuThread::ThreadId> threads;

4
level_zero/core/source/hw_helpers/l0_hw_helper_skl_to_icllp.inl
View File

@@ -25,7 +25,7 @@ void L0GfxCoreHelperHw<Family>::getAttentionBitmaskForSingleThreads(const std::v
const uint32_t numThreadsPerEu = (hwInfo.gtSystemInfo.ThreadCount / hwInfo.gtSystemInfo.EUCount);
const uint32_t bytesPerEu = alignUp(numThreadsPerEu, 8) / 8;
const uint32_t threadsSizePerSlice = numSubslicesPerSlice * numEuPerSubslice * bytesPerEu;
const uint32_t highestEnabledSlice = NEO::HwHelper::getHighestEnabledSlice(hwInfo);
const uint32_t highestEnabledSlice = NEO::GfxCoreHelper::getHighestEnabledSlice(hwInfo);
bitmaskSize = std::max(highestEnabledSlice, hwInfo.gtSystemInfo.MaxSlicesSupported) * numSubslicesPerSlice * numEuPerSubslice * bytesPerEu;
bitmask = std::make_unique<uint8_t[]>(bitmaskSize);
@@ -49,7 +49,7 @@ std::vector<EuThread::ThreadId> L0GfxCoreHelperHw<Family>::getThreadsFromAttenti
const uint32_t bytesPerEu = alignUp(numThreadsPerEu, 8) / 8;
const uint32_t threadsSizePerSlice = numSubslicesPerSlice * numEuPerSubslice * bytesPerEu;
const uint32_t threadsSizePerSubSlice = numEuPerSubslice * bytesPerEu;
const uint32_t highestEnabledSlice = NEO::HwHelper::getHighestEnabledSlice(hwInfo);
const uint32_t highestEnabledSlice = NEO::GfxCoreHelper::getHighestEnabledSlice(hwInfo);
UNRECOVERABLE_IF(bytesPerEu != 1);
std::vector<EuThread::ThreadId> threads;

4
level_zero/core/source/hw_helpers/l0_hw_helper_tgllp_to_dg2.inl
View File

@@ -21,7 +21,7 @@ void L0GfxCoreHelperHw<Family>::getAttentionBitmaskForSingleThreads(const std::v
const uint32_t bytesPerEu = alignUp(numThreadsPerEu, 8) / 8;
const uint32_t numEuPerSubslice = std::min(hwInfo.gtSystemInfo.MaxEuPerSubSlice, 8u);
const uint32_t threadsSizePerSlice = numSubslicesPerSlice * numEuPerSubslice * bytesPerEu;
const uint32_t highestEnabledSlice = NEO::HwHelper::getHighestEnabledSlice(hwInfo);
const uint32_t highestEnabledSlice = NEO::GfxCoreHelper::getHighestEnabledSlice(hwInfo);
const uint32_t eusPerRow = 4;
const uint32_t numberOfRows = 2;
@@ -63,7 +63,7 @@ std::vector<EuThread::ThreadId> L0GfxCoreHelperHw<Family>::getThreadsFromAttenti
const uint32_t threadsSizePerSubSlice = numEuPerSubslice * bytesPerEu;
const uint32_t eusPerRow = 4;
const uint32_t numberOfRows = 2;
const uint32_t highestEnabledSlice = NEO::HwHelper::getHighestEnabledSlice(hwInfo);
const uint32_t highestEnabledSlice = NEO::GfxCoreHelper::getHighestEnabledSlice(hwInfo);
UNRECOVERABLE_IF(bytesPerEu != 1);
std::vector<EuThread::ThreadId> threads;

4
level_zero/core/source/image/image_hw.inl
View File

@@ -225,13 +225,13 @@ void ImageCoreFamily<gfxCoreFamily>::copyRedescribedSurfaceStateToSSH(void *surf
template <GFXCORE_FAMILY gfxCoreFamily>
bool ImageCoreFamily<gfxCoreFamily>::isSuitableForCompression(const StructuresLookupTable &structuresLookupTable, const NEO::ImageInfo &imgInfo) {
auto &hwInfo = device->getHwInfo();
auto &loCoreHelper = device->getNEODevice()->getRootDeviceEnvironment().getHelper<L0GfxCoreHelper>();
auto &loGfxCoreHelper = device->getNEODevice()->getRootDeviceEnvironment().getHelper<L0GfxCoreHelper>();
if (structuresLookupTable.uncompressedHint) {
return false;
}
return (loCoreHelper.imageCompressionSupported(hwInfo) && !imgInfo.linearStorage);
return (loGfxCoreHelper.imageCompressionSupported(hwInfo) && !imgInfo.linearStorage);
}
} // namespace L0

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

@@ -394,7 +394,7 @@ ze_result_t KernelImp::suggestMaxCooperativeGroupCount(uint32_t *totalGroupCount
dssCount = hardwareInfo.gtSystemInfo.SubSliceCount;
}
auto &helper = module->getDevice()->getNEODevice()->getRootDeviceEnvironment().getHelper<NEO::CoreHelper>();
auto &helper = module->getDevice()->getNEODevice()->getRootDeviceEnvironment().getHelper<NEO::GfxCoreHelper>();
auto &descriptor = kernelImmData->getDescriptor();
auto availableThreadCount = helper.calculateAvailableThreadCount(hardwareInfo, descriptor.kernelAttributes.numGrfRequired);
@@ -737,8 +737,8 @@ ze_result_t KernelImp::getProperties(ze_kernel_properties_t *pKernelProperties)
reinterpret_cast<ze_kernel_preferred_group_size_properties_t *>(extendedProperties);
preferredGroupSizeProperties->preferredMultiple = this->kernelImmData->getKernelInfo()->getMaxSimdSize();
auto &hwHelper = NEO::HwHelper::get(this->module->getDevice()->getHwInfo().platform.eRenderCoreFamily);
if (hwHelper.isFusedEuDispatchEnabled(this->module->getDevice()->getHwInfo(), kernelDescriptor.kernelAttributes.flags.requiresDisabledEUFusion)) {
auto &gfxCoreHelper = NEO::GfxCoreHelper::get(this->module->getDevice()->getHwInfo().platform.eRenderCoreFamily);
if (gfxCoreHelper.isFusedEuDispatchEnabled(this->module->getDevice()->getHwInfo(), kernelDescriptor.kernelAttributes.flags.requiresDisabledEUFusion)) {
preferredGroupSizeProperties->preferredMultiple *= 2;
}
}
@@ -990,13 +990,13 @@ void KernelImp::setDebugSurface() {
}
}
void *KernelImp::patchBindlessSurfaceState(NEO::GraphicsAllocation *alloc, uint32_t bindless) {
auto &hwHelper = NEO::HwHelper::get(this->module->getDevice()->getHwInfo().platform.eRenderCoreFamily);
auto surfaceStateSize = hwHelper.getRenderSurfaceStateSize();
auto &gfxCoreHelper = NEO::GfxCoreHelper::get(this->module->getDevice()->getHwInfo().platform.eRenderCoreFamily);
auto surfaceStateSize = gfxCoreHelper.getRenderSurfaceStateSize();
NEO::BindlessHeapsHelper *bindlessHeapsHelper = this->module->getDevice()->getNEODevice()->getBindlessHeapsHelper();
auto ssInHeap = bindlessHeapsHelper->allocateSSInHeap(surfaceStateSize, alloc, NEO::BindlessHeapsHelper::GLOBAL_SSH);
this->residencyContainer.push_back(ssInHeap.heapAllocation);
auto patchLocation = ptrOffset(getCrossThreadData(), bindless);
auto patchValue = hwHelper.getBindlessSurfaceExtendedMessageDescriptorValue(static_cast<uint32_t>(ssInHeap.surfaceStateOffset));
auto patchValue = gfxCoreHelper.getBindlessSurfaceExtendedMessageDescriptorValue(static_cast<uint32_t>(ssInHeap.surfaceStateOffset));
patchWithRequiredSize(const_cast<uint8_t *>(patchLocation), sizeof(patchValue), patchValue);
return ssInHeap.ssPtr;
}

6
level_zero/core/source/kernel/patch_with_implicit_surface.inl
View File

@@ -19,7 +19,7 @@ inline void patchWithImplicitSurface(ArrayRef<uint8_t> crossThreadData, ArrayRef
size_t sizeToPatch = allocation.getUnderlyingBufferSize();
auto &hwInfo = device.getHardwareInfo();
auto &hwHelper = NEO::HwHelper::get(hwInfo.platform.eRenderCoreFamily);
auto &gfxCoreHelper = NEO::GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily);
auto isDebuggerActive = device.isDebuggerActive() || device.getDebugger() != nullptr;
NEO::EncodeSurfaceStateArgs args;
args.outMemory = surfaceState;
@@ -30,10 +30,10 @@ inline void patchWithImplicitSurface(ArrayRef<uint8_t> crossThreadData, ArrayRef
args.useGlobalAtomics = useGlobalAtomics;
args.numAvailableDevices = device.getNumGenericSubDevices();
args.areMultipleSubDevicesInContext = args.numAvailableDevices > 1;
args.mocs = hwHelper.getMocsIndex(*args.gmmHelper, true, false) << 1;
args.mocs = gfxCoreHelper.getMocsIndex(*args.gmmHelper, true, false) << 1;
args.implicitScaling = implicitScaling;
args.isDebuggerActive = isDebuggerActive;
hwHelper.encodeBufferSurfaceState(args);
gfxCoreHelper.encodeBufferSurfaceState(args);
}
}

4
level_zero/core/test/aub_tests/fixtures/aub_fixture.cpp
View File

@@ -41,14 +41,14 @@ void AUBFixtureL0::setUp(const NEO::HardwareInfo *hardwareInfo, bool debuggingEn
ASSERT_NE(nullptr, hardwareInfo);
const auto &hwInfo = *hardwareInfo;
auto &hwHelper = NEO::HwHelper::get(hwInfo.platform.eRenderCoreFamily);
auto &gfxCoreHelper = NEO::GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily);
auto engineType = getChosenEngineType(hwInfo);
const ::testing::TestInfo *const testInfo = ::testing::UnitTest::GetInstance()->current_test_info();
std::stringstream strfilename;
strfilename << NEO::ApiSpecificConfig::getAubPrefixForSpecificApi();
strfilename << testInfo->test_case_name() << "_" << testInfo->name() << "_" << hwHelper.getCsTraits(engineType).name;
strfilename << testInfo->test_case_name() << "_" << testInfo->name() << "_" << gfxCoreHelper.getCsTraits(engineType).name;
executionEnvironment = new NEO::ExecutionEnvironment();
executionEnvironment->prepareRootDeviceEnvironments(1u);

2
level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.cpp
View File

@@ -98,7 +98,7 @@ void ModuleMutableCommandListFixture::setUpImpl(uint32_t revision) {
false,
returnValue));
engineGroupType = NEO::HwHelper::get(device->getHwInfo().platform.eRenderCoreFamily).getEngineGroupType(neoDevice->getDefaultEngine().getEngineType(), neoDevice->getDefaultEngine().getEngineUsage(), device->getHwInfo());
engineGroupType = NEO::GfxCoreHelper::get(device->getHwInfo().platform.eRenderCoreFamily).getEngineGroupType(neoDevice->getDefaultEngine().getEngineType(), neoDevice->getDefaultEngine().getEngineUsage(), device->getHwInfo());
commandList.reset(whiteboxCast(CommandList::create(productFamily, device, engineGroupType, 0u, returnValue)));
commandListImmediate.reset(whiteboxCast(CommandList::createImmediate(productFamily, device, &queueDesc, false, engineGroupType, returnValue)));

2
level_zero/core/test/unit_tests/mocks/mock_device.h
View File

@@ -57,7 +57,7 @@ struct Mock<Device> : public Device {
ADDMETHOD_NOBASE(systemBarrier, ze_result_t, ZE_RESULT_SUCCESS, ());
// Runtime internal methods
ADDMETHOD_NOBASE(getExecEnvironment, void *, nullptr, ());
ADDMETHOD_NOBASE_REFRETURN(getHwHelper, NEO::HwHelper &, ());
ADDMETHOD_NOBASE_REFRETURN(getGfxCoreHelper, NEO::GfxCoreHelper &, ());
ADDMETHOD_NOBASE(getBuiltinFunctionsLib, BuiltinFunctionsLib *, nullptr, ());
ADDMETHOD_CONST_NOBASE(getMaxNumHwThreads, uint32_t, 16u, ());
ADDMETHOD_NOBASE(activateMetricGroupsDeferred, ze_result_t, ZE_RESULT_SUCCESS, (uint32_t count, zet_metric_group_handle_t *phMetricGroups));

2
level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp
View File

@@ -1297,7 +1297,7 @@ using SupportedPlatforms = IsWithinProducts<IGFX_SKYLAKE, IGFX_DG1>;
HWTEST2_F(CommandListCreate, givenCommandListThenSshCorrectlyReserved, SupportedPlatforms) {
MockCommandListHw<gfxCoreFamily> commandList;
commandList.initialize(device, NEO::EngineGroupType::Compute, 0u);
auto &helper = NEO::HwHelper::get(commandList.device->getHwInfo().platform.eRenderCoreFamily);
auto &helper = NEO::GfxCoreHelper::get(commandList.device->getHwInfo().platform.eRenderCoreFamily);
auto size = helper.getRenderSurfaceStateSize();
EXPECT_EQ(commandList.getReserveSshSize(), size);
}

8
level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_5.cpp
View File

@@ -94,7 +94,7 @@ HWTEST2_F(AppendQueryKernelTimestamps, givenCommandListWhenAppendQueryKernelTime
EXPECT_EQ(1u, commandList.cmdListHelper.groupSize[1]);
EXPECT_EQ(1u, commandList.cmdListHelper.groupSize[2]);
EXPECT_EQ(NEO::HwHelper::get(device->getHwInfo().platform.eRenderCoreFamily).useOnlyGlobalTimestamps() ? 1u : 0u, commandList.cmdListHelper.useOnlyGlobalTimestamp);
EXPECT_EQ(NEO::GfxCoreHelper::get(device->getHwInfo().platform.eRenderCoreFamily).useOnlyGlobalTimestamps() ? 1u : 0u, commandList.cmdListHelper.useOnlyGlobalTimestamp);
EXPECT_EQ(1u, commandList.cmdListHelper.threadGroupDimensions.groupCountX);
EXPECT_EQ(1u, commandList.cmdListHelper.threadGroupDimensions.groupCountY);
@@ -160,7 +160,7 @@ HWTEST2_F(AppendQueryKernelTimestamps, givenCommandListWhenAppendQueryKernelTime
EXPECT_EQ(1u, commandList.cmdListHelper.groupSize[1]);
EXPECT_EQ(1u, commandList.cmdListHelper.groupSize[2]);
EXPECT_EQ(NEO::HwHelper::get(device->getHwInfo().platform.eRenderCoreFamily).useOnlyGlobalTimestamps() ? 1u : 0u, commandList.cmdListHelper.useOnlyGlobalTimestamp);
EXPECT_EQ(NEO::GfxCoreHelper::get(device->getHwInfo().platform.eRenderCoreFamily).useOnlyGlobalTimestamps() ? 1u : 0u, commandList.cmdListHelper.useOnlyGlobalTimestamp);
EXPECT_EQ(1u, commandList.cmdListHelper.threadGroupDimensions.groupCountX);
EXPECT_EQ(1u, commandList.cmdListHelper.threadGroupDimensions.groupCountY);
@@ -215,7 +215,7 @@ HWTEST2_F(AppendQueryKernelTimestamps,
EXPECT_EQ(groupSizeY, commandList.cmdListHelper.groupSize[1]);
EXPECT_EQ(groupSizeZ, commandList.cmdListHelper.groupSize[2]);
EXPECT_EQ(NEO::HwHelper::get(device->getHwInfo().platform.eRenderCoreFamily).useOnlyGlobalTimestamps() ? 1u : 0u, commandList.cmdListHelper.useOnlyGlobalTimestamp);
EXPECT_EQ(NEO::GfxCoreHelper::get(device->getHwInfo().platform.eRenderCoreFamily).useOnlyGlobalTimestamps() ? 1u : 0u, commandList.cmdListHelper.useOnlyGlobalTimestamp);
EXPECT_EQ(static_cast<uint32_t>(eventCount) / groupSizeX, commandList.cmdListHelper.threadGroupDimensions.groupCountX);
EXPECT_EQ(1u, commandList.cmdListHelper.threadGroupDimensions.groupCountY);
@@ -269,7 +269,7 @@ HWTEST2_F(AppendQueryKernelTimestamps,
EXPECT_EQ(groupSizeY, commandList.cmdListHelper.groupSize[1]);
EXPECT_EQ(groupSizeZ, commandList.cmdListHelper.groupSize[2]);
EXPECT_EQ(NEO::HwHelper::get(device->getHwInfo().platform.eRenderCoreFamily).useOnlyGlobalTimestamps() ? 1u : 0u, commandList.cmdListHelper.useOnlyGlobalTimestamp);
EXPECT_EQ(NEO::GfxCoreHelper::get(device->getHwInfo().platform.eRenderCoreFamily).useOnlyGlobalTimestamps() ? 1u : 0u, commandList.cmdListHelper.useOnlyGlobalTimestamp);
EXPECT_EQ(static_cast<uint32_t>(eventCount) / groupSizeX, commandList.cmdListHelper.threadGroupDimensions.groupCountX);
EXPECT_EQ(1u, commandList.cmdListHelper.threadGroupDimensions.groupCountY);

4
level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_6.cpp
View File

@@ -57,7 +57,7 @@ HWTEST2_F(MultiTileCopyEngineCommandListTest, GivenMultiTileDeviceWhenCreatingCo
using CommandListExecuteImmediate = Test<DeviceFixture>;
HWTEST2_F(CommandListExecuteImmediate, whenExecutingCommandListImmediateWithFlushTaskThenRequiredStreamStateIsCorrectlyReported, IsAtLeastSkl) {
auto &hwHelper = NEO::HwHelper::get(device->getHwInfo().platform.eRenderCoreFamily);
auto &gfxCoreHelper = NEO::GfxCoreHelper::get(device->getHwInfo().platform.eRenderCoreFamily);
auto &hwInfoConfig = *NEO::HwInfoConfig::get(device->getHwInfo().platform.eProductFamily);
std::unique_ptr<L0::CommandList> commandList;
const ze_command_queue_desc_t desc = {};
@@ -81,7 +81,7 @@ HWTEST2_F(CommandListExecuteImmediate, whenExecutingCommandListImmediateWithFlus
hwInfoConfig.fillFrontEndPropertiesSupportStructure(frontEndPropertiesSupport, device->getHwInfo());
int expectedDisableOverdispatch = frontEndPropertiesSupport.disableOverdispatch;
int32_t expectedIsCoherencyRequired = scmPropertiesSupport.coherencyRequired ? hwHelper.forceNonGpuCoherencyWA(true) : -1;
int32_t expectedIsCoherencyRequired = scmPropertiesSupport.coherencyRequired ? gfxCoreHelper.forceNonGpuCoherencyWA(true) : -1;
int expectedLargeGrfMode = scmPropertiesSupport.largeGrfMode ? 1 : -1;
int expectedThreadArbitrationPolicy = scmPropertiesSupport.threadArbitrationPolicy ? NEO::ThreadArbitrationPolicy::RoundRobin : -1;

4
level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp
View File

@@ -1358,8 +1358,8 @@ HWTEST2_F(CommandListAppendLaunchKernel, GivenDebugToggleSetWhenUpdateStreamProp
DebugManagerStateRestore restorer;
DebugManager.flags.ForceThreadArbitrationPolicyProgrammingWithScm.set(1);
auto &hwHelper = NEO::HwHelper::get(device->getHwInfo().platform.eRenderCoreFamily);
auto defaultThreadArbitrationPolicy = hwHelper.getDefaultThreadArbitrationPolicy();
auto &gfxCoreHelper = NEO::GfxCoreHelper::get(device->getHwInfo().platform.eRenderCoreFamily);
auto defaultThreadArbitrationPolicy = gfxCoreHelper.getDefaultThreadArbitrationPolicy();
auto nonDefaultThreadArbitrationPolicy = defaultThreadArbitrationPolicy + 1;
Mock<::L0::Kernel> kernel;

4
level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp
View File

@@ -311,10 +311,10 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenKernelUsingSyncBufferWhenAppendLau
auto pCommandList = std::make_unique<WhiteBox<::L0::CommandListCoreFamily<gfxCoreFamily>>>();
auto &hwInfoConfig = *HwInfoConfig::get(defaultHwInfo->platform.eProductFamily);
auto &hwHelper = HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily);
auto &gfxCoreHelper = GfxCoreHelper::get(defaultHwInfo->platform.eRenderCoreFamily);
auto engineGroupType = NEO::EngineGroupType::Compute;
if (hwInfoConfig.isCooperativeEngineSupported(*defaultHwInfo)) {
engineGroupType = hwHelper.getEngineGroupType(aub_stream::EngineType::ENGINE_CCS, EngineUsage::Cooperative, *defaultHwInfo);
engineGroupType = gfxCoreHelper.getEngineGroupType(aub_stream::EngineType::ENGINE_CCS, EngineUsage::Cooperative, *defaultHwInfo);
}
pCommandList->initialize(device, engineGroupType, 0u);
auto result = pCommandList->appendLaunchCooperativeKernel(kernel.toHandle(), &groupCount, nullptr, 0, nullptr);

10
level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_3.cpp
View File

@@ -89,8 +89,8 @@ HWTEST2_F(CommandQueueProgramSBATest, whenCreatingCommandQueueThenItIsInitialize
uint32_t alignedSize = 4096u;
NEO::LinearStream child(commandQueue->commandStream.getSpace(alignedSize), alignedSize);
auto &hwHelper = HwHelper::get(neoDevice->getHardwareInfo().platform.eRenderCoreFamily);
const bool isaInLocalMemory = !hwHelper.useSystemMemoryPlacementForISA(neoDevice->getHardwareInfo());
auto &gfxCoreHelper = GfxCoreHelper::get(neoDevice->getHardwareInfo().platform.eRenderCoreFamily);
const bool isaInLocalMemory = !gfxCoreHelper.useSystemMemoryPlacementForISA(neoDevice->getHardwareInfo());
commandQueue->programStateBaseAddress(0u, true, child, true);
@@ -637,8 +637,8 @@ struct EngineInstancedDeviceExecuteTests : public ::testing::Test {
hwInfo->gtSystemInfo.CCSInfo.NumberOfCCSEnabled = numCcs;
hwInfo->featureTable.flags.ftrCCSNode = (numCcs > 0);
auto &coreHelper = rootDeviceEnvironment.getHelper<CoreHelper>();
coreHelper.adjustDefaultEngineType(hwInfo);
auto &gfxCoreHelper = rootDeviceEnvironment.getHelper<GfxCoreHelper>();
gfxCoreHelper.adjustDefaultEngineType(hwInfo);
if (!multiCcsDevice(*hwInfo, numCcs)) {
return false;
@@ -652,7 +652,7 @@ struct EngineInstancedDeviceExecuteTests : public ::testing::Test {
}
bool multiCcsDevice(const HardwareInfo &hwInfo, uint32_t expectedNumCcs) {
auto gpgpuEngines = HwHelper::get(hwInfo.platform.eRenderCoreFamily).getGpgpuEngineInstances(hwInfo);
auto gpgpuEngines = GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily).getGpgpuEngineInstances(hwInfo);
uint32_t numCcs = 0;

2
level_zero/core/test/unit_tests/sources/debugger/active_debugger_fixture.h
View File

@@ -39,7 +39,7 @@ struct ActiveDebuggerFixture {
executionEnvironment->rootDeviceEnvironments[0]->builtins.reset(mockBuiltIns);
executionEnvironment->rootDeviceEnvironments[0]->initGmm();
auto isHexadecimalArrayPreferred = HwHelper::get(hwInfo.platform.eRenderCoreFamily).isSipKernelAsHexadecimalArrayPreferred();
auto isHexadecimalArrayPreferred = GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily).isSipKernelAsHexadecimalArrayPreferred();
if (isHexadecimalArrayPreferred) {
MockSipData::useMockSip = true;
}

2
level_zero/core/test/unit_tests/sources/debugger/l0_debugger_fixture.h
View File

@@ -35,7 +35,7 @@ struct L0DebuggerFixture {
hwInfo = *NEO::defaultHwInfo.get();
hwInfo.featureTable.flags.ftrLocalMemory = true;
auto isHexadecimalArrayPreferred = HwHelper::get(hwInfo.platform.eRenderCoreFamily).isSipKernelAsHexadecimalArrayPreferred();
auto isHexadecimalArrayPreferred = GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily).isSipKernelAsHexadecimalArrayPreferred();
if (isHexadecimalArrayPreferred) {
MockSipData::useMockSip = true;
}

4
level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp
View File

@@ -44,7 +44,7 @@ TEST_F(L0DebuggerTest, givenL0DebuggerWhenGettingSipAllocationThenValidSipTypeIs
ASSERT_NE(nullptr, systemRoutine);
auto sipType = SipKernel::getSipKernelType(*neoDevice);
auto isHexadecimalArrayPreferred = HwHelper::get(hwInfo.platform.eRenderCoreFamily).isSipKernelAsHexadecimalArrayPreferred();
auto isHexadecimalArrayPreferred = GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily).isSipKernelAsHexadecimalArrayPreferred();
auto expectedSipAllocation = isHexadecimalArrayPreferred
? NEO::MockSipData::mockSipKernel->getSipAllocation()
@@ -126,7 +126,7 @@ HWTEST_F(L0DebuggerPerContextAddressSpaceTest, givenDebuggingEnabledWhenCommandL
EXPECT_EQ(0u, debugModeRegisterCount);
EXPECT_EQ(0u, tdDebugControlRegisterCount);
if (!HwHelper::get(hwInfo.platform.eRenderCoreFamily).isSipWANeeded(hwInfo)) {
if (!GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily).isSipWANeeded(hwInfo)) {
auto stateSipCmds = findAll<STATE_SIP *>(cmdList.begin(), cmdList.end());
ASSERT_EQ(1u, stateSipCmds.size());

6
level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_2.cpp
View File

@@ -190,8 +190,8 @@ HWTEST2_P(L0DebuggerWithBlitterTest, givenImmediateCommandListWhenExecutingWithF
ASSERT_TRUE(FamilyType::PARSE::parseCommandBuffer(
cmdList, commandList->csr->getCS().getCpuBase(), commandList->csr->getCS().getUsed()));
const auto &hwHelper = HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily);
if (hwHelper.isSipWANeeded(hwInfo)) {
const auto &gfxCoreHelper = GfxCoreHelper::get(defaultHwInfo->platform.eRenderCoreFamily);
if (gfxCoreHelper.isSipWANeeded(hwInfo)) {
auto miLoadImm = findAll<MI_LOAD_REGISTER_IMM *>(cmdList.begin(), cmdList.end());
@@ -536,7 +536,7 @@ HWTEST_P(L0DebuggerWithBlitterTest, givenDebuggingEnabledWhenCommandListIsExecut
EXPECT_EQ(0u, tdDebugControlRegisterCount);
EXPECT_EQ(0u, globalSipFound);
if (!HwHelper::get(hwInfo.platform.eRenderCoreFamily).isSipWANeeded(hwInfo)) {
if (!GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily).isSipWANeeded(hwInfo)) {
auto stateSipCmds = findAll<STATE_SIP *>(cmdList.begin(), cmdList.end());
if (device->getDevicePreemptionMode() != PreemptionMode::MidThread) {

4
level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp
View File

@@ -322,8 +322,8 @@ HWTEST_F(KernelDebugSurfaceTest, givenDebuggerAndBindfulKernelWhenAppendingKerne
neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->debugger.reset(debugger);
auto &hwInfo = *NEO::defaultHwInfo.get();
auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
auto maxDbgSurfaceSize = hwHelper.getSipKernelMaxDbgSurfaceSize(hwInfo);
auto &gfxCoreHelper = GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily);
auto maxDbgSurfaceSize = gfxCoreHelper.getSipKernelMaxDbgSurfaceSize(hwInfo);
auto debugSurface = neoDevice->getMemoryManager()->allocateGraphicsMemoryWithProperties(
{device->getRootDeviceIndex(), true,
maxDbgSurfaceSize,

26
level_zero/core/test/unit_tests/sources/device/test_device.cpp
View File

@@ -51,7 +51,7 @@
#include <memory>
namespace NEO {
extern HwHelper *hwHelperFactory[IGFX_MAX_CORE];
extern GfxCoreHelper *gfxCoreHelperFactory[IGFX_MAX_CORE];
} // namespace NEO
namespace L0 {
@@ -1228,10 +1228,10 @@ TEST_F(DeviceTest, givenCallToDevicePropertiesThenMaximumMemoryToBeAllocatedIsCo
device->getProperties(&deviceProperties);
EXPECT_EQ(deviceProperties.maxMemAllocSize, this->neoDevice->getDeviceInfo().maxMemAllocSize);
auto &hwHelper = HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily);
auto &gfxCoreHelper = GfxCoreHelper::get(defaultHwInfo->platform.eRenderCoreFamily);
auto expectedSize = this->neoDevice->getDeviceInfo().globalMemSize;
if (!this->neoDevice->areSharedSystemAllocationsAllowed()) {
expectedSize = std::min(expectedSize, hwHelper.getMaxMemAllocSize());
expectedSize = std::min(expectedSize, gfxCoreHelper.getMaxMemAllocSize());
}
EXPECT_EQ(deviceProperties.maxMemAllocSize, expectedSize);
}
@@ -1275,15 +1275,15 @@ TEST_F(InvalidExtensionTest, givenInvalidExtensionPropertiesDuringDeviceGetPrope
HWTEST_F(DeviceTest, givenNodeOrdinalFlagWhenCallAdjustCommandQueueDescThenDescOrdinalAndDescIndexProperlySet) {
DebugManagerStateRestore restore;
struct MockHwHelper : NEO::HwHelperHw<FamilyType> {
struct MockGfxCoreHelper : NEO::GfxCoreHelperHw<FamilyType> {
EngineGroupType getEngineGroupType(aub_stream::EngineType engineType, EngineUsage engineUsage, const HardwareInfo &hwInfo) const override {
return EngineGroupType::Compute;
}
};
auto hwInfo = *defaultHwInfo.get();
MockHwHelper hwHelper{};
VariableBackup<HwHelper *> hwHelperFactoryBackup{&NEO::hwHelperFactory[static_cast<size_t>(hwInfo.platform.eRenderCoreFamily)]};
hwHelperFactoryBackup = &hwHelper;
MockGfxCoreHelper gfxCoreHelper{};
VariableBackup<GfxCoreHelper *> gfxCoreHelperFactoryBackup{&NEO::gfxCoreHelperFactory[static_cast<size_t>(hwInfo.platform.eRenderCoreFamily)]};
gfxCoreHelperFactoryBackup = &gfxCoreHelper;
hwInfo.gtSystemInfo.CCSInfo.NumberOfCCSEnabled = 2;
auto nodeOrdinal = EngineHelpers::remapEngineTypeToHwSpecific(aub_stream::EngineType::ENGINE_CCS2, hwInfo);
@@ -3572,7 +3572,7 @@ TEST_F(DeviceTest, givenValidDeviceWhenCallingReleaseResourcesThenResourcesRelea
}
HWTEST_F(DeviceTest, givenCooperativeDispatchSupportedWhenQueryingPropertiesFlagsThenCooperativeKernelsAreSupported) {
struct MockHwHelper : NEO::HwHelperHw<FamilyType> {
struct MockGfxCoreHelper : NEO::GfxCoreHelperHw<FamilyType> {
bool isCooperativeDispatchSupported(const EngineGroupType engineGroupType, const HardwareInfo &hwInfo) const override {
return isCooperativeDispatchSupportedValue;
}
@@ -3587,9 +3587,9 @@ HWTEST_F(DeviceTest, givenCooperativeDispatchSupportedWhenQueryingPropertiesFlag
rootDeviceIndex);
Mock<L0::DeviceImp> deviceImp(neoMockDevice, neoMockDevice->getExecutionEnvironment());
MockHwHelper hwHelper{};
VariableBackup<HwHelper *> hwHelperFactoryBackup{&NEO::hwHelperFactory[static_cast<size_t>(hwInfo.platform.eRenderCoreFamily)]};
hwHelperFactoryBackup = &hwHelper;
MockGfxCoreHelper gfxCoreHelper{};
VariableBackup<GfxCoreHelper *> gfxCoreHelperFactoryBackup{&NEO::gfxCoreHelperFactory[static_cast<size_t>(hwInfo.platform.eRenderCoreFamily)]};
gfxCoreHelperFactoryBackup = &gfxCoreHelper;
uint32_t count = 0;
ze_result_t res = deviceImp.getCommandQueueGroupProperties(&count, nullptr);
@@ -3597,7 +3597,7 @@ HWTEST_F(DeviceTest, givenCooperativeDispatchSupportedWhenQueryingPropertiesFlag
NEO::EngineGroupType engineGroupTypes[] = {NEO::EngineGroupType::RenderCompute, NEO::EngineGroupType::Compute};
for (auto isCooperativeDispatchSupported : ::testing::Bool()) {
hwHelper.isCooperativeDispatchSupportedValue = isCooperativeDispatchSupported;
gfxCoreHelper.isCooperativeDispatchSupportedValue = isCooperativeDispatchSupported;
std::vector<ze_command_queue_group_properties_t> properties(count);
res = deviceImp.getCommandQueueGroupProperties(&count, properties.data());
@@ -3945,7 +3945,7 @@ struct MultiSubDeviceFixture : public DeviceFixture {
using MultiSubDeviceTest = Test<MultiSubDeviceFixture<true, true, -1, -1>>;
TEST_F(MultiSubDeviceTest, GivenApiSupportAndLocalMemoryEnabledWhenDeviceContainsSubDevicesThenItIsImplicitScalingCapable) {
if (NEO::HwHelper::get(neoDevice->getHardwareInfo().platform.eRenderCoreFamily).platformSupportsImplicitScaling(neoDevice->getHardwareInfo())) {
if (NEO::GfxCoreHelper::get(neoDevice->getHardwareInfo().platform.eRenderCoreFamily).platformSupportsImplicitScaling(neoDevice->getHardwareInfo())) {
EXPECT_TRUE(device->isImplicitScalingCapable());
EXPECT_EQ(neoDevice, deviceImp->getActiveDevice());
} else {

24
level_zero/core/test/unit_tests/sources/event/test_event.cpp
View File

@@ -162,7 +162,7 @@ HWTEST_F(EventPoolCreate, givenTimestampEventsThenEventSizeSufficientForAllKerne
auto &hwInfo = device->getHwInfo();
auto &l0GfxCoreHelper = L0GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily);
auto &hwHelper = NEO::HwHelper::get(hwInfo.platform.eRenderCoreFamily);
auto &gfxCoreHelper = NEO::GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily);
uint32_t maxPacketCount = EventPacketsCount::maxKernelSplit * NEO::TimestampPacketSizeControl::preferredPacketCount;
if (l0GfxCoreHelper.useDynamicEventPacketsCount(hwInfo)) {
@@ -170,7 +170,7 @@ HWTEST_F(EventPoolCreate, givenTimestampEventsThenEventSizeSufficientForAllKerne
}
uint32_t packetsSize = maxPacketCount *
static_cast<uint32_t>(NEO::TimestampPackets<typename FamilyType::TimestampPacketType>::getSinglePacketSize());
uint32_t kernelTimestampsSize = static_cast<uint32_t>(alignUp(packetsSize, hwHelper.getTimestampPacketAllocatorAlignment()));
uint32_t kernelTimestampsSize = static_cast<uint32_t>(alignUp(packetsSize, gfxCoreHelper.getTimestampPacketAllocatorAlignment()));
EXPECT_EQ(kernelTimestampsSize, eventPool->getEventSize());
}
@@ -1522,8 +1522,8 @@ HWTEST2_F(TimestampEventCreateMultiKernel, givenOverflowingTimeStampDataOnTwoKer
ze_kernel_timestamp_result_t results;
event->queryKernelTimestamp(&results);
auto &hwHelper = HwHelper::get(device->getHwInfo().platform.eRenderCoreFamily);
if (hwHelper.useOnlyGlobalTimestamps() == false) {
auto &gfxCoreHelper = GfxCoreHelper::get(device->getHwInfo().platform.eRenderCoreFamily);
if (gfxCoreHelper.useOnlyGlobalTimestamps() == false) {
EXPECT_EQ(static_cast<uint64_t>(maxTimeStampValue - 2), results.context.kernelStart);
EXPECT_EQ(static_cast<uint64_t>(maxTimeStampValue + 2), results.context.kernelEnd);
}
@@ -2006,7 +2006,7 @@ HWTEST_F(EventSizeTests, whenCreatingEventPoolThenUseCorrectSizeAndAlignment) {
ze_result_t result = ZE_RESULT_SUCCESS;
eventPool.reset(static_cast<EventPoolImp *>(EventPool::create(device->getDriverHandle(), context, 1, &hDevice, &eventPoolDesc, result)));
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
auto &hwHelper = device->getHwHelper();
auto &gfxCoreHelper = device->getGfxCoreHelper();
auto &hwInfo = device->getHwInfo();
auto &l0GfxCoreHelper = L0GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily);
@@ -2016,7 +2016,7 @@ HWTEST_F(EventSizeTests, whenCreatingEventPoolThenUseCorrectSizeAndAlignment) {
packetCount = l0GfxCoreHelper.getEventBaseMaxPacketCount(hwInfo);
}
auto expectedAlignment = static_cast<uint32_t>(hwHelper.getTimestampPacketAllocatorAlignment());
auto expectedAlignment = static_cast<uint32_t>(gfxCoreHelper.getTimestampPacketAllocatorAlignment());
auto singlePacketSize = TimestampPackets<typename FamilyType::TimestampPacketType>::getSinglePacketSize();
auto expectedSize = static_cast<uint32_t>(alignUp(packetCount * singlePacketSize, expectedAlignment));
@@ -2041,9 +2041,9 @@ HWTEST_F(EventSizeTests, whenCreatingEventPoolThenUseCorrectSizeAndAlignment) {
}
HWTEST_F(EventSizeTests, givenDebugFlagwhenCreatingEventPoolThenUseCorrectSizeAndAlignment) {
auto &hwHelper = device->getHwHelper();
auto &gfxCoreHelper = device->getGfxCoreHelper();
auto &hwInfo = device->getHwInfo();
auto expectedAlignment = static_cast<uint32_t>(hwHelper.getTimestampPacketAllocatorAlignment());
auto expectedAlignment = static_cast<uint32_t>(gfxCoreHelper.getTimestampPacketAllocatorAlignment());
auto &l0GfxCoreHelper = L0GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily);
@@ -2428,7 +2428,7 @@ struct EventDynamicPacketUseFixture : public DeviceFixture {
void testAllDevices() {
auto &hwInfo = device->getHwInfo();
auto &l0GfxCoreHelper = L0GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily);
auto &hwHelper = NEO::HwHelper::get(hwInfo.platform.eRenderCoreFamily);
auto &gfxCoreHelper = NEO::GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily);
ze_event_pool_desc_t eventPoolDesc = {
ZE_STRUCTURE_TYPE_EVENT_POOL_DESC,
@@ -2449,7 +2449,7 @@ struct EventDynamicPacketUseFixture : public DeviceFixture {
EXPECT_EQ(expectedPoolMaxPackets, eventPoolMaxPackets);
auto eventSize = eventPool->getEventSize();
auto expectedEventSize = static_cast<uint32_t>(alignUp(expectedPoolMaxPackets * hwHelper.getSingleTimestampPacketSize(), hwHelper.getTimestampPacketAllocatorAlignment()));
auto expectedEventSize = static_cast<uint32_t>(alignUp(expectedPoolMaxPackets * gfxCoreHelper.getSingleTimestampPacketSize(), gfxCoreHelper.getTimestampPacketAllocatorAlignment()));
EXPECT_EQ(expectedEventSize, eventSize);
ze_event_desc_t eventDesc = {
@@ -2472,7 +2472,7 @@ struct EventDynamicPacketUseFixture : public DeviceFixture {
auto &hwInfo = device->getHwInfo();
auto &l0GfxCoreHelper = L0GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily);
auto &hwHelper = NEO::HwHelper::get(hwInfo.platform.eRenderCoreFamily);
auto &gfxCoreHelper = NEO::GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily);
ze_event_pool_desc_t eventPoolDesc = {
ZE_STRUCTURE_TYPE_EVENT_POOL_DESC,
@@ -2504,7 +2504,7 @@ struct EventDynamicPacketUseFixture : public DeviceFixture {
EXPECT_EQ(expectedPoolMaxPackets, eventPoolMaxPackets);
auto eventSize = eventPool->getEventSize();
auto expectedEventSize = static_cast<uint32_t>(alignUp(expectedPoolMaxPackets * hwHelper.getSingleTimestampPacketSize(), hwHelper.getTimestampPacketAllocatorAlignment()));
auto expectedEventSize = static_cast<uint32_t>(alignUp(expectedPoolMaxPackets * gfxCoreHelper.getSingleTimestampPacketSize(), gfxCoreHelper.getTimestampPacketAllocatorAlignment()));
EXPECT_EQ(expectedEventSize, eventSize);
ze_event_desc_t eventDesc = {

2
level_zero/core/test/unit_tests/sources/helper/heap_assigner_l0_tests.cpp
View File

@@ -50,7 +50,7 @@ struct MockMemoryManagerAllocationHelper : public MemoryManagerMock {
}
bool passedUseLocalMem = false;
};
TEST_F(AlocationHelperTests, GivenLinearStreamAllocTypeWhenUseExternalAllocatorForSshAndDshEnabledThenUseLocalMemEqualHwHelperValue) {
TEST_F(AlocationHelperTests, GivenLinearStreamAllocTypeWhenUseExternalAllocatorForSshAndDshEnabledThenUseLocalMemEqualGfxCoreHelperValue) {
DebugManagerStateRestore dbgRestorer;
DebugManager.flags.UseExternalAllocatorForSshAndDsh.set(true);
AllocationData allocationData;

2
level_zero/core/test/unit_tests/sources/image/test_image.cpp
View File

@@ -470,7 +470,7 @@ HWTEST2_F(ImageCreate, givenImageDescWhenFailImageAllocationThenProperErrorIsRet
desc.format.z = ZE_IMAGE_FORMAT_SWIZZLE_1;
desc.format.w = ZE_IMAGE_FORMAT_SWIZZLE_X;
auto isHexadecimalArrayPreferred = NEO::HwHelper::get(NEO::defaultHwInfo->platform.eRenderCoreFamily).isSipKernelAsHexadecimalArrayPreferred();
auto isHexadecimalArrayPreferred = NEO::GfxCoreHelper::get(NEO::defaultHwInfo->platform.eRenderCoreFamily).isSipKernelAsHexadecimalArrayPreferred();
if (isHexadecimalArrayPreferred) {
backupSipInitType = true;
}

32
level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp
View File

@@ -82,8 +82,8 @@ TEST_F(KernelInitTest, givenKernelToInitWhenItHasTooBigPrivateSizeThenOutOfMemor
TEST_F(KernelInitTest, givenKernelToInitWhenItHasTooBigScratchSizeThenInvalidBinaryIsRetutned) {
auto globalSize = device->getNEODevice()->getRootDevice()->getGlobalMemorySize(static_cast<uint32_t>(device->getNEODevice()->getDeviceBitfield().to_ulong()));
uint32_t perHwThreadPrivateMemorySizeRequested = (static_cast<uint32_t>((globalSize + device->getNEODevice()->getDeviceInfo().computeUnitsUsedForScratch) / device->getNEODevice()->getDeviceInfo().computeUnitsUsedForScratch)) / 2;
auto &hwHelper = NEO::HwHelper::get(device->getHwInfo().platform.eRenderCoreFamily);
uint32_t maxScratchSize = hwHelper.getMaxScratchSize();
auto &gfxCoreHelper = NEO::GfxCoreHelper::get(device->getHwInfo().platform.eRenderCoreFamily);
uint32_t maxScratchSize = gfxCoreHelper.getMaxScratchSize();
std::unique_ptr<MockImmutableData> mockKernelImmData =
std::make_unique<MockImmutableData>(perHwThreadPrivateMemorySizeRequested, maxScratchSize + 1, 0x100);
@@ -1329,8 +1329,8 @@ TEST_F(KernelPropertiesTests, whenPassingPreferredGroupSizeStructToGetProperties
ze_result_t res = kernel->getProperties(&kernelProperties);
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
auto &hwHelper = NEO::HwHelper::get(module->getDevice()->getHwInfo().platform.eRenderCoreFamily);
if (hwHelper.isFusedEuDispatchEnabled(module->getDevice()->getHwInfo(), false)) {
auto &gfxCoreHelper = NEO::GfxCoreHelper::get(module->getDevice()->getHwInfo().platform.eRenderCoreFamily);
if (gfxCoreHelper.isFusedEuDispatchEnabled(module->getDevice()->getHwInfo(), false)) {
EXPECT_EQ(preferredGroupProperties.preferredMultiple, static_cast<uint32_t>(kernel->getImmutableData()->getKernelInfo()->getMaxSimdSize()) * 2);
} else {
EXPECT_EQ(preferredGroupProperties.preferredMultiple, static_cast<uint32_t>(kernel->getImmutableData()->getKernelInfo()->getMaxSimdSize()));
@@ -1766,7 +1766,7 @@ TEST_F(KernelIsaTests, givenKernelInfoWhenInitializingImmutableDataWithIsaThenPa
KernelImmutableData kernelImmutableData(device);
kernelImmutableData.initialize(&kernelInfo, device, 0, nullptr, nullptr, false);
auto graphicsAllocation = kernelImmutableData.getIsaGraphicsAllocation();
auto &helper = device->getNEODevice()->getRootDeviceEnvironment().getHelper<CoreHelper>();
auto &helper = device->getNEODevice()->getRootDeviceEnvironment().getHelper<GfxCoreHelper>();
size_t isaPadding = helper.getPaddingForISAAllocation();
EXPECT_EQ(graphicsAllocation->getUnderlyingBufferSize(), kernelInfo.heapInfo.KernelHeapSize + isaPadding);
}
@@ -1805,11 +1805,11 @@ TEST_F(KernelImpPatchBindlessTest, GivenKernelImpWhenPatchBindlessOffsetCalledTh
kernel.module = &mockModule;
NEO::MockGraphicsAllocation alloc;
uint32_t bindless = 0x40;
auto &hwHelper = NEO::HwHelper::get(device->getHwInfo().platform.eRenderCoreFamily);
size_t size = hwHelper.getRenderSurfaceStateSize();
auto &gfxCoreHelper = NEO::GfxCoreHelper::get(device->getHwInfo().platform.eRenderCoreFamily);
size_t size = gfxCoreHelper.getRenderSurfaceStateSize();
auto expectedSsInHeap = device->getNEODevice()->getBindlessHeapsHelper()->allocateSSInHeap(size, &alloc, NEO::BindlessHeapsHelper::GLOBAL_SSH);
auto patchLocation = ptrOffset(kernel.getCrossThreadData(), bindless);
auto patchValue = hwHelper.getBindlessSurfaceExtendedMessageDescriptorValue(static_cast<uint32_t>(expectedSsInHeap.surfaceStateOffset));
auto patchValue = gfxCoreHelper.getBindlessSurfaceExtendedMessageDescriptorValue(static_cast<uint32_t>(expectedSsInHeap.surfaceStateOffset));
auto ssPtr = kernel.patchBindlessSurfaceState(&alloc, bindless);
@@ -1837,8 +1837,8 @@ HWTEST2_F(KernelImpPatchBindlessTest, GivenKernelImpWhenSetSurfaceStateBindlessT
neoDevice->getRootDeviceIndex(),
neoDevice->getDeviceBitfield());
auto &hwHelper = NEO::HwHelper::get(device->getHwInfo().platform.eRenderCoreFamily);
size_t size = hwHelper.getRenderSurfaceStateSize();
auto &gfxCoreHelper = NEO::GfxCoreHelper::get(device->getHwInfo().platform.eRenderCoreFamily);
size_t size = gfxCoreHelper.getRenderSurfaceStateSize();
uint64_t gpuAddress = 0x2000;
void *buffer = reinterpret_cast<void *>(gpuAddress);
@@ -1872,8 +1872,8 @@ HWTEST2_F(KernelImpPatchBindlessTest, GivenKernelImpWhenSetSurfaceStateBindfulTh
neoDevice->getRootDeviceIndex(),
neoDevice->getDeviceBitfield());
auto &hwHelper = NEO::HwHelper::get(device->getHwInfo().platform.eRenderCoreFamily);
size_t size = hwHelper.getRenderSurfaceStateSize();
auto &gfxCoreHelper = NEO::GfxCoreHelper::get(device->getHwInfo().platform.eRenderCoreFamily);
size_t size = gfxCoreHelper.getRenderSurfaceStateSize();
uint64_t gpuAddress = 0x2000;
void *buffer = reinterpret_cast<void *>(gpuAddress);
@@ -1908,8 +1908,8 @@ HWTEST2_F(KernelImpL3CachingTests, GivenKernelImpWhenSetSurfaceStateWithUnaligne
neoDevice->getNumGenericSubDevices() > 1,
neoDevice->getRootDeviceIndex(),
neoDevice->getDeviceBitfield());
auto &hwHelper = NEO::HwHelper::get(device->getHwInfo().platform.eRenderCoreFamily);
size_t size = hwHelper.getRenderSurfaceStateSize();
auto &gfxCoreHelper = NEO::GfxCoreHelper::get(device->getHwInfo().platform.eRenderCoreFamily);
size_t size = gfxCoreHelper.getRenderSurfaceStateSize();
uint64_t gpuAddress = 0x2000;
void *buffer = reinterpret_cast<void *>(0x20123);
@@ -2234,8 +2234,8 @@ HWTEST2_F(SetKernelArg, givenImageAndBindlessKernelWhenSetArgImageThenCopySurfac
imageArg.bindful = undefined<SurfaceStateHeapOffset>;
ze_image_desc_t desc = {};
desc.stype = ZE_STRUCTURE_TYPE_IMAGE_DESC;
auto &hwHelper = NEO::HwHelper::get(neoDevice->getHardwareInfo().platform.eRenderCoreFamily);
auto surfaceStateSize = hwHelper.getRenderSurfaceStateSize();
auto &gfxCoreHelper = NEO::GfxCoreHelper::get(neoDevice->getHardwareInfo().platform.eRenderCoreFamily);
auto surfaceStateSize = gfxCoreHelper.getRenderSurfaceStateSize();
auto imageHW = std::make_unique<MyMockImage<gfxCoreFamily>>();
auto ret = imageHW->initialize(device, &desc);

28
level_zero/core/test/unit_tests/sources/kernel/test_kernel_2.cpp
View File

@@ -14,7 +14,7 @@
#include "level_zero/core/test/unit_tests/mocks/mock_kernel.h"
#include "level_zero/core/test/unit_tests/mocks/mock_module.h"
namespace NEO {
extern HwHelper *hwHelperFactory[IGFX_MAX_CORE];
extern GfxCoreHelper *gfxCoreHelperFactory[IGFX_MAX_CORE];
}
namespace L0 {
#include "level_zero/core/source/kernel/patch_with_implicit_surface.inl"
@@ -278,7 +278,7 @@ TEST_F(KernelImp, GivenNumChannelsZeroWhenSettingGroupSizeThenLocalIdsNotGenerat
}
HWTEST_F(KernelImp, givenSurfaceStateHeapWhenPatchWithImplicitSurfaceCalledThenIsDebuggerActiveIsSetCorrectly) {
struct MockHwHelper : NEO::HwHelperHw<FamilyType> {
struct MockGfxCoreHelper : NEO::GfxCoreHelperHw<FamilyType> {
void encodeBufferSurfaceState(EncodeSurfaceStateArgs &args) override {
savedSurfaceStateArgs = args;
++encodeBufferSurfaceStateCalled;
@@ -286,10 +286,10 @@ HWTEST_F(KernelImp, givenSurfaceStateHeapWhenPatchWithImplicitSurfaceCalledThenI
EncodeSurfaceStateArgs savedSurfaceStateArgs;
size_t encodeBufferSurfaceStateCalled{0};
};
MockHwHelper hwHelper{};
MockGfxCoreHelper gfxCoreHelper{};
auto hwInfo = *defaultHwInfo.get();
VariableBackup<HwHelper *> hwHelperFactoryBackup{&NEO::hwHelperFactory[static_cast<size_t>(hwInfo.platform.eRenderCoreFamily)]};
hwHelperFactoryBackup = &hwHelper;
VariableBackup<GfxCoreHelper *> gfxCoreHelperFactoryBackup{&NEO::gfxCoreHelperFactory[static_cast<size_t>(hwInfo.platform.eRenderCoreFamily)]};
gfxCoreHelperFactoryBackup = &gfxCoreHelper;
using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE;
@@ -299,13 +299,13 @@ HWTEST_F(KernelImp, givenSurfaceStateHeapWhenPatchWithImplicitSurfaceCalledThenI
uintptr_t ptrToPatchInCrossThreadData = 0;
NEO::MockGraphicsAllocation globalBuffer;
ArgDescPointer ptr;
ASSERT_EQ(hwHelper.encodeBufferSurfaceStateCalled, 0u);
ASSERT_EQ(gfxCoreHelper.encodeBufferSurfaceStateCalled, 0u);
{
patchWithImplicitSurface(crossThreadDataArrayRef, surfaceStateHeapArrayRef,
ptrToPatchInCrossThreadData,
globalBuffer, ptr,
*neoDevice, false, false);
EXPECT_EQ(hwHelper.encodeBufferSurfaceStateCalled, 0u);
EXPECT_EQ(gfxCoreHelper.encodeBufferSurfaceStateCalled, 0u);
}
{
ptr.bindful = 1;
@@ -313,8 +313,8 @@ HWTEST_F(KernelImp, givenSurfaceStateHeapWhenPatchWithImplicitSurfaceCalledThenI
ptrToPatchInCrossThreadData,
globalBuffer, ptr,
*neoDevice, false, false);
ASSERT_EQ(hwHelper.encodeBufferSurfaceStateCalled, 1u);
EXPECT_FALSE(hwHelper.savedSurfaceStateArgs.isDebuggerActive);
ASSERT_EQ(gfxCoreHelper.encodeBufferSurfaceStateCalled, 1u);
EXPECT_FALSE(gfxCoreHelper.savedSurfaceStateArgs.isDebuggerActive);
}
{
neoDevice->setDebuggerActive(true);
@@ -322,8 +322,8 @@ HWTEST_F(KernelImp, givenSurfaceStateHeapWhenPatchWithImplicitSurfaceCalledThenI
ptrToPatchInCrossThreadData,
globalBuffer, ptr,
*neoDevice, false, false);
ASSERT_EQ(hwHelper.encodeBufferSurfaceStateCalled, 2u);
EXPECT_TRUE(hwHelper.savedSurfaceStateArgs.isDebuggerActive);
ASSERT_EQ(gfxCoreHelper.encodeBufferSurfaceStateCalled, 2u);
EXPECT_TRUE(gfxCoreHelper.savedSurfaceStateArgs.isDebuggerActive);
}
{
neoDevice->setDebuggerActive(false);
@@ -333,8 +333,8 @@ HWTEST_F(KernelImp, givenSurfaceStateHeapWhenPatchWithImplicitSurfaceCalledThenI
ptrToPatchInCrossThreadData,
globalBuffer, ptr,
*neoDevice, false, false);
ASSERT_EQ(hwHelper.encodeBufferSurfaceStateCalled, 3u);
EXPECT_TRUE(hwHelper.savedSurfaceStateArgs.isDebuggerActive);
ASSERT_EQ(gfxCoreHelper.encodeBufferSurfaceStateCalled, 3u);
EXPECT_TRUE(gfxCoreHelper.savedSurfaceStateArgs.isDebuggerActive);
}
}
@@ -366,7 +366,7 @@ class KernelImpSuggestMaxCooperativeGroupCountTests : public KernelImp {
KernelImp::SetUp();
kernelInfo.kernelDescriptor = &kernelDescriptor;
auto &hardwareInfo = device->getHwInfo();
auto &helper = device->getNEODevice()->getRootDeviceEnvironment().getHelper<CoreHelper>();
auto &helper = device->getNEODevice()->getRootDeviceEnvironment().getHelper<GfxCoreHelper>();
availableThreadCount = helper.calculateAvailableThreadCount(hardwareInfo, numGrf);
dssCount = hardwareInfo.gtSystemInfo.DualSubSliceCount;

6
level_zero/core/test/unit_tests/sources/memory/test_memory.cpp
View File

@@ -341,7 +341,7 @@ HWTEST2_F(CompressionMemoryTest, givenDeviceUsmWhenAllocatingThenEnableCompressi
device->getNEODevice()->getRootDeviceEnvironment().getMutableHardwareInfo()->capabilityTable.ftrRenderCompressedBuffers = true;
auto &hwInfo = device->getHwInfo();
auto &l0GfxCoreHelper = device->getNEODevice()->getRootDeviceEnvironment().getHelper<L0GfxCoreHelper>();
auto &hwHelper = NEO::HwHelperHw<FamilyType>::get();
auto &gfxCoreHelper = NEO::GfxCoreHelperHw<FamilyType>::get();
// Default path
{
@@ -366,7 +366,7 @@ HWTEST2_F(CompressionMemoryTest, givenDeviceUsmWhenAllocatingThenEnableCompressi
auto allocation = allocDeviceMem(2048);
EXPECT_EQ(hwHelper.isBufferSizeSuitableForCompression(2048, hwInfo), allocation->isCompressionEnabled());
EXPECT_EQ(gfxCoreHelper.isBufferSizeSuitableForCompression(2048, hwInfo), allocation->isCompressionEnabled());
context->freeMem(ptr);
@@ -453,7 +453,7 @@ HWTEST2_F(CompressionMemoryTest, givenDeviceUsmWhenAllocatingThenEnableCompressi
auto allocation = allocDeviceMem(1);
if (!hwHelper.isBufferSizeSuitableForCompression(1, hwInfo)) {
if (!gfxCoreHelper.isBufferSizeSuitableForCompression(1, hwInfo)) {
EXPECT_FALSE(allocation->isCompressionEnabled());
}

2
level_zero/core/test/unit_tests/xe_hpc_core/test_cmdlist_xe_hpc_core.cpp
View File

@@ -974,7 +974,7 @@ HWTEST2_F(CreateCommandListXeHpcTest, givenXeHpcPlatformsWhenImmediateCommandLis
auto &hwInfo = device->getHwInfo();
auto &defaultEngine = neoDevice->getDefaultEngine();
auto engineGroupType = NEO::HwHelper::get(hwInfo.platform.eRenderCoreFamily).getEngineGroupType(defaultEngine.getEngineType(), defaultEngine.getEngineUsage(), hwInfo);
auto engineGroupType = NEO::GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily).getEngineGroupType(defaultEngine.getEngineType(), defaultEngine.getEngineUsage(), hwInfo);
ze_command_queue_desc_t queueDesc{};
queueDesc.ordinal = 0u;

8
level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_module_dg2.cpp
View File

@@ -27,8 +27,8 @@ HWTEST2_F(KernelDebugSurfaceDG2Test, givenDebuggerWhenKernelInitializeCalledThen
neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->debugger.reset(debugger);
auto &hwInfo = *NEO::defaultHwInfo.get();
auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
auto maxDbgSurfaceSize = hwHelper.getSipKernelMaxDbgSurfaceSize(hwInfo);
auto &gfxCoreHelper = GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily);
auto maxDbgSurfaceSize = gfxCoreHelper.getSipKernelMaxDbgSurfaceSize(hwInfo);
auto debugSurface = neoDevice->getMemoryManager()->allocateGraphicsMemoryWithProperties(
{device->getRootDeviceIndex(), true,
maxDbgSurfaceSize,
@@ -83,8 +83,8 @@ HWTEST2_F(KernelDebugSurfaceDG2Test, givenNoDebuggerButDebuggerActiveSetWhenPatc
neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->debugger.reset(debugger);
auto &hwInfo = *NEO::defaultHwInfo.get();
auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
auto maxDbgSurfaceSize = hwHelper.getSipKernelMaxDbgSurfaceSize(hwInfo);
auto &gfxCoreHelper = GfxCoreHelper::get(hwInfo.platform.eRenderCoreFamily);
auto maxDbgSurfaceSize = gfxCoreHelper.getSipKernelMaxDbgSurfaceSize(hwInfo);
auto debugSurface = neoDevice->getMemoryManager()->allocateGraphicsMemoryWithProperties(
{device->getRootDeviceIndex(), true,
maxDbgSurfaceSize,