Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor enqueueHandler cleanup

Browse Source 
Change-Id: I07b2d0571b91b797b7a20ec29bb4cf1496b84f96
Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>
This commit is contained in:
Dunajski, Bartosz
2019-08-02 15:56:28 +02:00
committed by sys_ocldev
parent bee2150c45
commit e88371ceff
10 changed files with 47 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
unit_tests/command_queue/dispatch_walker_tests.cpp
View File

@ -156,7 +156,6 @@ HWTEST_F(DispatchWalkerTest, shouldntChangeCommandStreamMemory) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
EXPECT_EQ(commandStreamBuffer, commandStream.getCpuBase());
@ -204,7 +203,6 @@ HWTEST_F(DispatchWalkerTest, noLocalIdsShouldntCrash) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
EXPECT_EQ(commandStreamBuffer, commandStream.getCpuBase());
@ -234,7 +232,6 @@ HWTEST_F(DispatchWalkerTest, dataParameterWorkDimensionswithDefaultLwsAlgorithm)
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
EXPECT_EQ(dimension, *kernel.workDim);
@ -265,7 +262,6 @@ HWTEST_F(DispatchWalkerTest, dataParameterWorkDimensionswithSquaredLwsAlgorithm)
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
EXPECT_EQ(dimension, *kernel.workDim);
}
@ -294,7 +290,6 @@ HWTEST_F(DispatchWalkerTest, dataParameterWorkDimensionswithNDLwsAlgorithm) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
EXPECT_EQ(dimension, *kernel.workDim);
}
@ -324,7 +319,6 @@ HWTEST_F(DispatchWalkerTest, dataParameterWorkDimensionswithOldLwsAlgorithm) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
EXPECT_EQ(dimension, *kernel.workDim);
}
@ -354,7 +348,6 @@ HWTEST_F(DispatchWalkerTest, dataParameterNumWorkGroups) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
EXPECT_EQ(2u, *kernel.numWorkGroupsX);
@ -386,7 +379,6 @@ HWTEST_F(DispatchWalkerTest, dataParameterNoLocalWorkSizeWithOutComputeND) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
EXPECT_EQ(2u, *kernel.localWorkSizeX);
EXPECT_EQ(5u, *kernel.localWorkSizeY);
@ -417,7 +409,6 @@ HWTEST_F(DispatchWalkerTest, dataParameterNoLocalWorkSizeWithComputeND) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
EXPECT_EQ(2u, *kernel.localWorkSizeX);
EXPECT_EQ(5u, *kernel.localWorkSizeY);
@ -449,7 +440,6 @@ HWTEST_F(DispatchWalkerTest, dataParameterNoLocalWorkSizeWithComputeSquared) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
EXPECT_EQ(2u, *kernel.localWorkSizeX);
EXPECT_EQ(5u, *kernel.localWorkSizeY);
@ -481,7 +471,6 @@ HWTEST_F(DispatchWalkerTest, dataParameterNoLocalWorkSizeWithOutComputeSquaredAn
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
EXPECT_EQ(2u, *kernel.localWorkSizeX);
EXPECT_EQ(5u, *kernel.localWorkSizeY);
@ -511,7 +500,6 @@ HWTEST_F(DispatchWalkerTest, dataParameterLocalWorkSize) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
EXPECT_EQ(1u, *kernel.localWorkSizeX);
EXPECT_EQ(2u, *kernel.localWorkSizeY);
@ -544,7 +532,6 @@ HWTEST_F(DispatchWalkerTest, dataParameterLocalWorkSizes) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
EXPECT_EQ(1u, *kernel.localWorkSizeX);
EXPECT_EQ(2u, *kernel.localWorkSizeY);
@ -581,7 +568,6 @@ HWTEST_F(DispatchWalkerTest, dataParameterLocalWorkSizeForSplitKernel) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
auto dispatchId = 0;
@ -632,7 +618,6 @@ HWTEST_F(DispatchWalkerTest, dataParameterLocalWorkSizesForSplitWalker) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
for (auto &dispatchInfo : multiDispatchInfo) {
@ -684,7 +669,6 @@ HWTEST_F(DispatchWalkerTest, dispatchWalkerDoesntConsumeCommandStreamWhenQueueIs
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
auto &commandStream = pCmdQ->getCS(1024);
@ -719,7 +703,6 @@ HWTEST_F(DispatchWalkerTest, dispatchWalkerShouldGetRequiredHeapSizesFromKernelW
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
Vec3<size_t> localWorkgroupSize(workGroupSize);
@ -746,7 +729,7 @@ HWTEST_F(DispatchWalkerTest, givenBlockedEnqueueWhenObtainingCommandStreamThenAl
CsrDependencies csrDependencies;
EventsRequest eventsRequest(0, nullptr, nullptr);
auto cmdStream = mockCmdQ.template obtainCommandStream<CL_COMMAND_NDRANGE_KERNEL>(csrDependencies, false, false, false, true,
auto cmdStream = mockCmdQ.template obtainCommandStream<CL_COMMAND_NDRANGE_KERNEL>(csrDependencies, false, true,
multiDispatchInfo, eventsRequest, blockedKernelData,
nullptr, 0u);
@ -773,7 +756,6 @@ HWTEST_F(DispatchWalkerTest, dispatchWalkerShouldGetRequiredHeapSizesFromMdiWhen
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
auto expectedSizeDSH = HardwareCommandsHelper<FamilyType>::getTotalSizeRequiredDSH(multiDispatchInfo);
@ -800,7 +782,6 @@ HWTEST_F(DispatchWalkerTest, givenBlockedQueueWhenDispatchWalkerIsCalledThenComm
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
EXPECT_NE(nullptr, blockedCommandsData->commandStream->getGraphicsAllocation());
@ -828,7 +809,6 @@ HWTEST_F(DispatchWalkerTest, givenThereAreAllocationsForReuseWhenDispatchWalkerI
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
EXPECT_TRUE(csr.getInternalAllocationStorage()->getAllocationsForReuse().peekIsEmpty());
@ -852,7 +832,6 @@ HWTEST_F(DispatchWalkerTest, dispatchWalkerWithMultipleDispatchInfo) {
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
for (auto &dispatchInfo : multiDispatchInfo) {
@ -894,7 +873,6 @@ HWCMDTEST_F(IGFX_GEN8_CORE, DispatchWalkerTest, dispatchWalkerWithMultipleDispat
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
auto dshAfterMultiDisptach = indirectHeap.getUsed();
@ -979,7 +957,6 @@ HWCMDTEST_F(IGFX_GEN8_CORE, DispatchWalkerTest, dispatchWalkerWithMultipleDispat
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
HardwareParse hwParser;
@ -1025,7 +1002,6 @@ HWCMDTEST_F(IGFX_GEN8_CORE, DispatchWalkerTest, dispatchWalkerWithMultipleDispat
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
HardwareParse hwParser;
@ -1076,7 +1052,6 @@ HWCMDTEST_F(IGFX_GEN8_CORE, DispatchWalkerTest, dispatchWalkerWithMultipleDispat
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
HardwareParse hwParser;
@ -1129,7 +1104,6 @@ HWTEST_F(DispatchWalkerTest, GivenCacheFlushAfterWalkerDisabledWhenAllocationReq
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
HardwareParse hwParse;
@ -1168,7 +1142,6 @@ HWTEST_F(DispatchWalkerTest, GivenCacheFlushAfterWalkerEnabledWhenWalkerWithTwoK
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
HardwareParse hwParse;
@ -1208,7 +1181,6 @@ HWTEST_F(DispatchWalkerTest, GivenCacheFlushAfterWalkerEnabledWhenTwoWalkersForQ
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
HardwareInterface<FamilyType>::dispatchWalker(
@ -1220,7 +1192,6 @@ HWTEST_F(DispatchWalkerTest, GivenCacheFlushAfterWalkerEnabledWhenTwoWalkersForQ
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
HardwareParse hwParse;
@ -1243,7 +1214,7 @@ HWTEST_F(DispatchWalkerTest, givenMultiDispatchWhenWhitelistedRegisterForCoheren
MockMultiDispatchInfo multiDispatchInfo(std::vector<DispatchInfo *>({&di1, &di2}));
HardwareInterface<FamilyType>::dispatchWalker(*pCmdQ, multiDispatchInfo, CsrDependencies(), nullptr, nullptr, nullptr, nullptr, nullptr,
pDevice->getPreemptionMode(), CL_COMMAND_NDRANGE_KERNEL);
CL_COMMAND_NDRANGE_KERNEL);
hwParser.parseCommands<FamilyType>(cmdStream, 0);
@ -1306,7 +1277,6 @@ HWTEST_F(DispatchWalkerTest, givenKernelWhenAuxToNonAuxWhenTranslationRequiredTh
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
auto sizeUsed = cmdStream.getUsed();
@ -1363,7 +1333,6 @@ HWTEST_F(DispatchWalkerTest, givenKernelWhenNonAuxToAuxWhenTranslationRequiredTh
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
auto sizeUsed = cmdStream.getUsed();

8
unit_tests/execution_model/parent_kernel_dispatch_tests.cpp
View File

@ -53,7 +53,6 @@ HWCMDTEST_P(IGFX_GEN8_CORE, ParentKernelDispatchTest, givenParentKernelWhenQueue
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
size_t dshUsedAfter = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 0u).getUsed();
@ -109,7 +108,6 @@ HWCMDTEST_P(IGFX_GEN8_CORE, ParentKernelDispatchTest, givenParentKernelWhenQueue
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
auto iohUsed = ioh.getUsed();
@ -135,7 +133,6 @@ HWCMDTEST_P(IGFX_GEN8_CORE, ParentKernelDispatchTest, givenParentKernelWhenQueue
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u);
@ -171,7 +168,6 @@ HWCMDTEST_P(IGFX_GEN8_CORE, ParentKernelDispatchTest, givenParentKernelWhenQueue
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
ASSERT_NE(nullptr, blockedCommandsData);
@ -283,7 +279,6 @@ HWCMDTEST_F(IGFX_GEN8_CORE, MockParentKernelDispatch, GivenBlockedQueueWhenParen
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
ASSERT_NE(nullptr, blockedCommandsData);
@ -316,7 +311,6 @@ HWCMDTEST_F(IGFX_GEN8_CORE, MockParentKernelDispatch, GivenParentKernelWhenDispa
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
LinearStream *commandStream = &pCmdQ->getCS(0);
@ -374,7 +368,6 @@ HWCMDTEST_F(IGFX_GEN8_CORE, MockParentKernelDispatch, GivenUsedSSHHeapWhenParent
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
EXPECT_EQ(UnitTestHelper<FamilyType>::getDefaultSshUsage(), ssh.getUsed());
@ -410,7 +403,6 @@ HWCMDTEST_F(IGFX_GEN8_CORE, MockParentKernelDispatch, GivenNotUsedSSHHeapWhenPar
nullptr,
nullptr,
nullptr,
pDevice->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
EXPECT_EQ(bufferMemory, ssh.getCpuBase());

1
unit_tests/execution_model/submit_blocked_parent_kernel_tests.cpp
View File

@ -421,7 +421,6 @@ HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelCommandQueueFixture, givenBlockedCommand
nullptr,
nullptr,
nullptr,
device->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
EXPECT_NE(nullptr, blockedCommandsData);

4
unit_tests/helpers/timestamp_packet_tests.cpp
View File

@ -390,7 +390,6 @@ HWCMDTEST_F(IGFX_GEN8_CORE, TimestampPacketTests, givenTimestampPacketWhenDispat
nullptr,
nullptr,
&timestampPacket,
device->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
HardwareParse hwParser;
@ -435,7 +434,6 @@ HWCMDTEST_F(IGFX_GEN8_CORE, TimestampPacketTests, givenTimestampPacketDisabledWh
nullptr,
nullptr,
&timestampPacket,
device->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
HardwareParse hwParser;
@ -885,7 +883,6 @@ HWTEST_F(TimestampPacketTests, givenTimestampPacketWriteEnabledWhenDispatchingTh
nullptr,
nullptr,
&timestamp7,
device->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
HardwareParse hwParser;
@ -969,7 +966,6 @@ HWTEST_F(TimestampPacketTests, givenTimestampPacketWriteEnabledOnDifferentCSRsFr
nullptr,
nullptr,
&timestamp7,
device->getPreemptionMode(),
CL_COMMAND_NDRANGE_KERNEL);
HardwareParse hwParser;