diff --git a/unit_tests/built_ins/built_in_tests.cpp b/unit_tests/built_ins/built_in_tests.cpp index bb8b78f669..40fe90fc3e 100644 --- a/unit_tests/built_ins/built_in_tests.cpp +++ b/unit_tests/built_ins/built_in_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -444,7 +444,7 @@ HWTEST_F(BuiltInTests, givenKernelWithAuxTranslationRequiredWhenEnqueueCalledThe auto mockAuxBuiltInOp = new MockAuxBuilInOp(*pBuiltIns, *pContext, *pDevice); pBuiltIns->BuiltinOpsBuilders[static_cast(EBuiltInOps::AuxTranslation)].first.reset(mockAuxBuiltInOp); - auto mockProgram = wrapReleasableObjectWithUniquePtr(new MockProgram(*pDevice->getExecutionEnvironment())); + auto mockProgram = clUniquePtr(new MockProgram(*pDevice->getExecutionEnvironment())); auto mockBuiltinKernel = MockKernel::create(*pDevice, mockProgram.get()); mockAuxBuiltInOp->usedKernels.at(0).reset(mockBuiltinKernel); diff --git a/unit_tests/program/program_tests.cpp b/unit_tests/program/program_tests.cpp index b026e8c2f7..a56ede5752 100644 --- a/unit_tests/program/program_tests.cpp +++ b/unit_tests/program/program_tests.cpp @@ -2842,20 +2842,20 @@ TEST_F(ProgramTests, givenCompilerInterfaceWhenCompileIsCalledThenProperIntermed pDevice->getExecutionEnvironment()->compilerInterface.reset(compilerInterface); compilerInterface->useLlvmText = true; - auto programLlvmText = wrapReleasableObjectWithUniquePtr(new MockProgram(*pDevice->getExecutionEnvironment())); + auto programLlvmText = clUniquePtr(new MockProgram(*pDevice->getExecutionEnvironment())); programLlvmText->setDevice(device); compilerInterface->intermediateRepresentation = IGC::CodeType::spirV; compilerInterface->compile(*programLlvmText, input); EXPECT_FALSE(programLlvmText->getIsSpirV()); compilerInterface->useLlvmText = false; - auto programSpirV = wrapReleasableObjectWithUniquePtr(new MockProgram(*pDevice->getExecutionEnvironment())); + auto programSpirV = clUniquePtr(new MockProgram(*pDevice->getExecutionEnvironment())); programSpirV->setDevice(device); compilerInterface->intermediateRepresentation = IGC::CodeType::spirV; compilerInterface->compile(*programSpirV, input); EXPECT_TRUE(programSpirV->getIsSpirV()); - auto programLlvmBc = wrapReleasableObjectWithUniquePtr(new MockProgram(*pDevice->getExecutionEnvironment())); + auto programLlvmBc = clUniquePtr(new MockProgram(*pDevice->getExecutionEnvironment())); programLlvmBc->setDevice(device); compilerInterface->intermediateRepresentation = IGC::CodeType::llvmBc; compilerInterface->compile(*programLlvmBc, input); @@ -2881,7 +2881,7 @@ TEST_F(ProgramTests, givenProgramWithSpirvWhenRebuildProgramIsCalledThenSpirvPat gEnvironment->igcPushDebugVars(debugVars); std::unique_ptr igcDebugVarsAutoPop{&gEnvironment, [](void *) { gEnvironment->igcPopDebugVars(); }}; - auto program = wrapReleasableObjectWithUniquePtr(new MockProgram(*pDevice->getExecutionEnvironment())); + auto program = clUniquePtr(new MockProgram(*pDevice->getExecutionEnvironment())); program->setDevice(device); uint32_t spirv[16] = {0x03022307, 0x23471113, 0x17192329}; program->storeIrBinary(spirv, sizeof(spirv), true); diff --git a/unit_tests/utilities/base_object_utils.h b/unit_tests/utilities/base_object_utils.h index 675cfe3d59..2d9bfffd88 100644 --- a/unit_tests/utilities/base_object_utils.h +++ b/unit_tests/utilities/base_object_utils.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -14,7 +14,7 @@ template using ReleaseableObjectPtr = std::unique_ptr; template -static ReleaseableObjectPtr wrapReleasableObjectWithUniquePtr(T *object) { +static ReleaseableObjectPtr clUniquePtr(T *object) { return ReleaseableObjectPtr{object, [](T *p) { p->release(); }}; } } // namespace OCLRT