Skip to content

Commit 45d2386

Browse files
Remove device enqueue part 15
- remove DEVICE_QUEUE_BUFFER Related-To: NEO-6559 Signed-off-by: Katarzyna Cencelewska <[email protected]>
1 parent 7f5ab26 commit 45d2386

File tree

7 files changed

+5
-23
lines changed

7 files changed

+5
-23
lines changed

opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2018-2021 Intel Corporation
2+
* Copyright (C) 2018-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -625,14 +625,6 @@ TEST(MemoryManagerTest, givenWriteCombinedTypeWhenGetAllocationDataIsCalledThenS
625625
EXPECT_FALSE(allocData.flags.useSystemMemory);
626626
}
627627

628-
TEST(MemoryManagerTest, givenDeviceQueueBufferTypeWhenGetAllocationDataIsCalledThenSystemMemoryIsRequested) {
629-
AllocationData allocData;
630-
MockMemoryManager mockMemoryManager;
631-
AllocationProperties properties{mockRootDeviceIndex, 1, GraphicsAllocation::AllocationType::DEVICE_QUEUE_BUFFER, mockDeviceBitfield};
632-
mockMemoryManager.getAllocationData(allocData, properties, nullptr, mockMemoryManager.createStorageInfoFromProperties(properties));
633-
EXPECT_TRUE(allocData.flags.useSystemMemory);
634-
}
635-
636628
TEST(MemoryManagerTest, givenInternalHostMemoryTypeWhenGetAllocationDataIsCalledThenSystemMemoryIsRequested) {
637629
AllocationData allocData;
638630
MockMemoryManager mockMemoryManager;
@@ -1122,7 +1114,6 @@ TEST_P(MemoryManagerGetAlloctionDataHaveNotToBeForcedTo48BitTest, givenAllocatio
11221114

11231115
static const GraphicsAllocation::AllocationType allocationHaveToBeForcedTo48Bit[] = {
11241116
GraphicsAllocation::AllocationType::COMMAND_BUFFER,
1125-
GraphicsAllocation::AllocationType::DEVICE_QUEUE_BUFFER,
11261117
GraphicsAllocation::AllocationType::IMAGE,
11271118
GraphicsAllocation::AllocationType::INDIRECT_OBJECT_HEAP,
11281119
GraphicsAllocation::AllocationType::INSTRUCTION_HEAP,

opencl/test/unit_test/utilities/file_logger_tests.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2019-2021 Intel Corporation
2+
* Copyright (C) 2019-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -903,7 +903,6 @@ AllocationTypeTestCase allocationTypeValues[] = {
903903
{GraphicsAllocation::AllocationType::BUFFER_HOST_MEMORY, "BUFFER_HOST_MEMORY"},
904904
{GraphicsAllocation::AllocationType::COMMAND_BUFFER, "COMMAND_BUFFER"},
905905
{GraphicsAllocation::AllocationType::CONSTANT_SURFACE, "CONSTANT_SURFACE"},
906-
{GraphicsAllocation::AllocationType::DEVICE_QUEUE_BUFFER, "DEVICE_QUEUE_BUFFER"},
907906
{GraphicsAllocation::AllocationType::EXTERNAL_HOST_PTR, "EXTERNAL_HOST_PTR"},
908907
{GraphicsAllocation::AllocationType::FILL_PATTERN, "FILL_PATTERN"},
909908
{GraphicsAllocation::AllocationType::GLOBAL_SURFACE, "GLOBAL_SURFACE"},

shared/source/helpers/app_resource_helper.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021 Intel Corporation
2+
* Copyright (C) 2021-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -32,8 +32,6 @@ const char *AppResourceHelper::getResourceTagStr(GraphicsAllocation::AllocationT
3232
return "CMNDBUFF";
3333
case GraphicsAllocation::AllocationType::CONSTANT_SURFACE:
3434
return "CSNTSRFC";
35-
case GraphicsAllocation::AllocationType::DEVICE_QUEUE_BUFFER:
36-
return "DEVQUEBF";
3735
case GraphicsAllocation::AllocationType::EXTERNAL_HOST_PTR:
3836
return "EXHSTPTR";
3937
case GraphicsAllocation::AllocationType::FILL_PATTERN:

shared/source/memory_manager/graphics_allocation.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ class GraphicsAllocation : public IDNode<GraphicsAllocation> {
5959
BUFFER_HOST_MEMORY,
6060
COMMAND_BUFFER,
6161
CONSTANT_SURFACE,
62-
DEVICE_QUEUE_BUFFER,
6362
EXTERNAL_HOST_PTR,
6463
FILL_PATTERN,
6564
GLOBAL_SURFACE,

shared/source/memory_manager/memory_manager.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,6 @@ bool MemoryManager::getAllocationData(AllocationData &allocationData, const Allo
360360
case GraphicsAllocation::AllocationType::RING_BUFFER:
361361
case GraphicsAllocation::AllocationType::SEMAPHORE_BUFFER:
362362
case GraphicsAllocation::AllocationType::BUFFER_HOST_MEMORY:
363-
case GraphicsAllocation::AllocationType::DEVICE_QUEUE_BUFFER:
364363
case GraphicsAllocation::AllocationType::EXTERNAL_HOST_PTR:
365364
case GraphicsAllocation::AllocationType::FILL_PATTERN:
366365
case GraphicsAllocation::AllocationType::MAP_ALLOCATION:
@@ -387,7 +386,6 @@ bool MemoryManager::getAllocationData(AllocationData &allocationData, const Allo
387386

388387
switch (properties.allocationType) {
389388
case GraphicsAllocation::AllocationType::COMMAND_BUFFER:
390-
case GraphicsAllocation::AllocationType::DEVICE_QUEUE_BUFFER:
391389
case GraphicsAllocation::AllocationType::IMAGE:
392390
case GraphicsAllocation::AllocationType::INDIRECT_OBJECT_HEAP:
393391
case GraphicsAllocation::AllocationType::INSTRUCTION_HEAP:

shared/source/utilities/logger.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2019-2021 Intel Corporation
2+
* Copyright (C) 2019-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -147,8 +147,6 @@ const char *getAllocationTypeString(GraphicsAllocation const *graphicsAllocation
147147
return "COMMAND_BUFFER";
148148
case GraphicsAllocation::AllocationType::CONSTANT_SURFACE:
149149
return "CONSTANT_SURFACE";
150-
case GraphicsAllocation::AllocationType::DEVICE_QUEUE_BUFFER:
151-
return "DEVICE_QUEUE_BUFFER";
152150
case GraphicsAllocation::AllocationType::EXTERNAL_HOST_PTR:
153151
return "EXTERNAL_HOST_PTR";
154152
case GraphicsAllocation::AllocationType::FILL_PATTERN:

shared/test/unit_test/helpers/app_resource_tests.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021 Intel Corporation
2+
* Copyright (C) 2021-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -63,7 +63,6 @@ AllocationTypeTagTestCase allocationTypeTagValues[static_cast<int>(GraphicsAlloc
6363
{GraphicsAllocation::AllocationType::BUFFER_HOST_MEMORY, "BFHSTMEM"},
6464
{GraphicsAllocation::AllocationType::COMMAND_BUFFER, "CMNDBUFF"},
6565
{GraphicsAllocation::AllocationType::CONSTANT_SURFACE, "CSNTSRFC"},
66-
{GraphicsAllocation::AllocationType::DEVICE_QUEUE_BUFFER, "DEVQUEBF"},
6766
{GraphicsAllocation::AllocationType::EXTERNAL_HOST_PTR, "EXHSTPTR"},
6867
{GraphicsAllocation::AllocationType::FILL_PATTERN, "FILPATRN"},
6968
{GraphicsAllocation::AllocationType::GLOBAL_SURFACE, "GLBLSRFC"},

0 commit comments

Comments
 (0)