mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

spirv-remap: Support outputting each SPIR-V module to a filename

Browse Source 
The `spirv-remap` tool now supports two output modes:
  * Outputting one or more inputs to a single directory -- the previous
    behavior
  * One output file per input -- new behavior.
This commit is contained in:
Allan MacKinnon 2023-07-28 12:13:55 -04:00 committed by GitHub
parent 0f873e757e
commit c8c669fc2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 61 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
StandAlone/spirv-remap.cpp
View File

@ -37,7 +37,11 @@
#include <fstream> #include <fstream>
#include <cstring> #include <cstring>
#include <stdexcept> #include <stdexcept>
#include <filesystem>
//
// Include remapper
//
#include "../SPIRV/SPVRemapper.h" #include "../SPIRV/SPVRemapper.h"
namespace { namespace {
@ -172,7 +176,7 @@ namespace {
<< " [--strip-all | --strip all | -s]" << " [--strip-all | --strip all | -s]"
<< " [--strip-white-list]" << " [--strip-white-list]"
<< " [--do-everything]" << " [--do-everything]"
<< " --input | -i file1 [file2...] --output|-o DESTDIR" << " --input | -i file1 [file2...] --output|-o DESTDIR | destfile1 [destfile2...]"
<< std::endl; << std::endl;
std::cout << " " << basename(name) << " [--version | -V]" << std::endl; std::cout << " " << basename(name) << " [--version | -V]" << std::endl;
@ -182,29 +186,42 @@ namespace {
} }
// grind through each SPIR in turn // grind through each SPIR in turn
void execute(const std::vector<std::string>& inputFile, const std::string& outputDir, void execute(const std::vector<std::string>& inputFiles,
const std::string& whiteListFile, int opts, int verbosity) const std::vector<std::string>& outputDirOrFiles,
const bool isSingleOutputDir,
const std::string& whiteListFile,
int opts,
int verbosity)
{ {
std::vector<std::string> whiteListStrings; std::vector<std::string> whiteListStrings;
if(!whiteListFile.empty()) if (!whiteListFile.empty())
read(whiteListStrings, whiteListFile, verbosity); read(whiteListStrings, whiteListFile, verbosity);
for (auto it = inputFile.cbegin(); it != inputFile.cend(); ++it) { for (std::size_t ii=0; ii<inputFiles.size(); ii++) {
const std::string &filename = *it;
std::vector<SpvWord> spv; std::vector<SpvWord> spv;
read(spv, filename, verbosity); read(spv, inputFiles[ii], verbosity);
spv::spirvbin_t(verbosity).remap(spv, whiteListStrings, opts); spv::spirvbin_t(verbosity).remap(spv, whiteListStrings, opts);
const std::string outfile = outputDir + path_sep_char() + basename(filename);
write(spv, outfile, verbosity); if (isSingleOutputDir) {
// write all outputs to same directory
const std::string outFile = outputDirOrFiles[0] + path_sep_char() + basename(inputFiles[ii]);
write(spv, outFile, verbosity);
} else {
// write each input to its associated output
write(spv, outputDirOrFiles[ii], verbosity);
}
} }
if (verbosity > 0) if (verbosity > 0)
std::cout << "Done: " << inputFile.size() << " file(s) processed" << std::endl; std::cout << "Done: " << inputFiles.size() << " file(s) processed" << std::endl;
} }
// Parse command line options // Parse command line options
void parseCmdLine(int argc, char** argv, std::vector<std::string>& inputFile, void parseCmdLine(int argc,
std::string& outputDir, char** argv,
std::vector<std::string>& inputFiles,
std::vector<std::string>& outputDirOrFiles,
std::string& stripWhiteListFile, std::string& stripWhiteListFile,
int& options, int& options,
int& verbosity) int& verbosity)
@ -222,18 +239,19 @@ namespace {
const std::string arg = argv[a]; const std::string arg = argv[a];
if (arg == "--output" || arg == "-o") { if (arg == "--output" || arg == "-o") {
// Output directory // Collect output dirs or files
if (++a >= argc) for (++a; a < argc && argv[a][0] != '-'; ++a)
outputDirOrFiles.push_back(argv[a]);
if (outputDirOrFiles.size() == 0)
usage(argv[0], "--output requires an argument"); usage(argv[0], "--output requires an argument");
if (!outputDir.empty())
usage(argv[0], "--output can be provided only once");
outputDir = argv[a++];
// Remove trailing directory separator characters
while (!outputDir.empty() && outputDir.back() == path_sep_char())
outputDir.pop_back();
// Remove trailing directory separator characters from all paths
for (std::size_t ii=0; ii<outputDirOrFiles.size(); ii++) {
auto path = outputDirOrFiles[ii];
while (!path.empty() && path.back() == path_sep_char())
path.pop_back();
}
} }
else if (arg == "-vv") { verbosity = 2; ++a; } // verbosity shortcuts else if (arg == "-vv") { verbosity = 2; ++a; } // verbosity shortcuts
else if (arg == "-vvv") { verbosity = 3; ++a; } // ... else if (arg == "-vvv") { verbosity = 3; ++a; } // ...
@ -262,7 +280,7 @@ namespace {
} else if (arg == "--input" || arg == "-i") { } else if (arg == "--input" || arg == "-i") {
// Collect input files // Collect input files
for (++a; a < argc && argv[a][0] != '-'; ++a) for (++a; a < argc && argv[a][0] != '-'; ++a)
inputFile.push_back(argv[a]); inputFiles.push_back(argv[a]);
} else if (arg == "--do-everything") { } else if (arg == "--do-everything") {
++a; ++a;
options = options | spv::spirvbin_t::DO_EVERYTHING; options = options | spv::spirvbin_t::DO_EVERYTHING;
@ -346,8 +364,8 @@ namespace {
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
std::vector<std::string> inputFile; std::vector<std::string> inputFiles;
std::string outputDir; std::vector<std::string> outputDirOrFiles;
std::string whiteListFile; std::string whiteListFile;
int opts; int opts;
int verbosity; int verbosity;
@ -361,13 +379,24 @@ int main(int argc, char** argv)
if (argc < 2) if (argc < 2)
usage(argv[0]); usage(argv[0]);
parseCmdLine(argc, argv, inputFile, outputDir, whiteListFile, opts, verbosity); parseCmdLine(argc, argv, inputFiles, outputDirOrFiles, whiteListFile, opts, verbosity);
if (outputDir.empty()) if (outputDirOrFiles.empty())
usage(argv[0], "Output directory required"); usage(argv[0], "Output directory or file(s) required.");
const bool isMultiInput = inputFiles.size() > 1;
const bool isMultiOutput = outputDirOrFiles.size() > 1;
const bool isSingleOutputDir = !isMultiOutput && std::filesystem::is_directory(outputDirOrFiles[0]);
if (isMultiInput && !isMultiOutput && !isSingleOutputDir)
usage(argv[0], "Output is not a directory.");
if (isMultiInput && isMultiOutput && (outputDirOrFiles.size() != inputFiles.size()))
usage(argv[0], "Output must be either a single directory or one output file per input.");
// Main operations: read, remap, and write. // Main operations: read, remap, and write.
execute(inputFile, outputDir, whiteListFile, opts, verbosity); execute(inputFiles, outputDirOrFiles, isSingleOutputDir, whiteListFile, opts, verbosity);
// If we get here, everything went OK! Nothing more to be done. // If we get here, everything went OK! Nothing more to be done.
} }