From 2275f8df0e36394f1c67a166481d1632c8bee365 Mon Sep 17 00:00:00 2001 From: "Dunajski, Bartosz" Date: Mon, 2 Sep 2019 12:49:36 +0200 Subject: [PATCH] Rename CommandMarker to CommandWithoutKernel Change-Id: Ie19c510465a36ea517a79db9eeac5b5993e44c81 Signed-off-by: Dunajski, Bartosz --- runtime/command_queue/enqueue_common.h | 2 +- runtime/helpers/task_information.cpp | 2 +- runtime/helpers/task_information.h | 2 +- unit_tests/event/event_tests.cpp | 8 ++++---- unit_tests/helpers/task_information_tests.cpp | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/runtime/command_queue/enqueue_common.h b/runtime/command_queue/enqueue_common.h index 1145f92285..eb670b74ea 100644 --- a/runtime/command_queue/enqueue_common.h +++ b/runtime/command_queue/enqueue_common.h @@ -755,7 +755,7 @@ void CommandQueueHw::enqueueBlocked( bool storeTimestampPackets = blockedCommandsData && timestampPacketContainer; if (enqueueProperties.operation != EnqueueProperties::Operation::GpuKernel) { - command = std::make_unique(*this, blockedCommandsData); + command = std::make_unique(*this, blockedCommandsData); } else { //store task data in event std::vector allSurfaces; diff --git a/runtime/helpers/task_information.cpp b/runtime/helpers/task_information.cpp index 88a5aa26bd..cee307d165 100644 --- a/runtime/helpers/task_information.cpp +++ b/runtime/helpers/task_information.cpp @@ -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; } diff --git a/runtime/helpers/task_information.h b/runtime/helpers/task_information.h index 261137904d..c317e23302 100644 --- a/runtime/helpers/task_information.h +++ b/runtime/helpers/task_information.h @@ -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; diff --git a/unit_tests/event/event_tests.cpp b/unit_tests/event/event_tests.cpp index 0450d04d6c..bd58098a52 100644 --- a/unit_tests/event/event_tests.cpp +++ b/unit_tests/event/event_tests.cpp @@ -795,7 +795,7 @@ HWTEST_F(InternalsEventTest, givenCpuProfilingPathWhenEnqueuedMarkerThenDontUseT MockEvent *event = new MockEvent(pCmdQ, CL_COMMAND_MARKER, 0, 0); event->setCPUProfilingPath(true); - event->setCommand(std::unique_ptr(new CommandMarker(*pCmdQ))); + event->setCommand(std::unique_ptr(new CommandWithoutKernel(*pCmdQ))); event->submitCommand(false); @@ -838,7 +838,7 @@ HWTEST_F(InternalsEventWithPerfCountersTest, givenCpuProfilingPerfCountersPathWh MockEvent *event = new MockEvent(pCmdQ, CL_COMMAND_MARKER, 0, 0); event->setCPUProfilingPath(true); - event->setCommand(std::unique_ptr(new CommandMarker(*pCmdQ))); + event->setCommand(std::unique_ptr(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(new CommandMarker(*pCmdQ))); + event->setCommand(std::unique_ptr(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(new CommandMarker(*pCmdQ))); + event->setCommand(std::unique_ptr(new CommandWithoutKernel(*pCmdQ))); event->submitCommand(false); EXPECT_EQ(csr.flushStamp->peekStamp(), event->flushStamp->peekStamp()); delete event; diff --git a/unit_tests/helpers/task_information_tests.cpp b/unit_tests/helpers/task_information_tests.cpp index efd38ca846..38078efa68 100644 --- a/unit_tests/helpers/task_information_tests.cpp +++ b/unit_tests/helpers/task_information_tests.cpp @@ -63,7 +63,7 @@ TEST(CommandTest, markerSubmitWithoutTerminateFlagDosntFlushCsr) { MockBuffer buffer; auto initialTaskCount = csr.peekTaskCount(); - std::unique_ptr command(new CommandMarker(*cmdQ)); + std::unique_ptr 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(new CommandMarker(*cmdQ)); + std::unique_ptr command(new CommandWithoutKernel(*cmdQ)); CompletionStamp completionStamp = command->submit(20, true); auto submitTaskCount = csr.peekTaskCount();