Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Ocloc - fix binary output filename with "-output_no_suffix""

Browse Source 
This reverts commit 3ca628c388.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2022-11-03 20:53:43 +01:00
committed by Compute-Runtime-Automation
parent 6f710bfad7
commit 83f63e0008
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/manifest.yml
View File

@ -38,7 +38,7 @@ components:
dest_dir: kernels_bin dest_dir: kernels_bin
type: git type: git
branch: kernels_bin branch: kernels_bin
revision: 1982-408 revision: 1982-406
kmdaf: kmdaf:
branch: kmdaf branch: kmdaf
dest_dir: kmdaf dest_dir: kmdaf

6
opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp
View File

@ -2597,7 +2597,7 @@ TEST(OfflineCompilerTest, givenOutputNoSuffixFlagAndNonEmptyOutputFileNameAndNon
mockOfflineCompiler.writeOutAllFiles(); 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); ASSERT_NE(mockOfflineCompiler.uniqueHelper->interceptedFiles.end(), outputFileIt);
EXPECT_EQ("12345678", outputFileIt->second); EXPECT_EQ("12345678", outputFileIt->second);
@ -2613,7 +2613,7 @@ TEST(OfflineCompilerTest, givenInputFileNameAndOutputNoSuffixFlagAndEmptyOutputF
mockOfflineCompiler.writeOutAllFiles(); 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); ASSERT_NE(mockOfflineCompiler.uniqueHelper->interceptedFiles.end(), outputFileIt);
EXPECT_EQ("12345678", outputFileIt->second); EXPECT_EQ("12345678", outputFileIt->second);
@ -2637,7 +2637,7 @@ TEST(OfflineCompilerTest, givenNonEmptyOutputDirectoryWhenWritingOutAllFilesTheD
EXPECT_EQ("/home/important", mockOfflineCompiler.createdDirs[1]); EXPECT_EQ("/home/important", mockOfflineCompiler.createdDirs[1]);
EXPECT_EQ("/home/important/compilation", mockOfflineCompiler.createdDirs[2]); 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); ASSERT_NE(mockOfflineCompiler.uniqueHelper->interceptedFiles.end(), outputFileIt);
EXPECT_EQ("12345678", outputFileIt->second); EXPECT_EQ("12345678", outputFileIt->second);

2
shared/offline_compiler/source/offline_compiler.cpp
View File

@ -1178,7 +1178,7 @@ void OfflineCompiler::writeOutAllFiles() {
if (!elfBinary.empty()) { if (!elfBinary.empty()) {
std::string elfOutputFile; std::string elfOutputFile;
if (outputNoSuffix) { if (outputNoSuffix) {
elfOutputFile = generateFilePath(outputDirectory, fileBase, ".bin"); elfOutputFile = generateFilePath(outputDirectory, fileBase, "");
} else { } else {
elfOutputFile = generateFilePath(outputDirectory, fileBase, ".bin") + generateOptsSuffix(); elfOutputFile = generateFilePath(outputDirectory, fileBase, ".bin") + generateOptsSuffix();
} }