diff --git a/runtime/compiler_interface/compiler_interface.h b/runtime/compiler_interface/compiler_interface.h index 771d4c6e6d..70e83e9782 100644 --- a/runtime/compiler_interface/compiler_interface.h +++ b/runtime/compiler_interface/compiler_interface.h @@ -50,9 +50,6 @@ class CompilerInterface { return instance; } - static void shutdown() { - } - MOCKABLE_VIRTUAL cl_int build(Program &program, const TranslationArgs &pInputArgs, bool enableCaching); MOCKABLE_VIRTUAL cl_int compile(Program &program, const TranslationArgs &pInputArgs); diff --git a/runtime/device/device.cpp b/runtime/device/device.cpp index ae72778d5a..d88f297a6b 100644 --- a/runtime/device/device.cpp +++ b/runtime/device/device.cpp @@ -81,7 +81,6 @@ Device::Device(const HardwareInfo &hwInfo, ExecutionEnvironment *executionEnviro } Device::~Device() { - CompilerInterface::shutdown(); DEBUG_BREAK_IF(nullptr == executionEnvironment->memoryManager.get()); if (performanceCounters) { performanceCounters->shutdown(); diff --git a/unit_tests/api/cl_build_program_tests.inl b/unit_tests/api/cl_build_program_tests.inl index dcd897d50b..379f5c33e0 100644 --- a/unit_tests/api/cl_build_program_tests.inl +++ b/unit_tests/api/cl_build_program_tests.inl @@ -61,7 +61,6 @@ TEST_F(clBuildProgramTests, GivenSourceAsInputWhenCreatingProgramWithSourceThenP EXPECT_EQ(CL_SUCCESS, retVal); deleteDataReadFromFile(pSource); - CompilerInterface::shutdown(); pProgram = clCreateProgramWithSource( nullptr, @@ -113,8 +112,6 @@ TEST_F(clBuildProgramTests, GivenBinaryAsInputWhenCreatingProgramWithSourceThenP retVal = clReleaseProgram(pProgram); EXPECT_EQ(CL_SUCCESS, retVal); - - CompilerInterface::shutdown(); } TEST_F(clBuildProgramTests, GivenProgramCreatedFromBinaryWhenBuildProgramWithOptionsIsCalledThenStoredOptionsAreUsed) { @@ -167,8 +164,6 @@ TEST_F(clBuildProgramTests, GivenProgramCreatedFromBinaryWhenBuildProgramWithOpt retVal = clReleaseProgram(pProgram); EXPECT_EQ(CL_SUCCESS, retVal); - - CompilerInterface::shutdown(); } TEST_F(clBuildProgramTests, GivenSpirAsInputWhenCreatingProgramFromBinaryThenProgramBuildSucceeds) { @@ -212,8 +207,6 @@ TEST_F(clBuildProgramTests, GivenSpirAsInputWhenCreatingProgramFromBinaryThenPro retVal = clReleaseProgram(pProgram); EXPECT_EQ(CL_SUCCESS, retVal); - - CompilerInterface::shutdown(); } TEST_F(clBuildProgramTests, GivenNullAsInputWhenCreatingProgramThenInvalidProgramErrorIsReturned) { diff --git a/unit_tests/api/cl_compile_program_tests.inl b/unit_tests/api/cl_compile_program_tests.inl index 069c6e697a..a822e54d52 100644 --- a/unit_tests/api/cl_compile_program_tests.inl +++ b/unit_tests/api/cl_compile_program_tests.inl @@ -64,7 +64,6 @@ TEST_F(clCompileProgramTests, GivenKernelAsSingleSourceWhenCompilingProgramThenS EXPECT_EQ(CL_SUCCESS, retVal); deleteDataReadFromFile(pSource); - CompilerInterface::shutdown(); } TEST_F(clCompileProgramTests, GivenKernelAsSourceWithHeaderWhenCompilingProgramThenSuccessIsReturned) { @@ -136,8 +135,6 @@ TEST_F(clCompileProgramTests, GivenKernelAsSourceWithHeaderWhenCompilingProgramT retVal = clReleaseProgram(pHeader); EXPECT_EQ(CL_SUCCESS, retVal); deleteDataReadFromFile(pHeaderSource); - - CompilerInterface::shutdown(); } TEST_F(clCompileProgramTests, GivenNullProgramWhenCompilingProgramThenInvalidProgramErrorIsReturned) { diff --git a/unit_tests/api/cl_create_program_with_built_in_kernels_tests.cpp b/unit_tests/api/cl_create_program_with_built_in_kernels_tests.cpp index bc6988efdd..ce2f796ebb 100644 --- a/unit_tests/api/cl_create_program_with_built_in_kernels_tests.cpp +++ b/unit_tests/api/cl_create_program_with_built_in_kernels_tests.cpp @@ -109,8 +109,6 @@ TEST_F(clCreateProgramWithBuiltInKernelsTests, mediaKernels) { retVal = clReleaseProgram(program); EXPECT_EQ(CL_SUCCESS, retVal); - - CompilerInterface::shutdown(); } TEST_F(clCreateProgramWithBuiltInKernelsTests, mediaKernelsOptions) { @@ -137,8 +135,6 @@ TEST_F(clCreateProgramWithBuiltInKernelsTests, mediaKernelsOptions) { EXPECT_EQ(std::string::npos, it); clReleaseProgram(program); - - CompilerInterface::shutdown(); } TEST_F(clCreateProgramWithBuiltInKernelsTests, vmeBlockMotionEstimateKernelHasCorrectDispatchBuilderAndFrontendKernel) { @@ -178,8 +174,6 @@ TEST_F(clCreateProgramWithBuiltInKernelsTests, vmeBlockMotionEstimateKernelHasCo clReleaseKernel(kernel); clReleaseProgram(program); - - CompilerInterface::shutdown(); } TEST_F(clCreateProgramWithBuiltInKernelsTests, vmeBlockAdvancedMotionEstimateCheckKernelHasCorrectDispatchBuilderAndFrontendKernel) { @@ -219,8 +213,6 @@ TEST_F(clCreateProgramWithBuiltInKernelsTests, vmeBlockAdvancedMotionEstimateChe clReleaseKernel(kernel); clReleaseProgram(program); - - CompilerInterface::shutdown(); } TEST_F(clCreateProgramWithBuiltInKernelsTests, vmeBlockAdvancedMotionEstimateBidirectionalCheckKernelHasCorrectDispatchBuilderAndFrontendKernel) { @@ -260,7 +252,5 @@ TEST_F(clCreateProgramWithBuiltInKernelsTests, vmeBlockAdvancedMotionEstimateBid clReleaseKernel(kernel); clReleaseProgram(program); - - CompilerInterface::shutdown(); } } // namespace ULT diff --git a/unit_tests/api/cl_get_kernel_arg_info_tests.inl b/unit_tests/api/cl_get_kernel_arg_info_tests.inl index d5eb5701fc..493ea1ce87 100644 --- a/unit_tests/api/cl_get_kernel_arg_info_tests.inl +++ b/unit_tests/api/cl_get_kernel_arg_info_tests.inl @@ -75,6 +75,5 @@ TEST_F(clGetKernelArgInfoTests, success) { EXPECT_EQ(CL_SUCCESS, retVal); deleteDataReadFromFile(pSource); - CompilerInterface::shutdown(); } } // namespace ULT diff --git a/unit_tests/api/cl_get_kernel_info_tests.inl b/unit_tests/api/cl_get_kernel_info_tests.inl index 8ffe40ad92..f04ceede3a 100644 --- a/unit_tests/api/cl_get_kernel_info_tests.inl +++ b/unit_tests/api/cl_get_kernel_info_tests.inl @@ -89,6 +89,5 @@ TEST_F(clGetKernelInfoTests, success) { EXPECT_EQ(CL_SUCCESS, retVal); deleteDataReadFromFile(pSource); - CompilerInterface::shutdown(); } } // namespace ULT diff --git a/unit_tests/api/cl_get_kernel_work_group_info_tests.inl b/unit_tests/api/cl_get_kernel_work_group_info_tests.inl index 9af6035081..ef64db20de 100644 --- a/unit_tests/api/cl_get_kernel_work_group_info_tests.inl +++ b/unit_tests/api/cl_get_kernel_work_group_info_tests.inl @@ -60,8 +60,6 @@ struct clGetKernelWorkGroupInfoTests : public api_fixture, kernel = clCreateKernel(pProgram, "CopyBuffer", &retVal); ASSERT_EQ(CL_SUCCESS, retVal); - - CompilerInterface::shutdown(); } void TearDown() override { diff --git a/unit_tests/api/cl_get_program_build_info_tests.inl b/unit_tests/api/cl_get_program_build_info_tests.inl index 346eaae58f..a505270ddb 100644 --- a/unit_tests/api/cl_get_program_build_info_tests.inl +++ b/unit_tests/api/cl_get_program_build_info_tests.inl @@ -93,7 +93,6 @@ TEST_F(clGetProgramBuildInfoTests, givenSourceWhenclGetProgramBuildInfoIsCalledT EXPECT_EQ(CL_SUCCESS, retVal); deleteDataReadFromFile(pSource); - CompilerInterface::shutdown(); } TEST_F(clGetProgramBuildInfoTests, givenElfBinaryWhenclGetProgramBuildInfoIsCalledThenReturnClBuildNone) { @@ -125,6 +124,5 @@ TEST_F(clGetProgramBuildInfoTests, givenElfBinaryWhenclGetProgramBuildInfoIsCall retVal = clReleaseProgram(pProgram); EXPECT_EQ(CL_SUCCESS, retVal); - CompilerInterface::shutdown(); } } // namespace ULT diff --git a/unit_tests/api/cl_get_program_info_tests.inl b/unit_tests/api/cl_get_program_info_tests.inl index 467834c38d..4729400d6b 100644 --- a/unit_tests/api/cl_get_program_info_tests.inl +++ b/unit_tests/api/cl_get_program_info_tests.inl @@ -94,7 +94,6 @@ TEST_F(clGetProgramInfoTests, SuccessfulProgramWithSource) { EXPECT_EQ(CL_SUCCESS, retVal); deleteDataReadFromFile(pSource); - CompilerInterface::shutdown(); } TEST_F(clGetProgramInfoTests, SuccessfulProgramWithIL) { diff --git a/unit_tests/api/cl_link_program_tests.inl b/unit_tests/api/cl_link_program_tests.inl index df25f49cd5..31fc1a464b 100644 --- a/unit_tests/api/cl_link_program_tests.inl +++ b/unit_tests/api/cl_link_program_tests.inl @@ -79,7 +79,6 @@ TEST_F(clLinkProgramTests, linkSingleSource) { EXPECT_EQ(CL_SUCCESS, retVal); deleteDataReadFromFile(pSource); - CompilerInterface::shutdown(); } TEST_F(clLinkProgramTests, createLibrarySingleSource) { @@ -142,7 +141,6 @@ TEST_F(clLinkProgramTests, createLibrarySingleSource) { EXPECT_EQ(CL_SUCCESS, retVal); deleteDataReadFromFile(pSource); - CompilerInterface::shutdown(); } TEST_F(clLinkProgramTests, nullContext) { diff --git a/unit_tests/compiler_interface/compiler_interface_tests.cpp b/unit_tests/compiler_interface/compiler_interface_tests.cpp index 7d3a0efa66..9d74fe0669 100644 --- a/unit_tests/compiler_interface/compiler_interface_tests.cpp +++ b/unit_tests/compiler_interface/compiler_interface_tests.cpp @@ -184,7 +184,6 @@ TEST_F(CompilerInterfaceTest, BuildWithDebugData) { retVal = pProgram->getInfo(CL_PROGRAM_DEBUG_INFO_INTEL, debugDataSize, nullptr, &retData); EXPECT_EQ(CL_SUCCESS, retVal); EXPECT_EQ(numDevices * sizeof(debugData), retData); - cip->shutdown(); delete[] debugData; delete cip; diff --git a/unit_tests/fixtures/built_in_fixture.cpp b/unit_tests/fixtures/built_in_fixture.cpp index ff96eea07b..80dea8ad0f 100644 --- a/unit_tests/fixtures/built_in_fixture.cpp +++ b/unit_tests/fixtures/built_in_fixture.cpp @@ -36,6 +36,4 @@ void BuiltInFixture::SetUp(Device *pDevice) { void BuiltInFixture::TearDown() { gEnvironment->igcPopDebugVars(); gEnvironment->fclPopDebugVars(); - - CompilerInterface::shutdown(); } diff --git a/unit_tests/mem_obj/image_tests.cpp b/unit_tests/mem_obj/image_tests.cpp index 8d8e336d87..e948d34e86 100644 --- a/unit_tests/mem_obj/image_tests.cpp +++ b/unit_tests/mem_obj/image_tests.cpp @@ -474,7 +474,6 @@ struct CreateImageHostPtr void TearDown() override { delete image; - CompilerInterface::shutdown(); BaseClass::TearDown(); MemoryManagementFixture::TearDown(); } diff --git a/unit_tests/program/program_data_tests.cpp b/unit_tests/program/program_data_tests.cpp index 6a032747b2..c04eab45bc 100644 --- a/unit_tests/program/program_data_tests.cpp +++ b/unit_tests/program/program_data_tests.cpp @@ -60,7 +60,6 @@ class ProgramDataTest : public testing::Test, ProgramFixture::TearDown(); ContextFixture::TearDown(); PlatformFixture::TearDown(); - CompilerInterface::shutdown(); } size_t setupConstantAllocation() { diff --git a/unit_tests/program/program_nonuniform.cpp b/unit_tests/program/program_nonuniform.cpp index dfb612f015..33b0ee8362 100644 --- a/unit_tests/program/program_nonuniform.cpp +++ b/unit_tests/program/program_nonuniform.cpp @@ -185,7 +185,6 @@ class ProgramNonUniformTest : public ContextFixture, ProgramFixture::TearDown(); ContextFixture::TearDown(); PlatformFixture::TearDown(); - CompilerInterface::shutdown(); } cl_device_id device; cl_int retVal = CL_SUCCESS; diff --git a/unit_tests/program/program_tests.cpp b/unit_tests/program/program_tests.cpp index 9acefe6b24..ebe643aa27 100644 --- a/unit_tests/program/program_tests.cpp +++ b/unit_tests/program/program_tests.cpp @@ -1532,7 +1532,6 @@ TEST_F(ProgramPatchTokenTests, DISABLED_ConstantMemorySurface) { EXPECT_EQ(CL_SUCCESS, retVal); EXPECT_EQ(0u, pProgram->getProgramScopePatchListSize()); - CompilerInterface::shutdown(); } //////////////////////////////////////////////////////////////////////////////// @@ -2178,7 +2177,6 @@ TEST_F(ProgramTests, ValidBinaryWithIGCVersionEqual0) { // Cleanup deleteDataReadFromFile(pBinary); - CompilerInterface::shutdown(); } TEST_F(ProgramTests, RebuildBinaryButNoCompilerInterface) { @@ -2338,7 +2336,6 @@ TEST_F(ProgramTests, RebuildBinaryWithProcessGenBinaryError) { // Cleanup deleteDataReadFromFile(pBinary); - CompilerInterface::shutdown(); } TEST_F(ProgramTests, GetProgramCompilerVersion) { diff --git a/unit_tests/program/program_with_block_kernels_tests.cpp b/unit_tests/program/program_with_block_kernels_tests.cpp index 2485129542..9efad9cc2f 100644 --- a/unit_tests/program/program_with_block_kernels_tests.cpp +++ b/unit_tests/program/program_with_block_kernels_tests.cpp @@ -41,7 +41,6 @@ class ProgramWithBlockKernelsTest : public ContextFixture, ProgramFixture::TearDown(); ContextFixture::TearDown(); PlatformFixture::TearDown(); - CompilerInterface::shutdown(); } cl_device_id device; cl_int retVal = CL_SUCCESS; diff --git a/unit_tests/program/program_with_source.h b/unit_tests/program/program_with_source.h index 6bd3d8805c..696e6ef012 100644 --- a/unit_tests/program/program_with_source.h +++ b/unit_tests/program/program_with_source.h @@ -55,7 +55,6 @@ class ProgramFromSourceTest : public ContextFixture, ContextFixture::TearDown(); PlatformFixture::TearDown(); delete kbHelper; - CompilerInterface::shutdown(); } KernelBinaryHelper *kbHelper;