intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-19 16:24:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename pipelined thread thread arbitration policy variable

Browse Source 
Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
This commit is contained in:
Kamil Kopryk
2024-05-20 10:35:21 +00:00
committed by Compute-Runtime-Automation
parent 66568de1e2
commit ce7f578548
12 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
level_zero/core/source/cmdlist/cmdlist.h
View File

@@ -10,6 +10,7 @@
#include "shared/source/command_container/cmdcontainer.h" #include "shared/source/command_container/cmdcontainer.h"
#include "shared/source/command_stream/preemption_mode.h" #include "shared/source/command_stream/preemption_mode.h"
#include "shared/source/command_stream/stream_properties.h" #include "shared/source/command_stream/stream_properties.h"
#include "shared/source/command_stream/thread_arbitration_policy.h"
#include "shared/source/helpers/cache_policy.h" #include "shared/source/helpers/cache_policy.h"
#include "shared/source/helpers/common_types.h" #include "shared/source/helpers/common_types.h"
#include "shared/source/helpers/definitions/command_encoder_args.h" #include "shared/source/helpers/definitions/command_encoder_args.h"
@@ -432,7 +433,7 @@ struct CommandList : _ze_command_list_handle_t {
CommandListType cmdListType = CommandListType::typeRegular; CommandListType cmdListType = CommandListType::typeRegular;
uint32_t partitionCount = 1; uint32_t partitionCount = 1;
uint32_t defaultMocsIndex = 0; uint32_t defaultMocsIndex = 0;
int32_t defaultThreadArbitrationPolicy = 0; int32_t defaultPipelinedThreadArbitrationPolicy = NEO::ThreadArbitrationPolicy::NotPresent;
bool isFlushTaskSubmissionEnabled = false; bool isFlushTaskSubmissionEnabled = false;
bool isSyncModeQueue = false; bool isSyncModeQueue = false;

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

@@ -248,9 +248,9 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::initialize(Device *device, NEO
this->inOrderAtomicSignalingEnabled = gfxCoreHelper.inOrderAtomicSignallingEnabled(rootDeviceEnvironment); this->inOrderAtomicSignalingEnabled = gfxCoreHelper.inOrderAtomicSignallingEnabled(rootDeviceEnvironment);
this->scratchAddressPatchingEnabled = (this->heaplessModeEnabled && !isImmediateType()); this->scratchAddressPatchingEnabled = (this->heaplessModeEnabled && !isImmediateType());
this->copyOperationFenceSupported = isCopyOnly() && productHelper.isDeviceToHostCopySignalingFenceRequired(); this->copyOperationFenceSupported = isCopyOnly() && productHelper.isDeviceToHostCopySignalingFenceRequired();
this->defaultThreadArbitrationPolicy = gfxCoreHelper.getDefaultThreadArbitrationPolicy(); this->defaultPipelinedThreadArbitrationPolicy = gfxCoreHelper.getDefaultThreadArbitrationPolicy();
if (NEO::debugManager.flags.OverrideThreadArbitrationPolicy.get() != -1) { if (NEO::debugManager.flags.OverrideThreadArbitrationPolicy.get() != -1) {
this->defaultThreadArbitrationPolicy = NEO::debugManager.flags.OverrideThreadArbitrationPolicy.get(); this->defaultPipelinedThreadArbitrationPolicy = NEO::debugManager.flags.OverrideThreadArbitrationPolicy.get();
} }
this->commandContainer.doubleSbaWaRef() = this->doubleSbaWa; this->commandContainer.doubleSbaWaRef() = this->doubleSbaWa;

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

@@ -208,7 +208,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchKernelWithParams(K
launchParams.additionalSizeParam, // additionalSizeParam launchParams.additionalSizeParam, // additionalSizeParam
0, // partitionCount 0, // partitionCount
launchParams.reserveExtraPayloadSpace, // reserveExtraPayloadSpace launchParams.reserveExtraPayloadSpace, // reserveExtraPayloadSpace
0, // defaultThreadArbitrationPolicy NEO::ThreadArbitrationPolicy::NotPresent, // defaultPipelinedThreadArbitrationPolicy
launchParams.isIndirect, // isIndirect launchParams.isIndirect, // isIndirect
launchParams.isPredicate, // isPredicate launchParams.isPredicate, // isPredicate
false, // isTimestampEvent false, // isTimestampEvent

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

@@ -335,7 +335,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchKernelWithParams(K
launchParams.additionalSizeParam, // additionalSizeParam launchParams.additionalSizeParam, // additionalSizeParam
this->partitionCount, // partitionCount this->partitionCount, // partitionCount
launchParams.reserveExtraPayloadSpace, // reserveExtraPayloadSpace launchParams.reserveExtraPayloadSpace, // reserveExtraPayloadSpace
this->defaultThreadArbitrationPolicy, // defaultThreadArbitrationPolicy this->defaultPipelinedThreadArbitrationPolicy, // defaultPipelinedThreadArbitrationPolicy
launchParams.isIndirect, // isIndirect launchParams.isIndirect, // isIndirect
launchParams.isPredicate, // isPredicate launchParams.isPredicate, // isPredicate
isTimestampEvent, // isTimestampEvent isTimestampEvent, // isTimestampEvent

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

@@ -203,7 +203,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenNotEnoughSpaceInCommandStreamWhenA
NEO::additionalKernelLaunchSizeParamNotSet, // additionalSizeParam NEO::additionalKernelLaunchSizeParamNotSet, // additionalSizeParam
0, // partitionCount 0, // partitionCount
0, // reserveExtraPayloadSpace 0, // reserveExtraPayloadSpace
0, // defaultThreadArbitrationPolicy NEO::ThreadArbitrationPolicy::NotPresent, // defaultPipelinedThreadArbitrationPolicy
false, // isIndirect false, // isIndirect
false, // isPredicate false, // isPredicate
false, // isTimestampEvent false, // isTimestampEvent

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

@@ -700,7 +700,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenNotEnoughSpaceInCommandStreamWhenA
NEO::additionalKernelLaunchSizeParamNotSet, // additionalSizeParam NEO::additionalKernelLaunchSizeParamNotSet, // additionalSizeParam
0, // partitionCount 0, // partitionCount
0, // reserveExtraPayloadSpace 0, // reserveExtraPayloadSpace
0, // defaultThreadArbitrationPolicy NEO::ThreadArbitrationPolicy::NotPresent, // defaultPipelinedThreadArbitrationPolicy
false, // isIndirect false, // isIndirect
false, // isPredicate false, // isPredicate
false, // isTimestampEvent false, // isTimestampEvent

5
shared/source/command_container/command_encoder.h
View File

@@ -10,6 +10,7 @@
#include "shared/source/command_container/cmdcontainer.h" #include "shared/source/command_container/cmdcontainer.h"
#include "shared/source/command_container/encode_alu_helper.h" #include "shared/source/command_container/encode_alu_helper.h"
#include "shared/source/command_stream/preemption_mode.h" #include "shared/source/command_stream/preemption_mode.h"
#include "shared/source/command_stream/thread_arbitration_policy.h"
#include "shared/source/debugger/debugger.h" #include "shared/source/debugger/debugger.h"
#include "shared/source/helpers/definitions/command_encoder_args.h" #include "shared/source/helpers/definitions/command_encoder_args.h"
#include "shared/source/helpers/register_offsets.h" #include "shared/source/helpers/register_offsets.h"
@@ -62,7 +63,7 @@ struct EncodeDispatchKernelArgs {
uint32_t additionalSizeParam = NEO::additionalKernelLaunchSizeParamNotSet; uint32_t additionalSizeParam = NEO::additionalKernelLaunchSizeParamNotSet;
uint32_t partitionCount = 0u; uint32_t partitionCount = 0u;
uint32_t reserveExtraPayloadSpace = 0; uint32_t reserveExtraPayloadSpace = 0;
int32_t defaultThreadArbitrationPolicy = 0; int32_t defaultPipelinedThreadArbitrationPolicy = NEO::ThreadArbitrationPolicy::NotPresent;
bool isIndirect = false; bool isIndirect = false;
bool isPredicate = false; bool isPredicate = false;
bool isTimestampEvent = false; bool isTimestampEvent = false;
@@ -127,7 +128,7 @@ struct EncodeDispatchKernel {
const uint32_t threadsPerThreadGroup, uint32_t slmTotalSize, SlmPolicy slmPolicy); const uint32_t threadsPerThreadGroup, uint32_t slmTotalSize, SlmPolicy slmPolicy);
template <typename InterfaceDescriptorType> template <typename InterfaceDescriptorType>
static void encodeEuSchedulingPolicy(InterfaceDescriptorType *pInterfaceDescriptor, const KernelDescriptor &kernelDesc, int32_t defaultThreadArbitrationPolicy); static void encodeEuSchedulingPolicy(InterfaceDescriptorType *pInterfaceDescriptor, const KernelDescriptor &kernelDesc, int32_t defaultPipelinedThreadArbitrationPolicy);
template <typename WalkerType> template <typename WalkerType>
static void encodeThreadData(WalkerType &walkerCmd, static void encodeThreadData(WalkerType &walkerCmd,

2
shared/source/command_container/command_encoder.inl
View File

@@ -591,7 +591,7 @@ bool EncodeDispatchKernel<Family>::inlineDataProgrammingRequired(const KernelDes
template <typename Family> template <typename Family>
template <typename InterfaceDescriptorType> template <typename InterfaceDescriptorType>
void EncodeDispatchKernel<Family>::encodeEuSchedulingPolicy(InterfaceDescriptorType *pInterfaceDescriptor, const KernelDescriptor &kernelDesc, int32_t defaultThreadArbitrationPolicy) { void EncodeDispatchKernel<Family>::encodeEuSchedulingPolicy(InterfaceDescriptorType *pInterfaceDescriptor, const KernelDescriptor &kernelDesc, int32_t defaultPipelinedThreadArbitrationPolicy) {
} }
template <typename Family> template <typename Family>

2
shared/source/command_container/command_encoder_enablers.inl
View File

@@ -25,7 +25,7 @@ template void NEO::EncodeDispatchKernel<Family>::programBarrierEnable<Family::IN
template void NEO::EncodeDispatchKernel<Family>::setScratchAddress<false>(uint64_t &scratchAddress, uint32_t requiredScratchSlot0Size, uint32_t requiredScratchSlot1Size, IndirectHeap *ssh, CommandStreamReceiver &csr); template void NEO::EncodeDispatchKernel<Family>::setScratchAddress<false>(uint64_t &scratchAddress, uint32_t requiredScratchSlot0Size, uint32_t requiredScratchSlot1Size, IndirectHeap *ssh, CommandStreamReceiver &csr);
template void NEO::EncodeDispatchKernel<Family>::setScratchAddress<true>(uint64_t &scratchAddress, uint32_t requiredScratchSlot0Size, uint32_t requiredScratchSlot1Size, IndirectHeap *ssh, CommandStreamReceiver &csr); template void NEO::EncodeDispatchKernel<Family>::setScratchAddress<true>(uint64_t &scratchAddress, uint32_t requiredScratchSlot0Size, uint32_t requiredScratchSlot1Size, IndirectHeap *ssh, CommandStreamReceiver &csr);
template void NEO::EncodeDispatchKernel<Family>::programInlineDataHeapless<false>(uint8_t *inlineDataPtr, EncodeDispatchKernelArgs &args, CommandContainer &container, uint64_t offsetThreadData); template void NEO::EncodeDispatchKernel<Family>::programInlineDataHeapless<false>(uint8_t *inlineDataPtr, EncodeDispatchKernelArgs &args, CommandContainer &container, uint64_t offsetThreadData);
template void NEO::EncodeDispatchKernel<Family>::encodeEuSchedulingPolicy<Family::INTERFACE_DESCRIPTOR_DATA>(Family::INTERFACE_DESCRIPTOR_DATA *pInterfaceDescriptor, const KernelDescriptor &kernelDesc, int32_t defaultThreadArbitrationPolicy); template void NEO::EncodeDispatchKernel<Family>::encodeEuSchedulingPolicy<Family::INTERFACE_DESCRIPTOR_DATA>(Family::INTERFACE_DESCRIPTOR_DATA *pInterfaceDescriptor, const KernelDescriptor &kernelDesc, int32_t defaultPipelinedThreadArbitrationPolicy);
template struct NEO::EncodeStates<Family>; template struct NEO::EncodeStates<Family>;
template struct NEO::EncodeMath<Family>; template struct NEO::EncodeMath<Family>;

2
shared/source/command_container/command_encoder_xehp_and_later.inl
View File

@@ -116,7 +116,7 @@ void EncodeDispatchKernel<Family>::encode(CommandContainer &container, EncodeDis
hwInfo); hwInfo);
if (args.isHeaplessStateInitEnabled) { if (args.isHeaplessStateInitEnabled) {
EncodeDispatchKernel<Family>::encodeEuSchedulingPolicy(&idd, kernelDescriptor, args.defaultThreadArbitrationPolicy); EncodeDispatchKernel<Family>::encodeEuSchedulingPolicy(&idd, kernelDescriptor, args.defaultPipelinedThreadArbitrationPolicy);
} }
auto &gfxCoreHelper = args.device->getGfxCoreHelper(); auto &gfxCoreHelper = args.device->getGfxCoreHelper();

4
shared/test/unit_test/command_container/command_encoder_tests.cpp
View File

@@ -689,8 +689,8 @@ HWTEST_F(CommandEncoderTests, givenInterfaceDescriptorWhenEncodeEuSchedulingPoli
KernelDescriptor kernelDescriptor; KernelDescriptor kernelDescriptor;
kernelDescriptor.kernelAttributes.threadArbitrationPolicy = ThreadArbitrationPolicy::AgeBased; kernelDescriptor.kernelAttributes.threadArbitrationPolicy = ThreadArbitrationPolicy::AgeBased;
int32_t defaultThreadArbitrationPolicy = ThreadArbitrationPolicy::RoundRobin; int32_t defaultPipelinedThreadArbitrationPolicy = ThreadArbitrationPolicy::RoundRobin;
EncodeDispatchKernel<FamilyType>::encodeEuSchedulingPolicy(&idd, kernelDescriptor, defaultThreadArbitrationPolicy); EncodeDispatchKernel<FamilyType>::encodeEuSchedulingPolicy(&idd, kernelDescriptor, defaultPipelinedThreadArbitrationPolicy);
constexpr uint32_t iddSizeInDW = 8; constexpr uint32_t iddSizeInDW = 8;
for (uint32_t i = 0u; i < iddSizeInDW; i++) { for (uint32_t i = 0u; i < iddSizeInDW; i++) {

2
shared/test/unit_test/fixtures/command_container_fixture.cpp
View File

@@ -57,7 +57,7 @@ EncodeDispatchKernelArgs CommandEncodeStatesFixture::createDefaultDispatchKernel
NEO::additionalKernelLaunchSizeParamNotSet, // additionalSizeParam NEO::additionalKernelLaunchSizeParamNotSet, // additionalSizeParam
1, // partitionCount 1, // partitionCount
0, // reserveExtraPayloadSpace 0, // reserveExtraPayloadSpace
0, // defaultThreadArbitrationPolicy NEO::ThreadArbitrationPolicy::NotPresent, // defaultPipelinedThreadArbitrationPolicy
false, // isIndirect false, // isIndirect
false, // isPredicate false, // isPredicate
false, // isTimestampEvent false, // isTimestampEvent