mirror of
https://github.com/KhronosGroup/SPIRV-Tools
synced 2024-12-28 10:41:04 +00:00
5a48c0da15
* Ensure same enum values have consistent extension lists * val: fix checking of capabilities The operand for an OpCapability should only be checked for the extension or core version. The InstructionPass registers a capability, and all its implied sub-capabilities before actually checking the operand to an OpCapability. * Add basic support for SPIR-V 1.5 - Adds SPV_ENV_UNIVERSAL_1_5 - Command line tools default to spv1.5 environment - SPIR-V 1.5 incorporates several extensions. Now the disassembler prefers outputing the non-EXT or non-KHR names. This requires updates to many tests, to make strings match again. - Command line tests: Expect SPIR-V 1.5 by default * Test validation of SPIR-V 1.5 incorporated extensions Starting with 1.5, incorporated features no longer require the associated OpExtension instruction.
155 lines
4.8 KiB
C++
155 lines
4.8 KiB
C++
// Copyright (c) 2015-2016 The Khronos Group Inc.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#include <cstdio>
|
|
#include <cstring>
|
|
#include <vector>
|
|
|
|
#include "source/spirv_target_env.h"
|
|
#include "spirv-tools/libspirv.h"
|
|
#include "tools/io.h"
|
|
|
|
void print_usage(char* argv0) {
|
|
std::string target_env_list = spvTargetEnvList(19, 80);
|
|
printf(
|
|
R"(%s - Create a SPIR-V binary module from SPIR-V assembly text
|
|
|
|
Usage: %s [options] [<filename>]
|
|
|
|
The SPIR-V assembly text is read from <filename>. If no file is specified,
|
|
or if the filename is "-", then the assembly text is read from standard input.
|
|
The SPIR-V binary module is written to file "out.spv", unless the -o option
|
|
is used.
|
|
|
|
Options:
|
|
|
|
-h, --help Print this help.
|
|
|
|
-o <filename> Set the output filename. Use '-' to mean stdout.
|
|
--version Display assembler version information.
|
|
--preserve-numeric-ids
|
|
Numeric IDs in the binary will have the same values as in the
|
|
source. Non-numeric IDs are allocated by filling in the gaps,
|
|
starting with 1 and going up.
|
|
--target-env {%s}
|
|
Use specified environment.
|
|
)",
|
|
argv0, argv0, target_env_list.c_str());
|
|
}
|
|
|
|
static const auto kDefaultEnvironment = SPV_ENV_UNIVERSAL_1_5;
|
|
|
|
int main(int argc, char** argv) {
|
|
const char* inFile = nullptr;
|
|
const char* outFile = nullptr;
|
|
uint32_t options = 0;
|
|
spv_target_env target_env = kDefaultEnvironment;
|
|
for (int argi = 1; argi < argc; ++argi) {
|
|
if ('-' == argv[argi][0]) {
|
|
switch (argv[argi][1]) {
|
|
case 'h': {
|
|
print_usage(argv[0]);
|
|
return 0;
|
|
}
|
|
case 'o': {
|
|
if (!outFile && argi + 1 < argc) {
|
|
outFile = argv[++argi];
|
|
} else {
|
|
print_usage(argv[0]);
|
|
return 1;
|
|
}
|
|
} break;
|
|
case 0: {
|
|
// Setting a filename of "-" to indicate stdin.
|
|
if (!inFile) {
|
|
inFile = argv[argi];
|
|
} else {
|
|
fprintf(stderr, "error: More than one input file specified\n");
|
|
return 1;
|
|
}
|
|
} break;
|
|
case '-': {
|
|
// Long options
|
|
if (0 == strcmp(argv[argi], "--version")) {
|
|
printf("%s\n", spvSoftwareVersionDetailsString());
|
|
printf("Target: %s\n",
|
|
spvTargetEnvDescription(kDefaultEnvironment));
|
|
return 0;
|
|
} else if (0 == strcmp(argv[argi], "--help")) {
|
|
print_usage(argv[0]);
|
|
return 0;
|
|
} else if (0 == strcmp(argv[argi], "--preserve-numeric-ids")) {
|
|
options |= SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS;
|
|
} else if (0 == strcmp(argv[argi], "--target-env")) {
|
|
if (argi + 1 < argc) {
|
|
const auto env_str = argv[++argi];
|
|
if (!spvParseTargetEnv(env_str, &target_env)) {
|
|
fprintf(stderr, "error: Unrecognized target env: %s\n",
|
|
env_str);
|
|
return 1;
|
|
}
|
|
} else {
|
|
fprintf(stderr, "error: Missing argument to --target-env\n");
|
|
return 1;
|
|
}
|
|
} else {
|
|
fprintf(stderr, "error: Unrecognized option: %s\n\n", argv[argi]);
|
|
print_usage(argv[0]);
|
|
return 1;
|
|
}
|
|
} break;
|
|
default:
|
|
fprintf(stderr, "error: Unrecognized option: %s\n\n", argv[argi]);
|
|
print_usage(argv[0]);
|
|
return 1;
|
|
}
|
|
} else {
|
|
if (!inFile) {
|
|
inFile = argv[argi];
|
|
} else {
|
|
fprintf(stderr, "error: More than one input file specified\n");
|
|
return 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!outFile) {
|
|
outFile = "out.spv";
|
|
}
|
|
|
|
std::vector<char> contents;
|
|
if (!ReadFile<char>(inFile, "r", &contents)) return 1;
|
|
|
|
spv_binary binary;
|
|
spv_diagnostic diagnostic = nullptr;
|
|
spv_context context = spvContextCreate(target_env);
|
|
spv_result_t error = spvTextToBinaryWithOptions(
|
|
context, contents.data(), contents.size(), options, &binary, &diagnostic);
|
|
spvContextDestroy(context);
|
|
if (error) {
|
|
spvDiagnosticPrint(diagnostic);
|
|
spvDiagnosticDestroy(diagnostic);
|
|
return error;
|
|
}
|
|
|
|
if (!WriteFile<uint32_t>(outFile, "wb", binary->code, binary->wordCount)) {
|
|
spvBinaryDestroy(binary);
|
|
return 1;
|
|
}
|
|
|
|
spvBinaryDestroy(binary);
|
|
|
|
return 0;
|
|
}
|