Rename SHARED_RESOURCE allocation type to SHARED_RESOURCE_COPY

Change-Id: Ie846450384730171304788bbb1709d7f088036a8

Author: HoppeMateusz

runtime/memory_manager/graphics_allocation.h

@@ -62,7 +62,7 @@ class GraphicsAllocation : public IDNode<GraphicsAllocation> {
         INDIRECT_OBJECT_HEAP,
         SURFACE_STATE_HEAP,
         DYNAMIC_STATE_HEAP,
-        SHARED_RESOURCE,
+        SHARED_RESOURCE_COPY,
         SVM,
         UNDECIDED,
     };

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);
     }

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)) {

runtime/os_interface/debug_settings_manager.cpp

@@ -313,8 +313,8 @@ const char *DebugSettingsManager<DebugLevel>::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:

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);

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];

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,

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);

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"}};
 

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<TestedDrmMemoryManager> 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];