diff --git a/shared/test/unit_test/command_container/command_container_tests.cpp b/shared/test/unit_test/command_container/command_container_tests.cpp index 8d41d49730..cdbc56fe46 100644 --- a/shared/test/unit_test/command_container/command_container_tests.cpp +++ b/shared/test/unit_test/command_container/command_container_tests.cpp @@ -445,7 +445,6 @@ TEST_F(CommandContainerTest, givenCommandContainerWhenWantToAddAlreadyAddedAlloc } HWTEST_F(CommandContainerTest, givenCmdContainerWhenInitializeCalledThenSSHHeapHasBindlessOffsetReserved) { - using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; std::unique_ptr cmdContainer(new CommandContainer); cmdContainer->setReservedSshSize(4 * MemoryConstants::pageSize); cmdContainer->initialize(pDevice, nullptr, HeapSize::defaultHeapSize, true, false); diff --git a/shared/test/unit_test/command_stream/compute_mode_tests_xehp_and_later.cpp b/shared/test/unit_test/command_stream/compute_mode_tests_xehp_and_later.cpp index 9cd5b2b174..d8db50d633 100644 --- a/shared/test/unit_test/command_stream/compute_mode_tests_xehp_and_later.cpp +++ b/shared/test/unit_test/command_stream/compute_mode_tests_xehp_and_later.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -213,8 +213,6 @@ HWTEST2_F(ComputeModeRequirements, givenCoherencyWithSharedHandlesWhenComputeMod HWTEST2_F(ComputeModeRequirements, givenFlushWithoutSharedHandlesWhenPreviouslyUsedThenPcAndSCMAreNotProgrammed, ForceNonCoherentSupportedMatcher) { setUpImpl(); - using STATE_COMPUTE_MODE = typename FamilyType::STATE_COMPUTE_MODE; - using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; auto graphicAlloc = csr->getMemoryManager()->allocateGraphicsMemoryWithProperties(MockAllocationProperties{csr->getRootDeviceIndex(), MemoryConstants::pageSize}); IndirectHeap stream(graphicAlloc); @@ -407,7 +405,6 @@ HWTEST2_F(ComputeModeRequirements, GivenSingleCCSEnabledSetupThenCorrectCommands getCsrHw()->setupContext(ccsOsContext); using STATE_COMPUTE_MODE = typename FamilyType::STATE_COMPUTE_MODE; - using FORCE_NON_COHERENT = typename STATE_COMPUTE_MODE::FORCE_NON_COHERENT; using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; auto *releaseHelper = device->getReleaseHelper(); diff --git a/shared/test/unit_test/debugger/test_l0_debugger.cpp b/shared/test/unit_test/debugger/test_l0_debugger.cpp index e1de91e64a..616e88f2c0 100644 --- a/shared/test/unit_test/debugger/test_l0_debugger.cpp +++ b/shared/test/unit_test/debugger/test_l0_debugger.cpp @@ -579,7 +579,6 @@ struct L0DebuggerSimpleParameterizedTest : public ::testing::TestWithParam, using Gen12Plus = IsAtLeastGfxCore; HWTEST2_P(L0DebuggerSimpleParameterizedTest, givenZeroGpuVasWhenProgrammingSbaTrackingThenStreamIsNotUsed, Gen12Plus) { - using MI_STORE_DATA_IMM = typename FamilyType::MI_STORE_DATA_IMM; auto debugger = std::make_unique>(pDevice); debugger->initialize(); diff --git a/shared/test/unit_test/device_binary_format/patchtokens_decoder_tests.cpp b/shared/test/unit_test/device_binary_format/patchtokens_decoder_tests.cpp index 42554da252..59c61404ef 100644 --- a/shared/test/unit_test/device_binary_format/patchtokens_decoder_tests.cpp +++ b/shared/test/unit_test/device_binary_format/patchtokens_decoder_tests.cpp @@ -376,9 +376,6 @@ TEST(KernelDecoder, GivenKernelWithValidStringPatchtokensThenDecodingSucceedsAnd storage.reserve(512); auto kernelToEncode = PatchTokensTestData::ValidEmptyKernel::create(storage); - iOpenCL::SPatchString stringTok = {}; - stringTok.Token = iOpenCL::PATCH_TOKEN::PATCH_TOKEN_STRING; - auto patchListOffset = ptrDiff(kernelToEncode.blobs.patchList.begin(), storage.data()); auto string1Off = PatchTokensTestData::pushBackStringToken("str1", 1, storage); auto string2Off = PatchTokensTestData::pushBackStringToken("str2", 2, storage); diff --git a/shared/test/unit_test/device_binary_format/yaml/yaml_parser_tests.cpp b/shared/test/unit_test/device_binary_format/yaml/yaml_parser_tests.cpp index 27ce14183e..eca7f72177 100644 --- a/shared/test/unit_test/device_binary_format/yaml/yaml_parser_tests.cpp +++ b/shared/test/unit_test/device_binary_format/yaml/yaml_parser_tests.cpp @@ -108,7 +108,6 @@ TEST(YamlIsNameBeginningCharacter, GivenCharThenReturnsTrueOnlyWhenCharIsLetterO TEST(YamlIsSign, GivenCharThenReturnsTrueOnlyWhenCharIsPlusOrMinus) { std::set validChars{}; - using It = IteratorAsValue; validChars.insert('+'); validChars.insert('-'); for (int c = std::numeric_limits::min(); c <= std::numeric_limits::max(); ++c) { diff --git a/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp b/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp index 8bb5c4b162..a1790baaf5 100644 --- a/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp +++ b/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp @@ -4607,7 +4607,6 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenBufferPointerArgWhenAddressSpaceIsKnown } TEST_F(decodeZeInfoKernelEntryTest, GivenPointerArgWhenAddressSpaceIsImageThenPopulatesArgDescriptorAccordingly) { - using AddressSpace = NEO::KernelArgMetadata::AddressSpaceQualifier; using namespace NEO::Zebin::ZeInfo::Tags::Kernel::PayloadArgument::AddrSpace; ConstStringRef zeinfo = R"===( @@ -4665,7 +4664,6 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenPointerArgWhenAccessQualifierIsKnownThe } TEST_F(decodeZeInfoKernelEntryTest, GivenNonPointerArgWhenAddressSpaceIsStatelessThenFails) { - using AccessQualifier = NEO::KernelArgMetadata::AddressSpaceQualifier; using namespace NEO::Zebin::ZeInfo::Tags::Kernel::PayloadArgument::AddrSpace; NEO::ConstStringRef nonPtrAddrSpace[] = {image, sampler}; diff --git a/shared/test/unit_test/direct_submission/linux/drm_direct_submission_tests.cpp b/shared/test/unit_test/direct_submission/linux/drm_direct_submission_tests.cpp index 16cef6bab6..0070175614 100644 --- a/shared/test/unit_test/direct_submission/linux/drm_direct_submission_tests.cpp +++ b/shared/test/unit_test/direct_submission/linux/drm_direct_submission_tests.cpp @@ -693,7 +693,6 @@ HWTEST_F(DrmDirectSubmissionTest, givenDisabledMonitorFenceWhenDispatchSwitchRin } HWTEST_F(DrmDirectSubmissionTest, givenDisabledMonitorFenceWhenUpdateTagValueThenTagIsNotUpdated) { - using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using Dispatcher = RenderDispatcher; MockDrmDirectSubmission directSubmission(*device->getDefaultEngine().commandStreamReceiver); diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.cpp b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.cpp index 093a957886..6ca1936421 100644 --- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.cpp @@ -26,7 +26,6 @@ using namespace NEO; using CommandEncodeStatesTestDg2AndLater = Test; HWTEST2_F(CommandEncodeStatesTestDg2AndLater, givenEventAddressWhenEncodeAndPVCAndDG2ThenSetDataportSubsliceCacheFlushIstSet, IsAtLeastXeHpgCore) { - using POSTSYNC_DATA = typename FamilyType::POSTSYNC_DATA; using DefaultWalkerType = typename FamilyType::DefaultWalkerType; uint32_t dims[] = {2, 1, 1}; std::unique_ptr dispatchInterface(new MockDispatchKernelEncoder()); @@ -52,7 +51,6 @@ HWTEST2_F(CommandEncodeStatesTestDg2AndLater, givenEventAddressWhenEncodeAndPVCA HWTEST2_F(CommandEncodeStatesTestDg2AndLater, givenDebugVariableToForceL1FlushWhenWalkerIsProgramedThenCacheFlushIsDisabled, IsAtLeastXeHpgCore) { DebugManagerStateRestore restore; NEO::debugManager.flags.ForcePostSyncL1Flush.set(0); - using POSTSYNC_DATA = typename FamilyType::POSTSYNC_DATA; using DefaultWalkerType = typename FamilyType::DefaultWalkerType; uint32_t dims[] = {2, 1, 1}; std::unique_ptr dispatchInterface(new MockDispatchKernelEncoder()); @@ -77,7 +75,6 @@ HWTEST2_F(CommandEncodeStatesTestDg2AndLater, givenDebugVariableToForceL1FlushWh } HWTEST2_F(CommandEncodeStatesTestDg2AndLater, givenEventAddressWhenEncodeThenMocsIndex2IsSet, IsXeHpgCore) { - using POSTSYNC_DATA = typename FamilyType::POSTSYNC_DATA; using DefaultWalkerType = typename FamilyType::DefaultWalkerType; uint32_t dims[] = {2, 1, 1}; std::unique_ptr dispatchInterface(new MockDispatchKernelEncoder()); @@ -140,7 +137,6 @@ HWTEST2_F(CommandEncodeStatesTestDg2AndLater, GivenDebugOverrideWhenSetAdditiona HWTEST2_F(CommandEncodeStatesTestDg2AndLater, givenOverridePreferredSlmAllocationSizePerDssWhenDispatchingKernelThenCorrectValueIsSet, IsAtLeastXeHpgCore) { using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA; using DefaultWalkerType = typename FamilyType::DefaultWalkerType; - using PREFERRED_SLM_ALLOCATION_SIZE = typename INTERFACE_DESCRIPTOR_DATA::PREFERRED_SLM_ALLOCATION_SIZE; DebugManagerStateRestore restorer; debugManager.flags.OverridePreferredSlmAllocationSizePerDss.set(5); uint32_t dims[] = {2, 1, 1}; diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.h b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.h index e5e40e1593..29841540ba 100644 --- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.h +++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.h @@ -22,7 +22,6 @@ struct PreferredSlmTestValues { template void verifyPreferredSlmValues(std::vector> valuesToTest, const NEO::RootDeviceEnvironment &rootDeviceEnvironment) { using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA; - using PREFERRED_SLM_ALLOCATION_SIZE = typename INTERFACE_DESCRIPTOR_DATA::PREFERRED_SLM_ALLOCATION_SIZE; auto &hwInfo = *rootDeviceEnvironment.getHardwareInfo(); auto threadsPerDssCount = hwInfo.gtSystemInfo.ThreadCount / hwInfo.gtSystemInfo.SubSliceCount; diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_pvc_and_later.cpp b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_pvc_and_later.cpp index e28539b5fe..f1b0571192 100644 --- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_pvc_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_pvc_and_later.cpp @@ -25,7 +25,6 @@ using namespace NEO; using CommandEncodeStatesTestPvcAndLater = Test; HWTEST2_F(CommandEncodeStatesTestPvcAndLater, givenOverrideSlmTotalSizeDebugVariableWhenDispatchingKernelThenSharedMemorySizeIsSetCorrectly, IsAtLeastXeHpcCore) { - using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA; using DefaultWalkerType = typename FamilyType::DefaultWalkerType; DebugManagerStateRestore restorer; uint32_t dims[] = {2, 1, 1}; @@ -58,7 +57,6 @@ HWTEST2_F(CommandEncodeStatesTestPvcAndLater, givenOverrideSlmTotalSizeDebugVari HWTEST2_F(CommandEncodeStatesTestPvcAndLater, givenVariousValuesWhenCallingSetBarrierEnableThenCorrectValuesAreSet, IsAtLeastXeHpcCore) { using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA; - using BARRIERS = typename INTERFACE_DESCRIPTOR_DATA::NUMBER_OF_BARRIERS; INTERFACE_DESCRIPTOR_DATA idd = FamilyType::cmdInitInterfaceDescriptorData; MockDevice device; auto hwInfo = device.getHardwareInfo(); @@ -82,7 +80,6 @@ HWTEST2_F(CommandEncodeStatesTestPvcAndLater, givenVariousValuesWhenCallingSetBa } HWCMDTEST_F(IGFX_XE_HP_CORE, CommandEncodeStatesTestPvcAndLater, givenCommandContainerWhenNumGrfRequiredIsGreaterThanDefaultThenLargeGrfModeEnabled) { - using PIPELINE_SELECT = typename FamilyType::PIPELINE_SELECT; using STATE_COMPUTE_MODE = typename FamilyType::STATE_COMPUTE_MODE; MockExecutionEnvironment executionEnvironment{}; auto &rootDeviceEnvironment = *executionEnvironment.rootDeviceEnvironments[0]; diff --git a/shared/test/unit_test/encoders/test_encode_states.cpp b/shared/test/unit_test/encoders/test_encode_states.cpp index f40b0c1337..1bdb775f7a 100644 --- a/shared/test/unit_test/encoders/test_encode_states.cpp +++ b/shared/test/unit_test/encoders/test_encode_states.cpp @@ -171,7 +171,6 @@ HWTEST_F(BindlessCommandEncodeStatesTest, GivenBindlessEnabledWhenBorderColorsRe using SAMPLER_BORDER_COLOR_STATE = typename FamilyType::SAMPLER_BORDER_COLOR_STATE; DebugManagerStateRestore restorer; debugManager.flags.UseExternalAllocatorForSshAndDsh.set(1); - using SAMPLER_STATE = typename FamilyType::SAMPLER_STATE; uint32_t numSamplers = 1; auto mockHelper = std::make_unique(pDevice, pDevice->getNumGenericSubDevices() > 1); @@ -191,7 +190,6 @@ HWTEST_F(BindlessCommandEncodeStatesTest, GivenBindlessEnabledWhenBorderColorsGr using SAMPLER_BORDER_COLOR_STATE = typename FamilyType::SAMPLER_BORDER_COLOR_STATE; DebugManagerStateRestore restorer; debugManager.flags.UseExternalAllocatorForSshAndDsh.set(1); - using SAMPLER_STATE = typename FamilyType::SAMPLER_STATE; uint32_t numSamplers = 1; auto mockHelper = std::make_unique(pDevice, pDevice->getNumGenericSubDevices() > 1); @@ -211,7 +209,6 @@ HWTEST_F(BindlessCommandEncodeStatesTest, GivenBindlessEnabledWhenBorderColorsBl using SAMPLER_BORDER_COLOR_STATE = typename FamilyType::SAMPLER_BORDER_COLOR_STATE; DebugManagerStateRestore restorer; debugManager.flags.UseExternalAllocatorForSshAndDsh.set(1); - using SAMPLER_STATE = typename FamilyType::SAMPLER_STATE; uint32_t numSamplers = 1; auto mockHelper = std::make_unique(pDevice, pDevice->getNumGenericSubDevices() > 1); @@ -231,7 +228,6 @@ HWTEST_F(BindlessCommandEncodeStatesTest, GivenBindlessEnabledWhenBorderColorsAl using SAMPLER_BORDER_COLOR_STATE = typename FamilyType::SAMPLER_BORDER_COLOR_STATE; DebugManagerStateRestore restorer; debugManager.flags.UseExternalAllocatorForSshAndDsh.set(1); - using SAMPLER_STATE = typename FamilyType::SAMPLER_STATE; uint32_t numSamplers = 1; auto mockHelper = std::make_unique(pDevice, pDevice->getNumGenericSubDevices() > 1); @@ -249,8 +245,6 @@ HWTEST_F(BindlessCommandEncodeStatesTest, GivenBindlessEnabledWhenBorderColorsAl HWTEST_F(CommandEncodeStatesTest, givenCreatedSurfaceStateBufferWhenAllocationProvidedThenUseAllocationAsInput) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; - using SURFACE_TYPE = typename RENDER_SURFACE_STATE::SURFACE_TYPE; - using AUXILIARY_SURFACE_MODE = typename RENDER_SURFACE_STATE::AUXILIARY_SURFACE_MODE; void *stateBuffer = alignedMalloc(sizeof(RENDER_SURFACE_STATE), sizeof(RENDER_SURFACE_STATE)); ASSERT_NE(nullptr, stateBuffer); @@ -296,11 +290,9 @@ HWTEST2_F(CommandEncodeStatesTest, givenCreatedSurfaceStateBufferWhenAllocationN memset(stateBuffer, 0, sizeof(RENDER_SURFACE_STATE)); size_t size = 0x1000; - SurfaceStateBufferLength length; uint64_t gpuAddr = 0; size_t allocSize = size; - length.length = static_cast(allocSize - 1); NEO::EncodeSurfaceStateArgs args; args.outMemory = stateBuffer; @@ -331,11 +323,9 @@ HWTEST2_F(CommandEncodeStatesTest, givenCreatedSurfaceStateBufferWhenGpuCoherenc memset(stateBuffer, 0, sizeof(RENDER_SURFACE_STATE)); size_t size = 0x1000; - SurfaceStateBufferLength length; uint64_t gpuAddr = 0; size_t allocSize = size; - length.length = static_cast(allocSize - 1); NEO::EncodeSurfaceStateArgs args; args.outMemory = stateBuffer; @@ -443,7 +433,6 @@ HWTEST_F(CommandEncodeStatesTest, givenAnUnalignedDstPtrThenCorrectAlignedPtrAnd } HWCMDTEST_F(IGFX_GEN12LP_CORE, CommandEncodeStatesTest, whenAdjustPipelineSelectIsCalledThenNothingHappens) { - using PIPELINE_SELECT = typename FamilyType::PIPELINE_SELECT; auto initialUsed = cmdContainer->getCommandStream()->getUsed(); NEO::EncodeComputeMode::adjustPipelineSelect(*cmdContainer, descriptor); EXPECT_EQ(initialUsed, cmdContainer->getCommandStream()->getUsed()); diff --git a/shared/test/unit_test/encoders/test_implicit_scaling_xehp_and_later.cpp b/shared/test/unit_test/encoders/test_implicit_scaling_xehp_and_later.cpp index 8abe6d45cf..4cb26f8607 100644 --- a/shared/test/unit_test/encoders/test_implicit_scaling_xehp_and_later.cpp +++ b/shared/test/unit_test/encoders/test_implicit_scaling_xehp_and_later.cpp @@ -314,7 +314,6 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenStaticPartitioningPrefer HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenStaticPartitioningPreferredWhenForceDisabledWparidRegisterThenExpectNoCommandFound) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; using PostSyncType = decltype(FamilyType::template getPostSyncType()); - using BATCH_BUFFER_START = typename FamilyType::MI_BATCH_BUFFER_START; using MI_LOAD_REGISTER_MEM = typename FamilyType::MI_LOAD_REGISTER_MEM; debugManager.flags.WparidRegisterProgramming.set(0); @@ -352,7 +351,6 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenStaticPartitioningPrefer HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenStaticPartitioningPreferredWhenForceDisabledPipeControlThenExpectNoCommandFound) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; using PostSyncType = decltype(FamilyType::template getPostSyncType()); - using BATCH_BUFFER_START = typename FamilyType::MI_BATCH_BUFFER_START; using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; debugManager.flags.UsePipeControlAfterPartitionedWalker.set(0); @@ -390,7 +388,6 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenStaticPartitioningPrefer HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenDynamicPartitioningPreferredWhenForceDisabledPipeControlThenExpectNoCommandFound) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; using PostSyncType = decltype(FamilyType::template getPostSyncType()); - using BATCH_BUFFER_START = typename FamilyType::MI_BATCH_BUFFER_START; using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; debugManager.flags.UsePipeControlAfterPartitionedWalker.set(0); @@ -566,7 +563,6 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, givenPipeControlIsNotRequiredAndPartitionRegisterProgrammingForcedWhenApiRequiresCleanupSectionThenDoNotAddPipeControlCrossTileSyncAndCleanupSection) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; - using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using MI_STORE_DATA_IMM = typename FamilyType::MI_STORE_DATA_IMM; using MI_ATOMIC = typename FamilyType::MI_ATOMIC; using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; @@ -628,7 +624,6 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, givenPipeControlIsNotRequiredAndForcePartitionRegisterProgrammingWhenApiRequiresCleanupSectionThenDoNotAddPipeControlCrossTileSyncAndCleanupSection) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; - using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using MI_STORE_DATA_IMM = typename FamilyType::MI_STORE_DATA_IMM; using MI_ATOMIC = typename FamilyType::MI_ATOMIC; using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; @@ -690,7 +685,6 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, givenPipeControlIsNotRequiredAndForcedCrossTileSyncWhenApiRequiresCleanupSectionThenDoNotAddPipeControlAndAddCrossTileSyncAndCleanupSection) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; - using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using MI_STORE_DATA_IMM = typename FamilyType::MI_STORE_DATA_IMM; using MI_ATOMIC = typename FamilyType::MI_ATOMIC; using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; @@ -759,7 +753,6 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, givenPipeControlIsNotRequiredAndForcedCrossTileSyncWhenApiRequiresNoCleanupSectionThenDoNotAddPipeControlAndCleanupSectionAndAddCrossTileSync) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; - using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using MI_STORE_DATA_IMM = typename FamilyType::MI_STORE_DATA_IMM; using MI_ATOMIC = typename FamilyType::MI_ATOMIC; using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; @@ -823,7 +816,6 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, givenPipeControlIsNotRequiredAndForcedCrossTileSyncAndPartitionRegisterWhenApiRequiresNoCleanupSectionThenDoNotAddPipeControlAndCleanupSectionAndAddCrossTileSync) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; - using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using MI_STORE_DATA_IMM = typename FamilyType::MI_STORE_DATA_IMM; using MI_ATOMIC = typename FamilyType::MI_ATOMIC; using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; @@ -889,7 +881,6 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, givenPipeControlIsNotRequiredAndForcedCrossTileSyncBeforeExecWhenApiRequiresCleanupSectionThenDoNotAddPipeControlAndAddCrossTileSyncAndCleanupSection) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; - using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using MI_STORE_DATA_IMM = typename FamilyType::MI_STORE_DATA_IMM; using MI_ATOMIC = typename FamilyType::MI_ATOMIC; using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; @@ -959,7 +950,6 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, givenPipeControlIsNotRequiredAndForcedCleanupSectionWhenApiNotRequiresCleanupSectionThenDoNotAddPipeControlAndCrossTileSyncAndAddCleanupSection) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; - using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using MI_STORE_DATA_IMM = typename FamilyType::MI_STORE_DATA_IMM; using MI_ATOMIC = typename FamilyType::MI_ATOMIC; using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; diff --git a/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp b/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp index 4abd9e42fd..6d54bd574f 100644 --- a/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp +++ b/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp @@ -247,7 +247,6 @@ HWTEST_F(BlitTests, givenDebugVariableWhenDispatchingPostBlitsCommandThenUseCorr HWTEST_F(BlitTests, givenMemoryWhenFillPatternWithBlitThenCommandIsProgrammed) { using XY_COLOR_BLT = typename FamilyType::XY_COLOR_BLT; - using COLOR_DEPTH = typename XY_COLOR_BLT::COLOR_DEPTH; uint32_t pattern[4] = {1, 0, 0, 0}; uint32_t streamBuffer[100] = {}; LinearStream stream(streamBuffer, sizeof(streamBuffer)); @@ -264,7 +263,6 @@ HWTEST_F(BlitTests, givenMemoryWhenFillPatternWithBlitThenCommandIsProgrammed) { HWTEST_F(BlitTests, givenMemorySizeBiggerThanMaxWidthButLessThanTwiceMaxWidthWhenFillPatternWithBlitThenHeightIsOne) { using XY_COLOR_BLT = typename FamilyType::XY_COLOR_BLT; - using COLOR_DEPTH = typename XY_COLOR_BLT::COLOR_DEPTH; uint32_t pattern[4] = {1, 0, 0, 0}; uint32_t streamBuffer[100] = {}; LinearStream stream(streamBuffer, sizeof(streamBuffer)); @@ -286,7 +284,6 @@ HWTEST_F(BlitTests, givenMemorySizeBiggerThanMaxWidthButLessThanTwiceMaxWidthWhe HWTEST_F(BlitTests, givenMemoryPointerOffsetVerifyCorrectDestinationBaseAddress) { using XY_COLOR_BLT = typename FamilyType::XY_COLOR_BLT; - using COLOR_DEPTH = typename XY_COLOR_BLT::COLOR_DEPTH; uint32_t pattern[4] = {5, 0, 0, 0}; uint32_t streamBuffer[100] = {}; LinearStream stream(streamBuffer, sizeof(streamBuffer)); @@ -307,7 +304,6 @@ HWTEST_F(BlitTests, givenMemoryPointerOffsetVerifyCorrectDestinationBaseAddress) HWTEST_F(BlitTests, givenMemorySizeTwiceBiggerThanMaxWidthWhenFillPatternWithBlitThenHeightIsTwo) { using XY_COLOR_BLT = typename FamilyType::XY_COLOR_BLT; - using COLOR_DEPTH = typename XY_COLOR_BLT::COLOR_DEPTH; HardwareInfo *hwInfo = pDevice->getRootDeviceEnvironment().getMutableHardwareInfo(); hwInfo->capabilityTable.blitterOperationsSupported = true; @@ -335,7 +331,6 @@ HWTEST_F(BlitTests, givenMemorySizeTwiceBiggerThanMaxWidthWhenFillPatternWithBli HWTEST_F(BlitTests, givenMemorySizeIsLessThanTwicenMaxWidthWhenFillPatternWithBlitThenHeightIsOne) { using XY_COLOR_BLT = typename FamilyType::XY_COLOR_BLT; - using COLOR_DEPTH = typename XY_COLOR_BLT::COLOR_DEPTH; HardwareInfo *hwInfo = pDevice->getRootDeviceEnvironment().getMutableHardwareInfo(); hwInfo->capabilityTable.blitterOperationsSupported = true; @@ -373,7 +368,6 @@ using BlitColor = IsWithinProducts; HWTEST2_F(BlitTests, givenMemoryWhenFillPatternSizeIs4BytesThen32BitMaskISSetCorrectly, BlitColor) { using XY_COLOR_BLT = typename FamilyType::XY_COLOR_BLT; - using COLOR_DEPTH = typename XY_COLOR_BLT::COLOR_DEPTH; uint32_t pattern = 1; uint32_t streamBuffer[100] = {}; LinearStream stream(streamBuffer, sizeof(streamBuffer)); @@ -507,7 +501,6 @@ HWTEST2_F(BlitTests, givenMemoryAndImageWhenDispatchCopyImageCallThenCommandAdde } HWTEST2_F(BlitTests, whenPrintImageBlitBlockCopyCommandIsCalledThenCmdDetailsAreNotPrintedToStdOutput, BlitPlatforms) { - using XY_BLOCK_COPY_BLT = typename FamilyType::XY_BLOCK_COPY_BLT; auto bltCmd = FamilyType::cmdInitXyBlockCopyBlt; testing::internal::CaptureStdout(); @@ -625,7 +618,6 @@ HWTEST2_F(BlitTests, givenPlatformWhenCallingPreBlitCommandWARequiredThenReturns } HWTEST2_F(BlitTests, givenPlatformWhenCallingEstimatePreBlitCommandSizeThenZeroIsReturned, WithoutGen12Lp) { - using MI_FLUSH_DW = typename FamilyType::MI_FLUSH_DW; EXPECT_EQ(0u, BlitCommandsHelper::estimatePreBlitCommandSize()); } diff --git a/shared/test/unit_test/helpers/gfx_core_helper_tests_dg2_and_later.cpp b/shared/test/unit_test/helpers/gfx_core_helper_tests_dg2_and_later.cpp index 136a3c9ef2..f5c3e37854 100644 --- a/shared/test/unit_test/helpers/gfx_core_helper_tests_dg2_and_later.cpp +++ b/shared/test/unit_test/helpers/gfx_core_helper_tests_dg2_and_later.cpp @@ -24,7 +24,6 @@ using GfxCoreHelperDg2AndLaterTest = ::testing::Test; HWTEST2_F(GfxCoreHelperDg2AndLaterTest, GivenUseL1CacheAsTrueWhenCallSetL1CachePolicyThenL1CachePolicyL1CacheControlIsSetProperly, IsAtLeastXeHpgCore) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; - using SURFACE_TYPE = typename RENDER_SURFACE_STATE::SURFACE_TYPE; MockExecutionEnvironment mockExecutionEnvironment{}; auto &gfxCoreHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper(); @@ -41,7 +40,6 @@ HWTEST2_F(GfxCoreHelperDg2AndLaterTest, GivenOverrideL1CacheControlInSurfaceStat debugManager.flags.OverrideL1CacheControlInSurfaceStateForScratchSpace.set(1); using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; - using SURFACE_TYPE = typename RENDER_SURFACE_STATE::SURFACE_TYPE; MockExecutionEnvironment mockExecutionEnvironment{}; auto &gfxCoreHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper(); auto &helper = reinterpret_cast &>(gfxCoreHelper); @@ -54,7 +52,6 @@ HWTEST2_F(GfxCoreHelperDg2AndLaterTest, GivenOverrideL1CacheControlInSurfaceStat HWTEST2_F(GfxCoreHelperDg2AndLaterTest, GivenUseL1CacheAsFalseWhenCallSetL1CachePolicyThenL1CachePolicyL1CacheControlIsNotSet, IsAtLeastXeHpgCore) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; - using SURFACE_TYPE = typename RENDER_SURFACE_STATE::SURFACE_TYPE; MockExecutionEnvironment mockExecutionEnvironment{}; auto &gfxCoreHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper(); auto &helper = reinterpret_cast &>(gfxCoreHelper); @@ -142,7 +139,6 @@ HWTEST2_F(PipeControlHelperTestsDg2AndLater, WhenAddingPipeControlWAThenCorrectC } HWTEST2_F(PipeControlHelperTestsDg2AndLater, WhenSettingExtraPipeControlPropertiesThenCorrectValuesAreSet, IsAtLeastXeHpgCore) { - using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; PipeControlArgs args{}; MemorySynchronizationCommands::setPostSyncExtraProperties(args); diff --git a/shared/test/unit_test/helpers/state_base_address_tests.cpp b/shared/test/unit_test/helpers/state_base_address_tests.cpp index e57e69f5c5..7335f4da39 100644 --- a/shared/test/unit_test/helpers/state_base_address_tests.cpp +++ b/shared/test/unit_test/helpers/state_base_address_tests.cpp @@ -281,7 +281,6 @@ HWTEST2_F(SbaTest, givenStateBaseAddressAndDebugFlagSetWhenAppendExtraCacheSetti } HWTEST2_F(SbaTest, givenStateBaseAddressAndDebugFlagSetWhenAppendExtraCacheSettingsThenProgramCorrectL1CachePolicy, IsAtLeastXeHpgCore) { - using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS; auto stateBaseAddress = FamilyType::cmdInitStateBaseAddress; StateBaseAddressHelperArgs args = createSbaHelperArgs(&stateBaseAddress, pDevice->getGmmHelper(), &ssh, nullptr, nullptr); diff --git a/shared/test/unit_test/helpers/test_blit_commands_helper_xehp_and_later.cpp b/shared/test/unit_test/helpers/test_blit_commands_helper_xehp_and_later.cpp index 48c5b827df..2137373515 100644 --- a/shared/test/unit_test/helpers/test_blit_commands_helper_xehp_and_later.cpp +++ b/shared/test/unit_test/helpers/test_blit_commands_helper_xehp_and_later.cpp @@ -87,7 +87,6 @@ HWTEST2_F(BlitTests, givenGmmWithEnabledCompresionWhenAppendBlitCommandsForFillB } HWTEST2_F(BlitTests, givenGmmWithEnabledCompresionWhenAppendBlitCommandsForFillBufferThenSetCompressionFormat, BlitPlatforms) { - using XY_COLOR_BLT = typename FamilyType::XY_COLOR_BLT; auto blitCmd = FamilyType::cmdInitXyColorBlt; auto gmmContext = pDevice->getGmmHelper(); @@ -105,7 +104,6 @@ HWTEST2_F(BlitTests, givenGmmWithEnabledCompresionWhenAppendBlitCommandsForFillB HWTEST2_F(BlitTests, givenGmmWithEnabledCompresionAndDebugFlagSetWhenAppendBlitCommandsForFillBufferThenSetCompressionFormat, BlitPlatforms) { DebugManagerStateRestore dbgRestore; - using XY_COLOR_BLT = typename FamilyType::XY_COLOR_BLT; auto blitCmd = FamilyType::cmdInitXyColorBlt; uint32_t newCompressionFormat = 1; @@ -122,7 +120,6 @@ HWTEST2_F(BlitTests, givenGmmWithEnabledCompresionAndDebugFlagSetWhenAppendBlitC } HWTEST2_F(BlitTests, givenOverridedMocksValueWhenAppendBlitCommandsForFillBufferThenDebugMocksValueIsSet, BlitPlatforms) { - using XY_COLOR_BLT = typename FamilyType::XY_COLOR_BLT; DebugManagerStateRestore dbgRestore; uint32_t mockValue = pDevice->getGmmHelper()->getMOCS(GMM_RESOURCE_USAGE_OCL_BUFFER) + 1; @@ -641,7 +638,6 @@ HWTEST2_F(BlitTests, givenDispatchDummyBlitWhenDummyBlitWaNotRequiredThenAdditio } HWTEST2_F(BlitTests, givenDispatchDummyBlitWhenForceDummyBlitWaDisabledThenAdditionalCommandsAreNotProgrammed, IsXeHPOrAbove) { - using XY_COLOR_BLT = typename FamilyType::XY_COLOR_BLT; DebugManagerStateRestore dbgRestore; debugManager.flags.ForceDummyBlitWa.set(0); auto &rootDeviceEnvironment = static_cast(pDevice->getRootDeviceEnvironmentRef()); diff --git a/shared/test/unit_test/os_interface/windows/wddm20_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm20_tests.cpp index a842bb99e7..a54ba1af7e 100644 --- a/shared/test/unit_test/os_interface/windows/wddm20_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm20_tests.cpp @@ -561,11 +561,6 @@ TEST_F(Wddm20Tests, WhenMakingResidentAndEvictingThenReturnIsCorrect) { error = wddm->evict(&allocation.getHandles()[0], allocation.getNumGmms(), sizeToTrim, true); EXPECT_TRUE(error); - auto monitoredFence = osContext->getResidencyController().getMonitoredFence(); - UINT64 fenceValue = 100; - monitoredFence.cpuAddress = &fenceValue; - monitoredFence.currentFenceValue = 101; - error = wddm->destroyAllocation(&allocation, osContext.get()); EXPECT_TRUE(error); diff --git a/shared/test/unit_test/os_interface/windows/wddm_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm_tests.cpp index d41d81a3fe..3c0b3f79f0 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_tests.cpp @@ -580,8 +580,6 @@ TEST_F(WddmTests, whenCallingEvictWithNoAllocationsThenDontCallGdi) { } TEST_F(WddmTests, GivenWddmWhenMapGpuVaCalledThenGmmClientCallsMapGpuVa) { - NEO::AllocationData allocData = {}; - allocData.type = NEO::AllocationType::buffer; wddm->callBaseDestroyAllocations = false; wddm->pagingQueue = PAGINGQUEUE_HANDLE; auto memoryManager = std::make_unique(*executionEnvironment); diff --git a/shared/test/unit_test/xe_hpc_core/compute_mode_tests_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/compute_mode_tests_xe_hpc_core.cpp index 04bbf1e820..eeda181cee 100644 --- a/shared/test/unit_test/xe_hpc_core/compute_mode_tests_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/compute_mode_tests_xe_hpc_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -324,7 +324,6 @@ HWTEST2_F(XeHpcComputeModeRequirements, givenComputeModeProgrammingWhenLargeGrfM HWTEST2_F(XeHpcComputeModeRequirements, givenComputeModeProgrammingWhenRequiredGRFNumberIsLowerThan128ThenSmallGRFModeIsProgrammed, IsXeHpcCore) { setUpImpl(); using STATE_COMPUTE_MODE = typename FamilyType::STATE_COMPUTE_MODE; - using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; auto cmdsSize = sizeof(STATE_COMPUTE_MODE); char buff[1024];