Rename CommandMarker to CommandWithoutKernel

Change-Id: Ie19c510465a36ea517a79db9eeac5b5993e44c81
Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>
This commit is contained in:
Dunajski, Bartosz 2019-09-02 12:49:36 +02:00
parent e7e23cd0b4
commit 2275f8df0e
5 changed files with 9 additions and 9 deletions

View File

@ -755,7 +755,7 @@ void CommandQueueHw<GfxFamily>::enqueueBlocked(
bool storeTimestampPackets = blockedCommandsData && timestampPacketContainer;
if (enqueueProperties.operation != EnqueueProperties::Operation::GpuKernel) {
command = std::make_unique<CommandMarker>(*this, blockedCommandsData);
command = std::make_unique<CommandWithoutKernel>(*this, blockedCommandsData);
} else {
//store task data in event
std::vector<Surface *> allSurfaces;

View File

@ -224,7 +224,7 @@ CompletionStamp &CommandComputeKernel::submit(uint32_t taskLevel, bool terminate
return completionStamp;
}
CompletionStamp &CommandMarker::submit(uint32_t taskLevel, bool terminated) {
CompletionStamp &CommandWithoutKernel::submit(uint32_t taskLevel, bool terminated) {
if (terminated) {
return completionStamp;
}

View File

@ -145,7 +145,7 @@ class CommandComputeKernel : public Command {
PreemptionMode preemptionMode;
};
class CommandMarker : public Command {
class CommandWithoutKernel : public Command {
public:
using Command::Command;
CompletionStamp &submit(uint32_t taskLevel, bool terminated) override;

View File

@ -795,7 +795,7 @@ HWTEST_F(InternalsEventTest, givenCpuProfilingPathWhenEnqueuedMarkerThenDontUseT
MockEvent<Event> *event = new MockEvent<Event>(pCmdQ, CL_COMMAND_MARKER, 0, 0);
event->setCPUProfilingPath(true);
event->setCommand(std::unique_ptr<Command>(new CommandMarker(*pCmdQ)));
event->setCommand(std::unique_ptr<Command>(new CommandWithoutKernel(*pCmdQ)));
event->submitCommand(false);
@ -838,7 +838,7 @@ HWTEST_F(InternalsEventWithPerfCountersTest, givenCpuProfilingPerfCountersPathWh
MockEvent<Event> *event = new MockEvent<Event>(pCmdQ, CL_COMMAND_MARKER, 0, 0);
event->setCPUProfilingPath(true);
event->setCommand(std::unique_ptr<Command>(new CommandMarker(*pCmdQ)));
event->setCommand(std::unique_ptr<Command>(new CommandWithoutKernel(*pCmdQ)));
event->submitCommand(false);
@ -865,7 +865,7 @@ HWTEST_F(InternalsEventWithPerfCountersTest, givenCpuProfilingPerfCountersPathWh
HwTimeStamps *timeStamps = event->getHwTimeStampNode()->tagForCpuAccess;
ASSERT_NE(nullptr, timeStamps);
event->setCommand(std::unique_ptr<Command>(new CommandMarker(*pCmdQ)));
event->setCommand(std::unique_ptr<Command>(new CommandWithoutKernel(*pCmdQ)));
event->submitCommand(false);
@ -1453,7 +1453,7 @@ HWTEST_F(InternalsEventTest, givenCommandWhenSubmitCalledThenUpdateFlushStamp) {
FlushStamp expectedFlushStamp = 0;
EXPECT_EQ(expectedFlushStamp, event->flushStamp->peekStamp());
event->setCommand(std::unique_ptr<Command>(new CommandMarker(*pCmdQ)));
event->setCommand(std::unique_ptr<Command>(new CommandWithoutKernel(*pCmdQ)));
event->submitCommand(false);
EXPECT_EQ(csr.flushStamp->peekStamp(), event->flushStamp->peekStamp());
delete event;

View File

@ -63,7 +63,7 @@ TEST(CommandTest, markerSubmitWithoutTerminateFlagDosntFlushCsr) {
MockBuffer buffer;
auto initialTaskCount = csr.peekTaskCount();
std::unique_ptr<Command> command(new CommandMarker(*cmdQ));
std::unique_ptr<Command> command(new CommandWithoutKernel(*cmdQ));
CompletionStamp completionStamp = command->submit(20, false);
EXPECT_EQ(initialTaskCount, completionStamp.taskCount);
@ -77,7 +77,7 @@ TEST(CommandTest, markerSubmitWithTerminateFlagAbortsFlush) {
MockBuffer buffer;
auto initialTaskCount = csr.peekTaskCount();
std::unique_ptr<Command> command(new CommandMarker(*cmdQ));
std::unique_ptr<Command> command(new CommandWithoutKernel(*cmdQ));
CompletionStamp completionStamp = command->submit(20, true);
auto submitTaskCount = csr.peekTaskCount();