Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-10 12:53:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add missing override keywords

Browse Source 
Change-Id: I30c82d2b0007d745d54c3bbc160e17b420193f3b
Signed-off-by: Jablonski, Mateusz <mateusz.jablonski@intel.com>
This commit is contained in:
Jablonski, Mateusz
2020-03-13 09:17:01 +01:00
committed by sys_ocldev
parent e2dedd41f4
commit 0884a341c8
32 changed files with 73 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h
View File

@ -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();
}

2
opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h
View File

@ -27,7 +27,7 @@ class CommandStreamReceiver;
class AUBCommandStreamFixture : public CommandStreamFixture {
public:
virtual void SetUp(CommandQueue *pCommandQueue);
virtual void TearDown();
void TearDown() override;
template <typename FamilyType>
AUBCommandStreamReceiverHw<FamilyType> *getAubCsr() const {

4
opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h
View File

@ -110,12 +110,12 @@ class AUBFixture : public CommandQueueHwFixture {
template <typename KernelFixture>
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();
}

4
opencl/test/unit_test/aub_tests/fixtures/aub_parent_kernel_fixture.h
View File

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

4
opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h
View File

@ -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();
}

4
opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h
View File

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

6
opencl/test/unit_test/command_queue/command_enqueue_fixture.h
View File

@ -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();
}

10
opencl/test/unit_test/command_queue/enqueue_fill_buffer_fixture.h
View File

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

4
opencl/test/unit_test/command_stream/tbx_command_stream_fixture.h
View File

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

8
opencl/test/unit_test/event/event_fixture.h
View File

@ -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<HelloWorldFixtureFactory> {
public:
void TearDown() {
void TearDown() override {
uEvent->setStatus(-1);
uEvent.reset();
HelloWorldFixture::TearDown();

4
opencl/test/unit_test/fixtures/hello_world_fixture.h
View File

@ -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();

2
opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h
View File

@ -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();

8
opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h
View File

@ -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();
}

21
opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h
View File

@ -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<KernelInfo> pKernelInfo;
SKernelBinaryHeaderCommon kernelHeader;
char pSshLocal[64];
char pCrossThreadData[64];
cl_int retVal = CL_SUCCESS;
MockProgram *pProgram = nullptr;
MockKernel *pKernel = nullptr;
std::unique_ptr<KernelInfo> pKernelInfo = nullptr;
SKernelBinaryHeaderCommon kernelHeader{};
char pSshLocal[64]{};
char pCrossThreadData[64]{};
};

2
opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h
View File

@ -67,6 +67,6 @@ class TestedDrmMemoryManager : public MemoryManagerCreate<DrmMemoryManager> {
void overrideGfxPartition(GfxPartition *newGfxPartition);
DrmAllocation *allocate32BitGraphicsMemory(size_t size, const void *ptr, GraphicsAllocation::AllocationType allocationType);
~TestedDrmMemoryManager();
~TestedDrmMemoryManager() override;
};
} // namespace NEO

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

