From 786cd28f2b9654d6acd89d85853cae8cb23a1169 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Mon, 18 May 2020 12:05:00 +0200 Subject: [PATCH] Remove not needed pragmas -Winconsistent-missing-override from OCL ULT Change-Id: Id8a67e33ed7191ba0acd2bb9b80336b6bb72b13a Signed-off-by: Mateusz Jablonski --- .../unit_test/helpers/kmd_notify_tests.cpp | 8 ------- opencl/test/unit_test/mocks/mock_aub_csr.h | 11 +--------- .../unit_test/mocks/mock_aub_file_stream.h | 11 +--------- opencl/test/unit_test/mocks/mock_csr.h | 22 +++++++------------ .../mocks/mock_gmm_page_table_mngr.h | 13 ++--------- .../unit_test/mocks/mock_gmm_resource_info.h | 11 ++-------- .../mocks/mock_source_level_debugger.h | 17 +++++--------- 7 files changed, 20 insertions(+), 73 deletions(-) diff --git a/opencl/test/unit_test/helpers/kmd_notify_tests.cpp b/opencl/test/unit_test/helpers/kmd_notify_tests.cpp index 0a10c23d6c..729f160f0b 100644 --- a/opencl/test/unit_test/helpers/kmd_notify_tests.cpp +++ b/opencl/test/unit_test/helpers/kmd_notify_tests.cpp @@ -17,11 +17,6 @@ #include "gmock/gmock.h" -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Winconsistent-missing-override" -#endif - using namespace NEO; struct KmdNotifyTests : public ::testing::Test { @@ -414,6 +409,3 @@ TEST_F(KmdNotifyTests, givenEnabledKmdNotifyMechanismWhenPowerSavingModeIsSetAnd EXPECT_EQ(0, timeout); } -#if defined(__clang__) -#pragma clang diagnostic pop -#endif diff --git a/opencl/test/unit_test/mocks/mock_aub_csr.h b/opencl/test/unit_test/mocks/mock_aub_csr.h index 6fdc43a458..3b5f3239af 100644 --- a/opencl/test/unit_test/mocks/mock_aub_csr.h +++ b/opencl/test/unit_test/mocks/mock_aub_csr.h @@ -21,11 +21,6 @@ #include -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Winconsistent-missing-override" -#endif - namespace NEO { struct MockAubFileStreamMockMmioWrite : public AubMemDump::AubFileStream { @@ -158,7 +153,7 @@ struct MockAubCsr : public AUBCommandStreamReceiverHw { bool fileIsOpen = false; std::string openFileName = ""; - MOCK_METHOD0(addPatchInfoComments, bool(void)); + MOCK_METHOD(bool, addPatchInfoComments, (), (override)); using CommandStreamReceiverHw::localMemoryEnabled; }; @@ -208,7 +203,3 @@ std::unique_ptr getEnvironment(bool createTagAllocation return aubExecutionEnvironment; } } // namespace NEO - -#if defined(__clang__) -#pragma clang diagnostic pop -#endif diff --git a/opencl/test/unit_test/mocks/mock_aub_file_stream.h b/opencl/test/unit_test/mocks/mock_aub_file_stream.h index c72edef32b..2d25b819a4 100644 --- a/opencl/test/unit_test/mocks/mock_aub_file_stream.h +++ b/opencl/test/unit_test/mocks/mock_aub_file_stream.h @@ -11,11 +11,6 @@ #include "gmock/gmock.h" -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Winconsistent-missing-override" -#endif - namespace NEO { struct MockAubFileStream : public AUBCommandStreamReceiver::AubFileStream { @@ -87,10 +82,6 @@ struct MockAubFileStream : public AUBCommandStreamReceiver::AubFileStream { }; struct GmockAubFileStream : public AUBCommandStreamReceiver::AubFileStream { - MOCK_METHOD1(addComment, bool(const char *message)); + MOCK_METHOD(bool, addComment, (const char *message), (override)); }; } // namespace NEO - -#if defined(__clang__) -#pragma clang diagnostic pop -#endif diff --git a/opencl/test/unit_test/mocks/mock_csr.h b/opencl/test/unit_test/mocks/mock_csr.h index 54dbc2c4ad..168053141d 100644 --- a/opencl/test/unit_test/mocks/mock_csr.h +++ b/opencl/test/unit_test/mocks/mock_csr.h @@ -14,11 +14,6 @@ #include -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Winconsistent-missing-override" -#endif - using namespace NEO; template @@ -226,14 +221,13 @@ template class MockFlatBatchBufferHelper : public FlatBatchBufferHelperHw { public: using FlatBatchBufferHelperHw::FlatBatchBufferHelperHw; - MOCK_METHOD1(setPatchInfoData, bool(const PatchInfoData &)); - MOCK_METHOD1(removePatchInfoData, bool(uint64_t)); - MOCK_METHOD1(registerCommandChunk, bool(CommandChunk &)); - MOCK_METHOD2(registerBatchBufferStartAddress, bool(uint64_t, uint64_t)); - MOCK_METHOD4(flattenBatchBuffer, - GraphicsAllocation *(uint32_t rootDeviceIndex, BatchBuffer &batchBuffer, size_t &sizeBatchBuffer, DispatchMode dispatchMode)); + MOCK_METHOD(bool, setPatchInfoData, (const PatchInfoData &), (override)); + MOCK_METHOD(bool, removePatchInfoData, (uint64_t), (override)); + MOCK_METHOD(bool, registerCommandChunk, (CommandChunk &), (override)); + MOCK_METHOD(bool, registerBatchBufferStartAddress, (uint64_t, uint64_t), (override)); + MOCK_METHOD(GraphicsAllocation *, + flattenBatchBuffer, + (uint32_t rootDeviceIndex, BatchBuffer &batchBuffer, size_t &sizeBatchBuffer, DispatchMode dispatchMode), + (override)); }; -#if defined(__clang__) -#pragma clang diagnostic pop -#endif diff --git a/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h b/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h index ddad0faa3f..587d3fb95a 100644 --- a/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h +++ b/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h @@ -11,11 +11,6 @@ #include "gmock/gmock.h" -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Winconsistent-missing-override" -#endif - namespace NEO { class MockGmmPageTableMngr : public GmmPageTableMngr { public: @@ -28,9 +23,9 @@ class MockGmmPageTableMngr : public GmmPageTableMngr { } }; - MOCK_METHOD2(initContextAuxTableRegister, GMM_STATUS(HANDLE initialBBHandle, GMM_ENGINE_TYPE engineType)); + MOCK_METHOD(GMM_STATUS, initContextAuxTableRegister, (HANDLE initialBBHandle, GMM_ENGINE_TYPE engineType), (override)); - MOCK_METHOD1(updateAuxTable, GMM_STATUS(const GMM_DDI_UPDATEAUXTABLE *ddiUpdateAuxTable)); + MOCK_METHOD(GMM_STATUS, updateAuxTable, (const GMM_DDI_UPDATEAUXTABLE *ddiUpdateAuxTable), (override)); void setCsrHandle(void *csrHandle) override; @@ -42,7 +37,3 @@ class MockGmmPageTableMngr : public GmmPageTableMngr { }; } // namespace NEO - -#if defined(__clang__) -#pragma clang diagnostic pop -#endif 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 bdb33cccd3..644d851fd7 100644 --- a/opencl/test/unit_test/mocks/mock_gmm_resource_info.h +++ b/opencl/test/unit_test/mocks/mock_gmm_resource_info.h @@ -12,10 +12,6 @@ #include "gmock/gmock.h" -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Winconsistent-missing-override" -#endif namespace NEO { struct SurfaceFormatInfo; @@ -72,11 +68,11 @@ class MockGmmResourceInfo : public GmmResourceInfo { GMM_STATUS getOffset(GMM_REQ_OFFSET_INFO &reqOffsetInfo) override; - MOCK_METHOD1(cpuBlt, uint8_t(GMM_RES_COPY_BLT *resCopyBlt)); + MOCK_METHOD(uint8_t, cpuBlt, (GMM_RES_COPY_BLT * resCopyBlt), (override)); void *getSystemMemPointer() override { return (void *)mockResourceCreateParams.pExistingSysMem; } - MOCK_METHOD1(getUnifiedAuxSurfaceOffset, uint64_t(GMM_UNIFIED_AUX_TYPE auxType)); + MOCK_METHOD(uint64_t, getUnifiedAuxSurfaceOffset, (GMM_UNIFIED_AUX_TYPE auxType), (override)); bool is64KBPageSuitable() const override { return is64KBPageSuitableValue; } @@ -117,6 +113,3 @@ class MockGmmResourceInfo : public GmmResourceInfo { }; } // namespace NEO -#if defined(__clang__) -#pragma clang diagnostic pop -#endif diff --git a/opencl/test/unit_test/mocks/mock_source_level_debugger.h b/opencl/test/unit_test/mocks/mock_source_level_debugger.h index d9ee662e56..b922bbfa7e 100644 --- a/opencl/test/unit_test/mocks/mock_source_level_debugger.h +++ b/opencl/test/unit_test/mocks/mock_source_level_debugger.h @@ -13,11 +13,6 @@ #include -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Winconsistent-missing-override" -#endif - using namespace NEO; class MockSourceLevelDebugger : public SourceLevelDebugger { @@ -97,10 +92,10 @@ class GMockSourceLevelDebugger : public SourceLevelDebugger { return isActive; } - MOCK_METHOD0(notifyDeviceDestruction, bool(void)); - MOCK_CONST_METHOD4(notifyKernelDebugData, bool(const DebugData *debugData, const std::string &name, const void *isa, size_t isaSize)); - MOCK_CONST_METHOD0(isOptimizationDisabled, bool()); - MOCK_METHOD1(notifyNewDevice, bool(uint32_t)); - MOCK_CONST_METHOD3(notifySourceCode, bool(const char *, size_t, std::string &)); - MOCK_METHOD1(initialize, bool(bool)); + MOCK_METHOD(bool, notifyDeviceDestruction, (), (override)); + MOCK_METHOD(bool, notifyKernelDebugData, (const DebugData *debugData, const std::string &name, const void *isa, size_t isaSize), (const, override)); + MOCK_METHOD(bool, isOptimizationDisabled, (), (const, override)); + MOCK_METHOD(bool, notifyNewDevice, (uint32_t), (override)); + MOCK_METHOD(bool, notifySourceCode, (const char *, size_t, std::string &), (const, override)); + MOCK_METHOD(bool, initialize, (bool), (override)); };