diff --git a/level_zero/core/source/cmdlist/cmdlist.h b/level_zero/core/source/cmdlist/cmdlist.h index 644ee32904..11448da57f 100644 --- a/level_zero/core/source/cmdlist/cmdlist.h +++ b/level_zero/core/source/cmdlist/cmdlist.h @@ -35,8 +35,8 @@ struct Kernel; struct CommandQueue; struct CmdListKernelLaunchParams { - NEO::RequiredPartitionDim requiredPartitionDim = NEO::RequiredPartitionDim::None; - NEO::RequiredDispatchWalkOrder requiredDispatchWalkOrder = NEO::RequiredDispatchWalkOrder::None; + NEO::RequiredPartitionDim requiredPartitionDim = NEO::RequiredPartitionDim::none; + NEO::RequiredDispatchWalkOrder requiredDispatchWalkOrder = NEO::RequiredDispatchWalkOrder::none; uint32_t additionalSizeParam = NEO::additionalKernelLaunchSizeParamNotSet; uint32_t numKernelsInSplitLaunch = 0; uint32_t numKernelsExecutedInSplitLaunch = 0; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_1.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_1.cpp index 5fe8eb5499..34ec268eaa 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_1.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_1.cpp @@ -196,8 +196,8 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenNotEnoughSpaceInCommandStreamWhenA nullptr, // outWalkerPtr nullptr, // additionalCommands PreemptionMode::MidBatch, // preemptionMode - NEO::RequiredPartitionDim::None, // requiredPartitionDim - NEO::RequiredDispatchWalkOrder::None, // requiredDispatchWalkOrder + NEO::RequiredPartitionDim::none, // requiredPartitionDim + NEO::RequiredDispatchWalkOrder::none, // requiredDispatchWalkOrder NEO::additionalKernelLaunchSizeParamNotSet, // additionalSizeParam 0, // partitionCount false, // isIndirect diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp index 05a08069eb..8621dd6136 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp @@ -648,8 +648,8 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenNotEnoughSpaceInCommandStreamWhenA nullptr, // outWalkerPtr nullptr, // additionalCommands PreemptionMode::MidBatch, // preemptionMode - NEO::RequiredPartitionDim::None, // requiredPartitionDim - NEO::RequiredDispatchWalkOrder::None, // requiredDispatchWalkOrder + NEO::RequiredPartitionDim::none, // requiredPartitionDim + NEO::RequiredDispatchWalkOrder::none, // requiredDispatchWalkOrder NEO::additionalKernelLaunchSizeParamNotSet, // additionalSizeParam 0, // partitionCount false, // isIndirect diff --git a/opencl/source/command_queue/hardware_interface_bdw_and_later.inl b/opencl/source/command_queue/hardware_interface_bdw_and_later.inl index 3b37af8171..5a76d06243 100644 --- a/opencl/source/command_queue/hardware_interface_bdw_and_later.inl +++ b/opencl/source/command_queue/hardware_interface_bdw_and_later.inl @@ -102,7 +102,7 @@ inline void HardwareInterface::programWalker( 0, commandQueue.getDevice()); - EncodeWalkerArgs encodeWalkerArgs{kernel.getExecutionType(), false, kernel.getKernelInfo().kernelDescriptor, NEO::RequiredDispatchWalkOrder::None, 0, 0}; + EncodeWalkerArgs encodeWalkerArgs{kernel.getExecutionType(), false, kernel.getKernelInfo().kernelDescriptor, NEO::RequiredDispatchWalkOrder::none, 0, 0}; EncodeDispatchKernel::encodeAdditionalWalkerFields(rootDeviceEnvironment, walkerCmd, encodeWalkerArgs); *walkerCmdBuf = walkerCmd; } diff --git a/opencl/source/command_queue/hardware_interface_xehp_and_later.inl b/opencl/source/command_queue/hardware_interface_xehp_and_later.inl index bf73bde726..c954e21828 100644 --- a/opencl/source/command_queue/hardware_interface_xehp_and_later.inl +++ b/opencl/source/command_queue/hardware_interface_xehp_and_later.inl @@ -143,7 +143,7 @@ inline void HardwareInterface::programWalker( } bool requiredSystemFence = kernelSystemAllocation && walkerArgs.event != nullptr; auto maxFrontEndThreads = commandQueue.getDevice().getDeviceInfo().maxFrontEndThreads; - EncodeWalkerArgs encodeWalkerArgs{kernel.getExecutionType(), requiredSystemFence, kernelInfo.kernelDescriptor, NEO::RequiredDispatchWalkOrder::None, 0, maxFrontEndThreads}; + EncodeWalkerArgs encodeWalkerArgs{kernel.getExecutionType(), requiredSystemFence, kernelInfo.kernelDescriptor, NEO::RequiredDispatchWalkOrder::none, 0, maxFrontEndThreads}; EncodeDispatchKernel::template encodeAdditionalWalkerFields(rootDeviceEnvironment, walkerCmd, encodeWalkerArgs); auto devices = queueCsr.getOsContext().getDeviceBitfield(); @@ -161,7 +161,7 @@ inline void HardwareInterface::programWalker( walkerCmd, nullptr, devices, - kernel.usesImages() ? RequiredPartitionDim::X : RequiredPartitionDim::None, + kernel.usesImages() ? RequiredPartitionDim::x : RequiredPartitionDim::none, partitionCount, false, false, diff --git a/opencl/test/unit_test/command_queue/dispatch_walker_tests_dg2_and_later.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests_dg2_and_later.cpp index 1c845319b8..cf4b8d700d 100644 --- a/opencl/test/unit_test/command_queue/dispatch_walker_tests_dg2_and_later.cpp +++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests_dg2_and_later.cpp @@ -84,7 +84,7 @@ HWTEST2_F(WalkerDispatchTestDg2AndLater, givenDebugVariableSetWhenProgramCompute auto &rootDeviceEnvironment = *mockExecutionEnvironment.rootDeviceEnvironments[0]; KernelDescriptor kernelDescriptor; - EncodeWalkerArgs walkerArgs{KernelExecutionType::defaultType, true, kernelDescriptor, NEO::RequiredDispatchWalkOrder::None, 0, 0}; + EncodeWalkerArgs walkerArgs{KernelExecutionType::defaultType, true, kernelDescriptor, NEO::RequiredDispatchWalkOrder::none, 0, 0}; for (auto forceL3PrefetchForComputeWalker : {false, true}) { debugManager.flags.ForceL3PrefetchForComputeWalker.set(forceL3PrefetchForComputeWalker); EncodeDispatchKernel::encodeAdditionalWalkerFields(rootDeviceEnvironment, walkerCmd, walkerArgs); diff --git a/shared/source/command_container/command_encoder.h b/shared/source/command_container/command_encoder.h index a49f3877a1..338dfd24c1 100644 --- a/shared/source/command_container/command_encoder.h +++ b/shared/source/command_container/command_encoder.h @@ -56,8 +56,8 @@ struct EncodeDispatchKernelArgs { void *outWalkerPtr = nullptr; std::list *additionalCommands = nullptr; PreemptionMode preemptionMode = PreemptionMode::Initial; - NEO::RequiredPartitionDim requiredPartitionDim = NEO::RequiredPartitionDim::None; - NEO::RequiredDispatchWalkOrder requiredDispatchWalkOrder = NEO::RequiredDispatchWalkOrder::None; + NEO::RequiredPartitionDim requiredPartitionDim = NEO::RequiredPartitionDim::none; + NEO::RequiredDispatchWalkOrder requiredDispatchWalkOrder = NEO::RequiredDispatchWalkOrder::none; uint32_t additionalSizeParam = NEO::additionalKernelLaunchSizeParamNotSet; uint32_t partitionCount = 0u; bool isIndirect = false; @@ -95,7 +95,7 @@ struct EncodeWalkerArgs { KernelExecutionType kernelExecutionType = KernelExecutionType::defaultType; bool requiredSystemFence = false; const KernelDescriptor &kernelDescriptor; - NEO::RequiredDispatchWalkOrder requiredDispatchWalkOrder = NEO::RequiredDispatchWalkOrder::None; + NEO::RequiredDispatchWalkOrder requiredDispatchWalkOrder = NEO::RequiredDispatchWalkOrder::none; uint32_t additionalSizeParam = NEO::additionalKernelLaunchSizeParamNotSet; uint32_t maxFrontEndThreads = 0; }; diff --git a/shared/source/command_container/walker_partition_xehp_and_later.h b/shared/source/command_container/walker_partition_xehp_and_later.h index 04e96c961a..8f359bcd5d 100644 --- a/shared/source/command_container/walker_partition_xehp_and_later.h +++ b/shared/source/command_container/walker_partition_xehp_and_later.h @@ -197,17 +197,17 @@ uint32_t computePartitionCountAndSetPartitionType(WalkerType *walker, std::optional requestedPartitionType{}; switch (requiredPartitionDim) { - case NEO::RequiredPartitionDim::X: + case NEO::RequiredPartitionDim::x: requestedPartitionType = PARTITION_TYPE::PARTITION_TYPE_X; break; - case NEO::RequiredPartitionDim::Y: + case NEO::RequiredPartitionDim::y: requestedPartitionType = PARTITION_TYPE::PARTITION_TYPE_Y; break; - case NEO::RequiredPartitionDim::Z: + case NEO::RequiredPartitionDim::z: requestedPartitionType = PARTITION_TYPE::PARTITION_TYPE_Z; break; default: - UNRECOVERABLE_IF(requiredPartitionDim != NEO::RequiredPartitionDim::None); + UNRECOVERABLE_IF(requiredPartitionDim != NEO::RequiredPartitionDim::none); break; } diff --git a/shared/source/helpers/definitions/command_encoder_args.h b/shared/source/helpers/definitions/command_encoder_args.h index 7693755910..bf5d80ff9e 100644 --- a/shared/source/helpers/definitions/command_encoder_args.h +++ b/shared/source/helpers/definitions/command_encoder_args.h @@ -29,17 +29,17 @@ struct MiFlushArgs { }; enum class RequiredPartitionDim : uint32_t { - None = 0, - X, - Y, - Z + none = 0, + x, + y, + z }; enum class RequiredDispatchWalkOrder : uint32_t { - None = 0, - X, - Y, - Additional + none = 0, + x, + y, + additional }; static constexpr uint32_t additionalKernelLaunchSizeParamNotSet = 0; diff --git a/shared/test/unit_test/encoders/test_implicit_scaling_xehp_and_later.cpp b/shared/test/unit_test/encoders/test_implicit_scaling_xehp_and_later.cpp index c437a672e4..c24374b858 100644 --- a/shared/test/unit_test/encoders/test_implicit_scaling_xehp_and_later.cpp +++ b/shared/test/unit_test/encoders/test_implicit_scaling_xehp_and_later.cpp @@ -36,7 +36,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenGetSizeWhenDispatchingCm expectedSize = ImplicitScalingDispatch::template getSize(false, false, twoTile, Vec3(0, 0, 0), Vec3(32, 1, 1)); uint32_t partitionCount = 0; - ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::None, partitionCount, true, false, dcFlushFlag, + ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::none, partitionCount, true, false, dcFlushFlag, forceExecutionOnSingleTileFlag, 0u, *defaultHwInfo); totalBytesProgrammed = commandStream.getUsed(); EXPECT_EQ(expectedSize, totalBytesProgrammed); @@ -79,7 +79,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenWorkgroupOneAndNoPartiti expectedSize = ImplicitScalingDispatch::template getSize(false, false, twoTile, Vec3(0, 0, 0), Vec3(1, 1, 1)); uint32_t partitionCount = 0; - ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::None, partitionCount, false, false, dcFlushFlag, + ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::none, partitionCount, false, false, dcFlushFlag, forceExecutionOnSingleTileFlag, 0u, *defaultHwInfo); totalBytesProgrammed = commandStream.getUsed(); EXPECT_EQ(expectedSize, totalBytesProgrammed); @@ -123,7 +123,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenWorkgroupOneAndPartition expectedSize = ImplicitScalingDispatch::template getSize(false, false, twoTile, Vec3(0, 0, 0), Vec3(1, 1, 1)); uint32_t partitionCount = 0; - ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::None, partitionCount, true, false, dcFlushFlag, + ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::none, partitionCount, true, false, dcFlushFlag, forceExecutionOnSingleTileFlag, 0u, *defaultHwInfo); totalBytesProgrammed = commandStream.getUsed(); EXPECT_EQ(expectedSize, totalBytesProgrammed); @@ -170,7 +170,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenStaticPartitioningWhenDi expectedSize = ImplicitScalingDispatch::template getSize(false, true, twoTile, Vec3(0, 0, 0), Vec3(32, 1, 1)); uint32_t partitionCount = 0; - ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::None, partitionCount, true, false, dcFlushFlag, + ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::none, partitionCount, true, false, dcFlushFlag, forceExecutionOnSingleTileFlag, workPartitionAllocationAddress, *defaultHwInfo); totalBytesProgrammed = commandStream.getUsed(); EXPECT_EQ(expectedSize, totalBytesProgrammed); @@ -222,7 +222,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenStaticPartitioningWhenPa expectedSize = ImplicitScalingDispatch::template getSize(false, true, twoTile, Vec3(0, 0, 0), Vec3(32, 1, 1)); uint32_t partitionCount = 0; - ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::None, partitionCount, true, false, dcFlushFlag, + ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::none, partitionCount, true, false, dcFlushFlag, forceExecutionOnSingleTileFlag, workPartitionAllocationAddress, *defaultHwInfo); totalBytesProgrammed = commandStream.getUsed(); EXPECT_EQ(expectedSize, totalBytesProgrammed); @@ -276,7 +276,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenStaticPartitioningPrefer expectedSize = ImplicitScalingDispatch::template getSize(false, true, twoTile, Vec3(0, 0, 0), Vec3(1, 1, 1)); uint32_t partitionCount = 0; - ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::None, partitionCount, true, false, dcFlushFlag, + ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::none, partitionCount, true, false, dcFlushFlag, forceExecutionOnSingleTileFlag, workPartitionAllocationAddress, *defaultHwInfo); totalBytesProgrammed = commandStream.getUsed(); EXPECT_EQ(expectedSize, totalBytesProgrammed); @@ -327,7 +327,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenStaticPartitioningPrefer expectedSize = ImplicitScalingDispatch::template getSize(false, true, twoTile, Vec3(0, 0, 0), Vec3(1, 1, 1)); uint32_t partitionCount = 0; - ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::None, partitionCount, true, false, dcFlushFlag, + ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::none, partitionCount, true, false, dcFlushFlag, forceExecutionOnSingleTileFlag, workPartitionAllocationAddress, *defaultHwInfo); totalBytesProgrammed = commandStream.getUsed(); EXPECT_EQ(expectedSize, totalBytesProgrammed); @@ -364,7 +364,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenStaticPartitioningPrefer expectedSize = ImplicitScalingDispatch::template getSize(false, true, twoTile, Vec3(0, 0, 0), Vec3(1, 1, 1)); uint32_t partitionCount = 0; - ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::None, partitionCount, true, false, dcFlushFlag, + ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::none, partitionCount, true, false, dcFlushFlag, forceExecutionOnSingleTileFlag, workPartitionAllocationAddress, *defaultHwInfo); totalBytesProgrammed = commandStream.getUsed(); EXPECT_EQ(expectedSize, totalBytesProgrammed); @@ -401,7 +401,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenDynamicPartitioningPrefe expectedSize = ImplicitScalingDispatch::template getSize(false, false, twoTile, Vec3(0, 0, 0), Vec3(1, 1, 1)); uint32_t partitionCount = 0; - ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::None, partitionCount, true, false, dcFlushFlag, + ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::none, partitionCount, true, false, dcFlushFlag, forceExecutionOnSingleTileFlag, workPartitionAllocationAddress, *defaultHwInfo); totalBytesProgrammed = commandStream.getUsed(); EXPECT_EQ(expectedSize, totalBytesProgrammed); @@ -449,7 +449,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, EXPECT_EQ(expectedSize, estimatedSize); uint32_t partitionCount = 0; - ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::None, partitionCount, true, true, dcFlushFlag, + ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::none, partitionCount, true, true, dcFlushFlag, forceExecutionOnSingleTileFlag, workPartitionAllocationAddress, *defaultHwInfo); totalBytesProgrammed = commandStream.getUsed(); EXPECT_EQ(expectedSize, totalBytesProgrammed); @@ -517,7 +517,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, EXPECT_EQ(expectedSize, estimatedSize); uint32_t partitionCount = 0; - ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::None, partitionCount, true, true, dcFlushFlag, + ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::none, partitionCount, true, true, dcFlushFlag, forceExecutionOnSingleTileFlag, workPartitionAllocationAddress, *defaultHwInfo); totalBytesProgrammed = commandStream.getUsed(); EXPECT_EQ(expectedSize, totalBytesProgrammed); @@ -577,7 +577,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, EXPECT_EQ(expectedSize, estimatedSize); uint32_t partitionCount = 0; - ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::None, partitionCount, true, true, dcFlushFlag, + ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::none, partitionCount, true, true, dcFlushFlag, forceExecutionOnSingleTileFlag, workPartitionAllocationAddress, *defaultHwInfo); totalBytesProgrammed = commandStream.getUsed(); EXPECT_EQ(expectedSize, totalBytesProgrammed); @@ -637,7 +637,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, EXPECT_EQ(expectedSize, estimatedSize); uint32_t partitionCount = 0; - ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::None, partitionCount, true, true, dcFlushFlag, + ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::none, partitionCount, true, true, dcFlushFlag, forceExecutionOnSingleTileFlag, workPartitionAllocationAddress, *defaultHwInfo); totalBytesProgrammed = commandStream.getUsed(); EXPECT_EQ(expectedSize, totalBytesProgrammed); @@ -704,7 +704,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, EXPECT_EQ(expectedSize, estimatedSize); uint32_t partitionCount = 0; - ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::None, partitionCount, true, true, dcFlushFlag, + ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::none, partitionCount, true, true, dcFlushFlag, forceExecutionOnSingleTileFlag, workPartitionAllocationAddress, *defaultHwInfo); totalBytesProgrammed = commandStream.getUsed(); EXPECT_EQ(expectedSize, totalBytesProgrammed); @@ -767,7 +767,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, EXPECT_EQ(expectedSize, estimatedSize); uint32_t partitionCount = 0; - ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::None, partitionCount, true, false, dcFlushFlag, + ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::none, partitionCount, true, false, dcFlushFlag, forceExecutionOnSingleTileFlag, workPartitionAllocationAddress, *defaultHwInfo); totalBytesProgrammed = commandStream.getUsed(); EXPECT_EQ(expectedSize, totalBytesProgrammed); @@ -832,7 +832,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, EXPECT_EQ(expectedSize, estimatedSize); uint32_t partitionCount = 0; - ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::None, partitionCount, true, false, dcFlushFlag, + ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::none, partitionCount, true, false, dcFlushFlag, forceExecutionOnSingleTileFlag, workPartitionAllocationAddress, *defaultHwInfo); totalBytesProgrammed = commandStream.getUsed(); EXPECT_EQ(expectedSize, totalBytesProgrammed); @@ -900,7 +900,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, EXPECT_EQ(expectedSize, estimatedSize); uint32_t partitionCount = 0; - ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::None, partitionCount, true, true, dcFlushFlag, + ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::none, partitionCount, true, true, dcFlushFlag, forceExecutionOnSingleTileFlag, workPartitionAllocationAddress, *defaultHwInfo); totalBytesProgrammed = commandStream.getUsed(); EXPECT_EQ(expectedSize, totalBytesProgrammed); @@ -967,7 +967,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, EXPECT_EQ(expectedSize, estimatedSize); uint32_t partitionCount = 0; - ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::None, partitionCount, true, false, dcFlushFlag, + ImplicitScalingDispatch::dispatchCommands(commandStream, walker, nullptr, twoTile, NEO::RequiredPartitionDim::none, partitionCount, true, false, dcFlushFlag, forceExecutionOnSingleTileFlag, workPartitionAllocationAddress, *defaultHwInfo); totalBytesProgrammed = commandStream.getUsed(); EXPECT_EQ(expectedSize, totalBytesProgrammed); diff --git a/shared/test/unit_test/encoders/walker_partition_tests_xehp_and_later_1.cpp b/shared/test/unit_test/encoders/walker_partition_tests_xehp_and_later_1.cpp index 98560b4d36..07ddae81c8 100644 --- a/shared/test/unit_test/encoders/walker_partition_tests_xehp_and_later_1.cpp +++ b/shared/test/unit_test/encoders/walker_partition_tests_xehp_and_later_1.cpp @@ -1288,7 +1288,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenStaticPartitionIsPreferr checkForProperCmdBufferAddressOffset = false; bool preferredStaticPartitioning = true; bool staticPartitioning = false; - auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, preferredStaticPartitioning, &staticPartitioning); + auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, preferredStaticPartitioning, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(1u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_DISABLED, walker.getPartitionType()); diff --git a/shared/test/unit_test/encoders/walker_partition_tests_xehp_and_later_2.cpp b/shared/test/unit_test/encoders/walker_partition_tests_xehp_and_later_2.cpp index 89bfb4cb9d..e92b2ede19 100644 --- a/shared/test/unit_test/encoders/walker_partition_tests_xehp_and_later_2.cpp +++ b/shared/test/unit_test/encoders/walker_partition_tests_xehp_and_later_2.cpp @@ -449,7 +449,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerWhenComputePartiti walker.setThreadGroupIdXDimension(16u); bool staticPartitioning = false; - auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 2u, false, &staticPartitioning); + auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 2u, false, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(2u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_X, walker.getPartitionType()); @@ -461,7 +461,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerWithNonUniformStar walker.setThreadGroupIdStartingX(1u); bool staticPartitioning = false; - auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, false, &staticPartitioning); + auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, false, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(1u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_DISABLED, walker.getPartitionType()); @@ -469,7 +469,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerWithNonUniformStar walker.setThreadGroupIdStartingX(0u); walker.setThreadGroupIdStartingY(1u); - partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, false, &staticPartitioning); + partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, false, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(1u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_DISABLED, walker.getPartitionType()); @@ -477,7 +477,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerWithNonUniformStar walker.setThreadGroupIdStartingY(0u); walker.setThreadGroupIdStartingZ(1u); - partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, false, &staticPartitioning); + partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, false, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(1u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_DISABLED, walker.getPartitionType()); @@ -491,21 +491,21 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerWithDifferentWorkg walker.setThreadGroupIdZDimension(64u); bool staticPartitioning = false; - auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, false, &staticPartitioning); + auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, false, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(4u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_X, walker.getPartitionType()); walker.setThreadGroupIdYDimension(65u); walker.setPartitionType(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_DISABLED); - partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, false, &staticPartitioning); + partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, false, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(4u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Y, walker.getPartitionType()); walker.setThreadGroupIdZDimension(66u); walker.setPartitionType(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_DISABLED); - partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, false, &staticPartitioning); + partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, false, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(4u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Z, walker.getPartitionType()); @@ -522,21 +522,21 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenDisabledMinimalPartition debugManager.flags.SetMinimalPartitionSize.set(0); bool staticPartitioning = false; - auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, false, &staticPartitioning); + auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, false, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(16u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_X, walker.getPartitionType()); walker.setThreadGroupIdYDimension(65u); walker.setPartitionType(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_DISABLED); - partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, false, &staticPartitioning); + partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, false, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(16u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Y, walker.getPartitionType()); walker.setThreadGroupIdZDimension(66u); walker.setPartitionType(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_DISABLED); - partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, false, &staticPartitioning); + partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, false, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(16u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Z, walker.getPartitionType()); @@ -550,14 +550,14 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerWithDifferentWorkg walker.setThreadGroupIdZDimension(4u); bool staticPartitioning = false; - auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, false, &staticPartitioning); + auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, false, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(4u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_X, walker.getPartitionType()); walker.setThreadGroupIdXDimension(1u); walker.setPartitionType(COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_DISABLED); - partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, false, &staticPartitioning); + partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, false, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(4u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Y, walker.getPartitionType()); @@ -565,7 +565,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerWithDifferentWorkg walker.setThreadGroupIdYDimension(1u); walker.setPartitionType(COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_DISABLED); - partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, false, &staticPartitioning); + partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, false, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(4u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Z, walker.getPartitionType()); @@ -582,25 +582,25 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerWithPartitionTypeH debugManager.flags.ExperimentalSetWalkerPartitionType.set(-1); bool staticPartitioning = false; - auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, false, &staticPartitioning); + auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, false, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(4u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_X, walker.getPartitionType()); debugManager.flags.ExperimentalSetWalkerPartitionType.set(static_cast(COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_X)); - partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, false, &staticPartitioning); + partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, false, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(4u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_X, walker.getPartitionType()); debugManager.flags.ExperimentalSetWalkerPartitionType.set(static_cast(COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Y)); - partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, false, &staticPartitioning); + partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, false, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(4u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Y, walker.getPartitionType()); debugManager.flags.ExperimentalSetWalkerPartitionType.set(static_cast(COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Z)); - partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, false, &staticPartitioning); + partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, false, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(2u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Z, walker.getPartitionType()); @@ -617,7 +617,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenInvalidPartitionTypeIsRe debugManager.flags.ExperimentalSetWalkerPartitionType.set(0); bool staticPartitioning = false; - EXPECT_ANY_THROW(computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, false, &staticPartitioning)); + EXPECT_ANY_THROW(computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, false, &staticPartitioning)); } HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerWithSmallXDimensionSizeWhenPartitionCountIsObtainedThenPartitionCountIsAdujsted) { @@ -628,7 +628,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerWithSmallXDimensio walker.setThreadGroupIdZDimension(1u); bool staticPartitioning = false; - auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 2u, false, &staticPartitioning); + auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 2u, false, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(2u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Y, walker.getPartitionType()); @@ -642,7 +642,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerWithBigXDimensionS walker.setThreadGroupIdZDimension(1u); bool staticPartitioning = false; - auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 2u, false, &staticPartitioning); + auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 2u, false, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(16u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_X, walker.getPartitionType()); @@ -659,7 +659,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenCustomMinimalPartitionSi debugManager.flags.SetMinimalPartitionSize.set(4096); bool staticPartitioning = false; - auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 2u, false, &staticPartitioning); + auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 2u, false, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(4u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_X, walker.getPartitionType()); @@ -673,7 +673,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerWithPartitionTypeP walker.setThreadGroupIdZDimension(1u); bool staticPartitioning = false; - auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, false, &staticPartitioning); + auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, false, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(1u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_DISABLED, walker.getPartitionType()); @@ -687,10 +687,10 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenXDimensionIsNotLargetAnd walker.setThreadGroupIdZDimension(16u); bool staticPartitioning = false; - auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, false, &staticPartitioning); + auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, false, &staticPartitioning); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Y, walker.getPartitionType()); - partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::X, 4u, false, &staticPartitioning); + partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::x, 4u, false, &staticPartitioning); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_X, walker.getPartitionType()); } @@ -702,7 +702,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenStaticPartitioningAndNon walker.setThreadGroupIdZDimension(1u); bool staticPartitioning = false; - auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::X, 4u, true, &staticPartitioning); + auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::x, 4u, true, &staticPartitioning); EXPECT_TRUE(staticPartitioning); EXPECT_EQ(4u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_X, walker.getPartitionType()); @@ -716,7 +716,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenStaticPartitioningAndPar walker.setThreadGroupIdZDimension(1u); bool staticPartitioning = false; - auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, true, &staticPartitioning); + auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, true, &staticPartitioning); EXPECT_TRUE(staticPartitioning); EXPECT_EQ(4u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Y, walker.getPartitionType()); @@ -730,7 +730,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenStaticPartitioningAndBig walker.setThreadGroupIdZDimension(1u); bool staticPartitioning = false; - auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, true, &staticPartitioning); + auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, true, &staticPartitioning); EXPECT_TRUE(staticPartitioning); EXPECT_EQ(4u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Y, walker.getPartitionType()); @@ -747,7 +747,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenStaticPartitioningAndAnd walker.setThreadGroupIdStartingZ(1); bool staticPartitioning = false; - auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, true, &staticPartitioning); + auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, true, &staticPartitioning); EXPECT_FALSE(staticPartitioning); EXPECT_EQ(1u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_DISABLED, walker.getPartitionType()); @@ -762,14 +762,14 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenStaticPartitioningAndPar walker.setThreadGroupIdZDimension(1u); bool staticPartitioning = false; - auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, true, &staticPartitioning); + auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, true, &staticPartitioning); EXPECT_TRUE(staticPartitioning); EXPECT_EQ(4u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Y, walker.getPartitionType()); debugManager.flags.ExperimentalSetWalkerPartitionType.set(static_cast(COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Z)); staticPartitioning = false; - partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 4u, true, &staticPartitioning); + partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 4u, true, &staticPartitioning); EXPECT_TRUE(staticPartitioning); EXPECT_EQ(4u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Z, walker.getPartitionType()); @@ -784,14 +784,14 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenStaticPartitioningWhenZD walker.setThreadGroupIdZDimension(2u); bool staticPartitioning = true; - auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 2u, true, &staticPartitioning); + auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 2u, true, &staticPartitioning); EXPECT_TRUE(staticPartitioning); EXPECT_EQ(2u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Z, walker.getPartitionType()); debugManager.flags.WalkerPartitionPreferHighestDimension.set(0); - partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 2u, true, &staticPartitioning); + partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 2u, true, &staticPartitioning); EXPECT_TRUE(staticPartitioning); EXPECT_EQ(2u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Y, walker.getPartitionType()); @@ -806,14 +806,14 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenStaticPartitioningWhenYD walker.setThreadGroupIdZDimension(1u); bool staticPartitioning = true; - auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 2u, true, &staticPartitioning); + auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 2u, true, &staticPartitioning); EXPECT_TRUE(staticPartitioning); EXPECT_EQ(2u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Y, walker.getPartitionType()); debugManager.flags.WalkerPartitionPreferHighestDimension.set(0); - partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 2u, true, &staticPartitioning); + partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 2u, true, &staticPartitioning); EXPECT_TRUE(staticPartitioning); EXPECT_EQ(2u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_X, walker.getPartitionType()); @@ -828,14 +828,14 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenStaticPartitioningWhenZD walker.setThreadGroupIdZDimension(513u); bool staticPartitioning = true; - auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 2u, true, &staticPartitioning); + auto partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 2u, true, &staticPartitioning); EXPECT_TRUE(staticPartitioning); EXPECT_EQ(2u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Z, walker.getPartitionType()); debugManager.flags.WalkerPartitionPreferHighestDimension.set(0); - partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::None, 2u, true, &staticPartitioning); + partitionCount = computePartitionCountAndSetPartitionType(&walker, NEO::RequiredPartitionDim::none, 2u, true, &staticPartitioning); EXPECT_TRUE(staticPartitioning); EXPECT_EQ(2u, partitionCount); EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_Z, walker.getPartitionType()); diff --git a/shared/test/unit_test/fixtures/command_container_fixture.cpp b/shared/test/unit_test/fixtures/command_container_fixture.cpp index b2192a5cbf..864934b1fb 100644 --- a/shared/test/unit_test/fixtures/command_container_fixture.cpp +++ b/shared/test/unit_test/fixtures/command_container_fixture.cpp @@ -49,8 +49,8 @@ EncodeDispatchKernelArgs CommandEncodeStatesFixture::createDefaultDispatchKernel nullptr, // outWalkerPtr nullptr, // additionalCommands PreemptionMode::Disabled, // preemptionMode - NEO::RequiredPartitionDim::None, // requiredPartitionDim - NEO::RequiredDispatchWalkOrder::None, // requiredDispatchWalkOrder + NEO::RequiredPartitionDim::none, // requiredPartitionDim + NEO::RequiredDispatchWalkOrder::none, // requiredDispatchWalkOrder NEO::additionalKernelLaunchSizeParamNotSet, // additionalSizeParam 1, // partitionCount false, // isIndirect diff --git a/shared/test/unit_test/xe_hpc_core/dispatch_walker_tests_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/dispatch_walker_tests_xe_hpc_core.cpp index 966dc881ae..886c87ea57 100644 --- a/shared/test/unit_test/xe_hpc_core/dispatch_walker_tests_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/dispatch_walker_tests_xe_hpc_core.cpp @@ -26,7 +26,7 @@ XE_HPC_CORETEST_F(WalkerDispatchTestsXeHpcCore, givenXeHpcWhenEncodeAdditionalWa auto &rootDeviceEnvironment = *mockExecutionEnvironment.rootDeviceEnvironments[0]; KernelDescriptor kernelDescriptor; - EncodeWalkerArgs walkerArgs{KernelExecutionType::defaultType, true, kernelDescriptor, NEO::RequiredDispatchWalkOrder::None, 0}; + EncodeWalkerArgs walkerArgs{KernelExecutionType::defaultType, true, kernelDescriptor, NEO::RequiredDispatchWalkOrder::none, 0}; { EncodeDispatchKernel::encodeAdditionalWalkerFields(rootDeviceEnvironment, walkerCmd, walkerArgs); EXPECT_FALSE(walkerCmd.getComputeDispatchAllWalkerEnable()); diff --git a/shared/test/unit_test/xe_hpc_core/pvc/dispatch_walker_tests_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/dispatch_walker_tests_pvc.cpp index b81a223e40..f11e4efb66 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/dispatch_walker_tests_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/dispatch_walker_tests_pvc.cpp @@ -44,7 +44,7 @@ PVCTEST_F(WalkerDispatchTestsPvc, givenPvcWhenEncodeAdditionalWalkerFieldsThenPo auto &hwInfo = *rootDeviceEnvironment.getMutableHardwareInfo(); KernelDescriptor kernelDescriptor; - EncodeWalkerArgs walkerArgs{KernelExecutionType::defaultType, true, kernelDescriptor, NEO::RequiredDispatchWalkOrder::None, 0}; + EncodeWalkerArgs walkerArgs{KernelExecutionType::defaultType, true, kernelDescriptor, NEO::RequiredDispatchWalkOrder::none, 0}; for (auto &testInput : testInputs) { for (auto &deviceId : pvcXlDeviceIds) { hwInfo.platform.usDeviceID = deviceId; @@ -70,7 +70,7 @@ PVCTEST_F(WalkerDispatchTestsPvc, givenPvcSupportsSystemMemoryFenceWhenNoSystemF hwInfo.platform.usRevId = 0x3; KernelDescriptor kernelDescriptor; - EncodeWalkerArgs walkerArgs{KernelExecutionType::defaultType, false, kernelDescriptor, NEO::RequiredDispatchWalkOrder::None, 0}; + EncodeWalkerArgs walkerArgs{KernelExecutionType::defaultType, false, kernelDescriptor, NEO::RequiredDispatchWalkOrder::none, 0}; for (auto &deviceId : pvcXlDeviceIds) { hwInfo.platform.usDeviceID = deviceId; diff --git a/shared/test/unit_test/xe_hpg_core/dg2/test_encode_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/test_encode_dg2.cpp index db6b509c3a..79c0145689 100644 --- a/shared/test/unit_test/xe_hpg_core/dg2/test_encode_dg2.cpp +++ b/shared/test/unit_test/xe_hpg_core/dg2/test_encode_dg2.cpp @@ -78,7 +78,7 @@ DG2TEST_F(CommandEncodeDG2Test, whenProgramComputeWalkerThenApplyL3WAForDg2G10A0 {dg2G12DeviceIds[0], revIdA0}}; KernelDescriptor kernelDescriptor; - EncodeWalkerArgs walkerArgs{KernelExecutionType::defaultType, true, kernelDescriptor, NEO::RequiredDispatchWalkOrder::None, 0}; + EncodeWalkerArgs walkerArgs{KernelExecutionType::defaultType, true, kernelDescriptor, NEO::RequiredDispatchWalkOrder::none, 0}; for (const auto &[deviceID, revisionID] : dg2Configs) { hwInfo.platform.usRevId = revisionID;