diff --git a/unit_tests/compiler_interface/compiler_interface_tests.cpp b/unit_tests/compiler_interface/compiler_interface_tests.cpp index f4d79789dd..db623c92fd 100644 --- a/unit_tests/compiler_interface/compiler_interface_tests.cpp +++ b/unit_tests/compiler_interface/compiler_interface_tests.cpp @@ -274,7 +274,7 @@ TEST_F(CompilerInterfaceTest, CompileClToIsaWithOptions) { TEST_F(CompilerInterfaceTest, CompileClToIr) { // compile only from .cl to IR MockCompilerDebugVars fclDebugVars; - fclDebugVars.fileName = clFiles + "copybuffer.elf"; + retrieveBinaryKernelFilename(fclDebugVars.fileName, "CopyBuffer_simd8_", ".bc"); gEnvironment->fclPushDebugVars(fclDebugVars); retVal = pCompilerInterface->compile(*pProgram, inputArgs); EXPECT_EQ(CL_SUCCESS, retVal); @@ -300,7 +300,7 @@ TEST_F(CompilerInterfaceTest, WhenCompileIsInvokedThenFclReceivesListOfExtension std::string receivedInternalOptions; MockCompilerDebugVars fclDebugVars; - fclDebugVars.fileName = clFiles + "copybuffer.elf"; + retrieveBinaryKernelFilename(fclDebugVars.fileName, "CopyBuffer_simd8_", ".bc"); fclDebugVars.receivedInternalOptionsOutput = &receivedInternalOptions; gEnvironment->fclPushDebugVars(fclDebugVars); retVal = pCompilerInterface->compile(*pProgram, inputArgs); @@ -362,7 +362,7 @@ TEST_F(CompilerInterfaceTest, LinkIrLinkFailure) { TEST_F(CompilerInterfaceTest, WhenLinkIsCalledThenLlvmBcIsUsedAsIntermediateRepresentation) { // link only from .ll to gen ISA MockCompilerDebugVars igcDebugVars; - igcDebugVars.fileName = clFiles + "copybuffer.ll"; + retrieveBinaryKernelFilename(igcDebugVars.fileName, "CopyBuffer_simd8_", ".bc"); gEnvironment->igcPushDebugVars(igcDebugVars); retVal = pCompilerInterface->link(*pProgram, inputArgs); gEnvironment->igcPopDebugVars(); @@ -427,7 +427,7 @@ TEST_F(CompilerInterfaceTest, CreateLibFailure) { TEST_F(CompilerInterfaceTest, WhenCreateLibraryIsCalledThenLlvmBcIsUsedAsIntermediateRepresentation) { // create library from .ll to IR MockCompilerDebugVars igcDebugVars; - igcDebugVars.fileName = clFiles + "copybuffer.ll"; + retrieveBinaryKernelFilename(igcDebugVars.fileName, "CopyBuffer_simd8_", ".bc"); gEnvironment->igcPushDebugVars(igcDebugVars); retVal = pCompilerInterface->createLibrary(*pProgram, inputArgs); gEnvironment->igcPopDebugVars(); @@ -932,7 +932,7 @@ TEST_F(CompilerInterfaceTest, whenIgcTranslatorReturnsBuildErrorThenGetSipKernel TEST_F(CompilerInterfaceTest, whenEverythingIsOkThenGetSipKernelReturnsIgcsOutputAsSipBinary) { MockCompilerDebugVars igcDebugVars; - igcDebugVars.fileName = clFiles + "copybuffer.ll"; + retrieveBinaryKernelFilename(igcDebugVars.fileName, "CopyBuffer_simd8_", ".bc"); gEnvironment->igcPushDebugVars(igcDebugVars); std::vector sipBinary; retVal = pCompilerInterface->getSipKernelBinary(SipKernelType::Csr, *this->pDevice, sipBinary); @@ -947,7 +947,7 @@ TEST_F(CompilerInterfaceTest, whenRequestingSipKernelBinaryThenProperInternalOpt std::string receivedInput; MockCompilerDebugVars igcDebugVars; - igcDebugVars.fileName = clFiles + "copybuffer.ll"; + retrieveBinaryKernelFilename(igcDebugVars.fileName, "CopyBuffer_simd8_", ".bc"); igcDebugVars.receivedInternalOptionsOutput = &receivedInternalOptions; igcDebugVars.receivedInput = &receivedInput; gEnvironment->igcPushDebugVars(igcDebugVars); diff --git a/unit_tests/test_files/copybuffer.elf b/unit_tests/test_files/copybuffer.elf deleted file mode 100644 index 86229dc5cf..0000000000 Binary files a/unit_tests/test_files/copybuffer.elf and /dev/null differ diff --git a/unit_tests/test_files/copybuffer.garbage b/unit_tests/test_files/copybuffer.garbage deleted file mode 100644 index da292aa554..0000000000 Binary files a/unit_tests/test_files/copybuffer.garbage and /dev/null differ diff --git a/unit_tests/test_files/copybuffer.ll b/unit_tests/test_files/copybuffer.ll deleted file mode 100644 index baffbadf6b..0000000000 Binary files a/unit_tests/test_files/copybuffer.ll and /dev/null differ diff --git a/unit_tests/test_files/sip_dummy_kernel_32.ll b/unit_tests/test_files/sip_dummy_kernel_32.ll deleted file mode 100644 index fd9aa45106..0000000000 --- a/unit_tests/test_files/sip_dummy_kernel_32.ll +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2018, Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -R"===( -target datalayout = "e-p:32:32:32" -target triple = "spir" -define void @f() { - ret void -} -!opencl.compiler.options = !{!0} -!opencl.kernels = !{!1} -!0 = !{} -!1 = !{void()* @f, !2, !3, !4, !5, !6, !7} -!2 = !{!"kernel_arg_addr_space"} -!3 = !{!"kernel_arg_access_qual"} -!4 = !{!"kernel_arg_type"} -!5 = !{!"kernel_arg_type_qual"} -!6 = !{!"kernel_arg_base_type"} -!7 = !{!"kernel_arg_name"} - -)===" \ No newline at end of file diff --git a/unit_tests/test_files/sip_dummy_kernel_64.ll b/unit_tests/test_files/sip_dummy_kernel_64.ll deleted file mode 100644 index 520a621353..0000000000 --- a/unit_tests/test_files/sip_dummy_kernel_64.ll +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2018, Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -R"===( -target datalayout = "e-p:64:64:64" -target triple = "spir64" -define void @f() { - ret void -} -!opencl.compiler.options = !{!0} -!opencl.kernels = !{!1} -!0 = !{} -!1 = !{void()* @f, !2, !3, !4, !5, !6, !7} -!2 = !{!"kernel_arg_addr_space"} -!3 = !{!"kernel_arg_access_qual"} -!4 = !{!"kernel_arg_type"} -!5 = !{!"kernel_arg_type_qual"} -!6 = !{!"kernel_arg_base_type"} -!7 = !{!"kernel_arg_name"} - -)===" \ No newline at end of file