fix: no longer append .bin to binary name when "-output_no_suffix" is passed

Signed-off-by: Filip Hazubski <[email protected]>

Source: df62888

Author: fhazubski-Intel

opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp

@@ -2856,53 +2856,12 @@ TEST(OfflineCompilerTest, givenOutputNoSuffixFlagAndNonEmptyOutputFileNameAndNon
 
     mockOfflineCompiler.writeOutAllFiles();
 
-    const auto outputFileIt = mockOfflineCompiler.uniqueHelper->interceptedFiles.find("some_output_filename.bin");
+    const auto outputFileIt = mockOfflineCompiler.uniqueHelper->interceptedFiles.find("some_output_filename");
     ASSERT_NE(mockOfflineCompiler.uniqueHelper->interceptedFiles.end(), outputFileIt);
 
     EXPECT_EQ("12345678", outputFileIt->second);
 }
 
-TEST(OfflineCompilerTest, givenOutputNoSuffixFlagAndOutputFileNameWithExtensionOutWhenWritingOutAllFilesThenBinaryFileDoesNotHaveExtensionBinAdded) {
-    MockOfflineCompiler mockOfflineCompiler{};
-    mockOfflineCompiler.uniqueHelper->interceptOutput = true;
-
-    mockOfflineCompiler.outputNoSuffix = true;
-    mockOfflineCompiler.outputFile = "some_output_filename.out";
-    mockOfflineCompiler.elfBinary = {49, 50, 51, 52, 53, 54, 55, 56}; // ASCII codes of "12345678"
-
-    mockOfflineCompiler.writeOutAllFiles();
-
-    const auto outputFileIt = mockOfflineCompiler.uniqueHelper->interceptedFiles.find("some_output_filename.out");
-    ASSERT_NE(mockOfflineCompiler.uniqueHelper->interceptedFiles.end(), outputFileIt);
-
-    mockOfflineCompiler.uniqueHelper->interceptedFiles.clear();
-    mockOfflineCompiler.outputFile = "some_output_filename.out1";
-    mockOfflineCompiler.writeOutAllFiles();
-
-    const auto outputFileIt2 = mockOfflineCompiler.uniqueHelper->interceptedFiles.find("some_output_filename.out1.bin");
-    ASSERT_NE(mockOfflineCompiler.uniqueHelper->interceptedFiles.end(), outputFileIt2);
-}
-TEST(OfflineCompilerTest, givenOutputNoSuffixFlagAndOutputFileNameWithExtensionExeWhenWritingOutAllFilesThenBinaryFileDoesNotHaveExtensionBinAdded) {
-    MockOfflineCompiler mockOfflineCompiler{};
-    mockOfflineCompiler.uniqueHelper->interceptOutput = true;
-
-    mockOfflineCompiler.outputNoSuffix = true;
-    mockOfflineCompiler.outputFile = "some_output_filename.exe";
-    mockOfflineCompiler.elfBinary = {49, 50, 51, 52, 53, 54, 55, 56}; // ASCII codes of "12345678"
-
-    mockOfflineCompiler.writeOutAllFiles();
-
-    const auto outputFileIt = mockOfflineCompiler.uniqueHelper->interceptedFiles.find("some_output_filename.exe");
-    ASSERT_NE(mockOfflineCompiler.uniqueHelper->interceptedFiles.end(), outputFileIt);
-
-    mockOfflineCompiler.uniqueHelper->interceptedFiles.clear();
-    mockOfflineCompiler.outputFile = "some_output_filename.exe1";
-    mockOfflineCompiler.writeOutAllFiles();
-
-    const auto outputFileIt2 = mockOfflineCompiler.uniqueHelper->interceptedFiles.find("some_output_filename.exe1.bin");
-    ASSERT_NE(mockOfflineCompiler.uniqueHelper->interceptedFiles.end(), outputFileIt2);
-}
-
 TEST(OfflineCompilerTest, givenInputFileNameAndOutputNoSuffixFlagAndEmptyOutputFileNameAndNonEmptyElfContentWhenWritingOutAllFilesThenFileWithTruncatedInputNameIsWritten) {
     MockOfflineCompiler mockOfflineCompiler{};
     mockOfflineCompiler.uniqueHelper->interceptOutput = true;
@@ -2913,7 +2872,7 @@ TEST(OfflineCompilerTest, givenInputFileNameAndOutputNoSuffixFlagAndEmptyOutputF
 
     mockOfflineCompiler.writeOutAllFiles();
 
-    const auto outputFileIt = mockOfflineCompiler.uniqueHelper->interceptedFiles.find("important_file.bin");
+    const auto outputFileIt = mockOfflineCompiler.uniqueHelper->interceptedFiles.find("important_file");
     ASSERT_NE(mockOfflineCompiler.uniqueHelper->interceptedFiles.end(), outputFileIt);
 
     EXPECT_EQ("12345678", outputFileIt->second);
@@ -2937,7 +2896,7 @@ TEST(OfflineCompilerTest, givenNonEmptyOutputDirectoryWhenWritingOutAllFilesTheD
     EXPECT_EQ("/home/important", mockOfflineCompiler.createdDirs[1]);
     EXPECT_EQ("/home/important/compilation", mockOfflineCompiler.createdDirs[2]);
 
-    const auto outputFileIt = mockOfflineCompiler.uniqueHelper->interceptedFiles.find("/home/important/compilation/some_output_filename.bin");
+    const auto outputFileIt = mockOfflineCompiler.uniqueHelper->interceptedFiles.find("/home/important/compilation/some_output_filename");
     ASSERT_NE(mockOfflineCompiler.uniqueHelper->interceptedFiles.end(), outputFileIt);
 
     EXPECT_EQ("12345678", outputFileIt->second);

shared/offline_compiler/source/offline_compiler.cpp

@@ -1189,22 +1189,7 @@ void OfflineCompiler::writeOutAllFiles() {
     if (!elfBinary.empty()) {
         std::string elfOutputFile;
         if (outputNoSuffix) {
-            // temporary fix for backwards compatibility with oneAPI 2023.1 and older
-            // after adding ".bin" extension to name of binary output file
-            // if "-output filename" is passed with ".out" or ".exe" extension - do not append ".bin"
-            if (outputFile.empty()) {
-                elfOutputFile = generateFilePath(outputDirectory, fileBase, ".bin");
-            } else {
-                size_t extPos = fileBase.find_last_of(".", fileBase.size());
-                std::string fileExt = ".bin";
-                if (extPos != std::string::npos) {
-                    auto existingExt = fileBase.substr(extPos, fileBase.size());
-                    if (existingExt == ".out" || existingExt == ".exe") {
-                        fileExt = "";
-                    }
-                }
-                elfOutputFile = generateFilePath(outputDirectory, fileBase, fileExt.c_str());
-            }
+            elfOutputFile = generateFilePath(outputDirectory, fileBase, "");
         } else {
             elfOutputFile = generateFilePath(outputDirectory, fileBase, ".bin") + generateOptsSuffix();
         }