diff --git a/opencl/source/command_queue/enqueue_common.h b/opencl/source/command_queue/enqueue_common.h index df8cd7e510..cafaa867f1 100644 --- a/opencl/source/command_queue/enqueue_common.h +++ b/opencl/source/command_queue/enqueue_common.h @@ -700,7 +700,7 @@ CompletionStamp CommandQueueHw::enqueueNonBlocked( auto mediaSamplerRequired = false; uint32_t numGrfRequired = GrfConfig::DefaultGrfNumber; - auto specialPipelineSelectMode = false; + auto systolicPipelineSelectMode = false; Kernel *kernel = nullptr; bool auxTranslationRequired = false; bool useGlobalAtomics = false; @@ -716,7 +716,7 @@ CompletionStamp CommandQueueHw::enqueueNonBlocked( mediaSamplerRequired |= kernel->isVmeKernel(); auto numGrfRequiredByKernel = static_cast(kernel->getKernelInfo().kernelDescriptor.kernelAttributes.numGrfRequired); numGrfRequired = std::max(numGrfRequired, numGrfRequiredByKernel); - specialPipelineSelectMode |= kernel->requiresSpecialPipelineSelectMode(); + systolicPipelineSelectMode |= kernel->requiresSystolicPipelineSelectMode(); auxTranslationRequired |= kernel->isAuxTranslationRequired(); if (kernel->hasUncacheableStatelessArgs()) { anyUncacheableArgs = true; @@ -791,7 +791,7 @@ CompletionStamp CommandQueueHw::enqueueNonBlocked( isTextureCacheFlushNeeded(commandType)); // textureCacheFlush dispatchFlags.pipelineSelectArgs.mediaSamplerRequired = mediaSamplerRequired; - dispatchFlags.pipelineSelectArgs.specialPipelineSelectMode = specialPipelineSelectMode; + dispatchFlags.pipelineSelectArgs.systolicPipelineSelectMode = systolicPipelineSelectMode; dispatchFlags.disableEUFusion = kernel->getKernelInfo().kernelDescriptor.kernelAttributes.flags.requiresDisabledEUFusion; diff --git a/opencl/source/helpers/task_information.cpp b/opencl/source/helpers/task_information.cpp index 06462d7393..7917c53032 100644 --- a/opencl/source/helpers/task_information.cpp +++ b/opencl/source/helpers/task_information.cpp @@ -223,7 +223,7 @@ CompletionStamp &CommandComputeKernel::submit(uint32_t taskLevel, bool terminate } dispatchFlags.barrierTimestampPacketNodes = ×tampPacketDependencies->barrierNodes; } - dispatchFlags.pipelineSelectArgs.specialPipelineSelectMode = kernel->requiresSpecialPipelineSelectMode(); + dispatchFlags.pipelineSelectArgs.systolicPipelineSelectMode = kernel->requiresSystolicPipelineSelectMode(); if (anyUncacheableArgs) { dispatchFlags.l3CacheSettings = L3CachingSettings::l3CacheOff; } else if (!kernel->areStatelessWritesUsed()) { diff --git a/opencl/source/kernel/kernel.cpp b/opencl/source/kernel/kernel.cpp index 6a2ea7a92d..1699d89e6e 100644 --- a/opencl/source/kernel/kernel.cpp +++ b/opencl/source/kernel/kernel.cpp @@ -2178,7 +2178,7 @@ void Kernel::reconfigureKernel() { maxKernelWorkGroupSize >>= 1; } this->containsStatelessWrites = kernelDescriptor.kernelAttributes.flags.usesStatelessWrites; - this->specialPipelineSelectMode = kernelDescriptor.kernelAttributes.flags.usesSpecialPipelineSelectMode; + this->systolicPipelineSelectMode = kernelDescriptor.kernelAttributes.flags.usesSystolicPipelineSelectMode; } bool Kernel::requiresCacheFlushCommand(const CommandQueue &commandQueue) const { diff --git a/opencl/source/kernel/kernel.h b/opencl/source/kernel/kernel.h index a6157020c9..88c2493094 100644 --- a/opencl/source/kernel/kernel.h +++ b/opencl/source/kernel/kernel.h @@ -283,7 +283,7 @@ class Kernel : public ReferenceTrackedObject { bool getAllowNonUniform() const { return program->getAllowNonUniform(); } bool isVmeKernel() const { return kernelInfo.kernelDescriptor.kernelAttributes.flags.usesVme; } - bool requiresSpecialPipelineSelectMode() const { return specialPipelineSelectMode; } + bool requiresSystolicPipelineSelectMode() const { return systolicPipelineSelectMode; } void performKernelTuning(CommandStreamReceiver &commandStreamReceiver, const Vec3 &lws, const Vec3 &gws, const Vec3 &offsets, TimestampPacketContainer *timestampContainer); MOCKABLE_VIRTUAL bool isSingleSubdevicePreferred() const; @@ -527,7 +527,7 @@ class Kernel : public ReferenceTrackedObject { bool usingImages = false; bool usingImagesOnly = false; bool auxTranslationRequired = false; - bool specialPipelineSelectMode = false; + bool systolicPipelineSelectMode = false; bool svmAllocationsRequireCacheFlush = false; bool isUnifiedMemorySyncRequired = true; bool debugEnabled = false; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp index afcd8eaeb9..cef4a12575 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp @@ -1084,7 +1084,7 @@ HWTEST2_F(CommandStreamReceiverFlushTaskTests, givenSpecialPipelineSelectModeCha CsrSizeRequestFlags csrSizeRequest = {}; DispatchFlags flags = DispatchFlagsHelper::createDefaultDispatchFlags(); - csrSizeRequest.specialPipelineSelectModeChanged = true; + csrSizeRequest.systolicPipelineSelectMode = true; commandStreamReceiver.overrideCsrSizeReqFlags(csrSizeRequest); size_t size = commandStreamReceiver.getCmdSizeForPipelineSelect(); diff --git a/opencl/test/unit_test/helpers/task_information_tests.cpp b/opencl/test/unit_test/helpers/task_information_tests.cpp index 565956867f..c77dffdf4f 100644 --- a/opencl/test/unit_test/helpers/task_information_tests.cpp +++ b/opencl/test/unit_test/helpers/task_information_tests.cpp @@ -294,7 +294,7 @@ HWTEST_F(DispatchFlagsTests, givenCommandComputeKernelWhenSubmitThenPassCorrectD std::unique_ptr command(new CommandComputeKernel(*mockCmdQ, kernelOperation, surfaces, flushDC, slmUsed, ndRangeKernel, nullptr, preemptionMode, kernel, 1)); command->submit(20, false); - EXPECT_FALSE(mockCsr->passedDispatchFlags.pipelineSelectArgs.specialPipelineSelectMode); + EXPECT_FALSE(mockCsr->passedDispatchFlags.pipelineSelectArgs.systolicPipelineSelectMode); EXPECT_EQ(kernel.mockKernel->isVmeKernel(), mockCsr->passedDispatchFlags.pipelineSelectArgs.mediaSamplerRequired); EXPECT_EQ(mockCmdQ->flushStamp->getStampReference(), mockCsr->passedDispatchFlags.flushStampReference); EXPECT_EQ(mockCmdQ->getThrottle(), mockCsr->passedDispatchFlags.throttle); @@ -342,7 +342,7 @@ HWTEST_F(DispatchFlagsTests, givenClCommandCopyImageWhenSubmitThenFlushTextureCa std::unique_ptr command(new CommandComputeKernel(*mockCmdQ, kernelOperation, surfaces, flushDC, slmUsed, commandType, nullptr, preemptionMode, kernel, 1)); command->submit(20, false); - EXPECT_FALSE(mockCsr->passedDispatchFlags.pipelineSelectArgs.specialPipelineSelectMode); + EXPECT_FALSE(mockCsr->passedDispatchFlags.pipelineSelectArgs.systolicPipelineSelectMode); EXPECT_EQ(kernel.mockKernel->isVmeKernel(), mockCsr->passedDispatchFlags.pipelineSelectArgs.mediaSamplerRequired); EXPECT_EQ(mockCmdQ->flushStamp->getStampReference(), mockCsr->passedDispatchFlags.flushStampReference); EXPECT_EQ(mockCmdQ->getThrottle(), mockCsr->passedDispatchFlags.throttle); diff --git a/opencl/test/unit_test/helpers/test_preamble_xehp_and_later.cpp b/opencl/test/unit_test/helpers/test_preamble_xehp_and_later.cpp index 294e7f83ae..e787ce58f4 100644 --- a/opencl/test/unit_test/helpers/test_preamble_xehp_and_later.cpp +++ b/opencl/test/unit_test/helpers/test_preamble_xehp_and_later.cpp @@ -542,12 +542,12 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, RenderSurfaceStateXeHPAndLaterTests, givenSpecificP using PipelineSelectTest = ::testing::Test; -HWCMDTEST_F(IGFX_XE_HP_CORE, PipelineSelectTest, whenCallingIsSpecialPipelineSelectModeChangedThenReturnCorrectValue) { +HWCMDTEST_F(IGFX_XE_HP_CORE, PipelineSelectTest, whenCallingIsSystolicPipelineSelectModeChangedThenReturnCorrectValue) { using PIPELINE_SELECT = typename FamilyType::PIPELINE_SELECT; - bool oldPipelineSelectSpecialMode = true; - bool newPipelineSelectSpecialMode = false; + bool oldPipelineSelectSystolicMode = true; + bool newPipelineSelectSystolicMode = false; - auto result = PreambleHelper::isSpecialPipelineSelectModeChanged(oldPipelineSelectSpecialMode, newPipelineSelectSpecialMode, *defaultHwInfo); + auto result = PreambleHelper::isSystolicPipelineSelectModeChanged(oldPipelineSelectSystolicMode, newPipelineSelectSystolicMode, *defaultHwInfo); EXPECT_TRUE(result); } diff --git a/opencl/test/unit_test/mocks/mock_kernel.h b/opencl/test/unit_test/mocks/mock_kernel.h index 6ae2f9d4bc..57c3487d2e 100644 --- a/opencl/test/unit_test/mocks/mock_kernel.h +++ b/opencl/test/unit_test/mocks/mock_kernel.h @@ -243,7 +243,7 @@ class MockKernel : public Kernel { void makeResident(CommandStreamReceiver &commandStreamReceiver) override; void getResidency(std::vector &dst) override; - void setSpecialPipelineSelectMode(bool value) { specialPipelineSelectMode = value; } + void setSystolicPipelineSelectMode(bool value) { systolicPipelineSelectMode = value; } bool requiresCacheFlushCommand(const CommandQueue &commandQueue) const override; diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/command_stream_receiver_hw_tests_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/command_stream_receiver_hw_tests_pvc.cpp index 312d2286e4..297b31b902 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/command_stream_receiver_hw_tests_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/command_stream_receiver_hw_tests_pvc.cpp @@ -65,11 +65,11 @@ PVCTEST_F(PvcCommandStreamReceiverFlushTaskTests, givenNotExistPolicyWhenFlushin EXPECT_EQ(notExistPolicy, commandStreamReceiver.streamProperties.stateComputeMode.threadArbitrationPolicy.value); } -PVCTEST_F(PvcCommandStreamReceiverFlushTaskTests, givenRevisionBAndAboveWhenLastSpecialPipelineSelectModeIsTrueAndFlushTaskIsCalledThenDontReprogramPipelineSelect) { +PVCTEST_F(PvcCommandStreamReceiverFlushTaskTests, givenRevisionBAndAboveWhenLastSystolicPipelineSelectModeIsTrueAndFlushTaskIsCalledThenDontReprogramPipelineSelect) { auto hwInfo = pDevice->getRootDeviceEnvironment().getMutableHardwareInfo(); auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); - flushTaskFlags.pipelineSelectArgs.specialPipelineSelectMode = true; + flushTaskFlags.pipelineSelectArgs.systolicPipelineSelectMode = true; flushTaskFlags.pipelineSelectArgs.mediaSamplerRequired = false; struct { @@ -90,8 +90,8 @@ PVCTEST_F(PvcCommandStreamReceiverFlushTaskTests, givenRevisionBAndAboveWhenLast flushTask(commandStreamReceiver); - EXPECT_EQ(testInput.expectedValue, commandStreamReceiver.lastSpecialPipelineSelectMode); - commandStreamReceiver.lastSpecialPipelineSelectMode = false; + EXPECT_EQ(testInput.expectedValue, commandStreamReceiver.lastSystolicPipelineSelectMode); + commandStreamReceiver.lastSystolicPipelineSelectMode = false; } } diff --git a/shared/source/command_container/command_encoder_xehp_and_later.inl b/shared/source/command_container/command_encoder_xehp_and_later.inl index 0f6a4667a6..c8d7e0e8ca 100644 --- a/shared/source/command_container/command_encoder_xehp_and_later.inl +++ b/shared/source/command_container/command_encoder_xehp_and_later.inl @@ -65,9 +65,9 @@ void EncodeDispatchKernel::encode(CommandContainer &container, EncodeDis threadDimsVec = {threadDims[0], threadDims[1], threadDims[2]}; } - bool specialModeRequired = kernelDescriptor.kernelAttributes.flags.usesSpecialPipelineSelectMode; - if (PreambleHelper::isSpecialPipelineSelectModeChanged(container.lastPipelineSelectModeRequired, specialModeRequired, hwInfo)) { - container.lastPipelineSelectModeRequired = specialModeRequired; + bool systolicModeRequired = kernelDescriptor.kernelAttributes.flags.usesSystolicPipelineSelectMode; + if (PreambleHelper::isSystolicPipelineSelectModeChanged(container.lastPipelineSelectModeRequired, systolicModeRequired, hwInfo)) { + container.lastPipelineSelectModeRequired = systolicModeRequired; EncodeComputeMode::adjustPipelineSelect(container, kernelDescriptor); } @@ -596,9 +596,9 @@ template void EncodeComputeMode::adjustPipelineSelect(CommandContainer &container, const NEO::KernelDescriptor &kernelDescriptor) { using PIPELINE_SELECT = typename Family::PIPELINE_SELECT; auto pipelineSelectCmd = Family::cmdInitPipelineSelect; - auto isSpecialModeSelected = kernelDescriptor.kernelAttributes.flags.usesSpecialPipelineSelectMode; + auto isSystolicModeSelected = kernelDescriptor.kernelAttributes.flags.usesSystolicPipelineSelectMode; - PreambleHelper::appendProgramPipelineSelect(&pipelineSelectCmd, isSpecialModeSelected, container.getDevice()->getHardwareInfo()); + PreambleHelper::appendProgramPipelineSelect(pipelineSelectCmd, isSystolicModeSelected, container.getDevice()->getHardwareInfo()); pipelineSelectCmd.setPipelineSelection(PIPELINE_SELECT::PIPELINE_SELECTION_GPGPU); diff --git a/shared/source/command_stream/command_stream_receiver.h b/shared/source/command_stream/command_stream_receiver.h index 321fc062d5..91966fa3ed 100644 --- a/shared/source/command_stream/command_stream_receiver.h +++ b/shared/source/command_stream/command_stream_receiver.h @@ -460,7 +460,7 @@ class CommandStreamReceiver { bool timestampPacketWriteEnabled = false; bool staticWorkPartitioningEnabled = false; bool nTo1SubmissionModelEnabled = false; - bool lastSpecialPipelineSelectMode = false; + bool lastSystolicPipelineSelectMode = false; bool requiresInstructionCacheFlush = false; bool localMemoryEnabled = false; diff --git a/shared/source/command_stream/command_stream_receiver_hw_base.inl b/shared/source/command_stream/command_stream_receiver_hw_base.inl index 4a1c10f2da..92832fbf93 100644 --- a/shared/source/command_stream/command_stream_receiver_hw_base.inl +++ b/shared/source/command_stream/command_stream_receiver_hw_base.inl @@ -261,9 +261,9 @@ CompletionStamp CommandStreamReceiverHw::flushTask( } auto newL3Config = PreambleHelper::getL3Config(hwInfo, dispatchFlags.useSLM); - auto isSpecialPipelineSelectModeChanged = PreambleHelper::isSpecialPipelineSelectModeChanged(lastSpecialPipelineSelectMode, - dispatchFlags.pipelineSelectArgs.specialPipelineSelectMode, - hwInfo); + auto isSystolicPipelineSelectModeChanged = PreambleHelper::isSystolicPipelineSelectModeChanged(lastSystolicPipelineSelectMode, + dispatchFlags.pipelineSelectArgs.systolicPipelineSelectMode, + hwInfo); auto requiresCoherency = hwHelper.forceNonGpuCoherencyWA(dispatchFlags.requiresCoherency); this->streamProperties.stateComputeMode.setProperties(requiresCoherency, dispatchFlags.numGrfRequired, @@ -272,7 +272,7 @@ CompletionStamp CommandStreamReceiverHw::flushTask( csrSizeRequestFlags.l3ConfigChanged = this->lastSentL3Config != newL3Config; csrSizeRequestFlags.preemptionRequestChanged = this->lastPreemptionMode != dispatchFlags.preemptionMode; csrSizeRequestFlags.mediaSamplerConfigChanged = this->lastMediaSamplerConfig != static_cast(dispatchFlags.pipelineSelectArgs.mediaSamplerRequired); - csrSizeRequestFlags.specialPipelineSelectModeChanged = isSpecialPipelineSelectModeChanged; + csrSizeRequestFlags.systolicPipelineSelectMode = isSystolicPipelineSelectModeChanged; csrSizeRequestFlags.activePartitionsChanged = isProgramActivePartitionConfigRequired(); @@ -902,7 +902,7 @@ template inline size_t CommandStreamReceiverHw::getCmdSizeForPipelineSelect() const { size_t size = 0; if ((csrSizeRequestFlags.mediaSamplerConfigChanged || - csrSizeRequestFlags.specialPipelineSelectModeChanged || + csrSizeRequestFlags.systolicPipelineSelectMode || !isPreambleSent) && !isPipelineSelectAlreadyProgrammed()) { size += PreambleHelper::getCmdSizeForPipelineSelect(peekHwInfo()); diff --git a/shared/source/command_stream/command_stream_receiver_hw_xehp_and_later.inl b/shared/source/command_stream/command_stream_receiver_hw_xehp_and_later.inl index 80b2c7cbc4..71c4e52d85 100644 --- a/shared/source/command_stream/command_stream_receiver_hw_xehp_and_later.inl +++ b/shared/source/command_stream/command_stream_receiver_hw_xehp_and_later.inl @@ -46,10 +46,10 @@ size_t CommandStreamReceiverHw::getCmdSizeForL3Config() const { retur template void CommandStreamReceiverHw::programPipelineSelect(LinearStream &commandStream, PipelineSelectArgs &pipelineSelectArgs) { - if (csrSizeRequestFlags.mediaSamplerConfigChanged || csrSizeRequestFlags.specialPipelineSelectModeChanged || !isPreambleSent) { + if (csrSizeRequestFlags.mediaSamplerConfigChanged || csrSizeRequestFlags.systolicPipelineSelectMode || !isPreambleSent) { PreambleHelper::programPipelineSelect(&commandStream, pipelineSelectArgs, peekHwInfo()); this->lastMediaSamplerConfig = pipelineSelectArgs.mediaSamplerRequired; - this->lastSpecialPipelineSelectMode = pipelineSelectArgs.specialPipelineSelectMode; + this->lastSystolicPipelineSelectMode = pipelineSelectArgs.systolicPipelineSelectMode; } } diff --git a/shared/source/command_stream/csr_definitions.h b/shared/source/command_stream/csr_definitions.h index 77015400cf..9264fd2b5d 100644 --- a/shared/source/command_stream/csr_definitions.h +++ b/shared/source/command_stream/csr_definitions.h @@ -124,7 +124,7 @@ struct CsrSizeRequestFlags { bool preemptionRequestChanged = false; bool mediaSamplerConfigChanged = false; bool hasSharedHandles = false; - bool specialPipelineSelectModeChanged = false; + bool systolicPipelineSelectMode = false; bool activePartitionsChanged = false; }; } // namespace NEO diff --git a/shared/source/device_binary_format/zebin_decoder.cpp b/shared/source/device_binary_format/zebin_decoder.cpp index 6e11c40ff2..01003dd1fd 100644 --- a/shared/source/device_binary_format/zebin_decoder.cpp +++ b/shared/source/device_binary_format/zebin_decoder.cpp @@ -1098,7 +1098,7 @@ NEO::DecodeError populateKernelDescriptor(NEO::ProgramInfo &dst, NEO::Elf::Elf::setAdditionalPipelineSelectFields(void *pipelin mask |= pipelineSelectSystolicModeEnableMaskBits; pipelineSelectTglplpCmd->setMaskBits(mask); - pipelineSelectTglplpCmd->setSpecialModeEnable(pipelineSelectArgs.specialPipelineSelectMode); + pipelineSelectTglplpCmd->setSpecialModeEnable(pipelineSelectArgs.systolicPipelineSelectMode); } diff --git a/shared/source/helpers/pipeline_select_args.h b/shared/source/helpers/pipeline_select_args.h index 5432026a9d..7af5765317 100644 --- a/shared/source/helpers/pipeline_select_args.h +++ b/shared/source/helpers/pipeline_select_args.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ namespace NEO { struct PipelineSelectArgs { - bool specialPipelineSelectMode = false; + bool systolicPipelineSelectMode = false; bool mediaSamplerRequired = false; bool is3DPipelineRequired = false; }; diff --git a/shared/source/helpers/preamble.h b/shared/source/helpers/preamble.h index f98a5f406d..36a6113b04 100644 --- a/shared/source/helpers/preamble.h +++ b/shared/source/helpers/preamble.h @@ -35,7 +35,7 @@ struct PreambleHelper { static void programPipelineSelect(LinearStream *pCommandStream, const PipelineSelectArgs &pipelineSelectArgs, const HardwareInfo &hwInfo); - static void appendProgramPipelineSelect(void *cmd, bool isSpecialModeSelected, const HardwareInfo &hwInfo); + static void appendProgramPipelineSelect(typename GfxFamily::PIPELINE_SELECT &cmd, bool isSystolicModeSelected, const HardwareInfo &hwInfo); static void programPreemption(LinearStream *pCommandStream, Device &device, GraphicsAllocation *preemptionCsr, LogicalStateHelper *logicalStateHelper); static void addPipeControlBeforeVfeCmd(LinearStream *pCommandStream, const HardwareInfo *hwInfo, EngineGroupType engineGroupType); static void appendProgramVFEState(const HardwareInfo &hwInfo, const StreamProperties &streamProperties, void *cmd); @@ -57,8 +57,8 @@ struct PreambleHelper { static uint32_t getL3Config(const HardwareInfo &hwInfo, bool useSLM); static bool isL3Configurable(const HardwareInfo &hwInfo); static bool isSystolicModeConfigurable(const HardwareInfo &hwInfo); - static bool isSpecialPipelineSelectModeChanged(bool lastSpecialPipelineSelectMode, bool newSpecialPipelineSelectMode, - const HardwareInfo &hwInfo); + static bool isSystolicPipelineSelectModeChanged(bool lastSystolicPipelineSelectMode, bool newSystolicPipelineSelectMode, + const HardwareInfo &hwInfo); static size_t getAdditionalCommandsSize(const Device &device); static std::vector getSupportedThreadArbitrationPolicies(); static size_t getVFECommandsSize(); diff --git a/shared/source/helpers/preamble_bdw_and_later.inl b/shared/source/helpers/preamble_bdw_and_later.inl index da96a331fb..d0da5b2252 100644 --- a/shared/source/helpers/preamble_bdw_and_later.inl +++ b/shared/source/helpers/preamble_bdw_and_later.inl @@ -75,7 +75,7 @@ size_t PreambleHelper::getVFECommandsSize() { } template -void PreambleHelper::appendProgramPipelineSelect(void *cmd, bool isSpecialModeSelected, const HardwareInfo &hwInfo) {} +void PreambleHelper::appendProgramPipelineSelect(typename GfxFamily::PIPELINE_SELECT &cmd, bool isSystolicModeSelected, const HardwareInfo &hwInfo) {} template bool PreambleHelper::isSystolicModeConfigurable(const HardwareInfo &hwInfo) { @@ -83,8 +83,8 @@ bool PreambleHelper::isSystolicModeConfigurable(const HardwareInfo &h } template -bool PreambleHelper::isSpecialPipelineSelectModeChanged(bool lastSpecialPipelineSelectMode, bool newSpecialPipelineSelectMode, - const HardwareInfo &hwInfo) { +bool PreambleHelper::isSystolicPipelineSelectModeChanged(bool lastSystolicPipelineSelectMode, bool newSystolicPipelineSelectMode, + const HardwareInfo &hwInfo) { return false; } } // namespace NEO diff --git a/shared/source/helpers/preamble_xehp_and_later.inl b/shared/source/helpers/preamble_xehp_and_later.inl index bc22f89a1b..bf5689d2db 100644 --- a/shared/source/helpers/preamble_xehp_and_later.inl +++ b/shared/source/helpers/preamble_xehp_and_later.inl @@ -26,22 +26,20 @@ template <> bool PreambleHelper::isSystolicModeConfigurable(const HardwareInfo &hwInfo); template -void PreambleHelper::appendProgramPipelineSelect(void *cmd, bool isSpecialModeSelected, const HardwareInfo &hwInfo) { - using PIPELINE_SELECT = typename Family::PIPELINE_SELECT; - auto command = static_cast(cmd); - auto mask = command->getMaskBits(); +void PreambleHelper::appendProgramPipelineSelect(typename Family::PIPELINE_SELECT &cmd, bool isSystolicModeSelected, const HardwareInfo &hwInfo) { + auto mask = cmd.getMaskBits(); if (PreambleHelper::isSystolicModeConfigurable(hwInfo)) { - command->setSystolicModeEnable(isSpecialModeSelected); + cmd.setSystolicModeEnable(isSystolicModeSelected); mask |= pipelineSelectSystolicModeEnableMaskBits; } if (DebugManager.flags.OverrideSystolicPipelineSelect.get() != -1) { - command->setSystolicModeEnable(DebugManager.flags.OverrideSystolicPipelineSelect.get()); + cmd.setSystolicModeEnable(DebugManager.flags.OverrideSystolicPipelineSelect.get()); mask |= pipelineSelectSystolicModeEnableMaskBits; } - command->setMaskBits(mask); + cmd.setMaskBits(mask); } template @@ -54,16 +52,16 @@ void PreambleHelper::programPipelineSelect(LinearStream *pCommandStream, PIPELINE_SELECT cmd = Family::cmdInitPipelineSelect; if (DebugManager.flags.CleanStateInPreamble.get()) { - auto pCmd = pCommandStream->getSpaceForCmd(); + auto cmdBuffer = pCommandStream->getSpaceForCmd(); cmd.setPipelineSelection(PIPELINE_SELECT::PIPELINE_SELECTION_3D); - *pCmd = cmd; + *cmdBuffer = cmd; PipeControlArgs args = {}; args.stateCacheInvalidationEnable = true; MemorySynchronizationCommands::addSingleBarrier(*pCommandStream, args); } - auto pCmd = pCommandStream->getSpaceForCmd(); + auto cmdBuffer = pCommandStream->getSpaceForCmd(); auto mask = pipelineSelectEnablePipelineSelectMaskBits; @@ -74,9 +72,9 @@ void PreambleHelper::programPipelineSelect(LinearStream *pCommandStream, } cmd.setMaskBits(mask); - appendProgramPipelineSelect(&cmd, pipelineSelectArgs.specialPipelineSelectMode, hwInfo); + appendProgramPipelineSelect(cmd, pipelineSelectArgs.systolicPipelineSelectMode, hwInfo); - *pCmd = cmd; + *cmdBuffer = cmd; if (DebugManager.flags.CleanStateInPreamble.get()) { PipeControlArgs args = {}; diff --git a/shared/source/kernel/kernel_descriptor.h b/shared/source/kernel/kernel_descriptor.h index acdb74c557..2851c53c23 100644 --- a/shared/source/kernel/kernel_descriptor.h +++ b/shared/source/kernel/kernel_descriptor.h @@ -183,7 +183,7 @@ struct KernelDescriptor { union { struct { // 0 - bool usesSpecialPipelineSelectMode : 1; + bool usesSystolicPipelineSelectMode : 1; bool usesStringMapForPrintf : 1; bool usesPrintf : 1; bool usesFencesForReadWriteImages : 1; diff --git a/shared/source/kernel/kernel_descriptor_from_patchtokens.cpp b/shared/source/kernel/kernel_descriptor_from_patchtokens.cpp index f6a711f17e..eeb59cc524 100644 --- a/shared/source/kernel/kernel_descriptor_from_patchtokens.cpp +++ b/shared/source/kernel/kernel_descriptor_from_patchtokens.cpp @@ -59,7 +59,7 @@ void populateKernelDescriptor(KernelDescriptor &dst, const SPatchExecutionEnviro dst.kernelAttributes.flags.requiresSubgroupIndependentForwardProgress = (0 != execEnv.SubgroupIndependentForwardProgressRequired); dst.kernelAttributes.flags.useGlobalAtomics = (0 != execEnv.HasGlobalAtomics); dst.kernelAttributes.flags.usesFencesForReadWriteImages = (0 != execEnv.UsesFencesForReadWriteImages); - dst.kernelAttributes.flags.usesSpecialPipelineSelectMode = (0 != execEnv.HasDPAS); + dst.kernelAttributes.flags.usesSystolicPipelineSelectMode = (0 != execEnv.HasDPAS); dst.kernelAttributes.flags.usesStatelessWrites = (0 != execEnv.StatelessWritesCount); dst.kernelAttributes.flags.useStackCalls = (0 != execEnv.HasStackCalls); dst.kernelAttributes.flags.hasRTCalls = (0 != execEnv.HasRTCalls); diff --git a/shared/source/os_interface/hw_info_config.h b/shared/source/os_interface/hw_info_config.h index 82c2d964d2..9a71e9195c 100644 --- a/shared/source/os_interface/hw_info_config.h +++ b/shared/source/os_interface/hw_info_config.h @@ -108,7 +108,7 @@ class HwInfoConfig { virtual bool getUuid(Device *device, std::array &uuid) const = 0; virtual bool isFlushTaskAllowed() const = 0; virtual bool programAllStateComputeCommandFields() const = 0; - virtual bool isSpecialPipelineSelectModeChanged(const HardwareInfo &hwInfo) const = 0; + virtual bool isSystolicPipelineSelectModeChanged(const HardwareInfo &hwInfo) const = 0; virtual bool isSystolicModeConfigurable(const HardwareInfo &hwInfo) const = 0; virtual bool isGlobalFenceInCommandStreamRequired(const HardwareInfo &hwInfo) const = 0; virtual bool isGlobalFenceInDirectSubmissionRequired(const HardwareInfo &hwInfo) const = 0; @@ -239,7 +239,7 @@ class HwInfoConfigHw : public HwInfoConfig { bool getUuid(Device *device, std::array &uuid) const override; bool isFlushTaskAllowed() const override; bool programAllStateComputeCommandFields() const override; - bool isSpecialPipelineSelectModeChanged(const HardwareInfo &hwInfo) const override; + bool isSystolicPipelineSelectModeChanged(const HardwareInfo &hwInfo) const override; bool isSystolicModeConfigurable(const HardwareInfo &hwInfo) const override; bool isComputeDispatchAllWalkerEnableInComputeWalkerRequired(const HardwareInfo &hwInfo) const override; bool isGlobalFenceInCommandStreamRequired(const HardwareInfo &hwInfo) const override; diff --git a/shared/source/os_interface/hw_info_config.inl b/shared/source/os_interface/hw_info_config.inl index 1beba44f36..799d4cadbd 100644 --- a/shared/source/os_interface/hw_info_config.inl +++ b/shared/source/os_interface/hw_info_config.inl @@ -357,7 +357,7 @@ bool HwInfoConfigHw::programAllStateComputeCommandFields() const { } template -bool HwInfoConfigHw::isSpecialPipelineSelectModeChanged(const HardwareInfo &hwInfo) const { +bool HwInfoConfigHw::isSystolicPipelineSelectModeChanged(const HardwareInfo &hwInfo) const { return false; } diff --git a/shared/source/xe_hp_core/preamble_xe_hp_core.cpp b/shared/source/xe_hp_core/preamble_xe_hp_core.cpp index 000fd284a9..f3eb397669 100644 --- a/shared/source/xe_hp_core/preamble_xe_hp_core.cpp +++ b/shared/source/xe_hp_core/preamble_xe_hp_core.cpp @@ -47,9 +47,9 @@ void PreambleHelper::appendProgramVFEState(const HardwareInfo &hwInfo, c } template <> -bool PreambleHelper::isSpecialPipelineSelectModeChanged(bool lastSpecialPipelineSelectMode, bool newSpecialPipelineSelectMode, - const HardwareInfo &hwInfo) { - return lastSpecialPipelineSelectMode != newSpecialPipelineSelectMode; +bool PreambleHelper::isSystolicPipelineSelectModeChanged(bool lastSystolicPipelineSelectMode, bool newSystolicPipelineSelectMode, + const HardwareInfo &hwInfo) { + return lastSystolicPipelineSelectMode != newSystolicPipelineSelectMode; } template <> diff --git a/shared/source/xe_hpc_core/preamble_xe_hpc_core.cpp b/shared/source/xe_hpc_core/preamble_xe_hpc_core.cpp index 2409365cb3..f390ad9129 100644 --- a/shared/source/xe_hpc_core/preamble_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/preamble_xe_hpc_core.cpp @@ -59,11 +59,11 @@ bool PreambleHelper::isSystolicModeConfigurable(const HardwareInfo &hwIn } template <> -bool PreambleHelper::isSpecialPipelineSelectModeChanged(bool lastSpecialPipelineSelectMode, bool newSpecialPipelineSelectMode, - const HardwareInfo &hwInfo) { +bool PreambleHelper::isSystolicPipelineSelectModeChanged(bool lastSystolicPipelineSelectMode, bool newSystolicPipelineSelectMode, + const HardwareInfo &hwInfo) { const auto &hwInfoConfig = *NEO::HwInfoConfig::get(hwInfo.platform.eProductFamily); - return (lastSpecialPipelineSelectMode != newSpecialPipelineSelectMode) && hwInfoConfig.isSpecialPipelineSelectModeChanged(hwInfo); + return (lastSystolicPipelineSelectMode != newSystolicPipelineSelectMode) && hwInfoConfig.isSystolicPipelineSelectModeChanged(hwInfo); } template struct PreambleHelper; diff --git a/shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl b/shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl index f0fbe232df..a27cb2568a 100644 --- a/shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl +++ b/shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl @@ -88,7 +88,7 @@ bool HwInfoConfigHw::isDisableOverdispatchAvailable(const HardwareIn } template <> -bool HwInfoConfigHw::isSpecialPipelineSelectModeChanged(const HardwareInfo &hwInfo) const { +bool HwInfoConfigHw::isSystolicPipelineSelectModeChanged(const HardwareInfo &hwInfo) const { return PVC::isAtMostXtA0(hwInfo); } diff --git a/shared/source/xe_hpg_core/preamble_xe_hpg_core.cpp b/shared/source/xe_hpg_core/preamble_xe_hpg_core.cpp index 6b02d96986..d20631359b 100644 --- a/shared/source/xe_hpg_core/preamble_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/preamble_xe_hpg_core.cpp @@ -47,9 +47,9 @@ bool PreambleHelper::isSystolicModeConfigurable(const HardwareInfo &hwIn } template <> -bool PreambleHelper::isSpecialPipelineSelectModeChanged(bool lastSpecialPipelineSelectMode, bool newSpecialPipelineSelectMode, - const HardwareInfo &hwInfo) { - return lastSpecialPipelineSelectMode != newSpecialPipelineSelectMode; +bool PreambleHelper::isSystolicPipelineSelectModeChanged(bool lastSystolicPipelineSelectMode, bool newSystolicPipelineSelectMode, + const HardwareInfo &hwInfo) { + return lastSystolicPipelineSelectMode != newSystolicPipelineSelectMode; } template struct PreambleHelper; diff --git a/shared/test/common/libult/ult_command_stream_receiver.h b/shared/test/common/libult/ult_command_stream_receiver.h index 21ec0a29bc..61c51a24bc 100644 --- a/shared/test/common/libult/ult_command_stream_receiver.h +++ b/shared/test/common/libult/ult_command_stream_receiver.h @@ -96,7 +96,7 @@ class UltCommandStreamReceiver : public CommandStreamReceiverHw, publ using BaseClass::CommandStreamReceiver::lastPreemptionMode; using BaseClass::CommandStreamReceiver::lastSentL3Config; using BaseClass::CommandStreamReceiver::lastSentUseGlobalAtomics; - using BaseClass::CommandStreamReceiver::lastSpecialPipelineSelectMode; + using BaseClass::CommandStreamReceiver::lastSystolicPipelineSelectMode; using BaseClass::CommandStreamReceiver::lastVmeSubslicesConfig; using BaseClass::CommandStreamReceiver::latestFlushedTaskCount; using BaseClass::CommandStreamReceiver::latestSentStatelessMocsConfig; diff --git a/shared/test/common/mocks/mock_hw_info_config.cpp b/shared/test/common/mocks/mock_hw_info_config.cpp index c7cca96d19..f4f17fdf20 100644 --- a/shared/test/common/mocks/mock_hw_info_config.cpp +++ b/shared/test/common/mocks/mock_hw_info_config.cpp @@ -306,7 +306,7 @@ bool HwInfoConfigHw::programAllStateComputeCommandFields() const { } template <> -bool HwInfoConfigHw::isSpecialPipelineSelectModeChanged(const HardwareInfo &hwInfo) const { +bool HwInfoConfigHw::isSystolicPipelineSelectModeChanged(const HardwareInfo &hwInfo) const { return false; } diff --git a/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp b/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp index c853996d41..c9f3eb0c15 100644 --- a/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp +++ b/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp @@ -2615,7 +2615,7 @@ TEST(PopulateKernelDescriptor, GivenMinimalExecutionEnvThenPopulateKernelDescrip EXPECT_EQ(kernelDescriptor.kernelAttributes.flags.useGlobalAtomics, Defaults::hasGlobalAtomics); EXPECT_EQ(kernelDescriptor.kernelAttributes.flags.useStackCalls, Defaults::hasStackCalls); EXPECT_EQ(kernelDescriptor.kernelAttributes.flags.usesFencesForReadWriteImages, Defaults::hasFenceForImageAccess); - EXPECT_EQ(kernelDescriptor.kernelAttributes.flags.usesSpecialPipelineSelectMode, Defaults::hasDpas); + EXPECT_EQ(kernelDescriptor.kernelAttributes.flags.usesSystolicPipelineSelectMode, Defaults::hasDpas); EXPECT_EQ(kernelDescriptor.kernelAttributes.flags.usesStatelessWrites, (false == Defaults::hasNoStatelessWrite)); EXPECT_EQ(kernelDescriptor.kernelAttributes.barrierCount, static_cast(Defaults::barrierCount)); EXPECT_EQ(kernelDescriptor.kernelAttributes.binaryFormat, DeviceBinaryFormat::Zebin); diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp index 6e6d87c40d..6ef619e765 100644 --- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp @@ -1283,7 +1283,7 @@ HWTEST2_F(CommandEncodeStatesTest, bool dpasModeRequired = true; cmdContainer->lastPipelineSelectModeRequired = false; - dispatchInterface->kernelDescriptor.kernelAttributes.flags.usesSpecialPipelineSelectMode = dpasModeRequired; + dispatchInterface->kernelDescriptor.kernelAttributes.flags.usesSystolicPipelineSelectMode = dpasModeRequired; bool requiresUncachedMocs = false; EncodeDispatchKernelArgs dispatchArgs = createDefaultDispatchKernelArgs(pDevice, dispatchInterface.get(), dims, requiresUncachedMocs); @@ -1313,7 +1313,7 @@ HWTEST2_F(CommandEncodeStatesTest, bool dpasModeRequired = true; DebugManager.flags.OverrideSystolicPipelineSelect.set(!dpasModeRequired); cmdContainer->lastPipelineSelectModeRequired = false; - dispatchInterface->kernelDescriptor.kernelAttributes.flags.usesSpecialPipelineSelectMode = dpasModeRequired; + dispatchInterface->kernelDescriptor.kernelAttributes.flags.usesSystolicPipelineSelectMode = dpasModeRequired; bool requiresUncachedMocs = false; EncodeDispatchKernelArgs dispatchArgs = createDefaultDispatchKernelArgs(pDevice, dispatchInterface.get(), dims, requiresUncachedMocs); @@ -1340,7 +1340,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandEncodeStatesTest, bool dpasModeRequired = true; cmdContainer->lastPipelineSelectModeRequired = dpasModeRequired; - dispatchInterface->kernelDescriptor.kernelAttributes.flags.usesSpecialPipelineSelectMode = dpasModeRequired; + dispatchInterface->kernelDescriptor.kernelAttributes.flags.usesSystolicPipelineSelectMode = dpasModeRequired; bool requiresUncachedMocs = false; EncodeDispatchKernelArgs dispatchArgs = createDefaultDispatchKernelArgs(pDevice, dispatchInterface.get(), dims, requiresUncachedMocs); diff --git a/shared/test/unit_test/encoders/test_encode_grf_mode_xe_hp_and_later.cpp b/shared/test/unit_test/encoders/test_encode_grf_mode_xe_hp_and_later.cpp index 62b093e3d7..0b38c7fef2 100644 --- a/shared/test/unit_test/encoders/test_encode_grf_mode_xe_hp_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_grf_mode_xe_hp_and_later.cpp @@ -107,7 +107,7 @@ HWTEST2_F(CommandEncodeStatesTest, givenLargeGrfModeDisabledThenExpectedCommands HWTEST2_F(CommandEncodeStatesTest, givenCommandContainerWithKernelDpasThenSystolicModeEnabled, IsWithinXeGfxFamily) { using PIPELINE_SELECT = typename FamilyType::PIPELINE_SELECT; - descriptor.kernelAttributes.flags.usesSpecialPipelineSelectMode = true; + descriptor.kernelAttributes.flags.usesSystolicPipelineSelectMode = true; EncodeComputeMode::adjustPipelineSelect(*cmdContainer.get(), descriptor); GenCmdList commands; CmdParse::parseCommandBuffer(commands, ptrOffset(cmdContainer->getCommandStream()->getCpuBase(), 0), cmdContainer->getCommandStream()->getUsed()); @@ -121,7 +121,7 @@ HWTEST2_F(CommandEncodeStatesTest, givenCommandContainerWithKernelDpasThenSystol HWTEST2_F(CommandEncodeStatesTest, givenCommandContainerWithNoKernelDpasThenSystolicModeIsNotEnabled, IsWithinXeGfxFamily) { using PIPELINE_SELECT = typename FamilyType::PIPELINE_SELECT; - descriptor.kernelAttributes.flags.usesSpecialPipelineSelectMode = false; + descriptor.kernelAttributes.flags.usesSystolicPipelineSelectMode = false; EncodeComputeMode::adjustPipelineSelect(*cmdContainer.get(), descriptor); GenCmdList commands; CmdParse::parseCommandBuffer(commands, ptrOffset(cmdContainer->getCommandStream()->getCpuBase(), 0), cmdContainer->getCommandStream()->getUsed()); @@ -138,7 +138,7 @@ HWTEST2_F(CommandEncodeStatesTest, givenDebugModeToOverrideSystolicModeToTrueWhe DebugManager.flags.OverrideSystolicPipelineSelect.set(1); using PIPELINE_SELECT = typename FamilyType::PIPELINE_SELECT; - descriptor.kernelAttributes.flags.usesSpecialPipelineSelectMode = false; + descriptor.kernelAttributes.flags.usesSystolicPipelineSelectMode = false; EncodeComputeMode::adjustPipelineSelect(*cmdContainer.get(), descriptor); GenCmdList commands; CmdParse::parseCommandBuffer(commands, ptrOffset(cmdContainer->getCommandStream()->getCpuBase(), 0), cmdContainer->getCommandStream()->getUsed()); @@ -155,7 +155,7 @@ HWTEST2_F(CommandEncodeStatesTest, givenDebugModeToOverrideSystolicModeToFalseWh DebugManager.flags.OverrideSystolicPipelineSelect.set(0); using PIPELINE_SELECT = typename FamilyType::PIPELINE_SELECT; - descriptor.kernelAttributes.flags.usesSpecialPipelineSelectMode = true; + descriptor.kernelAttributes.flags.usesSystolicPipelineSelectMode = true; EncodeComputeMode::adjustPipelineSelect(*cmdContainer.get(), descriptor); GenCmdList commands; CmdParse::parseCommandBuffer(commands, ptrOffset(cmdContainer->getCommandStream()->getCpuBase(), 0), cmdContainer->getCommandStream()->getUsed()); @@ -175,7 +175,7 @@ HWTEST2_F(CommandEncodeStatesTest, givenLargeGrfModeEnabledThenExpectedCommandsA auto usedSpaceBefore = cmdContainer->getCommandStream()->getUsed(); - descriptor.kernelAttributes.flags.usesSpecialPipelineSelectMode = true; + descriptor.kernelAttributes.flags.usesSystolicPipelineSelectMode = true; NEO::EncodeComputeMode::adjustPipelineSelect(*cmdContainer, descriptor); StreamProperties streamProperties{}; streamProperties.stateComputeMode.largeGrfMode.set(1); @@ -213,7 +213,7 @@ HWTEST2_F(CommandEncodeStatesTest, givenLargeGrfModeEnabledAndDisabledThenExpect auto usedSpaceBefore = cmdContainer->getCommandStream()->getUsed(); - descriptor.kernelAttributes.flags.usesSpecialPipelineSelectMode = true; + descriptor.kernelAttributes.flags.usesSystolicPipelineSelectMode = true; NEO::EncodeComputeMode::adjustPipelineSelect(*cmdContainer, descriptor); StreamProperties streamProperties{}; streamProperties.stateComputeMode.largeGrfMode.set(1); diff --git a/shared/test/unit_test/gen12lp/adlp/preamble_helper_tests_adlp.cpp b/shared/test/unit_test/gen12lp/adlp/preamble_helper_tests_adlp.cpp index 1a3a0b9945..72c918111c 100644 --- a/shared/test/unit_test/gen12lp/adlp/preamble_helper_tests_adlp.cpp +++ b/shared/test/unit_test/gen12lp/adlp/preamble_helper_tests_adlp.cpp @@ -18,7 +18,7 @@ using namespace NEO; using PreambleHelperTestsAdlp = ::testing::Test; -ADLPTEST_F(PreambleHelperTestsAdlp, givenSpecialPipelineSelectModeDisabledWhenProgrammingPipelineSelectThenDisableSystolicMode) { +ADLPTEST_F(PreambleHelperTestsAdlp, givenSystolicPipelineSelectModeDisabledWhenProgrammingPipelineSelectThenDisableSystolicMode) { using PIPELINE_SELECT = typename FamilyType::PIPELINE_SELECT; constexpr static auto bufferSize = sizeof(PIPELINE_SELECT); @@ -26,7 +26,7 @@ ADLPTEST_F(PreambleHelperTestsAdlp, givenSpecialPipelineSelectModeDisabledWhenPr LinearStream stream{streamBuffer, sizeof(bufferSize)}; DispatchFlags flags = DispatchFlagsHelper::createDefaultDispatchFlags(); - flags.pipelineSelectArgs.specialPipelineSelectMode = false; + flags.pipelineSelectArgs.systolicPipelineSelectMode = false; auto *pCmd = static_cast(stream.getSpace(0)); PreambleHelper::programPipelineSelect(&stream, flags.pipelineSelectArgs, ADLP::hwInfo); @@ -37,7 +37,7 @@ ADLPTEST_F(PreambleHelperTestsAdlp, givenSpecialPipelineSelectModeDisabledWhenPr EXPECT_EQ(PIPELINE_SELECT::PIPELINE_SELECTION_GPGPU, pCmd->getPipelineSelection()); } -ADLPTEST_F(PreambleHelperTestsAdlp, givenSpecialPipelineSelectModeEnabledWhenProgrammingPipelineSelectThenEnableSystolicMode) { +ADLPTEST_F(PreambleHelperTestsAdlp, givenSystolicPipelineSelectModeEnabledWhenProgrammingPipelineSelectThenEnableSystolicMode) { using PIPELINE_SELECT = typename FamilyType::PIPELINE_SELECT; constexpr static auto bufferSize = sizeof(PIPELINE_SELECT); @@ -45,7 +45,7 @@ ADLPTEST_F(PreambleHelperTestsAdlp, givenSpecialPipelineSelectModeEnabledWhenPro LinearStream stream{streamBuffer, sizeof(bufferSize)}; DispatchFlags flags = DispatchFlagsHelper::createDefaultDispatchFlags(); - flags.pipelineSelectArgs.specialPipelineSelectMode = true; + flags.pipelineSelectArgs.systolicPipelineSelectMode = true; auto *pCmd = static_cast(stream.getSpace(0)); PreambleHelper::programPipelineSelect(&stream, flags.pipelineSelectArgs, ADLP::hwInfo); diff --git a/shared/test/unit_test/helpers/test_hw_info_config.cpp b/shared/test/unit_test/helpers/test_hw_info_config.cpp index 25eab5d0cd..32bbab81bc 100644 --- a/shared/test/unit_test/helpers/test_hw_info_config.cpp +++ b/shared/test/unit_test/helpers/test_hw_info_config.cpp @@ -35,9 +35,9 @@ HWTEST_F(HwInfoConfigTest, givenHwInfoConfigWhenIsGlobalFenceInCommandStreamRequ EXPECT_FALSE(hwInfoConfig.isGlobalFenceInCommandStreamRequired(*defaultHwInfo)); } -HWTEST_F(HwInfoConfigTest, givenHwInfoConfigWhenIsSpecialPipelineSelectModeChangedThenFalseIsReturned) { +HWTEST_F(HwInfoConfigTest, givenHwInfoConfigWhenIsSystolicPipelineSelectModeChangedThenFalseIsReturned) { const auto &hwInfoConfig = *HwInfoConfig::get(defaultHwInfo->platform.eProductFamily); - EXPECT_FALSE(hwInfoConfig.isSpecialPipelineSelectModeChanged(*defaultHwInfo)); + EXPECT_FALSE(hwInfoConfig.isSystolicPipelineSelectModeChanged(*defaultHwInfo)); } HWTEST_F(HwInfoConfigTest, givenHwInfoConfigWhenIsSystolicModeConfigurabledThenFalseIsReturned) { diff --git a/shared/test/unit_test/preamble/preamble_tests.cpp b/shared/test/unit_test/preamble/preamble_tests.cpp index f2d013cb96..5919d5e4da 100644 --- a/shared/test/unit_test/preamble/preamble_tests.cpp +++ b/shared/test/unit_test/preamble/preamble_tests.cpp @@ -264,7 +264,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, PreambleTest, WhenAppendProgramPipelineSelectThenNot using PIPELINE_SELECT = typename FamilyType::PIPELINE_SELECT; PIPELINE_SELECT cmd = FamilyType::cmdInitPipelineSelect; cmd.setMaskBits(pipelineSelectEnablePipelineSelectMaskBits); - PreambleHelper::appendProgramPipelineSelect(&cmd, true, *defaultHwInfo); + PreambleHelper::appendProgramPipelineSelect(cmd, true, *defaultHwInfo); EXPECT_EQ(pipelineSelectEnablePipelineSelectMaskBits, cmd.getMaskBits()); } diff --git a/shared/test/unit_test/xe_hp_core/xe_hp_sdv/test_preamble_xe_hp_sdv.cpp b/shared/test/unit_test/xe_hp_core/xe_hp_sdv/test_preamble_xe_hp_sdv.cpp index 5a5a46f736..6a3c639660 100644 --- a/shared/test/unit_test/xe_hp_core/xe_hp_sdv/test_preamble_xe_hp_sdv.cpp +++ b/shared/test/unit_test/xe_hp_core/xe_hp_sdv/test_preamble_xe_hp_sdv.cpp @@ -120,9 +120,9 @@ using XeHPPipelineSelect = ::testing::Test; XEHPTEST_F(XeHPPipelineSelect, WhenAppendProgramPipelineSelectThenCorrectValuesSet) { using PIPELINE_SELECT = typename FamilyType::PIPELINE_SELECT; PIPELINE_SELECT cmd = FamilyType::cmdInitPipelineSelect; - PreambleHelper::appendProgramPipelineSelect(&cmd, true, *defaultHwInfo); + PreambleHelper::appendProgramPipelineSelect(cmd, true, *defaultHwInfo); EXPECT_TRUE(cmd.getSystolicModeEnable()); - PreambleHelper::appendProgramPipelineSelect(&cmd, false, *defaultHwInfo); + PreambleHelper::appendProgramPipelineSelect(cmd, false, *defaultHwInfo); EXPECT_FALSE(cmd.getSystolicModeEnable()); EXPECT_EQ(pipelineSelectSystolicModeEnableMaskBits, cmd.getMaskBits()); } diff --git a/shared/test/unit_test/xe_hpc_core/excludes_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/excludes_xe_hpc_core.cpp index 9359b5080f..06a5b0dcfe 100644 --- a/shared/test/unit_test/xe_hpc_core/excludes_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/excludes_xe_hpc_core.cpp @@ -29,7 +29,7 @@ HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenIsAdjustProgrammab HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenIsComputeDispatchAllWalkerEnableInCfeStateRequiredThenFalseIsReturned, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenIsComputeDispatchAllWalkerEnableInComputeWalkerRequiredThenFalseIsReturned, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenIsGlobalFenceInCommandStreamRequiredThenFalseIsReturned, IGFX_XE_HPC_CORE); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenIsSpecialPipelineSelectModeChangedThenFalseIsReturned, IGFX_XE_HPC_CORE); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenIsSystolicPipelineSelectModeChangedThenFalseIsReturned, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenIsSystolicModeConfigurabledThenFalseIsReturned, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenGetThreadEuRatioForScratchThen8IsReturned, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenVariousValuesWhenConvertingHwRevIdAndSteppingThenConversionIsCorrect, IGFX_XE_HPC_CORE); diff --git a/shared/test/unit_test/xe_hpc_core/pvc/test_encode_dispatch_kernel_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/test_encode_dispatch_kernel_pvc.cpp index 2571751323..31aa1ba05e 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/test_encode_dispatch_kernel_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/test_encode_dispatch_kernel_pvc.cpp @@ -60,7 +60,7 @@ PVCTEST_F(EncodeKernelPvcTest, givenRevisionBAndAboveWhenSpecialModeRequiredThen uint32_t dims[] = {1, 1, 1}; std::unique_ptr dispatchInterface(new MockDispatchKernelEncoder()); - dispatchInterface->kernelDescriptor.kernelAttributes.flags.usesSpecialPipelineSelectMode = true; + dispatchInterface->kernelDescriptor.kernelAttributes.flags.usesSystolicPipelineSelectMode = true; struct { unsigned short revId; @@ -93,7 +93,7 @@ PVCTEST_F(EncodeKernelPvcTest, givenRevisionBAndAboveWhenSpecialModeRequiredAndA auto hwInfo = pDevice->getRootDeviceEnvironment().getMutableHardwareInfo(); std::unique_ptr dispatchInterface(new MockDispatchKernelEncoder()); - dispatchInterface->kernelDescriptor.kernelAttributes.flags.usesSpecialPipelineSelectMode = true; + dispatchInterface->kernelDescriptor.kernelAttributes.flags.usesSystolicPipelineSelectMode = true; struct { unsigned short revId; diff --git a/shared/test/unit_test/xe_hpc_core/pvc/test_preamble_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/test_preamble_pvc.cpp index a9d4476258..d1d940a3e1 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/test_preamble_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/test_preamble_pvc.cpp @@ -52,7 +52,7 @@ PVCTEST_F(PreamblePipelineSelectState, givenRevisionBAndAboveWhenCallingProgramP auto hwInfo = pDevice->getRootDeviceEnvironment().getMutableHardwareInfo(); PipelineSelectArgs pipelineArgs; - pipelineArgs.specialPipelineSelectMode = true; + pipelineArgs.systolicPipelineSelectMode = true; struct { unsigned short revId;