fix: ocloc fatbinary handle -out_dir without -output

Currently if we pass `-out_dir` in ocloc fatbinary cmdline, e.g.:
./ocloc compile -file vector.cl ... -out_dir ../exampler_dir
ocloc sets the name for the output file from the `-output` parameter.
But as the `-output` parameter is not provided,
the file name will be empty and won't be written to disk.

This patch adds support for a scenario
where you pass `-out_dir` without `-output`.
In this case, the file will have default name - input file's base name.

Related-To: NEO-10603
Signed-off-by: Fabian Zwolinski <[email protected]>

Author: fzwolinski

opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.cpp

@@ -508,6 +508,76 @@ TEST_F(OclocFatBinaryProductAcronymsTests, givenBinaryOutputNameOptionWhenBuildi
     }
 }
 
+TEST_F(OclocFatBinaryProductAcronymsTests, givenBinaryOutputDirOptionWhenBuildingThenCorrectFileIsCreated) {
+    auto acronyms = prepareProductsWithoutDashes(oclocArgHelperWithoutInput.get());
+    if (acronyms.size() < 2) {
+        GTEST_SKIP();
+    }
+
+    std::string acronymsTarget = acronyms[0] + "," + acronyms[1];
+    std::vector<ConstStringRef> expected{ConstStringRef(acronyms[0]), ConstStringRef(acronyms[1])};
+    auto got = NEO::getTargetProductsForFatbinary(acronymsTarget, oclocArgHelperWithoutInput.get());
+    EXPECT_EQ(got, expected);
+
+    oclocArgHelperWithoutInput->getPrinterRef().setSuppressMessages(false);
+
+    {
+        std::stringstream resString;
+        std::vector<std::string> argv = {
+            "ocloc",
+            "-file",
+            clFiles + "copybuffer.cl",
+            "-out_dir",
+            "../expected_output_directory",
+            "-device",
+            acronymsTarget};
+
+        testing::internal::CaptureStdout();
+        int retVal = buildFatBinary(argv, oclocArgHelperWithoutInput.get());
+        auto output = testing::internal::GetCapturedStdout();
+        EXPECT_EQ(retVal, OCLOC_SUCCESS);
+
+        const std::string expectedFatbinaryFileName = "../expected_output_directory/copybuffer.ar";
+        EXPECT_EQ(1u, NEO::virtualFileList.size());
+        EXPECT_TRUE(NEO::virtualFileList.find(expectedFatbinaryFileName) != NEO::virtualFileList.end());
+
+        for (const auto &product : expected) {
+            resString << "Build succeeded for : " << product.str() + ".\n";
+        }
+
+        EXPECT_STREQ(output.c_str(), resString.str().c_str());
+    }
+
+    {
+        std::stringstream resString;
+        std::vector<std::string> argv = {
+            "ocloc",
+            "-file",
+            clFiles + "copybuffer.cl",
+            "-out_dir",
+            "../expected_output_directory",
+            "-output",
+            "expected_filename",
+            "-device",
+            acronymsTarget};
+
+        testing::internal::CaptureStdout();
+        int retVal = buildFatBinary(argv, oclocArgHelperWithoutInput.get());
+        auto output = testing::internal::GetCapturedStdout();
+        EXPECT_EQ(retVal, OCLOC_SUCCESS);
+
+        const std::string expectedFatbinaryFileName = "../expected_output_directory/expected_filename";
+        EXPECT_EQ(2u, NEO::virtualFileList.size());
+        EXPECT_TRUE(NEO::virtualFileList.find(expectedFatbinaryFileName) != NEO::virtualFileList.end());
+
+        for (const auto &product : expected) {
+            resString << "Build succeeded for : " << product.str() + ".\n";
+        }
+
+        EXPECT_STREQ(output.c_str(), resString.str().c_str());
+    }
+}
+
 TEST_F(OclocFatBinaryProductAcronymsTests, givenTwoSameReleaseTargetsWhenGetProductsAcronymsThenDuplicatesAreNotFound) {
     if (enabledReleasesAcronyms.empty()) {
         GTEST_SKIP();

shared/offline_compiler/source/ocloc_fatbinary.cpp

@@ -401,13 +401,21 @@ int buildFatBinary(const std::vector<std::string> &args, OclocArgHelper *argHelp
     }
 
     auto fatbinaryData = fatbinary.encode();
-    std::string fatbinaryFileName = outputFileName;
-    if (outputFileName.empty() && (false == inputFileName.empty())) {
-        fatbinaryFileName = OfflineCompiler::getFileNameTrunk(inputFileName) + ".ar";
-    }
+
+    std::string fatbinaryFileName = "";
+
     if (false == outputDirectory.empty()) {
-        fatbinaryFileName = outputDirectory + "/" + outputFileName;
+        fatbinaryFileName = outputDirectory + "/";
+    }
+
+    if (false == outputFileName.empty()) {
+        fatbinaryFileName += outputFileName;
+    } else {
+        if (false == inputFileName.empty()) {
+            fatbinaryFileName += OfflineCompiler::getFileNameTrunk(inputFileName) + ".ar";
+        }
     }
+
     argHelper->saveOutput(fatbinaryFileName, fatbinaryData.data(), fatbinaryData.size());
 
     return 0;