From 274fe055e9150856ca91d59c0a8ce05bdeee02db Mon Sep 17 00:00:00 2001 From: Szymon Morek Date: Fri, 13 Aug 2021 09:47:42 +0000 Subject: [PATCH] Rename Plus in source code to AndLater Related-To: NEO-5920 Signed-off-by: Szymon Morek --- .../test_cmdlist_append_event_reset.cpp | 8 +- .../test_cmdlist_append_launch_kernel_1.cpp | 20 +-- opencl/source/gen8/device_enqueue.h | 6 +- opencl/source/gen8/scheduler_definitions.h | 4 +- .../enqueue_kernel_aub_tests.cpp | 6 +- .../dispatch_walker_tests_xehp_and_later.cpp | 94 +++++----- .../enqueue_media_kernel_xehp_and_later.cpp | 28 +-- ...e_resource_barier_tests_xehp_and_later.cpp | 6 +- ...d_stream_receiver_tests_xehp_and_later.cpp | 60 +++---- ...ceiver_flush_task_tests_xehp_and_later.cpp | 50 +++--- ...tream_receiver_hw_tests_xehp_and_later.cpp | 170 +++++++++--------- ...mulated_common_hw_tests_xehp_and_later.cpp | 22 +-- ...d_stream_receiver_tests_xehp_and_later.cpp | 20 +-- .../device/get_device_info_tests.cpp | 2 +- .../aub_helper_hw_tests_xehp_and_later.cpp | 10 +- ...ngine_node_helper_tests_xehp_and_later.cpp | 4 +- .../hardware_commands_helper_tests.cpp | 10 +- .../test/unit_test/helpers/hw_helper_tests.h | 2 +- .../hw_helper_tests_xehp_and_later.cpp | 60 +++---- .../helpers/test_preamble_xehp_and_later.cpp | 44 ++--- .../mem_obj/buffer_tests_xehp_and_later.cpp | 36 ++-- .../mem_obj/image_tests_tgllp_and_later.cpp | 6 +- .../mem_obj/image_tests_xehp_and_later.cpp | 42 ++--- ..._scratch_space_controller_xehp_and_later.h | 28 +-- .../sampler/sampler_tests_xehp_and_later.cpp | 4 +- .../xe_hp_core/xehp/hw_helper_tests_xehp.inl | 2 +- ...mand_stream_receiver_hw_xehp_and_later.inl | 2 +- ...cratch_space_controller_xehp_and_later.cpp | 84 ++++----- .../scratch_space_controller_xehp_and_later.h | 8 +- .../helpers/hw_helper_xehp_and_later.inl | 2 +- .../xe_hp_core/hw_helper_xe_hp_core.cpp | 2 +- .../xe_hp_core/test_preemption_xe_hp_core.cpp | 2 +- .../command_encoder_tests_xehp_and_later.cpp | 14 +- ..._encode_dispatch_kernel_xehp_and_later.cpp | 18 +- .../test_encode_math_xehp_and_later.cpp | 4 +- ...test_encode_mi_flush_dw_xehp_and_later.cpp | 4 +- .../test_preemption_xehp_and_later.cpp | 16 +- ...h_space_controler_xehp_and_later_tests.cpp | 46 ++--- 38 files changed, 473 insertions(+), 473 deletions(-) diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp index 922efb653f..2c6a24884b 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp @@ -120,8 +120,8 @@ HWTEST_F(CommandListAppendEventReset, givenCmdlistWhenAppendingEventResetThenEve } } -using SklPlusMatcher = IsAtLeastProduct; -HWTEST2_F(CommandListAppendEventReset, givenImmediateCmdlistWhenAppendingEventResetThenCommandsAreExecuted, SklPlusMatcher) { +using SklAndLaterMatcher = IsAtLeastProduct; +HWTEST2_F(CommandListAppendEventReset, givenImmediateCmdlistWhenAppendingEventResetThenCommandsAreExecuted, SklAndLaterMatcher) { const ze_command_queue_desc_t desc = {}; bool internalEngine = true; @@ -138,7 +138,7 @@ HWTEST2_F(CommandListAppendEventReset, givenImmediateCmdlistWhenAppendingEventRe ASSERT_EQ(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(CommandListAppendEventReset, givenTimestampEventUsedInResetThenPipeControlAppendedCorrectly, SklPlusMatcher) { +HWTEST2_F(CommandListAppendEventReset, givenTimestampEventUsedInResetThenPipeControlAppendedCorrectly, SklAndLaterMatcher) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using POST_SYNC_OPERATION = typename PIPE_CONTROL::POST_SYNC_OPERATION; @@ -183,7 +183,7 @@ HWTEST2_F(CommandListAppendEventReset, givenTimestampEventUsedInResetThenPipeCon ASSERT_EQ(EventPacketsCount::eventPackets, postSyncFound); } -HWTEST2_F(CommandListAppendEventReset, givenEventWithHostScopeUsedInResetThenPipeControlWithDcFlushAppended, SklPlusMatcher) { +HWTEST2_F(CommandListAppendEventReset, givenEventWithHostScopeUsedInResetThenPipeControlWithDcFlushAppended, SklAndLaterMatcher) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using POST_SYNC_OPERATION = typename PIPE_CONTROL::POST_SYNC_OPERATION; 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 520da0cbae..1e923a23a7 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 @@ -235,8 +235,8 @@ HWTEST_F(CommandListAppendLaunchKernel, WhenAppendingMultipleTimesThenSshIsNotDe EXPECT_NE(initialAllocation, reallocatedAllocation); } -using SklPlusMatcher = IsAtLeastProduct; -HWTEST2_F(CommandListAppendLaunchKernel, WhenAppendingFunctionThenUsedCmdBufferSizeDoesNotExceedEstimate, SklPlusMatcher) { +using SklAndLaterMatcher = IsAtLeastProduct; +HWTEST2_F(CommandListAppendLaunchKernel, WhenAppendingFunctionThenUsedCmdBufferSizeDoesNotExceedEstimate, SklAndLaterMatcher) { createKernel(); ze_group_count_t groupCount{1, 1, 1}; @@ -536,7 +536,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenForcePipeControlPriorToWalkerKeyAn EXPECT_NE(firstBatchBufferAllocation, secondBatchBufferAllocation); } -HWTEST2_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingLaunchKernelThenKernelIsExecutedOnImmediateCmdQ, SklPlusMatcher) { +HWTEST2_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingLaunchKernelThenKernelIsExecutedOnImmediateCmdQ, SklAndLaterMatcher) { createKernel(); const ze_command_queue_desc_t desc = {}; @@ -562,7 +562,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingL ASSERT_EQ(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingLaunchKernelWithInvalidEventThenInvalidArgumentErrorIsReturned, SklPlusMatcher) { +HWTEST2_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingLaunchKernelWithInvalidEventThenInvalidArgumentErrorIsReturned, SklAndLaterMatcher) { createKernel(); const ze_command_queue_desc_t desc = {}; @@ -588,7 +588,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingL ASSERT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, result); } -HWTEST2_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingLaunchKernelIndirectThenKernelIsExecutedOnImmediateCmdQ, SklPlusMatcher) { +HWTEST2_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingLaunchKernelIndirectThenKernelIsExecutedOnImmediateCmdQ, SklAndLaterMatcher) { createKernel(); const ze_command_queue_desc_t desc = {}; bool internalEngine = true; @@ -613,7 +613,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingL ASSERT_EQ(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingLaunchKernelIndirectWithInvalidEventThenInvalidArgumentErrorIsReturned, SklPlusMatcher) { +HWTEST2_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingLaunchKernelIndirectWithInvalidEventThenInvalidArgumentErrorIsReturned, SklAndLaterMatcher) { createKernel(); const ze_command_queue_desc_t desc = {}; @@ -1005,7 +1005,7 @@ HWTEST_F(CommandListAppendLaunchKernel, givenInvalidEventListWhenAppendLaunchCoo EXPECT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, returnValue); } -HWTEST2_F(CommandListAppendLaunchKernel, givenKernelUsingSyncBufferWhenAppendLaunchCooperativeKernelIsCalledThenCorrectValueIsReturned, SklPlusMatcher) { +HWTEST2_F(CommandListAppendLaunchKernel, givenKernelUsingSyncBufferWhenAppendLaunchCooperativeKernelIsCalledThenCorrectValueIsReturned, SklAndLaterMatcher) { Mock<::L0::Kernel> kernel; auto pMockModule = std::unique_ptr(new Mock(device, nullptr)); kernel.module = pMockModule.get(); @@ -1053,7 +1053,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenKernelUsingSyncBufferWhenAppendLau } } -HWTEST2_F(CommandListAppendLaunchKernel, whenUpdateStreamPropertiesIsCalledThenRequiredStateAndFinalStateAreCorrectlySet, SklPlusMatcher) { +HWTEST2_F(CommandListAppendLaunchKernel, whenUpdateStreamPropertiesIsCalledThenRequiredStateAndFinalStateAreCorrectlySet, SklAndLaterMatcher) { Mock<::L0::Kernel> kernel; auto pMockModule = std::unique_ptr(new Mock(device, nullptr)); kernel.module = pMockModule.get(); @@ -1077,7 +1077,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, whenUpdateStreamPropertiesIsCalledThenR EXPECT_EQ(expectedDisableOverdispatch, pCommandList->finalStreamState.frontEndState.disableOverdispatch.value); } -HWTEST2_F(CommandListAppendLaunchKernel, givenCooperativeKernelWhenAppendLaunchCooperativeKernelIsCalledThenCommandListTypeIsProperlySet, SklPlusMatcher) { +HWTEST2_F(CommandListAppendLaunchKernel, givenCooperativeKernelWhenAppendLaunchCooperativeKernelIsCalledThenCommandListTypeIsProperlySet, SklAndLaterMatcher) { createKernel(); kernel->setGroupSize(4, 1, 1); ze_group_count_t groupCount{8, 1, 1}; @@ -1099,7 +1099,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenCooperativeKernelWhenAppendLaunchC EXPECT_TRUE(pCommandList->containsCooperativeKernelsFlag); } -HWTEST2_F(CommandListAppendLaunchKernel, givenCooperativeAndNonCooperativeKernelsWhenAppendLaunchCooperativeKernelIsCalledThenReturnError, SklPlusMatcher) { +HWTEST2_F(CommandListAppendLaunchKernel, givenCooperativeAndNonCooperativeKernelsWhenAppendLaunchCooperativeKernelIsCalledThenReturnError, SklAndLaterMatcher) { Mock<::L0::Kernel> kernel; auto pMockModule = std::unique_ptr(new Mock(device, nullptr)); kernel.module = pMockModule.get(); diff --git a/opencl/source/gen8/device_enqueue.h b/opencl/source/gen8/device_enqueue.h index 20679cfa67..8a9b2bfa3a 100644 --- a/opencl/source/gen8/device_enqueue.h +++ b/opencl/source/gen8/device_enqueue.h @@ -26,12 +26,12 @@ #ifdef WA_LRI_COMMANDS_EXIST_GEN8 -#define SECOND_LEVEL_BUFFER_SPACE_FOR_EACH_ENQUEUE_GEN8PLUS (OCLRT_SIZEOF_MEDIA_STATE_FLUSH + OCLRT_SIZEOF_MI_ATOMIC_CMD + OCLRT_SIZEOF_MEDIA_INTERFACE_DESCRIPTOR_LOAD_DEVICE_CMD + OCLRT_LOAD_REGISTER_IMM_CMD_G8 + OCLRT_PIPE_CONTROL_CMD_DEVICE_CMD_G8 + OCLRT_GPGPU_WALKER_CMD_DEVICE_CMD_G8 + OCLRT_SIZEOF_MEDIA_STATE_FLUSH + OCLRT_PIPE_CONTROL_CMD_DEVICE_CMD_G8 + OCLRT_LOAD_REGISTER_IMM_CMD_G8 + CS_PREFETCH_SIZE) +#define SECOND_LEVEL_BUFFER_SPACE_FOR_EACH_ENQUEUE_GEN8_AND_LATER (OCLRT_SIZEOF_MEDIA_STATE_FLUSH + OCLRT_SIZEOF_MI_ATOMIC_CMD + OCLRT_SIZEOF_MEDIA_INTERFACE_DESCRIPTOR_LOAD_DEVICE_CMD + OCLRT_LOAD_REGISTER_IMM_CMD_G8 + OCLRT_PIPE_CONTROL_CMD_DEVICE_CMD_G8 + OCLRT_GPGPU_WALKER_CMD_DEVICE_CMD_G8 + OCLRT_SIZEOF_MEDIA_STATE_FLUSH + OCLRT_PIPE_CONTROL_CMD_DEVICE_CMD_G8 + OCLRT_LOAD_REGISTER_IMM_CMD_G8 + CS_PREFETCH_SIZE) #else -#define SECOND_LEVEL_BUFFER_SPACE_FOR_EACH_ENQUEUE_GEN8PLUS (OCLRT_SIZEOF_MEDIA_STATE_FLUSH + OCLRT_SIZEOF_MI_ATOMIC_CMD + OCLRT_SIZEOF_MEDIA_VFE_STATE_CMD + OCLRT_SIZEOF_MEDIA_INTERFACE_DESCRIPTOR_LOAD_DEVICE_CMD + OCLRT_PIPE_CONTROL_CMD_DEVICE_CMD_G8 + OCLRT_GPGPU_WALKER_CMD_DEVICE_CMD_G8 + OCLRT_SIZEOF_MEDIA_STATE_FLUSH + OCLRT_PIPE_CONTROL_CMD_DEVICE_CMD_G8 + CS_PREFETCH_SIZE) +#define SECOND_LEVEL_BUFFER_SPACE_FOR_EACH_ENQUEUE_GEN8_AND_LATER (OCLRT_SIZEOF_MEDIA_STATE_FLUSH + OCLRT_SIZEOF_MI_ATOMIC_CMD + OCLRT_SIZEOF_MEDIA_VFE_STATE_CMD + OCLRT_SIZEOF_MEDIA_INTERFACE_DESCRIPTOR_LOAD_DEVICE_CMD + OCLRT_PIPE_CONTROL_CMD_DEVICE_CMD_G8 + OCLRT_GPGPU_WALKER_CMD_DEVICE_CMD_G8 + OCLRT_SIZEOF_MEDIA_STATE_FLUSH + OCLRT_PIPE_CONTROL_CMD_DEVICE_CMD_G8 + CS_PREFETCH_SIZE) #endif //WA_LRI_COMMANDS_EXIST_GEN8 -#define SECOND_LEVEL_BUFFER_NUMBER_OF_ENQUEUES_GEN8PLUS (128) +#define SECOND_LEVEL_BUFFER_NUMBER_OF_ENQUEUES_GEN8_AND_LATER (128) diff --git a/opencl/source/gen8/scheduler_definitions.h b/opencl/source/gen8/scheduler_definitions.h index 5e8bfe90b2..4d7a8245df 100644 --- a/opencl/source/gen8/scheduler_definitions.h +++ b/opencl/source/gen8/scheduler_definitions.h @@ -22,8 +22,8 @@ #define INTERFACE_DESCRIPTOR_TABLE_SIZE INTERFACE_DESCRIPTOR_TABLE_SIZE_G8 #define OCLRT_SIZEOF_SAMPLER_STATE OCLRT_SIZEOF_SAMPLER_STATE_G8 -#define SECOND_LEVEL_BUFFER_SPACE_FOR_EACH_ENQUEUE (SECOND_LEVEL_BUFFER_SPACE_FOR_EACH_ENQUEUE_GEN8PLUS) -#define SECOND_LEVEL_BUFFER_NUMBER_OF_ENQUEUES (SECOND_LEVEL_BUFFER_NUMBER_OF_ENQUEUES_GEN8PLUS) +#define SECOND_LEVEL_BUFFER_SPACE_FOR_EACH_ENQUEUE (SECOND_LEVEL_BUFFER_SPACE_FOR_EACH_ENQUEUE_GEN8_AND_LATER) +#define SECOND_LEVEL_BUFFER_NUMBER_OF_ENQUEUES (SECOND_LEVEL_BUFFER_NUMBER_OF_ENQUEUES_GEN8_AND_LATER) // DWORD OFFSET #define MEDIA_STATE_FLUSH_INITIAL_OFFSET 0 diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp index 8178336d87..3012b562e1 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp @@ -864,9 +864,9 @@ HWTEST_F(AUBSimpleArgNonUniformTest, givenOpenCL20SupportWhenProvidingWork3DimNo } using AUBBindlessKernel = Test>; -using IsSklPlus = IsAtLeastProduct; +using IsSklAndLater = IsAtLeastProduct; -HWTEST2_F(AUBBindlessKernel, DISABLED_givenBindlessCopyKernelWhenEnqueuedThenResultsValidate, IsSklPlus) { +HWTEST2_F(AUBBindlessKernel, DISABLED_givenBindlessCopyKernelWhenEnqueuedThenResultsValidate, IsSklAndLater) { constexpr size_t bufferSize = MemoryConstants::pageSize; createKernel(std::string("bindless_stateful_copy_buffer"), std::string("StatefulCopyBuffer")); @@ -944,7 +944,7 @@ HWTEST2_F(AUBBindlessKernel, DISABLED_givenBindlessCopyKernelWhenEnqueuedThenRes bufferDataSrc, bufferSize); } -HWTEST2_F(AUBBindlessKernel, DISABLED_givenBindlessCopyImageKernelWhenEnqueuedThenResultsValidate, IsSklPlus) { +HWTEST2_F(AUBBindlessKernel, DISABLED_givenBindlessCopyImageKernelWhenEnqueuedThenResultsValidate, IsSklAndLater) { constexpr unsigned int testWidth = 5; constexpr unsigned int testHeight = 1; constexpr unsigned int testDepth = 1; diff --git a/opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp index 0dcbe2cfcb..00eb9095ce 100644 --- a/opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp @@ -38,7 +38,7 @@ using namespace NEO; using WalkerDispatchTest = ::testing::Test; -struct XeHPPlusDispatchWalkerBasicFixture : public LinearStreamFixture { +struct XeHPAndLaterDispatchWalkerBasicFixture : public LinearStreamFixture { void SetUp() override { LinearStreamFixture::SetUp(); memset(globalOffsets, 0, sizeof(globalOffsets)); @@ -83,9 +83,9 @@ struct XeHPPlusDispatchWalkerBasicFixture : public LinearStreamFixture { std::unique_ptr kernel; }; -using XeHPPlusDispatchWalkerBasicTest = Test; +using XeHPAndLaterDispatchWalkerBasicTest = Test; -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenWorkDimOneThenLocalWorkSizeEqualsLocalXDim) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenWorkDimOneThenLocalWorkSizeEqualsLocalXDim) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; COMPUTE_WALKER *computeWalker = static_cast(linearStream.getSpace(sizeof(COMPUTE_WALKER))); *computeWalker = FamilyType::cmdInitGpgpuWalker; @@ -104,7 +104,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenWorkDimOneThen EXPECT_EQ(0u, computeWalker->getWalkOrder()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenWorkDimTwoThenLocalWorkSizeEqualsProductLocalXandYDim) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenWorkDimTwoThenLocalWorkSizeEqualsProductLocalXandYDim) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; COMPUTE_WALKER *computeWalker = static_cast(linearStream.getSpace(sizeof(COMPUTE_WALKER))); *computeWalker = FamilyType::cmdInitGpgpuWalker; @@ -124,7 +124,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenWorkDimTwoThen EXPECT_EQ(0u, computeWalker->getEmitInlineParameter()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenWorkDimThreeThenLocalWorkSizeEqualsProductLocalXandYandZDim) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenWorkDimThreeThenLocalWorkSizeEqualsProductLocalXandYandZDim) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; COMPUTE_WALKER *computeWalker = static_cast(linearStream.getSpace(sizeof(COMPUTE_WALKER))); *computeWalker = FamilyType::cmdInitGpgpuWalker; @@ -145,7 +145,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenWorkDimThreeTh EXPECT_EQ(0u, computeWalker->getEmitInlineParameter()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkDimOneWhenAskHwForLocalIdsThenExpectGenerationFieldsSet) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimOneWhenAskHwForLocalIdsThenExpectGenerationFieldsSet) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; COMPUTE_WALKER *computeWalker = static_cast(linearStream.getSpace(sizeof(COMPUTE_WALKER))); *computeWalker = FamilyType::cmdInitGpgpuWalker; @@ -169,7 +169,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkDimOneWhe EXPECT_EQ(4u, computeWalker->getWalkOrder()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkDimTwoWhenOnlyYIdPresentAskHwForLocalIdsThenExpectGenerationFieldsSet) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimTwoWhenOnlyYIdPresentAskHwForLocalIdsThenExpectGenerationFieldsSet) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; COMPUTE_WALKER *computeWalker = static_cast(linearStream.getSpace(sizeof(COMPUTE_WALKER))); *computeWalker = FamilyType::cmdInitGpgpuWalker; @@ -194,7 +194,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkDimTwoWhe EXPECT_EQ(0u, computeWalker->getEmitInlineParameter()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkThreeTwoWhenOnlyZIdPresentAskHwForLocalIdsThenExpectGenerationFieldsSet) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkThreeTwoWhenOnlyZIdPresentAskHwForLocalIdsThenExpectGenerationFieldsSet) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; COMPUTE_WALKER *computeWalker = static_cast(linearStream.getSpace(sizeof(COMPUTE_WALKER))); *computeWalker = FamilyType::cmdInitGpgpuWalker; @@ -219,7 +219,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkThreeTwoW EXPECT_EQ(0u, computeWalker->getEmitInlineParameter()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenDifferentSIMDsizesWhenLocalIdsGeneratedThenMessageSizeIsSetToProperValue) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenDifferentSIMDsizesWhenLocalIdsGeneratedThenMessageSizeIsSetToProperValue) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; COMPUTE_WALKER *computeWalker = static_cast(linearStream.getSpace(sizeof(COMPUTE_WALKER))); *computeWalker = FamilyType::cmdInitGpgpuWalker; @@ -242,7 +242,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenDifferentSIMD } } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkDimTwoWhenAskHwForLocalIdsThenExpectGenerationFieldsSet) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimTwoWhenAskHwForLocalIdsThenExpectGenerationFieldsSet) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; COMPUTE_WALKER *computeWalker = static_cast(linearStream.getSpace(sizeof(COMPUTE_WALKER))); @@ -267,7 +267,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkDimTwoWhe EXPECT_EQ(0u, computeWalker->getEmitInlineParameter()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkDimThreeWhenAskHwForLocalIdsThenExpectGenerationFieldsSet) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimThreeWhenAskHwForLocalIdsThenExpectGenerationFieldsSet) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; COMPUTE_WALKER *computeWalker = static_cast(linearStream.getSpace(sizeof(COMPUTE_WALKER))); *computeWalker = FamilyType::cmdInitGpgpuWalker; @@ -291,7 +291,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkDimThreeW EXPECT_EQ(0u, computeWalker->getEmitInlineParameter()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkDimThreeWhenAskHwForLocalIdsAndNoLocalIdsUsedThenExpectNoGenerationFieldsSet) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimThreeWhenAskHwForLocalIdsAndNoLocalIdsUsedThenExpectNoGenerationFieldsSet) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; COMPUTE_WALKER *computeWalker = static_cast(linearStream.getSpace(sizeof(COMPUTE_WALKER))); *computeWalker = FamilyType::cmdInitGpgpuWalker; @@ -313,7 +313,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkDimThreeW EXPECT_EQ(0u, computeWalker->getEmitInlineParameter()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkDimThreeWhenNotAskHwForLocalIdsAndLocalIdsUsedThenExpectNoGenerationFieldsSet) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimThreeWhenNotAskHwForLocalIdsAndLocalIdsUsedThenExpectNoGenerationFieldsSet) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; COMPUTE_WALKER *computeWalker = static_cast(linearStream.getSpace(sizeof(COMPUTE_WALKER))); *computeWalker = FamilyType::cmdInitGpgpuWalker; @@ -335,7 +335,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkDimThreeW EXPECT_EQ(0u, computeWalker->getEmitInlineParameter()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkDimOneWhenAskForInlineDataAndNoLocalIdsPresentThenExpectOnlyInlineFieldSet) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimOneWhenAskForInlineDataAndNoLocalIdsPresentThenExpectOnlyInlineFieldSet) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; COMPUTE_WALKER *computeWalker = static_cast(linearStream.getSpace(sizeof(COMPUTE_WALKER))); *computeWalker = FamilyType::cmdInitGpgpuWalker; @@ -352,7 +352,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkDimOneWhe EXPECT_EQ(1u, computeWalker->getEmitInlineParameter()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkDimOneWhenAskForInlineDataAndLocalIdsPresentThenExpectInlineAndDoNotExpectEmitLocalIdFieldSet) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimOneWhenAskForInlineDataAndLocalIdsPresentThenExpectInlineAndDoNotExpectEmitLocalIdFieldSet) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; COMPUTE_WALKER *computeWalker = static_cast(linearStream.getSpace(sizeof(COMPUTE_WALKER))); *computeWalker = FamilyType::cmdInitGpgpuWalker; @@ -372,7 +372,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkDimOneWhe EXPECT_EQ(1u, computeWalker->getEmitInlineParameter()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkDimThreeWhenAskForInlineDataAndLocalIdsPresentThenDoNotExpectEmitLocalIdFieldSetButExpectInlineSet) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimThreeWhenAskForInlineDataAndLocalIdsPresentThenDoNotExpectEmitLocalIdFieldSetButExpectInlineSet) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; COMPUTE_WALKER *computeWalker = static_cast(linearStream.getSpace(sizeof(COMPUTE_WALKER))); *computeWalker = FamilyType::cmdInitGpgpuWalker; @@ -391,7 +391,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkDimThreeW EXPECT_EQ(1u, computeWalker->getEmitInlineParameter()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkDimThreeWhenAskHwForLocalIdsAndInlineDataThenExpectGenerationFieldsSet) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimThreeWhenAskHwForLocalIdsAndInlineDataThenExpectGenerationFieldsSet) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; COMPUTE_WALKER *computeWalker = static_cast(linearStream.getSpace(sizeof(COMPUTE_WALKER))); *computeWalker = FamilyType::cmdInitGpgpuWalker; @@ -416,7 +416,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenWorkDimThreeW EXPECT_EQ(5u, computeWalker->getWalkOrder()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenTimestampPacketWhenDispatchingThenProgramPostSyncData) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenTimestampPacketWhenDispatchingThenProgramPostSyncData) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; MockKernelWithInternals kernel1(*device); @@ -469,7 +469,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenTimestampPack EXPECT_EQ(contextStartAddress, secondWalker->getPostSync().getDestinationAddress()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenDebugVariableEnabledWhenEnqueueingThenWriteWalkerStamp) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenDebugVariableEnabledWhenEnqueueingThenWriteWalkerStamp) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; DebugManager.flags.EnableTimestampPacket.set(true); @@ -499,7 +499,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenDebugVariable EXPECT_EQ(expectedMocs, postSyncData.getMocs()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenDebugVariableEnabledWhenMocsValueIsOverwrittenThenPostSyncContainsProperSetting) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenDebugVariableEnabledWhenMocsValueIsOverwrittenThenPostSyncContainsProperSetting) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; auto mocsValue = 8u; DebugManager.flags.EnableTimestampPacket.set(true); @@ -525,7 +525,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenDebugVariable EXPECT_EQ(mocsValue, postSyncData.getMocs()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenTimestampPacketWriteEnabledWhenEstimatingStreamSizeThenAddEnoughSpace) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenTimestampPacketWriteEnabledWhenEstimatingStreamSizeThenAddEnoughSpace) { MockCommandQueueHw cmdQ(context.get(), device.get(), nullptr); MockKernelWithInternals kernel1(*device); MockKernelWithInternals kernel2(*device); @@ -542,7 +542,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenTimestampPack EXPECT_EQ(sizeWithEnabled, sizeWithDisabled + 0); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenDebugVariableEnabledWhenEnqueueingThenWritePostsyncOperationInImmWriteMode) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenDebugVariableEnabledWhenEnqueueingThenWritePostsyncOperationInImmWriteMode) { DebugManager.flags.UseImmDataWriteModeOnPostSyncOperation.set(true); device->getUltCommandStreamReceiver().timestampPacketWriteEnabled = true; @@ -565,7 +565,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenDebugVariable EXPECT_EQ(0x2'0000'0002u, postSyncData.getImmediateData()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenDebugVariableEnabledWhenEnqueueingThenSystolicIsProgrammed) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenDebugVariableEnabledWhenEnqueueingThenSystolicIsProgrammed) { DebugManager.flags.OverrideSystolicInComputeWalker.set(true); device->getUltCommandStreamReceiver().timestampPacketWriteEnabled = true; @@ -583,7 +583,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenDebugVariable EXPECT_TRUE(walker->getSystolicModeEnable()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenAutoLocalIdsGenerationEnabledWhenDispatchMeetCriteriaThenExpectNoLocalIdsAndProperIsaAddress) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenAutoLocalIdsGenerationEnabledWhenDispatchMeetCriteriaThenExpectNoLocalIdsAndProperIsaAddress) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA; @@ -646,7 +646,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenAutoLocalIdsG memoryManager->freeGraphicsMemory(kernel->kernelInfo.kernelAllocation); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenPassInlineDataEnabledWhenLocalIdsUsedThenDoNotExpectCrossThreadDataInWalkerEmitLocalFieldSet) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenPassInlineDataEnabledWhenLocalIdsUsedThenDoNotExpectCrossThreadDataInWalkerEmitLocalFieldSet) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA; using INLINE_DATA = typename FamilyType::INLINE_DATA; @@ -719,7 +719,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenPassInlineDat memoryManager->freeGraphicsMemory(kernel->kernelInfo.kernelAllocation); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenExecutionMaskWithoutReminderWhenProgrammingWalkerThenSetValidNumberOfBitsInMask) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenExecutionMaskWithoutReminderWhenProgrammingWalkerThenSetValidNumberOfBitsInMask) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; auto cmdQ = std::make_unique>(context.get(), device.get(), nullptr); @@ -750,7 +750,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenExecutionMask } } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenPassInlineDataEnabledWhenLocalIdsUsedAndCrossThreadIsTwoGrfsThenExpectFirstCrossThreadDataInWalkerSecondInPayloadWithPerThread) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenPassInlineDataEnabledWhenLocalIdsUsedAndCrossThreadIsTwoGrfsThenExpectFirstCrossThreadDataInWalkerSecondInPayloadWithPerThread) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; using INLINE_DATA = typename FamilyType::INLINE_DATA; @@ -817,7 +817,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenPassInlineDat memoryManager->freeGraphicsMemory(kernel->kernelInfo.kernelAllocation); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenPassInlineDataEnabledWhenNoLocalIdsUsedThenExpectCrossThreadDataInWalkerAndNoEmitLocalFieldSet) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenPassInlineDataEnabledWhenNoLocalIdsUsedThenExpectCrossThreadDataInWalkerAndNoEmitLocalFieldSet) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; using INLINE_DATA = typename FamilyType::INLINE_DATA; @@ -867,7 +867,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenPassInlineDat memoryManager->freeGraphicsMemory(kernel->kernelInfo.kernelAllocation); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenPassInlineDataEnabledWhenNoLocalIdsUsedAndCrossThreadIsTwoGrfsThenExpectFirstCrossThreadDataInWalkerSecondInPayload) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenPassInlineDataEnabledWhenNoLocalIdsUsedAndCrossThreadIsTwoGrfsThenExpectFirstCrossThreadDataInWalkerSecondInPayload) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; using INLINE_DATA = typename FamilyType::INLINE_DATA; @@ -922,7 +922,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenPassInlineDat memoryManager->freeGraphicsMemory(kernel->kernelInfo.kernelAllocation); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenAllChannelsActiveWithWorkDimOneDimensionThenHwGenerationIsEnabledWithOverwrittenWalkOrder) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenAllChannelsActiveWithWorkDimOneDimensionThenHwGenerationIsEnabledWithOverwrittenWalkOrder) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; DebugManager.flags.EnableHwGenerationLocalIds.set(true); @@ -959,7 +959,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenAllChannelsAc memoryManager->freeGraphicsMemory(kernel->kernelInfo.kernelAllocation); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenPassInlineDataAndHwLocalIdsGenerationEnabledWhenLocalIdsUsedThenExpectCrossThreadDataInWalkerAndEmitFields) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenPassInlineDataAndHwLocalIdsGenerationEnabledWhenLocalIdsUsedThenExpectCrossThreadDataInWalkerAndEmitFields) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA; using INLINE_DATA = typename FamilyType::INLINE_DATA; @@ -1013,7 +1013,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenPassInlineDat memoryManager->freeGraphicsMemory(kernel->kernelInfo.kernelAllocation); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenPassInlineDataAndHwLocalIdsGenerationEnabledWhenLocalIdsNotUsedThenExpectCrossThreadDataInWalkerAndNoHwLocalIdGeneration) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenPassInlineDataAndHwLocalIdsGenerationEnabledWhenLocalIdsNotUsedThenExpectCrossThreadDataInWalkerAndNoHwLocalIdGeneration) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA; using INLINE_DATA = typename FamilyType::INLINE_DATA; @@ -1066,7 +1066,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenPassInlineDat memoryManager->freeGraphicsMemory(kernel->kernelInfo.kernelAllocation); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenWalkerPartitionIsOnThenSizeIsProperlyEstimated) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenWalkerPartitionIsOnThenSizeIsProperlyEstimated) { DebugManager.flags.EnableWalkerPartition.set(1u); UltClDeviceFactory deviceFactory{1, 2}; MockClDevice *device = deviceFactory.rootDevices[0]; @@ -1120,7 +1120,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenWalkerPartitio EXPECT_EQ(returnedSize, partitionSize + baseSize); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenWalkerPartitionIsDisabledThenSizeIsProperlyEstimated) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenWalkerPartitionIsDisabledThenSizeIsProperlyEstimated) { DebugManager.flags.EnableWalkerPartition.set(0u); auto cmdQ = std::make_unique>(context.get(), device.get(), nullptr); @@ -1138,7 +1138,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenWalkerPartitio EXPECT_EQ(returnedSize, baseSize); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenQueueIsMultiEngineCapableThenWalkerPartitionsAreEstimated) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenQueueIsMultiEngineCapableThenWalkerPartitionsAreEstimated) { DebugManager.flags.EnableWalkerPartition.set(1u); auto cmdQ = std::make_unique>(context.get(), device.get(), nullptr); @@ -1159,7 +1159,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenQueueIsMultiEn EXPECT_EQ(returnedSize, partitionSize + baseSize); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenProgramWalkerIsCalledThenWalkerPartitionLogicIsExecuted) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenProgramWalkerIsCalledThenWalkerPartitionLogicIsExecuted) { if (!OSInterface::osEnableLocalMemory) { GTEST_SKIP(); } @@ -1177,7 +1177,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenProgramWalkerI EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_X, computeWalker->getPartitionType()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenProgramWalkerIsCalledAndForceSynchronizeWalkerInWpariModeThenWalkerPartitionLogicIsExecuted) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenProgramWalkerIsCalledAndForceSynchronizeWalkerInWpariModeThenWalkerPartitionLogicIsExecuted) { if (!OSInterface::osEnableLocalMemory) { GTEST_SKIP(); } @@ -1196,7 +1196,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenProgramWalkerI EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_X, computeWalker->getPartitionType()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenKernelThatPrefersSingleSubdeviceWhenProgramWalkerThenPartitioningIsNotUsed) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenKernelThatPrefersSingleSubdeviceWhenProgramWalkerThenPartitioningIsNotUsed) { if (!OSInterface::osEnableLocalMemory) { GTEST_SKIP(); } @@ -1219,7 +1219,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenKernelThatPre EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_DISABLED, computeWalker->getPartitionType()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenProgramWalkerIsCalledWithPartitionLogicDisabledThenWalkerPartitionLogicIsNotExecuted) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenProgramWalkerIsCalledWithPartitionLogicDisabledThenWalkerPartitionLogicIsNotExecuted) { if (!OSInterface::osEnableLocalMemory) { GTEST_SKIP(); } @@ -1237,7 +1237,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenProgramWalkerI EXPECT_EQ(FamilyType::COMPUTE_WALKER::PARTITION_TYPE::PARTITION_TYPE_DISABLED, computeWalker->getPartitionType()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenQueueIsCreatedWithMultiEngineSupportAndEnqueueIsDoneThenWalkerIsPartitioned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenQueueIsCreatedWithMultiEngineSupportAndEnqueueIsDoneThenWalkerIsPartitioned) { if (!OSInterface::osEnableLocalMemory) { GTEST_SKIP(); } @@ -1257,7 +1257,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenQueueIsCreated EXPECT_EQ(64u, computeWalker->getPartitionSize()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenProgramWalkerIsCalledWithDebugRegistryOverridesThenWalkerContainsProperParameters) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenProgramWalkerIsCalledWithDebugRegistryOverridesThenWalkerContainsProperParameters) { if (!OSInterface::osEnableLocalMemory) { GTEST_SKIP(); } @@ -1280,7 +1280,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenProgramWalkerI EXPECT_EQ(expectedPartitionCount, static_cast(DebugManager.flags.ExperimentalSetWalkerPartitionCount.get())); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenProgramWalkerIsCalledWithDebugRegistryOverridesToPartitionCountOneThenProgramProperParameters) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenProgramWalkerIsCalledWithDebugRegistryOverridesToPartitionCountOneThenProgramProperParameters) { DebugManager.flags.EnableWalkerPartition.set(1u); DebugManager.flags.ExperimentalSetWalkerPartitionCount.set(1u); DebugManager.flags.ExperimentalSetWalkerPartitionType.set(2u); @@ -1298,7 +1298,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenProgramWalkerI EXPECT_FALSE(computeWalker->getWorkloadPartitionEnable()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenThereIsNoLocalMemorySupportThenDoNotPartition) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenThereIsNoLocalMemorySupportThenDoNotPartition) { DebugManager.flags.EnableWalkerPartition.set(1u); DebugManager.flags.ExperimentalSetWalkerPartitionCount.set(2u); DebugManager.flags.ExperimentalSetWalkerPartitionType.set(2u); @@ -1317,7 +1317,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenThereIsNoLocal EXPECT_FALSE(computeWalker->getWorkloadPartitionEnable()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenEnqueueIsBlockedOnUserEventThenDoNotPartition) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenEnqueueIsBlockedOnUserEventThenDoNotPartition) { if (!OSInterface::osEnableLocalMemory) { GTEST_SKIP(); } @@ -1344,7 +1344,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenEnqueueIsBlock clReleaseEvent(userEvent); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenDispatchProfilingCalledThenDoNothing) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenDispatchProfilingCalledThenDoNothing) { MockCommandQueue cmdQ(context.get(), device.get(), nullptr, false); auto &cmdStream = cmdQ.getCS(0); @@ -1360,7 +1360,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, whenDispatchProfil EXPECT_EQ(0u, cmdStream.getUsed()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenOpenClWhenEnqueuePartitionWalkerThenExpectNoNativeCrossTileSyncCleanup) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenOpenClWhenEnqueuePartitionWalkerThenExpectNoNativeCrossTileSyncCleanup) { using MI_STORE_DATA_IMM = typename FamilyType::MI_STORE_DATA_IMM; if (!OSInterface::osEnableLocalMemory) { @@ -1384,7 +1384,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusDispatchWalkerBasicTest, givenOpenClWhenEnq EXPECT_EQ(0u, storeDataImmList.size()); } -using NonDefaultPlatformGpuWalkerTest = XeHPPlusDispatchWalkerBasicTest; +using NonDefaultPlatformGpuWalkerTest = XeHPAndLaterDispatchWalkerBasicTest; HWCMDTEST_F(IGFX_XE_HP_CORE, NonDefaultPlatformGpuWalkerTest, givenNonDefaultPlatformWhenSetupTimestampPacketThenGmmHelperIsTakenFromNonDefaultPlatform) { auto executionEnvironment = std::make_unique(); diff --git a/opencl/test/unit_test/command_queue/enqueue_media_kernel_xehp_and_later.cpp b/opencl/test/unit_test/command_queue/enqueue_media_kernel_xehp_and_later.cpp index 928a4ece76..b2aef0fe0c 100644 --- a/opencl/test/unit_test/command_queue/enqueue_media_kernel_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_media_kernel_xehp_and_later.cpp @@ -15,7 +15,7 @@ using namespace NEO; typedef MediaKernelFixture MediaKernelTest; -HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusCsrWhenEnqueueBlockedVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { +HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPAndLaterCsrWhenEnqueueBlockedVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { typedef typename FamilyType::PIPELINE_SELECT PIPELINE_SELECT; cl_uint workDim = 1; @@ -51,7 +51,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusCsrWhenEnqueueBlocked pCmdQ->releaseVirtualEvent(); } -HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusCsrWhenEnqueueBlockedNonVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { +HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPAndLaterCsrWhenEnqueueBlockedNonVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { typedef typename FamilyType::PIPELINE_SELECT PIPELINE_SELECT; cl_uint workDim = 1; @@ -87,7 +87,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusCsrWhenEnqueueBlocked pCmdQ->releaseVirtualEvent(); } -HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusCsrWhenEnqueueVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { +HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPAndLaterCsrWhenEnqueueVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { typedef typename FamilyType::PIPELINE_SELECT PIPELINE_SELECT; auto retVal = EnqueueKernelHelper<>::enqueueKernel( pCmdQ, @@ -111,7 +111,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusCsrWhenEnqueueVmeKern EXPECT_FALSE(pCmd->getSystolicModeEnable()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusCsrWhenEnqueueNonVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { +HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPAndLaterCsrWhenEnqueueNonVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { typedef typename FamilyType::PIPELINE_SELECT PIPELINE_SELECT; auto retVal = EnqueueKernelHelper<>::enqueueKernel( pCmdQ, @@ -135,7 +135,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusCsrWhenEnqueueNonVmeK EXPECT_FALSE(pCmd->getSystolicModeEnable()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusCsrWhenEnqueueVmeKernelTwiceThenProgramPipelineSelectOnce) { +HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPAndLaterCsrWhenEnqueueVmeKernelTwiceThenProgramPipelineSelectOnce) { typedef typename FamilyType::PIPELINE_SELECT PIPELINE_SELECT; auto retVal = EnqueueKernelHelper<>::enqueueKernel( pCmdQ, @@ -151,7 +151,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusCsrWhenEnqueueVmeKern EXPECT_EQ(1u, numCommands); } -HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusCsrWhenEnqueueNonVmeKernelTwiceThenProgramPipelineSelectOnce) { +HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPAndLaterCsrWhenEnqueueNonVmeKernelTwiceThenProgramPipelineSelectOnce) { typedef typename FamilyType::PIPELINE_SELECT PIPELINE_SELECT; auto retVal = EnqueueKernelHelper<>::enqueueKernel( pCmdQ, @@ -166,7 +166,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusCsrWhenEnqueueNonVmeK EXPECT_EQ(1u, numCommands); } -HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusCsrWhenEnqueueVmeKernelAfterNonVmeKernelThenProgramPipelineSelectionAndMediaSamplerTwice) { +HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPAndLaterCsrWhenEnqueueVmeKernelAfterNonVmeKernelThenProgramPipelineSelectionAndMediaSamplerTwice) { typedef typename FamilyType::PIPELINE_SELECT PIPELINE_SELECT; auto retVal = EnqueueKernelHelper<>::enqueueKernel( @@ -200,7 +200,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusCsrWhenEnqueueVmeKern EXPECT_FALSE(pCmd->getSystolicModeEnable()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusCsrWhenEnqueueNonVmeKernelAfterVmeKernelThenProgramProgramPipelineSelectionAndMediaSamplerTwice) { +HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPAndLaterCsrWhenEnqueueNonVmeKernelAfterVmeKernelThenProgramProgramPipelineSelectionAndMediaSamplerTwice) { typedef typename FamilyType::PIPELINE_SELECT PIPELINE_SELECT; auto retVal = EnqueueKernelHelper<>::enqueueKernel( pCmdQ, @@ -233,7 +233,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusCsrWhenEnqueueNonVmeK EXPECT_FALSE(pCmd->getSystolicModeEnable()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusCsrWhenEnqueueVmeKernelThenVmeSubslicesConfigDoesntChangeToFalse) { +HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPAndLaterCsrWhenEnqueueVmeKernelThenVmeSubslicesConfigDoesntChangeToFalse) { auto csr = static_cast *>(&pDevice->getGpgpuCommandStreamReceiver()); csr->lastVmeSubslicesConfig = true; auto retVal = EnqueueKernelHelper<>::enqueueKernel( @@ -248,7 +248,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusCsrWhenEnqueueVmeKern EXPECT_TRUE(csr->lastVmeSubslicesConfig); } -HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusCsrWhenEnqueueVmeKernelThenVmeSubslicesConfigDoesntChangeToTrue) { +HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPAndLaterCsrWhenEnqueueVmeKernelThenVmeSubslicesConfigDoesntChangeToTrue) { auto csr = static_cast *>(&pDevice->getGpgpuCommandStreamReceiver()); csr->lastVmeSubslicesConfig = false; auto retVal = EnqueueKernelHelper<>::enqueueKernel( @@ -275,7 +275,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, WhenGettingCmdSizeForVmeThenZeroIs EXPECT_EQ(0u, csr->getCmdSizeForMediaSampler(true)); } -HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusWhenEnqueueSystolicKernelThenPipelineSelectEnablesSystolicMode) { +HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPAndLaterWhenEnqueueSystolicKernelThenPipelineSelectEnablesSystolicMode) { typedef typename FamilyType::PIPELINE_SELECT PIPELINE_SELECT; MockKernelWithInternals mockKernel(*pClDevice, context); @@ -299,7 +299,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusWhenEnqueueSystolicKe EXPECT_TRUE(pCmd->getSystolicModeEnable()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusWhenEnqueueNonSystolicKernelThenPipelineSelectDisablesSystolicMode) { +HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPAndLaterWhenEnqueueNonSystolicKernelThenPipelineSelectDisablesSystolicMode) { typedef typename FamilyType::PIPELINE_SELECT PIPELINE_SELECT; MockKernelWithInternals mockKernel(*pClDevice, context); @@ -323,7 +323,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusWhenEnqueueNonSystoli EXPECT_FALSE(pCmd->getSystolicModeEnable()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusWhenEnqueueTwoSystolicKernelsThenPipelineSelectEnablesSystolicModeOnce) { +HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPAndLaterWhenEnqueueTwoSystolicKernelsThenPipelineSelectEnablesSystolicModeOnce) { typedef typename FamilyType::PIPELINE_SELECT PIPELINE_SELECT; MockKernelWithInternals mockKernel(*pClDevice, context); @@ -355,7 +355,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusWhenEnqueueTwoSystoli EXPECT_TRUE(pCmd->getSystolicModeEnable()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPPlusWhenEnqueueTwoKernelsThenPipelineSelectEnablesSystolicModeWhenNeeded) { +HWCMDTEST_F(IGFX_XE_HP_CORE, MediaKernelTest, givenXeHPAndLaterWhenEnqueueTwoKernelsThenPipelineSelectEnablesSystolicModeWhenNeeded) { typedef typename FamilyType::PIPELINE_SELECT PIPELINE_SELECT; MockKernelWithInternals mockKernel(*pClDevice, context); diff --git a/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests_xehp_and_later.cpp index ac8aaeb3a2..883be1be04 100644 --- a/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests_xehp_and_later.cpp @@ -32,9 +32,9 @@ class MockCommandQueueWithCacheFlush : public MockCommandQueueHw { bool commandRequireCacheFlush = false; }; -using EnqueueResourceBarrierTestXeHpCorePlus = EnqueueHandlerTest; +using EnqueueResourceBarrierTestXeHpCoreAndLater = EnqueueHandlerTest; -HWCMDTEST_F(IGFX_XE_HP_CORE, EnqueueResourceBarrierTestXeHpCorePlus, GivenCommandStreamWithoutKernelAndTimestampPacketEnabledWhenEnqueuedResourceBarrierWithEventThenTimestampAddedToEvent) { +HWCMDTEST_F(IGFX_XE_HP_CORE, EnqueueResourceBarrierTestXeHpCoreAndLater, GivenCommandStreamWithoutKernelAndTimestampPacketEnabledWhenEnqueuedResourceBarrierWithEventThenTimestampAddedToEvent) { DebugManagerStateRestore dbgRestore; DebugManager.flags.EnableTimestampPacket.set(1); pDevice->getUltCommandStreamReceiver().timestampPacketWriteEnabled = true; @@ -78,7 +78,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, EnqueueResourceBarrierTestXeHpCorePlus, GivenComman eventObj->release(); } -HWCMDTEST_F(IGFX_XE_HP_CORE, EnqueueResourceBarrierTestXeHpCorePlus, GivenCommandStreamWithoutKernelAndTimestampPacketDisabledWhenEnqueuedResourceBarrierWithEventThenTimestampNotAddedToEvent) { +HWCMDTEST_F(IGFX_XE_HP_CORE, EnqueueResourceBarrierTestXeHpCoreAndLater, GivenCommandStreamWithoutKernelAndTimestampPacketDisabledWhenEnqueuedResourceBarrierWithEventThenTimestampNotAddedToEvent) { DebugManagerStateRestore dbgRestore; DebugManager.flags.EnableTimestampPacket.set(0); static_cast *>(&pDevice->getGpgpuCommandStreamReceiver())->timestampPacketWriteEnabled = false; diff --git a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_tests_xehp_and_later.cpp index bf6721969a..90d5fb2e5f 100644 --- a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_tests_xehp_and_later.cpp @@ -34,7 +34,7 @@ using namespace NEO; -struct XeHPPlusAubCommandStreamReceiverTests : ClDeviceFixture, ::testing::Test { +struct XeHPAndLaterAubCommandStreamReceiverTests : ClDeviceFixture, ::testing::Test { template void setUpImpl() { hardwareInfo = *defaultHwInfo; @@ -52,16 +52,16 @@ struct XeHPPlusAubCommandStreamReceiverTests : ClDeviceFixture, ::testing::Test }; template -class MockAubCsrXeHPPlus : public AUBCommandStreamReceiverHw { +class MockAubCsrXeHPAndLater : public AUBCommandStreamReceiverHw { public: using AUBCommandStreamReceiverHw::getAddressSpace; using CommandStreamReceiverHw::localMemoryEnabled; using CommandStreamReceiverSimulatedHw::createPhysicalAddressAllocator; - MockAubCsrXeHPPlus(const std::string &fileName, - bool standalone, ExecutionEnvironment &executionEnvironment, - uint32_t rootDeviceIndex, - const DeviceBitfield deviceBitfield) + MockAubCsrXeHPAndLater(const std::string &fileName, + bool standalone, ExecutionEnvironment &executionEnvironment, + uint32_t rootDeviceIndex, + const DeviceBitfield deviceBitfield) : AUBCommandStreamReceiverHw(fileName, standalone, executionEnvironment, rootDeviceIndex, deviceBitfield) {} uint32_t getDeviceIndex() const override { @@ -71,7 +71,7 @@ class MockAubCsrXeHPPlus : public AUBCommandStreamReceiverHw { uint32_t deviceIndex = 0u; }; -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenGetGUCWorkQueueItemHeaderIsCalledThenAppropriateValueDependingOnEngineTypeIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenGetGUCWorkQueueItemHeaderIsCalledThenAppropriateValueDependingOnEngineTypeIsReturned) { setUpImpl(); MockOsContext rcsOsContext(0, EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_RCS, EngineUsage::Regular})); @@ -93,7 +93,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenAubComm EXPECT_EQ(0x00030001u, aubCsr->getGUCWorkQueueItemHeader()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenGraphicsAlloctionWithNonLocalMemoryPoolWhenGetPPGTTAdditionalBitsIsCalledThenAppropriateValueIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubCommandStreamReceiverTests, givenGraphicsAlloctionWithNonLocalMemoryPoolWhenGetPPGTTAdditionalBitsIsCalledThenAppropriateValueIsReturned) { setUpImpl(); DebugManagerStateRestore debugRestorer; @@ -106,7 +106,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenGraphic EXPECT_EQ(3u, bits); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenGraphicsAlloctionWithLocalMemoryPoolWhenGetPPGTTAdditionalBitsIsCalledThenAppropriateValueIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubCommandStreamReceiverTests, givenGraphicsAlloctionWithLocalMemoryPoolWhenGetPPGTTAdditionalBitsIsCalledThenAppropriateValueIsReturned) { setUpImpl(); DebugManagerStateRestore debugRestorer; @@ -120,7 +120,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenGraphic EXPECT_EQ(3u | (1 << 11), bits); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenAubDumpForceAllToLocalMemoryPoolWhenGetPPGTTAdditionalBitsIsCalledThenLocalBitIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubCommandStreamReceiverTests, givenAubDumpForceAllToLocalMemoryPoolWhenGetPPGTTAdditionalBitsIsCalledThenLocalBitIsReturned) { setUpImpl(); DebugManagerStateRestore debugRestorer; @@ -134,13 +134,13 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenAubDump EXPECT_EQ(3u | (1 << 11), bits); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenAubDumpForceAllToLocalMemoryEnabledWhenGetAddressSpaceIsCalledThenTraceLocalIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubCommandStreamReceiverTests, givenAubDumpForceAllToLocalMemoryEnabledWhenGetAddressSpaceIsCalledThenTraceLocalIsReturned) { setUpImpl(); DebugManagerStateRestore debugRestorer; DebugManager.flags.AUBDumpForceAllToLocalMemory.set(true); - std::unique_ptr> aubCsr(new MockAubCsrXeHPPlus("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); + std::unique_ptr> aubCsr(new MockAubCsrXeHPAndLater("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); auto stream = std::make_unique(); aubCsr->stream = stream.get(); @@ -149,13 +149,13 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenAubDump EXPECT_EQ(AubMemDump::AddressSpaceValues::TraceLocal, addressSpace); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenAubDumpForceAllToLocalMemoryDisabledWhenGetAddressSpaceIsCalledThenTraceNonlocalIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubCommandStreamReceiverTests, givenAubDumpForceAllToLocalMemoryDisabledWhenGetAddressSpaceIsCalledThenTraceNonlocalIsReturned) { setUpImpl(); DebugManagerStateRestore debugRestorer; DebugManager.flags.AUBDumpForceAllToLocalMemory.set(false); - std::unique_ptr> aubCsr(new MockAubCsrXeHPPlus("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); + std::unique_ptr> aubCsr(new MockAubCsrXeHPAndLater("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); auto stream = std::make_unique(); aubCsr->stream = stream.get(); @@ -164,7 +164,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenAubDump EXPECT_EQ(AubMemDump::AddressSpaceValues::TraceNonlocal, addressSpace); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenCCSEnabledWhenEngineMmiosAreInitializedThenExpectL3ConfigMmioIsWritten) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubCommandStreamReceiverTests, givenCCSEnabledWhenEngineMmiosAreInitializedThenExpectL3ConfigMmioIsWritten) { setUpImpl(); MockOsContext osContext(0, EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_CCS, EngineUsage::Regular})); @@ -179,7 +179,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenCCSEnab EXPECT_TRUE(stream->isOnMmioList(MMIOPair(0xB234, 0xA0000000u))); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenRCSEnabledWhenEngineMmiosAreInitializedThenExpectL3ConfigMmioIsWritten) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubCommandStreamReceiverTests, givenRCSEnabledWhenEngineMmiosAreInitializedThenExpectL3ConfigMmioIsWritten) { setUpImpl(); MockOsContext osContext(0, EngineDescriptorHelper::getDefaultDescriptor()); @@ -194,10 +194,10 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenRCSEnab EXPECT_TRUE(stream->isOnMmioList(MMIOPair(0xB134, 0xA0000000u))); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenLocaLMemoryBitWhenGetAddressSpaceFromPTEBitsIsCalledThenTraceLocalIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubCommandStreamReceiverTests, givenLocaLMemoryBitWhenGetAddressSpaceFromPTEBitsIsCalledThenTraceLocalIsReturned) { setUpImpl(); - std::unique_ptr> aubCsr(new MockAubCsrXeHPPlus("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); + std::unique_ptr> aubCsr(new MockAubCsrXeHPAndLater("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); auto stream = std::make_unique(); aubCsr->stream = stream.get(); @@ -206,10 +206,10 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenLocaLMe EXPECT_EQ(AubMemDump::AddressSpaceValues::TraceLocal, addressSpace); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenLocalMemoryEnabledWhenGetMemoryBankForGttIsCalledThenCorrectBankForDeviceIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubCommandStreamReceiverTests, givenLocalMemoryEnabledWhenGetMemoryBankForGttIsCalledThenCorrectBankForDeviceIsReturned) { setUpImpl(); - std::unique_ptr> aubCsr(new MockAubCsrXeHPPlus("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); + std::unique_ptr> aubCsr(new MockAubCsrXeHPAndLater("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); aubCsr->localMemoryEnabled = true; auto bank = aubCsr->getMemoryBankForGtt(); @@ -228,10 +228,10 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenLocalMe EXPECT_EQ(MemoryBanks::getBankForLocalMemory(3), bank); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, whenPhysicalAllocatorIsCreatedThenItHasCorrectBankSzieAndNumberOfBanks) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubCommandStreamReceiverTests, whenPhysicalAllocatorIsCreatedThenItHasCorrectBankSzieAndNumberOfBanks) { setUpImpl(); - std::unique_ptr> aubCsr(new MockAubCsrXeHPPlus("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); + std::unique_ptr> aubCsr(new MockAubCsrXeHPAndLater("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); auto physicalAddressAllocator = std::unique_ptr(aubCsr->createPhysicalAddressAllocator(&pDevice->getHardwareInfo())); auto allocator = reinterpret_cast *>(physicalAddressAllocator.get()); @@ -240,12 +240,12 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, whenPhysical EXPECT_EQ(1u, allocator->getNumberOfBanks()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, whenPhysicalAllocatorIsCreatedWith4TileConfigThenItHasCorrectBankSzieAndNumberOfBanks) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubCommandStreamReceiverTests, whenPhysicalAllocatorIsCreatedWith4TileConfigThenItHasCorrectBankSzieAndNumberOfBanks) { DebugManagerStateRestore restorer; DebugManager.flags.CreateMultipleSubDevices.set(4); setUpImpl(); - std::unique_ptr> aubCsr(new MockAubCsrXeHPPlus("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); + std::unique_ptr> aubCsr(new MockAubCsrXeHPAndLater("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); auto physicalAddressAllocator = std::unique_ptr(aubCsr->createPhysicalAddressAllocator(&pDevice->getHardwareInfo())); auto allocator = reinterpret_cast *>(physicalAddressAllocator.get()); @@ -254,7 +254,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, whenPhysical EXPECT_EQ(4u, allocator->getNumberOfBanks()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenInitEngineMMIOIsCalledForGivenEngineTypeThenCorrespondingMmiosAreInitialized) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenInitEngineMMIOIsCalledForGivenEngineTypeThenCorrespondingMmiosAreInitialized) { setUpImpl(); DebugManagerStateRestore debugRestorer; @@ -321,7 +321,7 @@ static void checkCcsEngineMMIO(aub_stream::EngineType engineType, uint32_t mmioB EXPECT_EQ(mmioList[16], MMIOPair(0x0000B234, 0xA0000000)); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenCcsEngineMmioListForSpecificCcsInstanceIsReadThenItIsInitializedWithProperValues) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenCcsEngineMmioListForSpecificCcsInstanceIsReadThenItIsInitializedWithProperValues) { setUpImpl(); checkCcsEngineMMIO(aub_stream::ENGINE_CCS, 0x1a000); @@ -330,7 +330,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenAubComm checkCcsEngineMMIO(aub_stream::ENGINE_CCS3, 0x26000); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenRcsEngineMmioListIsReadThenItIsInitializedWithProperValues) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenRcsEngineMmioListIsReadThenItIsInitializedWithProperValues) { setUpImpl(); auto &mmioList = *AUBFamilyMapper::perEngineMMIO[aub_stream::ENGINE_RCS]; @@ -364,15 +364,15 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests, givenAubComm EXPECT_EQ(mmioList[21], MMIOPair(0x0000B134, 0xA0000000)); } -using XeHPPlusAubCommandStreamReceiverTests2 = HwHelperTest; +using XeHPAndLaterAubCommandStreamReceiverTests2 = HwHelperTest; -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusAubCommandStreamReceiverTests2, givenLocalMemoryEnabledInCSRWhenGetGTTDataIsCalledThenLocalMemoryIsSet) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubCommandStreamReceiverTests2, givenLocalMemoryEnabledInCSRWhenGetGTTDataIsCalledThenLocalMemoryIsSet) { DebugManagerStateRestore debugRestorer; DebugManager.flags.EnableLocalMemory.set(1); hardwareInfo.featureTable.ftrLocalMemory = true; std::unique_ptr device(MockDevice::createWithNewExecutionEnvironment(&hardwareInfo)); - std::unique_ptr> aubCsr(std::make_unique>("", true, *device->executionEnvironment, device->getRootDeviceIndex(), device->getDeviceBitfield())); + std::unique_ptr> aubCsr(std::make_unique>("", true, *device->executionEnvironment, device->getRootDeviceIndex(), device->getDeviceBitfield())); EXPECT_TRUE(aubCsr->localMemoryEnabled); AubGTTData data = {false, false}; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp index 7dff95e1ea..c38cc6ccae 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp @@ -19,9 +19,9 @@ using namespace NEO; -typedef UltCommandStreamReceiverTest CommandStreamReceiverFlushTaskXeHPPlusTests; +typedef UltCommandStreamReceiverTest CommandStreamReceiverFlushTaskXeHPAndLaterTests; -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, whenReprogrammingSshThenBindingTablePoolIsProgrammed) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, whenReprogrammingSshThenBindingTablePoolIsProgrammed) { auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); flushTask(commandStreamReceiver); @@ -34,7 +34,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, whenRe bindingTablePoolAlloc->getSurfaceObjectControlStateIndexToMocsTables()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, whenReprogrammingSshThenBindingTablePoolIsProgrammedWithCachingOffWhenDebugKeyPresent) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, whenReprogrammingSshThenBindingTablePoolIsProgrammedWithCachingOffWhenDebugKeyPresent) { DebugManagerStateRestore restorer; DebugManager.flags.DisableCachingForHeaps.set(1); @@ -50,7 +50,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, whenRe bindingTablePoolAlloc->getSurfaceObjectControlStateIndexToMocsTables()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, whenNotReprogrammingSshThenBindingTablePoolIsNotProgrammed) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, whenNotReprogrammingSshThenBindingTablePoolIsNotProgrammed) { auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); flushTask(commandStreamReceiver); @@ -76,7 +76,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, whenNo EXPECT_EQ(nullptr, bindingTablePoolAlloc); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenStateBaseAddressWhenItIsRequiredThenThereIsPipeControlPriorToItWithTextureCacheFlushAndHdc) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, givenStateBaseAddressWhenItIsRequiredThenThereIsPipeControlPriorToItWithTextureCacheFlushAndHdc) { using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS; auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); @@ -94,7 +94,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenS EXPECT_TRUE(pipeControlCmd->getHdcPipelineFlush()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, whenNotReprogrammingSshButInitProgrammingFlagsThenBindingTablePoolIsProgrammed) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, whenNotReprogrammingSshButInitProgrammingFlagsThenBindingTablePoolIsProgrammed) { auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); flushTask(commandStreamReceiver); @@ -120,7 +120,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, whenNo EXPECT_NE(nullptr, bindingTablePoolAlloc); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenSbaProgrammingWhenHeapsAreNotProvidedThenDontProgram) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, givenSbaProgrammingWhenHeapsAreNotProvidedThenDontProgram) { using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS; DispatchFlags dispatchFlags = DispatchFlagsHelper::createDefaultDispatchFlags(); @@ -179,7 +179,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenS } using isXeHPOrAbove = IsAtLeastProduct; -HWTEST2_F(CommandStreamReceiverFlushTaskXeHPPlusTests, whenFlushAllCachesVariableIsSetAndAddPipeControlIsCalledThenFieldsAreProperlySet, isXeHPOrAbove) { +HWTEST2_F(CommandStreamReceiverFlushTaskXeHPAndLaterTests, whenFlushAllCachesVariableIsSetAndAddPipeControlIsCalledThenFieldsAreProperlySet, isXeHPOrAbove) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; DebugManagerStateRestore dbgRestorer; DebugManager.flags.FlushAllCaches.set(true); @@ -213,14 +213,14 @@ HWTEST2_F(CommandStreamReceiverFlushTaskXeHPPlusTests, whenFlushAllCachesVariabl EXPECT_TRUE(pipeControl->getCompressionControlSurfaceCcsFlush()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenconfigureCSRtoNonDirtyStateWhenFlushTaskIsCalledThenNoCommandsAreAdded) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, givenconfigureCSRtoNonDirtyStateWhenFlushTaskIsCalledThenNoCommandsAreAdded) { configureCSRtoNonDirtyState(true); auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); flushTask(commandStreamReceiver); EXPECT_EQ(0u, commandStreamReceiver.commandStream.getUsed()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenMultiOsContextCommandStreamReceiverWhenFlushTaskIsCalledThenCommandStreamReceiverStreamIsUsed) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, givenMultiOsContextCommandStreamReceiverWhenFlushTaskIsCalledThenCommandStreamReceiverStreamIsUsed) { configureCSRtoNonDirtyState(true); auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); commandStreamReceiver.multiOsContextCapable = true; @@ -232,7 +232,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenM EXPECT_NE(nullptr, batchBufferStart); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenCsrInBatchingModeWhenTaskIsSubmittedViaCsrThenBbEndCoversPaddingEnoughToFitMiBatchBufferStart) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, givenCsrInBatchingModeWhenTaskIsSubmittedViaCsrThenBbEndCoversPaddingEnoughToFitMiBatchBufferStart) { auto &mockCsr = pDevice->getUltCommandStreamReceiver(); mockCsr.overrideDispatchPolicy(DispatchMode::BatchedDispatch); mockCsr.timestampPacketWriteEnabled = false; @@ -254,7 +254,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenC EXPECT_EQ(expectedUsedSize, mockCsr.commandStream.getUsed()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, GivenSameTaskLevelThenDontSendPipeControl) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, GivenSameTaskLevelThenDontSendPipeControl) { auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); // Configure the CSR to not need to submit any state or commands. @@ -268,7 +268,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, GivenS EXPECT_EQ(sizeUsed, 0u); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenDeviceWithThreadGroupPreemptionSupportThenDontSendMediaVfeStateIfNotDirty) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, givenDeviceWithThreadGroupPreemptionSupportThenDontSendMediaVfeStateIfNotDirty) { DebugManagerStateRestore dbgRestore; DebugManager.flags.ForcePreemptionMode.set(static_cast(PreemptionMode::ThreadGroup)); @@ -287,7 +287,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenD EXPECT_EQ(0u, sizeUsed); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenCommandStreamReceiverWithInstructionCacheRequestWhenFlushTaskIsCalledThenPipeControlWithInstructionCacheIsEmitted) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, givenCommandStreamReceiverWithInstructionCacheRequestWhenFlushTaskIsCalledThenPipeControlWithInstructionCacheIsEmitted) { auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); configureCSRtoNonDirtyState(true); @@ -306,7 +306,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenC EXPECT_FALSE(commandStreamReceiver.requiresInstructionCacheFlush); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenHigherTaskLevelWhenTimestampPacketWriteIsEnabledThenDontAddPipeControl) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, givenHigherTaskLevelWhenTimestampPacketWriteIsEnabledThenDontAddPipeControl) { auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); commandStreamReceiver.timestampPacketWriteEnabled = true; commandStreamReceiver.isPreambleSent = true; @@ -322,7 +322,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenH EXPECT_EQ(cmdList.end(), itorPC); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, WhenForcePipeControlPriorToWalkerIsSetThenAddExtraPipeControls) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, WhenForcePipeControlPriorToWalkerIsSetThenAddExtraPipeControls) { DebugManagerStateRestore stateResore; DebugManager.flags.ForcePipeControlPriorToWalker.set(true); DebugManager.flags.FlushAllCaches.set(true); @@ -375,7 +375,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, WhenFo EXPECT_EQ(counterPC, 2); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, whenSamplerCacheFlushNotRequiredThenDontSendPipecontrol) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, whenSamplerCacheFlushNotRequiredThenDontSendPipecontrol) { auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); NEO::WorkaroundTable *waTable = &pDevice->getRootDeviceEnvironment().getMutableHardwareInfo()->workaroundTable; @@ -396,7 +396,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, whenSa EXPECT_EQ(cmdList.end(), itorPC); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, whenSamplerCacheFlushBeforeAndWaSamplerCacheFlushBetweenRedescribedSurfaceReadsDasabledThenDontSendPipecontrol) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, whenSamplerCacheFlushBeforeAndWaSamplerCacheFlushBetweenRedescribedSurfaceReadsDasabledThenDontSendPipecontrol) { auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); commandStreamReceiver.isPreambleSent = true; commandStreamReceiver.setSamplerCacheFlushRequired(CommandStreamReceiver::SamplerCacheFlushState::samplerCacheFlushBefore); @@ -417,7 +417,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, whenSa EXPECT_EQ(cmdList.end(), itorPC); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, WhenFlushingTaskThenStateBaseAddressProgrammingShouldMatchTracking) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, WhenFlushingTaskThenStateBaseAddressProgrammingShouldMatchTracking) { typedef typename FamilyType::STATE_BASE_ADDRESS STATE_BASE_ADDRESS; auto gmmHelper = pDevice->getGmmHelper(); auto stateHeapMocs = gmmHelper->getMOCS(GMM_RESOURCE_USAGE_OCL_STATE_HEAP_BUFFER); @@ -441,7 +441,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, WhenFl EXPECT_EQ(stateHeapMocs, cmd.getInstructionMemoryObjectControlState()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, GivenBlockingWhenFlushingTaskThenPipeControlProgrammedCorrectly) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, GivenBlockingWhenFlushingTaskThenPipeControlProgrammedCorrectly) { typedef typename FamilyType::PIPE_CONTROL PIPE_CONTROL; CommandQueueHw commandQueue(nullptr, pClDevice, 0, false); auto commandStreamReceiver = new MockCsrHw(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); @@ -488,7 +488,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, GivenB EXPECT_EQ(0u, numberOfPC); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenCsrInNonDirtyStateWhenflushTaskIsCalledThenNoFlushIsCalled) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, givenCsrInNonDirtyStateWhenflushTaskIsCalledThenNoFlushIsCalled) { CommandQueueHw commandQueue(nullptr, pClDevice, 0, false); auto &commandStream = commandQueue.getCS(4096u); @@ -512,7 +512,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenC EXPECT_EQ(0, mockCsr->flushCalledCount); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenCsrInNonDirtyStateAndBatchingModeWhenflushTaskIsCalledWithDisabledPreemptionThenSubmissionIsNotRecorded) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, givenCsrInNonDirtyStateAndBatchingModeWhenflushTaskIsCalledWithDisabledPreemptionThenSubmissionIsNotRecorded) { CommandQueueHw commandQueue(nullptr, pClDevice, 0, false); auto &commandStream = commandQueue.getCS(4096u); @@ -547,7 +547,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenC EXPECT_EQ(0u, surfacesForResidency.size()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenCsrInBatchingModeWhenRecordedBatchBufferIsBeingSubmittedThenFlushIsCalledWithRecordedCommandBuffer) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, givenCsrInBatchingModeWhenRecordedBatchBufferIsBeingSubmittedThenFlushIsCalledWithRecordedCommandBuffer) { CommandQueueHw commandQueue(nullptr, pClDevice, 0, false); auto &commandStream = commandQueue.getCS(4096u); @@ -620,7 +620,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenC } } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenNothingToFlushWhenFlushTaskCalledThenDontFlushStamp) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, givenNothingToFlushWhenFlushTaskCalledThenDontFlushStamp) { auto mockCsr = new MockCsrHw2(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); pDevice->resetCommandStreamReceiver(mockCsr); @@ -634,7 +634,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenN EXPECT_EQ(0, mockCsr->flushCalledCount); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPPlusTests, givenEpilogueRequiredFlagWhenTaskIsSubmittedDirectlyThenItPointsBackToCsr) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, givenEpilogueRequiredFlagWhenTaskIsSubmittedDirectlyThenItPointsBackToCsr) { configureCSRtoNonDirtyState(true); auto &commandStreamReceiver = this->pDevice->getUltCommandStreamReceiver(); diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp index 6ec10e2a2c..6cf2b4dee5 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp @@ -57,9 +57,9 @@ class ImplicitFlushSettings { }; } // namespace NEO -struct CommandStreamReceiverHwTestXeHPPlus : public ClDeviceFixture, - public HardwareParse, - public ::testing::Test { +struct CommandStreamReceiverHwTestXeHPAndLater : public ClDeviceFixture, + public HardwareParse, + public ::testing::Test { void SetUp() override { ClDeviceFixture::SetUp(); @@ -72,7 +72,7 @@ struct CommandStreamReceiverHwTestXeHPPlus : public ClDeviceFixture, } }; -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenPreambleSentWhenL3ConfigRequestChangedThenDontProgramL3Register) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenPreambleSentWhenL3ConfigRequestChangedThenDontProgramL3Register) { using MI_LOAD_REGISTER_IMM = typename FamilyType::MI_LOAD_REGISTER_IMM; size_t GWS = 1; @@ -101,12 +101,12 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenPreambleS } } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, WhenCommandStreamReceiverHwIsCreatedThenDefaultSshSizeIs2MB) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, WhenCommandStreamReceiverHwIsCreatedThenDefaultSshSizeIs2MB) { auto &commandStreamReceiver = pDevice->getGpgpuCommandStreamReceiver(); EXPECT_EQ(2 * MB, commandStreamReceiver.defaultSshSize); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, WhenScratchSpaceExistsThenReturnNonZeroGpuAddressToPatch) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, WhenScratchSpaceExistsThenReturnNonZeroGpuAddressToPatch) { auto commandStreamReceiver = new MockCsrHw(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); pDevice->resetCommandStreamReceiver(commandStreamReceiver); void *ssh = alignedMalloc(512, 4096); @@ -125,7 +125,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, WhenScratchSpa alignedFree(ssh); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, WhenOsContextSupportsMultipleDevicesThenScratchSpaceAllocationIsPlacedOnEachSupportedDevice) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, WhenOsContextSupportsMultipleDevicesThenScratchSpaceAllocationIsPlacedOnEachSupportedDevice) { DebugManagerStateRestore restorer; DebugManager.flags.CreateMultipleSubDevices.set(2u); ExecutionEnvironment *executionEnvironment = platform()->peekExecutionEnvironment(); @@ -147,7 +147,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, WhenOsContextS alignedFree(ssh); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, WhenScratchSpaceNotExistThenReturnZeroGpuAddressToPatch) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, WhenScratchSpaceNotExistThenReturnZeroGpuAddressToPatch) { MockCsrHw commandStreamReceiver(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); auto scratchSpaceAddr = commandStreamReceiver.getScratchPatchAddress(); @@ -155,13 +155,13 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, WhenScratchSpa EXPECT_EQ(expectedScratchGpuAddr, scratchSpaceAddr); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, whenProgrammingMiSemaphoreWaitThenSetRegisterPollModeMemoryPoll) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, whenProgrammingMiSemaphoreWaitThenSetRegisterPollModeMemoryPoll) { using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; MI_SEMAPHORE_WAIT miSemaphoreWait = FamilyType::cmdInitMiSemaphoreWait; EXPECT_EQ(MI_SEMAPHORE_WAIT::REGISTER_POLL_MODE::REGISTER_POLL_MODE_MEMORY_POLL, miSemaphoreWait.getRegisterPollMode()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSpaceSurfaceStateEnabledWhenSratchAllocationRequestedThenProgramCfeStateWithScratchAllocation) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenScratchSpaceSurfaceStateEnabledWhenSratchAllocationRequestedThenProgramCfeStateWithScratchAllocation) { using CFE_STATE = typename FamilyType::CFE_STATE; using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; @@ -171,7 +171,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSp MockKernelWithInternals kernel(*pClDevice); CommandQueueHw commandQueue(&ctx, pClDevice, 0, false); auto commandStreamReceiver = new MockCsrHw(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); - auto scratchController = static_cast(commandStreamReceiver->getScratchSpaceController()); + auto scratchController = static_cast(commandStreamReceiver->getScratchSpaceController()); scratchController->slotId = 2u; pDevice->resetCommandStreamReceiver(commandStreamReceiver); auto &commandStreamCSR = commandStreamReceiver->getCS(); @@ -206,9 +206,9 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSp EXPECT_EQ(kernel.kernelInfo.kernelDescriptor.kernelAttributes.perThreadScratchSize[0], scratchState->getSurfacePitch()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSpaceSurfaceStateEnabledWhenNewSshProvidedAndNoScratchAllocationExistThenNoDirtyBitSet) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenScratchSpaceSurfaceStateEnabledWhenNewSshProvidedAndNoScratchAllocationExistThenNoDirtyBitSet) { auto commandStreamReceiver = std::make_unique>(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); - auto scratchController = static_cast(commandStreamReceiver->getScratchSpaceController()); + auto scratchController = static_cast(commandStreamReceiver->getScratchSpaceController()); bool stateBaseAddressDirty = false; bool cfeStateDirty = false; @@ -218,9 +218,9 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSp EXPECT_FALSE(cfeStateDirty); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSpaceSurfaceStateEnabledWhenRequiredScratchSpaceIsSetThenPerThreadScratchSizeIsAlignedTo64) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenScratchSpaceSurfaceStateEnabledWhenRequiredScratchSpaceIsSetThenPerThreadScratchSizeIsAlignedTo64) { auto commandStreamReceiver = std::make_unique>(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); - auto scratchController = static_cast(commandStreamReceiver->getScratchSpaceController()); + auto scratchController = static_cast(commandStreamReceiver->getScratchSpaceController()); uint32_t perThreadScratchSize = 1; uint32_t expectedValue = 1 << 6; @@ -231,10 +231,10 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSp EXPECT_EQ(expectedValue, scratchController->perThreadScratchSize); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSpaceSurfaceStateEnabledWhenNewSshProvidedAndScratchAllocationExistsThenSetDirtyBitCopyCurrentState) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenScratchSpaceSurfaceStateEnabledWhenNewSshProvidedAndScratchAllocationExistsThenSetDirtyBitCopyCurrentState) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; auto commandStreamReceiver = std::make_unique>(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); - auto scratchController = static_cast(commandStreamReceiver->getScratchSpaceController()); + auto scratchController = static_cast(commandStreamReceiver->getScratchSpaceController()); scratchController->slotId = 0; bool stateBaseAddressDirty = false; bool cfeStateDirty = false; @@ -265,10 +265,10 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSp alignedFree(newSurfaceHeap); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSpaceSurfaceStateEnabledWhenBiggerScratchSpaceRequiredThenReplaceAllocation) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenScratchSpaceSurfaceStateEnabledWhenBiggerScratchSpaceRequiredThenReplaceAllocation) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; auto commandStreamReceiver = new MockCsrHw(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); - auto scratchController = static_cast(commandStreamReceiver->getScratchSpaceController()); + auto scratchController = static_cast(commandStreamReceiver->getScratchSpaceController()); scratchController->slotId = 6; pDevice->resetCommandStreamReceiver(commandStreamReceiver); @@ -304,10 +304,10 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSp alignedFree(surfaceHeap); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSpaceSurfaceStateEnabledWhenScratchSlotIsNonZeroThenSlotIdIsUpdatedAndCorrectOffsetIsSet) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenScratchSpaceSurfaceStateEnabledWhenScratchSlotIsNonZeroThenSlotIdIsUpdatedAndCorrectOffsetIsSet) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; auto commandStreamReceiver = new MockCsrHw(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); - auto scratchController = static_cast(commandStreamReceiver->getScratchSpaceController()); + auto scratchController = static_cast(commandStreamReceiver->getScratchSpaceController()); pDevice->resetCommandStreamReceiver(commandStreamReceiver); @@ -330,16 +330,16 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSp alignedFree(surfaceHeap); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSpaceSurfaceStateEnabledWhenProgramHeapsThenSetReqScratchSpaceAndProgramSurfaceStateAreCalled) { - class MockScratchSpaceControllerXeHPPlus : public ScratchSpaceControllerXeHPPlus { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenScratchSpaceSurfaceStateEnabledWhenProgramHeapsThenSetReqScratchSpaceAndProgramSurfaceStateAreCalled) { + class MockScratchSpaceControllerXeHPAndLater : public ScratchSpaceControllerXeHPAndLater { public: uint32_t requiredScratchSpaceCalledTimes = 0u; uint32_t programSurfaceStateCalledTimes = 0u; - MockScratchSpaceControllerXeHPPlus(uint32_t rootDeviceIndex, - ExecutionEnvironment &environment, - InternalAllocationStorage &allocationStorage) : ScratchSpaceControllerXeHPPlus(rootDeviceIndex, environment, allocationStorage) {} + MockScratchSpaceControllerXeHPAndLater(uint32_t rootDeviceIndex, + ExecutionEnvironment &environment, + InternalAllocationStorage &allocationStorage) : ScratchSpaceControllerXeHPAndLater(rootDeviceIndex, environment, allocationStorage) {} - using ScratchSpaceControllerXeHPPlus::scratchAllocation; + using ScratchSpaceControllerXeHPAndLater::scratchAllocation; void setRequiredScratchSpace(void *sshBaseAddress, uint32_t scratchSlot, @@ -360,9 +360,9 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSp auto commandStreamReceiver = new MockCsrHw(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); pDevice->resetCommandStreamReceiver(commandStreamReceiver); - std::unique_ptr scratchController = std::make_unique(pDevice->getRootDeviceIndex(), - *pDevice->executionEnvironment, - *commandStreamReceiver->getInternalAllocationStorage()); + std::unique_ptr scratchController = std::make_unique(pDevice->getRootDeviceIndex(), + *pDevice->executionEnvironment, + *commandStreamReceiver->getInternalAllocationStorage()); bool cfeStateDirty = false; bool stateBaseAddressDirty = false; @@ -378,23 +378,23 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSp scratchController->programHeaps(container, 0u, 1u, 0u, 0u, commandStreamReceiver->getOsContext(), stateBaseAddressDirty, cfeStateDirty); - auto scratch = static_cast(scratchController.get()); + auto scratch = static_cast(scratchController.get()); EXPECT_EQ(scratch->requiredScratchSpaceCalledTimes, 1u); EXPECT_EQ(scratch->programSurfaceStateCalledTimes, 2u); alignedFree(surfaceHeap); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchWhenSetNewSshPtrAndChangeIdIsFalseThenSlotIdIsNotChanged) { - class MockScratchSpaceControllerXeHPPlus : public ScratchSpaceControllerXeHPPlus { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenScratchWhenSetNewSshPtrAndChangeIdIsFalseThenSlotIdIsNotChanged) { + class MockScratchSpaceControllerXeHPAndLater : public ScratchSpaceControllerXeHPAndLater { public: uint32_t programSurfaceStateCalledTimes = 0u; - MockScratchSpaceControllerXeHPPlus(uint32_t rootDeviceIndex, - ExecutionEnvironment &environment, - InternalAllocationStorage &allocationStorage) : ScratchSpaceControllerXeHPPlus(rootDeviceIndex, environment, allocationStorage) {} + MockScratchSpaceControllerXeHPAndLater(uint32_t rootDeviceIndex, + ExecutionEnvironment &environment, + InternalAllocationStorage &allocationStorage) : ScratchSpaceControllerXeHPAndLater(rootDeviceIndex, environment, allocationStorage) {} - using ScratchSpaceControllerXeHPPlus::scratchAllocation; - using ScratchSpaceControllerXeHPPlus::slotId; + using ScratchSpaceControllerXeHPAndLater::scratchAllocation; + using ScratchSpaceControllerXeHPAndLater::slotId; protected: void programSurfaceState() override { @@ -404,9 +404,9 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchWh auto commandStreamReceiver = new MockCsrHw(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); pDevice->resetCommandStreamReceiver(commandStreamReceiver); - std::unique_ptr scratchController = std::make_unique(pDevice->getRootDeviceIndex(), - *pDevice->executionEnvironment, - *commandStreamReceiver->getInternalAllocationStorage()); + std::unique_ptr scratchController = std::make_unique(pDevice->getRootDeviceIndex(), + *pDevice->executionEnvironment, + *commandStreamReceiver->getInternalAllocationStorage()); NEO::GraphicsAllocation graphicsAllocation(1u, NEO::GraphicsAllocation::AllocationType::BUFFER, nullptr, 0u, 0u, 0u, MemoryPool::System4KBPages, 0u); @@ -414,7 +414,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchWh void *surfaceHeap = alignedMalloc(0x1000, 0x1000); - auto scratch = static_cast(scratchController.get()); + auto scratch = static_cast(scratchController.get()); scratch->slotId = 10; scratch->scratchAllocation = &graphicsAllocation; scratch->setNewSshPtr(surfaceHeap, cfeStateDirty, false); @@ -426,31 +426,31 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchWh alignedFree(surfaceHeap); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchWhenProgramSurfaceStateAndUpdateSlotIsFalseThenSlotIdIsNotChanged) { - class MockScratchSpaceControllerXeHPPlus : public ScratchSpaceControllerXeHPPlus { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenScratchWhenProgramSurfaceStateAndUpdateSlotIsFalseThenSlotIdIsNotChanged) { + class MockScratchSpaceControllerXeHPAndLater : public ScratchSpaceControllerXeHPAndLater { public: - MockScratchSpaceControllerXeHPPlus(uint32_t rootDeviceIndex, - ExecutionEnvironment &environment, - InternalAllocationStorage &allocationStorage) : ScratchSpaceControllerXeHPPlus(rootDeviceIndex, environment, allocationStorage) {} + MockScratchSpaceControllerXeHPAndLater(uint32_t rootDeviceIndex, + ExecutionEnvironment &environment, + InternalAllocationStorage &allocationStorage) : ScratchSpaceControllerXeHPAndLater(rootDeviceIndex, environment, allocationStorage) {} - using ScratchSpaceControllerXeHPPlus::programSurfaceState; - using ScratchSpaceControllerXeHPPlus::scratchAllocation; - using ScratchSpaceControllerXeHPPlus::slotId; - using ScratchSpaceControllerXeHPPlus::surfaceStateHeap; - using ScratchSpaceControllerXeHPPlus::updateSlots; + using ScratchSpaceControllerXeHPAndLater::programSurfaceState; + using ScratchSpaceControllerXeHPAndLater::scratchAllocation; + using ScratchSpaceControllerXeHPAndLater::slotId; + using ScratchSpaceControllerXeHPAndLater::surfaceStateHeap; + using ScratchSpaceControllerXeHPAndLater::updateSlots; }; auto commandStreamReceiver = new MockCsrHw(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); pDevice->resetCommandStreamReceiver(commandStreamReceiver); - std::unique_ptr scratchController = std::make_unique(pDevice->getRootDeviceIndex(), - *pDevice->executionEnvironment, - *commandStreamReceiver->getInternalAllocationStorage()); + std::unique_ptr scratchController = std::make_unique(pDevice->getRootDeviceIndex(), + *pDevice->executionEnvironment, + *commandStreamReceiver->getInternalAllocationStorage()); NEO::GraphicsAllocation graphicsAllocation(1u, NEO::GraphicsAllocation::AllocationType::BUFFER, nullptr, 0u, 0u, 0u, MemoryPool::System4KBPages, 0u); void *surfaceHeap = alignedMalloc(0x1000, 0x1000); - auto scratch = static_cast(scratchController.get()); + auto scratch = static_cast(scratchController.get()); scratch->surfaceStateHeap = static_cast(surfaceHeap); scratch->slotId = 10; scratch->updateSlots = false; @@ -462,14 +462,14 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchWh alignedFree(surfaceHeap); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSpaceSurfaceStateEnabledWhenBiggerPrivateScratchSpaceRequiredThenReplaceAllocation) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenScratchSpaceSurfaceStateEnabledWhenBiggerPrivateScratchSpaceRequiredThenReplaceAllocation) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; DebugManagerStateRestore restorer; DebugManager.flags.EnablePrivateScratchSlot1.set(1); RENDER_SURFACE_STATE surfaceState[6]; MockCsrHw commandStreamReceiver(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); commandStreamReceiver.setupContext(pDevice->getGpgpuCommandStreamReceiver().getOsContext()); - auto scratchController = static_cast(commandStreamReceiver.getScratchSpaceController()); + auto scratchController = static_cast(commandStreamReceiver.getScratchSpaceController()); bool cfeStateDirty = false; bool stateBaseAddressDirty = false; @@ -490,14 +490,14 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSp EXPECT_EQ(scratchController->privateScratchAllocation->getGpuAddress(), surfaceState[5].getSurfaceBaseAddress()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSpaceControllerWithOnlyPrivateScratchSpaceWhenGettingPatchAddressThenGetCorrectValue) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenScratchSpaceControllerWithOnlyPrivateScratchSpaceWhenGettingPatchAddressThenGetCorrectValue) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; DebugManagerStateRestore restorer; DebugManager.flags.EnablePrivateScratchSlot1.set(1); RENDER_SURFACE_STATE surfaceState[6]; MockCsrHw commandStreamReceiver(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); commandStreamReceiver.setupContext(pDevice->getGpgpuCommandStreamReceiver().getOsContext()); - auto scratchController = static_cast(commandStreamReceiver.getScratchSpaceController()); + auto scratchController = static_cast(commandStreamReceiver.getScratchSpaceController()); bool cfeStateDirty = false; bool stateBaseAddressDirty = false; @@ -519,14 +519,14 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSp EXPECT_EQ(expectedPatchAddress, scratchController->getScratchPatchAddress()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSpaceSurfaceStateEnabledWhenNotBiggerPrivateScratchSpaceRequiredThenCfeStateIsNotDirty) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenScratchSpaceSurfaceStateEnabledWhenNotBiggerPrivateScratchSpaceRequiredThenCfeStateIsNotDirty) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; DebugManagerStateRestore restorer; DebugManager.flags.EnablePrivateScratchSlot1.set(1); RENDER_SURFACE_STATE surfaceState[4]; MockCsrHw commandStreamReceiver(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); commandStreamReceiver.setupContext(pDevice->getGpgpuCommandStreamReceiver().getOsContext()); - auto scratchController = static_cast(commandStreamReceiver.getScratchSpaceController()); + auto scratchController = static_cast(commandStreamReceiver.getScratchSpaceController()); bool cfeStateDirty = false; bool stateBaseAddressDirty = false; @@ -547,14 +547,14 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSp EXPECT_EQ(gpuVa, surfaceState[3].getSurfaceBaseAddress()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSpaceSurfaceStateWithoutPrivateScratchSpaceWhenDoubleAllocationsScratchSpaceIsUsedThenPrivateScratchAddressIsZero) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenScratchSpaceSurfaceStateWithoutPrivateScratchSpaceWhenDoubleAllocationsScratchSpaceIsUsedThenPrivateScratchAddressIsZero) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; DebugManagerStateRestore restorer; DebugManager.flags.EnablePrivateScratchSlot1.set(1); RENDER_SURFACE_STATE surfaceState[4]; MockCsrHw commandStreamReceiver(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); commandStreamReceiver.setupContext(pDevice->getGpgpuCommandStreamReceiver().getOsContext()); - auto scratchController = static_cast(commandStreamReceiver.getScratchSpaceController()); + auto scratchController = static_cast(commandStreamReceiver.getScratchSpaceController()); bool cfeStateDirty = false; bool stateBaseAddressDirty = false; @@ -569,31 +569,31 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSp EXPECT_EQ(0u, surfaceState[3].getSurfaceBaseAddress()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSpaceControllerWhenDebugKeyForPrivateScratchIsDisabledThenThereAre16Slots) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenScratchSpaceControllerWhenDebugKeyForPrivateScratchIsDisabledThenThereAre16Slots) { DebugManagerStateRestore restorer; DebugManager.flags.EnablePrivateScratchSlot1.set(0); MockCsrHw commandStreamReceiver(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); commandStreamReceiver.setupContext(pDevice->getGpgpuCommandStreamReceiver().getOsContext()); - auto scratchController = static_cast(commandStreamReceiver.getScratchSpaceController()); + auto scratchController = static_cast(commandStreamReceiver.getScratchSpaceController()); EXPECT_EQ(16u, scratchController->stateSlotsCount); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSpaceControllerWhenDebugKeyForPrivateScratchIsEnabledThenThereAre32Slots) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenScratchSpaceControllerWhenDebugKeyForPrivateScratchIsEnabledThenThereAre32Slots) { DebugManagerStateRestore restorer; DebugManager.flags.EnablePrivateScratchSlot1.set(1); MockCsrHw commandStreamReceiver(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); commandStreamReceiver.setupContext(pDevice->getGpgpuCommandStreamReceiver().getOsContext()); - auto scratchController = static_cast(commandStreamReceiver.getScratchSpaceController()); + auto scratchController = static_cast(commandStreamReceiver.getScratchSpaceController()); EXPECT_EQ(32u, scratchController->stateSlotsCount); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSpaceSurfaceStateEnabledWhenSizeForPrivateScratchSpaceIsMisalignedThenAlignItTo64) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenScratchSpaceSurfaceStateEnabledWhenSizeForPrivateScratchSpaceIsMisalignedThenAlignItTo64) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; DebugManagerStateRestore restorer; DebugManager.flags.EnablePrivateScratchSlot1.set(1); RENDER_SURFACE_STATE surfaceState[4]; MockCsrHw commandStreamReceiver(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); - auto scratchController = static_cast(commandStreamReceiver.getScratchSpaceController()); + auto scratchController = static_cast(commandStreamReceiver.getScratchSpaceController()); uint32_t misalignedSizeForPrivateScratch = MemoryConstants::pageSize + 1; @@ -606,13 +606,13 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenScratchSp EXPECT_EQ(scratchController->privateScratchSizeBytes, scratchController->getPrivateScratchSpaceAllocation()->getUnderlyingBufferSize()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenDisabledPrivateScratchSpaceWhenSizeForPrivateScratchSpaceIsProvidedThenItIsNotCreated) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenDisabledPrivateScratchSpaceWhenSizeForPrivateScratchSpaceIsProvidedThenItIsNotCreated) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; DebugManagerStateRestore restorer; DebugManager.flags.EnablePrivateScratchSlot1.set(0); RENDER_SURFACE_STATE surfaceState[4]; MockCsrHw commandStreamReceiver(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); - auto scratchController = static_cast(commandStreamReceiver.getScratchSpaceController()); + auto scratchController = static_cast(commandStreamReceiver.getScratchSpaceController()); bool cfeStateDirty = false; bool stateBaseAddressDirty = false; @@ -622,16 +622,16 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenDisabledP EXPECT_EQ(nullptr, scratchController->getPrivateScratchSpaceAllocation()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenDisabledPrivateScratchSpaceWhenGettingOffsetForSlotThenEachSlotContainsOnlyOneSurfaceState) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenDisabledPrivateScratchSpaceWhenGettingOffsetForSlotThenEachSlotContainsOnlyOneSurfaceState) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; DebugManagerStateRestore restorer; DebugManager.flags.EnablePrivateScratchSlot1.set(0); MockCsrHw commandStreamReceiver(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); - auto scratchController = static_cast(commandStreamReceiver.getScratchSpaceController()); + auto scratchController = static_cast(commandStreamReceiver.getScratchSpaceController()); EXPECT_EQ(sizeof(RENDER_SURFACE_STATE), scratchController->getOffsetToSurfaceState(1u)); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenBlockedCacheFlushCmdWhenSubmittingThenDispatchBlockedCommands) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenBlockedCacheFlushCmdWhenSubmittingThenDispatchBlockedCommands) { using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; MockContext context(pClDevice); @@ -713,7 +713,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenBlockedCa cmdQ0->isQueueBlocked(); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, WhenOsContextSupportsMultipleDevicesThenCommandStreamReceiverIsMultiOsContextCapable) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, WhenOsContextSupportsMultipleDevicesThenCommandStreamReceiverIsMultiOsContextCapable) { uint32_t multiDeviceMask = 0b11; uint32_t singleDeviceMask = 0b10; std::unique_ptr multiDeviceOsContext(OsContext::create(nullptr, 0u, @@ -737,7 +737,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, WhenOsContextS EXPECT_EQ(1u, commandStreamReceiverSingle.deviceBitfield.count()); } -HWTEST2_F(CommandStreamReceiverHwTestXeHPPlus, givenXE_HP_COREDefaultSupportEnabledWhenOsSupportsNewResourceImplicitFlushThenReturnOsSupportValue, IsXeHpCore) { +HWTEST2_F(CommandStreamReceiverHwTestXeHPAndLater, givenXE_HP_COREDefaultSupportEnabledWhenOsSupportsNewResourceImplicitFlushThenReturnOsSupportValue, IsXeHpCore) { MockCsrHw commandStreamReceiver(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); commandStreamReceiver.setupContext(*osContext); @@ -752,7 +752,7 @@ HWTEST2_F(CommandStreamReceiverHwTestXeHPPlus, givenXE_HP_COREDefaultSupportEnab } } -HWTEST2_F(CommandStreamReceiverHwTestXeHPPlus, givenXE_HP_COREDefaultSupportDisabledWhenOsSupportsNewResourceImplicitFlushThenReturnOsSupportValue, IsXeHpCore) { +HWTEST2_F(CommandStreamReceiverHwTestXeHPAndLater, givenXE_HP_COREDefaultSupportDisabledWhenOsSupportsNewResourceImplicitFlushThenReturnOsSupportValue, IsXeHpCore) { MockCsrHw commandStreamReceiver(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); commandStreamReceiver.setupContext(*osContext); @@ -761,7 +761,7 @@ HWTEST2_F(CommandStreamReceiverHwTestXeHPPlus, givenXE_HP_COREDefaultSupportDisa EXPECT_FALSE(commandStreamReceiver.checkPlatformSupportsNewResourceImplicitFlush()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenPlatformSupportsImplicitFlushForNewResourceWhenCsrIsMultiContextThenExpectNoSupport) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenPlatformSupportsImplicitFlushForNewResourceWhenCsrIsMultiContextThenExpectNoSupport) { VariableBackup defaultSettingForNewResourceBackup(&ImplicitFlushSettings::getSettingForNewResource(), true); MockCsrHw commandStreamReceiver(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); @@ -772,7 +772,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenPlatformS EXPECT_FALSE(commandStreamReceiver.checkPlatformSupportsNewResourceImplicitFlush()); } -HWTEST2_F(CommandStreamReceiverHwTestXeHPPlus, givenXE_HP_COREDefaultSupportEnabledWhenOsSupportsGpuIdleImplicitFlushThenReturnOsSupportValue, IsXeHpCore) { +HWTEST2_F(CommandStreamReceiverHwTestXeHPAndLater, givenXE_HP_COREDefaultSupportEnabledWhenOsSupportsGpuIdleImplicitFlushThenReturnOsSupportValue, IsXeHpCore) { MockCsrHw commandStreamReceiver(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); commandStreamReceiver.setupContext(*osContext); @@ -787,7 +787,7 @@ HWTEST2_F(CommandStreamReceiverHwTestXeHPPlus, givenXE_HP_COREDefaultSupportEnab } } -HWTEST2_F(CommandStreamReceiverHwTestXeHPPlus, givenXE_HP_COREDefaultSupportDisabledWhenOsSupportsGpuIdleImplicitFlushThenReturnOsSupportValue, IsXeHpCore) { +HWTEST2_F(CommandStreamReceiverHwTestXeHPAndLater, givenXE_HP_COREDefaultSupportDisabledWhenOsSupportsGpuIdleImplicitFlushThenReturnOsSupportValue, IsXeHpCore) { MockCsrHw commandStreamReceiver(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); commandStreamReceiver.setupContext(*osContext); @@ -796,7 +796,7 @@ HWTEST2_F(CommandStreamReceiverHwTestXeHPPlus, givenXE_HP_COREDefaultSupportDisa EXPECT_FALSE(commandStreamReceiver.checkPlatformSupportsGpuIdleImplicitFlush()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenPlatformSupportsImplicitFlushForIdleGpuWhenCsrIsMultiContextThenExpectNoSupport) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenPlatformSupportsImplicitFlushForIdleGpuWhenCsrIsMultiContextThenExpectNoSupport) { VariableBackup defaultSettingForGpuIdleBackup(&ImplicitFlushSettings::getSettingForGpuIdle(), true); MockCsrHw commandStreamReceiver(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); @@ -808,7 +808,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenPlatformS EXPECT_FALSE(commandStreamReceiver.checkPlatformSupportsGpuIdleImplicitFlush()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenPlatformSupportsImplicitFlushForIdleGpuWhenCsrIsMultiContextAndDirectSubmissionActiveThenExpectSupportTrue) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenPlatformSupportsImplicitFlushForIdleGpuWhenCsrIsMultiContextAndDirectSubmissionActiveThenExpectSupportTrue) { VariableBackup defaultSettingForGpuIdleBackup(&ImplicitFlushSettings::getSettingForGpuIdle(), true); VariableBackup backupOsSettingForGpuIdle(&OSInterface::gpuIdleImplicitFlush, true); @@ -823,7 +823,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, givenPlatformS EXPECT_TRUE(commandStreamReceiver.checkPlatformSupportsGpuIdleImplicitFlush()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, whenCreatingWorkPartitionAllocationThenItsPropertiesAreCorrect) { +HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, whenCreatingWorkPartitionAllocationThenItsPropertiesAreCorrect) { DebugManagerStateRestore restore{}; DebugManager.flags.EnableStaticPartitioning.set(1); DebugManager.flags.EnableLocalMemory.set(1); @@ -838,7 +838,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPPlus, whenCreatingWo EXPECT_TRUE(workPartitionAllocationStorageInfo.tileInstanced); } -HWTEST2_F(CommandStreamReceiverHwTestXeHPPlus, givenXeHpWhenRayTracingEnabledThenDoNotAddCommandBatchBuffer, IsXEHP) { +HWTEST2_F(CommandStreamReceiverHwTestXeHPAndLater, givenXeHpWhenRayTracingEnabledThenDoNotAddCommandBatchBuffer, IsXEHP) { MockCsrHw commandStreamReceiver(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); auto cmdSize = commandStreamReceiver.getCmdSizeForPerDssBackedBuffer(pDevice->getHardwareInfo()); diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp index 2fd53b7bc1..a60f2f8da4 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp @@ -15,9 +15,9 @@ #include "opencl/test/unit_test/mocks/mock_csr_simulated_common_hw.h" #include "test.h" -using XeHPPlusMockSimulatedCsrHwTests = Test; +using XeHPAndLaterMockSimulatedCsrHwTests = Test; -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusMockSimulatedCsrHwTests, givenLocalMemoryEnabledWhenGlobalMmiosAreInitializedThenLmemIsInitializedAndLmemCfgMmioIsWritten) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterMockSimulatedCsrHwTests, givenLocalMemoryEnabledWhenGlobalMmiosAreInitializedThenLmemIsInitializedAndLmemCfgMmioIsWritten) { std::unique_ptr> csrSimulatedCommonHw(new MockSimulatedCsrHw(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); csrSimulatedCommonHw->localMemoryEnabled = true; @@ -29,7 +29,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusMockSimulatedCsrHwTests, givenLocalMemoryEn EXPECT_TRUE(stream->isOnMmioList(MMIOPair(0x0000cf58, 0x80000000u))); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusMockSimulatedCsrHwTests, givenAUBDumpForceAllToLocalMemoryWhenGlobalMmiosAreInitializedThenLmemIsInitializedAndLmemCfgMmioIsWritten) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterMockSimulatedCsrHwTests, givenAUBDumpForceAllToLocalMemoryWhenGlobalMmiosAreInitializedThenLmemIsInitializedAndLmemCfgMmioIsWritten) { DebugManagerStateRestore debugRestorer; DebugManager.flags.AUBDumpForceAllToLocalMemory.set(true); @@ -43,7 +43,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusMockSimulatedCsrHwTests, givenAUBDumpForceA EXPECT_TRUE(stream->isOnMmioList(MMIOPair(0x0000cf58, 0x80000000u))); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusMockSimulatedCsrHwTests, givenAubCommandStreamReceiverWhenGlobalMmiosAreInitializedThenMOCSRegistersAreConfigured) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterMockSimulatedCsrHwTests, givenAubCommandStreamReceiverWhenGlobalMmiosAreInitializedThenMOCSRegistersAreConfigured) { MockSimulatedCsrHw csrSimulatedCommonHw(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); auto stream = std::make_unique(); @@ -117,7 +117,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusMockSimulatedCsrHwTests, givenAubCommandStr EXPECT_TRUE(stream->isOnMmioList(MMIOPair(0x000040FC, 0x00000038))); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusMockSimulatedCsrHwTests, givenAubCommandStreamReceiverWhenGlobalMmiosAreInitializedThenLNCFRegistersAreConfigured) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterMockSimulatedCsrHwTests, givenAubCommandStreamReceiverWhenGlobalMmiosAreInitializedThenLNCFRegistersAreConfigured) { MockSimulatedCsrHw csrSimulatedCommonHw(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); auto stream = std::make_unique(); @@ -159,7 +159,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusMockSimulatedCsrHwTests, givenAubCommandStr EXPECT_TRUE(stream->isOnMmioList(MMIOPair(0x0000B09C, 0x00300010))); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusMockSimulatedCsrHwTests, givenAubCommandStreamReceiverWhenGlobalMmiosAreInitializedThenPerfMmioRegistersAreConfigured) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterMockSimulatedCsrHwTests, givenAubCommandStreamReceiverWhenGlobalMmiosAreInitializedThenPerfMmioRegistersAreConfigured) { MockSimulatedCsrHw csrSimulatedCommonHw(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); auto stream = std::make_unique(); @@ -172,7 +172,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusMockSimulatedCsrHwTests, givenAubCommandStr EXPECT_TRUE(stream->isOnMmioList(MMIOPair(0x00008708, 0x00000000))); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusMockSimulatedCsrHwTests, givenAubCommandStreamReceiverWhenGlobalMmiosAreInitializedThenTRTTRegistersAreConfigured) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterMockSimulatedCsrHwTests, givenAubCommandStreamReceiverWhenGlobalMmiosAreInitializedThenTRTTRegistersAreConfigured) { MockSimulatedCsrHw csrSimulatedCommonHw(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); auto stream = std::make_unique(); @@ -189,7 +189,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusMockSimulatedCsrHwTests, givenAubCommandStr EXPECT_TRUE(stream->isOnMmioList(MMIOPair(0x00004DFC, 0x00000000))); } -class XeHPPlusTileRangeRegisterTest : public ClDeviceFixture, public ::testing::Test { +class XeHPAndLaterTileRangeRegisterTest : public ClDeviceFixture, public ::testing::Test { public: template void setUpImpl() { @@ -234,7 +234,7 @@ class XeHPPlusTileRangeRegisterTest : public ClDeviceFixture, public ::testing:: } }; -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTileRangeRegisterTest, givenLocalMemoryEnabledWhenGlobalMmiosAreInitializedThenTileRangeRegistersAreProgrammed) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterTileRangeRegisterTest, givenLocalMemoryEnabledWhenGlobalMmiosAreInitializedThenTileRangeRegistersAreProgrammed) { setUpImpl(); std::unique_ptr> csrSimulatedCommonHw(new MockSimulatedCsrHw(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); csrSimulatedCommonHw->localMemoryEnabled = true; @@ -246,7 +246,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTileRangeRegisterTest, givenLocalMemoryEnab checkMMIOs(stream->mmioList, 1, 32); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTileRangeRegisterTest, givenLocalMemoryEnabledAnd4TileConfigWhenGlobalMmiosAreInitializedThenTileRangeRegistersAreProgrammed) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterTileRangeRegisterTest, givenLocalMemoryEnabledAnd4TileConfigWhenGlobalMmiosAreInitializedThenTileRangeRegistersAreProgrammed) { DebugManagerStateRestore restorer; DebugManager.flags.CreateMultipleSubDevices.set(4); setUpImpl(); @@ -260,7 +260,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTileRangeRegisterTest, givenLocalMemoryEnab checkMMIOs(stream->mmioList, 4, 32); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTileRangeRegisterTest, givenAUBDumpForceAllToLocalMemoryWhenGlobalMmiosAreInitializedThenTileRangeRegistersAreProgrammed) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterTileRangeRegisterTest, givenAUBDumpForceAllToLocalMemoryWhenGlobalMmiosAreInitializedThenTileRangeRegistersAreProgrammed) { setUpImpl(); DebugManagerStateRestore debugRestorer; DebugManager.flags.AUBDumpForceAllToLocalMemory.set(true); diff --git a/opencl/test/unit_test/command_stream/tbx_command_stream_receiver_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_stream/tbx_command_stream_receiver_tests_xehp_and_later.cpp index 8cd9bef52c..8f614d123a 100644 --- a/opencl/test/unit_test/command_stream/tbx_command_stream_receiver_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_stream/tbx_command_stream_receiver_tests_xehp_and_later.cpp @@ -18,7 +18,7 @@ using namespace NEO; -struct XeHPPlusTbxCommandStreamReceiverTests : ClDeviceFixture, ::testing::Test { +struct XeHPAndLaterTbxCommandStreamReceiverTests : ClDeviceFixture, ::testing::Test { template void setUpImpl() { hardwareInfo = *defaultHwInfo; @@ -46,7 +46,7 @@ struct MockTbxCommandStreamReceiverHw : TbxCommandStreamReceiverHw { uint32_t deviceIndex = 0u; }; -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTbxCommandStreamReceiverTests, givenNullPtrGraphicsAlloctionWhenGetPPGTTAdditionalBitsIsCalledThenAppropriateValueIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterTbxCommandStreamReceiverTests, givenNullPtrGraphicsAlloctionWhenGetPPGTTAdditionalBitsIsCalledThenAppropriateValueIsReturned) { setUpImpl(); auto tbxCsr = std::make_unique>(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); GraphicsAllocation *allocation = nullptr; @@ -55,7 +55,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTbxCommandStreamReceiverTests, givenNullPtr EXPECT_EQ(3u, bits); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTbxCommandStreamReceiverTests, givenGraphicsAlloctionWithNonLocalMemoryPoolWhenGetPPGTTAdditionalBitsIsCalledThenAppropriateValueIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterTbxCommandStreamReceiverTests, givenGraphicsAlloctionWithNonLocalMemoryPoolWhenGetPPGTTAdditionalBitsIsCalledThenAppropriateValueIsReturned) { setUpImpl(); auto tbxCsr = std::make_unique>(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); MockGraphicsAllocation allocation(nullptr, 0); @@ -64,7 +64,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTbxCommandStreamReceiverTests, givenGraphic EXPECT_EQ(3u, bits); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTbxCommandStreamReceiverTests, givenGraphicsAlloctionWithLocalMemoryPoolWhenGetPPGTTAdditionalBitsIsCalledThenAppropriateValueIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterTbxCommandStreamReceiverTests, givenGraphicsAlloctionWithLocalMemoryPoolWhenGetPPGTTAdditionalBitsIsCalledThenAppropriateValueIsReturned) { setUpImpl(); auto tbxCsr = std::make_unique>(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); MockGraphicsAllocation allocation(nullptr, 0); @@ -74,7 +74,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTbxCommandStreamReceiverTests, givenGraphic EXPECT_EQ(3u | (1 << 11), bits); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTbxCommandStreamReceiverTests, givenAubDumpForceAllToLocalMemoryPoolWhenGetPPGTTAdditionalBitsIsCalledThenLocalBitIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterTbxCommandStreamReceiverTests, givenAubDumpForceAllToLocalMemoryPoolWhenGetPPGTTAdditionalBitsIsCalledThenLocalBitIsReturned) { setUpImpl(); DebugManagerStateRestore debugRestorer; DebugManager.flags.AUBDumpForceAllToLocalMemory.set(true); @@ -87,7 +87,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTbxCommandStreamReceiverTests, givenAubDump EXPECT_EQ(3u | (1 << 11), bits); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTbxCommandStreamReceiverTests, givenLocalMemoryFeatureWhenGetGTTDataIsCalledThenLocalMemoryIsSet) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterTbxCommandStreamReceiverTests, givenLocalMemoryFeatureWhenGetGTTDataIsCalledThenLocalMemoryIsSet) { setUpImpl(); DebugManagerStateRestore debugRestorer; DebugManager.flags.EnableLocalMemory.set(1); @@ -102,7 +102,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTbxCommandStreamReceiverTests, givenLocalMe EXPECT_TRUE(data.localMemory); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTbxCommandStreamReceiverTests, givenLocalMemoryEnabledWhenGetMemoryBankForGttIsCalledThenCorrectBankForDeviceIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterTbxCommandStreamReceiverTests, givenLocalMemoryEnabledWhenGetMemoryBankForGttIsCalledThenCorrectBankForDeviceIsReturned) { setUpImpl(); DebugManagerStateRestore debugRestorer; DebugManager.flags.EnableLocalMemory.set(1); @@ -127,7 +127,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTbxCommandStreamReceiverTests, givenLocalMe EXPECT_EQ(MemoryBanks::getBankForLocalMemory(3), bank); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTbxCommandStreamReceiverTests, whenPhysicalAllocatorIsCreatedThenItHasCorrectBankSzieAndNumberOfBanks) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterTbxCommandStreamReceiverTests, whenPhysicalAllocatorIsCreatedThenItHasCorrectBankSzieAndNumberOfBanks) { setUpImpl(); std::unique_ptr device(MockDevice::createWithNewExecutionEnvironment(&hardwareInfo)); auto tbxCsr = std::make_unique>(*device->executionEnvironment, device->getRootDeviceIndex(), device->getDeviceBitfield()); @@ -138,7 +138,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTbxCommandStreamReceiverTests, whenPhysical EXPECT_EQ(1u, allocator->getNumberOfBanks()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTbxCommandStreamReceiverTests, whenPhysicalAllocatorIsCreatedFor4TilesThenItHasCorrectBankSzieAndNumberOfBanks) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterTbxCommandStreamReceiverTests, whenPhysicalAllocatorIsCreatedFor4TilesThenItHasCorrectBankSzieAndNumberOfBanks) { DebugManagerStateRestore restorer; DebugManager.flags.CreateMultipleSubDevices.set(4); setUpImpl(); @@ -151,7 +151,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTbxCommandStreamReceiverTests, whenPhysical EXPECT_EQ(4u, allocator->getNumberOfBanks()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusTbxCommandStreamReceiverTests, whenAskedForPollForCompletionParametersThenReturnCorrectValues) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterTbxCommandStreamReceiverTests, whenAskedForPollForCompletionParametersThenReturnCorrectValues) { setUpImpl(); class MyMockTbxHw : public TbxCommandStreamReceiverHw { public: diff --git a/opencl/test/unit_test/device/get_device_info_tests.cpp b/opencl/test/unit_test/device/get_device_info_tests.cpp index 3dbd0d8674..a942789520 100644 --- a/opencl/test/unit_test/device/get_device_info_tests.cpp +++ b/opencl/test/unit_test/device/get_device_info_tests.cpp @@ -50,7 +50,7 @@ TEST(GetDeviceInfo, GivenInvalidParametersWhenGettingDeviceInfoThenValueSizeRetI EXPECT_EQ(0x1234u, valueSizeRet); } -HWCMDTEST_F(IGFX_GEN8_CORE, GetDeviceInfoMemCapabilitiesTest, GivenValidParametersWhenGetDeviceInfoIsCalledForBdwPlusThenClSuccessIsReturned) { +HWCMDTEST_F(IGFX_GEN8_CORE, GetDeviceInfoMemCapabilitiesTest, GivenValidParametersWhenGetDeviceInfoIsCalledForBdwAndLaterThenClSuccessIsReturned) { std::vector params = { {CL_DEVICE_HOST_MEM_CAPABILITIES_INTEL, diff --git a/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp b/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp index a38e228cd5..4b2ace4d64 100644 --- a/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp @@ -14,21 +14,21 @@ using namespace NEO; -using AubHelperHwTestXeHPPlus = Test; +using AubHelperHwTestXeHPAndLater = Test; -HWCMDTEST_F(IGFX_XE_HP_CORE, AubHelperHwTestXeHPPlus, givenAubHelperWhenGetDataHintForPml4EntryIsCalledThenTracePpgttLevel4IsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, AubHelperHwTestXeHPAndLater, givenAubHelperWhenGetDataHintForPml4EntryIsCalledThenTracePpgttLevel4IsReturned) { AubHelperHw aubHelper(true); EXPECT_EQ(AubMemDump::DataTypeHintValues::TracePpgttLevel4, aubHelper.getDataHintForPml4Entry()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, AubHelperHwTestXeHPPlus, givenAubHelperWhenGetDataHintForPml4EntryIsCalledThenTracePpgttLevel3IsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, AubHelperHwTestXeHPAndLater, givenAubHelperWhenGetDataHintForPml4EntryIsCalledThenTracePpgttLevel3IsReturned) { AubHelperHw aubHelper(true); EXPECT_EQ(AubMemDump::DataTypeHintValues::TracePpgttLevel3, aubHelper.getDataHintForPdpEntry()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, AubHelperHwTestXeHPPlus, givenAubHelperWhenGetDataHintForPml4EntryIsCalledThenTracePpgttLevel2IsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, AubHelperHwTestXeHPAndLater, givenAubHelperWhenGetDataHintForPml4EntryIsCalledThenTracePpgttLevel2IsReturned) { AubHelperHw aubHelper(true); EXPECT_EQ(AubMemDump::DataTypeHintValues::TracePpgttLevel2, aubHelper.getDataHintForPdEntry()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, AubHelperHwTestXeHPPlus, givenAubHelperWhenGetDataHintForPml4EntryIsCalledThenTracePpgttLevel1IsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, AubHelperHwTestXeHPAndLater, givenAubHelperWhenGetDataHintForPml4EntryIsCalledThenTracePpgttLevel1IsReturned) { AubHelperHw aubHelper(true); EXPECT_EQ(AubMemDump::DataTypeHintValues::TracePpgttLevel1, aubHelper.getDataHintForPtEntry()); } diff --git a/opencl/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp b/opencl/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp index b5df45b537..26fd2ee608 100644 --- a/opencl/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp @@ -12,9 +12,9 @@ using namespace NEO; -using EngineNodeHelperTestsXeHPPlus = ::Test; +using EngineNodeHelperTestsXeHPAndLater = ::Test; -HWCMDTEST_F(IGFX_XE_HP_CORE, EngineNodeHelperTestsXeHPPlus, WhenGetBcsEngineTypeIsCalledThenBcsEngineIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, EngineNodeHelperTestsXeHPAndLater, WhenGetBcsEngineTypeIsCalledThenBcsEngineIsReturned) { const auto hwInfo = pDevice->getHardwareInfo(); auto &selectorCopyEngine = pDevice->getDeviceById(0)->getSelectorCopyEngine(); EXPECT_EQ(aub_stream::EngineType::ENGINE_BCS, EngineHelpers::getBcsEngineType(hwInfo, selectorCopyEngine, false)); diff --git a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp index 565a78f593..1450e8e024 100644 --- a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp +++ b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp @@ -1302,9 +1302,9 @@ HWTEST_F(KernelCacheFlushTests, givenLocallyUncachedBufferWhenGettingAllocations clReleaseMemObject(bufferRegular); } -using HardwareCommandsTestXeHpPlus = HardwareCommandsTest; +using HardwareCommandsTestXeHpAndLater = HardwareCommandsTest; -HWCMDTEST_F(IGFX_XE_HP_CORE, HardwareCommandsTestXeHpPlus, givenIndirectHeapNotAllocatedFromInternalPoolWhenSendCrossThreadDataIsCalledThenOffsetZeroIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HardwareCommandsTestXeHpAndLater, givenIndirectHeapNotAllocatedFromInternalPoolWhenSendCrossThreadDataIsCalledThenOffsetZeroIsReturned) { auto nonInternalAllocation = pDevice->getMemoryManager()->allocateGraphicsMemoryWithProperties(MockAllocationProperties{pDevice->getRootDeviceIndex(), MemoryConstants::pageSize}); IndirectHeap indirectHeap(nonInternalAllocation, false); @@ -1321,7 +1321,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, HardwareCommandsTestXeHpPlus, givenIndirectHeapNotA pDevice->getMemoryManager()->freeGraphicsMemory(nonInternalAllocation); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HardwareCommandsTestXeHpPlus, givenIndirectHeapAllocatedFromInternalPoolWhenSendCrossThreadDataIsCalledThenHeapBaseOffsetIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HardwareCommandsTestXeHpAndLater, givenIndirectHeapAllocatedFromInternalPoolWhenSendCrossThreadDataIsCalledThenHeapBaseOffsetIsReturned) { auto internalAllocation = pDevice->getMemoryManager()->allocateGraphicsMemoryWithProperties(MockAllocationProperties(pDevice->getRootDeviceIndex(), true, MemoryConstants::pageSize, GraphicsAllocation::AllocationType::INTERNAL_HEAP, pDevice->getDeviceBitfield())); IndirectHeap indirectHeap(internalAllocation, true); auto expectedOffset = is64bit ? internalAllocation->getGpuAddressToPatch() : 0u; @@ -1338,7 +1338,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, HardwareCommandsTestXeHpPlus, givenIndirectHeapAllo pDevice->getMemoryManager()->freeGraphicsMemory(internalAllocation); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HardwareCommandsTestXeHpPlus, givenSendCrossThreadDataWhenWhenAddPatchInfoCommentsForAUBDumpIsSetThenAddPatchInfoDataOffsetsAreMoved) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HardwareCommandsTestXeHpAndLater, givenSendCrossThreadDataWhenWhenAddPatchInfoCommentsForAUBDumpIsSetThenAddPatchInfoDataOffsetsAreMoved) { DebugManagerStateRestore dbgRestore; DebugManager.flags.AddPatchInfoCommentsForAUBDump.set(true); @@ -1384,7 +1384,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, HardwareCommandsTestXeHpPlus, givenSendCrossThreadD EXPECT_EQ(PatchInfoAllocationType::IndirectObjectHeap, kernel->getPatchInfoDataList()[0].targetType); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HardwareCommandsTestXeHpPlus, whenGetSizeRequiredForCacheFlushIsCalledThenExceptionIsThrown) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HardwareCommandsTestXeHpAndLater, whenGetSizeRequiredForCacheFlushIsCalledThenExceptionIsThrown) { CommandQueueHw cmdQ(pContext, pClDevice, 0, false); EXPECT_ANY_THROW(HardwareCommandsHelper::getSizeRequiredForCacheFlush(cmdQ, nullptr, 0)); diff --git a/opencl/test/unit_test/helpers/hw_helper_tests.h b/opencl/test/unit_test/helpers/hw_helper_tests.h index 10c95fc3bf..9389013dfe 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests.h +++ b/opencl/test/unit_test/helpers/hw_helper_tests.h @@ -25,7 +25,7 @@ struct ComputeSlmTestInput { uint32_t slmSize; }; -constexpr ComputeSlmTestInput computeSlmValuesXeHPPlusTestsInput[] = { +constexpr ComputeSlmTestInput computeSlmValuesXeHPAndLaterTestsInput[] = { {0, 0 * KB}, {1, 0 * KB + 1}, {1, 1 * KB}, diff --git a/opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp b/opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp index 39c4eb2d9e..dea9c655e1 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp @@ -20,14 +20,14 @@ #include "engine_node.h" #include "pipe_control_args.h" -using HwHelperTestXeHPPlus = HwHelperTest; +using HwHelperTestXeHPAndLater = HwHelperTest; -HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, WhenGettingMaxBarriersPerSliceThen32IsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, WhenGettingMaxBarriersPerSliceThen32IsReturned) { auto &helper = HwHelper::get(renderCoreFamily); EXPECT_EQ(32u, helper.getMaxBarrierRegisterPerSlice()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, whenCapabilityCoherencyFlagSetTrueThenOverrideToFalse) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, whenCapabilityCoherencyFlagSetTrueThenOverrideToFalse) { auto &helper = HwHelper::get(renderCoreFamily); bool coherency = true; @@ -35,7 +35,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, whenCapabilityCoherencyFlagSe EXPECT_FALSE(coherency); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenHwHelperWhenGetGpuTimeStampInNSIsCalledThenOnlyLow32BitsFromTimeStampAreUsedAndCorrectValueIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenHwHelperWhenGetGpuTimeStampInNSIsCalledThenOnlyLow32BitsFromTimeStampAreUsedAndCorrectValueIsReturned) { auto &helper = HwHelper::get(renderCoreFamily); auto timeStamp = 0x00ff'ffff'ffff; @@ -45,7 +45,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenHwHelperWhenGetGpuTimeSt EXPECT_EQ(result, helper.getGpuTimeStampInNS(timeStamp, frequency)); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, GivenNoCcsNodeThenDefaultEngineTypeIsRcs) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, GivenNoCcsNodeThenDefaultEngineTypeIsRcs) { hardwareInfo.featureTable.ftrCCSNode = false; auto &helper = HwHelper::get(renderCoreFamily); @@ -56,7 +56,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, GivenNoCcsNodeThenDefaultEngi EXPECT_EQ(expectedEngine, hardwareInfo.capabilityTable.defaultEngineType); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, GiveCcsNodeThenDefaultEngineTypeIsCcs) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, GiveCcsNodeThenDefaultEngineTypeIsCcs) { hardwareInfo.featureTable.ftrCCSNode = true; auto &helper = HwHelper::get(renderCoreFamily); @@ -64,7 +64,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, GiveCcsNodeThenDefaultEngineT EXPECT_EQ(aub_stream::ENGINE_CCS, hardwareInfo.capabilityTable.defaultEngineType); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenXeHPPlusPlatformWhenSetupHardwareCapabilitiesIsCalledThenThenSpecificImplementationIsUsed) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenXeHPAndLaterPlatformWhenSetupHardwareCapabilitiesIsCalledThenThenSpecificImplementationIsUsed) { hardwareInfo.featureTable.ftrLocalMemory = true; HardwareCapabilities hwCaps = {0}; @@ -76,31 +76,31 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenXeHPPlusPlatformWhenSetu EXPECT_TRUE(hwCaps.isStatelesToStatefullWithOffsetSupported); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenXeHPPlusPlatformWithLocalMemoryFeatureWhenIsLocalMemoryEnabledIsCalledThenTrueIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenXeHPAndLaterPlatformWithLocalMemoryFeatureWhenIsLocalMemoryEnabledIsCalledThenTrueIsReturned) { hardwareInfo.featureTable.ftrLocalMemory = true; auto &helper = reinterpret_cast &>(HwHelperHw::get()); EXPECT_TRUE(helper.isLocalMemoryEnabled(hardwareInfo)); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenXeHPPlusPlatformWithoutLocalMemoryFeatureWhenIsLocalMemoryEnabledIsCalledThenFalseIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenXeHPAndLaterPlatformWithoutLocalMemoryFeatureWhenIsLocalMemoryEnabledIsCalledThenFalseIsReturned) { hardwareInfo.featureTable.ftrLocalMemory = false; auto &helper = reinterpret_cast &>(HwHelperHw::get()); EXPECT_FALSE(helper.isLocalMemoryEnabled(hardwareInfo)); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenXeHPPlusPlatformWhenCheckingIfHvAlign4IsRequiredThenReturnFalse) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenXeHPAndLaterPlatformWhenCheckingIfHvAlign4IsRequiredThenReturnFalse) { auto &helper = HwHelperHw::get(); EXPECT_FALSE(helper.hvAlign4Required()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenXeHPPlusPlatformWhenCheckTimestampPacketWriteThenReturnTrue) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenXeHPAndLaterPlatformWhenCheckTimestampPacketWriteThenReturnTrue) { auto &hwHelper = HwHelperHw::get(); EXPECT_TRUE(hwHelper.timestampPacketWriteSupported()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenAllFlagsSetWhenGetGpgpuEnginesThenReturnThreeRcsEnginesFourCcsEnginesAndOneBcsEngine) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenAllFlagsSetWhenGetGpgpuEnginesThenReturnThreeRcsEnginesFourCcsEnginesAndOneBcsEngine) { HardwareInfo hwInfo = *defaultHwInfo; hwInfo.featureTable.ftrCCSNode = true; hwInfo.featureTable.ftrBcsInfo = 1; @@ -127,7 +127,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenAllFlagsSetWhenGetGpgpuE EXPECT_EQ(aub_stream::ENGINE_BCS, engines[8].first); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenBcsDisabledWhenGetGpgpuEnginesThenReturnThreeRcsEnginesFourCcsEngines) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenBcsDisabledWhenGetGpgpuEnginesThenReturnThreeRcsEnginesFourCcsEngines) { HardwareInfo hwInfo = *defaultHwInfo; hwInfo.featureTable.ftrCCSNode = true; hwInfo.featureTable.ftrBcsInfo = 0; @@ -149,7 +149,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenBcsDisabledWhenGetGpgpuE EXPECT_EQ(aub_stream::ENGINE_CCS3, engines[6].first); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenCcsDisabledWhenGetGpgpuEnginesThenReturnRcsAndOneBcsEngine) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenCcsDisabledWhenGetGpgpuEnginesThenReturnRcsAndOneBcsEngine) { HardwareInfo hwInfo = *defaultHwInfo; hwInfo.featureTable.ftrCCSNode = false; hwInfo.featureTable.ftrBcsInfo = 1; @@ -169,7 +169,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenCcsDisabledWhenGetGpgpuE EXPECT_EQ(aub_stream::ENGINE_BCS, engines[4].first); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenCcsDisabledAndNumberOfCcsEnabledWhenGetGpgpuEnginesThenReturnRcsAndOneBcsEngine) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenCcsDisabledAndNumberOfCcsEnabledWhenGetGpgpuEnginesThenReturnRcsAndOneBcsEngine) { HardwareInfo hwInfo = *defaultHwInfo; hwInfo.featureTable.ftrCCSNode = false; hwInfo.featureTable.ftrBcsInfo = 1; @@ -189,7 +189,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenCcsDisabledAndNumberOfCc EXPECT_EQ(aub_stream::ENGINE_BCS, engines[4].first); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenVariousCachesRequestProperMOCSIndexesAreBeingReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenVariousCachesRequestProperMOCSIndexesAreBeingReturned) { DebugManagerStateRestore restore; auto &helper = HwHelper::get(renderCoreFamily); @@ -219,7 +219,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenVariousCachesRequestProp EXPECT_EQ(expectedMocsForL3andL1on, mocsIndex); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenStoreRegMemCommandWhenAdjustingThenSetRemapEnabled) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenStoreRegMemCommandWhenAdjustingThenSetRemapEnabled) { typename FamilyType::MI_STORE_REGISTER_MEM_CMD storeRegMem = {}; storeRegMem.setMmioRemapEnable(false); @@ -229,9 +229,9 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenStoreRegMemCommandWhenAd EXPECT_TRUE(storeRegMem.getMmioRemapEnable()); } -using PipeControlHelperTestsXeHPPlus = ::testing::Test; +using PipeControlHelperTestsXeHPAndLater = ::testing::Test; -HWCMDTEST_F(IGFX_XE_HP_CORE, PipeControlHelperTestsXeHPPlus, WhenAddingPipeControlWAThenCorrectCommandsAreProgrammed) { +HWCMDTEST_F(IGFX_XE_HP_CORE, PipeControlHelperTestsXeHPAndLater, WhenAddingPipeControlWAThenCorrectCommandsAreProgrammed) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; uint8_t buffer[128]; @@ -277,13 +277,13 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, PipeControlHelperTestsXeHPPlus, WhenAddingPipeContr } } -HWCMDTEST_F(IGFX_XE_HP_CORE, PipeControlHelperTestsXeHPPlus, WhenGettingSizeForAdditionalSynchronizationThenCorrectValueIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, PipeControlHelperTestsXeHPAndLater, WhenGettingSizeForAdditionalSynchronizationThenCorrectValueIsReturned) { HardwareInfo hardwareInfo = *defaultHwInfo; EXPECT_EQ(0u, UltMemorySynchronizationCommands::getSizeForAdditonalSynchronization(hardwareInfo)); } -HWCMDTEST_F(IGFX_XE_HP_CORE, PipeControlHelperTestsXeHPPlus, WhenSettingExtraPipeControlPropertiesThenCorrectValuesAreSet) { +HWCMDTEST_F(IGFX_XE_HP_CORE, PipeControlHelperTestsXeHPAndLater, WhenSettingExtraPipeControlPropertiesThenCorrectValuesAreSet) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; for (auto ftrLocalMemory : ::testing::Bool()) { @@ -301,14 +301,14 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, PipeControlHelperTestsXeHPPlus, WhenSettingExtraPip } } -HWCMDTEST_F(IGFX_XE_HP_CORE, PipeControlHelperTestsXeHPPlus, whenSettingCacheFlushExtraFieldsThenExpectHdcFlushSet) { +HWCMDTEST_F(IGFX_XE_HP_CORE, PipeControlHelperTestsXeHPAndLater, whenSettingCacheFlushExtraFieldsThenExpectHdcFlushSet) { PipeControlArgs args; MemorySynchronizationCommands::setCacheFlushExtraProperties(args); EXPECT_TRUE(args.hdcPipelineFlush); } -HWCMDTEST_F(IGFX_XE_HP_CORE, PipeControlHelperTestsXeHPPlus, givenRequestedCacheFlushesWhenProgrammingPipeControlThenFlushHdc) { +HWCMDTEST_F(IGFX_XE_HP_CORE, PipeControlHelperTestsXeHPAndLater, givenRequestedCacheFlushesWhenProgrammingPipeControlThenFlushHdc) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; uint32_t buffer[sizeof(PIPE_CONTROL) * 2] = {}; @@ -324,7 +324,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, PipeControlHelperTestsXeHPPlus, givenRequestedCache EXPECT_TRUE(pipeControl->getCompressionControlSurfaceCcsFlush()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, PipeControlHelperTestsXeHPPlus, givenDebugVariableSetWhenProgrammingPipeControlThenFlushHdc) { +HWCMDTEST_F(IGFX_XE_HP_CORE, PipeControlHelperTestsXeHPAndLater, givenDebugVariableSetWhenProgrammingPipeControlThenFlushHdc) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; DebugManagerStateRestore restore; DebugManager.flags.FlushAllCaches.set(true); @@ -340,7 +340,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, PipeControlHelperTestsXeHPPlus, givenDebugVariableS EXPECT_TRUE(pipeControl->getCompressionControlSurfaceCcsFlush()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, PipeControlHelperTestsXeHPPlus, givenDebugDisableCacheFlushWhenProgrammingPipeControlWithCacheFlushThenExpectDebugOverrideFlushHdc) { +HWCMDTEST_F(IGFX_XE_HP_CORE, PipeControlHelperTestsXeHPAndLater, givenDebugDisableCacheFlushWhenProgrammingPipeControlWithCacheFlushThenExpectDebugOverrideFlushHdc) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; DebugManagerStateRestore restore; DebugManager.flags.DoNotFlushCaches.set(true); @@ -358,17 +358,17 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, PipeControlHelperTestsXeHPPlus, givenDebugDisableCa EXPECT_FALSE(pipeControl->getCompressionControlSurfaceCcsFlush()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenHwHelperXeCoreWhenGettingGlobalTimeStampBitsThen32IsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenHwHelperXeCoreWhenGettingGlobalTimeStampBitsThen32IsReturned) { auto &helper = HwHelper::get(renderCoreFamily); EXPECT_EQ(helper.getGlobalTimeStampBits(), 32U); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenHwHelperWhenGettingPlanarYuvHeightThenHelperReturnsCorrectValue) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenHwHelperWhenGettingPlanarYuvHeightThenHelperReturnsCorrectValue) { auto &helper = HwHelper::get(renderCoreFamily); EXPECT_EQ(helper.getPlanarYuvMaxHeight(), 16128u); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, WhenIsPipeControlWArequiredIsCalledThenCorrectValueIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, WhenIsPipeControlWArequiredIsCalledThenCorrectValueIsReturned) { auto hwInfo = pDevice->getHardwareInfo(); for (auto ftrLocalMemory : ::testing::Bool()) { hwInfo.featureTable.ftrLocalMemory = ftrLocalMemory; @@ -378,7 +378,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, WhenIsPipeControlWArequiredIs } } -HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, whenGettingPreferenceForSmallKernelsThenCertainThresholdIsTested) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, whenGettingPreferenceForSmallKernelsThenCertainThresholdIsTested) { DebugManagerStateRestore restorer; auto &helper = HwHelper::get(renderCoreFamily); EXPECT_TRUE(helper.preferSmallWorkgroupSizeForKernel(512u, this->pClDevice->getHardwareInfo())); @@ -395,7 +395,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, whenGettingPreferenceForSmall EXPECT_FALSE(helper.preferSmallWorkgroupSizeForKernel(0u, this->pClDevice->getHardwareInfo())); } -HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPPlus, givenHwHelperWhenGettingBindlessSurfaceExtendedMessageDescriptorValueThenCorrectValueIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenHwHelperWhenGettingBindlessSurfaceExtendedMessageDescriptorValueThenCorrectValueIsReturned) { auto &hwHelper = HwHelper::get(pDevice->getHardwareInfo().platform.eRenderCoreFamily); auto value = hwHelper.getBindlessSurfaceExtendedMessageDescriptorValue(0x200); 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 9822fb84aa..e717a3f68d 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 @@ -22,8 +22,8 @@ using namespace NEO; -using ThreadArbitrationXeHPPlus = PreambleFixture; -HWCMDTEST_F(IGFX_XE_HP_CORE, ThreadArbitrationXeHPPlus, givenPolicyWhenThreadArbitrationProgrammedThenDoNothing) { +using ThreadArbitrationXeHPAndLater = PreambleFixture; +HWCMDTEST_F(IGFX_XE_HP_CORE, ThreadArbitrationXeHPAndLater, givenPolicyWhenThreadArbitrationProgrammedThenDoNothing) { LinearStream &cs = linearStream; PreambleHelper::programThreadArbitration(&cs, ThreadArbitrationPolicy::RoundRobin); @@ -32,8 +32,8 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ThreadArbitrationXeHPPlus, givenPolicyWhenThreadArb EXPECT_EQ(0u, HwHelperHw::get().getDefaultThreadArbitrationPolicy()); } -using ProgramPipelineXeHPPlus = PreambleFixture; -HWCMDTEST_F(IGFX_XE_HP_CORE, ProgramPipelineXeHPPlus, whenCleanStateInPreambleIsSetAndProgramPipelineSelectIsCalledThenExtraPipelineSelectAndTwoExtraPipeControlsAdded) { +using ProgramPipelineXeHPAndLater = PreambleFixture; +HWCMDTEST_F(IGFX_XE_HP_CORE, ProgramPipelineXeHPAndLater, whenCleanStateInPreambleIsSetAndProgramPipelineSelectIsCalledThenExtraPipelineSelectAndTwoExtraPipeControlsAdded) { typedef typename FamilyType::PIPELINE_SELECT PIPELINE_SELECT; typedef typename FamilyType::PIPE_CONTROL PIPE_CONTROL; DebugManagerStateRestore stateRestore; @@ -51,7 +51,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ProgramPipelineXeHPPlus, whenCleanStateInPreambleIs EXPECT_EQ(2u, numPipelineSelect); } -HWCMDTEST_F(IGFX_XE_HP_CORE, ProgramPipelineXeHPPlus, givenDebugVariableWhenProgramPipelineSelectIsCalledThenItHasProperFieldsSet) { +HWCMDTEST_F(IGFX_XE_HP_CORE, ProgramPipelineXeHPAndLater, givenDebugVariableWhenProgramPipelineSelectIsCalledThenItHasProperFieldsSet) { typedef typename FamilyType::PIPELINE_SELECT PIPELINE_SELECT; DebugManagerStateRestore stateRestore; DebugManager.flags.OverrideSystolicPipelineSelect.set(1); @@ -70,8 +70,8 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ProgramPipelineXeHPPlus, givenDebugVariableWhenProg EXPECT_TRUE(cmd->getSystolicModeEnable()); } -using PreemptionWatermarkXeHPPlus = PreambleFixture; -HWCMDTEST_F(IGFX_XE_HP_CORE, PreemptionWatermarkXeHPPlus, givenPreambleThenPreambleWorkAroundsIsNotProgrammed) { +using PreemptionWatermarkXeHPAndLater = PreambleFixture; +HWCMDTEST_F(IGFX_XE_HP_CORE, PreemptionWatermarkXeHPAndLater, givenPreambleThenPreambleWorkAroundsIsNotProgrammed) { PreambleHelper::programGenSpecificPreambleWorkArounds(&linearStream, *defaultHwInfo); parseCommands(linearStream); @@ -89,8 +89,8 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, PreemptionWatermarkXeHPPlus, givenPreambleThenPream EXPECT_EQ(expectedSize, PreambleHelper::getAdditionalCommandsSize(mockDevice)); } -struct KernelCommandsXeHPPlus : public PreambleVfeState, - public ClDeviceFixture { +struct KernelCommandsXeHPAndLater : public PreambleVfeState, + public ClDeviceFixture { void SetUp() override { PreambleVfeState::SetUp(); ClDeviceFixture::SetUp(); @@ -107,7 +107,7 @@ struct KernelCommandsXeHPPlus : public PreambleVfeState, KernelInfo kernelInfo; }; -HWCMDTEST_F(IGFX_XE_HP_CORE, KernelCommandsXeHPPlus, whenKernelSizeIsRequiredThenReturnZero) { +HWCMDTEST_F(IGFX_XE_HP_CORE, KernelCommandsXeHPAndLater, whenKernelSizeIsRequiredThenReturnZero) { MockKernel kernel(program.get(), kernelInfo, *pClDevice); size_t expectedSize = 0; @@ -115,28 +115,28 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, KernelCommandsXeHPPlus, whenKernelSizeIsRequiredThe EXPECT_EQ(expectedSize, actualSize); } -HWCMDTEST_F(IGFX_XE_HP_CORE, KernelCommandsXeHPPlus, whenPipeControlForWaIsRequiredThenReturnFalse) { +HWCMDTEST_F(IGFX_XE_HP_CORE, KernelCommandsXeHPAndLater, whenPipeControlForWaIsRequiredThenReturnFalse) { auto &hwInfo = pDevice->getHardwareInfo(); EXPECT_EQ(UnitTestHelper::isPipeControlWArequired(hwInfo), MemorySynchronizationCommands::isPipeControlWArequired(hwInfo)); } -HWCMDTEST_F(IGFX_XE_HP_CORE, KernelCommandsXeHPPlus, whenMediaInterfaceDescriptorLoadIsRequiredThenDoNotProgramNonExistingCommand) { +HWCMDTEST_F(IGFX_XE_HP_CORE, KernelCommandsXeHPAndLater, whenMediaInterfaceDescriptorLoadIsRequiredThenDoNotProgramNonExistingCommand) { size_t expectedSize = 0; EXPECT_EQ(expectedSize, linearStream.getUsed()); HardwareCommandsHelper::sendMediaInterfaceDescriptorLoad(linearStream, 0, 0); EXPECT_EQ(expectedSize, linearStream.getUsed()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, KernelCommandsXeHPPlus, whenMediaStateFlushIsRequiredThenDoNotProgramNonExistingCommand) { +HWCMDTEST_F(IGFX_XE_HP_CORE, KernelCommandsXeHPAndLater, whenMediaStateFlushIsRequiredThenDoNotProgramNonExistingCommand) { size_t expectedSize = 0; EXPECT_EQ(expectedSize, linearStream.getUsed()); HardwareCommandsHelper::sendMediaStateFlush(linearStream, 0); EXPECT_EQ(expectedSize, linearStream.getUsed()); } -using PreambleCfeStateXeHPPlus = PreambleFixture; +using PreambleCfeStateXeHPAndLater = PreambleFixture; -HWCMDTEST_F(IGFX_XE_HP_CORE, PreambleCfeStateXeHPPlus, givenScratchEnabledWhenPreambleCfeStateIsProgrammedThenCheckMaxThreadsAddressFieldsAreProgrammed) { +HWCMDTEST_F(IGFX_XE_HP_CORE, PreambleCfeStateXeHPAndLater, givenScratchEnabledWhenPreambleCfeStateIsProgrammedThenCheckMaxThreadsAddressFieldsAreProgrammed) { using CFE_STATE = typename FamilyType::CFE_STATE; uint64_t expectedAddress = 1 << CFE_STATE::SCRATCHSPACEBUFFER_BIT_SHIFT; @@ -157,7 +157,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, PreambleCfeStateXeHPPlus, givenScratchEnabledWhenPr EXPECT_EQ(expectedAddress, address); } -HWCMDTEST_F(IGFX_XE_HP_CORE, PreambleCfeStateXeHPPlus, givenNotSetDebugFlagWhenPreambleCfeStateIsProgrammedThenCFEStateParamsHaveNotSetValue) { +HWCMDTEST_F(IGFX_XE_HP_CORE, PreambleCfeStateXeHPAndLater, givenNotSetDebugFlagWhenPreambleCfeStateIsProgrammedThenCFEStateParamsHaveNotSetValue) { using CFE_STATE = typename FamilyType::CFE_STATE; auto cfeState = reinterpret_cast(linearStream.getSpace(sizeof(CFE_STATE))); @@ -180,7 +180,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, PreambleCfeStateXeHPPlus, givenNotSetDebugFlagWhenP EXPECT_EQ(overDispatchControl, static_cast(cfeState->getOverDispatchControl())); } -HWCMDTEST_F(IGFX_XE_HP_CORE, PreambleCfeStateXeHPPlus, givenSetDebugFlagWhenPreambleCfeStateIsProgrammedThenCFEStateParamsHaveSetValue) { +HWCMDTEST_F(IGFX_XE_HP_CORE, PreambleCfeStateXeHPAndLater, givenSetDebugFlagWhenPreambleCfeStateIsProgrammedThenCFEStateParamsHaveSetValue) { using CFE_STATE = typename FamilyType::CFE_STATE; uint32_t expectedValue1 = 1u; @@ -509,7 +509,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHpCommandStreamReceiverFlushTaskTests, givenL1Ind EXPECT_EQ(expectedMocs, actualMocs); } -using StateBaseAddressXeHPPlusTests = XeHpCommandStreamReceiverFlushTaskTests; +using StateBaseAddressXeHPAndLaterTests = XeHpCommandStreamReceiverFlushTaskTests; struct CompressionParamsSupportedMatcher { template @@ -521,7 +521,7 @@ struct CompressionParamsSupportedMatcher { } }; -HWTEST2_F(StateBaseAddressXeHPPlusTests, givenMemoryCompressionEnabledWhenAppendingSbaThenEnableStatelessCompressionForAllStatelessAccesses, CompressionParamsSupportedMatcher) { +HWTEST2_F(StateBaseAddressXeHPAndLaterTests, givenMemoryCompressionEnabledWhenAppendingSbaThenEnableStatelessCompressionForAllStatelessAccesses, CompressionParamsSupportedMatcher) { auto memoryManager = pDevice->getExecutionEnvironment()->memoryManager.get(); AllocationProperties properties(pDevice->getRootDeviceIndex(), 1, GraphicsAllocation::AllocationType::BUFFER, pDevice->getDeviceBitfield()); auto allocation = memoryManager->allocateGraphicsMemoryWithProperties(properties); @@ -541,7 +541,7 @@ HWTEST2_F(StateBaseAddressXeHPPlusTests, givenMemoryCompressionEnabledWhenAppend memoryManager->freeGraphicsMemory(allocation); } -HWCMDTEST_F(IGFX_XE_HP_CORE, StateBaseAddressXeHPPlusTests, givenNonZeroInternalHeapBaseAddressWhenSettingIsDisabledThenExpectCommandValueZero) { +HWCMDTEST_F(IGFX_XE_HP_CORE, StateBaseAddressXeHPAndLaterTests, givenNonZeroInternalHeapBaseAddressWhenSettingIsDisabledThenExpectCommandValueZero) { auto memoryManager = pDevice->getExecutionEnvironment()->memoryManager.get(); AllocationProperties properties(pDevice->getRootDeviceIndex(), 1, GraphicsAllocation::AllocationType::BUFFER, pDevice->getDeviceBitfield()); auto allocation = memoryManager->allocateGraphicsMemoryWithProperties(properties); @@ -556,9 +556,9 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, StateBaseAddressXeHPPlusTests, givenNonZeroInternal memoryManager->freeGraphicsMemory(allocation); } -using RenderSurfaceStateXeHPPlusTests = XeHpCommandStreamReceiverFlushTaskTests; +using RenderSurfaceStateXeHPAndLaterTests = XeHpCommandStreamReceiverFlushTaskTests; -HWCMDTEST_F(IGFX_XE_HP_CORE, RenderSurfaceStateXeHPPlusTests, givenSpecificProductFamilyWhenAppendingRssThenProgramGpuCoherency) { +HWCMDTEST_F(IGFX_XE_HP_CORE, RenderSurfaceStateXeHPAndLaterTests, givenSpecificProductFamilyWhenAppendingRssThenProgramGpuCoherency) { auto memoryManager = pDevice->getExecutionEnvironment()->memoryManager.get(); size_t allocationSize = MemoryConstants::pageSize; AllocationProperties properties(pDevice->getRootDeviceIndex(), allocationSize, GraphicsAllocation::AllocationType::BUFFER, pDevice->getDeviceBitfield()); diff --git a/opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp b/opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp index 244a3a1d3f..3b9f2fb72b 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp @@ -29,9 +29,9 @@ using namespace NEO; -typedef ::testing::Test XeHPPlusBufferTests; +typedef ::testing::Test XeHPAndLaterBufferTests; -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenContextTypeDefaultWhenBufferIsWritableAndOnlyOneTileIsAvailableThenRemainFlagsToTrue) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenContextTypeDefaultWhenBufferIsWritableAndOnlyOneTileIsAvailableThenRemainFlagsToTrue) { DebugManagerStateRestore restorer; DebugManager.flags.CreateMultipleSubDevices.set(1); initPlatform(); @@ -63,7 +63,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenContextTypeDefaultWhenBuf EXPECT_TRUE(surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenDebugFlagSetWhenProgramingSurfaceStateThenForceCompressionFormat) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenDebugFlagSetWhenProgramingSurfaceStateThenForceCompressionFormat) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; DebugManagerStateRestore restorer; @@ -96,7 +96,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenDebugFlagSetWhenProgramin } } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenContextTypeDefaultWhenBufferIsWritableThenFlipPartialFlagsToFalse) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenContextTypeDefaultWhenBufferIsWritableThenFlipPartialFlagsToFalse) { DebugManagerStateRestore restorer; DebugManager.flags.CreateMultipleSubDevices.set(4); initPlatform(); @@ -126,7 +126,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenContextTypeDefaultWhenBuf EXPECT_FALSE(surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenContextTypeUnrestrictiveWhenBufferIsWritableThenFlipPartialFlagsToFalse) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenContextTypeUnrestrictiveWhenBufferIsWritableThenFlipPartialFlagsToFalse) { DebugManagerStateRestore restorer; DebugManager.flags.CreateMultipleSubDevices.set(4); initPlatform(); @@ -156,7 +156,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenContextTypeUnrestrictiveW EXPECT_FALSE(surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenContextTypeDefaultWhenBufferIsNotWritableThenRemainPartialFlagsToTrue) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenContextTypeDefaultWhenBufferIsNotWritableThenRemainPartialFlagsToTrue) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; MockContext context; context.contextType = ContextType::CONTEXT_TYPE_DEFAULT; @@ -184,7 +184,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenContextTypeDefaultWhenBuf EXPECT_TRUE(surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenContextTypeSpecializedWhenBufferIsWritableThenRemainPartialFlagsToTrue) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenContextTypeSpecializedWhenBufferIsWritableThenRemainPartialFlagsToTrue) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; MockContext context; context.contextType = ContextType::CONTEXT_TYPE_SPECIALIZED; @@ -212,7 +212,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenContextTypeSpecializedWhe EXPECT_TRUE(surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenDebugFlagForMultiTileSupportWhenSurfaceStateIsSetThenValuesMatch) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenDebugFlagForMultiTileSupportWhenSurfaceStateIsSetThenValuesMatch) { DebugManagerStateRestore restore; using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; MockContext context; @@ -248,7 +248,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenDebugFlagForMultiTileSupp EXPECT_EQ(1u, surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenNullContextWhenBufferAllocationIsNullThenRemainPartialFlagsToTrue) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenNullContextWhenBufferAllocationIsNullThenRemainPartialFlagsToTrue) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; RENDER_SURFACE_STATE surfaceState = FamilyType::cmdInitRenderSurfaceState; @@ -267,7 +267,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenNullContextWhenBufferAllo alignedFree(ptr); } -struct MultiGpuGlobalAtomicsBufferTest : public XeHPPlusBufferTests, +struct MultiGpuGlobalAtomicsBufferTest : public XeHPAndLaterBufferTests, public ::testing::WithParamInterface> { }; @@ -361,7 +361,7 @@ INSTANTIATE_TEST_CASE_P(MultiGpuGlobalAtomicsBufferTest, ::testing::Bool(), ::testing::Bool())); -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenBufferAllocationInDeviceMemoryWhenStatelessCompressionIsEnabledThenSetSurfaceStateWithCompressionSettings) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenBufferAllocationInDeviceMemoryWhenStatelessCompressionIsEnabledThenSetSurfaceStateWithCompressionSettings) { DebugManagerStateRestore restorer; DebugManager.flags.EnableLocalMemory.set(1); DebugManager.flags.EnableStatelessCompressionWithUnifiedMemory.set(1); @@ -397,7 +397,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenBufferAllocationInDeviceM EXPECT_EQ(static_cast(DebugManager.flags.FormatForStatelessCompressionWithUnifiedMemory.get()), surfaceState.getCompressionFormat()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenBufferAllocationInHostMemoryWhenStatelessCompressionIsEnabledThenDontSetSurfaceStateWithCompressionSettings) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenBufferAllocationInHostMemoryWhenStatelessCompressionIsEnabledThenDontSetSurfaceStateWithCompressionSettings) { DebugManagerStateRestore restorer; DebugManager.flags.EnableStatelessCompressionWithUnifiedMemory.set(1); @@ -427,7 +427,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenBufferAllocationInHostMem EXPECT_EQ(0u, surfaceState.getCompressionFormat()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenBufferAllocationWithoutGraphicsAllocationWhenStatelessCompressionIsEnabledThenDontSetSurfaceStateWithCompressionSettings) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenBufferAllocationWithoutGraphicsAllocationWhenStatelessCompressionIsEnabledThenDontSetSurfaceStateWithCompressionSettings) { DebugManagerStateRestore restorer; DebugManager.flags.EnableStatelessCompressionWithUnifiedMemory.set(1); @@ -459,7 +459,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenBufferAllocationWithoutGr EXPECT_EQ(0u, surfaceState.getCompressionFormat()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenDebugVariableForcingL1CachingWhenBufferSurfaceStateIsSetThenItIsCachedInL1) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenDebugVariableForcingL1CachingWhenBufferSurfaceStateIsSetThenItIsCachedInL1) { DebugManagerStateRestore restorer; DebugManager.flags.ForceL1Caching.set(1u); MockContext context; @@ -483,7 +483,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenDebugVariableForcingL1Cac EXPECT_EQ(expectedMocs, actualMocs); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenDebugVariableForcingL1CachingDisabledWhenBufferSurfaceStateIsSetThenItIsCachedInL3) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenDebugVariableForcingL1CachingDisabledWhenBufferSurfaceStateIsSetThenItIsCachedInL3) { DebugManagerStateRestore restorer; DebugManager.flags.ForceL1Caching.set(0u); MockContext context; @@ -507,7 +507,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenDebugVariableForcingL1Cac EXPECT_EQ(expectedMocs, actualMocs); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenBufferWhenArgumentIsConstAndAuxModeIsOnThenL3DisabledPolicyIsChoosen) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenBufferWhenArgumentIsConstAndAuxModeIsOnThenL3DisabledPolicyIsChoosen) { MockContext context; const auto size = MemoryConstants::pageSize; const auto flags = CL_MEM_READ_ONLY; @@ -529,7 +529,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenBufferWhenArgumentIsConst EXPECT_EQ(expectedMocs, actualMocs); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenBufferSetSurfaceThatMemoryPtrAndSizeIsAlignedToCachelineThenL1CacheShouldBeOn) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenBufferSetSurfaceThatMemoryPtrAndSizeIsAlignedToCachelineThenL1CacheShouldBeOn) { MockContext context; auto size = MemoryConstants::pageSize; @@ -549,7 +549,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenBufferSetSurfaceThatMemor alignedFree(ptr); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusBufferTests, givenAlignedCacheableNonReadOnlyBufferThenChooseOclBufferPolicy) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenAlignedCacheableNonReadOnlyBufferThenChooseOclBufferPolicy) { MockContext context; const auto size = MemoryConstants::pageSize; const auto ptr = (void *)alignedMalloc(size * 2, MemoryConstants::pageSize); diff --git a/opencl/test/unit_test/mem_obj/image_tests_tgllp_and_later.cpp b/opencl/test/unit_test/mem_obj/image_tests_tgllp_and_later.cpp index 438cfa8d01..57ae97dc4f 100644 --- a/opencl/test/unit_test/mem_obj/image_tests_tgllp_and_later.cpp +++ b/opencl/test/unit_test/mem_obj/image_tests_tgllp_and_later.cpp @@ -13,7 +13,7 @@ using namespace NEO; -struct ImageTestsTgllPlus : ClDeviceFixture, testing::Test { +struct ImageTestsTgllAndLater : ClDeviceFixture, testing::Test { void SetUp() override { ClDeviceFixture::SetUp(); context = std::make_unique(pClDevice); @@ -30,8 +30,8 @@ struct ImageTestsTgllPlus : ClDeviceFixture, testing::Test { std::unique_ptr srcImage{}; }; -using TgllpPlusMatcher = IsAtLeastProduct; -HWTEST2_F(ImageTestsTgllPlus, givenDepthResourceWhenSettingImageArgThenSetDepthStencilResourceField, TgllpPlusMatcher) { +using TgllpAndLaterMatcher = IsAtLeastProduct; +HWTEST2_F(ImageTestsTgllAndLater, givenDepthResourceWhenSettingImageArgThenSetDepthStencilResourceField, TgllpAndLaterMatcher) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; RENDER_SURFACE_STATE surfaceState{}; auto &gpuFlags = srcImage->getGraphicsAllocation(pClDevice->getRootDeviceIndex())->getDefaultGmm()->gmmResourceInfo->getResourceFlags()->Gpu; diff --git a/opencl/test/unit_test/mem_obj/image_tests_xehp_and_later.cpp b/opencl/test/unit_test/mem_obj/image_tests_xehp_and_later.cpp index bae4a8e822..1520d7940c 100644 --- a/opencl/test/unit_test/mem_obj/image_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/mem_obj/image_tests_xehp_and_later.cpp @@ -27,9 +27,9 @@ using namespace NEO; -using XeHPPlusImageTests = ::testing::Test; +using XeHPAndLaterImageTests = ::testing::Test; -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusImageTests, givenContextTypeDefaultWhenImageIsWritableAndOnlyOneTileIsAvailableThenRemainFlagsToTrue) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterImageTests, givenContextTypeDefaultWhenImageIsWritableAndOnlyOneTileIsAvailableThenRemainFlagsToTrue) { DebugManagerStateRestore restorer; DebugManager.flags.CreateMultipleSubDevices.set(1); initPlatform(); @@ -68,7 +68,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusImageTests, givenContextTypeDefaultWhenImag EXPECT_TRUE(surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusImageTests, givenContextTypeDefaultWhenImageIsWritableThenFlipPartialFlagsToFalse) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterImageTests, givenContextTypeDefaultWhenImageIsWritableThenFlipPartialFlagsToFalse) { DebugManagerStateRestore restorer; DebugManager.flags.CreateMultipleSubDevices.set(4); initPlatform(); @@ -105,7 +105,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusImageTests, givenContextTypeDefaultWhenImag EXPECT_FALSE(surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusImageTests, givenDebugFlagForMultiTileSupportWhenSurfaceStateIsProgrammedThenItHasDesiredValues) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterImageTests, givenDebugFlagForMultiTileSupportWhenSurfaceStateIsProgrammedThenItHasDesiredValues) { DebugManagerStateRestore restorer; using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; MockContext context; @@ -148,7 +148,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusImageTests, givenDebugFlagForMultiTileSuppo EXPECT_EQ(1u, surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusImageTests, givenContextTypeUnrestrictiveWhenImageIsWritableThenFlipPartialFlagsToFalse) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterImageTests, givenContextTypeUnrestrictiveWhenImageIsWritableThenFlipPartialFlagsToFalse) { DebugManagerStateRestore restorer; DebugManager.flags.CreateMultipleSubDevices.set(4); initPlatform(); @@ -185,7 +185,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusImageTests, givenContextTypeUnrestrictiveWh EXPECT_FALSE(surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusImageTests, givenContextTypeDefaultWhenImageIsNotWritableThenRemainPartialFlagsToTrue) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterImageTests, givenContextTypeDefaultWhenImageIsNotWritableThenRemainPartialFlagsToTrue) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; MockContext context; context.contextType = ContextType::CONTEXT_TYPE_DEFAULT; @@ -220,7 +220,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusImageTests, givenContextTypeDefaultWhenImag EXPECT_TRUE(surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusImageTests, givenContextTypeSpecializedWhenImageIsWritableThenRemainPartialFlagsToTrue) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterImageTests, givenContextTypeSpecializedWhenImageIsWritableThenRemainPartialFlagsToTrue) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; MockContext context; context.contextType = ContextType::CONTEXT_TYPE_SPECIALIZED; @@ -255,7 +255,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusImageTests, givenContextTypeSpecializedWhen EXPECT_TRUE(surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -struct MultiGpuGlobalAtomicsImageTest : public XeHPPlusImageTests, +struct MultiGpuGlobalAtomicsImageTest : public XeHPAndLaterImageTests, public ::testing::WithParamInterface> { }; @@ -319,7 +319,7 @@ INSTANTIATE_TEST_CASE_P(MultiGpuGlobalAtomicsImageTest, ::testing::Bool(), ::testing::Bool())); -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusImageTests, WhenAppendingSurfaceStateParamsThenDoNothing) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterImageTests, WhenAppendingSurfaceStateParamsThenDoNothing) { typedef typename FamilyType::RENDER_SURFACE_STATE RENDER_SURFACE_STATE; MockContext context; auto image = std::unique_ptr(ImageHelper::create(&context)); @@ -334,7 +334,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusImageTests, WhenAppendingSurfaceStateParams EXPECT_EQ(0, memcmp(&surfaceStateBefore, &surfaceStateAfter, sizeof(RENDER_SURFACE_STATE))); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusImageTests, givenCompressionEnabledWhenAppendingSurfaceStateParamsThenProgramCompressionFormat) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterImageTests, givenCompressionEnabledWhenAppendingSurfaceStateParamsThenProgramCompressionFormat) { MockContext context; auto mockGmmClient = static_cast(context.getDevice(0)->getRootDeviceEnvironment().getGmmClientContext()); typedef typename FamilyType::RENDER_SURFACE_STATE RENDER_SURFACE_STATE; @@ -359,7 +359,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusImageTests, givenCompressionEnabledWhenAppe EXPECT_EQ(image->getGraphicsAllocation(context.getDevice(0)->getRootDeviceIndex())->getDefaultGmm()->gmmResourceInfo->getResourceFormat(), mockGmmClient->capturedFormat); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusImageTests, givenCompressionWhenAppendingImageFromBufferThenTwoIsSetAsCompressionFormat) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterImageTests, givenCompressionWhenAppendingImageFromBufferThenTwoIsSetAsCompressionFormat) { typedef typename FamilyType::RENDER_SURFACE_STATE RENDER_SURFACE_STATE; MockContext context; @@ -399,7 +399,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusImageTests, givenCompressionWhenAppendingIm clReleaseMemObject(imageDesc.mem_object); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusImageTests, givenImageFromBufferWhenSettingSurfaceStateThenPickCompressionFormatFromDebugVariable) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterImageTests, givenImageFromBufferWhenSettingSurfaceStateThenPickCompressionFormatFromDebugVariable) { typedef typename FamilyType::RENDER_SURFACE_STATE RENDER_SURFACE_STATE; DebugManagerStateRestore restorer; @@ -450,7 +450,7 @@ struct CompressionParamsSupportedMatcher { } }; -HWTEST2_F(XeHPPlusImageTests, givenMcsAllocationWhenSetArgIsCalledWithUnifiedAuxCapabilityAndMCSThenProgramAuxFieldsForCcs, CompressionParamsSupportedMatcher) { +HWTEST2_F(XeHPAndLaterImageTests, givenMcsAllocationWhenSetArgIsCalledWithUnifiedAuxCapabilityAndMCSThenProgramAuxFieldsForCcs, CompressionParamsSupportedMatcher) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; using AUXILIARY_SURFACE_MODE = typename RENDER_SURFACE_STATE::AUXILIARY_SURFACE_MODE; using SURFACE_TYPE = typename RENDER_SURFACE_STATE::SURFACE_TYPE; @@ -480,7 +480,7 @@ HWTEST2_F(XeHPPlusImageTests, givenMcsAllocationWhenSetArgIsCalledWithUnifiedAux EXPECT_EQ(surfaceState.getAuxiliarySurfaceMode(), AUXILIARY_SURFACE_MODE::AUXILIARY_SURFACE_MODE_AUX_MCS_LCE); } -HWTEST2_F(ImageClearColorFixture, givenImageForXeHPPlusWhenClearColorParametersAreSetThenClearColorSurfaceInSurfaceStateIsSet, CompressionParamsSupportedMatcher) { +HWTEST2_F(ImageClearColorFixture, givenImageForXeHPAndLaterWhenClearColorParametersAreSetThenClearColorSurfaceInSurfaceStateIsSet, CompressionParamsSupportedMatcher) { this->setUpImpl(); auto surfaceState = this->getSurfaceState(); @@ -510,7 +510,7 @@ struct CompressionClearColorAddressMatcher { } }; -HWTEST2_F(ImageClearColorFixture, givenImageForXeHPPlusWhenCanonicalAddresForClearColorIsUsedThenItsConvertedToNonCanonicalForm, CompressionClearColorAddressMatcher) { +HWTEST2_F(ImageClearColorFixture, givenImageForXeHPAndLaterWhenCanonicalAddresForClearColorIsUsedThenItsConvertedToNonCanonicalForm, CompressionClearColorAddressMatcher) { this->setUpImpl(); auto surfaceState = this->getSurfaceState(); @@ -528,7 +528,7 @@ HWTEST2_F(ImageClearColorFixture, givenImageForXeHPPlusWhenCanonicalAddresForCle EXPECT_EQ(GmmHelper::decanonize(canonicalAddress), nonCanonicalAddress); } -HWTEST2_F(XeHPPlusImageTests, givenMediaCompressionWhenAppendingNewAllocationThenNotZeroIsSetAsCompressionType, CompressionParamsSupportedMatcher) { +HWTEST2_F(XeHPAndLaterImageTests, givenMediaCompressionWhenAppendingNewAllocationThenNotZeroIsSetAsCompressionType, CompressionParamsSupportedMatcher) { MockContext context; using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; auto hwInfo = defaultHwInfo.get(); @@ -554,7 +554,7 @@ HWTEST2_F(XeHPPlusImageTests, givenMediaCompressionWhenAppendingNewAllocationThe EXPECT_EQ(surfaceState.getAuxiliarySurfaceMode(), RENDER_SURFACE_STATE::AUXILIARY_SURFACE_MODE::AUXILIARY_SURFACE_MODE_AUX_NONE); } -HWTEST2_F(XeHPPlusImageTests, givenRenderCompressionWhenAppendingNewAllocationThenNotZeroIsSetAsCompressionType, CompressionParamsSupportedMatcher) { +HWTEST2_F(XeHPAndLaterImageTests, givenRenderCompressionWhenAppendingNewAllocationThenNotZeroIsSetAsCompressionType, CompressionParamsSupportedMatcher) { MockContext context; using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; auto hwInfo = defaultHwInfo.get(); @@ -592,7 +592,7 @@ HWTEST2_F(XeHPPlusImageTests, givenRenderCompressionWhenAppendingNewAllocationTh EXPECT_EQ(surfaceState.getAuxiliarySurfaceMode(), RENDER_SURFACE_STATE::AUXILIARY_SURFACE_MODE::AUXILIARY_SURFACE_MODE_AUX_CCS_E); } -HWTEST2_F(XeHPPlusImageTests, givenNoCompressionWhenProgramingImageSurfaceStateThenCompressionIsDisabled, CompressionParamsSupportedMatcher) { +HWTEST2_F(XeHPAndLaterImageTests, givenNoCompressionWhenProgramingImageSurfaceStateThenCompressionIsDisabled, CompressionParamsSupportedMatcher) { MockContext context; using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; cl_image_desc imgDesc = Image2dDefaults::imageDesc; @@ -608,7 +608,7 @@ HWTEST2_F(XeHPPlusImageTests, givenNoCompressionWhenProgramingImageSurfaceStateT EXPECT_EQ(surfaceState.getAuxiliarySurfaceMode(), RENDER_SURFACE_STATE::AUXILIARY_SURFACE_MODE::AUXILIARY_SURFACE_MODE_AUX_NONE); } -struct XeHPPlusImageHelperTests : ::testing::Test { +struct XeHPAndLaterImageHelperTests : ::testing::Test { void SetUp() override { context = std::make_unique(); image.reset(ImageHelper::create(context.get())); @@ -623,7 +623,7 @@ struct XeHPPlusImageHelperTests : ::testing::Test { uint8_t mockCompressionFormat = 3u; }; -HWTEST2_F(XeHPPlusImageHelperTests, givenMediaCompressedImageWhenAppendingSurfaceStateParamsForCompressionThenCallAppriopriateFunction, CompressionParamsSupportedMatcher) { +HWTEST2_F(XeHPAndLaterImageHelperTests, givenMediaCompressedImageWhenAppendingSurfaceStateParamsForCompressionThenCallAppriopriateFunction, CompressionParamsSupportedMatcher) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; RENDER_SURFACE_STATE rss{}; platformsImpl->clear(); @@ -642,7 +642,7 @@ HWTEST2_F(XeHPPlusImageHelperTests, givenMediaCompressedImageWhenAppendingSurfac EXPECT_EQ(expectedGetMediaSurfaceStateCompressionFormatCalled, gmmClientContext->getMediaSurfaceStateCompressionFormatCalled); } -HWTEST2_F(XeHPPlusImageHelperTests, givenNotMediaCompressedImageWhenAppendingSurfaceStateParamsForCompressionThenCallAppriopriateFunction, CompressionParamsSupportedMatcher) { +HWTEST2_F(XeHPAndLaterImageHelperTests, givenNotMediaCompressedImageWhenAppendingSurfaceStateParamsForCompressionThenCallAppriopriateFunction, CompressionParamsSupportedMatcher) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; RENDER_SURFACE_STATE rss{}; platformsImpl->clear(); diff --git a/opencl/test/unit_test/mocks/mock_scratch_space_controller_xehp_and_later.h b/opencl/test/unit_test/mocks/mock_scratch_space_controller_xehp_and_later.h index dfc8cd7a5d..6d4f0bea2c 100644 --- a/opencl/test/unit_test/mocks/mock_scratch_space_controller_xehp_and_later.h +++ b/opencl/test/unit_test/mocks/mock_scratch_space_controller_xehp_and_later.h @@ -9,19 +9,19 @@ #include "shared/source/command_stream/scratch_space_controller_xehp_and_later.h" namespace NEO { -struct MockScratchSpaceControllerXeHPPlus : public ScratchSpaceControllerXeHPPlus { - using ScratchSpaceControllerXeHPPlus::computeUnitsUsedForScratch; - using ScratchSpaceControllerXeHPPlus::getOffsetToSurfaceState; - using ScratchSpaceControllerXeHPPlus::perThreadScratchSize; - using ScratchSpaceControllerXeHPPlus::privateScratchAllocation; - using ScratchSpaceControllerXeHPPlus::privateScratchSizeBytes; - using ScratchSpaceControllerXeHPPlus::scratchAllocation; - using ScratchSpaceControllerXeHPPlus::scratchSizeBytes; - using ScratchSpaceControllerXeHPPlus::ScratchSpaceControllerXeHPPlus; - using ScratchSpaceControllerXeHPPlus::singleSurfaceStateSize; - using ScratchSpaceControllerXeHPPlus::slotId; - using ScratchSpaceControllerXeHPPlus::stateSlotsCount; - using ScratchSpaceControllerXeHPPlus::surfaceStateHeap; - using ScratchSpaceControllerXeHPPlus::updateSlots; +struct MockScratchSpaceControllerXeHPAndLater : public ScratchSpaceControllerXeHPAndLater { + using ScratchSpaceControllerXeHPAndLater::computeUnitsUsedForScratch; + using ScratchSpaceControllerXeHPAndLater::getOffsetToSurfaceState; + using ScratchSpaceControllerXeHPAndLater::perThreadScratchSize; + using ScratchSpaceControllerXeHPAndLater::privateScratchAllocation; + using ScratchSpaceControllerXeHPAndLater::privateScratchSizeBytes; + using ScratchSpaceControllerXeHPAndLater::scratchAllocation; + using ScratchSpaceControllerXeHPAndLater::scratchSizeBytes; + using ScratchSpaceControllerXeHPAndLater::ScratchSpaceControllerXeHPAndLater; + using ScratchSpaceControllerXeHPAndLater::singleSurfaceStateSize; + using ScratchSpaceControllerXeHPAndLater::slotId; + using ScratchSpaceControllerXeHPAndLater::stateSlotsCount; + using ScratchSpaceControllerXeHPAndLater::surfaceStateHeap; + using ScratchSpaceControllerXeHPAndLater::updateSlots; }; } // namespace NEO diff --git a/opencl/test/unit_test/sampler/sampler_tests_xehp_and_later.cpp b/opencl/test/unit_test/sampler/sampler_tests_xehp_and_later.cpp index 78ede58e27..f0eb446c29 100644 --- a/opencl/test/unit_test/sampler/sampler_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/sampler/sampler_tests_xehp_and_later.cpp @@ -18,9 +18,9 @@ using namespace NEO; -using XeHPPlusSamplerTest = Test; +using XeHPAndLaterSamplerTest = Test; -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusSamplerTest, GivenDefaultThenLowQualityFilterIsDisabled) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterSamplerTest, GivenDefaultThenLowQualityFilterIsDisabled) { using SAMPLER_STATE = typename FamilyType::SAMPLER_STATE; auto state = FamilyType::cmdInitSamplerState; EXPECT_EQ(SAMPLER_STATE::LOW_QUALITY_FILTER_DISABLE, state.getLowQualityFilter()); diff --git a/opencl/test/unit_test/xe_hp_core/xehp/hw_helper_tests_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/hw_helper_tests_xehp.inl index 0a0d7d7a93..ecde2b40b5 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/hw_helper_tests_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/hw_helper_tests_xehp.inl @@ -116,7 +116,7 @@ XEHPTEST_F(HwHelperTestsXeHP, givenRcsDisabledButDebugVariableSetWhenGetGpgpuEng XEHPTEST_F(HwHelperTestsXeHP, GivenVariousValuesWhenComputeSlmSizeIsCalledThenCorrectValueIsReturned) { auto &hwInfo = pDevice->getHardwareInfo(); - for (auto &testInput : computeSlmValuesXeHPPlusTestsInput) { + for (auto &testInput : computeSlmValuesXeHPAndLaterTestsInput) { EXPECT_EQ(testInput.expected, HwHelperHw::get().computeSlmValues(hwInfo, testInput.slmSize)); } } 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 7ed673c8ac..581e3351aa 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 @@ -78,7 +78,7 @@ void CommandStreamReceiverHw::programPipelineSelect(LinearStream &com template void CommandStreamReceiverHw::createScratchSpaceController() { - scratchSpaceController = std::make_unique(this->rootDeviceIndex, executionEnvironment, *internalAllocationStorage.get()); + scratchSpaceController = std::make_unique(this->rootDeviceIndex, executionEnvironment, *internalAllocationStorage.get()); } template diff --git a/shared/source/command_stream/scratch_space_controller_xehp_and_later.cpp b/shared/source/command_stream/scratch_space_controller_xehp_and_later.cpp index 1ed7c7aa39..f0062ab041 100644 --- a/shared/source/command_stream/scratch_space_controller_xehp_and_later.cpp +++ b/shared/source/command_stream/scratch_space_controller_xehp_and_later.cpp @@ -21,9 +21,9 @@ #include "shared/source/os_interface/os_context.h" namespace NEO { -ScratchSpaceControllerXeHPPlus::ScratchSpaceControllerXeHPPlus(uint32_t rootDeviceIndex, - ExecutionEnvironment &environment, - InternalAllocationStorage &allocationStorage) +ScratchSpaceControllerXeHPAndLater::ScratchSpaceControllerXeHPAndLater(uint32_t rootDeviceIndex, + ExecutionEnvironment &environment, + InternalAllocationStorage &allocationStorage) : ScratchSpaceController(rootDeviceIndex, environment, allocationStorage) { auto &hwHelper = HwHelper::get(environment.rootDeviceEnvironments[rootDeviceIndex]->getHardwareInfo()->platform.eRenderCoreFamily); singleSurfaceStateSize = hwHelper.getRenderSurfaceStateSize(); @@ -31,11 +31,11 @@ ScratchSpaceControllerXeHPPlus::ScratchSpaceControllerXeHPPlus(uint32_t rootDevi privateScratchSpaceSupported = !!DebugManager.flags.EnablePrivateScratchSlot1.get(); } if (privateScratchSpaceSupported) { - ScratchSpaceControllerXeHPPlus::stateSlotsCount *= 2; + ScratchSpaceControllerXeHPAndLater::stateSlotsCount *= 2; } } -void ScratchSpaceControllerXeHPPlus::setNewSshPtr(void *newSsh, bool &cfeDirty, bool changeId) { +void ScratchSpaceControllerXeHPAndLater::setNewSshPtr(void *newSsh, bool &cfeDirty, bool changeId) { if (surfaceStateHeap != newSsh) { surfaceStateHeap = static_cast(newSsh); if (scratchAllocation == nullptr) { @@ -50,14 +50,14 @@ void ScratchSpaceControllerXeHPPlus::setNewSshPtr(void *newSsh, bool &cfeDirty, } } -void ScratchSpaceControllerXeHPPlus::setRequiredScratchSpace(void *sshBaseAddress, - uint32_t offset, - uint32_t requiredPerThreadScratchSize, - uint32_t requiredPerThreadPrivateScratchSize, - uint32_t currentTaskCount, - OsContext &osContext, - bool &stateBaseAddressDirty, - bool &vfeStateDirty) { +void ScratchSpaceControllerXeHPAndLater::setRequiredScratchSpace(void *sshBaseAddress, + uint32_t offset, + uint32_t requiredPerThreadScratchSize, + uint32_t requiredPerThreadPrivateScratchSize, + uint32_t currentTaskCount, + OsContext &osContext, + bool &stateBaseAddressDirty, + bool &vfeStateDirty) { setNewSshPtr(sshBaseAddress, vfeStateDirty, offset == 0 ? true : false); bool scratchSurfaceDirty; prepareScratchAllocation(requiredPerThreadScratchSize, requiredPerThreadPrivateScratchSize, currentTaskCount, osContext, stateBaseAddressDirty, scratchSurfaceDirty, vfeStateDirty); @@ -68,7 +68,7 @@ void ScratchSpaceControllerXeHPPlus::setRequiredScratchSpace(void *sshBaseAddres } } -void ScratchSpaceControllerXeHPPlus::programSurfaceState() { +void ScratchSpaceControllerXeHPAndLater::programSurfaceState() { if (updateSlots) { slotId++; } @@ -79,7 +79,7 @@ void ScratchSpaceControllerXeHPPlus::programSurfaceState() { programSurfaceStateAtPtr(surfaceStateForScratchAllocation); } -void ScratchSpaceControllerXeHPPlus::programSurfaceStateAtPtr(void *surfaceStateForScratchAllocation) { +void ScratchSpaceControllerXeHPAndLater::programSurfaceStateAtPtr(void *surfaceStateForScratchAllocation) { auto &hwHelper = HwHelper::get(executionEnvironment.rootDeviceEnvironments[rootDeviceIndex]->getHardwareInfo()->platform.eRenderCoreFamily); uint64_t scratchAllocationAddress = 0u; if (scratchAllocation) { @@ -103,10 +103,10 @@ void ScratchSpaceControllerXeHPPlus::programSurfaceStateAtPtr(void *surfaceState } } -uint64_t ScratchSpaceControllerXeHPPlus::calculateNewGSH() { +uint64_t ScratchSpaceControllerXeHPAndLater::calculateNewGSH() { return 0u; } -uint64_t ScratchSpaceControllerXeHPPlus::getScratchPatchAddress() { +uint64_t ScratchSpaceControllerXeHPAndLater::getScratchPatchAddress() { uint64_t scratchAddress = 0u; if (scratchAllocation || privateScratchAllocation) { if (ApiSpecificConfig::getBindlessConfiguration()) { @@ -118,7 +118,7 @@ uint64_t ScratchSpaceControllerXeHPPlus::getScratchPatchAddress() { return scratchAddress; } -size_t ScratchSpaceControllerXeHPPlus::getOffsetToSurfaceState(uint32_t requiredSlotCount) const { +size_t ScratchSpaceControllerXeHPAndLater::getOffsetToSurfaceState(uint32_t requiredSlotCount) const { auto offset = requiredSlotCount * singleSurfaceStateSize; if (privateScratchSpaceSupported) { offset *= 2; @@ -126,19 +126,19 @@ size_t ScratchSpaceControllerXeHPPlus::getOffsetToSurfaceState(uint32_t required return offset; } -void ScratchSpaceControllerXeHPPlus::reserveHeap(IndirectHeap::Type heapType, IndirectHeap *&indirectHeap) { +void ScratchSpaceControllerXeHPAndLater::reserveHeap(IndirectHeap::Type heapType, IndirectHeap *&indirectHeap) { if (heapType == IndirectHeap::SURFACE_STATE) { indirectHeap->getSpace(getOffsetToSurfaceState(stateSlotsCount)); } } -void ScratchSpaceControllerXeHPPlus::programBindlessSurfaceStateForScratch(BindlessHeapsHelper *heapsHelper, - uint32_t requiredPerThreadScratchSize, - uint32_t requiredPerThreadPrivateScratchSize, - uint32_t currentTaskCount, - OsContext &osContext, - bool &stateBaseAddressDirty, - bool &vfeStateDirty, - NEO::CommandStreamReceiver *csr) { +void ScratchSpaceControllerXeHPAndLater::programBindlessSurfaceStateForScratch(BindlessHeapsHelper *heapsHelper, + uint32_t requiredPerThreadScratchSize, + uint32_t requiredPerThreadPrivateScratchSize, + uint32_t currentTaskCount, + OsContext &osContext, + bool &stateBaseAddressDirty, + bool &vfeStateDirty, + NEO::CommandStreamReceiver *csr) { bool scratchSurfaceDirty; prepareScratchAllocation(requiredPerThreadScratchSize, requiredPerThreadPrivateScratchSize, currentTaskCount, osContext, stateBaseAddressDirty, scratchSurfaceDirty, vfeStateDirty); if (scratchSurfaceDirty) { @@ -149,13 +149,13 @@ void ScratchSpaceControllerXeHPPlus::programBindlessSurfaceStateForScratch(Bindl csr->makeResident(*bindlessSS.heapAllocation); } -void ScratchSpaceControllerXeHPPlus::prepareScratchAllocation(uint32_t requiredPerThreadScratchSize, - uint32_t requiredPerThreadPrivateScratchSize, - uint32_t currentTaskCount, - OsContext &osContext, - bool &stateBaseAddressDirty, - bool &scratchSurfaceDirty, - bool &vfeStateDirty) { +void ScratchSpaceControllerXeHPAndLater::prepareScratchAllocation(uint32_t requiredPerThreadScratchSize, + uint32_t requiredPerThreadPrivateScratchSize, + uint32_t currentTaskCount, + OsContext &osContext, + bool &stateBaseAddressDirty, + bool &scratchSurfaceDirty, + bool &vfeStateDirty) { uint32_t requiredPerThreadScratchSizeAlignedUp = alignUp(requiredPerThreadScratchSize, 64); size_t requiredScratchSizeInBytes = requiredPerThreadScratchSizeAlignedUp * computeUnitsUsedForScratch; scratchSurfaceDirty = false; @@ -188,14 +188,14 @@ void ScratchSpaceControllerXeHPPlus::prepareScratchAllocation(uint32_t requiredP } } -void ScratchSpaceControllerXeHPPlus::programHeaps(HeapContainer &heapContainer, - uint32_t scratchSlot, - uint32_t requiredPerThreadScratchSize, - uint32_t requiredPerThreadPrivateScratchSize, - uint32_t currentTaskCount, - OsContext &osContext, - bool &stateBaseAddressDirty, - bool &vfeStateDirty) { +void ScratchSpaceControllerXeHPAndLater::programHeaps(HeapContainer &heapContainer, + uint32_t scratchSlot, + uint32_t requiredPerThreadScratchSize, + uint32_t requiredPerThreadPrivateScratchSize, + uint32_t currentTaskCount, + OsContext &osContext, + bool &stateBaseAddressDirty, + bool &vfeStateDirty) { sshOffset = scratchSlot; updateSlots = false; setRequiredScratchSpace(heapContainer[0]->getUnderlyingBuffer(), sshOffset, requiredPerThreadScratchSize, requiredPerThreadPrivateScratchSize, currentTaskCount, osContext, stateBaseAddressDirty, vfeStateDirty); diff --git a/shared/source/command_stream/scratch_space_controller_xehp_and_later.h b/shared/source/command_stream/scratch_space_controller_xehp_and_later.h index 99cf13c565..c0f169cc0a 100644 --- a/shared/source/command_stream/scratch_space_controller_xehp_and_later.h +++ b/shared/source/command_stream/scratch_space_controller_xehp_and_later.h @@ -13,11 +13,11 @@ namespace NEO { -class ScratchSpaceControllerXeHPPlus : public ScratchSpaceController { +class ScratchSpaceControllerXeHPAndLater : public ScratchSpaceController { public: - ScratchSpaceControllerXeHPPlus(uint32_t rootDeviceIndex, - ExecutionEnvironment &environment, - InternalAllocationStorage &allocationStorage); + ScratchSpaceControllerXeHPAndLater(uint32_t rootDeviceIndex, + ExecutionEnvironment &environment, + InternalAllocationStorage &allocationStorage); void setNewSshPtr(void *newSsh, bool &cfeDirty, bool changeId); void setRequiredScratchSpace(void *sshBaseAddress, diff --git a/shared/source/helpers/hw_helper_xehp_and_later.inl b/shared/source/helpers/hw_helper_xehp_and_later.inl index 767717aa93..cce9104979 100644 --- a/shared/source/helpers/hw_helper_xehp_and_later.inl +++ b/shared/source/helpers/hw_helper_xehp_and_later.inl @@ -30,7 +30,7 @@ uint32_t HwHelperHw::getComputeUnitsUsedForScratch(const HardwareInfo return static_cast(DebugManager.flags.OverrideNumComputeUnitsForScratch.get()); } - // XeHP plus products return physical threads + // XeHP and later products return physical threads return pHwInfo->gtSystemInfo.MaxSubSlicesSupported * pHwInfo->gtSystemInfo.MaxEuPerSubSlice * (pHwInfo->gtSystemInfo.ThreadCount / pHwInfo->gtSystemInfo.EUCount); } diff --git a/shared/source/xe_hp_core/hw_helper_xe_hp_core.cpp b/shared/source/xe_hp_core/hw_helper_xe_hp_core.cpp index ddc8df3a38..beff8edc56 100644 --- a/shared/source/xe_hp_core/hw_helper_xe_hp_core.cpp +++ b/shared/source/xe_hp_core/hw_helper_xe_hp_core.cpp @@ -33,7 +33,7 @@ uint32_t HwHelperHw::getComputeUnitsUsedForScratch(const HardwareInfo *p return static_cast(DebugManager.flags.OverrideNumComputeUnitsForScratch.get()); } - // XeHP plus products return physical threads + // XeHP and later products return physical threads return std::max(pHwInfo->gtSystemInfo.MaxSubSlicesSupported, static_cast(32)) * pHwInfo->gtSystemInfo.MaxEuPerSubSlice * (pHwInfo->gtSystemInfo.ThreadCount / pHwInfo->gtSystemInfo.EUCount); } diff --git a/shared/test/common/xe_hp_core/test_preemption_xe_hp_core.cpp b/shared/test/common/xe_hp_core/test_preemption_xe_hp_core.cpp index d5bad23139..b9ac933c87 100644 --- a/shared/test/common/xe_hp_core/test_preemption_xe_hp_core.cpp +++ b/shared/test/common/xe_hp_core/test_preemption_xe_hp_core.cpp @@ -10,7 +10,7 @@ using namespace NEO; -HWTEST_EXCLUDE_PRODUCT(XeHPPlusPreemptionTests, GivenDebuggerUsedWhenProgrammingStateSipThenStateSipIsAdded, IGFX_XE_HP_CORE); +HWTEST_EXCLUDE_PRODUCT(XeHPAndLaterPreemptionTests, GivenDebuggerUsedWhenProgrammingStateSipThenStateSipIsAdded, IGFX_XE_HP_CORE); template <> PreemptionTestHwDetails GetPreemptionTestHwDetails() { diff --git a/shared/test/unit_test/encoders/command_encoder_tests_xehp_and_later.cpp b/shared/test/unit_test/encoders/command_encoder_tests_xehp_and_later.cpp index 273a2f8141..bb25926e72 100644 --- a/shared/test/unit_test/encoders/command_encoder_tests_xehp_and_later.cpp +++ b/shared/test/unit_test/encoders/command_encoder_tests_xehp_and_later.cpp @@ -13,13 +13,13 @@ using namespace NEO; -using XeHPPlusHardwareCommandsTest = testing::Test; +using XeHPAndLaterHardwareCommandsTest = testing::Test; -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusHardwareCommandsTest, givenXeHPPlusPlatformWhenDoBindingTablePrefetchIsCalledThenReturnsFalse) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterHardwareCommandsTest, givenXeHPAndLaterPlatformWhenDoBindingTablePrefetchIsCalledThenReturnsFalse) { EXPECT_FALSE(EncodeSurfaceState::doBindingTablePrefetch()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusHardwareCommandsTest, GivenXeHPPlusPlatformWhenSetCoherencyTypeIsCalledThenOnlyEncodingSupportedIsSingleGpuCoherent) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterHardwareCommandsTest, GivenXeHPAndLaterPlatformWhenSetCoherencyTypeIsCalledThenOnlyEncodingSupportedIsSingleGpuCoherent) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; using COHERENCY_TYPE = typename RENDER_SURFACE_STATE::COHERENCY_TYPE; @@ -30,20 +30,20 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusHardwareCommandsTest, GivenXeHPPlusPlatform } } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusHardwareCommandsTest, givenXeHPPlusPlatformWhenGetAdditionalPipelineSelectSizeIsCalledThenZeroIsReturned) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterHardwareCommandsTest, givenXeHPAndLaterPlatformWhenGetAdditionalPipelineSelectSizeIsCalledThenZeroIsReturned) { MockDevice device; EXPECT_EQ(0u, EncodeWA::getAdditionalPipelineSelectSize(device)); } -using XeHPPlusCommandEncoderTest = Test; +using XeHPAndLaterCommandEncoderTest = Test; -HWTEST2_F(XeHPPlusCommandEncoderTest, whenGettingRequiredSizeForStateBaseAddressCommandThenCorrectSizeIsReturned, IsAtLeastXeHpCore) { +HWTEST2_F(XeHPAndLaterCommandEncoderTest, whenGettingRequiredSizeForStateBaseAddressCommandThenCorrectSizeIsReturned, IsAtLeastXeHpCore) { auto container = CommandContainer(); size_t size = EncodeStateBaseAddress::getRequiredSizeForStateBaseAddress(*pDevice, container); EXPECT_EQ(size, 104ul); } -HWTEST2_F(XeHPPlusCommandEncoderTest, givenCommandContainerWithDirtyHeapWhenGettingRequiredSizeForStateBaseAddressCommandThenCorrectSizeIsReturned, IsAtLeastXeHpCore) { +HWTEST2_F(XeHPAndLaterCommandEncoderTest, givenCommandContainerWithDirtyHeapWhenGettingRequiredSizeForStateBaseAddressCommandThenCorrectSizeIsReturned, IsAtLeastXeHpCore) { auto container = CommandContainer(); container.setHeapDirty(HeapType::SURFACE_STATE); size_t size = EncodeStateBaseAddress::getRequiredSizeForStateBaseAddress(*pDevice, container); 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 3d71956432..1170315ce9 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 @@ -604,9 +604,9 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandEncodeStatesTest, givenInterfaceDescriptorDa EXPECT_EQ(forceThreadGroupDispatchSize, iddArg.getThreadGroupDispatchSize()); } -using WalkerThreadTestXeHPPlus = WalkerThreadTest; +using WalkerThreadTestXeHPAndLater = WalkerThreadTest; -HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPPlus, givenStartWorkGroupWhenIndirectIsFalseThenExpectStartGroupAndThreadDimensionsProgramming) { +HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, givenStartWorkGroupWhenIndirectIsFalseThenExpectStartGroupAndThreadDimensionsProgramming) { using WALKER_TYPE = typename FamilyType::WALKER_TYPE; WALKER_TYPE walkerCmd = FamilyType::cmdInitGpgpuWalker; @@ -640,7 +640,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPPlus, givenStartWorkGroupWhenIn EXPECT_FALSE(walkerCmd.getEmitInlineParameter()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPPlus, givenNoStartWorkGroupWhenIndirectIsTrueThenExpectNoStartGroupAndThreadDimensionsProgramming) { +HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, givenNoStartWorkGroupWhenIndirectIsTrueThenExpectNoStartGroupAndThreadDimensionsProgramming) { using WALKER_TYPE = typename FamilyType::WALKER_TYPE; WALKER_TYPE walkerCmd = FamilyType::cmdInitGpgpuWalker; @@ -674,7 +674,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPPlus, givenNoStartWorkGroupWhen EXPECT_FALSE(walkerCmd.getEmitInlineParameter()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPPlus, givenSimdSizeOneWhenWorkGroupSmallerThanSimdThenExpectSimdSizeAsMaxAndExecutionMaskFull) { +HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, givenSimdSizeOneWhenWorkGroupSmallerThanSimdThenExpectSimdSizeAsMaxAndExecutionMaskFull) { using WALKER_TYPE = typename FamilyType::WALKER_TYPE; WALKER_TYPE walkerCmd = FamilyType::cmdInitGpgpuWalker; @@ -710,7 +710,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPPlus, givenSimdSizeOneWhenWorkG EXPECT_FALSE(walkerCmd.getEmitInlineParameter()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPPlus, givenStartWorkGroupWhenWorkGroupSmallerThanSimdThenExpectStartGroupAndExecutionMaskNotFull) { +HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, givenStartWorkGroupWhenWorkGroupSmallerThanSimdThenExpectStartGroupAndExecutionMaskNotFull) { using WALKER_TYPE = typename FamilyType::WALKER_TYPE; WALKER_TYPE walkerCmd = FamilyType::cmdInitGpgpuWalker; @@ -745,7 +745,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPPlus, givenStartWorkGroupWhenWo EXPECT_FALSE(walkerCmd.getEmitInlineParameter()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPPlus, givenLocalIdGenerationByHwWhenNoLocalIdsPresentThenExpectNoEmitAndGenerateLocalIds) { +HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, givenLocalIdGenerationByHwWhenNoLocalIdsPresentThenExpectNoEmitAndGenerateLocalIds) { using WALKER_TYPE = typename FamilyType::WALKER_TYPE; WALKER_TYPE walkerCmd = FamilyType::cmdInitGpgpuWalker; @@ -778,7 +778,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPPlus, givenLocalIdGenerationByH EXPECT_FALSE(walkerCmd.getEmitInlineParameter()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPPlus, givenLocalIdGenerationByHwWhenLocalIdsPresentThenExpectEmitAndGenerateLocalIds) { +HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, givenLocalIdGenerationByHwWhenLocalIdsPresentThenExpectEmitAndGenerateLocalIds) { using WALKER_TYPE = typename FamilyType::WALKER_TYPE; WALKER_TYPE walkerCmd = FamilyType::cmdInitGpgpuWalker; @@ -813,7 +813,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPPlus, givenLocalIdGenerationByH EXPECT_FALSE(walkerCmd.getEmitInlineParameter()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPPlus, WhenInlineDataIsTrueThenExpectInlineDataProgramming) { +HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, WhenInlineDataIsTrueThenExpectInlineDataProgramming) { using WALKER_TYPE = typename FamilyType::WALKER_TYPE; WALKER_TYPE walkerCmd = FamilyType::cmdInitGpgpuWalker; @@ -847,7 +847,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPPlus, WhenInlineDataIsTrueThenE EXPECT_TRUE(walkerCmd.getEmitInlineParameter()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPPlus, WhenExecutionMaskNotZeroThenExpectOverrideExecutionMaskCalculation) { +HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, WhenExecutionMaskNotZeroThenExpectOverrideExecutionMaskCalculation) { using WALKER_TYPE = typename FamilyType::WALKER_TYPE; WALKER_TYPE walkerCmd = FamilyType::cmdInitGpgpuWalker; diff --git a/shared/test/unit_test/encoders/test_encode_math_xehp_and_later.cpp b/shared/test/unit_test/encoders/test_encode_math_xehp_and_later.cpp index 2503a91f00..79e7086e06 100644 --- a/shared/test/unit_test/encoders/test_encode_math_xehp_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_math_xehp_and_later.cpp @@ -14,9 +14,9 @@ using namespace NEO; -using XeHPPlusCommandEncoderMathTest = Test; +using XeHPAndLaterCommandEncoderMathTest = Test; -HWTEST2_F(XeHPPlusCommandEncoderMathTest, WhenAppendsAGreaterThanThenPredicateCorrectlySetAndRemapEnabled, IsAtLeastXeHpCore) { +HWTEST2_F(XeHPAndLaterCommandEncoderMathTest, WhenAppendsAGreaterThanThenPredicateCorrectlySetAndRemapEnabled, IsAtLeastXeHpCore) { using MI_LOAD_REGISTER_MEM = typename FamilyType::MI_LOAD_REGISTER_MEM; using MI_LOAD_REGISTER_IMM = typename FamilyType::MI_LOAD_REGISTER_IMM; using MI_LOAD_REGISTER_REG = typename FamilyType::MI_LOAD_REGISTER_REG; diff --git a/shared/test/unit_test/encoders/test_encode_mi_flush_dw_xehp_and_later.cpp b/shared/test/unit_test/encoders/test_encode_mi_flush_dw_xehp_and_later.cpp index d8df3b772d..2a72905d84 100644 --- a/shared/test/unit_test/encoders/test_encode_mi_flush_dw_xehp_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_mi_flush_dw_xehp_and_later.cpp @@ -10,9 +10,9 @@ using namespace NEO; -using XeHPPlusEncodeMiFlushDWTest = Test; +using XeHPAndLaterEncodeMiFlushDWTest = Test; -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusEncodeMiFlushDWTest, whenMiFlushDwIsProgrammedThenSetFlushCcsAndLlc) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterEncodeMiFlushDWTest, whenMiFlushDwIsProgrammedThenSetFlushCcsAndLlc) { using MI_FLUSH_DW = typename FamilyType::MI_FLUSH_DW; uint8_t buffer[2 * sizeof(MI_FLUSH_DW)] = {}; LinearStream linearStream(buffer, sizeof(buffer)); diff --git a/shared/test/unit_test/preemption/test_preemption_xehp_and_later.cpp b/shared/test/unit_test/preemption/test_preemption_xehp_and_later.cpp index d3c58d33f7..60e1268871 100644 --- a/shared/test/unit_test/preemption/test_preemption_xehp_and_later.cpp +++ b/shared/test/unit_test/preemption/test_preemption_xehp_and_later.cpp @@ -17,9 +17,9 @@ using namespace NEO; -using XeHPPlusPreemptionTests = DevicePreemptionTests; +using XeHPAndLaterPreemptionTests = DevicePreemptionTests; -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusPreemptionTests, whenProgramStateSipIsCalledThenStateSipCmdIsNotAddedToStream) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterPreemptionTests, whenProgramStateSipIsCalledThenStateSipCmdIsNotAddedToStream) { size_t requiredSize = PreemptionHelper::getRequiredStateSipCmdSize(*device); EXPECT_EQ(0U, requiredSize); @@ -28,12 +28,12 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusPreemptionTests, whenProgramStateSipIsCalle EXPECT_EQ(0U, cmdStream.getUsed()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusPreemptionTests, WhenProgrammingThenWaHasExpectedSize) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterPreemptionTests, WhenProgrammingThenWaHasExpectedSize) { size_t expectedSize = 0; EXPECT_EQ(expectedSize, PreemptionHelper::getPreemptionWaCsSize(*device)); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusPreemptionTests, WhenProgrammingThenWaNotApplied) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterPreemptionTests, WhenProgrammingThenWaNotApplied) { size_t usedSize = 0; auto requiredSize = PreemptionHelper::getRequiredStateSipCmdSize(*device); @@ -46,7 +46,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusPreemptionTests, WhenProgrammingThenWaNotAp EXPECT_EQ(usedSize, cmdStream.getUsed()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusPreemptionTests, givenInterfaceDescriptorDataWhenMidThreadPreemptionModeThenSetDisableThreadPreemptionBitToDisable) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterPreemptionTests, givenInterfaceDescriptorDataWhenMidThreadPreemptionModeThenSetDisableThreadPreemptionBitToDisable) { using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA; INTERFACE_DESCRIPTOR_DATA iddArg; @@ -58,7 +58,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusPreemptionTests, givenInterfaceDescriptorDa EXPECT_EQ(INTERFACE_DESCRIPTOR_DATA::THREAD_PREEMPTION_DISABLE_DISABLE, iddArg.getThreadPreemptionDisable()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusPreemptionTests, givenInterfaceDescriptorDataWhenNoMidThreadPreemptionModeThenSetDisableThreadPreemptionBitToEnable) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterPreemptionTests, givenInterfaceDescriptorDataWhenNoMidThreadPreemptionModeThenSetDisableThreadPreemptionBitToEnable) { using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA; INTERFACE_DESCRIPTOR_DATA iddArg; @@ -80,7 +80,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusPreemptionTests, givenInterfaceDescriptorDa EXPECT_EQ(INTERFACE_DESCRIPTOR_DATA::THREAD_PREEMPTION_DISABLE_ENABLE, iddArg.getThreadPreemptionDisable()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusPreemptionTests, WhenProgrammingPreemptionThenExpectLoadRegisterCommandRemapFlagEnabled) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterPreemptionTests, WhenProgrammingPreemptionThenExpectLoadRegisterCommandRemapFlagEnabled) { using MI_LOAD_REGISTER_IMM = typename FamilyType::MI_LOAD_REGISTER_IMM; const size_t bufferSize = 128; @@ -93,7 +93,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusPreemptionTests, WhenProgrammingPreemptionT EXPECT_TRUE(lriCommand->getMmioRemapEnable()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPPlusPreemptionTests, GivenDebuggerUsedWhenProgrammingStateSipThenStateSipIsAdded) { +HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterPreemptionTests, GivenDebuggerUsedWhenProgrammingStateSipThenStateSipIsAdded) { using STATE_SIP = typename FamilyType::STATE_SIP; device->executionEnvironment->rootDeviceEnvironments[0]->debugger.reset(new MockDebugger); diff --git a/shared/test/unit_test/scratch_space_controler/scratch_space_controler_xehp_and_later_tests.cpp b/shared/test/unit_test/scratch_space_controler/scratch_space_controler_xehp_and_later_tests.cpp index f35ad1755d..35ab638c30 100644 --- a/shared/test/unit_test/scratch_space_controler/scratch_space_controler_xehp_and_later_tests.cpp +++ b/shared/test/unit_test/scratch_space_controler/scratch_space_controler_xehp_and_later_tests.cpp @@ -16,18 +16,18 @@ using namespace NEO; -class MockScratchSpaceControllerXeHPPlus : public ScratchSpaceControllerXeHPPlus { +class MockScratchSpaceControllerXeHPAndLater : public ScratchSpaceControllerXeHPAndLater { public: - using ScratchSpaceControllerXeHPPlus::bindlessSS; - using ScratchSpaceControllerXeHPPlus::scratchAllocation; - using ScratchSpaceControllerXeHPPlus::singleSurfaceStateSize; + using ScratchSpaceControllerXeHPAndLater::bindlessSS; + using ScratchSpaceControllerXeHPAndLater::scratchAllocation; + using ScratchSpaceControllerXeHPAndLater::singleSurfaceStateSize; - MockScratchSpaceControllerXeHPPlus(uint32_t rootDeviceIndex, - ExecutionEnvironment &environment, - InternalAllocationStorage &allocationStorage) : ScratchSpaceControllerXeHPPlus(rootDeviceIndex, environment, allocationStorage) { + MockScratchSpaceControllerXeHPAndLater(uint32_t rootDeviceIndex, + ExecutionEnvironment &environment, + InternalAllocationStorage &allocationStorage) : ScratchSpaceControllerXeHPAndLater(rootDeviceIndex, environment, allocationStorage) { scratchAllocation = &alloc; } - ~MockScratchSpaceControllerXeHPPlus() override { + ~MockScratchSpaceControllerXeHPAndLater() override { scratchAllocation = nullptr; } void programSurfaceStateAtPtr(void *surfaceStateForScratchAllocation) override { @@ -58,9 +58,9 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ScratchComtrolerTests, givenBindlessModeOnWhenGetPa csr.setupContext(*pDevice->getDefaultEngine().osContext); ExecutionEnvironment *execEnv = static_cast(pDevice->getExecutionEnvironment()); - std::unique_ptr scratchController = std::make_unique(pDevice->getRootDeviceIndex(), - *execEnv, - *csr.getInternalAllocationStorage()); + std::unique_ptr scratchController = std::make_unique(pDevice->getRootDeviceIndex(), + *execEnv, + *csr.getInternalAllocationStorage()); uint64_t bindlessOffset = 0x4000; scratchController->bindlessSS.surfaceStateOffset = bindlessOffset; EXPECT_EQ(scratchController->getScratchPatchAddress(), bindlessOffset); @@ -74,9 +74,9 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ScratchComtrolerTests, givenDirtyScratchAllocationO csr.setupContext(*pDevice->getDefaultEngine().osContext); ExecutionEnvironment *execEnv = static_cast(pDevice->getExecutionEnvironment()); - std::unique_ptr scratchController = std::make_unique(pDevice->getRootDeviceIndex(), - *execEnv, - *csr.getInternalAllocationStorage()); + std::unique_ptr scratchController = std::make_unique(pDevice->getRootDeviceIndex(), + *execEnv, + *csr.getInternalAllocationStorage()); auto bindlessHeapHelper = std::make_unique(pDevice->getMemoryManager(), pDevice->getNumAvailableDevices() > 1, pDevice->getRootDeviceIndex()); bool gsbaStateDirty = false; bool frontEndStateDirty = false; @@ -94,9 +94,9 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ScratchComtrolerTests, givenNotDirtyScratchAllocati csr.setupContext(*pDevice->getDefaultEngine().osContext); ExecutionEnvironment *execEnv = static_cast(pDevice->getExecutionEnvironment()); - std::unique_ptr scratchController = std::make_unique(pDevice->getRootDeviceIndex(), - *execEnv, - *csr.getInternalAllocationStorage()); + std::unique_ptr scratchController = std::make_unique(pDevice->getRootDeviceIndex(), + *execEnv, + *csr.getInternalAllocationStorage()); auto bindlessHeapHelper = std::make_unique(pDevice->getMemoryManager(), pDevice->getNumAvailableDevices() > 1, pDevice->getRootDeviceIndex()); bool gsbaStateDirty = false; bool frontEndStateDirty = false; @@ -116,9 +116,9 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ScratchComtrolerTests, givenPrivateScratchEnabledWh csr.setupContext(*pDevice->getDefaultEngine().osContext); ExecutionEnvironment *execEnv = static_cast(pDevice->getExecutionEnvironment()); - std::unique_ptr scratchController = std::make_unique(pDevice->getRootDeviceIndex(), - *execEnv, - *csr.getInternalAllocationStorage()); + std::unique_ptr scratchController = std::make_unique(pDevice->getRootDeviceIndex(), + *execEnv, + *csr.getInternalAllocationStorage()); auto bindlessHeapHelper = std::make_unique(pDevice->getMemoryManager(), pDevice->getNumAvailableDevices() > 1, pDevice->getRootDeviceIndex()); bool gsbaStateDirty = false; bool frontEndStateDirty = false; @@ -138,9 +138,9 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ScratchComtrolerTests, givenPrivateScratchDisabledW csr.setupContext(*pDevice->getDefaultEngine().osContext); ExecutionEnvironment *execEnv = static_cast(pDevice->getExecutionEnvironment()); - std::unique_ptr scratchController = std::make_unique(pDevice->getRootDeviceIndex(), - *execEnv, - *csr.getInternalAllocationStorage()); + std::unique_ptr scratchController = std::make_unique(pDevice->getRootDeviceIndex(), + *execEnv, + *csr.getInternalAllocationStorage()); auto bindlessHeapHelper = std::make_unique(pDevice->getMemoryManager(), pDevice->getNumAvailableDevices() > 1, pDevice->getRootDeviceIndex()); bool gsbaStateDirty = false; bool frontEndStateDirty = false;