@@ -108,7 +108,6 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::reset() {
108108template <GFXCORE_FAMILY gfxCoreFamily>
109109ze_result_t CommandListCoreFamily<gfxCoreFamily>::initialize(Device *device, NEO::EngineGroupType engineGroupType,
110110 ze_command_list_flags_t flags) {
111- using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
112111 this ->device = device;
113112 this ->commandListPreemptionMode = device->getDevicePreemptionMode ();
114113 this ->engineGroupType = engineGroupType;
@@ -158,8 +157,6 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::executeCommandListImmediate(bo
158157
159158template <GFXCORE_FAMILY gfxCoreFamily>
160159ze_result_t CommandListCoreFamily<gfxCoreFamily>::close() {
161- using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
162-
163160 commandContainer.removeDuplicatesFromResidencyContainer ();
164161 NEO::EncodeBatchBufferStartOrEnd<GfxFamily>::programBatchBufferEnd (commandContainer);
165162
@@ -260,7 +257,6 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchMultipleKernelsInd
260257 auto alloc = allocData->gpuAllocations .getGraphicsAllocation (device->getRootDeviceIndex ());
261258 commandContainer.addToResidencyContainer (alloc);
262259
263- using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
264260 for (uint32_t i = 0 ; i < numKernels; i++) {
265261 NEO::EncodeMathMMIO<GfxFamily>::encodeGreaterThanPredicate (commandContainer, alloc->getGpuAddress (), i);
266262
@@ -279,9 +275,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchMultipleKernelsInd
279275
280276template <GFXCORE_FAMILY gfxCoreFamily>
281277ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendEventReset(ze_event_handle_t hEvent) {
282- using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
283278 using POST_SYNC_OPERATION = typename GfxFamily::PIPE_CONTROL::POST_SYNC_OPERATION;
284- using MI_BATCH_BUFFER_END = typename GfxFamily::MI_BATCH_BUFFER_END;
285279 auto event = Event::fromHandle (hEvent);
286280
287281 uint64_t baseAddr = event->getGpuAddress (this ->device );
@@ -869,7 +863,6 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendMemoryCopyBlit(uintptr_t
869863
870864 auto clearColorAllocation = device->getNEODevice ()->getDefaultEngine ().commandStreamReceiver ->getClearColorAllocation ();
871865
872- using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
873866 auto blitProperties = NEO::BlitProperties::constructPropertiesForCopy (dstPtrAlloc, srcPtrAlloc, {dstOffset, 0 , 0 }, {srcOffset, 0 , 0 }, {size, 0 , 0 }, 0 , 0 , 0 , 0 , clearColorAllocation);
874867 commandContainer.addToResidencyContainer (dstPtrAlloc);
875868 commandContainer.addToResidencyContainer (srcPtrAlloc);
@@ -893,8 +886,6 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendMemoryCopyBlitRegion(NEO
893886 size_t dstRowPitch, size_t dstSlicePitch,
894887 const Vec3<size_t > &srcSize, const Vec3<size_t > &dstSize, ze_event_handle_t hSignalEvent,
895888 uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) {
896- using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
897-
898889 dstRegion.originX += static_cast <uint32_t >(dstOffset);
899890 srcRegion.originX += static_cast <uint32_t >(srcOffset);
900891 uint32_t bytesPerPixel = NEO::BlitCommandsHelper<GfxFamily>::getAvailableBytesPerPixel (copySize.x , srcRegion.originX , dstRegion.originX , srcSize.x , dstSize.x );
@@ -939,8 +930,6 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendCopyImageBlit(NEO::Graph
939930 size_t dstRowPitch, size_t dstSlicePitch,
940931 size_t bytesPerPixel, const Vec3<size_t > ©Size,
941932 const Vec3<size_t > &srcSize, const Vec3<size_t > &dstSize, ze_event_handle_t hSignalEvent) {
942- using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
943-
944933 auto clearColorAllocation = device->getNEODevice ()->getDefaultEngine ().commandStreamReceiver ->getClearColorAllocation ();
945934
946935 auto blitProperties = NEO::BlitProperties::constructPropertiesForCopy (dst, src,
@@ -963,8 +952,6 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendPageFaultCopy(NEO::Graph
963952 NEO::GraphicsAllocation *srcAllocation,
964953 size_t size, bool flushHost) {
965954
966- using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
967-
968955 size_t middleElSize = sizeof (uint32_t ) * 4 ;
969956 uintptr_t rightSize = size % middleElSize;
970957 bool isStateless = false ;
@@ -1022,7 +1009,6 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendMemoryCopy(void *dstptr,
10221009 uint32_t numWaitEvents,
10231010 ze_event_handle_t *phWaitEvents) {
10241011
1025- using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
10261012 uintptr_t start = reinterpret_cast <uintptr_t >(dstptr);
10271013 bool isStateless = false ;
10281014
@@ -1411,7 +1397,6 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendMemoryFill(void *ptr,
14111397 return res;
14121398 }
14131399
1414- using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
14151400 bool hostPointerNeedsFlush = false ;
14161401
14171402 NEO::SvmAllocationData *allocData = nullptr ;
@@ -1653,7 +1638,6 @@ void CommandListCoreFamily<gfxCoreFamily>::appendSignalEventPostWalker(ze_event_
16531638 appendEventForProfiling (hEvent, false );
16541639 } else {
16551640 using POST_SYNC_OPERATION = typename GfxFamily::PIPE_CONTROL::POST_SYNC_OPERATION;
1656- using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
16571641
16581642 commandContainer.addToResidencyContainer (&event->getAllocation (this ->device ));
16591643 uint64_t baseAddr = event->getGpuAddress (this ->device );
@@ -1686,7 +1670,6 @@ void CommandListCoreFamily<gfxCoreFamily>::appendSignalEventPostWalker(ze_event_
16861670
16871671template <GFXCORE_FAMILY gfxCoreFamily>
16881672void CommandListCoreFamily<gfxCoreFamily>::appendEventForProfilingCopyCommand(ze_event_handle_t hEvent, bool beforeWalker) {
1689- using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
16901673 auto event = Event::fromHandle (hEvent);
16911674
16921675 if (!event->isEventTimestampFlagSet ()) {
@@ -1799,7 +1782,6 @@ inline ze_result_t CommandListCoreFamily<gfxCoreFamily>::addEventsToCmdList(uint
17991782template <GFXCORE_FAMILY gfxCoreFamily>
18001783ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendSignalEvent(ze_event_handle_t hEvent) {
18011784 using POST_SYNC_OPERATION = typename GfxFamily::PIPE_CONTROL::POST_SYNC_OPERATION;
1802- using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
18031785 auto event = Event::fromHandle (hEvent);
18041786
18051787 commandContainer.addToResidencyContainer (&event->getAllocation (this ->device ));
@@ -1868,8 +1850,6 @@ template <GFXCORE_FAMILY gfxCoreFamily>
18681850ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendWaitOnEvents(uint32_t numEvents,
18691851 ze_event_handle_t *phEvent) {
18701852
1871- using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
1872- using MI_SEMAPHORE_WAIT = typename GfxFamily::MI_SEMAPHORE_WAIT;
18731853 using COMPARE_OPERATION = typename GfxFamily::MI_SEMAPHORE_WAIT::COMPARE_OPERATION;
18741854
18751855 NEO::Device *neoDevice = device->getNEODevice ();
@@ -2017,7 +1997,6 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendWriteGlobalTimestamp(
20171997 uint64_t *dstptr, ze_event_handle_t hSignalEvent,
20181998 uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) {
20191999
2020- using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
20212000 using POST_SYNC_OPERATION = typename GfxFamily::PIPE_CONTROL::POST_SYNC_OPERATION;
20222001
20232002 if (numWaitEvents > 0 ) {
@@ -2169,7 +2148,6 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::reserveSpace(size_t size, void
21692148
21702149template <GFXCORE_FAMILY gfxCoreFamily>
21712150ze_result_t CommandListCoreFamily<gfxCoreFamily>::prepareIndirectParams(const ze_group_count_t *pThreadGroupDimensions) {
2172- using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
21732151 auto allocData = device->getDriverHandle ()->getSvmAllocsManager ()->getSVMAlloc (pThreadGroupDimensions);
21742152 if (allocData) {
21752153 auto alloc = allocData->gpuAllocations .getGraphicsAllocation (device->getRootDeviceIndex ());
@@ -2198,7 +2176,6 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::prepareIndirectParams(const ze
21982176
21992177template <GFXCORE_FAMILY gfxCoreFamily>
22002178void CommandListCoreFamily<gfxCoreFamily>::updateStreamProperties(Kernel &kernel, bool isMultiOsContextCapable, bool isCooperative) {
2201- using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
22022179 using VFE_STATE_TYPE = typename GfxFamily::VFE_STATE_TYPE;
22032180
22042181 auto &hwInfo = device->getHwInfo ();
@@ -2233,7 +2210,6 @@ void CommandListCoreFamily<gfxCoreFamily>::updateStreamProperties(Kernel &kernel
22332210
22342211template <GFXCORE_FAMILY gfxCoreFamily>
22352212void CommandListCoreFamily<gfxCoreFamily>::clearCommandsToPatch() {
2236- using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
22372213 using VFE_STATE_TYPE = typename GfxFamily::VFE_STATE_TYPE;
22382214
22392215 for (auto &commandToPatch : commandsToPatch) {
@@ -2251,15 +2227,15 @@ void CommandListCoreFamily<gfxCoreFamily>::clearCommandsToPatch() {
22512227
22522228template <GFXCORE_FAMILY gfxCoreFamily>
22532229ze_result_t CommandListCoreFamily<gfxCoreFamily>::setGlobalWorkSizeIndirect(NEO::CrossThreadDataOffset offsets[3 ], uint64_t crossThreadAddress, uint32_t lws[3 ]) {
2254- using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
2255-
22562230 NEO::EncodeIndirectParams<GfxFamily>::setGlobalWorkSizeIndirect (commandContainer, offsets, crossThreadAddress, lws);
22572231
22582232 return ZE_RESULT_SUCCESS;
22592233}
22602234
22612235template <GFXCORE_FAMILY gfxCoreFamily>
22622236void CommandListCoreFamily<gfxCoreFamily>::programStateBaseAddress(NEO::CommandContainer &container, bool genericMediaStateClearRequired) {
2237+ using STATE_BASE_ADDRESS = typename GfxFamily::STATE_BASE_ADDRESS;
2238+
22632239 const auto &hwInfo = this ->device ->getHwInfo ();
22642240 bool isRcs = (this ->engineGroupType == NEO::EngineGroupType::RenderCompute);
22652241
0 commit comments