intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 06:49:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Correct naming in memadvise flags

Browse Source 
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2022-12-07 12:49:56 +00:00
committed by Compute-Runtime-Automation
parent 1c9f17844b
commit e3ede4bb92
7 changed files with 86 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp
View File

@@ -3856,16 +3856,16 @@ TEST_F(DrmAllocationTests, givenDrmAllocationWhenSetMemAdviseWithCachePolicyIsCa
EXPECT_EQ(CachePolicy::WriteBack, bo.peekCachePolicy());
MemAdviseFlags memAdviseFlags{};
EXPECT_TRUE(memAdviseFlags.cached_memory);
EXPECT_TRUE(memAdviseFlags.cachedMemory);
for (auto cached : {true, false, true}) {
memAdviseFlags.cached_memory = cached;
memAdviseFlags.cachedMemory = cached;
EXPECT_TRUE(allocation.setMemAdvise(&drm, memAdviseFlags));
EXPECT_EQ(cached ? CachePolicy::WriteBack : CachePolicy::Uncached, bo.peekCachePolicy());
EXPECT_EQ(memAdviseFlags.memadvise_flags, allocation.enabledMemAdviseFlags.memadvise_flags);
EXPECT_EQ(memAdviseFlags.allFlags, allocation.enabledMemAdviseFlags.allFlags);
}
}
@@ -4291,7 +4291,7 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenSetMemAdviseIsCalledThenUp
for (auto isCached : {false, true}) {
MemAdviseFlags flags{};
flags.cached_memory = isCached;
flags.cachedMemory = isCached;
EXPECT_TRUE(memoryManager.setMemAdvise(&drmAllocation, flags, rootDeviceIndex));
EXPECT_EQ(isCached ? CachePolicy::WriteBack : CachePolicy::Uncached, bo.peekCachePolicy());

12
shared/test/unit_test/os_interface/linux/drm_with_prelim_tests.cpp
View File

@@ -241,12 +241,12 @@ TEST_F(IoctlHelperPrelimFixture, givenDrmAllocationWhenSetMemAdviseFailsThenDont
allocation.bufferObjects[0] = &bo;
MemAdviseFlags memAdviseFlags{};
memAdviseFlags.non_atomic = 1;
memAdviseFlags.nonAtomic = 1;
allocation.setMemAdvise(drm.get(), memAdviseFlags);
EXPECT_EQ(1u, drm->ioctlCallsCount);
EXPECT_NE(memAdviseFlags.memadvise_flags, allocation.enabledMemAdviseFlags.memadvise_flags);
EXPECT_NE(memAdviseFlags.allFlags, allocation.enabledMemAdviseFlags.allFlags);
}
TEST_F(IoctlHelperPrelimFixture, givenDrmAllocationWhenSetMemAdviseWithNonAtomicIsCalledThenUpdateTheCorrespondingVmAdviceForBufferObject) {
@@ -258,10 +258,10 @@ TEST_F(IoctlHelperPrelimFixture, givenDrmAllocationWhenSetMemAdviseWithNonAtomic
MemAdviseFlags memAdviseFlags{};
for (auto nonAtomic : {true, false}) {
memAdviseFlags.non_atomic = nonAtomic;
memAdviseFlags.nonAtomic = nonAtomic;
EXPECT_TRUE(allocation.setMemAdvise(drm.get(), memAdviseFlags));
EXPECT_EQ(memAdviseFlags.memadvise_flags, allocation.enabledMemAdviseFlags.memadvise_flags);
EXPECT_EQ(memAdviseFlags.allFlags, allocation.enabledMemAdviseFlags.allFlags);
}
EXPECT_EQ(2u, drm->ioctlCallsCount);
}
@@ -275,10 +275,10 @@ TEST_F(IoctlHelperPrelimFixture, givenDrmAllocationWhenSetMemAdviseWithDevicePre
MemAdviseFlags memAdviseFlags{};
for (auto devicePreferredLocation : {true, false}) {
memAdviseFlags.device_preferred_location = devicePreferredLocation;
memAdviseFlags.devicePreferredLocation = devicePreferredLocation;
EXPECT_TRUE(allocation.setMemAdvise(drm.get(), memAdviseFlags));
EXPECT_EQ(memAdviseFlags.memadvise_flags, allocation.enabledMemAdviseFlags.memadvise_flags);
EXPECT_EQ(memAdviseFlags.allFlags, allocation.enabledMemAdviseFlags.allFlags);
}
EXPECT_EQ(2u, drm->ioctlCallsCount);
}