From 0884a341c85dfd58b974d3c02c3b81a892e8838d Mon Sep 17 00:00:00 2001 From: "Jablonski, Mateusz" Date: Fri, 13 Mar 2020 09:17:01 +0100 Subject: [PATCH] Add missing override keywords Change-Id: I30c82d2b0007d745d54c3bbc160e17b420193f3b Signed-off-by: Jablonski, Mateusz --- .../command_queue/command_enqueue_fixture.h | 4 ++-- .../aub_command_stream_fixture.h | 2 +- .../aub_tests/fixtures/aub_fixture.h | 4 ++-- .../fixtures/aub_parent_kernel_fixture.h | 4 ++-- .../aub_tests/fixtures/run_kernel_fixture.h | 4 ++-- .../aub_tests/fixtures/simple_arg_fixture.h | 4 ++-- .../command_queue/command_enqueue_fixture.h | 6 +++--- .../enqueue_fill_buffer_fixture.h | 10 +++------ .../tbx_command_stream_fixture.h | 4 ++-- opencl/test/unit_test/event/event_fixture.h | 8 +++---- .../unit_test/fixtures/hello_world_fixture.h | 4 ++-- .../fixtures/hello_world_kernel_fixture.h | 2 +- .../fixtures/simple_arg_kernel_fixture.h | 8 +++---- .../kernel/kernel_arg_buffer_fixture.h | 21 +++++++------------ .../mocks/linux/mock_drm_memory_manager.h | 2 +- opencl/test/unit_test/mocks/mock_aub_csr.h | 10 ++++----- .../mocks/mock_block_kernel_manager.h | 1 - opencl/test/unit_test/mocks/mock_cif.h | 2 -- opencl/test/unit_test/mocks/mock_compilers.h | 4 ++-- opencl/test/unit_test/mocks/mock_context.h | 4 ++-- opencl/test/unit_test/mocks/mock_csr.h | 5 +---- .../mocks/mock_deferrable_deletion.h | 4 ++-- .../unit_test/mocks/mock_deferred_deleter.h | 2 +- .../test/unit_test/mocks/mock_device_queue.h | 2 +- .../unit_test/mocks/mock_gmm_resource_info.h | 2 +- opencl/test/unit_test/mocks/mock_kernel.h | 4 ++-- .../mocks/mock_memory_operations_handler.h | 9 ++++---- opencl/test/unit_test/mocks/mock_pipe.h | 6 +++--- opencl/test/unit_test/mocks/mock_program.h | 2 +- opencl/test/unit_test/mocks/mock_sip.h | 2 +- .../unit_test/os_interface/linux/drm_mock.h | 2 +- .../unit_test/program/program_with_source.h | 18 +++++++--------- 32 files changed, 73 insertions(+), 93 deletions(-) diff --git a/opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h b/opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h index 96984b74e6..1d909e5013 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h +++ b/opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h @@ -19,12 +19,12 @@ namespace NEO { struct CommandEnqueueAUBFixture : public CommandEnqueueBaseFixture, public AUBCommandStreamFixture { using AUBCommandStreamFixture::SetUp; - void SetUp() { + void SetUp() override { CommandEnqueueBaseFixture::SetUp(cl_command_queue_properties(0)); AUBCommandStreamFixture::SetUp(pCmdQ); } - void TearDown() { + void TearDown() override { AUBCommandStreamFixture::TearDown(); CommandEnqueueBaseFixture::TearDown(); } diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h index 4fa99c6fa0..c299e68fcd 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h @@ -27,7 +27,7 @@ class CommandStreamReceiver; class AUBCommandStreamFixture : public CommandStreamFixture { public: virtual void SetUp(CommandQueue *pCommandQueue); - virtual void TearDown(); + void TearDown() override; template AUBCommandStreamReceiverHw *getAubCsr() const { diff --git a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h index 36e106ad60..bddefdf45a 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h @@ -110,12 +110,12 @@ class AUBFixture : public CommandQueueHwFixture { template struct KernelAUBFixture : public AUBFixture, public KernelFixture { - void SetUp() { + void SetUp() override { AUBFixture::SetUp(nullptr); KernelFixture::SetUp(device.get(), context); } - void TearDown() { + void TearDown() override { KernelFixture::TearDown(); AUBFixture::TearDown(); } diff --git a/opencl/test/unit_test/aub_tests/fixtures/aub_parent_kernel_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/aub_parent_kernel_fixture.h index 732c95ccd8..09268f12a6 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/aub_parent_kernel_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/aub_parent_kernel_fixture.h @@ -19,7 +19,7 @@ class AUBParentKernelFixture : public CommandEnqueueAUBFixture, public: using HelloWorldKernelFixture::SetUp; - void SetUp() { + void SetUp() override { CommandEnqueueAUBFixture::SetUp(); ASSERT_NE(nullptr, pClDevice); if (pClDevice->getHardwareInfo().capabilityTable.clVersionSupport < 20) { @@ -27,7 +27,7 @@ class AUBParentKernelFixture : public CommandEnqueueAUBFixture, } HelloWorldKernelFixture::SetUp(pClDevice, programFile, kernelName, "-cl-std=CL2.0"); } - void TearDown() { + void TearDown() override { if (IsSkipped()) { return; } diff --git a/opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h index 7c111b3be2..5115f03af9 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h @@ -41,11 +41,11 @@ class RunKernelFixture : public CommandEnqueueAUBFixture { RunKernelFixture() { } - virtual void SetUp() { + void SetUp() override { CommandEnqueueAUBFixture::SetUp(); } - virtual void TearDown() { + void TearDown() override { CommandEnqueueAUBFixture::TearDown(); } diff --git a/opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h index 6719435cc9..4b276fcb6e 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h @@ -55,7 +55,7 @@ struct SimpleArgFixture : public FixtureFactory::IndirectHeapFixture, } public: - virtual void SetUp() { + void SetUp() override { DeviceFixture::SetUp(); ASSERT_NE(nullptr, pClDevice); CommandQueueFixture::SetUp(pClDevice, 0); @@ -86,7 +86,7 @@ struct SimpleArgFixture : public FixtureFactory::IndirectHeapFixture, outBuffer->setMemObjectsAllocationWithWritableFlags(true); } - virtual void TearDown() { + void TearDown() override { if (pExpectedMemory) { alignedFree(pExpectedMemory); pExpectedMemory = nullptr; diff --git a/opencl/test/unit_test/command_queue/command_enqueue_fixture.h b/opencl/test/unit_test/command_queue/command_enqueue_fixture.h index 76b180503f..e6f37fb2ad 100644 --- a/opencl/test/unit_test/command_queue/command_enqueue_fixture.h +++ b/opencl/test/unit_test/command_queue/command_enqueue_fixture.h @@ -26,7 +26,7 @@ struct CommandDeviceFixture : public DeviceFixture, CommandQueueHwFixture::SetUp(pClDevice, cmdQueueProperties); } - void TearDown() { + void TearDown() override { CommandQueueHwFixture::TearDown(); DeviceFixture::TearDown(); } @@ -42,7 +42,7 @@ struct CommandEnqueueBaseFixture : CommandDeviceFixture, HardwareParse::SetUp(); } - void TearDown() { + void TearDown() override { HardwareParse::TearDown(); IndirectHeapFixture::TearDown(); CommandDeviceFixture::TearDown(); @@ -56,7 +56,7 @@ struct CommandEnqueueFixture : public CommandEnqueueBaseFixture, CommandStreamFixture::SetUp(pCmdQ); } - void TearDown() { + void TearDown() override { CommandEnqueueBaseFixture::TearDown(); CommandStreamFixture::TearDown(); } diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_fixture.h index bb022af6cc..35b54ee9cd 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_fixture.h @@ -15,11 +15,7 @@ namespace NEO { struct EnqueueFillBufferFixture : public CommandEnqueueFixture { - EnqueueFillBufferFixture() - : buffer(nullptr) { - } - - virtual void SetUp() { + void SetUp() override { CommandEnqueueFixture::SetUp(); BufferDefaults::context = new MockContext; @@ -27,7 +23,7 @@ struct EnqueueFillBufferFixture : public CommandEnqueueFixture { buffer = BufferHelper<>::create(); } - virtual void TearDown() { + void TearDown() override { delete buffer; delete BufferDefaults::context; @@ -44,6 +40,6 @@ struct EnqueueFillBufferFixture : public CommandEnqueueFixture { } MockContext context; - Buffer *buffer; + Buffer *buffer = nullptr; }; } // namespace NEO diff --git a/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.h b/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.h index 54ce8774b2..e09900df0b 100644 --- a/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.h +++ b/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.h @@ -19,10 +19,10 @@ class MockDevice; class TbxCommandStreamFixture : public CommandStreamFixture { public: virtual void SetUp(MockDevice *pDevice); - virtual void TearDown(void); + void TearDown(void) override; CommandStreamReceiver *pCommandStreamReceiver = nullptr; - MemoryManager *memoryManager; + MemoryManager *memoryManager = nullptr; }; } // namespace NEO diff --git a/opencl/test/unit_test/event/event_fixture.h b/opencl/test/unit_test/event/event_fixture.h index bc1540a23f..a54e72aef4 100644 --- a/opencl/test/unit_test/event/event_fixture.h +++ b/opencl/test/unit_test/event/event_fixture.h @@ -53,17 +53,17 @@ struct InternalsEventTest InternalsEventTest() { } - void SetUp() { + void SetUp() override { DeviceFixture::SetUp(); mockContext = new MockContext(pClDevice); } - void TearDown() { + void TearDown() override { delete mockContext; DeviceFixture::TearDown(); } - MockContext *mockContext; + MockContext *mockContext = nullptr; }; struct MyUserEvent : public VirtualEvent { @@ -119,7 +119,7 @@ struct MyEvent : public Event { class MockEventTests : public HelloWorldTest { public: - void TearDown() { + void TearDown() override { uEvent->setStatus(-1); uEvent.reset(); HelloWorldFixture::TearDown(); diff --git a/opencl/test/unit_test/fixtures/hello_world_fixture.h b/opencl/test/unit_test/fixtures/hello_world_fixture.h index 1a9ee29e73..1ae4c0d07b 100644 --- a/opencl/test/unit_test/fixtures/hello_world_fixture.h +++ b/opencl/test/unit_test/fixtures/hello_world_fixture.h @@ -58,7 +58,7 @@ struct HelloWorldFixture : public FixtureFactory::IndirectHeapFixture, } public: - virtual void SetUp() { + void SetUp() override { DeviceFixture::SetUp(); ASSERT_NE(nullptr, pClDevice); CommandQueueFixture::SetUp(pClDevice, 0); @@ -96,7 +96,7 @@ struct HelloWorldFixture : public FixtureFactory::IndirectHeapFixture, pKernel->setArg(1, destBuffer); } - virtual void TearDown() { + void TearDown() override { pCmdQ->flush(); srcBuffer->release(); diff --git a/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h b/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h index 5599fa5a5e..1f80cfd6de 100644 --- a/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h +++ b/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h @@ -85,7 +85,7 @@ struct HelloWorldKernelFixture : public ProgramFixture { EXPECT_EQ(CL_SUCCESS, retVal); } - virtual void TearDown() { + void TearDown() override { delete pKernelName; delete pTestFilename; pKernel->release(); diff --git a/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h b/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h index bd296fa09e..7ac49e2567 100644 --- a/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h +++ b/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h @@ -123,7 +123,7 @@ class SimpleArgKernelFixture : public ProgramFixture { ASSERT_EQ(CL_SUCCESS, retVal); } - virtual void TearDown() { + void TearDown() override { if (pKernel) { delete pKernel; pKernel = nullptr; @@ -177,7 +177,7 @@ class SimpleArgNonUniformKernelFixture : public ProgramFixture { ASSERT_EQ(CL_SUCCESS, retVal); } - virtual void TearDown() { + void TearDown() override { if (kernel) { delete kernel; kernel = nullptr; @@ -230,7 +230,7 @@ class SimpleKernelFixture : public ProgramFixture { } } - virtual void TearDown() { + void TearDown() override { for (size_t i = 0; i < maxKernelsCount; i++) { if (kernels[i]) { kernels[i].reset(nullptr); @@ -283,7 +283,7 @@ class SimpleKernelStatelessFixture : public ProgramFixture { ASSERT_EQ(CL_SUCCESS, retVal); } - void TearDown() { + void TearDown() override { ProgramFixture::TearDown(); } diff --git a/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h b/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h index 877a215c74..10a6363006 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h +++ b/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h @@ -28,19 +28,14 @@ class KernelArgBufferFixture : public ContextFixture, public DeviceFixture { using ContextFixture::SetUp; public: - KernelArgBufferFixture() - : retVal(CL_SUCCESS), pProgram(nullptr), pKernel(nullptr), pKernelInfo(nullptr) { - } - - protected: void SetUp(); - void TearDown(); + void TearDown() override; - cl_int retVal; - MockProgram *pProgram; - MockKernel *pKernel; - std::unique_ptr pKernelInfo; - SKernelBinaryHeaderCommon kernelHeader; - char pSshLocal[64]; - char pCrossThreadData[64]; + cl_int retVal = CL_SUCCESS; + MockProgram *pProgram = nullptr; + MockKernel *pKernel = nullptr; + std::unique_ptr pKernelInfo = nullptr; + SKernelBinaryHeaderCommon kernelHeader{}; + char pSshLocal[64]{}; + char pCrossThreadData[64]{}; }; diff --git a/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h b/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h index b25ba2d7b0..2b4132345a 100644 --- a/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h +++ b/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h @@ -67,6 +67,6 @@ class TestedDrmMemoryManager : public MemoryManagerCreate { void overrideGfxPartition(GfxPartition *newGfxPartition); DrmAllocation *allocate32BitGraphicsMemory(size_t size, const void *ptr, GraphicsAllocation::AllocationType allocationType); - ~TestedDrmMemoryManager(); + ~TestedDrmMemoryManager() override; }; } // namespace NEO diff --git a/opencl/test/unit_test/mocks/mock_aub_csr.h b/opencl/test/unit_test/mocks/mock_aub_csr.h index 8944d1be85..be0df96945 100644 --- a/opencl/test/unit_test/mocks/mock_aub_csr.h +++ b/opencl/test/unit_test/mocks/mock_aub_csr.h @@ -84,7 +84,7 @@ struct MockAubCsr : public AUBCommandStreamReceiverHw { void initProgrammingFlags() override { initProgrammingFlagsCalled = true; } - void initializeEngine() { + void initializeEngine() override { AUBCommandStreamReceiverHw::initializeEngine(); initializeEngineCalled = true; } @@ -106,18 +106,18 @@ struct MockAubCsr : public AUBCommandStreamReceiverHw { AUBCommandStreamReceiverHw::pollForCompletion(); pollForCompletionCalled = true; } - void expectMemoryEqual(void *gfxAddress, const void *srcAddress, size_t length) { + void expectMemoryEqual(void *gfxAddress, const void *srcAddress, size_t length) override { AUBCommandStreamReceiverHw::expectMemoryEqual(gfxAddress, srcAddress, length); expectMemoryEqualCalled = true; } - void expectMemoryNotEqual(void *gfxAddress, const void *srcAddress, size_t length) { + void expectMemoryNotEqual(void *gfxAddress, const void *srcAddress, size_t length) override { AUBCommandStreamReceiverHw::expectMemoryNotEqual(gfxAddress, srcAddress, length); expectMemoryNotEqualCalled = true; } - bool waitForCompletionWithTimeout(bool enableTimeout, int64_t timeoutMicroseconds, uint32_t taskCountToWait) { + bool waitForCompletionWithTimeout(bool enableTimeout, int64_t timeoutMicroseconds, uint32_t taskCountToWait) override { return true; } - void addAubComment(const char *message) { + void addAubComment(const char *message) override { AUBCommandStreamReceiverHw::addAubComment(message); addAubCommentCalled = true; } diff --git a/opencl/test/unit_test/mocks/mock_block_kernel_manager.h b/opencl/test/unit_test/mocks/mock_block_kernel_manager.h index 6fd4b86146..fd1a460e82 100644 --- a/opencl/test/unit_test/mocks/mock_block_kernel_manager.h +++ b/opencl/test/unit_test/mocks/mock_block_kernel_manager.h @@ -13,7 +13,6 @@ namespace NEO { class MockBlockKernelManager : public BlockKernelManager { public: MockBlockKernelManager() = default; - ~MockBlockKernelManager() = default; using BlockKernelManager::blockKernelInfoArray; using BlockKernelManager::blockPrivateSurfaceArray; }; diff --git a/opencl/test/unit_test/mocks/mock_cif.h b/opencl/test/unit_test/mocks/mock_cif.h index 77c656b358..c577755b6f 100644 --- a/opencl/test/unit_test/mocks/mock_cif.h +++ b/opencl/test/unit_test/mocks/mock_cif.h @@ -94,8 +94,6 @@ struct MockCIFMain : MockCIF { static std::map globalCreators; MockCIFMain(); - ~MockCIFMain() { - } CIF::Version_t GetBinaryVersion() const override { return 1; diff --git a/opencl/test/unit_test/mocks/mock_compilers.h b/opencl/test/unit_test/mocks/mock_compilers.h index 4f89b471a5..f8f5879c58 100644 --- a/opencl/test/unit_test/mocks/mock_compilers.h +++ b/opencl/test/unit_test/mocks/mock_compilers.h @@ -118,7 +118,7 @@ struct MockIgcFeaturesAndWorkarounds : MockCIF { using MockCIF::TranslateImpl; MockIgcOclTranslationCtx(); - ~MockIgcOclTranslationCtx(); + ~MockIgcOclTranslationCtx() override; IGC::OclTranslationOutputBase *TranslateImpl( CIF::Version_t outVersion, @@ -237,7 +237,7 @@ struct MockFclOclTranslationCtx : MockCIF { struct MockFclOclDeviceCtx : MockCIF { MockFclOclDeviceCtx(); - ~MockFclOclDeviceCtx(); + ~MockFclOclDeviceCtx() override; static CIF::ICIF *Create(CIF::InterfaceId_t intId, CIF::Version_t version); void SetOclApiVersion(uint32_t version) override { diff --git a/opencl/test/unit_test/mocks/mock_context.h b/opencl/test/unit_test/mocks/mock_context.h index d7490392d0..eb8b9580b3 100644 --- a/opencl/test/unit_test/mocks/mock_context.h +++ b/opencl/test/unit_test/mocks/mock_context.h @@ -25,7 +25,7 @@ class MockContext : public Context { void(CL_CALLBACK *funcNotify)(const char *, const void *, size_t, void *), void *data); MockContext(); - ~MockContext(); + ~MockContext() override; void clearSharingFunctions(); void setSharingFunctions(SharingFunctions *sharingFunctions); @@ -34,6 +34,6 @@ class MockContext : public Context { void registerSharingWithId(SharingFunctions *sharing, SharingType sharingId); private: - ClDevice *device; + ClDevice *device = nullptr; }; } // namespace NEO diff --git a/opencl/test/unit_test/mocks/mock_csr.h b/opencl/test/unit_test/mocks/mock_csr.h index a71efdef51..5f7d1af884 100644 --- a/opencl/test/unit_test/mocks/mock_csr.h +++ b/opencl/test/unit_test/mocks/mock_csr.h @@ -257,16 +257,13 @@ class MockCommandStreamReceiver : public CommandStreamReceiver { bool multiOsContextCapable = false; bool downloadAllocationCalled = false; - ~MockCommandStreamReceiver() { - } - bool waitForCompletionWithTimeout(bool enableTimeout, int64_t timeoutMicroseconds, uint32_t taskCountToWait) override { waitForCompletionWithTimeoutCalled++; return true; } bool flush(BatchBuffer &batchBuffer, ResidencyContainer &allocationsForResidency) override; - bool isMultiOsContextCapable() const { return multiOsContextCapable; } + bool isMultiOsContextCapable() const override { return multiOsContextCapable; } CompletionStamp flushTask( LinearStream &commandStream, diff --git a/opencl/test/unit_test/mocks/mock_deferrable_deletion.h b/opencl/test/unit_test/mocks/mock_deferrable_deletion.h index 5e7487fa8d..50f32a8de0 100644 --- a/opencl/test/unit_test/mocks/mock_deferrable_deletion.h +++ b/opencl/test/unit_test/mocks/mock_deferrable_deletion.h @@ -15,7 +15,7 @@ class MockDeferrableDeletion : public DeferrableDeletion { public: bool apply() override; - virtual ~MockDeferrableDeletion(); + ~MockDeferrableDeletion() override; int applyCalled = 0; }; -} // namespace NEO \ No newline at end of file +} // namespace NEO diff --git a/opencl/test/unit_test/mocks/mock_deferred_deleter.h b/opencl/test/unit_test/mocks/mock_deferred_deleter.h index 58e0d99771..c803d31591 100644 --- a/opencl/test/unit_test/mocks/mock_deferred_deleter.h +++ b/opencl/test/unit_test/mocks/mock_deferred_deleter.h @@ -13,7 +13,7 @@ class MockDeferredDeleter : public DeferredDeleter { public: MockDeferredDeleter(); - ~MockDeferredDeleter(); + ~MockDeferredDeleter() override; void deferDeletion(DeferrableDeletion *deletion) override; diff --git a/opencl/test/unit_test/mocks/mock_device_queue.h b/opencl/test/unit_test/mocks/mock_device_queue.h index 08fd2f2b1a..ca149e0ddf 100644 --- a/opencl/test/unit_test/mocks/mock_device_queue.h +++ b/opencl/test/unit_test/mocks/mock_device_queue.h @@ -99,7 +99,7 @@ class MockDeviceQueueHw : public DeviceQueueHw { setupExpectedCmds(); }; - ~MockDeviceQueueHw() { + ~MockDeviceQueueHw() override { if (expectedCmds.prefetch) delete expectedCmds.prefetch; } diff --git a/opencl/test/unit_test/mocks/mock_gmm_resource_info.h b/opencl/test/unit_test/mocks/mock_gmm_resource_info.h index b6f6b074e6..80b37d346e 100644 --- a/opencl/test/unit_test/mocks/mock_gmm_resource_info.h +++ b/opencl/test/unit_test/mocks/mock_gmm_resource_info.h @@ -22,7 +22,7 @@ struct SurfaceFormatInfo; class MockGmmResourceInfo : public GmmResourceInfo { public: - virtual ~MockGmmResourceInfo(); + ~MockGmmResourceInfo() override; MockGmmResourceInfo(GMM_RESCREATE_PARAMS *resourceCreateParams); diff --git a/opencl/test/unit_test/mocks/mock_kernel.h b/opencl/test/unit_test/mocks/mock_kernel.h index 983b919d78..bf3b1e4fec 100644 --- a/opencl/test/unit_test/mocks/mock_kernel.h +++ b/opencl/test/unit_test/mocks/mock_kernel.h @@ -95,7 +95,7 @@ class MockKernel : public Kernel { : Kernel(programArg, kernelInfoArg, deviceArg, scheduler) { } - ~MockKernel() { + ~MockKernel() override { // prevent double deletion if (Kernel::crossThreadData == mockCrossThreadData.data()) { Kernel::crossThreadData = nullptr; @@ -564,7 +564,7 @@ class MockParentKernel : public Kernel { MockParentKernel(Program *programArg, const KernelInfo &kernelInfoArg, const ClDevice &deviceArg) : Kernel(programArg, kernelInfoArg, deviceArg) { } - ~MockParentKernel() { + ~MockParentKernel() override { delete kernelInfo.patchInfo.executionEnvironment; delete kernelInfo.patchInfo.pAllocateStatelessDefaultDeviceQueueSurface; delete kernelInfo.patchInfo.pAllocateStatelessEventPoolSurface; diff --git a/opencl/test/unit_test/mocks/mock_memory_operations_handler.h b/opencl/test/unit_test/mocks/mock_memory_operations_handler.h index 41af679fbe..89822cdfe7 100644 --- a/opencl/test/unit_test/mocks/mock_memory_operations_handler.h +++ b/opencl/test/unit_test/mocks/mock_memory_operations_handler.h @@ -15,9 +15,8 @@ class GraphicsAllocation; class MockMemoryOperationsHandler : public MemoryOperationsHandler { public: MockMemoryOperationsHandler() {} - virtual ~MockMemoryOperationsHandler() {} - MemoryOperationsStatus makeResident(ArrayRef gfxAllocations) { return MemoryOperationsStatus::UNSUPPORTED; } - MemoryOperationsStatus evict(GraphicsAllocation &gfxAllocation) { return MemoryOperationsStatus::UNSUPPORTED; } - MemoryOperationsStatus isResident(GraphicsAllocation &gfxAllocation) { return MemoryOperationsStatus::UNSUPPORTED; } + MemoryOperationsStatus makeResident(ArrayRef gfxAllocations) override { return MemoryOperationsStatus::UNSUPPORTED; } + MemoryOperationsStatus evict(GraphicsAllocation &gfxAllocation) override { return MemoryOperationsStatus::UNSUPPORTED; } + MemoryOperationsStatus isResident(GraphicsAllocation &gfxAllocation) override { return MemoryOperationsStatus::UNSUPPORTED; } }; -} // namespace NEO \ No newline at end of file +} // namespace NEO diff --git a/opencl/test/unit_test/mocks/mock_pipe.h b/opencl/test/unit_test/mocks/mock_pipe.h index bab4b228fd..6c5586f0d7 100644 --- a/opencl/test/unit_test/mocks/mock_pipe.h +++ b/opencl/test/unit_test/mocks/mock_pipe.h @@ -21,15 +21,15 @@ class MockPipeStorage { MockPipeStorage(bool unaligned) { mockGfxAllocation = new MockGraphicsAllocation(alignUp(&data, 4), sizeof(data) / 2); } - char data[256]; - MockGraphicsAllocation *mockGfxAllocation; + char data[256]{}; + MockGraphicsAllocation *mockGfxAllocation = nullptr; }; class MockPipe : public MockPipeStorage, public Pipe { public: MockPipe(Context *context) : MockPipeStorage(), Pipe(context, 0, 1, 128, nullptr, &data, mockGfxAllocation) { } - ~MockPipe() { + ~MockPipe() override { if (!getContext()) { delete mockGfxAllocation; } diff --git a/opencl/test/unit_test/mocks/mock_program.h b/opencl/test/unit_test/mocks/mock_program.h index 3f1dcba136..7213ab6677 100644 --- a/opencl/test/unit_test/mocks/mock_program.h +++ b/opencl/test/unit_test/mocks/mock_program.h @@ -68,7 +68,7 @@ class MockProgram : public Program { MockProgram(T &&... args) : Program(std::forward(args)...) { } - ~MockProgram() { + ~MockProgram() override { if (contextSet) context = nullptr; } diff --git a/opencl/test/unit_test/mocks/mock_sip.h b/opencl/test/unit_test/mocks/mock_sip.h index dbc37a2bb8..422d8ebd03 100644 --- a/opencl/test/unit_test/mocks/mock_sip.h +++ b/opencl/test/unit_test/mocks/mock_sip.h @@ -24,7 +24,7 @@ class MockSipKernel : public SipKernel { MockSipKernel(SipKernelType type, Program *sipProgram); MockSipKernel(); - ~MockSipKernel(); + ~MockSipKernel() override; static std::vector dummyBinaryForSip; static std::vector getDummyGenBinary(); diff --git a/opencl/test/unit_test/os_interface/linux/drm_mock.h b/opencl/test/unit_test/os_interface/linux/drm_mock.h index 91da66a23b..fc8ef9dc93 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_mock.h +++ b/opencl/test/unit_test/os_interface/linux/drm_mock.h @@ -38,7 +38,7 @@ class DrmMock : public Drm { } DrmMock() : DrmMock(*platform()->peekExecutionEnvironment()->rootDeviceEnvironments[0]) {} - ~DrmMock() { + ~DrmMock() override { if (sysFsDefaultGpuPathToRestore != nullptr) { sysFsDefaultGpuPath = sysFsDefaultGpuPathToRestore; } diff --git a/opencl/test/unit_test/program/program_with_source.h b/opencl/test/unit_test/program/program_with_source.h index 0e861615ea..6cf7d3b698 100644 --- a/opencl/test/unit_test/program/program_with_source.h +++ b/opencl/test/unit_test/program/program_with_source.h @@ -30,11 +30,7 @@ class ProgramFromSourceTest : public ContextFixture, using PlatformFixture::SetUp; protected: - ProgramFromSourceTest() - : kbHelper(nullptr), SourceFileName(nullptr), KernelName(nullptr), retVal(CL_SUCCESS) { - } - - virtual void SetUp() { + void SetUp() override { std::tie(SourceFileName, BinaryFileName, KernelName) = GetParam(); kbHelper = new KernelBinaryHelper(BinaryFileName); @@ -49,7 +45,7 @@ class ProgramFromSourceTest : public ContextFixture, SourceFileName); } - virtual void TearDown() { + void TearDown() override { knownSource.reset(); ProgramFixture::TearDown(); ContextFixture::TearDown(); @@ -57,10 +53,10 @@ class ProgramFromSourceTest : public ContextFixture, delete kbHelper; } - KernelBinaryHelper *kbHelper; - const char *SourceFileName; - const char *BinaryFileName; - const char *KernelName; - cl_int retVal; + KernelBinaryHelper *kbHelper = nullptr; + const char *SourceFileName = nullptr; + const char *BinaryFileName = nullptr; + const char *KernelName = nullptr; + cl_int retVal = CL_SUCCESS; }; } // namespace NEO