Lei Zhang [Fri, 23 Sep 2016 19:13:24 +0000 (15:13 -0400)]
Avoid appending EOL in StringifyMessage().
EOL should be appended when outputing to streams by the tool.
Lei Zhang [Thu, 22 Sep 2016 15:28:48 +0000 (11:28 -0400)]
Fix operand class test coverage table.
* Fix a missing column.
* Convert line endings.
This will make the table beautiful and searchable on Github.
Lei Zhang [Wed, 21 Sep 2016 21:16:31 +0000 (17:16 -0400)]
Clean up header dependency.
David Neto [Thu, 22 Sep 2016 21:09:34 +0000 (17:09 -0400)]
Handle parse failure for setting spec constants
Umar Arshad [Thu, 22 Sep 2016 14:23:08 +0000 (10:23 -0400)]
Fix forward reference issues with forword pointer
* Allows OpTypeForwardPointer to reference IDs not yet declared in
the module
* Allows OpTypeStruct to reference IDs not yet declared in
the module
Possible Issue: OpTypeStruct should only allow forward references
if the ID is a pointer that is referenced by a forward pointer. Need
Type support in Validator which is currently a work in progress.
qining [Thu, 22 Sep 2016 15:50:12 +0000 (11:50 -0400)]
Command line option for set default value for spec constant
Format:
```
--set-spec-constant-default-value "<spec id A>:<default value A> <spec id
B>:<default value B> ..."
```
Example:
shader: `test.vert`
```
layout(constant_id = 100) const int myint = 10;
layout(constant_id = 101) const int myuint = 100;
layout(constant_id = 200) const float myfloat = 1.25;
layout(constant_id = 201) const double mydouble = 2.34;
void main() {}
```
command line:
```
spirv-opt --set-spec-const-default-value "100:12 101:200 200:1.2323
201:1.2345" test.vert -o output.spv
```
output:
```
...
OpDecorate %7 SpecId 100
OpDecorate %8 SpecId 101
OpDecorate %10 SpecId 200
OpDecorate %12 SpecId 201
%void = OpTypeVoid
%3 = OpTypeFunction %void
%int = OpTypeInt 32 1
%7 = OpSpecConstant %int 12
%8 = OpSpecConstant %int 200
%float = OpTypeFloat 32
%10 = OpSpecConstant %float 1.23232
%double = OpTypeFloat 64
%12 = OpSpecConstant %double 2.34232
...
```
Lei Zhang [Wed, 21 Sep 2016 20:45:53 +0000 (16:45 -0400)]
Use nullptr as the default message consumer to ignore all messages.
There is no difference between the previous IgnoreMessage() function
and a null std::function, from functionality's perspective.
The user can set nullptr as the MessageConsumer, so need to guard
against nullptr before calling the consumer anyway. It's better
we use it internally so that it may expose problems by us instead
of the user.
Lei Zhang [Wed, 21 Sep 2016 14:53:15 +0000 (10:53 -0400)]
Change some asserts to normal errors in IrLoader.
Lei Zhang [Wed, 21 Sep 2016 14:52:31 +0000 (10:52 -0400)]
Add two more utility functions for sending errors to consumer.
Lei Zhang [Wed, 14 Sep 2016 16:09:52 +0000 (12:09 -0400)]
Change parameter name from file to source in Log() and Logf().
Lei Zhang [Tue, 20 Sep 2016 22:03:37 +0000 (18:03 -0400)]
Add more Assemble(), Disassemble() and Validate() overloads.
Lei Zhang [Fri, 16 Sep 2016 20:12:04 +0000 (16:12 -0400)]
Publish the C++ interface.
Lei Zhang [Fri, 16 Sep 2016 19:56:30 +0000 (15:56 -0400)]
Rename SpvTools to SpirvTools.
Lei Zhang [Wed, 21 Sep 2016 16:44:37 +0000 (12:44 -0400)]
Use C style names for MessageLevel.
Lei Zhang [Wed, 21 Sep 2016 15:30:41 +0000 (11:30 -0400)]
Change to use enum instead of enum class for MessageLevel.
This allows us to create C interface with MessageLevel later.
Lei Zhang [Mon, 12 Sep 2016 18:11:46 +0000 (14:11 -0400)]
Add a C++ interface to the optimization functionalities.
Lei Zhang [Tue, 20 Sep 2016 20:48:00 +0000 (16:48 -0400)]
Allow changing MessageConsumer in Pass & PassManager.
Default-constructed Pass/PassManager will have a MessageConsumer
which ignores all messages. SetMessageConsumer() should be called
to supply a meaningful MessageConsumer.
Lei Zhang [Tue, 20 Sep 2016 20:44:24 +0000 (16:44 -0400)]
Change BuildModule() to accept pointer-size pair for binary.
Lei Zhang [Mon, 12 Sep 2016 16:39:44 +0000 (12:39 -0400)]
Change interface of Pass::Process() to return possible failures.
David Neto [Mon, 19 Sep 2016 14:13:04 +0000 (10:13 -0400)]
Provide friendly names for shader ballot BuiltIns
Umar Arshad [Thu, 15 Sep 2016 21:32:44 +0000 (17:32 -0400)]
Update validate interface to accept binary pointers
Lei Zhang [Fri, 16 Sep 2016 19:43:41 +0000 (15:43 -0400)]
Set the default source name as "input".
David Neto [Fri, 16 Sep 2016 20:40:00 +0000 (16:40 -0400)]
Start v2016.6-dev
David Neto [Fri, 16 Sep 2016 20:39:40 +0000 (16:39 -0400)]
Finalize v2016.5
David Neto [Fri, 16 Sep 2016 18:40:02 +0000 (14:40 -0400)]
Add basic support for SPV_KHR_shader_ballot
Requires use of SPIRV-Headers that has support
for SPV_KHR_shader_ballot.
Adds assembler, disassembler, binary parser support.
Adds general support for allowing an operand to be
only enabled by a set of extensions.
TODO: Validator support for extension checking.
Lei Zhang [Fri, 9 Sep 2016 14:46:23 +0000 (10:46 -0400)]
Prepare the C++ interface for publication.
* Use PIMPL idiom in the C++ interface.
* Clean up interface for assembling and disassembling.
* Add validation into C++ interface.
* Add more tests for the C++ interface.
Lei Zhang [Fri, 9 Sep 2016 18:45:18 +0000 (14:45 -0400)]
Move functions for building modules outside of the C++ interface.
Lei Zhang [Fri, 16 Sep 2016 16:10:47 +0000 (12:10 -0400)]
Let SPIRV_ASSERT() exit the program if the assertion fails.
Lei Zhang [Sat, 20 Aug 2016 03:17:44 +0000 (23:17 -0400)]
Add MessageConsumer to PassManager, Pass, and analysis interfaces.
Also convert some uses of assert() in optimization code to use
SPIRV_ASSERT(), SPIRV_UNIMPLEMENTED(), or SPIRV_UNREACHABLE()
accordingly.
Lei Zhang [Thu, 8 Sep 2016 15:43:48 +0000 (11:43 -0400)]
Add utility macros for logging messages.
Add the following macros for logging purpose:
* SPIRV_ASSERT
* SPIRV_DEBUG
* SPIRV_UNIMPLEMENTED
* SPIRV_UNREACHABLE
The last two is always turned on, while the first two can only
be turned on in debug build.
Lei Zhang [Fri, 2 Sep 2016 22:06:18 +0000 (18:06 -0400)]
Add a callback mechanism for communicating messages to callers.
Every time an event happens in the library that the user should be
aware of, the callback will be invoked.
The existing diagnostic mechanism is hijacked internally by a
callback that creates an diagnostic object each time an event
happens.
David Neto [Tue, 13 Sep 2016 16:38:42 +0000 (12:38 -0400)]
Make friendly names for built-in variables.
Handles only OpDecorate
Does not handle:
- decorations on struct members
- decoration via OpGroupDecorate
David Neto [Wed, 14 Sep 2016 19:22:47 +0000 (15:22 -0400)]
Update CHANGES to say #414 is fixed
David Neto [Wed, 14 Sep 2016 15:57:20 +0000 (11:57 -0400)]
Fix validator: OpUndef can be member of a constant composite
This was enabled in SPIR-V 1.0 Rev 7
Fixes: https://github.com/KhronosGroup/SPIRV-Tools/issues/414
David Neto [Wed, 14 Sep 2016 16:48:38 +0000 (12:48 -0400)]
Clarify: Ok to pass null diagnostic to spvBinaryParse
It's a valid use case: I might mostly trust my binaries and I don't
care to to collect detailed diagnostic feedback.
David Neto [Wed, 14 Sep 2016 15:04:19 +0000 (11:04 -0400)]
Fix validator SSA check: Phi can use its own value sometimes
Defer removal of a Phi's result id from the undefined-forward-reference
set until after you've scanned the arguments. The reordering is only
significant for Phi.
Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/415
qining [Fri, 9 Sep 2016 15:47:42 +0000 (11:47 -0400)]
Build "spec id->default val str" mapping from string
Add function `ParseDefaultValuesString()` to build the spec id->default
value string mapping required by `SetSpecConstantDefaultValuePass`.
qining [Tue, 13 Sep 2016 15:57:02 +0000 (11:57 -0400)]
Guard against nullptr in number parsing utilities
ParseNumber(): Returns false if the given string is a nullptr.
ParseAndEncodeXXXX(): Returns kInvalidText and populate error message:
"The given text is a nullptr", if the givne string is a nullptr.
qining [Tue, 30 Aug 2016 18:57:56 +0000 (14:57 -0400)]
Set default values for spec const decorated by SpecId
The pass instance is constructed with a map from spec id (uint32_t) to
default values in string format. The default value strings will be
parsed to numbers according to the target spec constant type.
If the Spec Id decoration is found to be applied on multiple different
target ids, that decoration instruction (OpDecorate or OpGroupDecorate)
will be skipped. But other decoration instrucitons may still be
processed.
David Neto [Mon, 12 Sep 2016 20:48:05 +0000 (16:48 -0400)]
Update CMake condition for Emacs load/save helper
Make SPIRV_TOOLS_INSTALL_EMACS_HELPERS a CMake option. Otherwise
I get a variable-defined-but-not-used error.
steve-lunarg [Fri, 2 Sep 2016 20:04:02 +0000 (14:04 -0600)]
add spirv-dis/spirv-as support for emacs when loading .spv binaries
qining [Thu, 8 Sep 2016 22:00:12 +0000 (18:00 -0400)]
Add IsSigned() to opt::Analysis::Integer.
qining [Thu, 1 Sep 2016 18:27:04 +0000 (14:27 -0400)]
Pull out the number parsing logic
Pull out the number parsing logic from
AssemblyContext::binaryEncodeNumericLiteral() to utilities.
The new utility function: `ParseAndEncodeNumber()` now accepts:
* number text to parse
* number type
* a emit function, which is a function which will be called with each
parsed uint32 word.
* a pointer to std::string to be overwritten with error messages.
(pass nullptr if expect no error message)
and returns:
* an enum result type to indicate the status
Type/Structs moved to utility:
* template<typename T> class ClampToZeroIfUnsignedType
New type:
* enum EncodeNumberStatus: success or error code
* NumberType: hold the number type information for the number to be parsed.
* several helper functions are also added for NumberType.
Functions moved to utility:
* Helpers:
* template<typename T> checkRangeAndIfHexThenSignExtend() -> CheckRangeAndIfHex....()
* Interfaces:
* template<typename T> parseNumber() -> ParseNumber()
* binaryEncodeIntegerLiteral() -> ParseAndEncodeIntegerNumber()
* binaryEncodeFloatingPointLiteral() -> ParseAndEncodeFloatingPointNumber()
* binaryEncodeNumericLiteral() -> ParseAndEncodeNumber()
Tests added/moved to test/ParseNumber.cpp, including tests for:
* ParseNumber(): This is moved from TextToBinary.cpp to ParseNumber.cpp
* ParseAndEncodeIntegerNumber(): New added
* ParseAndEncodeFloatingPointNumber(): New added
* ParseAndEncodeNumber(): New added
Note that the error messages are kept almost the same as before, but
they may be inappropriate for an utility function. Those will be fixed
in another CL.
Lei Zhang [Thu, 8 Sep 2016 21:26:53 +0000 (17:26 -0400)]
Merge diagnostic tests and single them out in a separate binary.
Lei Zhang [Wed, 7 Sep 2016 21:43:15 +0000 (17:43 -0400)]
Create separate binaries for validation tests.
Lei Zhang [Wed, 7 Sep 2016 21:26:18 +0000 (17:26 -0400)]
Prefix test binaries with `test_`, rename UnitSPIRV, update README.
Lei Zhang [Mon, 5 Sep 2016 20:17:33 +0000 (16:17 -0400)]
Travis CI: mark build as finished once a job failed.
Lei Zhang [Mon, 5 Sep 2016 21:11:44 +0000 (17:11 -0400)]
Kill the spvCheck macro which is just alias to if-statement.
Lei Zhang [Fri, 2 Sep 2016 14:15:47 +0000 (10:15 -0400)]
Update README about the optimization library and tool.
David Neto [Fri, 2 Sep 2016 14:29:14 +0000 (10:29 -0400)]
Say contributors have to click through the CLA
David Neto [Fri, 2 Sep 2016 13:29:52 +0000 (09:29 -0400)]
Add test for presence of copyrights and license terms
David Neto [Thu, 1 Sep 2016 19:38:53 +0000 (15:38 -0400)]
Start v2016.5-dev
David Neto [Thu, 1 Sep 2016 19:33:59 +0000 (15:33 -0400)]
Relicense SPIRV-Tools under Apache 2.0
Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/383
Finalize v2016.4
David Neto [Thu, 1 Sep 2016 18:49:14 +0000 (14:49 -0400)]
Add check_copyright to check or update copyright.
It will also replace an MIT or Khronos free use license with
the Apache license notice.
David Neto [Thu, 1 Sep 2016 17:04:00 +0000 (13:04 -0400)]
Fix Google copyright lines
Lei Zhang [Fri, 2 Sep 2016 13:51:44 +0000 (09:51 -0400)]
Kill the spvCheckReturn macro.
Lei Zhang [Fri, 2 Sep 2016 13:49:56 +0000 (09:49 -0400)]
Kill diagnostic_helper & the wrapping DIAGNOSTIC macro.
Lei Zhang [Wed, 31 Aug 2016 23:37:13 +0000 (19:37 -0400)]
Tests for preserving line debug insts even killing its affecting targets.
qining [Wed, 17 Aug 2016 21:19:48 +0000 (17:19 -0400)]
Unify constants pass
De-duplicate constants and unifies the uses of constants for a SPIR-V
module. If two constants are defined exactly the same, only one of them
will be kept and all the uses of the removed constant will be redirected
to the kept one.
This pass handles normal constants (defined with
OpConstant{|True|False|Composite}), some spec constants (those defined
with OpSpecConstant{Op|Composite}) and null constants (defined with
OpConstantNull).
There are several cases not handled by this pass:
1) If there are decorations for the result id of a constant defining
instruction, that instruction will not be processed. This means the
instruction won't be used to replace other instructions and other
instructions won't be used to replace it either.
2) This pass does not unify null constants (defined with
OpConstantNull instruction) with their equivalent zero-valued normal
constants (defined with OpConstant{|False|Composite} with zero as the
operand values or component values).
David Neto [Wed, 31 Aug 2016 18:35:58 +0000 (14:35 -0400)]
Refactor CapabilitySet into templated class EnumSet
qining [Wed, 31 Aug 2016 16:44:49 +0000 (12:44 -0400)]
Add forwarding so that passes' ctor can have args.
Also removed the default argument value of `skip_nop` for function
`SinglePassRunAndCheck()` and `SinglePassRunAndDisassemble()`. This is
required to support variadic arguments.
David Neto [Mon, 29 Aug 2016 18:49:00 +0000 (14:49 -0400)]
Handle capabilities larger than value 63
Use libspirv::CapabilitySet instead of a 64-bit mask.
Remove dead function spvOpcodeRequiresCapability and its tests.
The JSON grammar parser is simplified since it just writes the
list of capabilities as a braced list, and takes advantage of
the CapabilitySet intializer-list constructor.
David Neto [Sat, 27 Aug 2016 18:49:53 +0000 (14:49 -0400)]
Add libspirv::CapabilitySet
It's optimized for the common case, where capabilities have value
at most 63.
qining [Mon, 29 Aug 2016 22:05:24 +0000 (18:05 -0400)]
Get annotation instructions of a given id.
qining [Mon, 29 Aug 2016 20:09:40 +0000 (16:09 -0400)]
Add AppendNames() interface for AssemblyBuilder
Lei Zhang [Mon, 29 Aug 2016 19:46:09 +0000 (15:46 -0400)]
Create a separate header and source file for each pass.
qining [Thu, 4 Aug 2016 17:24:08 +0000 (13:24 -0400)]
Fold spec constants to normal constants (values fixed)
For the spec constants defined by OpSpecConstantOp and
OpSpecContantComposite, if all of their operands are constants with
determined values (normal constants whose values are fixed), calculate
the correct values of the spec constants and re-define them as normal
constants.
In short, this pass replaces all the spec constants defined by
OpSpecContantOp and OpSpecConstantComposite with normal constants when
possible. So far not all valid operations of OpSpecConstantOp are
supported, we have several constriction here:
1) Only 32-bit integer and boolean (both scalar and vector) are
supported for any arithmetic operations. Integers in other width (like
64-bit) are not supported.
2) OpSConvert, OpFConvert, OpQuantizeToF16, and all the
operations under Kernel capability, are not supported.
3) OpCompositeInsert is not supported.
Note that this pass does not unify normal constants. This means it is
possible to have new generatd constants defining the same values.
David Neto [Thu, 25 Aug 2016 22:36:03 +0000 (18:36 -0400)]
Pass manager recomputes Id bound automatically.
Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/371
in the sense that the id bound is correct after all the passes
have been run. But it might be inconsistent between passes.
Lei Zhang [Fri, 26 Aug 2016 20:52:16 +0000 (16:52 -0400)]
Create const overloads for begin() and end() in Instruction.
David Neto [Fri, 26 Aug 2016 20:25:40 +0000 (16:25 -0400)]
Fix typo in spirv-opt help
David Neto [Tue, 23 Aug 2016 15:41:28 +0000 (11:41 -0400)]
Add Module::ComputeIdBound
When IDs change, something should use this utility method
and Module::SetIdBound before writing out the binary.
Lei Zhang [Fri, 26 Aug 2016 18:02:40 +0000 (14:02 -0400)]
Add tests for decoration_empty().
qining [Fri, 26 Aug 2016 15:54:36 +0000 (11:54 -0400)]
Add a method in the types to check whether there is no decoration on a
type.
David Neto [Fri, 26 Aug 2016 14:33:41 +0000 (10:33 -0400)]
Test ir::Instruction::GetOperand and GetInOperand
David Neto [Thu, 25 Aug 2016 20:42:36 +0000 (16:42 -0400)]
IrLoader gracefully handles incomplete blocks and functions
This lets us write smaller test cases with the IrLoader, avoiding
boilerplate for function begin/end, and basic block begin/end.
Also ForEachInst is more forgiving of cases where a basic block
doesn't have a label, and when a function doesn't have a defining
or end instruction.
David Neto [Thu, 25 Aug 2016 21:45:08 +0000 (17:45 -0400)]
Add Instruction begin and end mutable iterators
Refactored the instuction test.
David Neto [Thu, 25 Aug 2016 16:55:44 +0000 (12:55 -0400)]
Add Instruction cbegin and cend to access operands
David Neto [Sat, 20 Aug 2016 13:47:00 +0000 (09:47 -0400)]
ForEachInst optionally runs on attached debug line insts
Also:
- Add const forms of ForEachInst
- Rewrite Module::ToBinary in terms of ForEachInst
- Add Instruction::ToBinaryWithoutAttachedDebugInsts
- Delete the ToBinary method on Function, BasicBlock, and Instruction
since it can now be implemented with ForEachInst in a less confusing
way, e.g. without recursion.
- Preserve debug line instructions on OpFunctionEnd (and store that
instruction as a unique-pointer, for regularity).
Lei Zhang [Wed, 17 Aug 2016 14:34:53 +0000 (10:34 -0400)]
Travis CI: add build configuration for Android NDK with cmake.
David Neto [Wed, 24 Aug 2016 15:18:16 +0000 (11:18 -0400)]
Start v2016.4-dev
David Neto [Wed, 24 Aug 2016 15:17:07 +0000 (11:17 -0400)]
Finalize v2016.3
David Neto [Mon, 22 Aug 2016 15:38:18 +0000 (11:38 -0400)]
Add spirv-lesspipe.sh
Idea suggested by @steve-lunarg in issue 359.
David Neto [Wed, 24 Aug 2016 13:47:49 +0000 (09:47 -0400)]
Mere mention of PointSize BuiltIn does not require Shader capability
Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/365 which
was reopened for this.
Lei Zhang [Fri, 19 Aug 2016 03:16:21 +0000 (23:16 -0400)]
Add a home brewed make_unique to ease creating unique_ptrs.
Lei Zhang [Sat, 20 Aug 2016 15:12:57 +0000 (11:12 -0400)]
Remove some unused macros and functions.
David Neto [Tue, 23 Aug 2016 22:44:26 +0000 (18:44 -0400)]
CHANGES captures fix for issue 365
David Neto [Tue, 23 Aug 2016 22:18:17 +0000 (18:18 -0400)]
Relax ClipDistance, CullDistance capability check in all environments
Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/365
David Neto [Sat, 20 Aug 2016 09:51:15 +0000 (05:51 -0400)]
Add opt::ir::Module::SetIdBound
qining [Tue, 23 Aug 2016 15:34:24 +0000 (11:34 -0400)]
Get the number of elements for Vector and Matrix type
qining [Tue, 16 Aug 2016 17:06:03 +0000 (13:06 -0400)]
Refine the DefUseManager
* Fix the behavior when analyzing an individual instruction:
* exisiting instruction:
Clear the original records and re-analyze it as a new instruction.
* new instruction with exisiting result id:
Clear the original records of the exisiting result id. This means
the records of the analyzed result-id-defining instruction will be
overwritten by the record of the new instruction with the same
result id.
* new instruction with new result id or without result id:
Just update the internal records to incorperate the new
instruction.
* Add tests for analyzing individual instruction w/o an exisiting module.
* Refactor ClearInst() implementation
* Remove ClearDef() function.
* Fixed a bug in DefUseManager::ReplaceAllUsesWith() that OpName
instruction may trigger the assertion incorrectly.
* update the blurbs for EraseUseRecordsOfOperandIds()
qining [Wed, 17 Aug 2016 20:44:38 +0000 (16:44 -0400)]
Get the width from integer and float type
qining [Tue, 16 Aug 2016 15:04:32 +0000 (11:04 -0400)]
Replace the SetOperand() with SetInOperand() and SetResultType()
Lei Zhang [Tue, 16 Aug 2016 15:19:34 +0000 (11:19 -0400)]
Make clear that we are using ptrdiff_t as the iterator difference type.
And ptrdiff_t is a implementation defined signed type. Comparing it
with unsigned number literal causes compiler warnings.
Lei Zhang [Mon, 15 Aug 2016 15:13:25 +0000 (11:13 -0400)]
Derive iterator from std::iterator to reap standarad algorithms.
By deriving from std::iterator, iterator_traits will be properly
set up for our custom iterator type, thus we can use algorithms
from STL with our custom iterators.
Lei Zhang [Mon, 15 Aug 2016 17:41:47 +0000 (13:41 -0400)]
Make analyses RAII-like and turn disable copy/move constructors.
David Neto [Mon, 15 Aug 2016 15:27:13 +0000 (11:27 -0400)]
Avoid integer modulo by 1, to avoid warning
Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/349
David Neto [Fri, 12 Aug 2016 18:19:17 +0000 (14:19 -0400)]
Avoid race on mkdir
Should fix https://github.com/KhronosGroup/SPIRV-Tools/issues/340
Lei Zhang [Fri, 12 Aug 2016 18:59:56 +0000 (14:59 -0400)]
Allow OpUndef appearing in the type and global variable section.
Also clean up API functions for adding instructions into the
type and global values section.
qining [Fri, 12 Aug 2016 21:26:35 +0000 (17:26 -0400)]
Add another construtor for opt::ir::Instruction
David Neto [Fri, 12 Aug 2016 18:47:26 +0000 (14:47 -0400)]
Test INotEqual for OpSpecConstantOp in asm, disasm