From a996ec6d9a6b1a481adaf5dfddf24024012e06d7 Mon Sep 17 00:00:00 2001 From: "Jablonski, Mateusz" Date: Fri, 13 Mar 2020 14:59:00 +0100 Subject: [PATCH] Fix unit test issues remove dead store initialize default values in class definition Change-Id: I39abef12104a80df13ace0fb127c4ee24e00b184 Signed-off-by: Jablonski, Mateusz --- .../aub_tests/fixtures/simple_arg_fixture.h | 14 ++--- .../command_queue/command_queue_fixture.h | 2 +- .../enqueue_copy_buffer_fixture.h | 8 +-- .../enqueue_copy_buffer_rect_fixture.h | 8 +-- .../enqueue_copy_buffer_to_image_fixture.h | 17 ++---- .../enqueue_copy_image_fixture.h | 12 ++--- .../enqueue_copy_image_to_buffer_fixture.h | 17 ++---- .../enqueue_fill_image_fixture.h | 8 +-- .../enqueue_map_buffer_fixture.h | 6 +-- .../enqueue_read_buffer_rect_fixture.h | 11 ++-- .../enqueue_read_image_fixture.h | 10 ++-- .../enqueue_write_buffer_rect_fixture.h | 13 ++--- .../enqueue_write_image_fixture.h | 10 ++-- .../command_stream/command_stream_fixture.h | 11 ++-- .../context/driver_diagnostics_tests.h | 53 +++++++++---------- .../unit_test/fixtures/built_in_fixture.h | 2 +- .../test/unit_test/fixtures/context_fixture.h | 2 +- .../fixtures/execution_model_fixture.h | 10 ++-- .../unit_test/fixtures/hello_world_fixture.h | 21 +++----- .../unit_test/fixtures/platform_fixture.h | 6 +-- .../test/unit_test/fixtures/program_fixture.h | 8 +-- .../fixtures/simple_arg_kernel_fixture.h | 17 ++---- opencl/test/unit_test/global_environment.h | 18 +++---- .../unit_test/helpers/cmd_buffer_validator.h | 4 +- .../indirect_heap/indirect_heap_fixture.h | 11 ++-- opencl/test/unit_test/mocks/mock_cif.h | 6 +-- opencl/test/unit_test/mocks/mock_kernel.h | 4 +- .../offline_compiler/offline_compiler_tests.h | 22 +++----- .../unit_test/program/program_from_binary.h | 16 ++---- 29 files changed, 116 insertions(+), 231 deletions(-) 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 4b276fcb6e..bae33e5fda 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 @@ -50,10 +50,6 @@ struct SimpleArgFixture : public FixtureFactory::IndirectHeapFixture, using KernelFixture::pKernel; using KernelFixture::SetUp; - SimpleArgFixture() - : pDestMemory(nullptr), sizeUserMemory(128 * sizeof(float)) { - } - public: void SetUp() override { DeviceFixture::SetUp(); @@ -103,10 +99,10 @@ struct SimpleArgFixture : public FixtureFactory::IndirectHeapFixture, DeviceFixture::TearDown(); } - int argVal; - void *pDestMemory; - void *pExpectedMemory; - size_t sizeUserMemory; - GraphicsAllocation *outBuffer; + int argVal = 0; + void *pDestMemory = nullptr; + void *pExpectedMemory = nullptr; + size_t sizeUserMemory = 128 * sizeof(float); + GraphicsAllocation *outBuffer = nullptr; }; } // namespace NEO diff --git a/opencl/test/unit_test/command_queue/command_queue_fixture.h b/opencl/test/unit_test/command_queue/command_queue_fixture.h index defd9b1caa..c0631a59e4 100644 --- a/opencl/test/unit_test/command_queue/command_queue_fixture.h +++ b/opencl/test/unit_test/command_queue/command_queue_fixture.h @@ -62,7 +62,7 @@ struct CommandQueueFixture { ClDevice *device, cl_command_queue_properties properties); - CommandQueue *pCmdQ; + CommandQueue *pCmdQ = nullptr; }; static const cl_command_queue_properties AllCommandQueueProperties[] = { diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h index 3a49eba65a..5c77805351 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h @@ -46,10 +46,6 @@ struct EnqueueCopyBufferTest : public CommandEnqueueFixture, public EnqueueCopyBufferHelper, public ::testing::Test { - EnqueueCopyBufferTest(void) - : srcBuffer(nullptr) { - } - void SetUp(void) override { CommandEnqueueFixture::SetUp(); @@ -88,7 +84,7 @@ struct EnqueueCopyBufferTest : public CommandEnqueueFixture, } MockContext context; - Buffer *srcBuffer; - Buffer *dstBuffer; + Buffer *srcBuffer = nullptr; + Buffer *dstBuffer = nullptr; }; } // namespace NEO diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h index c00106998a..a34f5f7bf6 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h @@ -53,10 +53,6 @@ struct EnqueueCopyBufferRectTest : public CommandEnqueueFixture, public EnqueueCopyBufferRectHelper, public ::testing::Test { - EnqueueCopyBufferRectTest(void) : srcBuffer(nullptr), - dstBuffer(nullptr) { - } - struct BufferRect : public BufferDefaults { static const size_t sizeInBytes; }; @@ -130,8 +126,8 @@ struct EnqueueCopyBufferRectTest : public CommandEnqueueFixture, parseCommands(*pCmdQ); } - Buffer *srcBuffer; - Buffer *dstBuffer; + Buffer *srcBuffer = nullptr; + Buffer *dstBuffer = nullptr; static const size_t rowPitch = 100; static const size_t slicePitch = 100 * 100; diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h index d973191e5d..fc7c89cf13 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h @@ -20,10 +20,6 @@ namespace NEO { struct EnqueueCopyBufferToImageTest : public CommandEnqueueFixture, public ::testing::Test { - EnqueueCopyBufferToImageTest() : srcBuffer(nullptr), - dstImage(nullptr) { - } - void SetUp() override { CommandEnqueueFixture::SetUp(); @@ -52,18 +48,15 @@ struct EnqueueCopyBufferToImageTest : public CommandEnqueueFixture, parseCommands(*pCmdQ); } - MockContext *context; - Buffer *srcBuffer; - Image *dstImage; + MockContext *context = nullptr; + Buffer *srcBuffer = nullptr; + Image *dstImage = nullptr; }; struct EnqueueCopyBufferToImageMipMapTest : public CommandEnqueueFixture, public ::testing::Test, public ::testing::WithParamInterface { - EnqueueCopyBufferToImageMipMapTest() : srcBuffer(nullptr) { - } - void SetUp(void) override { CommandEnqueueFixture::SetUp(); BufferDefaults::context = new MockContext(pClDevice); @@ -78,8 +71,8 @@ struct EnqueueCopyBufferToImageMipMapTest : public CommandEnqueueFixture, CommandEnqueueFixture::TearDown(); } - MockContext *context; - Buffer *srcBuffer; + MockContext *context = nullptr; + Buffer *srcBuffer = nullptr; }; } // namespace NEO diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h index a015018747..03da897a1b 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h @@ -20,10 +20,6 @@ namespace NEO { struct EnqueueCopyImageTest : public CommandEnqueueFixture, public ::testing::Test { - EnqueueCopyImageTest() : srcImage(nullptr), - dstImage(nullptr) { - } - void SetUp(void) override { CommandEnqueueFixture::SetUp(); context = new MockContext(pClDevice); @@ -49,9 +45,9 @@ struct EnqueueCopyImageTest : public CommandEnqueueFixture, parseCommands(*pCmdQ); } - MockContext *context; - Image *srcImage; - Image *dstImage; + MockContext *context = nullptr; + Image *srcImage = nullptr; + Image *dstImage = nullptr; }; struct EnqueueCopyImageMipMapTest : public CommandEnqueueFixture, @@ -68,6 +64,6 @@ struct EnqueueCopyImageMipMapTest : public CommandEnqueueFixture, CommandEnqueueFixture::TearDown(); } - MockContext *context; + MockContext *context = nullptr; }; } // namespace NEO diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h index 502cd0c70c..9c28b1d9ad 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h @@ -20,10 +20,6 @@ namespace NEO { struct EnqueueCopyImageToBufferTest : public CommandEnqueueFixture, public ::testing::Test { - EnqueueCopyImageToBufferTest() : srcImage(nullptr), - dstBuffer(nullptr) { - } - void SetUp(void) override { CommandEnqueueFixture::SetUp(); BufferDefaults::context = new MockContext(pClDevice); @@ -51,18 +47,15 @@ struct EnqueueCopyImageToBufferTest : public CommandEnqueueFixture, parseCommands(*pCmdQ); } - MockContext *context; - Image *srcImage; - Buffer *dstBuffer; + MockContext *context = nullptr; + Image *srcImage = nullptr; + Buffer *dstBuffer = nullptr; }; struct EnqueueCopyImageToBufferMipMapTest : public CommandEnqueueFixture, public ::testing::Test, public ::testing::WithParamInterface { - EnqueueCopyImageToBufferMipMapTest() : dstBuffer(nullptr) { - } - void SetUp(void) override { CommandEnqueueFixture::SetUp(); BufferDefaults::context = new MockContext(pClDevice); @@ -77,7 +70,7 @@ struct EnqueueCopyImageToBufferMipMapTest : public CommandEnqueueFixture, CommandEnqueueFixture::TearDown(); } - MockContext *context; - Buffer *dstBuffer; + MockContext *context = nullptr; + Buffer *dstBuffer = nullptr; }; } // namespace NEO diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h index ff3edd0caa..9f52a96082 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h @@ -15,10 +15,6 @@ namespace NEO { struct EnqueueFillImageTestFixture : public CommandEnqueueFixture { - - EnqueueFillImageTestFixture() : image(nullptr) { - } - void SetUp(void) override { CommandEnqueueFixture::SetUp(); context = new MockContext(pClDevice); @@ -40,7 +36,7 @@ struct EnqueueFillImageTestFixture : public CommandEnqueueFixture { parseCommands(*pCmdQ); } - MockContext *context; - Image *image; + MockContext *context = nullptr; + Image *image = nullptr; }; } // namespace NEO diff --git a/opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h index 13d06a9108..57e73bb781 100644 --- a/opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h @@ -18,10 +18,6 @@ namespace NEO { struct EnqueueMapBufferTypeTest : public CommandEnqueueFixture, public ::testing::Test { - EnqueueMapBufferTypeTest(void) - : srcBuffer(nullptr) { - } - void SetUp() override { CommandEnqueueFixture::SetUp(); BufferDefaults::context = new MockContext; @@ -50,6 +46,6 @@ struct EnqueueMapBufferTypeTest : public CommandEnqueueFixture, parseCommands(*pCmdQ); } - Buffer *srcBuffer; + Buffer *srcBuffer = nullptr; }; } // namespace NEO diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h index f109324359..3020822b83 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h @@ -20,11 +20,6 @@ namespace NEO { struct EnqueueReadBufferRectTest : public CommandEnqueueFixture, public ::testing::Test { - EnqueueReadBufferRectTest(void) - : buffer(nullptr), - hostPtr(nullptr) { - } - void SetUp() override { CommandEnqueueFixture::SetUp(); context.reset(new MockContext(pCmdQ->getDevice().getSpecializedDevice())); @@ -46,8 +41,8 @@ struct EnqueueReadBufferRectTest : public CommandEnqueueFixture, } void TearDown() override { - nonZeroCopyBuffer.reset(nullptr); - buffer.reset(nullptr); + nonZeroCopyBuffer.reset(); + buffer.reset(); ::alignedFree(hostPtr); context.reset(); @@ -85,7 +80,7 @@ struct EnqueueReadBufferRectTest : public CommandEnqueueFixture, std::unique_ptr context; std::unique_ptr buffer; std::unique_ptr nonZeroCopyBuffer; - void *hostPtr; + void *hostPtr = nullptr; static const size_t rowPitch = 100; static const size_t slicePitch = 100 * 100; diff --git a/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h index 46680cb8ec..83d39931e3 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h @@ -22,10 +22,6 @@ struct EnqueueReadImageTest : public CommandEnqueueFixture, typedef CommandQueueHwFixture CommandQueueFixture; using CommandQueueHwFixture::pCmdQ; - EnqueueReadImageTest() : dstPtr(nullptr), - srcImage(nullptr) { - } - void SetUp(void) override { CommandEnqueueFixture::SetUp(); @@ -52,9 +48,9 @@ struct EnqueueReadImageTest : public CommandEnqueueFixture, parseCommands(*pCmdQ); } - float *dstPtr; - Image *srcImage; - MockContext *context; + float *dstPtr = nullptr; + Image *srcImage = nullptr; + MockContext *context = nullptr; }; struct EnqueueReadImageMipMapTest : public EnqueueReadImageTest, diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h index 5d12b22e7a..67c8c0503f 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h @@ -21,11 +21,6 @@ namespace NEO { struct EnqueueWriteBufferRectTest : public CommandEnqueueFixture, public ::testing::Test { - EnqueueWriteBufferRectTest(void) - : buffer(nullptr), - hostPtr(nullptr) { - } - void SetUp() override { CommandEnqueueFixture::SetUp(); context.reset(new MockContext(pClDevice)); @@ -48,10 +43,10 @@ struct EnqueueWriteBufferRectTest : public CommandEnqueueFixture, } void TearDown() override { - buffer.reset(nullptr); - nonZeroCopyBuffer.reset(nullptr); + buffer.reset(); + nonZeroCopyBuffer.reset(); ::alignedFree(hostPtr); - context.reset(nullptr); + context.reset(); CommandEnqueueFixture::TearDown(); } @@ -87,7 +82,7 @@ struct EnqueueWriteBufferRectTest : public CommandEnqueueFixture, std::unique_ptr buffer; std::unique_ptr nonZeroCopyBuffer; - void *hostPtr; + void *hostPtr = nullptr; static const size_t rowPitch = 100; static const size_t slicePitch = 100 * 100; diff --git a/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h index 5668cb6820..786dbccc2e 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h @@ -20,10 +20,6 @@ namespace NEO { struct EnqueueWriteImageTest : public CommandEnqueueFixture, public ::testing::Test { - EnqueueWriteImageTest() : srcPtr(nullptr), - dstImage(nullptr) { - } - void SetUp(void) override { CommandEnqueueFixture::SetUp(); @@ -52,9 +48,9 @@ struct EnqueueWriteImageTest : public CommandEnqueueFixture, parseCommands(*pCmdQ); } - float *srcPtr; - Image *dstImage; - MockContext *context; + float *srcPtr = nullptr; + Image *dstImage = nullptr; + MockContext *context = nullptr; }; struct EnqueueWriteImageMipMapTest : public EnqueueWriteImageTest, diff --git a/opencl/test/unit_test/command_stream/command_stream_fixture.h b/opencl/test/unit_test/command_stream/command_stream_fixture.h index 1abbbc58e7..b30b83e2bf 100644 --- a/opencl/test/unit_test/command_stream/command_stream_fixture.h +++ b/opencl/test/unit_test/command_stream/command_stream_fixture.h @@ -13,20 +13,15 @@ namespace NEO { struct CommandStreamFixture { - CommandStreamFixture(void) - : pCS(nullptr), - pCmdBuffer(nullptr) { - } - void SetUp(CommandQueue *pCmdQ) { pCS = &pCmdQ->getCS(1024); pCmdBuffer = pCS->getCpuBase(); } - virtual void TearDown(void) { + virtual void TearDown() { } - LinearStream *pCS; - void *pCmdBuffer; + LinearStream *pCS = nullptr; + void *pCmdBuffer = nullptr; }; } // namespace NEO diff --git a/opencl/test/unit_test/context/driver_diagnostics_tests.h b/opencl/test/unit_test/context/driver_diagnostics_tests.h index 898a738140..9326ffcc2f 100644 --- a/opencl/test/unit_test/context/driver_diagnostics_tests.h +++ b/opencl/test/unit_test/context/driver_diagnostics_tests.h @@ -33,9 +33,6 @@ void CL_CALLBACK callbackFunction(const char *providedHint, const void *flags, s struct DriverDiagnosticsTest : public PlatformFixture, public ::testing::Test { using PlatformFixture::SetUp; - DriverDiagnosticsTest() : retVal(CL_SUCCESS) { - } - void SetUp() override { PlatformFixture::SetUp(); memset(userData, 0, maxHintCounter * DriverDiagnostics::maxHintStringSize); @@ -45,9 +42,9 @@ struct DriverDiagnosticsTest : public PlatformFixture, PlatformFixture::TearDown(); } - cl_int retVal; - char userData[maxHintCounter * DriverDiagnostics::maxHintStringSize]; - char expectedHint[DriverDiagnostics::maxHintStringSize]; + cl_int retVal = CL_SUCCESS; + char userData[maxHintCounter * DriverDiagnostics::maxHintStringSize]{}; + char expectedHint[DriverDiagnostics::maxHintStringSize]{}; }; struct VerboseLevelTest : public DriverDiagnosticsTest, @@ -101,10 +98,10 @@ struct PerformanceHintBufferTest : public PerformanceHintTest, alignedFree(address); PerformanceHintTest::TearDown(); } - bool alignedSize; - bool alignedAddress; - void *address; - Buffer *buffer; + bool alignedSize = false; + bool alignedAddress = false; + void *address = nullptr; + Buffer *buffer = nullptr; }; struct PerformanceHintCommandQueueTest : public PerformanceHintTest, @@ -123,11 +120,11 @@ struct PerformanceHintCommandQueueTest : public PerformanceHintTest, delete clDevice; PerformanceHintTest::TearDown(); } - MockDevice *device; - MockClDevice *clDevice; - cl_command_queue cmdQ; - bool profilingEnabled; - bool preemptionSupported; + MockDevice *device = nullptr; + MockClDevice *clDevice = nullptr; + cl_command_queue cmdQ = nullptr; + bool profilingEnabled = false; + bool preemptionSupported = false; }; struct PerformanceHintEnqueueTest : public PerformanceHintTest { @@ -158,8 +155,8 @@ struct PerformanceHintEnqueueBufferTest : public PerformanceHintEnqueueTest { alignedFree(address); PerformanceHintEnqueueTest::TearDown(); } - void *address; - Buffer *buffer; + void *address = nullptr; + Buffer *buffer = nullptr; }; struct PerformanceHintEnqueueReadBufferTest : public PerformanceHintEnqueueBufferTest, @@ -173,8 +170,8 @@ struct PerformanceHintEnqueueReadBufferTest : public PerformanceHintEnqueueBuffe void TearDown() override { PerformanceHintEnqueueBufferTest::TearDown(); } - bool alignedSize; - bool alignedAddress; + bool alignedSize = false; + bool alignedAddress = false; }; struct PerformanceHintEnqueueImageTest : public PerformanceHintEnqueueTest { @@ -192,8 +189,8 @@ struct PerformanceHintEnqueueImageTest : public PerformanceHintEnqueueTest { alignedFree(address); PerformanceHintEnqueueTest::TearDown(); } - void *address; - Image *image; + void *address = nullptr; + Image *image = nullptr; std::unique_ptr zeroCopyImage; }; @@ -208,8 +205,8 @@ struct PerformanceHintEnqueueReadImageTest : public PerformanceHintEnqueueImageT void TearDown() override { PerformanceHintEnqueueImageTest::TearDown(); } - bool alignedSize; - bool alignedAddress; + bool alignedSize = false; + bool alignedAddress = false; }; struct PerformanceHintEnqueueMapTest : public PerformanceHintEnqueueTest, @@ -243,8 +240,8 @@ struct PerformanceHintEnqueueKernelTest : public PerformanceHintEnqueueTest, ProgramFixture::TearDown(); PerformanceHintEnqueueTest::TearDown(); } - Kernel *kernel; - size_t globalWorkGroupSize[3]; + Kernel *kernel = nullptr; + size_t globalWorkGroupSize[3]{}; }; struct PerformanceHintEnqueueKernelBadSizeTest : public PerformanceHintEnqueueKernelTest, @@ -279,8 +276,8 @@ struct PerformanceHintEnqueueKernelPrintfTest : public PerformanceHintEnqueueTes ProgramFixture::TearDown(); PerformanceHintEnqueueTest::TearDown(); } - Kernel *kernel; - size_t globalWorkGroupSize[3]; + Kernel *kernel = nullptr; + size_t globalWorkGroupSize[3]{}; }; struct PerformanceHintKernelTest : public PerformanceHintTest, @@ -294,5 +291,5 @@ struct PerformanceHintKernelTest : public PerformanceHintTest, void TearDown() override { PerformanceHintTest::TearDown(); } - bool zeroSized; + bool zeroSized = false; }; diff --git a/opencl/test/unit_test/fixtures/built_in_fixture.h b/opencl/test/unit_test/fixtures/built_in_fixture.h index 7a13db32ed..f09bb34fc3 100644 --- a/opencl/test/unit_test/fixtures/built_in_fixture.h +++ b/opencl/test/unit_test/fixtures/built_in_fixture.h @@ -19,5 +19,5 @@ class BuiltInFixture { void SetUp(NEO::Device *pDevice); void TearDown(); - NEO::BuiltIns *pBuiltIns; + NEO::BuiltIns *pBuiltIns = nullptr; }; diff --git a/opencl/test/unit_test/fixtures/context_fixture.h b/opencl/test/unit_test/fixtures/context_fixture.h index 777fd9d29b..d0308fcbc0 100644 --- a/opencl/test/unit_test/fixtures/context_fixture.h +++ b/opencl/test/unit_test/fixtures/context_fixture.h @@ -19,6 +19,6 @@ class ContextFixture { virtual void SetUp(cl_uint numDevices, cl_device_id *pDeviceList); virtual void TearDown(); - MockContext *pContext; + MockContext *pContext = nullptr; }; } // namespace NEO diff --git a/opencl/test/unit_test/fixtures/execution_model_fixture.h b/opencl/test/unit_test/fixtures/execution_model_fixture.h index 2796c6bd6b..3fe6409f72 100644 --- a/opencl/test/unit_test/fixtures/execution_model_fixture.h +++ b/opencl/test/unit_test/fixtures/execution_model_fixture.h @@ -43,15 +43,13 @@ class DeviceQueueFixture { delete pDevQueue; } - DeviceQueue *pDevQueue; + DeviceQueue *pDevQueue = nullptr; }; class ExecutionModelKernelTest : public ExecutionModelKernelFixture, public CommandQueueHwFixture, public DeviceQueueFixture { public: - ExecutionModelKernelTest(){}; - void SetUp() override { DebugManager.flags.EnableTimestampPacket.set(0); ExecutionModelKernelFixture::SetUp(); @@ -82,8 +80,6 @@ class ExecutionModelSchedulerTest : public DeviceFixture, public CommandQueueHwFixture, public DeviceQueueFixture { public: - ExecutionModelSchedulerTest(){}; - void SetUp() override { DeviceFixture::SetUp(); CommandQueueHwFixture::SetUp(pClDevice, 0); @@ -101,7 +97,7 @@ class ExecutionModelSchedulerTest : public DeviceFixture, DeviceFixture::TearDown(); } - MockParentKernel *parentKernel; + MockParentKernel *parentKernel = nullptr; }; struct ParentKernelCommandQueueFixture : public CommandQueueHwFixture, @@ -125,5 +121,5 @@ struct ParentKernelCommandQueueFixture : public CommandQueueHwFixture, return std::make_unique(commandStream, *gpgpuCsr.getInternalAllocationStorage()); } - MockClDevice *device; + MockClDevice *device = nullptr; }; diff --git a/opencl/test/unit_test/fixtures/hello_world_fixture.h b/opencl/test/unit_test/fixtures/hello_world_fixture.h index 1ae4c0d07b..3d37069244 100644 --- a/opencl/test/unit_test/fixtures/hello_world_fixture.h +++ b/opencl/test/unit_test/fixtures/hello_world_fixture.h @@ -50,13 +50,6 @@ struct HelloWorldFixture : public FixtureFactory::IndirectHeapFixture, using IndirectHeapFixture::SetUp; using KernelFixture::pKernel; - HelloWorldFixture() : pSrcMemory(nullptr), - pDestMemory(nullptr), - sizeUserMemory(128 * sizeof(float)), - kernelFilename("CopyBuffer_simd"), - kernelName("CopyBuffer") { - } - public: void SetUp() override { DeviceFixture::SetUp(); @@ -109,13 +102,13 @@ struct HelloWorldFixture : public FixtureFactory::IndirectHeapFixture, BufferDefaults::context->release(); DeviceFixture::TearDown(); } - Buffer *srcBuffer; - Buffer *destBuffer; - void *pSrcMemory; - void *pDestMemory; - size_t sizeUserMemory; - const char *kernelFilename; - const char *kernelName; + Buffer *srcBuffer = nullptr; + Buffer *destBuffer = nullptr; + void *pSrcMemory = nullptr; + void *pDestMemory = nullptr; + size_t sizeUserMemory = 128 * sizeof(float); + const char *kernelFilename = "CopyBuffer_simd"; + const char *kernelName = "CopyBuffer"; const int srcPattern = 85; const int destPattern = 170; diff --git a/opencl/test/unit_test/fixtures/platform_fixture.h b/opencl/test/unit_test/fixtures/platform_fixture.h index 88742344ae..57e1fcaa54 100644 --- a/opencl/test/unit_test/fixtures/platform_fixture.h +++ b/opencl/test/unit_test/fixtures/platform_fixture.h @@ -21,9 +21,9 @@ class PlatformFixture { void SetUp(); void TearDown(); - Platform *pPlatform; + Platform *pPlatform = nullptr; - cl_uint num_devices; - cl_device_id *devices; + cl_uint num_devices = 0u; + cl_device_id *devices = nullptr; }; } // namespace NEO diff --git a/opencl/test/unit_test/fixtures/program_fixture.h b/opencl/test/unit_test/fixtures/program_fixture.h index 48573dbcc7..9270ee8d89 100644 --- a/opencl/test/unit_test/fixtures/program_fixture.h +++ b/opencl/test/unit_test/fixtures/program_fixture.h @@ -18,10 +18,6 @@ namespace NEO { class ProgramFixture { public: - ProgramFixture() : pProgram(nullptr), - knownSource(nullptr), - knownSourceSize(0) {} - void CreateProgramFromBinary(cl_context context, cl_device_id *pDeviceList, const std::string &binaryFileName, @@ -52,8 +48,8 @@ class ProgramFixture { knownSource.reset(); } - MockProgram *pProgram; + MockProgram *pProgram = nullptr; std::unique_ptr knownSource; - size_t knownSourceSize; + size_t knownSourceSize = 0u; }; } // namespace NEO 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 7ac49e2567..e14556c430 100644 --- a/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h +++ b/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h @@ -74,9 +74,6 @@ class SimpleArgKernelFixture : public ProgramFixture { public: using ProgramFixture::SetUp; - SimpleArgKernelFixture() - : retVal(CL_SUCCESS), pKernel(nullptr) { - } protected: virtual void SetUp(ClDevice *pDevice) { @@ -134,17 +131,14 @@ class SimpleArgKernelFixture : public ProgramFixture { ProgramFixture::TearDown(); } - cl_int retVal; - Kernel *pKernel; - MockContext *pContext; + cl_int retVal = CL_SUCCESS; + Kernel *pKernel = nullptr; + MockContext *pContext = nullptr; }; class SimpleArgNonUniformKernelFixture : public ProgramFixture { public: using ProgramFixture::SetUp; - SimpleArgNonUniformKernelFixture() - : retVal(CL_SUCCESS), kernel(nullptr) { - } protected: void SetUp(ClDevice *device, Context *context) { @@ -186,8 +180,8 @@ class SimpleArgNonUniformKernelFixture : public ProgramFixture { ProgramFixture::TearDown(); } - cl_int retVal; - Kernel *kernel; + cl_int retVal = CL_SUCCESS; + Kernel *kernel = nullptr; }; class SimpleKernelFixture : public ProgramFixture { @@ -250,7 +244,6 @@ class SimpleKernelStatelessFixture : public ProgramFixture { public: DebugManagerStateRestore restorer; using ProgramFixture::SetUp; - SimpleKernelStatelessFixture() = default; protected: void SetUp(ClDevice *device, Context *context) { diff --git a/opencl/test/unit_test/global_environment.h b/opencl/test/unit_test/global_environment.h index 8bb71ed7f7..e33c82338b 100644 --- a/opencl/test/unit_test/global_environment.h +++ b/opencl/test/unit_test/global_environment.h @@ -48,9 +48,9 @@ class TestEnvironment : public ::testing::Environment { virtual std::string &igcGetMockFile(); protected: - OsLibrary *libraryFrontEnd; - OsLibrary *libraryIGC; - OsLibrary *libraryOS; + OsLibrary *libraryFrontEnd = nullptr; + OsLibrary *libraryIGC = nullptr; + OsLibrary *libraryOS = nullptr; std::vector igcDebugVarStack; std::vector fclDebugVarStack; @@ -58,14 +58,14 @@ class TestEnvironment : public ::testing::Environment { void (*igcSetDebugVarsFPtr)(MockCompilerDebugVars &debugVars); void (*fclSetDebugVarsFptr)(MockCompilerDebugVars &debugVars); - MockCompilerDebugVars fclDefaultDebugVars; - MockCompilerDebugVars igcDefaultDebugVars; - HardwareInfo hwInfoDefaultDebugVars; + MockCompilerDebugVars fclDefaultDebugVars{}; + MockCompilerDebugVars igcDefaultDebugVars{}; + HardwareInfo hwInfoDefaultDebugVars{}; - std::string fclMockFile; - std::string igcMockFile; + std::string fclMockFile{}; + std::string igcMockFile{}; - MockCompilerEnableGuard mockCompilerGuard; + MockCompilerEnableGuard mockCompilerGuard{}; }; extern TestEnvironment *gEnvironment; diff --git a/opencl/test/unit_test/helpers/cmd_buffer_validator.h b/opencl/test/unit_test/helpers/cmd_buffer_validator.h index 65252e85cf..d3f7d73d89 100644 --- a/opencl/test/unit_test/helpers/cmd_buffer_validator.h +++ b/opencl/test/unit_test/helpers/cmd_buffer_validator.h @@ -47,7 +47,7 @@ struct GenericCmdValidator : CmdValidatorWithStaticStorage struct MockCIF : BaseType { - MockCIF() - : refCount(1) { - } - void Release() override { auto prev = refCount--; assert(prev >= 1); @@ -53,7 +49,7 @@ struct MockCIF : BaseType { return true; // by default : no sub-interface are supported } - uint32_t refCount; + uint32_t refCount = 1u; }; struct MockCIFMain : MockCIF { diff --git a/opencl/test/unit_test/mocks/mock_kernel.h b/opencl/test/unit_test/mocks/mock_kernel.h index bf3b1e4fec..d9efbe6576 100644 --- a/opencl/test/unit_test/mocks/mock_kernel.h +++ b/opencl/test/unit_test/mocks/mock_kernel.h @@ -438,9 +438,7 @@ class MockParentKernel : public Kernel { info->childrenKernelsIdOffset.push_back({0, crossThreadOffset}); } - crossThreadOffset += 8; - - assert(crossThreadSize >= crossThreadOffset); + UNRECOVERABLE_IF(crossThreadSize < crossThreadOffset + 8); info->crossThreadData = new char[crossThreadSize]; auto clDevice = device.getSpecializedDevice(); diff --git a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.h b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.h index 9fbde20c72..78c26b2bcb 100644 --- a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.h +++ b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.h @@ -19,31 +19,21 @@ namespace NEO { class OfflineCompilerTests : public ::testing::Test { public: - OfflineCompilerTests() : pOfflineCompiler(nullptr), - retVal(CL_SUCCESS) { - uniqueHelper = std::make_unique(); - // ctor - } - - OfflineCompiler *pOfflineCompiler; - int retVal; - std::unique_ptr uniqueHelper; + OfflineCompiler *pOfflineCompiler = nullptr; + int retVal = CL_SUCCESS; + std::unique_ptr uniqueHelper = std::make_unique(); }; class MultiCommandTests : public ::testing::Test { public: - MultiCommandTests() : pMultiCommand(nullptr), - retVal(CL_SUCCESS) { - uniqueHelper = std::make_unique(); - } void createFileWithArgs(const std::vector &, int numOfBuild); void deleteFileWithArgs(); void deleteOutFileList(); - MultiCommand *pMultiCommand; + MultiCommand *pMultiCommand = nullptr; std::string nameOfFileWithArgs; std::string outFileList; - int retVal; - std::unique_ptr uniqueHelper; + int retVal = CL_SUCCESS; + std::unique_ptr uniqueHelper = std::make_unique(); }; void MultiCommandTests::createFileWithArgs(const std::vector &singleArgs, int numOfBuild) { diff --git a/opencl/test/unit_test/program/program_from_binary.h b/opencl/test/unit_test/program/program_from_binary.h index a222c0b280..dbcc9f520a 100644 --- a/opencl/test/unit_test/program/program_from_binary.h +++ b/opencl/test/unit_test/program/program_from_binary.h @@ -29,11 +29,6 @@ class ProgramFromBinaryTest : public DeviceFixture, using ContextFixture::SetUp; protected: - ProgramFromBinaryTest() : BinaryFileName(nullptr), - KernelName(nullptr), - retVal(CL_SUCCESS) { - } - void SetUp() override { std::tie(BinaryFileName, KernelName) = GetParam(); @@ -60,9 +55,9 @@ class ProgramFromBinaryTest : public DeviceFixture, options = optionsIn; } - const char *BinaryFileName; - const char *KernelName; - cl_int retVal; + const char *BinaryFileName = nullptr; + const char *KernelName = nullptr; + cl_int retVal = CL_SUCCESS; std::string options; }; @@ -76,9 +71,6 @@ class ProgramSimpleFixture : public DeviceFixture, using ContextFixture::SetUp; public: - ProgramSimpleFixture() : retVal(CL_SUCCESS) { - } - void SetUp() override { DeviceFixture::SetUp(); @@ -95,6 +87,6 @@ class ProgramSimpleFixture : public DeviceFixture, } protected: - cl_int retVal; + cl_int retVal = CL_SUCCESS; }; } // namespace NEO