NDK Release 12 Beta 2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAldE7sEACgkQ6K0/gZqxDnit5gCeLL5caPbqHCqJVgE059fvWPV7
F3wAn0CdPDeJBKPSETTK8N7tA3MZzUyn
=VC3Q
-----END PGP SIGNATURE-----
Merge remote-tracking branch 'aosp/upstream-master'

Pulls in the following:
27d98e2 Merge pull request #181 from antiagainst/readme
29ca6f9 Use footnotes for links in README.md.
4897864 Grammar update: OpPhi now uses PairIdRefIdRef as the last operand.
11636fb Update the core grammar.
469f0e8 Make paths to grammar output files
8ba7c92 Remove revision from SPV_ENV_*.
670c0ac Allow to only build certain grammar tables.
051e067 Remove the outdated patch file.
7649c73 Fix MSVC error C2797.
80e416c Use JSON grammar files to generate extended instruction sets.
9ca2d6d Rname grammar.json to spirv.core.grammar.json and add version info.
3fb2676 Fix validation of array length.
6fa3f8a Remove dependency on SPIR-V headers in libspirv.h.
d03c0a1 Enable linking against libSPIRV-Tools from linux shared libraries
c9b2285 Fix spelling mistakes
4f293b7 Use the JSON grammar file to generate various info tables.
a1de2b3 Handle CRLF in assembly text.
3d27da4 Add a target environment to spvContextCreate().
6836e17 OpExecutionMode only takes a single ExecutionMode
4529146 Capability fix: ImageReadWrite & ImageMipmap require ImageBasic.
tree: c2e0e0e41c34040c5fa4f75f588d1c2213b9a0e2
  1. .clang-format
  2. .gitignore
  3. .travis.yml
  4. CMakeLists.txt
  5. LICENSE
  6. README.md
  7. external/
  8. include/
  9. source/
  10. syntax.md
  11. test/
  12. tools/
  13. utils/
README.md

SPIR-V Tools

Build Status

Overview

The SPIR-V Tools project provides an API and commands for processing SPIR-V modules.

The project includes an assembler, binary module parser, disassembler, and validator for SPIR-V, all based on a common static library. The library contains all of the implementation details, and is used in the standalone tools whilst also enabling integration into other code bases directly.

The interfaces are still under development, and are expected to change.

SPIR-V is defined by the Khronos Group Inc. See the SPIR-V Registry for the SPIR-V specification, headers, and XML registry.

Supported features

Assembler, binary parser, and disassembler

  • Based on SPIR-V 1.0 Revision 3.
    • Supports GLSL std450 extended instructions.
    • Supports OpenCL extended instructions.
  • Assembler only does basic syntax checking. No cross validation of IDs or types is performed, except to check literal arguments to OpConstant, OpSpecConstant, and OpSwitch.

See syntax.md for the assembly language syntax.

Validator

Warning: The validator is incomplete.

Source code

The SPIR-V Tools are maintained by members of the The Khronos Group Inc., at https://github.com/KhronosGroup/SPIRV-Tools.

Contributions via merge request are welcome. Changes should:

We intend to maintain a linear history on the GitHub master branch.

Source code organization

  • external/googletest: Intended location for the googletest sources, not provided
  • include/: API clients should add this directory to the include search path
  • include/spirv-tools/libspirv.h: C API public interface
  • include/spirv/ : Contains header files from the SPIR-V Registry, required by the public API.
  • source/: API implementation
  • test/: Tests, using the googletest framework
  • tools/: Command line executables

Tests

The project contains a number of tests, used to drive development and ensure correctness. The tests are written using the googletest framework. The googletest source is not provided with this project. There are two ways to enable tests:

  • If SPIR-V Tools is configured as part of an enclosing project, then the enclosing project should configure googletest before configuring SPIR-V Tools.
  • If SPIR-V Tools is configured as a standalone project, then download the googletest source into the <spirv-dir>/external/googletest directory before configuring and building the project.

Note: You must use a version of googletest that includes a fix for googletest issue 610. The fix is included on the googletest master branch any time after 2015-11-10. In particular, googletest must be newer than version 1.7.0.

Build

The project uses CMake to generate platform-specific build configurations. To generate these build files, issue the following commands:

mkdir <spirv-dir>/build
cd <spirv-dir>/build
cmake [-G <platform-generator>] <spirv-dir>

