diff --git a/level_zero/core/source/cmdlist/cmdlist_hw.h b/level_zero/core/source/cmdlist/cmdlist_hw.h index df12efcae1..387d57b255 100644 --- a/level_zero/core/source/cmdlist/cmdlist_hw.h +++ b/level_zero/core/source/cmdlist/cmdlist_hw.h @@ -43,10 +43,7 @@ struct Event; template struct CommandListCoreFamily : CommandListImp { - using BaseClass = CommandListImp; using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; - using INTERFACE_DESCRIPTOR_DATA = typename GfxFamily::INTERFACE_DESCRIPTOR_DATA; - using STATE_BASE_ADDRESS = typename GfxFamily::STATE_BASE_ADDRESS; using CommandListImp::CommandListImp; ze_result_t initialize(Device *device, NEO::EngineGroupType engineGroupType, ze_command_list_flags_t flags) override; diff --git a/level_zero/core/source/cmdlist/cmdlist_hw.inl b/level_zero/core/source/cmdlist/cmdlist_hw.inl index 2e839098a4..63265145f6 100644 --- a/level_zero/core/source/cmdlist/cmdlist_hw.inl +++ b/level_zero/core/source/cmdlist/cmdlist_hw.inl @@ -108,7 +108,6 @@ ze_result_t CommandListCoreFamily::reset() { template ze_result_t CommandListCoreFamily::initialize(Device *device, NEO::EngineGroupType engineGroupType, ze_command_list_flags_t flags) { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; this->device = device; this->commandListPreemptionMode = device->getDevicePreemptionMode(); this->engineGroupType = engineGroupType; @@ -158,8 +157,6 @@ ze_result_t CommandListCoreFamily::executeCommandListImmediate(bo template ze_result_t CommandListCoreFamily::close() { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; - commandContainer.removeDuplicatesFromResidencyContainer(); NEO::EncodeBatchBufferStartOrEnd::programBatchBufferEnd(commandContainer); @@ -260,7 +257,6 @@ ze_result_t CommandListCoreFamily::appendLaunchMultipleKernelsInd auto alloc = allocData->gpuAllocations.getGraphicsAllocation(device->getRootDeviceIndex()); commandContainer.addToResidencyContainer(alloc); - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; for (uint32_t i = 0; i < numKernels; i++) { NEO::EncodeMathMMIO::encodeGreaterThanPredicate(commandContainer, alloc->getGpuAddress(), i); @@ -279,9 +275,7 @@ ze_result_t CommandListCoreFamily::appendLaunchMultipleKernelsInd template ze_result_t CommandListCoreFamily::appendEventReset(ze_event_handle_t hEvent) { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using POST_SYNC_OPERATION = typename GfxFamily::PIPE_CONTROL::POST_SYNC_OPERATION; - using MI_BATCH_BUFFER_END = typename GfxFamily::MI_BATCH_BUFFER_END; auto event = Event::fromHandle(hEvent); uint64_t baseAddr = event->getGpuAddress(this->device); @@ -869,7 +863,6 @@ ze_result_t CommandListCoreFamily::appendMemoryCopyBlit(uintptr_t auto clearColorAllocation = device->getNEODevice()->getDefaultEngine().commandStreamReceiver->getClearColorAllocation(); - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; auto blitProperties = NEO::BlitProperties::constructPropertiesForCopy(dstPtrAlloc, srcPtrAlloc, {dstOffset, 0, 0}, {srcOffset, 0, 0}, {size, 0, 0}, 0, 0, 0, 0, clearColorAllocation); commandContainer.addToResidencyContainer(dstPtrAlloc); commandContainer.addToResidencyContainer(srcPtrAlloc); @@ -893,8 +886,6 @@ ze_result_t CommandListCoreFamily::appendMemoryCopyBlitRegion(NEO size_t dstRowPitch, size_t dstSlicePitch, const Vec3 &srcSize, const Vec3 &dstSize, ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; - dstRegion.originX += static_cast(dstOffset); srcRegion.originX += static_cast(srcOffset); uint32_t bytesPerPixel = NEO::BlitCommandsHelper::getAvailableBytesPerPixel(copySize.x, srcRegion.originX, dstRegion.originX, srcSize.x, dstSize.x); @@ -939,8 +930,6 @@ ze_result_t CommandListCoreFamily::appendCopyImageBlit(NEO::Graph size_t dstRowPitch, size_t dstSlicePitch, size_t bytesPerPixel, const Vec3 ©Size, const Vec3 &srcSize, const Vec3 &dstSize, ze_event_handle_t hSignalEvent) { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; - auto clearColorAllocation = device->getNEODevice()->getDefaultEngine().commandStreamReceiver->getClearColorAllocation(); auto blitProperties = NEO::BlitProperties::constructPropertiesForCopy(dst, src, @@ -963,8 +952,6 @@ ze_result_t CommandListCoreFamily::appendPageFaultCopy(NEO::Graph NEO::GraphicsAllocation *srcAllocation, size_t size, bool flushHost) { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; - size_t middleElSize = sizeof(uint32_t) * 4; uintptr_t rightSize = size % middleElSize; bool isStateless = false; @@ -1022,7 +1009,6 @@ ze_result_t CommandListCoreFamily::appendMemoryCopy(void *dstptr, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; uintptr_t start = reinterpret_cast(dstptr); bool isStateless = false; @@ -1411,7 +1397,6 @@ ze_result_t CommandListCoreFamily::appendMemoryFill(void *ptr, return res; } - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; bool hostPointerNeedsFlush = false; NEO::SvmAllocationData *allocData = nullptr; @@ -1653,7 +1638,6 @@ void CommandListCoreFamily::appendSignalEventPostWalker(ze_event_ appendEventForProfiling(hEvent, false); } else { using POST_SYNC_OPERATION = typename GfxFamily::PIPE_CONTROL::POST_SYNC_OPERATION; - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; commandContainer.addToResidencyContainer(&event->getAllocation(this->device)); uint64_t baseAddr = event->getGpuAddress(this->device); @@ -1686,7 +1670,6 @@ void CommandListCoreFamily::appendSignalEventPostWalker(ze_event_ template void CommandListCoreFamily::appendEventForProfilingCopyCommand(ze_event_handle_t hEvent, bool beforeWalker) { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; auto event = Event::fromHandle(hEvent); if (!event->isEventTimestampFlagSet()) { @@ -1799,7 +1782,6 @@ inline ze_result_t CommandListCoreFamily::addEventsToCmdList(uint template ze_result_t CommandListCoreFamily::appendSignalEvent(ze_event_handle_t hEvent) { using POST_SYNC_OPERATION = typename GfxFamily::PIPE_CONTROL::POST_SYNC_OPERATION; - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; auto event = Event::fromHandle(hEvent); commandContainer.addToResidencyContainer(&event->getAllocation(this->device)); @@ -1868,8 +1850,6 @@ template ze_result_t CommandListCoreFamily::appendWaitOnEvents(uint32_t numEvents, ze_event_handle_t *phEvent) { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; - using MI_SEMAPHORE_WAIT = typename GfxFamily::MI_SEMAPHORE_WAIT; using COMPARE_OPERATION = typename GfxFamily::MI_SEMAPHORE_WAIT::COMPARE_OPERATION; NEO::Device *neoDevice = device->getNEODevice(); @@ -2017,7 +1997,6 @@ ze_result_t CommandListCoreFamily::appendWriteGlobalTimestamp( uint64_t *dstptr, ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using POST_SYNC_OPERATION = typename GfxFamily::PIPE_CONTROL::POST_SYNC_OPERATION; if (numWaitEvents > 0) { @@ -2169,7 +2148,6 @@ ze_result_t CommandListCoreFamily::reserveSpace(size_t size, void template ze_result_t CommandListCoreFamily::prepareIndirectParams(const ze_group_count_t *pThreadGroupDimensions) { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; auto allocData = device->getDriverHandle()->getSvmAllocsManager()->getSVMAlloc(pThreadGroupDimensions); if (allocData) { auto alloc = allocData->gpuAllocations.getGraphicsAllocation(device->getRootDeviceIndex()); @@ -2198,7 +2176,6 @@ ze_result_t CommandListCoreFamily::prepareIndirectParams(const ze template void CommandListCoreFamily::updateStreamProperties(Kernel &kernel, bool isMultiOsContextCapable, bool isCooperative) { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using VFE_STATE_TYPE = typename GfxFamily::VFE_STATE_TYPE; auto &hwInfo = device->getHwInfo(); @@ -2233,7 +2210,6 @@ void CommandListCoreFamily::updateStreamProperties(Kernel &kernel template void CommandListCoreFamily::clearCommandsToPatch() { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using VFE_STATE_TYPE = typename GfxFamily::VFE_STATE_TYPE; for (auto &commandToPatch : commandsToPatch) { @@ -2251,8 +2227,6 @@ void CommandListCoreFamily::clearCommandsToPatch() { template ze_result_t CommandListCoreFamily::setGlobalWorkSizeIndirect(NEO::CrossThreadDataOffset offsets[3], uint64_t crossThreadAddress, uint32_t lws[3]) { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; - NEO::EncodeIndirectParams::setGlobalWorkSizeIndirect(commandContainer, offsets, crossThreadAddress, lws); return ZE_RESULT_SUCCESS; @@ -2260,6 +2234,8 @@ ze_result_t CommandListCoreFamily::setGlobalWorkSizeIndirect(NEO: template void CommandListCoreFamily::programStateBaseAddress(NEO::CommandContainer &container, bool genericMediaStateClearRequired) { + using STATE_BASE_ADDRESS = typename GfxFamily::STATE_BASE_ADDRESS; + const auto &hwInfo = this->device->getHwInfo(); bool isRcs = (this->engineGroupType == NEO::EngineGroupType::RenderCompute); diff --git a/level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl b/level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl index b81cdf4978..d8f137f10b 100644 --- a/level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl +++ b/level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl @@ -40,7 +40,6 @@ template void CommandListCoreFamily::applyMemoryRangesBarrier(uint32_t numRanges, const size_t *pRangeSizes, const void **pRanges) { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; NEO::LinearStream *commandStream = commandContainer.getCommandStream(); NEO::SVMAllocsManager *svmAllocsManager = @@ -128,9 +127,6 @@ ze_result_t CommandListCoreFamily::appendLaunchKernelWithParams(z bool isIndirect, bool isPredicate, bool isCooperative) { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; - using COMPUTE_WALKER = typename GfxFamily::COMPUTE_WALKER; - using STATE_BASE_ADDRESS = typename GfxFamily::STATE_BASE_ADDRESS; const auto &hwInfo = this->device->getHwInfo(); if (NEO::DebugManager.flags.ForcePipeControlPriorToWalker.get()) { diff --git a/level_zero/core/source/cmdqueue/cmdqueue_hw.inl b/level_zero/core/source/cmdqueue/cmdqueue_hw.inl index cfa86ca3c9..83db6c56d1 100644 --- a/level_zero/core/source/cmdqueue/cmdqueue_hw.inl +++ b/level_zero/core/source/cmdqueue/cmdqueue_hw.inl @@ -70,16 +70,9 @@ ze_result_t CommandQueueHw::executeCommandLists( ze_fence_handle_t hFence, bool performMigration) { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using MI_BATCH_BUFFER_START = typename GfxFamily::MI_BATCH_BUFFER_START; using MI_BATCH_BUFFER_END = typename GfxFamily::MI_BATCH_BUFFER_END; - using PIPE_CONTROL = typename GfxFamily::PIPE_CONTROL; - using POST_SYNC_OPERATION = typename PIPE_CONTROL::POST_SYNC_OPERATION; - - using MI_LOAD_REGISTER_MEM = typename GfxFamily::MI_LOAD_REGISTER_MEM; - using MI_LOAD_REGISTER_IMM = typename GfxFamily::MI_LOAD_REGISTER_IMM; - auto lockCSR = csr->obtainUniqueOwnership(); auto anyCommandListWithCooperativeKernels = false; @@ -493,7 +486,6 @@ ze_result_t CommandQueueHw::executeCommandLists( template void CommandQueueHw::programFrontEnd(uint64_t scratchAddress, uint32_t perThreadScratchSpaceSize, NEO::LinearStream &commandStream) { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; UNRECOVERABLE_IF(csr == nullptr); auto &hwInfo = device->getHwInfo(); auto &hwHelper = NEO::HwHelper::get(hwInfo.platform.eRenderCoreFamily); @@ -511,7 +503,6 @@ void CommandQueueHw::programFrontEnd(uint64_t scratchAddress, uin template size_t CommandQueueHw::estimateFrontEndCmdSize() { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; return NEO::PreambleHelper::getVFECommandsSize(); } @@ -546,15 +537,12 @@ size_t CommandQueueHw::estimateFrontEndCmdSizeForMultipleCommandL template size_t CommandQueueHw::estimatePipelineSelect() { - - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; return NEO::PreambleHelper::getCmdSizeForPipelineSelect(device->getHwInfo()); } template void CommandQueueHw::programPipelineSelect(NEO::LinearStream &commandStream) { NEO::PipelineSelectArgs args = {0, 0}; - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; NEO::PreambleHelper::programPipelineSelect(&commandStream, args, device->getHwInfo()); gpgpuEnabled = true; } @@ -566,9 +554,7 @@ bool CommandQueueHw::isDispatchTaskCountPostSyncRequired(ze_fence template void CommandQueueHw::dispatchTaskCountPostSync(NEO::LinearStream &commandStream, const NEO::HardwareInfo &hwInfo) { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; - using PIPE_CONTROL = typename GfxFamily::PIPE_CONTROL; - using POST_SYNC_OPERATION = typename PIPE_CONTROL::POST_SYNC_OPERATION; + using POST_SYNC_OPERATION = typename GfxFamily::PIPE_CONTROL::POST_SYNC_OPERATION; uint64_t postSyncAddress = csr->getTagAllocation()->getGpuAddress(); uint32_t postSyncData = csr->peekTaskCount() + 1; @@ -595,7 +581,6 @@ void CommandQueueHw::dispatchTaskCountPostSync(NEO::LinearStream template bool CommandQueueHw::getPreemptionCmdProgramming() { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; return NEO::PreemptionHelper::getRequiredCmdStreamSize(NEO::PreemptionMode::MidThread, NEO::PreemptionMode::Initial) > 0u; } diff --git a/level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl b/level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl index d0b179ad7d..13fe2674bf 100644 --- a/level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl +++ b/level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl @@ -31,7 +31,6 @@ namespace L0 { template void CommandQueueHw::programStateBaseAddress(uint64_t gsba, bool useLocalMemoryForIndirectHeap, NEO::LinearStream &commandStream, bool cachedMOCSAllowed) { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using STATE_BASE_ADDRESS = typename GfxFamily::STATE_BASE_ADDRESS; const auto &hwInfo = this->device->getHwInfo(); @@ -91,7 +90,6 @@ void CommandQueueHw::programStateBaseAddress(uint64_t gsba, bool template size_t CommandQueueHw::estimateStateBaseAddressCmdSize() { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using STATE_BASE_ADDRESS = typename GfxFamily::STATE_BASE_ADDRESS; using PIPE_CONTROL = typename GfxFamily::PIPE_CONTROL; diff --git a/level_zero/core/source/cmdqueue/cmdqueue_xe_hp_core_and_later.inl b/level_zero/core/source/cmdqueue/cmdqueue_xe_hp_core_and_later.inl index 2d5cd6cae8..c6692a3c46 100644 --- a/level_zero/core/source/cmdqueue/cmdqueue_xe_hp_core_and_later.inl +++ b/level_zero/core/source/cmdqueue/cmdqueue_xe_hp_core_and_later.inl @@ -22,7 +22,6 @@ namespace L0 { template void CommandQueueHw::programStateBaseAddress(uint64_t gsba, bool useLocalMemoryForIndirectHeap, NEO::LinearStream &commandStream, bool cachedMOCSAllowed) { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using STATE_BASE_ADDRESS = typename GfxFamily::STATE_BASE_ADDRESS; if (NEO::ApiSpecificConfig::getBindlessConfiguration()) { NEO::Device *neoDevice = device->getNEODevice(); @@ -85,7 +84,6 @@ void CommandQueueHw::programStateBaseAddress(uint64_t gsba, bool template size_t CommandQueueHw::estimateStateBaseAddressCmdSize() { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using STATE_BASE_ADDRESS = typename GfxFamily::STATE_BASE_ADDRESS; using PIPE_CONTROL = typename GfxFamily::PIPE_CONTROL; using _3DSTATE_BINDING_TABLE_POOL_ALLOC = typename GfxFamily::_3DSTATE_BINDING_TABLE_POOL_ALLOC; @@ -138,7 +136,6 @@ void CommandQueueHw::handleScratchSpace(NEO::HeapContainer &sshHe template void CommandQueueHw::patchCommands(CommandList &commandList, uint64_t scratchAddress) { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using CFE_STATE = typename GfxFamily::CFE_STATE; uint32_t lowScratchAddress = uint32_t(0xFFFFFFFF & scratchAddress); diff --git a/level_zero/core/source/gen12lp/definitions/cache_flush_gen12lp.inl b/level_zero/core/source/gen12lp/definitions/cache_flush_gen12lp.inl index adfadd0f68..86ee6d53bd 100644 --- a/level_zero/core/source/gen12lp/definitions/cache_flush_gen12lp.inl +++ b/level_zero/core/source/gen12lp/definitions/cache_flush_gen12lp.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -17,8 +17,6 @@ void CommandListCoreFamily::applyMemoryRangesBarrier(uint32_t num const size_t *pRangeSizes, const void **pRanges) { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; - const auto &hwInfo = this->device->getHwInfo(); bool supportL3Control = hwInfo.capabilityTable.supportCacheFlushAfterWalker; if (!supportL3Control) { diff --git a/level_zero/core/source/gen9/cmdlist_gen9.h b/level_zero/core/source/gen9/cmdlist_gen9.h index bccc1f5dd0..182d9083b1 100644 --- a/level_zero/core/source/gen9/cmdlist_gen9.h +++ b/level_zero/core/source/gen9/cmdlist_gen9.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -23,7 +23,6 @@ struct CommandListProductFamily : public CommandListCoreFamily { using CommandListCoreFamily::CommandListCoreFamily; void programL3(bool isSLMused) override { - using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; NEO::EncodeL3State::encode(commandContainer, isSLMused); } };