diff --git a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp index 3c71e4822c..9fb837e43c 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -625,14 +625,6 @@ TEST(MemoryManagerTest, givenWriteCombinedTypeWhenGetAllocationDataIsCalledThenS EXPECT_FALSE(allocData.flags.useSystemMemory); } -TEST(MemoryManagerTest, givenDeviceQueueBufferTypeWhenGetAllocationDataIsCalledThenSystemMemoryIsRequested) { - AllocationData allocData; - MockMemoryManager mockMemoryManager; - AllocationProperties properties{mockRootDeviceIndex, 1, GraphicsAllocation::AllocationType::DEVICE_QUEUE_BUFFER, mockDeviceBitfield}; - mockMemoryManager.getAllocationData(allocData, properties, nullptr, mockMemoryManager.createStorageInfoFromProperties(properties)); - EXPECT_TRUE(allocData.flags.useSystemMemory); -} - TEST(MemoryManagerTest, givenInternalHostMemoryTypeWhenGetAllocationDataIsCalledThenSystemMemoryIsRequested) { AllocationData allocData; MockMemoryManager mockMemoryManager; @@ -1122,7 +1114,6 @@ TEST_P(MemoryManagerGetAlloctionDataHaveNotToBeForcedTo48BitTest, givenAllocatio static const GraphicsAllocation::AllocationType allocationHaveToBeForcedTo48Bit[] = { GraphicsAllocation::AllocationType::COMMAND_BUFFER, - GraphicsAllocation::AllocationType::DEVICE_QUEUE_BUFFER, GraphicsAllocation::AllocationType::IMAGE, GraphicsAllocation::AllocationType::INDIRECT_OBJECT_HEAP, GraphicsAllocation::AllocationType::INSTRUCTION_HEAP, diff --git a/opencl/test/unit_test/utilities/file_logger_tests.cpp b/opencl/test/unit_test/utilities/file_logger_tests.cpp index 0aad306a4d..4ff099f494 100644 --- a/opencl/test/unit_test/utilities/file_logger_tests.cpp +++ b/opencl/test/unit_test/utilities/file_logger_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -903,7 +903,6 @@ AllocationTypeTestCase allocationTypeValues[] = { {GraphicsAllocation::AllocationType::BUFFER_HOST_MEMORY, "BUFFER_HOST_MEMORY"}, {GraphicsAllocation::AllocationType::COMMAND_BUFFER, "COMMAND_BUFFER"}, {GraphicsAllocation::AllocationType::CONSTANT_SURFACE, "CONSTANT_SURFACE"}, - {GraphicsAllocation::AllocationType::DEVICE_QUEUE_BUFFER, "DEVICE_QUEUE_BUFFER"}, {GraphicsAllocation::AllocationType::EXTERNAL_HOST_PTR, "EXTERNAL_HOST_PTR"}, {GraphicsAllocation::AllocationType::FILL_PATTERN, "FILL_PATTERN"}, {GraphicsAllocation::AllocationType::GLOBAL_SURFACE, "GLOBAL_SURFACE"}, diff --git a/shared/source/helpers/app_resource_helper.cpp b/shared/source/helpers/app_resource_helper.cpp index d6021778b0..ccabb80540 100644 --- a/shared/source/helpers/app_resource_helper.cpp +++ b/shared/source/helpers/app_resource_helper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -32,8 +32,6 @@ const char *AppResourceHelper::getResourceTagStr(GraphicsAllocation::AllocationT return "CMNDBUFF"; case GraphicsAllocation::AllocationType::CONSTANT_SURFACE: return "CSNTSRFC"; - case GraphicsAllocation::AllocationType::DEVICE_QUEUE_BUFFER: - return "DEVQUEBF"; case GraphicsAllocation::AllocationType::EXTERNAL_HOST_PTR: return "EXHSTPTR"; case GraphicsAllocation::AllocationType::FILL_PATTERN: diff --git a/shared/source/memory_manager/graphics_allocation.h b/shared/source/memory_manager/graphics_allocation.h index 82a71a2fad..b1a0683c32 100644 --- a/shared/source/memory_manager/graphics_allocation.h +++ b/shared/source/memory_manager/graphics_allocation.h @@ -59,7 +59,6 @@ class GraphicsAllocation : public IDNode { BUFFER_HOST_MEMORY, COMMAND_BUFFER, CONSTANT_SURFACE, - DEVICE_QUEUE_BUFFER, EXTERNAL_HOST_PTR, FILL_PATTERN, GLOBAL_SURFACE, diff --git a/shared/source/memory_manager/memory_manager.cpp b/shared/source/memory_manager/memory_manager.cpp index 73386068e7..17b0e4f49a 100644 --- a/shared/source/memory_manager/memory_manager.cpp +++ b/shared/source/memory_manager/memory_manager.cpp @@ -360,7 +360,6 @@ bool MemoryManager::getAllocationData(AllocationData &allocationData, const Allo case GraphicsAllocation::AllocationType::RING_BUFFER: case GraphicsAllocation::AllocationType::SEMAPHORE_BUFFER: case GraphicsAllocation::AllocationType::BUFFER_HOST_MEMORY: - case GraphicsAllocation::AllocationType::DEVICE_QUEUE_BUFFER: case GraphicsAllocation::AllocationType::EXTERNAL_HOST_PTR: case GraphicsAllocation::AllocationType::FILL_PATTERN: case GraphicsAllocation::AllocationType::MAP_ALLOCATION: @@ -387,7 +386,6 @@ bool MemoryManager::getAllocationData(AllocationData &allocationData, const Allo switch (properties.allocationType) { case GraphicsAllocation::AllocationType::COMMAND_BUFFER: - case GraphicsAllocation::AllocationType::DEVICE_QUEUE_BUFFER: case GraphicsAllocation::AllocationType::IMAGE: case GraphicsAllocation::AllocationType::INDIRECT_OBJECT_HEAP: case GraphicsAllocation::AllocationType::INSTRUCTION_HEAP: diff --git a/shared/source/utilities/logger.cpp b/shared/source/utilities/logger.cpp index d10688c74d..b5f5c52efb 100644 --- a/shared/source/utilities/logger.cpp +++ b/shared/source/utilities/logger.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -147,8 +147,6 @@ const char *getAllocationTypeString(GraphicsAllocation const *graphicsAllocation return "COMMAND_BUFFER"; case GraphicsAllocation::AllocationType::CONSTANT_SURFACE: return "CONSTANT_SURFACE"; - case GraphicsAllocation::AllocationType::DEVICE_QUEUE_BUFFER: - return "DEVICE_QUEUE_BUFFER"; case GraphicsAllocation::AllocationType::EXTERNAL_HOST_PTR: return "EXTERNAL_HOST_PTR"; case GraphicsAllocation::AllocationType::FILL_PATTERN: diff --git a/shared/test/unit_test/helpers/app_resource_tests.cpp b/shared/test/unit_test/helpers/app_resource_tests.cpp index 62456fd61c..9fda3087a8 100644 --- a/shared/test/unit_test/helpers/app_resource_tests.cpp +++ b/shared/test/unit_test/helpers/app_resource_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -63,7 +63,6 @@ AllocationTypeTagTestCase allocationTypeTagValues[static_cast(GraphicsAlloc {GraphicsAllocation::AllocationType::BUFFER_HOST_MEMORY, "BFHSTMEM"}, {GraphicsAllocation::AllocationType::COMMAND_BUFFER, "CMNDBUFF"}, {GraphicsAllocation::AllocationType::CONSTANT_SURFACE, "CSNTSRFC"}, - {GraphicsAllocation::AllocationType::DEVICE_QUEUE_BUFFER, "DEVQUEBF"}, {GraphicsAllocation::AllocationType::EXTERNAL_HOST_PTR, "EXHSTPTR"}, {GraphicsAllocation::AllocationType::FILL_PATTERN, "FILPATRN"}, {GraphicsAllocation::AllocationType::GLOBAL_SURFACE, "GLBLSRFC"},