From 7f7daef49ca64d20d6f84e39afe901aef4569907 Mon Sep 17 00:00:00 2001 From: "Mrozek, Michal" Date: Wed, 28 Feb 2018 13:06:23 +0100 Subject: [PATCH] Avoid default parameter to program constructor. Change-Id: I75e9a619131f7d8721416cf18d87418568d04f25 --- runtime/api/api.cpp | 2 +- runtime/program/create.inl | 4 +- runtime/program/program.cpp | 2 +- runtime/program/program.h | 2 +- unit_tests/api/cl_api_tests.cpp | 4 +- unit_tests/api/cl_create_kernel_tests.cpp | 2 +- .../compiler_interface/binary_cache_tests.cpp | 6 +-- .../compiler_interface_tests.cpp | 8 ++-- unit_tests/event/event_tests.cpp | 2 +- unit_tests/fixtures/scenario_test_fixture.h | 2 +- .../helpers/dispatch_info_builder_tests.cpp | 2 +- unit_tests/helpers/dispatch_info_tests.cpp | 2 +- unit_tests/helpers/kernel_commands_tests.cpp | 8 ++-- unit_tests/kernel/clone_kernel_tests.cpp | 2 +- .../kernel/kernel_accelerator_arg_tests.cpp | 2 +- .../kernel/kernel_arg_buffer_fixture.cpp | 2 +- unit_tests/kernel/kernel_arg_pipe_tests.cpp | 2 +- unit_tests/kernel/kernel_arg_svm_tests.cpp | 2 +- unit_tests/kernel/kernel_tests.cpp | 26 ++++++------ unit_tests/mem_obj/buffer_set_arg_tests.cpp | 2 +- unit_tests/mocks/mock_kernel.h | 2 +- unit_tests/mocks/mock_program.h | 2 +- .../debug_settings_manager_tests.cpp | 2 +- unit_tests/program/printf_handler_tests.cpp | 4 +- unit_tests/program/program_tests.cpp | 42 +++++++++---------- .../program_with_block_kernels_tests.cpp | 2 +- 26 files changed, 69 insertions(+), 69 deletions(-) diff --git a/runtime/api/api.cpp b/runtime/api/api.cpp index 80c57dadcd..54290b703f 100644 --- a/runtime/api/api.cpp +++ b/runtime/api/api.cpp @@ -1226,7 +1226,7 @@ cl_program CL_API_CALL clLinkProgram(cl_context context, pContext = castToObject(context); } if (pContext != nullptr) { - program = new Program(pContext); + program = new Program(pContext, false); Program *pProgram = castToObject(program); retVal = pProgram->link(numDevices, deviceList, options, numInputPrograms, inputPrograms, diff --git a/runtime/program/create.inl b/runtime/program/create.inl index d7bd4d06db..f6c250716a 100644 --- a/runtime/program/create.inl +++ b/runtime/program/create.inl @@ -37,7 +37,7 @@ T *Program::create( auto pContext = castToObject(context); DEBUG_BREAK_IF(!pContext); - auto program = new T(pContext); + auto program = new T(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); + program = new T(pContext, false); program->sourceCode.swap(combinedString); } diff --git a/runtime/program/program.cpp b/runtime/program/program.cpp index dfc8467860..8dc7f04c17 100644 --- a/runtime/program/program.cpp +++ b/runtime/program/program.cpp @@ -35,7 +35,7 @@ namespace OCLRT { const std::string Program::clOptNameClVer("-cl-std=CL"); const std::string Program::clOptNameUniformWgs{"-cl-uniform-work-group-size"}; -Program::Program() : Program(nullptr) { +Program::Program() : Program(nullptr, false) { numDevices = 0; } diff --git a/runtime/program/program.h b/runtime/program/program.h index d78576e682..f9856e35a7 100644 --- a/runtime/program/program.h +++ b/runtime/program/program.h @@ -116,7 +116,7 @@ class Program : public BaseObject<_cl_program> { size_t length, cl_int &errcodeRet); - Program(Context *context, bool isBuiltIn = false); + Program(Context *context, bool isBuiltIn); ~Program() override; Program(const Program &) = delete; diff --git a/unit_tests/api/cl_api_tests.cpp b/unit_tests/api/cl_api_tests.cpp index 303ab04970..d4a7a8d31f 100644 --- a/unit_tests/api/cl_api_tests.cpp +++ b/unit_tests/api/cl_api_tests.cpp @@ -48,7 +48,7 @@ void api_fixture::SetUp() { pCommandQueue = new CommandQueue(pContext, pDevice, 0); - pProgram = new MockProgram(pContext); + pProgram = new MockProgram(pContext, false); pKernel = new MockKernel(pProgram, *pProgram->MockProgram::getKernelInfo(), *pDevice); ASSERT_NE(nullptr, pKernel); @@ -82,7 +82,7 @@ void api_fixture_using_aligned_memory_manager::SetUp() { commandQueue = new CommandQueue(context, devPtr, 0); - program = new MockProgram(ctxPtr); + program = new MockProgram(ctxPtr, false); Program *prgPtr = reinterpret_cast(program); kernel = new MockKernel(prgPtr, *program->MockProgram::getKernelInfo(), *devPtr); diff --git a/unit_tests/api/cl_create_kernel_tests.cpp b/unit_tests/api/cl_create_kernel_tests.cpp index 70c1adbf26..ad9246242d 100644 --- a/unit_tests/api/cl_create_kernel_tests.cpp +++ b/unit_tests/api/cl_create_kernel_tests.cpp @@ -98,7 +98,7 @@ TEST_F(clCreateKernelTests, invalidKernel) { pKernelInfo->isValid = false; pKernelInfo->name = "CopyBuffer"; - MockProgram *pMockProg = new MockProgram(pContext); + MockProgram *pMockProg = new MockProgram(pContext, false); pMockProg->addKernelInfo(pKernelInfo); kernel = clCreateKernel( diff --git a/unit_tests/compiler_interface/binary_cache_tests.cpp b/unit_tests/compiler_interface/binary_cache_tests.cpp index f31d0adaeb..acb020c02c 100644 --- a/unit_tests/compiler_interface/binary_cache_tests.cpp +++ b/unit_tests/compiler_interface/binary_cache_tests.cpp @@ -358,7 +358,7 @@ TEST_F(CompilerInterfaceCachedTests, canInjectCache) { } TEST_F(CompilerInterfaceCachedTests, notCachedAndIgcFailed) { MockContext context(pDevice, true); - MockProgram program(&context); + MockProgram program(&context, false); BinaryCacheMock cache; TranslationArgs inputArgs; @@ -389,7 +389,7 @@ TEST_F(CompilerInterfaceCachedTests, notCachedAndIgcFailed) { TEST_F(CompilerInterfaceCachedTests, wasCached) { MockContext context(pDevice, true); - MockProgram program(&context); + MockProgram program(&context, false); BinaryCacheMock cache; TranslationArgs inputArgs; @@ -420,7 +420,7 @@ TEST_F(CompilerInterfaceCachedTests, wasCached) { TEST_F(CompilerInterfaceCachedTests, builtThenCached) { MockContext context(pDevice, true); - MockProgram program(&context); + MockProgram program(&context, false); BinaryCacheMock cache; TranslationArgs inputArgs; diff --git a/unit_tests/compiler_interface/compiler_interface_tests.cpp b/unit_tests/compiler_interface/compiler_interface_tests.cpp index 04330568a1..0fcfd7966d 100644 --- a/unit_tests/compiler_interface/compiler_interface_tests.cpp +++ b/unit_tests/compiler_interface/compiler_interface_tests.cpp @@ -82,7 +82,7 @@ class CompilerInterfaceTest : public MemoryManagementFixture, cl_device_id clDevice = pDevice; pContext = Context::create(nullptr, DeviceVector(&clDevice, 1), nullptr, nullptr, retVal); - pProgram = new Program(pContext); + pProgram = new Program(pContext, false); inputArgs.pInput = (char *)pSource; inputArgs.InputSize = (uint32_t)sourceSize; @@ -482,7 +482,7 @@ TEST_F(CompilerInterfaceTest, igcBuildFailure) { TEST_F(CompilerInterfaceTest, CompileAndLinkSpirToIsa) { // compile and link from SPIR binary to gen ISA - MockProgram program(pContext); + MockProgram program(pContext, false); char binary[] = "BC\xc0\xde "; auto retVal = program.createProgramFromBinary(binary, sizeof(binary)); EXPECT_EQ(CL_SUCCESS, retVal); @@ -494,7 +494,7 @@ TEST_F(CompilerInterfaceTest, CompileAndLinkSpirToIsa) { TEST_F(CompilerInterfaceTest, BuildSpirToIsa) { // build from SPIR binary to gen ISA - MockProgram program(pContext); + MockProgram program(pContext, false); char binary[] = "BC\xc0\xde "; auto retVal = program.createProgramFromBinary(binary, sizeof(binary)); EXPECT_EQ(CL_SUCCESS, retVal); @@ -504,7 +504,7 @@ TEST_F(CompilerInterfaceTest, BuildSpirToIsa) { TEST_F(CompilerInterfaceTest, BuildSpirvToIsa) { // build from SPIR binary to gen ISA - MockProgram program(pContext); + MockProgram program(pContext, false); uint64_t spirv[16] = {0x03022307}; auto retVal = program.createProgramFromBinary(spirv, sizeof(spirv)); EXPECT_EQ(CL_SUCCESS, retVal); diff --git a/unit_tests/event/event_tests.cpp b/unit_tests/event/event_tests.cpp index 9973dfa11a..d6eae2738f 100644 --- a/unit_tests/event/event_tests.cpp +++ b/unit_tests/event/event_tests.cpp @@ -593,7 +593,7 @@ TEST_F(InternalsEventTest, givenBlockedKernelWithPrintfWhenSubmittedThenPrintOut pKernelInfo->patchInfo.pAllocateStatelessPrintfSurface = pPrintfSurface; pKernelInfo->patchInfo.stringDataMap.insert(std::make_pair(0, printfStringInfo)); - MockProgram *pProgram = new MockProgram(mockContext); + MockProgram *pProgram = new MockProgram(mockContext, false); uint64_t crossThread[10]; MockKernel *pKernel = new MockKernel(pProgram, *pKernelInfo, *pDevice); diff --git a/unit_tests/fixtures/scenario_test_fixture.h b/unit_tests/fixtures/scenario_test_fixture.h index d65a6535b6..73c97da188 100644 --- a/unit_tests/fixtures/scenario_test_fixture.h +++ b/unit_tests/fixtures/scenario_test_fixture.h @@ -52,7 +52,7 @@ class ScenarioTest : public ::testing::Test, cl_device_id clDevice = pDevice; context = Context::create(nullptr, DeviceVector(&clDevice, 1), nullptr, nullptr, retVal); commandQueue = new MockCommandQueue(context, pDevice, 0); - program = new MockProgram(context); + program = new MockProgram(context, false); kernelInternals = new MockKernelWithInternals(*pDevice, context); kernel = kernelInternals->mockKernel; diff --git a/unit_tests/helpers/dispatch_info_builder_tests.cpp b/unit_tests/helpers/dispatch_info_builder_tests.cpp index a3144037a3..83d7e71426 100644 --- a/unit_tests/helpers/dispatch_info_builder_tests.cpp +++ b/unit_tests/helpers/dispatch_info_builder_tests.cpp @@ -81,7 +81,7 @@ class DispatchInfoBuilderFixture : public ContextFixture, public DeviceFixture, pKernelInfo->kernelArgInfo[2].kernelArgPatchInfoVector[0].crossthreadOffset = 0x50; pKernelInfo->kernelArgInfo[2].kernelArgPatchInfoVector[0].size = (uint32_t)sizeof(void *); - pProgram = new MockProgram(pContext); + pProgram = new MockProgram(pContext, false); pKernel = new MockKernel(pProgram, *pKernelInfo, *pDevice); ASSERT_EQ(CL_SUCCESS, pKernel->initialize()); diff --git a/unit_tests/helpers/dispatch_info_tests.cpp b/unit_tests/helpers/dispatch_info_tests.cpp index ee32121422..0df67eb9ad 100644 --- a/unit_tests/helpers/dispatch_info_tests.cpp +++ b/unit_tests/helpers/dispatch_info_tests.cpp @@ -53,7 +53,7 @@ class DispatchInfoFixture : public ContextFixture, public DeviceFixture, public pKernelInfo->patchInfo.mediavfestate = pMediaVFEstate; pPrintfSurface = new SPatchAllocateStatelessPrintfSurface(); pKernelInfo->patchInfo.pAllocateStatelessPrintfSurface = pPrintfSurface; - pProgram = new MockProgram(pContext); + pProgram = new MockProgram(pContext, false); pKernel = new MockKernel(pProgram, *pKernelInfo, *pDevice); pKernel->slmTotalSize = 128; diff --git a/unit_tests/helpers/kernel_commands_tests.cpp b/unit_tests/helpers/kernel_commands_tests.cpp index 35e8d4ea26..e79d519cd1 100644 --- a/unit_tests/helpers/kernel_commands_tests.cpp +++ b/unit_tests/helpers/kernel_commands_tests.cpp @@ -410,7 +410,7 @@ HWTEST_F(KernelCommandsTest, usedBindingTableStatePointersForGlobalAndConstantAn // create program with valid context MockContext context; - MockProgram program(&context); + MockProgram program(&context, false); // setup global memory char globalBuffer[16]; @@ -531,7 +531,7 @@ HWTEST_F(KernelCommandsTest, setBindingTableStatesForKernelWithBuffersNotRequiri // create program with valid context MockContext context; - MockProgram program(&context); + MockProgram program(&context, false); // create kernel MockKernel *pKernel = new MockKernel(&program, *pKernelInfo, *pDevice); @@ -590,7 +590,7 @@ HWTEST_F(KernelCommandsTest, setBindingTableStatesForNoSurfaces) { // create program with valid context MockContext context; - MockProgram program(&context); + MockProgram program(&context, false); // create kernel MockKernel *pKernel = new MockKernel(&program, *pKernelInfo, *pDevice); @@ -790,7 +790,7 @@ HWTEST_F(KernelCommandsTest, getSizeRequiredIHForExecutionModelReturnsZeroForNon // create program with valid context MockContext context; - MockProgram program(&context); + MockProgram program(&context, false); // create kernel std::unique_ptr pKernel = std::unique_ptr(new MockKernel(&program, *pKernelInfo.get(), *pDevice)); diff --git a/unit_tests/kernel/clone_kernel_tests.cpp b/unit_tests/kernel/clone_kernel_tests.cpp index e9581f2213..64503221b4 100644 --- a/unit_tests/kernel/clone_kernel_tests.cpp +++ b/unit_tests/kernel/clone_kernel_tests.cpp @@ -97,7 +97,7 @@ class CloneKernelFixture : public ContextFixture, public DeviceFixture, public M pKernelInfo->kernelArgInfo[0].offsetVmeSadAdjustMode = 0x14; pKernelInfo->kernelArgInfo[0].offsetVmeSearchPathType = 0x1c; - pProgram = new MockProgram(pContext); + pProgram = new MockProgram(pContext, false); pSourceKernel = new MockKernel(pProgram, *pKernelInfo, *pDevice); ASSERT_EQ(CL_SUCCESS, pSourceKernel->initialize()); diff --git a/unit_tests/kernel/kernel_accelerator_arg_tests.cpp b/unit_tests/kernel/kernel_accelerator_arg_tests.cpp index a92ab3031a..1b0a54a836 100644 --- a/unit_tests/kernel/kernel_accelerator_arg_tests.cpp +++ b/unit_tests/kernel/kernel_accelerator_arg_tests.cpp @@ -78,7 +78,7 @@ class KernelArgAcceleratorFixture : public ContextFixture, public DeviceFixture, pKernelInfo->kernelArgInfo[0].offsetVmeSadAdjustMode = 0x14; pKernelInfo->kernelArgInfo[0].offsetVmeSearchPathType = 0x1c; - pProgram = new MockProgram(pContext); + pProgram = new MockProgram(pContext, false); pKernel = new MockKernel(pProgram, *pKernelInfo, *pDevice); ASSERT_EQ(CL_SUCCESS, pKernel->initialize()); diff --git a/unit_tests/kernel/kernel_arg_buffer_fixture.cpp b/unit_tests/kernel/kernel_arg_buffer_fixture.cpp index 66555b674e..6fa27ae77b 100644 --- a/unit_tests/kernel/kernel_arg_buffer_fixture.cpp +++ b/unit_tests/kernel/kernel_arg_buffer_fixture.cpp @@ -63,7 +63,7 @@ void KernelArgBufferFixture::SetUp() { pKernelInfo->kernelArgInfo[0].kernelArgPatchInfoVector[0].crossthreadOffset = 0x30; pKernelInfo->kernelArgInfo[0].kernelArgPatchInfoVector[0].size = (uint32_t)sizeof(void *); - pProgram = new MockProgram(pContext); + pProgram = new MockProgram(pContext, false); pKernel = new MockKernel(pProgram, *pKernelInfo, *pDevice); ASSERT_EQ(CL_SUCCESS, pKernel->initialize()); diff --git a/unit_tests/kernel/kernel_arg_pipe_tests.cpp b/unit_tests/kernel/kernel_arg_pipe_tests.cpp index 41adb80934..4490d7d210 100644 --- a/unit_tests/kernel/kernel_arg_pipe_tests.cpp +++ b/unit_tests/kernel/kernel_arg_pipe_tests.cpp @@ -72,7 +72,7 @@ class KernelArgPipeFixture : public ContextFixture, public DeviceFixture, public pKernelInfo->kernelArgInfo[0].kernelArgPatchInfoVector[0].crossthreadOffset = 0x30; pKernelInfo->kernelArgInfo[0].kernelArgPatchInfoVector[0].size = (uint32_t)sizeof(void *); - pProgram = new MockProgram(pContext); + pProgram = new MockProgram(pContext, false); pKernel = new MockKernel(pProgram, *pKernelInfo, *pDevice); ASSERT_EQ(CL_SUCCESS, pKernel->initialize()); diff --git a/unit_tests/kernel/kernel_arg_svm_tests.cpp b/unit_tests/kernel/kernel_arg_svm_tests.cpp index d4fc51fdf2..55d1d62a51 100644 --- a/unit_tests/kernel/kernel_arg_svm_tests.cpp +++ b/unit_tests/kernel/kernel_arg_svm_tests.cpp @@ -71,7 +71,7 @@ class KernelArgSvmFixture_ : public ContextFixture, public DeviceFixture, public pKernelInfo->kernelArgInfo[0].kernelArgPatchInfoVector[0].crossthreadOffset = 0x30; pKernelInfo->kernelArgInfo[0].kernelArgPatchInfoVector[0].size = (uint32_t)sizeof(void *); - pProgram = new MockProgram(pContext); + pProgram = new MockProgram(pContext, false); pKernel = new MockKernel(pProgram, *pKernelInfo, *pDevice); ASSERT_EQ(CL_SUCCESS, pKernel->initialize()); diff --git a/unit_tests/kernel/kernel_tests.cpp b/unit_tests/kernel/kernel_tests.cpp index fe47281b82..a1da6b324d 100644 --- a/unit_tests/kernel/kernel_tests.cpp +++ b/unit_tests/kernel/kernel_tests.cpp @@ -491,7 +491,7 @@ TEST_F(KernelPrivateSurfaceTest, testPrivateSurface) { // create kernel MockContext context; - MockProgram program(&context); + MockProgram program(&context, false); MockKernel *pKernel = new MockKernel(&program, *pKernelInfo, *pDevice); ASSERT_EQ(CL_SUCCESS, pKernel->initialize()); @@ -531,7 +531,7 @@ TEST_F(KernelPrivateSurfaceTest, givenKernelWithPrivateSurfaceThatIsInUseByGpuWh pKernelInfo->patchInfo.executionEnvironment = &tokenEE; MockContext context; - MockProgram program(&context); + MockProgram program(&context, false); std::unique_ptr pKernel(new MockKernel(&program, *pKernelInfo, *pDevice)); pKernel->initialize(); @@ -575,7 +575,7 @@ TEST_F(KernelPrivateSurfaceTest, testPrivateSurfaceAllocationFailure) { // create kernel MockContext context; - MockProgram program(&context); + MockProgram program(&context, false); MemoryManagementFixture::InjectedFunction method = [&](size_t failureIndex) { MockKernel *pKernel = new MockKernel(&program, *pKernelInfo, *pDevice); @@ -622,7 +622,7 @@ TEST_F(KernelPrivateSurfaceTest, given32BitDeviceWhenKernelIsCreatedThenPrivateS // create kernel MockContext context; - MockProgram program(&context); + MockProgram program(&context, false); MockKernel *pKernel = new MockKernel(&program, *pKernelInfo, *pDevice); ASSERT_EQ(CL_SUCCESS, pKernel->initialize()); @@ -655,7 +655,7 @@ HWTEST_F(KernelPrivateSurfaceTest, givenStatefulKernelWhenKernelIsCreatedThenPri pKernelInfo->patchInfo.pAllocateStatelessPrivateSurface = &AllocateStatelessPrivateMemorySurface; MockContext context; - MockProgram program(&context); + MockProgram program(&context, false); // create kernel MockKernel *pKernel = new MockKernel(&program, *pKernelInfo, *pDevice); @@ -706,7 +706,7 @@ TEST_F(KernelPrivateSurfaceTest, givenStatelessKernelWhenKernelIsCreatedThenPriv GraphicsAllocation gfxAlloc(buffer, sizeof(buffer)); MockContext context; - MockProgram program(&context); + MockProgram program(&context, false); program.setConstantSurface(&gfxAlloc); // create kernel @@ -774,7 +774,7 @@ TEST_F(KernelGlobalSurfaceTest, givenBuiltInKernelWhenKernelIsCreatedThenGlobalS // create kernel MockContext context; - MockProgram program(&context); + MockProgram program(&context, false); program.setGlobalSurface(&gfxAlloc); MockKernel *pKernel = new MockKernel(&program, *pKernelInfo, *pDevice); @@ -855,7 +855,7 @@ HWTEST_F(KernelGlobalSurfaceTest, givenStatefulKernelWhenKernelIsCreatedThenGlob void *bufferAddress = gfxAlloc.getUnderlyingBuffer(); MockContext context; - MockProgram program(&context); + MockProgram program(&context, false); program.setGlobalSurface(&gfxAlloc); // create kernel @@ -1033,7 +1033,7 @@ HWTEST_F(KernelConstantSurfaceTest, givenStatefulKernelWhenKernelIsCreatedThenCo void *bufferAddress = gfxAlloc.getUnderlyingBuffer(); MockContext context; - MockProgram program(&context); + MockProgram program(&context, false); program.setConstantSurface(&gfxAlloc); // create kernel @@ -1122,7 +1122,7 @@ HWTEST_F(KernelEventPoolSurfaceTest, givenStatefulKernelWhenKernelIsCreatedThenE pKernelInfo->patchInfo.pAllocateStatelessEventPoolSurface = &AllocateStatelessEventPoolSurface; // create kernel - MockProgram program(&context); + MockProgram program(&context, false); MockKernel *pKernel = new MockKernel(&program, *pKernelInfo, *pDevice); // setup surface state heap @@ -1175,7 +1175,7 @@ HWTEST_F(KernelEventPoolSurfaceTest, givenStatefulKernelWhenEventPoolIsPatchedTh pKernelInfo->patchInfo.pAllocateStatelessEventPoolSurface = &AllocateStatelessEventPoolSurface; // create kernel - MockProgram program(&context); + MockProgram program(&context, false); MockKernel *pKernel = new MockKernel(&program, *pKernelInfo, *pDevice); // setup surface state heap @@ -1337,7 +1337,7 @@ HWTEST_F(KernelDefaultDeviceQueueSurfaceTest, givenStatefulKernelWhenKernelIsCre pKernelInfo->patchInfo.pAllocateStatelessDefaultDeviceQueueSurface = &AllocateStatelessDefaultDeviceQueueSurface; // create kernel - MockProgram program(&context); + MockProgram program(&context, false); MockKernel *pKernel = new MockKernel(&program, *pKernelInfo, *pDevice); // setup surface state heap @@ -1390,7 +1390,7 @@ HWTEST_F(KernelDefaultDeviceQueueSurfaceTest, givenStatefulKernelWhenDefaultDevi pKernelInfo->patchInfo.pAllocateStatelessDefaultDeviceQueueSurface = &AllocateStatelessDefaultDeviceQueueSurface; // create kernel - MockProgram program(&context); + MockProgram program(&context, false); MockKernel *pKernel = new MockKernel(&program, *pKernelInfo, *pDevice); // setup surface state heap diff --git a/unit_tests/mem_obj/buffer_set_arg_tests.cpp b/unit_tests/mem_obj/buffer_set_arg_tests.cpp index 13b8738461..6805a55fff 100644 --- a/unit_tests/mem_obj/buffer_set_arg_tests.cpp +++ b/unit_tests/mem_obj/buffer_set_arg_tests.cpp @@ -72,7 +72,7 @@ class BufferSetArgTest : public ContextFixture, pKernelInfo->kernelArgInfo[1].kernelArgPatchInfoVector[0].size = sizeOfPointer; pKernelInfo->kernelArgInfo[0].kernelArgPatchInfoVector[0].size = sizeOfPointer; - pProgram = new MockProgram(pContext); + pProgram = new MockProgram(pContext, false); pKernel = new MockKernel(pProgram, *pKernelInfo, *pDevice); ASSERT_NE(nullptr, pKernel); diff --git a/unit_tests/mocks/mock_kernel.h b/unit_tests/mocks/mock_kernel.h index 085eba0546..fc4e80b180 100644 --- a/unit_tests/mocks/mock_kernel.h +++ b/unit_tests/mocks/mock_kernel.h @@ -218,7 +218,7 @@ class MockKernelWithInternals { mockContext = context; } - mockProgram = new MockProgram(context); + mockProgram = new MockProgram(context, false); mockKernel = new MockKernel(mockProgram, kernelInfo, deviceArg); mockKernel->setCrossThreadData(&crossThreadData, sizeof(crossThreadData)); mockKernel->setSshLocal(&sshLocal, sizeof(sshLocal)); diff --git a/unit_tests/mocks/mock_program.h b/unit_tests/mocks/mock_program.h index e0a8d6b013..b682c4fed3 100644 --- a/unit_tests/mocks/mock_program.h +++ b/unit_tests/mocks/mock_program.h @@ -33,7 +33,7 @@ class GraphicsAllocation; class MockProgram : public Program { public: MockProgram() : Program() {} - MockProgram(Context *context) : Program(context) {} + MockProgram(Context *context, bool isBuiltinKernel) : Program(context, isBuiltinKernel) {} ~MockProgram() { if (contextSet) context = nullptr; diff --git a/unit_tests/os_interface/debug_settings_manager_tests.cpp b/unit_tests/os_interface/debug_settings_manager_tests.cpp index 51fab07792..31dced18e8 100644 --- a/unit_tests/os_interface/debug_settings_manager_tests.cpp +++ b/unit_tests/os_interface/debug_settings_manager_tests.cpp @@ -564,7 +564,7 @@ TEST(DebugSettingsManager, WithDebugFunctionalityDumpKernelArgsBuffer) { auto buffer = BufferHelper<>::create(&context); cl_mem clObj = buffer; - MockProgram program(&context); + MockProgram program(&context, false); auto kernelInfo = unique_ptr(KernelInfo::create()); auto device = unique_ptr(Device::create(nullptr, false)); auto kernel = unique_ptr(new MockKernel(&program, *kernelInfo, *device)); diff --git a/unit_tests/program/printf_handler_tests.cpp b/unit_tests/program/printf_handler_tests.cpp index df557d6dda..7dd5d7451f 100644 --- a/unit_tests/program/printf_handler_tests.cpp +++ b/unit_tests/program/printf_handler_tests.cpp @@ -42,7 +42,7 @@ TEST(PrintfHandlerTest, givenNotPreparedPrintfHandlerWhenGetSurfaceIsCalledThenR KernelInfo *pKernelInfo = new KernelInfo(); pKernelInfo->patchInfo.pAllocateStatelessPrintfSurface = pPrintfSurface; - MockProgram *pProgram = new MockProgram(&context); + MockProgram *pProgram = new MockProgram(&context, false); MockKernel *pKernel = new MockKernel(pProgram, *pKernelInfo, *device); MockMultiDispatchInfo multiDispatchInfo(pKernel); @@ -68,7 +68,7 @@ TEST(PrintfHandlerTest, givenPreparedPrintfHandlerWhenGetSurfaceIsCalledThenResu KernelInfo *pKernelInfo = new KernelInfo(); pKernelInfo->patchInfo.pAllocateStatelessPrintfSurface = pPrintfSurface; - MockProgram *pProgram = new MockProgram(&context); + MockProgram *pProgram = new MockProgram(&context, false); uint64_t crossThread[10]; MockKernel *pKernel = new MockKernel(pProgram, *pKernelInfo, *device); diff --git a/unit_tests/program/program_tests.cpp b/unit_tests/program/program_tests.cpp index 6f3ead9922..ec871d0b87 100644 --- a/unit_tests/program/program_tests.cpp +++ b/unit_tests/program/program_tests.cpp @@ -1609,7 +1609,7 @@ TEST(ProgramFromBinaryTests, CreateWithBinary_FailRecompile) { TEST(ProgramFromBinaryTests, givenEmptyProgramThenErrorIsReturned) { class TestedProgram : public Program { public: - TestedProgram(Context *context, bool isBuiltIn = false) : Program(context) {} + TestedProgram(Context *context, bool isBuiltIn) : Program(context, isBuiltIn) {} char *setGenBinary(char *binary) { auto res = genBinary; genBinary = binary; @@ -1679,7 +1679,7 @@ TEST_F(ProgramTests, ProgramCtorSetsProperInternalOptions) { DebugManager.flags.DisableStatelessToStatefulOptimization.set(false); if (pDevice) { - MockProgram program(pContext); + MockProgram program(pContext, false); char paramValue[32]; pDevice->getDeviceInfo(CL_DEVICE_VERSION, 32, paramValue, 0); if (strstr(paramValue, "2.1")) { @@ -1702,7 +1702,7 @@ TEST_F(ProgramTests, ProgramCtorSetsProperInternalOptionsForced20) { pDevice->getMutableDeviceInfo()->clVersion = "OpenCL 2.0 "; if (pDevice) { - MockProgram program(pContext); + MockProgram program(pContext, false); char paramValue[32]; pDevice->getDeviceInfo(CL_DEVICE_VERSION, 32, paramValue, 0); ASSERT_EQ(std::string(paramValue), "OpenCL 2.0 "); @@ -1717,7 +1717,7 @@ TEST_F(ProgramTests, ProgramCtorSetsProperInternalOptionsWhenStatelessToStateful DebugManager.flags.DisableStatelessToStatefulOptimization.set(true); if (pDevice) { - MockProgram program(pContext); + MockProgram program(pContext, false); char paramValue[32]; pDevice->getDeviceInfo(CL_DEVICE_VERSION, 32, paramValue, 0); if (strstr(paramValue, "2.1")) { @@ -1746,7 +1746,7 @@ TEST_F(ProgramTests, ProgramCtorSetsProperInternalOptionsWhenForcing32BitAddress DebugManager.flags.DisableStatelessToStatefulOptimization.set(false); if (pDevice) { const_cast(&pDevice->getDeviceInfo())->force32BitAddressess = true; - MockProgram program(pContext); + MockProgram program(pContext, false); char paramValue[32]; pDevice->getDeviceInfo(CL_DEVICE_VERSION, 32, paramValue, 0); if (strstr(paramValue, "2.1")) { @@ -1841,7 +1841,7 @@ TEST_F(ProgramTests, BuiltinProgramCreateSetsProperInternalOptionsEnablingStatel TEST_F(ProgramTests, ProgramCtorSetsProperProgramScopePatchListSize) { - MockProgram program(pContext); + MockProgram program(pContext, false); EXPECT_EQ((size_t)0, program.getProgramScopePatchListSize()); } @@ -1850,7 +1850,7 @@ TEST_F(ProgramTests, GivenContextWhenCreateProgramThenIncrementContextRefCount) auto initialInternalRefCount = pContext->getRefInternalCount(); MockProgram tempProgram; - MockProgram *program = new MockProgram(pContext); + MockProgram *program = new MockProgram(pContext, false); EXPECT_EQ(pContext->getReference(), initialApiRefCount); EXPECT_EQ(pContext->getRefInternalCount(), initialInternalRefCount + 1); @@ -2477,7 +2477,7 @@ TEST_F(ProgramTests, GetProgramCompilerVersion) { } TEST_F(ProgramTests, GivenZeroPrivateSizeInBlockWhenAllocateBlockProvateSurfacesCalledThenNoSurfaceIsCreated) { - MockProgram *program = new MockProgram(pContext); + MockProgram *program = new MockProgram(pContext, false); uint32_t crossThreadOffsetBlock = 0; @@ -2503,7 +2503,7 @@ TEST_F(ProgramTests, GivenZeroPrivateSizeInBlockWhenAllocateBlockProvateSurfaces } TEST_F(ProgramTests, GivenNonZeroPrivateSizeInBlockWhenAllocateBlockProvateSurfacesCalledThenSurfaceIsCreated) { - MockProgram *program = new MockProgram(pContext); + MockProgram *program = new MockProgram(pContext, false); uint32_t crossThreadOffsetBlock = 0; @@ -2529,7 +2529,7 @@ TEST_F(ProgramTests, GivenNonZeroPrivateSizeInBlockWhenAllocateBlockProvateSurfa } TEST_F(ProgramTests, GivenNonZeroPrivateSizeInBlockWhenAllocateBlockProvateSurfacesCalledThenSecondSurfaceIsNotCreated) { - MockProgram *program = new MockProgram(pContext); + MockProgram *program = new MockProgram(pContext, false); uint32_t crossThreadOffsetBlock = 0; @@ -2563,7 +2563,7 @@ TEST_F(ProgramTests, GivenNonZeroPrivateSizeInBlockWhenAllocateBlockProvateSurfa } TEST_F(ProgramTests, freeBlockPrivateSurfacesFreesGraphicsAllocationsFromBlockKernelManager) { - MockProgram *program = new MockProgram(pContext); + MockProgram *program = new MockProgram(pContext, false); uint32_t crossThreadOffsetBlock = 0; @@ -2610,7 +2610,7 @@ TEST_F(Program32BitTests, givenDeviceWithForce32BitAddressingOnWhenBultinIsCreat } TEST_F(Program32BitTests, givenDeviceWithForce32BitAddressingOnWhenProgramIsCreatedThen32bitFlagIsPassedAsInternalOption) { - MockProgram pProgram(pContext); + MockProgram pProgram(pContext, false); auto &internalOptions = pProgram.getInternalOptions(); std::string s1 = internalOptions; size_t pos = s1.find("-m32"); @@ -2624,7 +2624,7 @@ TEST_F(Program32BitTests, givenDeviceWithForce32BitAddressingOnWhenProgramIsCrea TEST_F(Program32BitTests, givenDeviceWhenProgramIsCreatedThenProgramCountInDeviceIncreases) { auto device = pContext->getDevice(0); EXPECT_EQ(0u, device->getProgramCount()); - MockProgram pProgram(pContext); + MockProgram pProgram(pContext, false); EXPECT_EQ(1u, device->getProgramCount()); } @@ -2638,8 +2638,8 @@ TEST_F(ProgramTests, givenNewProgramTheStatelessToStatefulBufferOffsetOtimizatio template struct CreateProgramFromBinaryMock : MockProgram { using MockProgram::MockProgram; - CreateProgramFromBinaryMock(Context *context, bool isBuiltIn = false) - : MockProgram(context) { + CreateProgramFromBinaryMock(Context *context, bool isBuiltIn) + : MockProgram(context, isBuiltIn) { } cl_int createProgramFromBinary(const void *pBinary, @@ -2771,7 +2771,7 @@ TEST_F(ProgramTests, linkingTwoValidSpirvProgramsReturnsValidProgram) { } TEST_F(ProgramTests, givenSeparateBlockKernelsWhenNoParentAndSubgroupKernelsThenSeparateNoneKernel) { - MockProgram program(pContext); + MockProgram program(pContext, false); EXPECT_EQ(0u, program.getKernelInfoArray().size()); EXPECT_EQ(0u, program.getParentKernelInfoArray().size()); @@ -2784,7 +2784,7 @@ TEST_F(ProgramTests, givenSeparateBlockKernelsWhenNoParentAndSubgroupKernelsThen } TEST_F(ProgramTests, givenSeparateBlockKernelsWhenRegularKernelsThenSeparateNoneKernel) { - MockProgram program(pContext); + MockProgram program(pContext, false); auto pRegularKernel1Info = KernelInfo::create(); pRegularKernel1Info->name = "regular_kernel_1"; @@ -2806,7 +2806,7 @@ TEST_F(ProgramTests, givenSeparateBlockKernelsWhenRegularKernelsThenSeparateNone } TEST_F(ProgramTests, givenSeparateBlockKernelsWhenChildLikeKernelWithoutParentKernelThenSeparateNoneKernel) { - MockProgram program(pContext); + MockProgram program(pContext, false); auto pParentKernelInfo = KernelInfo::create(); pParentKernelInfo->name = "another_parent_kernel"; @@ -2830,7 +2830,7 @@ TEST_F(ProgramTests, givenSeparateBlockKernelsWhenChildLikeKernelWithoutParentKe } TEST_F(ProgramTests, givenSeparateBlockKernelsWhenChildLikeKernelWithoutSubgroupKernelThenSeparateNoneKernel) { - MockProgram program(pContext); + MockProgram program(pContext, false); auto pSubgroupKernelInfo = KernelInfo::create(); pSubgroupKernelInfo->name = "another_subgroup_kernel"; @@ -2854,7 +2854,7 @@ TEST_F(ProgramTests, givenSeparateBlockKernelsWhenChildLikeKernelWithoutSubgroup } TEST_F(ProgramTests, givenSeparateBlockKernelsWhenParentKernelWithChildKernelThenSeparateChildKernel) { - MockProgram program(pContext); + MockProgram program(pContext, false); auto pParentKernelInfo = KernelInfo::create(); pParentKernelInfo->name = "parent_kernel"; @@ -2878,7 +2878,7 @@ TEST_F(ProgramTests, givenSeparateBlockKernelsWhenParentKernelWithChildKernelThe } TEST_F(ProgramTests, givenSeparateBlockKernelsWhenSubgroupKernelWithChildKernelThenSeparateChildKernel) { - MockProgram program(pContext); + MockProgram program(pContext, false); auto pSubgroupKernelInfo = KernelInfo::create(); pSubgroupKernelInfo->name = "subgroup_kernel"; diff --git a/unit_tests/program/program_with_block_kernels_tests.cpp b/unit_tests/program/program_with_block_kernels_tests.cpp index d19d31ad3b..ef2fbf2e44 100644 --- a/unit_tests/program/program_with_block_kernels_tests.cpp +++ b/unit_tests/program/program_with_block_kernels_tests.cpp @@ -118,7 +118,7 @@ TEST_F(ProgramWithBlockKernelsTest, GivenKernelWithBlockKernelsWhenProgramIsLink ASSERT_NE(nullptr, pProgram); EXPECT_EQ(CL_SUCCESS, retVal); - Program *programLinked = new Program(pContext); + Program *programLinked = new Program(pContext, false); cl_program program = pProgram; retVal = pProgram->compile(1, &device, buildOptions, 0, nullptr, nullptr, nullptr, nullptr);