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

Remove not needed pragmas -Winconsistent-missing-override from OCL ULT

Browse Source 
Change-Id: Id8a67e33ed7191ba0acd2bb9b80336b6bb72b13a
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2020-05-18 12:05:00 +02:00
committed by sys_ocldev
parent dda8562818
commit 786cd28f2b
7 changed files with 20 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opencl/test/unit_test/helpers/kmd_notify_tests.cpp
View File

@ -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

11
opencl/test/unit_test/mocks/mock_aub_csr.h
View File

@ -21,11 +21,6 @@
#include <string>
#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<GfxFamily> {
bool fileIsOpen = false;
std::string openFileName = "";
MOCK_METHOD0(addPatchInfoComments, bool(void));
MOCK_METHOD(bool, addPatchInfoComments, (), (override));
using CommandStreamReceiverHw<GfxFamily>::localMemoryEnabled;
};
@ -208,7 +203,3 @@ std::unique_ptr<AubExecutionEnvironment> getEnvironment(bool createTagAllocation
return aubExecutionEnvironment;
}
} // namespace NEO
#if defined(__clang__)
#pragma clang diagnostic pop
#endif

11
opencl/test/unit_test/mocks/mock_aub_file_stream.h
View File

@ -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

22
opencl/test/unit_test/mocks/mock_csr.h
View File

@ -14,11 +14,6 @@
#include <vector>
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Winconsistent-missing-override"
#endif
using namespace NEO;
template <typename GfxFamily>
@ -226,14 +221,13 @@ template <typename GfxFamily>
class MockFlatBatchBufferHelper : public FlatBatchBufferHelperHw<GfxFamily> {
public:
using FlatBatchBufferHelperHw<GfxFamily>::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

13
opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h
View File

@ -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

11
opencl/test/unit_test/mocks/mock_gmm_resource_info.h
View File

@ -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

17
opencl/test/unit_test/mocks/mock_source_level_debugger.h
View File

@ -13,11 +13,6 @@
#include <string>
#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));
};