Once the build files have been generated, build using your preferred development environment.

CMake options

The following CMake options are supported:

  • SPIRV_COLOR_TERMINAL={ON|OFF}, default ON - Enables color console output.
  • SPIRV_SKIP_EXECUTABLES={ON|OFF}, default OFF- Build only the library, not the command line tools. This will also prevent the tests from being built.
  • SPIRV_USE_SANITIZER=<sanitizer>, default is no sanitizing - On UNIX platforms with an appropriate version of clang this option enables the use of the sanitizers documented here. This should only be used with a debug build.
  • SPIRV_WARN_EVERYTHING={ON|OFF}, default OFF - On UNIX platforms enable more strict warnings. The code might not compile with this option enabled. For Clang, enables -Weverything. For GCC, enables -Wpedantic. See CMakeLists.txt for details.
  • SPIRV_WERROR={ON|OFF}, default ON - Forces a compilation error on any warnings encountered by enabling the compiler-specific compiler front-end option.

Library

Usage

The library provides a C API, but the internals use C++11.

In order to use the library from an application, the include path should point to <spirv-dir>/include, which will enable the application to include the header <spirv-dir>/include/libspirv/libspirv.h then linking against the static library in <spirv-build-dir>/libSPIRV-Tools.a or <spirv-build-dir>/SPIRV-Tools.lib.

  • SPIRV-Tools CMake target: Creates the static library:
    • <spirv-build-dir>/libSPIRV-Tools.a on Linux and OS X.
    • <spirv-build-dir>/libSPIRV-Tools.lib on Windows.

Entry points

The interfaces are still under development, and are expected to change.

There are three main entry points into the library.

  • spvTextToBinary: An assembler, translating text to a binary SPIR-V module.
  • spvBinaryToText: A disassembler, translating a binary SPIR-V module to text.
  • spvBinaryParse: The entry point to a binary parser API. It issues callbacks for the header and each parsed instruction. The disassembler is implemented as a client of spvBinaryParse.
  • spvValidate implements the validator functionality. Incomplete

Command line tools

Command line tools, which wrap the above library functions, are provided to assemble or disassemble shader files. It's a convention to name SPIR-V assembly and binary files with suffix .spvasm and .spv, respectively.

Assembler tool

The assembler reads the assembly language text, and emits the binary form.

The standalone assembler is the exectuable called spirv-as, and is located in <spirv-build-dir>/spirv-as. The functionality of the assembler is implemented by the spvTextToBinary library function.

  • spirv-as - the standalone assembler
    • <spirv-dir>/spirv-as

Use option -h to print help.

Disassembler tool

The disassembler reads the binary form, and emits assembly language text.

The standalone disassembler is the executable called spirv-dis, and is located in <spirv-build-dir>/spirv-dis. The functionality of the disassembler is implemented by the spvBinaryToText library function.

  • spirv-dis - the standalone disassembler
    • <spirv-dir>/spirv-dis

Use option -h to print help.

The output includes syntax colouring when printing to the standard output stream, on Linux, Windows, and OS X.

Validator tool

Warning: This functionality is under development, and is incomplete.

The standalone validator is the executable called spirv-val, and is located in <spirv-build-dir>/spirv-val. The functionality of the validator is implemented by the spvValidate library function.

The validator operates on the binary form.

  • spirv-val - the standalone validator
    • <spirv-dir>/spirv-val

Tests

Tests are only built when googletest is found.

The <spirv-build-dir>/UnitSPIRV executable runs the project tests. It supports the standard googletest command line options.

The project also adds a CMake test spirv-tools-testsuite, which executes UnitSPIRV. That way it's possible to run the tests using ctest.

Future Work

Assembler and disassembler

  • The disassembler could emit helpful annotations in comments. For example:
    • Use variable name information from debug instructions to annotate key operations on variables.
    • Show control flow information by annotating OpLabel instructions with that basic block's predecessors.
  • Error messages could be improved.

Validator

This is a work in progress.

Licence

Copyright (c) 2015-2016 The Khronos Group Inc.

Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and/or associated documentation files (the
"Materials"), to deal in the Materials without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Materials, and to
permit persons to whom the Materials are furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Materials.

MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS
KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS
SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT
   https://www.khronos.org/registry/

THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.