From 4662183cccf75cb4b1077310956fb976b848c8d4 Mon Sep 17 00:00:00 2001 From: "Mrozek, Michal" Date: Tue, 26 May 2020 22:38:48 -0700 Subject: [PATCH] Revert "Move timestamp packet buffer to system memory." This reverts commit 660dae513ed2348d6f7b8c0929ae82a3bb41f209. Change-Id: Ic14ac0edba62d2401fd1258c263ce55568cfb6da --- .../memory_manager_allocate_in_preferred_pool_tests.inl | 4 ++-- shared/source/memory_manager/memory_manager.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl index 235e808af5..375b1c9b2f 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl +++ b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl @@ -566,12 +566,12 @@ TEST(MemoryManagerTest, givenLinearStreamTypeWhenGetAllocationDataIsCalledThenSy EXPECT_TRUE(allocData.flags.requiresCpuAccess); } -TEST(MemoryManagerTest, givenTimestampPacketTagBufferTypeWhenGetAllocationDataIsCalledThenSystemMemoryIsRequestedAndRequireCpuAccess) { +TEST(MemoryManagerTest, givenTimestampPacketTagBufferTypeWhenGetAllocationDataIsCalledThenSystemMemoryIsNotRequestedAndRequireCpuAccess) { AllocationData allocData; MockMemoryManager mockMemoryManager; AllocationProperties properties{0, 1, GraphicsAllocation::AllocationType::TIMESTAMP_PACKET_TAG_BUFFER}; mockMemoryManager.getAllocationData(allocData, properties, nullptr, mockMemoryManager.createStorageInfoFromProperties(properties)); - EXPECT_TRUE(allocData.flags.useSystemMemory); + EXPECT_FALSE(allocData.flags.useSystemMemory); EXPECT_TRUE(allocData.flags.requiresCpuAccess); } diff --git a/shared/source/memory_manager/memory_manager.cpp b/shared/source/memory_manager/memory_manager.cpp index 8ff4843d7c..835b705669 100644 --- a/shared/source/memory_manager/memory_manager.cpp +++ b/shared/source/memory_manager/memory_manager.cpp @@ -295,7 +295,6 @@ bool MemoryManager::getAllocationData(AllocationData &allocationData, const Allo case GraphicsAllocation::AllocationType::TAG_BUFFER: case GraphicsAllocation::AllocationType::GLOBAL_FENCE: case GraphicsAllocation::AllocationType::INTERNAL_HOST_MEMORY: - case GraphicsAllocation::AllocationType::TIMESTAMP_PACKET_TAG_BUFFER: allocationData.flags.useSystemMemory = true; default: break;