intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-04 23:56:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

feature: ocloc - add new option for output binary filename

Browse Source 
- new option "-o [filename]" allows to set output binary filename, ocloc
will not add any extension to the name
- no other files will be produced (.spv/.cpp/.dbg)
Related-To: NEO-7935

Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
This commit is contained in:
Mateusz Hoppe
2023-05-05 15:16:46 +00:00
committed by Compute-Runtime-Automation
parent 826abf338a
commit 252c5a99cf
6 changed files with 192 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,7 +311,7 @@ int buildFatBinary(const std::vector<std::string> &args, OclocArgHelper *argHelp
} else if ((ConstStringRef("-file") == currArg) && hasMoreArgs) {
inputFileName = args[argIndex + 1];
++argIndex;
} else if ((ConstStringRef("-output") == currArg) && hasMoreArgs) {
} else if (((ConstStringRef("-output") == currArg) || (ConstStringRef("-o") == currArg)) && hasMoreArgs) {
outputFileName = args[argIndex + 1];
++argIndex;
} else if ((ConstStringRef("-out_dir") == currArg) && hasMoreArgs) {

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

@@ -677,6 +677,9 @@ int OfflineCompiler::parseCommandLine(size_t numArgs, const std::vector<std::str
} else if (("-output" == currArg) && hasMoreArgs) {
outputFile = argv[argIndex + 1];
argIndex++;
} else if (("-o" == currArg) && hasMoreArgs) {
binaryOutputFile = argv[argIndex + 1];
argIndex++;
} else if ((CompilerOptions::arch32bit == currArg) || ("-32" == currArg)) {
compile32 = true;
CompilerOptions::concatenateAppend(internalOptions, CompilerOptions::arch32bit);
@@ -753,6 +756,11 @@ int OfflineCompiler::parseCommandLine(size_t numArgs, const std::vector<std::str
}
}
if (!binaryOutputFile.empty() && (useGenFile || useCppFile || outputNoSuffix || !outputFile.empty())) {
argHelper->printf("Error: options: -gen_file/-cpp_file/-output_no_suffix/-output cannot be used with -o\n");
retVal = INVALID_COMMAND_LINE;
return retVal;
}
unifyExcludeIrFlags();
if (DebugManager.flags.OverrideRevision.get() != -1) {
@@ -923,10 +931,14 @@ Usage: ocloc [compile] -file <filename> -device <device_type> [-output <filename
<device_type> can be: %s
- can be single target device.
-o <filename> Optional output file name.
Must not be used with:
-gen_file | -cpp_file | -output_no_suffix | -output
-output <filename> Optional output file base name.
Default is input file's base name.
This base name will be used for all output
files. Proper sufixes (describing file formats)
This base name will be used for all output files.
For single target device proper suffixes (describing file formats)
will be added automatically.
-out_dir <output_dir> Optional output directory.
@@ -1141,6 +1153,16 @@ void OfflineCompiler::writeOutAllFiles() {
}
}
if (!binaryOutputFile.empty()) {
std::string outputFile = generateFilePath(outputDirectory, binaryOutputFile, "");
if (isOnlySpirV()) {
argHelper->saveOutput(outputFile, irBinary, irBinarySize);
} else if (!elfBinary.empty()) {
argHelper->saveOutput(outputFile, elfBinary.data(), elfBinary.size());
}
return;
}
if (irBinary && !inputFileSpirV) {
std::string irOutputFileName = generateFilePathForIr(fileBase) + generateOptsSuffix();

1
shared/offline_compiler/source/offline_compiler.h
View File

@@ -136,6 +136,7 @@ All supported acronyms: %s.
std::string productFamilyName;
std::string inputFile;
std::string outputFile;
std::string binaryOutputFile;
std::string outputDirectory;
std::string options;
std::string internalOptions;