Remove default value for dispatchWalker parameter.

Change-Id: I0676a353a4364339664edc416e36da37a345a4f6
This commit is contained in:
Mrozek, Michal
2018-03-30 11:49:36 +02:00
committed by sys_ocldev
parent 8505658cab
commit 5dc0a7c731
2 changed files with 43 additions and 23 deletions

View File

@@ -149,7 +149,8 @@ HWTEST_F(DispatchWalkerTest, shouldntChangeCommandStreamMemory) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode());
pDevice->getPreemptionMode(),
false);
EXPECT_EQ(commandStreamBuffer, commandStream.getCpuBase());
EXPECT_LT(commandStreamStart, commandStream.getUsed());
@@ -196,7 +197,8 @@ HWTEST_F(DispatchWalkerTest, noLocalIdsShouldntCrash) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode());
pDevice->getPreemptionMode(),
false);
EXPECT_EQ(commandStreamBuffer, commandStream.getCpuBase());
EXPECT_LT(commandStreamStart, commandStream.getUsed());
@@ -224,7 +226,8 @@ HWTEST_F(DispatchWalkerTest, dataParameterWorkDimensionswithDefaultLwsAlgorithm)
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode());
pDevice->getPreemptionMode(),
false);
EXPECT_EQ(dimension, *kernel.workDim);
}
}
@@ -253,7 +256,8 @@ HWTEST_F(DispatchWalkerTest, dataParameterWorkDimensionswithSquaredLwsAlgorithm)
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode());
pDevice->getPreemptionMode(),
false);
EXPECT_EQ(dimension, *kernel.workDim);
}
}
@@ -281,7 +285,8 @@ HWTEST_F(DispatchWalkerTest, dataParameterWorkDimensionswithNDLwsAlgorithm) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode());
pDevice->getPreemptionMode(),
false);
EXPECT_EQ(dimension, *kernel.workDim);
}
}
@@ -310,7 +315,8 @@ HWTEST_F(DispatchWalkerTest, dataParameterWorkDimensionswithOldLwsAlgorithm) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode());
pDevice->getPreemptionMode(),
false);
EXPECT_EQ(dimension, *kernel.workDim);
}
}
@@ -338,7 +344,8 @@ HWTEST_F(DispatchWalkerTest, dataParameterNumWorkGroups) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode());
pDevice->getPreemptionMode(),
false);
EXPECT_EQ(2u, *kernel.numWorkGroupsX);
EXPECT_EQ(5u, *kernel.numWorkGroupsY);
EXPECT_EQ(10u, *kernel.numWorkGroupsZ);
@@ -368,7 +375,8 @@ HWTEST_F(DispatchWalkerTest, dataParameterNoLocalWorkSizeWithOutComputeND) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode());
pDevice->getPreemptionMode(),
false);
EXPECT_EQ(2u, *kernel.localWorkSizeX);
EXPECT_EQ(5u, *kernel.localWorkSizeY);
EXPECT_EQ(1u, *kernel.localWorkSizeZ);
@@ -398,7 +406,8 @@ HWTEST_F(DispatchWalkerTest, dataParameterNoLocalWorkSizeWithComputeND) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode());
pDevice->getPreemptionMode(),
false);
EXPECT_EQ(2u, *kernel.localWorkSizeX);
EXPECT_EQ(5u, *kernel.localWorkSizeY);
EXPECT_EQ(10u, *kernel.localWorkSizeZ);
@@ -429,7 +438,8 @@ HWTEST_F(DispatchWalkerTest, dataParameterNoLocalWorkSizeWithComputeSquared) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode());
pDevice->getPreemptionMode(),
false);
EXPECT_EQ(2u, *kernel.localWorkSizeX);
EXPECT_EQ(5u, *kernel.localWorkSizeY);
EXPECT_EQ(1u, *kernel.localWorkSizeZ);
@@ -460,7 +470,8 @@ HWTEST_F(DispatchWalkerTest, dataParameterNoLocalWorkSizeWithOutComputeSquaredAn
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode());
pDevice->getPreemptionMode(),
false);
EXPECT_EQ(2u, *kernel.localWorkSizeX);
EXPECT_EQ(5u, *kernel.localWorkSizeY);
EXPECT_EQ(1u, *kernel.localWorkSizeZ);
@@ -489,7 +500,8 @@ HWTEST_F(DispatchWalkerTest, dataParameterLocalWorkSize) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode());
pDevice->getPreemptionMode(),
false);
EXPECT_EQ(1u, *kernel.localWorkSizeX);
EXPECT_EQ(2u, *kernel.localWorkSizeY);
EXPECT_EQ(3u, *kernel.localWorkSizeZ);
@@ -521,7 +533,8 @@ HWTEST_F(DispatchWalkerTest, dataParameterLocalWorkSizes) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode());
pDevice->getPreemptionMode(),
false);
EXPECT_EQ(1u, *kernel.localWorkSizeX);
EXPECT_EQ(2u, *kernel.localWorkSizeY);
EXPECT_EQ(3u, *kernel.localWorkSizeZ);
@@ -556,7 +569,8 @@ HWTEST_F(DispatchWalkerTest, dataParameterLocalWorkSizeForSplitKernel) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode());
pDevice->getPreemptionMode(),
false);
auto dispatchId = 0;
for (auto &dispatchInfo : multiDispatchInfo) {
@@ -598,7 +612,8 @@ HWTEST_F(DispatchWalkerTest, dataParameterLocalWorkSizesForSplitWalker) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode());
pDevice->getPreemptionMode(),
false);
auto dispatchId = 0;
for (auto &dispatchInfo : multiDispatchInfo) {
@@ -752,7 +767,8 @@ HWTEST_F(DispatchWalkerTest, dispatchWalkerWithMultipleDispatchInfo) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode());
pDevice->getPreemptionMode(),
false);
for (auto &dispatchInfo : multiDispatchInfo) {
auto &kernel = *dispatchInfo.getKernel();
@@ -792,7 +808,8 @@ HWTEST_F(DispatchWalkerTest, dispatchWalkerWithMultipleDispatchInfoCorrectlyProg
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode());
pDevice->getPreemptionMode(),
false);
auto dshAfterMultiDisptach = indirectHeap.getUsed();
@@ -875,7 +892,8 @@ HWTEST_F(DispatchWalkerTest, dispatchWalkerWithMultipleDispatchInfoCorrectlyProg
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode());
pDevice->getPreemptionMode(),
false);
HardwareParse hwParser;
hwParser.parseCommands<FamilyType>(cmdStream, 0);
@@ -919,7 +937,8 @@ HWTEST_F(DispatchWalkerTest, dispatchWalkerWithMultipleDispatchInfoAndDifferentK
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode());
pDevice->getPreemptionMode(),
false);
HardwareParse hwParser;
hwParser.parseCommands<FamilyType>(cmdStream, 0);
@@ -968,7 +987,8 @@ HWTEST_F(DispatchWalkerTest, dispatchWalkerWithMultipleDispatchInfoButSameKernel
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode());
pDevice->getPreemptionMode(),
false);
HardwareParse hwParser;
hwParser.parseCommands<FamilyType>(cmdStream, 0);
@@ -1010,7 +1030,7 @@ HWTEST_F(DispatchWalkerTest, givenMultiDispatchWhenWhitelistedRegisterForCoheren
DispatchInfo di2(&kernel, 1, Vec3<size_t>(1, 1, 1), Vec3<size_t>(1, 1, 1), Vec3<size_t>(0, 0, 0));
MockMultiDispatchInfo multiDispatchInfo(std::vector<DispatchInfo *>({&di1, &di2}));
dispatchWalker<FamilyType>(*pCmdQ, multiDispatchInfo, 0, nullptr, nullptr, nullptr, nullptr, pDevice->getPreemptionMode());
dispatchWalker<FamilyType>(*pCmdQ, multiDispatchInfo, 0, nullptr, nullptr, nullptr, nullptr, pDevice->getPreemptionMode(), false);
hwParser.parseCommands<FamilyType>(cmdStream, 0);