@ -84,7 +84,7 @@ struct MockAubCsr : public AUBCommandStreamReceiverHw<GfxFamily> {
void initProgrammingFlags() override {
initProgrammingFlagsCalled = true;
}
void initializeEngine() {
void initializeEngine() override {
AUBCommandStreamReceiverHw<GfxFamily>::initializeEngine();
initializeEngineCalled = true;
}
@ -106,18 +106,18 @@ struct MockAubCsr : public AUBCommandStreamReceiverHw<GfxFamily> {
AUBCommandStreamReceiverHw<GfxFamily>::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<GfxFamily>::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<GfxFamily>::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<GfxFamily>::addAubComment(message);
addAubCommentCalled = true;
}

1
opencl/test/unit_test/mocks/mock_block_kernel_manager.h
View File

@ -13,7 +13,6 @@ namespace NEO {
class MockBlockKernelManager : public BlockKernelManager {
public:
MockBlockKernelManager() = default;
~MockBlockKernelManager() = default;
using BlockKernelManager::blockKernelInfoArray;
using BlockKernelManager::blockPrivateSurfaceArray;
};

2
opencl/test/unit_test/mocks/mock_cif.h
View File

@ -94,8 +94,6 @@ struct MockCIFMain : MockCIF<CIF::CIFMain> {
static std::map<CIF::InterfaceId_t, CreatorFuncT> globalCreators;
MockCIFMain();
~MockCIFMain() {
}
CIF::Version_t GetBinaryVersion() const override {
return 1;

4
opencl/test/unit_test/mocks/mock_compilers.h
View File

@ -118,7 +118,7 @@ struct MockIgcFeaturesAndWorkarounds : MockCIF<IGC::IgcFeaturesAndWorkaroundsTag
struct MockIgcOclTranslationCtx : MockCIF<IGC::IgcOclTranslationCtxTagOCL> {
using MockCIF<IGC::IgcOclTranslationCtxTagOCL>::TranslateImpl;
MockIgcOclTranslationCtx();
~MockIgcOclTranslationCtx();
~MockIgcOclTranslationCtx() override;
IGC::OclTranslationOutputBase *TranslateImpl(
CIF::Version_t outVersion,
@ -237,7 +237,7 @@ struct MockFclOclTranslationCtx : MockCIF<IGC::FclOclTranslationCtxTagOCL> {
struct MockFclOclDeviceCtx : MockCIF<IGC::FclOclDeviceCtxTagOCL> {
MockFclOclDeviceCtx();
~MockFclOclDeviceCtx();
~MockFclOclDeviceCtx() override;
static CIF::ICIF *Create(CIF::InterfaceId_t intId, CIF::Version_t version);
void SetOclApiVersion(uint32_t version) override {

4
opencl/test/unit_test/mocks/mock_context.h
View File

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

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

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

4
opencl/test/unit_test/mocks/mock_deferrable_deletion.h
View File

@ -15,7 +15,7 @@ class MockDeferrableDeletion : public DeferrableDeletion {
public:
bool apply() override;
virtual ~MockDeferrableDeletion();
~MockDeferrableDeletion() override;
int applyCalled = 0;
};
} // namespace NEO
} // namespace NEO

2
opencl/test/unit_test/mocks/mock_deferred_deleter.h
View File

@ -13,7 +13,7 @@ class MockDeferredDeleter : public DeferredDeleter {
public:
MockDeferredDeleter();
~MockDeferredDeleter();
~MockDeferredDeleter() override;
void deferDeletion(DeferrableDeletion *deletion) override;

2
opencl/test/unit_test/mocks/mock_device_queue.h
View File

@ -99,7 +99,7 @@ class MockDeviceQueueHw : public DeviceQueueHw<GfxFamily> {
setupExpectedCmds();
};
~MockDeviceQueueHw() {
~MockDeviceQueueHw() override {
if (expectedCmds.prefetch)
delete expectedCmds.prefetch;
}

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

@ -22,7 +22,7 @@ struct SurfaceFormatInfo;
class MockGmmResourceInfo : public GmmResourceInfo {
public:
virtual ~MockGmmResourceInfo();
~MockGmmResourceInfo() override;
MockGmmResourceInfo(GMM_RESCREATE_PARAMS *resourceCreateParams);

4
opencl/test/unit_test/mocks/mock_kernel.h
View File

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

9
opencl/test/unit_test/mocks/mock_memory_operations_handler.h
View File

@ -15,9 +15,8 @@ class GraphicsAllocation;
class MockMemoryOperationsHandler : public MemoryOperationsHandler {
public:
MockMemoryOperationsHandler() {}
virtual ~MockMemoryOperationsHandler() {}
MemoryOperationsStatus makeResident(ArrayRef<GraphicsAllocation *> gfxAllocations) { return MemoryOperationsStatus::UNSUPPORTED; }
MemoryOperationsStatus evict(GraphicsAllocation &gfxAllocation) { return MemoryOperationsStatus::UNSUPPORTED; }
MemoryOperationsStatus isResident(GraphicsAllocation &gfxAllocation) { return MemoryOperationsStatus::UNSUPPORTED; }
MemoryOperationsStatus makeResident(ArrayRef<GraphicsAllocation *> gfxAllocations) override { return MemoryOperationsStatus::UNSUPPORTED; }
MemoryOperationsStatus evict(GraphicsAllocation &gfxAllocation) override { return MemoryOperationsStatus::UNSUPPORTED; }
MemoryOperationsStatus isResident(GraphicsAllocation &gfxAllocation) override { return MemoryOperationsStatus::UNSUPPORTED; }
};
} // namespace NEO
} // namespace NEO

6
opencl/test/unit_test/mocks/mock_pipe.h
View File

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

2
opencl/test/unit_test/mocks/mock_program.h
View File

@ -68,7 +68,7 @@ class MockProgram : public Program {
MockProgram(T &&... args) : Program(std::forward<T>(args)...) {
}
~MockProgram() {
~MockProgram() override {
if (contextSet)
context = nullptr;
}

2
opencl/test/unit_test/mocks/mock_sip.h
View File

@ -24,7 +24,7 @@ class MockSipKernel : public SipKernel {
MockSipKernel(SipKernelType type, Program *sipProgram);
MockSipKernel();
~MockSipKernel();
~MockSipKernel() override;
static std::vector<char> dummyBinaryForSip;
static std::vector<char> getDummyGenBinary();

2
opencl/test/unit_test/os_interface/linux/drm_mock.h
View File

@ -38,7 +38,7 @@ class DrmMock : public Drm {
}
DrmMock() : DrmMock(*platform()->peekExecutionEnvironment()->rootDeviceEnvironments[0]) {}
~DrmMock() {
~DrmMock() override {
if (sysFsDefaultGpuPathToRestore != nullptr) {
sysFsDefaultGpuPath = sysFsDefaultGpuPathToRestore;
}

18
opencl/test/unit_test/program/program_with_source.h
View File

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