diff --git a/opencl/test/unit_test/gen12lp/gfx_core_helper_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/gfx_core_helper_tests_gen12lp.inl index 4bd4ef4d0b..fdf0099ce6 100644 --- a/opencl/test/unit_test/gen12lp/gfx_core_helper_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/gfx_core_helper_tests_gen12lp.inl @@ -359,7 +359,6 @@ GEN12LPTEST_F(GfxCoreHelperTestGen12Lp, givenAllocationTypeWithCpuAccessRequired AllocationType::globalSurface, AllocationType::internalHeap, AllocationType::linearStream, - AllocationType::pipe, AllocationType::printfSurface, AllocationType::timestampPacketTagBuffer, AllocationType::ringBuffer, diff --git a/shared/source/aub/aub_helper.cpp b/shared/source/aub/aub_helper.cpp index 4a151caf16..036e846f44 100644 --- a/shared/source/aub/aub_helper.cpp +++ b/shared/source/aub/aub_helper.cpp @@ -23,7 +23,6 @@ namespace NEO { bool AubHelper::isOneTimeAubWritableAllocationType(const AllocationType &type) { switch (type) { - case AllocationType::pipe: case AllocationType::constantSurface: case AllocationType::globalSurface: case AllocationType::kernelIsa: diff --git a/shared/source/helpers/app_resource_helper.cpp b/shared/source/helpers/app_resource_helper.cpp index 6b4719813f..ecb99f1f90 100644 --- a/shared/source/helpers/app_resource_helper.cpp +++ b/shared/source/helpers/app_resource_helper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2024 Intel Corporation + * Copyright (C) 2021-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -60,8 +60,6 @@ const char *AppResourceHelper::getResourceTagStr(AllocationType type) { return "MAPALLOC"; case AllocationType::mcs: return "MCS"; - case AllocationType::pipe: - return "PIPE"; case AllocationType::preemption: return "PRMPTION"; case AllocationType::printfSurface: diff --git a/shared/source/memory_manager/allocation_type.h b/shared/source/memory_manager/allocation_type.h index 2acaba9467..7f98cb2312 100644 --- a/shared/source/memory_manager/allocation_type.h +++ b/shared/source/memory_manager/allocation_type.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Intel Corporation + * Copyright (C) 2022-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -30,7 +30,6 @@ enum class AllocationType { linearStream, mapAllocation, mcs, - pipe, preemption, printfSurface, privateSurface, diff --git a/shared/source/memory_manager/graphics_allocation.h b/shared/source/memory_manager/graphics_allocation.h index b4e866b33c..7cb878cd50 100644 --- a/shared/source/memory_manager/graphics_allocation.h +++ b/shared/source/memory_manager/graphics_allocation.h @@ -219,7 +219,6 @@ class GraphicsAllocation : public IDNode, NEO::NonCopyableAn allocationType == AllocationType::globalSurface || allocationType == AllocationType::internalHeap || allocationType == AllocationType::linearStream || - allocationType == AllocationType::pipe || allocationType == AllocationType::printfSurface || allocationType == AllocationType::timestampPacketTagBuffer || allocationType == AllocationType::ringBuffer || diff --git a/shared/source/memory_manager/memory_manager.cpp b/shared/source/memory_manager/memory_manager.cpp index f3447c7056..4ea1f1b8d1 100644 --- a/shared/source/memory_manager/memory_manager.cpp +++ b/shared/source/memory_manager/memory_manager.cpp @@ -530,7 +530,6 @@ bool MemoryManager::getAllocationData(AllocationData &allocationData, const Allo case AllocationType::bufferHostMemory: case AllocationType::constantSurface: case AllocationType::globalSurface: - case AllocationType::pipe: case AllocationType::printfSurface: case AllocationType::privateSurface: case AllocationType::scratchSurface: @@ -570,7 +569,6 @@ bool MemoryManager::getAllocationData(AllocationData &allocationData, const Allo case AllocationType::globalSurface: case AllocationType::image: case AllocationType::mapAllocation: - case AllocationType::pipe: case AllocationType::sharedBuffer: case AllocationType::sharedImage: case AllocationType::sharedResourceCopy: @@ -909,7 +907,6 @@ bool MemoryManager::isExternalAllocation(AllocationType allocationType) { allocationType == AllocationType::fillPattern || allocationType == AllocationType::image || allocationType == AllocationType::mapAllocation || - allocationType == AllocationType::pipe || allocationType == AllocationType::sharedBuffer || allocationType == AllocationType::sharedImage || allocationType == AllocationType::sharedResourceCopy || diff --git a/shared/source/utilities/logger.cpp b/shared/source/utilities/logger.cpp index 579ed3e744..845a83a7c4 100644 --- a/shared/source/utilities/logger.cpp +++ b/shared/source/utilities/logger.cpp @@ -161,8 +161,6 @@ const char *getAllocationTypeString(GraphicsAllocation const *graphicsAllocation return "MAP_ALLOCATION"; case AllocationType::mcs: return "MCS"; - case AllocationType::pipe: - return "PIPE"; case AllocationType::preemption: return "PREEMPTION"; case AllocationType::printfSurface: diff --git a/shared/test/unit_test/aub/aub_helper_tests.cpp b/shared/test/unit_test/aub/aub_helper_tests.cpp index d7e3473f1b..3ba4b2e760 100644 --- a/shared/test/unit_test/aub/aub_helper_tests.cpp +++ b/shared/test/unit_test/aub/aub_helper_tests.cpp @@ -101,7 +101,6 @@ TEST(AubHelper, givenAllocationTypeWhenAskingIfOneTimeWritableThenReturnCorrectR bool isOneTimeWritable = AubHelper::isOneTimeAubWritableAllocationType(allocType); switch (allocType) { - case AllocationType::pipe: case AllocationType::constantSurface: case AllocationType::globalSurface: case AllocationType::kernelIsa: diff --git a/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp b/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp index 7d204480ea..272428c228 100644 --- a/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp +++ b/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp @@ -745,7 +745,6 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenWriteMe auto gfxAllocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{pDevice->getRootDeviceIndex(), MemoryConstants::pageSize}); const AllocationType onlyOneTimeAubWritableTypes[] = { - AllocationType::pipe, AllocationType::constantSurface, AllocationType::globalSurface, AllocationType::kernelIsa, diff --git a/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp b/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp index 43322767a6..c436d3623f 100644 --- a/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp +++ b/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp @@ -1550,7 +1550,6 @@ HWTEST_F(TbxCommandStreamTests, givenTbxModeWhenPageFaultManagerIsNotAvailableTh } static constexpr std::array onceWritableAllocTypesForTbx{ - AllocationType::pipe, AllocationType::constantSurface, AllocationType::globalSurface, AllocationType::kernelIsa, diff --git a/shared/test/unit_test/helpers/app_resource_tests.cpp b/shared/test/unit_test/helpers/app_resource_tests.cpp index 66452ea182..4a20118d36 100644 --- a/shared/test/unit_test/helpers/app_resource_tests.cpp +++ b/shared/test/unit_test/helpers/app_resource_tests.cpp @@ -73,7 +73,6 @@ AllocationTypeTagTestCase allocationTypeTagValues[static_cast(AllocationTyp {AllocationType::linearStream, "LINRSTRM"}, {AllocationType::mapAllocation, "MAPALLOC"}, {AllocationType::mcs, "MCS"}, - {AllocationType::pipe, "PIPE"}, {AllocationType::preemption, "PRMPTION"}, {AllocationType::printfSurface, "PRNTSRFC"}, {AllocationType::privateSurface, "PRVTSRFC"}, diff --git a/shared/test/unit_test/memory_manager/graphics_allocation_tests.cpp b/shared/test/unit_test/memory_manager/graphics_allocation_tests.cpp index bddee0bcff..9e94324dc7 100644 --- a/shared/test/unit_test/memory_manager/graphics_allocation_tests.cpp +++ b/shared/test/unit_test/memory_manager/graphics_allocation_tests.cpp @@ -154,7 +154,6 @@ TEST(GraphicsAllocationTest, givenAllocationTypeWhenCheckingCpuAccessRequiredThe case AllocationType::globalSurface: case AllocationType::internalHeap: case AllocationType::linearStream: - case AllocationType::pipe: case AllocationType::printfSurface: case AllocationType::timestampPacketTagBuffer: case AllocationType::ringBuffer: diff --git a/shared/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp b/shared/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp index 1cb8900c31..12d37b38ce 100644 --- a/shared/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp +++ b/shared/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp @@ -229,7 +229,6 @@ TEST_P(MemoryManagerGetAlloctionData32BitAnd64kbPagesNotAllowedTest, givenAlloca static const AllocationType allocationTypesWith32BitAnd64KbPagesAllowed[] = {AllocationType::buffer, AllocationType::bufferHostMemory, - AllocationType::pipe, AllocationType::scratchSurface, AllocationType::workPartitionSurface, AllocationType::privateSurface, @@ -585,14 +584,6 @@ TEST(MemoryManagerTest, givenMCSTypeWhenGetAllocationDataIsCalledThenSystemMemor EXPECT_TRUE(allocData.flags.useSystemMemory); } -TEST(MemoryManagerTest, givenPipeTypeWhenGetAllocationDataIsCalledThenSystemMemoryIsNotRequested) { - AllocationData allocData; - MockMemoryManager mockMemoryManager; - AllocationProperties properties{mockRootDeviceIndex, 1, AllocationType::pipe, mockDeviceBitfield}; - mockMemoryManager.getAllocationData(allocData, properties, nullptr, mockMemoryManager.createStorageInfoFromProperties(properties)); - EXPECT_FALSE(allocData.flags.useSystemMemory); -} - TEST(MemoryManagerTest, givenGlobalSurfaceTypeWhenGetAllocationDataIsCalledThenSystemMemoryIsNotRequested) { AllocationData allocData; MockMemoryManager mockMemoryManager; @@ -1337,7 +1328,6 @@ static const AllocationType allocationHaveNotToBeForcedTo48Bit[] = { AllocationType::globalSurface, AllocationType::internalHostMemory, AllocationType::mapAllocation, - AllocationType::pipe, AllocationType::printfSurface, AllocationType::privateSurface, AllocationType::profilingTagBuffer, diff --git a/shared/test/unit_test/memory_manager/memory_manager_tests.cpp b/shared/test/unit_test/memory_manager/memory_manager_tests.cpp index aa99a6ed26..c4bada6587 100644 --- a/shared/test/unit_test/memory_manager/memory_manager_tests.cpp +++ b/shared/test/unit_test/memory_manager/memory_manager_tests.cpp @@ -2533,7 +2533,7 @@ TEST(MemoryManagerTest, givenAllocationTypesThatMayNeedL3FlushWhenCallingGetAllo AllocationType::buffer, AllocationType::bufferHostMemory, AllocationType::externalHostPtr, AllocationType::globalSurface, AllocationType::image, - AllocationType::pipe, AllocationType::sharedImage, + AllocationType::sharedImage, AllocationType::sharedBuffer, AllocationType::sharedResourceCopy, AllocationType::svmZeroCopy, AllocationType::svmGpu, AllocationType::svmCpu, AllocationType::writeCombined, diff --git a/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp index 2b80081896..348bdd2d1f 100644 --- a/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp @@ -3109,7 +3109,6 @@ static const AllocationType allocation57Bit[] = { AllocationType::buffer, AllocationType::constantSurface, AllocationType::globalSurface, - AllocationType::pipe, AllocationType::printfSurface, AllocationType::privateSurface, AllocationType::sharedBuffer, diff --git a/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp index 34297be4d9..2ac4389c37 100644 --- a/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp @@ -271,10 +271,10 @@ HWTEST_TEMPLATED_F(DrmMemoryManagerTest, GivenAllocatePhysicalHostMemoryThenSucc } HWTEST_TEMPLATED_F(DrmMemoryManagerTest, GivenAllocatePhysicalHostMemoryThenSuccessReturnedAndCacheableFlagIsOverriden) { - mock->ioctlExpected.gemWait = 49; - mock->ioctlExpected.gemCreateExt = 49; - mock->ioctlExpected.gemMmapOffset = 49; - mock->ioctlExpected.gemClose = 49; + mock->ioctlExpected.gemWait = static_cast(AllocationType::count); + mock->ioctlExpected.gemCreateExt = static_cast(AllocationType::count); + mock->ioctlExpected.gemMmapOffset = static_cast(AllocationType::count); + mock->ioctlExpected.gemClose = static_cast(AllocationType::count); std::vector regionInfo(1); regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0}; diff --git a/shared/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp index 55bfccf043..11ab303814 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp @@ -577,7 +577,6 @@ TEST_F(WddmMemoryManagerTests, givenTypeWhenCallIsStatelessAccessRequiredThenPro AllocationType::kernelIsaInternal, AllocationType::mapAllocation, AllocationType::mcs, - AllocationType::pipe, AllocationType::preemption, AllocationType::profilingTagBuffer, AllocationType::sharedImage, diff --git a/shared/test/unit_test/utilities/logger_tests.cpp b/shared/test/unit_test/utilities/logger_tests.cpp index 31658f6122..6fe3d991dc 100644 --- a/shared/test/unit_test/utilities/logger_tests.cpp +++ b/shared/test/unit_test/utilities/logger_tests.cpp @@ -447,7 +447,7 @@ TEST(AllocationTypeLogging, givenGraphicsAllocationTypeWhenConvertingToStringThe DebugVariables flags; FullyEnabledFileLogger fileLogger(testFile, flags); - std::array, 41> allocationTypeValues = { + std::array, 40> allocationTypeValues = { {{AllocationType::buffer, "BUFFER"}, {AllocationType::bufferHostMemory, "BUFFER_HOST_MEMORY"}, {AllocationType::commandBuffer, "COMMAND_BUFFER"}, @@ -465,7 +465,6 @@ TEST(AllocationTypeLogging, givenGraphicsAllocationTypeWhenConvertingToStringThe {AllocationType::linearStream, "LINEAR_STREAM"}, {AllocationType::mapAllocation, "MAP_ALLOCATION"}, {AllocationType::mcs, "MCS"}, - {AllocationType::pipe, "PIPE"}, {AllocationType::preemption, "PREEMPTION"}, {AllocationType::printfSurface, "PRINTF_SURFACE"}, {AllocationType::privateSurface, "PRIVATE_SURFACE"},