Improve KernelInfo handling:

Remove wrapper for KernelInfo constructor
Switch to unique pointer where possible

Change-Id: Ib3f323e34836e1d189d836fd539ab45518609610

Author: AdamCetnerowski

runtime/program/kernel_info.cpp

@@ -209,10 +209,6 @@ void WorkSizeInfo::checkRatio(const size_t workItems[3]) {
     }
 }
 
-KernelInfo *KernelInfo::create() {
-    return new KernelInfo();
-}
-
 KernelInfo::~KernelInfo() {
     kernelArgInfo.clear();
 

runtime/program/kernel_info.h

@@ -128,7 +128,6 @@ struct DebugData {
 
 struct KernelInfo {
   public:
-    static KernelInfo *create();
     KernelInfo() {
         heapInfo = {};
         patchInfo = {};

runtime/program/process_gen_binary.cpp

@@ -80,7 +80,7 @@ size_t Program::processKernel(
     size_t sizeProcessed = 0;
 
     do {
-        auto pKernelInfo = KernelInfo::create();
+        auto pKernelInfo = new KernelInfo();
         if (!pKernelInfo) {
             retVal = CL_OUT_OF_HOST_MEMORY;
             break;
@@ -113,7 +113,6 @@ size_t Program::processKernel(
         retVal = parsePatchList(*pKernelInfo);
         if (retVal != CL_SUCCESS) {
             delete pKernelInfo;
-
             sizeProcessed = ptrDiff(pCurKernelPtr, pKernelBlob);
             break;
         }

unit_tests/accelerators/media_image_arg_tests.cpp

@@ -47,7 +47,8 @@ class MediaImageSetArgTest : public DeviceFixture,
   protected:
     void SetUp() override {
         DeviceFixture::SetUp();
-        pKernelInfo = KernelInfo::create();
+
+        pKernelInfo = std::make_unique<KernelInfo>();
         program = std::make_unique<MockProgram>(*pDevice->getExecutionEnvironment());
 
         kernelHeader.SurfaceStateHeapSize = sizeof(surfaceStateHeap);
@@ -82,7 +83,7 @@ class MediaImageSetArgTest : public DeviceFixture,
     void TearDown() override {
         delete srcImage;
         delete pKernel;
-        delete pKernelInfo;
+
         delete context;
         DeviceFixture::TearDown();
     }
@@ -92,7 +93,7 @@ class MediaImageSetArgTest : public DeviceFixture,
     std::unique_ptr<MockProgram> program;
     MockKernel *pKernel = nullptr;
     SKernelBinaryHeaderCommon kernelHeader;
-    KernelInfo *pKernelInfo = nullptr;
+    std::unique_ptr<KernelInfo> pKernelInfo;
     char surfaceStateHeap[0x80];
     Image *srcImage = nullptr;
 };

unit_tests/api/cl_create_kernel_tests.inl

@@ -89,7 +89,7 @@ TEST_F(clCreateKernelTests, returnsSuccess) {
 
 TEST_F(clCreateKernelTests, givenInvalidKernelWhenCreatingNewKernelThenReturnClInvalidProgramExecutable) {
     cl_kernel kernel = nullptr;
-    KernelInfo *pKernelInfo = KernelInfo::create();
+    KernelInfo *pKernelInfo = new KernelInfo();
     pKernelInfo->isValid = false;
 
     std::unique_ptr<MockProgram> pMockProg = std::make_unique<MockProgram>(*pPlatform->peekExecutionEnvironment(), pContext, false);
@@ -170,7 +170,7 @@ TEST_F(clCreateKernelTests, nullProgram) {
 
 TEST_F(clCreateKernelTests, givenNullKernelNameWhenCreatingNewKernelThenReturnClInvalidValue) {
     cl_kernel kernel = nullptr;
-    KernelInfo *pKernelInfo = KernelInfo::create();
+    KernelInfo *pKernelInfo = new KernelInfo();
     pKernelInfo->isValid = true;
 
     std::unique_ptr<MockProgram> pMockProg = std::make_unique<MockProgram>(*pPlatform->peekExecutionEnvironment(), pContext, false);

unit_tests/api/cl_set_kernel_arg_svm_pointer_tests.inl

@@ -40,7 +40,7 @@ class KernelArgSvmFixture : public api_fixture, public DeviceFixture {
         DeviceFixture::SetUp();
 
         // define kernel info
-        pKernelInfo = KernelInfo::create();
+        pKernelInfo = std::make_unique<KernelInfo>();
 
         // setup kernel arg offsets
         KernelArgPatchInfo kernelArgPatchInfo;
@@ -66,15 +66,14 @@ class KernelArgSvmFixture : public api_fixture, public DeviceFixture {
 
     void TearDown() override {
         delete pMockKernel;
-        delete pKernelInfo;
 
         DeviceFixture::TearDown();
         api_fixture::TearDown();
     }
 
     cl_int retVal = CL_SUCCESS;
     MockKernel *pMockKernel = nullptr;
-    KernelInfo *pKernelInfo = nullptr;
+    std::unique_ptr<KernelInfo> pKernelInfo;
     SKernelBinaryHeaderCommon kernelHeader;
     char pSshLocal[64];
     char pCrossThreadData[64];

unit_tests/api/cl_set_kernel_exec_info_tests.inl

@@ -31,7 +31,7 @@ class KernelExecInfoFixture : public api_fixture {
     void SetUp() override {
         api_fixture::SetUp();
 
-        pKernelInfo = KernelInfo::create();
+        pKernelInfo = std::make_unique<KernelInfo>();
 
         pMockKernel = new MockKernel(pProgram, *pKernelInfo, *pPlatform->getDevice(0));
         ASSERT_EQ(CL_SUCCESS, pMockKernel->initialize());
@@ -48,14 +48,13 @@ class KernelExecInfoFixture : public api_fixture {
         }
 
         delete pMockKernel;
-        delete pKernelInfo;
 
         api_fixture::TearDown();
     }
 
     cl_int retVal = CL_SUCCESS;
     MockKernel *pMockKernel = nullptr;
-    KernelInfo *pKernelInfo = nullptr;
+    std::unique_ptr<KernelInfo> pKernelInfo;
     void *ptrSvm = nullptr;
     cl_device_svm_capabilities svmCapabilities = 0;
 };

unit_tests/fixtures/kernel_arg_fixture.cpp

@@ -21,6 +21,7 @@
  */
 
 #include "unit_tests/fixtures/kernel_arg_fixture.h"
+#include "runtime/program/kernel_info.h"
 
 #include "unit_tests/fixtures/image_fixture.h"
 #include "unit_tests/mocks/mock_context.h"
@@ -31,7 +32,7 @@
 KernelImageArgTest::~KernelImageArgTest() = default;
 
 void KernelImageArgTest::SetUp() {
-    pKernelInfo.reset(OCLRT::KernelInfo::create());
+    pKernelInfo = std::make_unique<OCLRT::KernelInfo>();
     KernelArgPatchInfo kernelArgPatchInfo;
     kernelHeader.reset(new iOpenCL::SKernelBinaryHeaderCommon{});
 

unit_tests/fixtures/preemption_fixture.cpp

@@ -49,7 +49,7 @@ void DevicePreemptionTests::SetUp() {
         dbgRestore.reset(new DebugManagerStateRestore());
     }
     const cl_queue_properties properties[3] = {CL_QUEUE_PROPERTIES, 0, 0};
-    kernelInfo.reset(KernelInfo::create());
+    kernelInfo = std::make_unique<KernelInfo>();
     device.reset(MockDevice::createWithNewExecutionEnvironment<MockDevice>(nullptr));
     context.reset(new MockContext(device.get()));
     cmdQ.reset(new MockCommandQueue(context.get(), device.get(), properties));

unit_tests/gtpin/gtpin_tests.cpp

@@ -2257,7 +2257,7 @@ TEST_F(GTPinTests, givenInitializedGTPinInterfaceWhenOnKernelSubitIsCalledThenCo
     std::unique_ptr<MockContext> context(new MockContext(pDevice));
 
     EXPECT_EQ(CL_SUCCESS, retVal);
-    std::unique_ptr<KernelInfo> pKernelInfo(KernelInfo::create());
+    auto pKernelInfo = std::make_unique<KernelInfo>();
     kernelHeader.SurfaceStateHeapSize = sizeof(surfaceStateHeap);
     pKernelInfo->heapInfo.pSsh = surfaceStateHeap;
     pKernelInfo->heapInfo.pKernelHeader = &kernelHeader;