Add executionEnvironment field to Program

Change-Id: Id624177aa3f0b5525bac86e2e0a935ebaf53480e
Signed-off-by: Maciej Dziuban <[email protected]>

Author: DziubanMaciejIntel

runtime/api/api.cpp

@@ -1361,7 +1361,7 @@ cl_program CL_API_CALL clLinkProgram(cl_context context,
         pContext = castToObject<Context>(context);
     }
     if (pContext != nullptr) {
-        program = new Program(pContext, false);
+        program = new Program(*pContext->getDevice(0)->getExecutionEnvironment(), pContext, false);
         retVal = program->link(numDevices, deviceList, options,
                                numInputPrograms, inputPrograms,
                                funcNotify, userData);

runtime/program/create.inl

@@ -37,7 +37,7 @@ T *Program::create(
     auto pContext = castToObject<Context>(context);
     DEBUG_BREAK_IF(!pContext);
 
-    auto program = new T(pContext, false);
+    auto program = new T(*pContext->getDevice(0)->getExecutionEnvironment(), pContext, false);
 
     auto retVal = program->createProgramFromBinary(binaries[0], lengths[0]);
 
@@ -76,7 +76,7 @@ T *Program::create(
         lengths);
 
     if (CL_SUCCESS == retVal) {
-        program = new T(pContext, false);
+        program = new T(*pContext->getDevice(0)->getExecutionEnvironment(), pContext, false);
         program->sourceCode.swap(combinedString);
     }
 
@@ -99,7 +99,7 @@ T *Program::create(
     }
 
     if (retVal == CL_SUCCESS) {
-        program = new T();
+        program = new T(*device.getExecutionEnvironment());
         program->setSource((char *)nullTerminatedString);
         program->context = context;
         program->isBuiltIn = isBuiltIn;
@@ -136,7 +136,7 @@ T *Program::createFromGenBinary(
     }
 
     if (CL_SUCCESS == retVal) {
-        program = new T(context, isBuiltIn);
+        program = new T(executionEnvironment, context, isBuiltIn);
         program->numDevices = 1;
         program->storeGenBinary(binary, size);
         program->isCreatedFromBinary = true;
@@ -164,7 +164,7 @@ T *Program::createFromIL(Context *ctx,
         return nullptr;
     }
 
-    T *program = new T(ctx, false);
+    T *program = new T(*ctx->getDevice(0)->getExecutionEnvironment(), ctx, false);
     errcodeRet = program->createProgramFromBinary(il, length);
     if (errcodeRet != CL_SUCCESS) {
         delete program;

runtime/program/program.cpp

@@ -36,11 +36,13 @@ namespace OCLRT {
 const std::string Program::clOptNameClVer("-cl-std=CL");
 const std::string Program::clOptNameUniformWgs{"-cl-uniform-work-group-size"};
 
-Program::Program() : Program(nullptr, false) {
+Program::Program(ExecutionEnvironment &executionEnvironment) : Program(executionEnvironment, nullptr, false) {
     numDevices = 0;
 }
 
-Program::Program(Context *context, bool isBuiltIn) : context(context), isBuiltIn(isBuiltIn) {
+Program::Program(ExecutionEnvironment &executionEnvironment, Context *context, bool isBuiltIn) : executionEnvironment(executionEnvironment),
+                                                                                                 context(context),
+                                                                                                 isBuiltIn(isBuiltIn) {
     if (this->context && !this->isBuiltIn) {
         this->context->incRefInternal();
     }

runtime/program/program.h

@@ -41,6 +41,7 @@
 namespace OCLRT {
 class Context;
 class CompilerInterface;
+class ExecutionEnvironment;
 template <>
 struct OpenCLObjectMapper<_cl_program> {
     typedef class Program DerivedType;
@@ -95,7 +96,7 @@ class Program : public BaseObject<_cl_program> {
                            size_t length,
                            cl_int &errcodeRet);
 
-    Program(Context *context, bool isBuiltIn);
+    Program(ExecutionEnvironment &executionEnvironment, Context *context, bool isBuiltIn);
     ~Program() override;
 
     Program(const Program &) = delete;
@@ -144,6 +145,10 @@ class Program : public BaseObject<_cl_program> {
         return context;
     }
 
+    ExecutionEnvironment &peekExecutionEnvironment() const {
+        return executionEnvironment;
+    }
+
     const Device &getDevice(cl_uint deviceOrdinal) const {
         return *pDevice;
     }
@@ -240,7 +245,7 @@ class Program : public BaseObject<_cl_program> {
     }
 
   protected:
-    Program();
+    Program(ExecutionEnvironment &executionEnvironment);
 
     MOCKABLE_VIRTUAL bool isSafeToSkipUnhandledToken(unsigned int token) const;
 
@@ -322,6 +327,7 @@ class Program : public BaseObject<_cl_program> {
 
     std::map<const Device*, std::string>  buildLog;
 
+    ExecutionEnvironment&     executionEnvironment;
     Context*                  context;
     Device*                   pDevice;
     cl_uint                   numDevices;

unit_tests/accelerators/media_image_arg_tests.cpp

@@ -48,7 +48,7 @@ class MediaImageSetArgTest : public DeviceFixture,
     void SetUp() override {
         DeviceFixture::SetUp();
         pKernelInfo = KernelInfo::create();
-        program = std::make_unique<MockProgram>();
+        program = std::make_unique<MockProgram>(*pDevice->getExecutionEnvironment());
 
         kernelHeader.SurfaceStateHeapSize = sizeof(surfaceStateHeap);
         pKernelInfo->heapInfo.pSsh = surfaceStateHeap;

unit_tests/api/cl_api_tests.cpp

@@ -47,7 +47,7 @@ void api_fixture::SetUp() {
 
     pCommandQueue = new CommandQueue(pContext, pDevice, 0);
 
-    pProgram = new MockProgram(pContext, false);
+    pProgram = new MockProgram(*pDevice->getExecutionEnvironment(), pContext, false);
 
     pKernel = new MockKernel(pProgram, *pProgram->MockProgram::getKernelInfo(), *pDevice);
     ASSERT_NE(nullptr, pKernel);
@@ -76,7 +76,7 @@ void api_fixture_using_aligned_memory_manager::SetUp() {
 
     commandQueue = new CommandQueue(context, devPtr, 0);
 
-    program = new MockProgram(ctxPtr, false);
+    program = new MockProgram(*device->getExecutionEnvironment(), ctxPtr, false);
     Program *prgPtr = reinterpret_cast<Program *>(program);
 
     kernel = new MockKernel(prgPtr, *program->MockProgram::getKernelInfo(), *devPtr);

unit_tests/api/cl_create_kernel_tests.inl

@@ -92,7 +92,7 @@ TEST_F(clCreateKernelTests, givenInvalidKernelWhenCreatingNewKernelThenReturnClI
     KernelInfo *pKernelInfo = KernelInfo::create();
     pKernelInfo->isValid = false;
 
-    std::unique_ptr<MockProgram> pMockProg = std::make_unique<MockProgram>(pContext, false);
+    std::unique_ptr<MockProgram> pMockProg = std::make_unique<MockProgram>(*pPlatform->peekExecutionEnvironment(), pContext, false);
     pMockProg->addKernelInfo(pKernelInfo);
     pMockProg->SetBuildStatus(CL_BUILD_SUCCESS);
 
@@ -173,7 +173,7 @@ TEST_F(clCreateKernelTests, givenNullKernelNameWhenCreatingNewKernelThenReturnCl
     KernelInfo *pKernelInfo = KernelInfo::create();
     pKernelInfo->isValid = true;
 
-    std::unique_ptr<MockProgram> pMockProg = std::make_unique<MockProgram>(pContext, false);
+    std::unique_ptr<MockProgram> pMockProg = std::make_unique<MockProgram>(*pPlatform->peekExecutionEnvironment(), pContext, false);
     pMockProg->addKernelInfo(pKernelInfo);
 
     kernel = clCreateKernel(
@@ -199,7 +199,7 @@ TEST_F(clCreateKernelTests, invalidProgram) {
 
 TEST_F(clCreateKernelTests, givenProgramWithBuildErrorWhenCreatingNewKernelThenReturnClInvalidProgramExecutable) {
     cl_kernel kernel = nullptr;
-    std::unique_ptr<MockProgram> pMockProg = std::make_unique<MockProgram>(pContext, false);
+    std::unique_ptr<MockProgram> pMockProg = std::make_unique<MockProgram>(*pPlatform->peekExecutionEnvironment(), pContext, false);
     pMockProg->SetBuildStatus(CL_BUILD_ERROR);
 
     kernel = clCreateKernel(

unit_tests/built_ins/built_in_tests.cpp

@@ -458,7 +458,7 @@ HWTEST_F(BuiltInTests, givenKernelWithAuxTranslationRequiredWhenEnqueueCalledThe
     auto mockAuxBuiltInOp = new MockAuxBuilInOp<FamilyType>(*pBuiltIns, *pContext, *pDevice);
     pBuiltIns->BuiltinOpsBuilders[static_cast<uint32_t>(EBuiltInOps::AuxTranslation)].first.reset(mockAuxBuiltInOp);
 
-    MockProgram mockProgram;
+    MockProgram mockProgram(*pDevice->getExecutionEnvironment());
     auto mockBuiltinKernel = MockKernel::create(*pDevice, &mockProgram);
     mockAuxBuiltInOp->usedKernels.at(0).reset(mockBuiltinKernel);
 

unit_tests/command_queue/command_queue_tests.cpp

@@ -920,7 +920,7 @@ TEST(CommandQueue, givenEnqueueAcquireSharedObjectsCallWhenAcquireFailsThenCorre
 
 HWTEST_F(CommandQueueCommandStreamTest, givenDebugKernelWhenSetupDebugSurfaceIsCalledThenSurfaceStateIsCorrectlySet) {
     using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE;
-    MockProgram program;
+    MockProgram program(*pDevice->getExecutionEnvironment());
     program.enableKernelDebug();
     std::unique_ptr<MockDebugKernel> kernel(MockKernel::create<MockDebugKernel>(*pDevice, &program));
     CommandQueue cmdQ(context.get(), pDevice, 0);
@@ -939,7 +939,7 @@ HWTEST_F(CommandQueueCommandStreamTest, givenDebugKernelWhenSetupDebugSurfaceIsC
 
 HWTEST_F(CommandQueueCommandStreamTest, givenCsrWithDebugSurfaceAllocatedWhenSetupDebugSurfaceIsCalledThenDebugSurfaceIsReused) {
     using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE;
-    MockProgram program;
+    MockProgram program(*pDevice->getExecutionEnvironment());
     program.enableKernelDebug();
     std::unique_ptr<MockDebugKernel> kernel(MockKernel::create<MockDebugKernel>(*pDevice, &program));
     CommandQueue cmdQ(context.get(), pDevice, 0);