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

Delete OsContext from FenceData

Browse Source 
This decoupling is needed to move makeResidentResidencyAllocations into
WddmResidencyController, where we have only contextId, not the context itself

Change-Id: I0d79f1dc7a51fa6b1d713deb6e9003aa2b7be1d4
Signed-off-by: Maciej Dziuban <maciej.dziuban@intel.com>
This commit is contained in:
Maciej Dziuban
2018-10-22 16:43:20 +02:00
committed by sys_ocldev
parent 77b00fa749
commit 7fe0a0df06
9 changed files with 55 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
unit_tests/memory_manager/memory_manager_tests.cpp
View File

@@ -1864,11 +1864,11 @@ TEST(ResidencyDataTest, givenTwoOsContextsWhenTheyAreRegistredFromHigherToLowerT
}
TEST(ResidencyDataTest, givenResidencyDataWhenUpdateCompletionDataIsCalledThenItIsProperlyUpdated) {
struct mockResidencyData : public ResidencyData {
using ResidencyData::completionData;
struct MockResidencyData : public ResidencyData {
using ResidencyData::lastFenceValues;
};
mockResidencyData residency;
MockResidencyData residency;
OsContext osContext(nullptr, 0u);
OsContext osContext2(nullptr, 1u);
@@ -1877,25 +1877,20 @@ TEST(ResidencyDataTest, givenResidencyDataWhenUpdateCompletionDataIsCalledThenIt
auto lastFenceValue2 = 23llu;
auto lastFenceValue3 = 373llu;
EXPECT_EQ(0u, residency.completionData.size());
EXPECT_EQ(0u, residency.lastFenceValues.size());
residency.updateCompletionData(lastFenceValue, &osContext);
EXPECT_EQ(1u, residency.completionData.size());
EXPECT_EQ(&osContext, residency.completionData[0].osContext);
EXPECT_EQ(lastFenceValue, residency.completionData[0].lastFence);
residency.updateCompletionData(lastFenceValue, osContext.getContextId());
EXPECT_EQ(1u, residency.lastFenceValues.size());
EXPECT_EQ(lastFenceValue, residency.lastFenceValues[0]);
EXPECT_EQ(lastFenceValue, residency.getFenceValueForContextId(osContext.getContextId()));
EXPECT_EQ(&osContext, residency.getOsContextFromId(0u));
residency.updateCompletionData(lastFenceValue2, &osContext2);
residency.updateCompletionData(lastFenceValue2, osContext2.getContextId());
EXPECT_EQ(2u, residency.completionData.size());
EXPECT_EQ(&osContext2, residency.completionData[1].osContext);
EXPECT_EQ(lastFenceValue2, residency.completionData[1].lastFence);
EXPECT_EQ(2u, residency.lastFenceValues.size());
EXPECT_EQ(lastFenceValue2, residency.lastFenceValues[1]);
EXPECT_EQ(lastFenceValue2, residency.getFenceValueForContextId(osContext2.getContextId()));
EXPECT_EQ(&osContext2, residency.getOsContextFromId(1u));
residency.updateCompletionData(lastFenceValue3, &osContext2);
EXPECT_EQ(lastFenceValue3, residency.completionData[1].lastFence);
residency.updateCompletionData(lastFenceValue3, osContext2.getContextId());
EXPECT_EQ(lastFenceValue3, residency.lastFenceValues[1]);
EXPECT_EQ(lastFenceValue3, residency.getFenceValueForContextId(osContext2.getContextId()));
EXPECT_EQ(&osContext2, residency.getOsContextFromId(1u));
}