From c870628d087b13b99ea2f8b72b0d0a9cce226ef1 Mon Sep 17 00:00:00 2001 From: "Hoppe, Mateusz" Date: Mon, 28 Jan 2019 13:59:37 +0100 Subject: [PATCH] Rename SHARED_RESOURCE allocation type to SHARED_RESOURCE_COPY Change-Id: Ie846450384730171304788bbb1709d7f088036a8 --- runtime/memory_manager/graphics_allocation.h | 2 +- runtime/memory_manager/memory_manager.cpp | 2 +- runtime/memory_manager/memory_manager.h | 2 +- runtime/os_interface/debug_settings_manager.cpp | 4 ++-- runtime/sharings/d3d/d3d_surface.cpp | 2 +- .../memory_manager_allocate_in_device_pool_tests.cpp | 4 ++-- .../memory_manager_allocate_in_preferred_pool_tests.inl | 2 +- unit_tests/memory_manager/memory_manager_tests.cpp | 4 ++-- unit_tests/os_interface/debug_settings_manager_tests.cpp | 2 +- unit_tests/os_interface/linux/drm_memory_manager_tests.cpp | 4 ++-- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/runtime/memory_manager/graphics_allocation.h b/runtime/memory_manager/graphics_allocation.h index 986e0ba85f..b4998d9a47 100644 --- a/runtime/memory_manager/graphics_allocation.h +++ b/runtime/memory_manager/graphics_allocation.h @@ -62,7 +62,7 @@ class GraphicsAllocation : public IDNode { INDIRECT_OBJECT_HEAP, SURFACE_STATE_HEAP, DYNAMIC_STATE_HEAP, - SHARED_RESOURCE, + SHARED_RESOURCE_COPY, SVM, UNDECIDED, }; diff --git a/runtime/memory_manager/memory_manager.cpp b/runtime/memory_manager/memory_manager.cpp index 0c652f9afe..ae105b779d 100644 --- a/runtime/memory_manager/memory_manager.cpp +++ b/runtime/memory_manager/memory_manager.cpp @@ -310,7 +310,7 @@ GraphicsAllocation *MemoryManager::allocateGraphicsMemoryInPreferredPool(Allocat } GraphicsAllocation *MemoryManager::allocateGraphicsMemory(const AllocationData &allocationData) { - if (allocationData.type == GraphicsAllocation::AllocationType::IMAGE || allocationData.type == GraphicsAllocation::AllocationType::SHARED_RESOURCE) { + if (allocationData.type == GraphicsAllocation::AllocationType::IMAGE || allocationData.type == GraphicsAllocation::AllocationType::SHARED_RESOURCE_COPY) { UNRECOVERABLE_IF(allocationData.imgInfo == nullptr); return allocateGraphicsMemoryForImage(allocationData); } diff --git a/runtime/memory_manager/memory_manager.h b/runtime/memory_manager/memory_manager.h index c9f163cdbe..3e2113017b 100644 --- a/runtime/memory_manager/memory_manager.h +++ b/runtime/memory_manager/memory_manager.h @@ -231,7 +231,7 @@ class MemoryManager { status = AllocationStatus::Error; switch (allocationData.type) { case GraphicsAllocation::AllocationType::IMAGE: - case GraphicsAllocation::AllocationType::SHARED_RESOURCE: + case GraphicsAllocation::AllocationType::SHARED_RESOURCE_COPY: break; default: if (!allocationData.flags.useSystemMemory && !(allocationData.flags.allow32Bit && this->force32bitAllocations)) { diff --git a/runtime/os_interface/debug_settings_manager.cpp b/runtime/os_interface/debug_settings_manager.cpp index 259f9a2a2d..ecf22d2956 100644 --- a/runtime/os_interface/debug_settings_manager.cpp +++ b/runtime/os_interface/debug_settings_manager.cpp @@ -313,8 +313,8 @@ const char *DebugSettingsManager::getAllocationTypeString(GraphicsAl return "SURFACE_STATE_HEAP"; case OCLRT::GraphicsAllocation::AllocationType::DYNAMIC_STATE_HEAP: return "DYNAMIC_STATE_HEAP"; - case OCLRT::GraphicsAllocation::AllocationType::SHARED_RESOURCE: - return "SHARED_RESOURCE"; + case OCLRT::GraphicsAllocation::AllocationType::SHARED_RESOURCE_COPY: + return "SHARED_RESOURCE_COPY"; case OCLRT::GraphicsAllocation::AllocationType::SVM: return "SVM"; case OCLRT::GraphicsAllocation::AllocationType::UNDECIDED: diff --git a/runtime/sharings/d3d/d3d_surface.cpp b/runtime/sharings/d3d/d3d_surface.cpp index 535ea87c1f..a868b8ecba 100644 --- a/runtime/sharings/d3d/d3d_surface.cpp +++ b/runtime/sharings/d3d/d3d_surface.cpp @@ -91,7 +91,7 @@ Image *D3DSurface::create(Context *context, cl_dx9_surface_info_khr *surfaceInfo } AllocationProperties allocProperties = MemObjHelper::getAllocationProperties(&imgInfo, true); - allocProperties.allocationType = GraphicsAllocation::AllocationType::SHARED_RESOURCE; + allocProperties.allocationType = GraphicsAllocation::AllocationType::SHARED_RESOURCE_COPY; DevicesBitfield devices = 0; alloc = context->getMemoryManager()->allocateGraphicsMemoryInPreferredPool(allocProperties, devices, nullptr); diff --git a/unit_tests/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp b/unit_tests/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp index 1f6751ad68..fa9fe89eea 100644 --- a/unit_tests/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp +++ b/unit_tests/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp @@ -24,7 +24,7 @@ TEST(MemoryManagerTest, givenNotSetUseSystemMemoryWhenGraphicsAllocationInDevice memoryManager.freeGraphicsMemory(allocation); } -TEST(MemoryManagerTest, givenImageOrSharedResourceWhenGraphicsAllocationInDevicePoolIsAllocatedThenNullptrIsReturned) { +TEST(MemoryManagerTest, givenImageOrSharedResourceCopyWhenGraphicsAllocationInDevicePoolIsAllocatedThenNullptrIsReturned) { ExecutionEnvironment executionEnvironment; OsAgnosticMemoryManager memoryManager(false, false, executionEnvironment); @@ -34,7 +34,7 @@ TEST(MemoryManagerTest, givenImageOrSharedResourceWhenGraphicsAllocationInDevice allocData.flags.allocateMemory = true; GraphicsAllocation::AllocationType types[] = {GraphicsAllocation::AllocationType::IMAGE, - GraphicsAllocation::AllocationType::SHARED_RESOURCE}; + GraphicsAllocation::AllocationType::SHARED_RESOURCE_COPY}; for (uint32_t i = 0; i < arrayCount(types); i++) { allocData.type = types[i]; diff --git a/unit_tests/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl b/unit_tests/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl index b92ce39821..f0d72016e9 100644 --- a/unit_tests/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl +++ b/unit_tests/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl @@ -162,7 +162,7 @@ static const GraphicsAllocation::AllocationType allocationTypesWith32BitAnd64KbP GraphicsAllocation::AllocationType::TIMESTAMP_TAG_BUFFER, GraphicsAllocation::AllocationType::IMAGE, GraphicsAllocation::AllocationType::INSTRUCTION_HEAP, - GraphicsAllocation::AllocationType::SHARED_RESOURCE}; + GraphicsAllocation::AllocationType::SHARED_RESOURCE_COPY}; INSTANTIATE_TEST_CASE_P(Disallow32BitAnd64kbPagesTypes, MemoryManagerGetAlloctionData32BitAnd64kbPagesNotAllowedTest, diff --git a/unit_tests/memory_manager/memory_manager_tests.cpp b/unit_tests/memory_manager/memory_manager_tests.cpp index 5e12bc3853..b88edcf737 100644 --- a/unit_tests/memory_manager/memory_manager_tests.cpp +++ b/unit_tests/memory_manager/memory_manager_tests.cpp @@ -1144,7 +1144,7 @@ TEST(OsAgnosticMemoryManager, givenLocalMemorySupportedAndAubUsageWhenMemoryMana EXPECT_EQ(heap32Base, memoryManager.allocator32Bit->getBase()); } -TEST(MemoryManager, givenSharedResourceWhenAllocatingGraphicsMemoryThenAllocateGraphicsMemoryForImageIsCalled) { +TEST(MemoryManager, givenSharedResourceCopyWhenAllocatingGraphicsMemoryThenAllocateGraphicsMemoryForImageIsCalled) { ExecutionEnvironment executionEnvironment; MockMemoryManager memoryManager(false, true, executionEnvironment); cl_image_desc imgDesc = {}; @@ -1157,7 +1157,7 @@ TEST(MemoryManager, givenSharedResourceWhenAllocatingGraphicsMemoryThenAllocateG MockMemoryManager::AllocationData allocationData; allocationData.imgInfo = &imgInfo; - allocationData.type = GraphicsAllocation::AllocationType::SHARED_RESOURCE; + allocationData.type = GraphicsAllocation::AllocationType::SHARED_RESOURCE_COPY; auto imageAllocation = memoryManager.allocateGraphicsMemory(allocationData); EXPECT_NE(nullptr, imageAllocation); diff --git a/unit_tests/os_interface/debug_settings_manager_tests.cpp b/unit_tests/os_interface/debug_settings_manager_tests.cpp index af50dd01fb..f8d55e7dd5 100644 --- a/unit_tests/os_interface/debug_settings_manager_tests.cpp +++ b/unit_tests/os_interface/debug_settings_manager_tests.cpp @@ -888,7 +888,7 @@ AllocationTypeTestCase allocationTypeValues[] = { {OCLRT::GraphicsAllocation::AllocationType::INDIRECT_OBJECT_HEAP, "INDIRECT_OBJECT_HEAP"}, {OCLRT::GraphicsAllocation::AllocationType::SURFACE_STATE_HEAP, "SURFACE_STATE_HEAP"}, {OCLRT::GraphicsAllocation::AllocationType::DYNAMIC_STATE_HEAP, "DYNAMIC_STATE_HEAP"}, - {OCLRT::GraphicsAllocation::AllocationType::SHARED_RESOURCE, "SHARED_RESOURCE"}, + {OCLRT::GraphicsAllocation::AllocationType::SHARED_RESOURCE_COPY, "SHARED_RESOURCE_COPY"}, {OCLRT::GraphicsAllocation::AllocationType::SVM, "SVM"}, {OCLRT::GraphicsAllocation::AllocationType::UNDECIDED, "UNDECIDED"}}; diff --git a/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp b/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp index c38e79af8f..4403d51dd7 100644 --- a/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp +++ b/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp @@ -3076,7 +3076,7 @@ TEST_F(DrmMemoryManagerTest, givenDisabledHostPtrTrackingWhenAllocateGraphicsMem memoryManager->freeGraphicsMemory(allocation); } -TEST_F(DrmMemoryManagerTest, givenImageOrSharedResourceWhenGraphicsAllocationInDevicePoolIsAllocatedThenNullptrIsReturned) { +TEST_F(DrmMemoryManagerTest, givenImageOrSharedResourceCopyWhenGraphicsAllocationInDevicePoolIsAllocatedThenNullptrIsReturned) { ExecutionEnvironment executionEnvironment; std::unique_ptr memoryManager(new (std::nothrow) TestedDrmMemoryManager(Drm::get(0), false, false, executionEnvironment)); @@ -3086,7 +3086,7 @@ TEST_F(DrmMemoryManagerTest, givenImageOrSharedResourceWhenGraphicsAllocationInD allocData.flags.allocateMemory = true; GraphicsAllocation::AllocationType types[] = {GraphicsAllocation::AllocationType::IMAGE, - GraphicsAllocation::AllocationType::SHARED_RESOURCE}; + GraphicsAllocation::AllocationType::SHARED_RESOURCE_COPY}; for (uint32_t i = 0; i < arrayCount(types); i++) { allocData.type = types[i];