David Neto [Fri, 18 Sep 2015 15:19:18 +0000 (11:19 -0400)]
Assembler support for image operands from Rev31
Rev32 and later add many more image operands, and
rearrange their values.
Lei Zhang [Thu, 17 Sep 2015 22:24:53 +0000 (18:24 -0400)]
Let EncodeAndDecodeSuccessfully remove preamble comments.
Lei Zhang [Tue, 15 Sep 2015 17:36:21 +0000 (13:36 -0400)]
Clean up code for encoding literal operands.
David Neto [Thu, 17 Sep 2015 21:39:45 +0000 (17:39 -0400)]
Remove SPV_OPERAND_TYPE_VARIABLE_MEMORY_ACCESS
If a memory mask operand is present, it is a mask. The mask appears
only once, so just use SPV_OPERAND_TYPE_OPTIONAL_MEMORY_MASK.
The "variable literals" aspect comes into play as follows: if the
Aligned bit is set in the mask, then the parser will be made to
expect the alignment value as a literal number operand that follows
the mask. That is done through mask operand expansion.
David Neto [Thu, 17 Sep 2015 21:06:10 +0000 (17:06 -0400)]
Assembler: mask expressions where 1 bits imply operands
Properly support a memory access mask with a combination
of bits, including the Aligned bit. When the Aligned bit is
set, the parser should expect an alignment value literal operand.
David Neto [Thu, 17 Sep 2015 18:02:11 +0000 (14:02 -0400)]
Document the syntax of mask expressions
David Neto [Wed, 16 Sep 2015 22:32:54 +0000 (18:32 -0400)]
Assembler support for simple mask expressions
For example, support combining mask enums with "|",
such as "NotNaN|AllowRecip" for the fast math mode.
This is supported for mask values that don't modify the
expected operand pattern:
- fast math mode
- function control
- loop control
- selection control
TODO: disassembler support to print them as mask expressions.
David Neto [Wed, 16 Sep 2015 20:42:56 +0000 (16:42 -0400)]
Generalize spvOperandTableNameLookup to take string length.
This is preparation for parsing mask expressions.
Dejan Mircevski [Fri, 11 Sep 2015 19:03:54 +0000 (15:03 -0400)]
Forbid !<integer> preceding or succeeding '='.
David Neto [Wed, 16 Sep 2015 19:56:43 +0000 (15:56 -0400)]
Assembler test for Dim, ImageFormat enums.
Adds SPV_OPERAND_TYPE_SAMPLER_IMAGE_FORMAT, and the
translation tables for its values from the spv::ImageFormat values.
David Neto [Wed, 16 Sep 2015 20:16:22 +0000 (16:16 -0400)]
Document inability to use names from 3.12, 1.13
You can't use names from 3.12 Image Channel Order and
3.13 Image Channel Data Type since in the intstruction grammar,
they are only used as return values, but never named arguments
to instructions.
David Neto [Wed, 16 Sep 2015 19:29:02 +0000 (15:29 -0400)]
Use generalized EnumCase in AccessQualifier assembly tests
This is in preparation for coming tests that will also
use the templated EnumCase instead of making their
own structs.
Also reformat AccessQualifier test.
Dejan Mircevski [Fri, 11 Sep 2015 20:34:49 +0000 (16:34 -0400)]
Handle IDs among !<integer> operands.
David Neto [Tue, 15 Sep 2015 14:27:22 +0000 (10:27 -0400)]
Assembler test for SamplerAddressingMode, SamplerFilterMode
Uses OpConstantSampler instruction.
David Neto [Tue, 15 Sep 2015 20:41:38 +0000 (16:41 -0400)]
Assembler test for Storage Class enum values
This covers the storage classes in SPIR-V Rev31. Rev32 has more.
Lei Zhang [Mon, 14 Sep 2015 19:22:23 +0000 (15:22 -0400)]
Support multiple word literal numbers as constants.
Add a new operand type SPV_OPERAND_TYPE_MULTIWORD_LITERAL_NUMBER
to represent those operands that can expand into multiple words.
Now only OpConstant and OpSpecConstant have such kind of operand.
David Neto [Tue, 15 Sep 2015 13:48:10 +0000 (09:48 -0400)]
Update CHANGES and Future Work
David Neto [Mon, 14 Sep 2015 21:07:11 +0000 (17:07 -0400)]
Assembler test for ExecutionScope, with OpGroupIAdd
Use spvOperandTypeStr to generalize the error message
for failure to parse an ID.
Extend spvOperandTypeStr to cover SPV_OPERAND_TYPE_EXECUTION_SCOPE.
David Neto [Sat, 12 Sep 2015 02:35:04 +0000 (22:35 -0400)]
Assembler test for OpTypePipe
Covers all AccessQualifier enums.
In Rev32, OpTypePipe no longer has a type argument.
Added TODOs for this.
David Neto [Mon, 14 Sep 2015 19:08:48 +0000 (15:08 -0400)]
Assembler test for single-valued Memory Access flag.
David Neto [Mon, 14 Sep 2015 18:50:37 +0000 (14:50 -0400)]
Assembler test for single-valued FunctionControl mask
Fixed name of "Inline" enumerant.
Support for combinations of function control masks should come later.
Lei Zhang [Mon, 14 Sep 2015 19:26:12 +0000 (15:26 -0400)]
Remove useless variable.
David Neto [Mon, 14 Sep 2015 18:33:08 +0000 (14:33 -0400)]
Assembler test for single-valued LoopControl mask
Support for combining masks should come later.
David Neto [Mon, 14 Sep 2015 18:28:33 +0000 (14:28 -0400)]
Assembler test for single-valued SelectionControl mask
Support for combining masks should come later.
David Neto [Mon, 14 Sep 2015 17:56:45 +0000 (13:56 -0400)]
Clarify the syntax. Some named enumerants are unusable
You can't use a named enumerant if it's only meaningful
in an operand supplied as an ID to a target instruction.
The place where you'd use the name is something like an
OpConstant, but there's not enough context to bring those
names into scope, unless you're willing to tolerate
potential collisions.
Occurs for the names in:
- 3.25 Memory Semantics
- 3.27 Scope ID
- 3.29 Kernel Enqueue Flags
- 3.30 Kernel Profiling Info
Lei Zhang [Mon, 14 Sep 2015 16:26:15 +0000 (12:26 -0400)]
Simplify code for handling literals in disassembler.
David Neto [Mon, 14 Sep 2015 17:05:53 +0000 (13:05 -0400)]
Move the syntax description into its own file
David Neto [Mon, 14 Sep 2015 16:09:17 +0000 (12:09 -0400)]
Add patch for generating opcode.inc syntax table.
Lei Zhang [Mon, 14 Sep 2015 14:05:37 +0000 (10:05 -0400)]
Run clang-format.
David Neto [Fri, 11 Sep 2015 17:55:57 +0000 (13:55 -0400)]
Assembler test for OpExecutionMode
David Neto [Fri, 11 Sep 2015 17:36:02 +0000 (13:36 -0400)]
Assembler test for OpEntryPoint
Dejan Mircevski [Sat, 12 Sep 2015 00:10:54 +0000 (20:10 -0400)]
Simplify format indication in CompileSuccesfully().
Lei Zhang [Fri, 11 Sep 2015 18:31:27 +0000 (14:31 -0400)]
Limit the use of spvCheck and spvCheckReturn to validator.
spvCheck is indeed just an if-statement. Defining such a macro
doesn't help much.
David Neto [Fri, 11 Sep 2015 19:16:43 +0000 (15:16 -0400)]
Update readme with latest news.
Lei Zhang [Fri, 11 Sep 2015 17:45:18 +0000 (13:45 -0400)]
Move bitwisecast.h to source/ and add include guard.
David Neto [Fri, 11 Sep 2015 16:04:03 +0000 (12:04 -0400)]
Fix an infinite loop during message generation.
Rename getWord to spvGetWord and unit test it.
Lei Zhang [Fri, 11 Sep 2015 15:56:09 +0000 (11:56 -0400)]
Add option to change assembly syntax format in the dis tool.
Dejan Mircevski [Fri, 11 Sep 2015 04:43:11 +0000 (00:43 -0400)]
Handle operands when OpCode is !<integer>.
David Neto [Fri, 11 Sep 2015 16:15:58 +0000 (12:15 -0400)]
Add TODO for capability dependencies for Rev32+
David Neto [Fri, 11 Sep 2015 15:28:27 +0000 (11:28 -0400)]
Assembler test for OpMemoryModel
Lei Zhang [Fri, 11 Sep 2015 15:01:59 +0000 (11:01 -0400)]
Add library function parameter to set assembly format for disassembler.
Lei Zhang [Thu, 10 Sep 2015 21:42:41 +0000 (17:42 -0400)]
Add option to change assembly syntax format in the as tool.
David Neto [Thu, 10 Sep 2015 20:39:09 +0000 (16:39 -0400)]
Assembler tests for OpCapability.
Adds test file for instructions in the Mode-Setting section
of the SPIR-V spec.
David Neto [Thu, 10 Sep 2015 19:51:57 +0000 (15:51 -0400)]
Assembler test for LinkageAttributes decorations
David Neto [Thu, 10 Sep 2015 17:23:11 +0000 (13:23 -0400)]
Assembler tests for all decorations except Linkage attributes
Fixes typos in various parser tables.
Updates readme.md with the fixes.
Lei Zhang [Thu, 10 Sep 2015 21:07:21 +0000 (17:07 -0400)]
Run clang-format.
Lei Zhang [Thu, 10 Sep 2015 18:00:00 +0000 (14:00 -0400)]
Add an API parameter to choose assembly syntax format for assembler.
Added a new enum for supported assembly syntax formats:
Canonical Assembly Format (CAF) and Assignment Assembly Format (AAF).
Updated assembler interface functions to support choice of assembly
syntax format.
Dejan Mircevski [Thu, 10 Sep 2015 18:55:33 +0000 (14:55 -0400)]
Simplify checking for !<integer> first word.
David Neto [Wed, 9 Sep 2015 22:10:01 +0000 (18:10 -0400)]
Assembler test for OpSourceExtension.
Add test utility function MakeVector(std::string) to encode
a string as a vector of 32-bit words, as per the SPIR-V literal
string encoding.
Andrew Woloszyn [Thu, 10 Sep 2015 14:28:22 +0000 (10:28 -0400)]
Added missing diagnostic when disassembling empty file.
Added diagnostic messages for what should be an internal failure
that never happens. I figure if we return "failed" for something the
user cannot control we should print a message for it.
David Neto [Wed, 9 Sep 2015 14:58:02 +0000 (10:58 -0400)]
Test assembly of OpSource using all language enums
Adds a file to test assembly of instructions in the "Debug" section
of the SPIR-V spec.
David Neto [Wed, 9 Sep 2015 20:54:39 +0000 (16:54 -0400)]
Update CHANGES in the readme.md
David Neto [Tue, 8 Sep 2015 19:38:55 +0000 (15:38 -0400)]
Avoid undefined pointer given to spvTextDestroy
The undefined pointer might get through to the call
to spvTextDestroy if the test fails on an earlier step.
In that case I just want to see the test failure, and
not a test failure followed by undefined behaviour.
Pyry Haulos [Wed, 9 Sep 2015 20:35:53 +0000 (13:35 -0700)]
Fix build on MSC
Visual C++ compiler doesn't allow ternary select where type depends on
condition even if there is a user-defined conversion operator to a common
type.
David Neto [Tue, 8 Sep 2015 21:11:40 +0000 (17:11 -0400)]
Add OpNop, OpUndef tests for spvTextToBinary
Add text_fixture::TextToBinaryTestBase::CompiledInstructions,
to more easily just examine the generated instructions by skipping
over the header.
Add spvtest::MakeInstruction utility function to easily generate
a vector containing an opcode and its operands.
Lei Zhang [Wed, 9 Sep 2015 19:44:32 +0000 (15:44 -0400)]
Fix interface function calls to the new API.
Lei Zhang [Wed, 9 Sep 2015 14:36:48 +0000 (10:36 -0400)]
Preserve float values during encoding and decoding roundtrip.
Andrew Woloszyn [Wed, 9 Sep 2015 17:04:32 +0000 (13:04 -0400)]
Removed the ambiguity in the API for cleaning input vs output data.
Previous the api used spv_text_t and spv_binary_t for both input
and output, but depending on the usage, you either MUST
call spvBinaryDestroy or you MUST NOT call spvBinaryDestroy on the
pointer.
David Neto [Tue, 8 Sep 2015 19:29:22 +0000 (15:29 -0400)]
Simplify uses of spvBinaryDestroy in tests
Always try to destroy the binary during common methods
of test fixtures. This is safe if no other code in the test
attempted to destroy the binary.
Take advantage of the fact spvBinaryDestroy is a no-op on a nullptr,
by eliminating the null pointer check in the caller.
David Neto [Tue, 8 Sep 2015 19:34:26 +0000 (15:34 -0400)]
spvTextDestroy is no-op on nullptr.
David Neto [Wed, 9 Sep 2015 15:35:01 +0000 (11:35 -0400)]
Fix spvBinaryDestroy test to use an API-created object
David Neto [Tue, 8 Sep 2015 13:55:52 +0000 (09:55 -0400)]
Enable OpcodeMake test, by sampling values.
The previous version of the test was disabled, presumably
because it took to long to run.
David Neto [Tue, 8 Sep 2015 19:15:23 +0000 (15:15 -0400)]
spvBinaryDestroy(nullptr) is a no-op.
David Neto [Tue, 8 Sep 2015 18:59:57 +0000 (14:59 -0400)]
Remove spvOpcodeIsVariable
Nothing was using it.
David Neto [Tue, 8 Sep 2015 15:51:54 +0000 (11:51 -0400)]
Fix -p on disassembler.
spvTextToBinary fails if printing option is on
*and* you send in a non-null pointer-to-spv_text.
Dejan Mircevski [Tue, 8 Sep 2015 18:20:12 +0000 (14:20 -0400)]
Add hex-format tests for !<integer>.
Dejan Mircevski [Tue, 8 Sep 2015 18:17:14 +0000 (14:17 -0400)]
Add invalid-operand tests for !<integer>.
Dejan Mircevski [Tue, 8 Sep 2015 16:14:07 +0000 (12:14 -0400)]
Make all SpirvVectors const in ImmediateInt.cpp.
Dejan Mircevski [Tue, 8 Sep 2015 15:41:36 +0000 (11:41 -0400)]
Tests for parsing recognizable words after !<integer>.
David Neto [Fri, 4 Sep 2015 18:55:28 +0000 (14:55 -0400)]
Add disabled test to check float value parsing
Disabled for now because float parsing is broken.
David Neto [Tue, 1 Sep 2015 14:01:53 +0000 (10:01 -0400)]
Remove SPV_OPERAND_TYPE_ELLIPSIS
Andrew Woloszyn [Fri, 4 Sep 2015 19:13:57 +0000 (15:13 -0400)]
Added option to only compile spirv library instead of all binaries as well
David Neto [Tue, 1 Sep 2015 22:05:14 +0000 (18:05 -0400)]
Print diagnostics at the beginning of input.
A spv_diagnostic_t value knows if the source is textual rather
than binary.
Dejan Mircevski [Thu, 3 Sep 2015 20:29:27 +0000 (16:29 -0400)]
Avoid "operands" in the !<immediate> explanation.
Also declare "!<integer> = OpCode" legal.
David Neto [Fri, 4 Sep 2015 18:31:01 +0000 (14:31 -0400)]
Document current support and known bugs.
Dejan Mircevski [Thu, 3 Sep 2015 21:42:50 +0000 (17:42 -0400)]
Test consecutive opcodes being !<integer>.
David Neto [Thu, 27 Aug 2015 17:03:52 +0000 (13:03 -0400)]
Use opcode operand definitions from SPIR-V specification generator.
The assembler and disassembler now use a dynamically adjusted
sequence of expected operand types. (Internally, it is a deque,
for readability.) Both parsers repeatedly pull an expected operand
type from the left of this pattern list, and try to match the next
input token against it.
The expected pattern is adjusted during the parse to accommodate:
- an extended instruction's expected operands, depending on the
extended instruction's index.
- when an operand itself has operands
- to handle sequences of zero or more operands, or pairs of
operands. These are expanded lazily during the parse.
Adds spv::OperandClass from the SPIR-V specification generator.
Modifies spv_operand_desc_t:
- adds hasResult, hasType, and operandClass array to the opcode
description type.
- "wordCount" is replaced with "numTypes", which counts the number
of entries in operandTypes. And each of those describes a
*logical* operand, including the type id for the instruction,
and the result id for the instruction. A logical operand could be
variable-width, such as a literal string.
Adds opcode.inc, an automatically-generated table of operation
descriptions, with one line to describe each core instruction.
Externally, we have modified the SPIR-V spec doc generator to
emit this file.
(We have hacked this copy to use the old semantics for OpLine.)
Inside the assembler, parsing an operand may fail with new
error code SPV_FAIL_MATCH. For an optional operand, this is not
fatal, but should trigger backtracking at a higher level.
The spvTextIsStartOfNewInst checks the case of the third letter
of what might be an opcode. So now, "OpenCL" does not look like
an opcode name.
In assembly, the EntryPoint name field is mandatory, but can be
an empty string.
Adjust tests for changes to:
- OpSampedImage
- OpTypeSampler
Dejan Mircevski [Fri, 4 Sep 2015 12:51:52 +0000 (08:51 -0400)]
Print failing assembly text in CompileSuccessfully().
David Neto [Tue, 1 Sep 2015 16:24:06 +0000 (12:24 -0400)]
Remove unused struct "bin"
Dejan Mircevski [Wed, 2 Sep 2015 21:17:42 +0000 (17:17 -0400)]
More !<integer> tests.
Dejan Mircevski [Thu, 3 Sep 2015 18:28:41 +0000 (14:28 -0400)]
Use spvOpcodeMake() in ImmediateInt tests.
David Neto [Tue, 1 Sep 2015 18:56:09 +0000 (14:56 -0400)]
Don't overload operators in std namespace.
Use a spvtest::WordVector proxy object to easily print
std::vector<uint32_t> and spv_binary_t values.
Dejan Mircevski [Wed, 2 Sep 2015 18:48:33 +0000 (14:48 -0400)]
Add a few unit tests for !<integer>. More to come.
Start using GMock: modify CMakeLists, fix googletest URL in readme.
Add useful utilities to the TestFixture class. Also make it conform to
go/gunit recommendations about setup/teardown.
David Neto [Mon, 31 Aug 2015 18:07:22 +0000 (14:07 -0400)]
Add bin-to-text test for operand with operands
David Neto [Mon, 31 Aug 2015 17:34:28 +0000 (13:34 -0400)]
Add binary-to-text test for single instruction
This is easier to debug!
Binary-to-text testing needs more tests, and more
specific tests. That's for future work.
David Neto [Tue, 25 Aug 2015 18:21:13 +0000 (14:21 -0400)]
Getting the next word respects quoting and escaping.
Use double quotes ("). They can be interspersed with
other whitespace characters, just like shell quoting.
A backslash (\) always escapes the next character.
The end of the stream always terminates the word.
Add AutoText struct to unit test utilities, to easily
make spv_text_t values and reference them as spv_text values.
Andrew Woloszyn [Tue, 1 Sep 2015 19:15:36 +0000 (15:15 -0400)]
Had spriv-tools stay inside it's own directory.
In order to facilitate having a project depend on spirv-tools,
have spirv-tools not pollute any external builds.
Dejan Mircevski [Mon, 31 Aug 2015 21:42:22 +0000 (17:42 -0400)]
Move ImmediateInt tests into their own file.
This is in preparation of adding many more tests in accordance with the
evolved spec.
Also sort the test-source lines in CMakeLists.
Dejan Mircevski [Mon, 31 Aug 2015 20:19:07 +0000 (16:19 -0400)]
Warn about !<integer> opcode in assignment format.
Dejan Mircevski [Mon, 31 Aug 2015 19:24:32 +0000 (15:24 -0400)]
Put test classes in anonymous namespace.
Put TestFixture.h classes in a namespace.
Remove unused #includes.
Dejan Mircevski [Mon, 31 Aug 2015 16:13:33 +0000 (12:13 -0400)]
Clarify !<integer> behaviour in readme.md.
David Neto [Tue, 25 Aug 2015 17:53:19 +0000 (13:53 -0400)]
Getting the next word ends at a comment (;)
David Neto [Thu, 27 Aug 2015 17:50:05 +0000 (13:50 -0400)]
Combine parsing of ID and RESULT_ID operand types
David Neto [Mon, 24 Aug 2015 20:27:02 +0000 (16:27 -0400)]
String literals must be quoted.
David Neto [Mon, 24 Aug 2015 19:33:14 +0000 (15:33 -0400)]
Fix some bugs in parsing literals.
- a single hyphen is a string, not a number.
- a string with more than one period is a string, not a number
- check for string overflow
Add some unit tests
David Neto [Thu, 27 Aug 2015 17:38:39 +0000 (13:38 -0400)]
Add SPV_FAILED_MATCH status code
This is for future use by the parser.
David Neto [Thu, 27 Aug 2015 17:14:02 +0000 (13:14 -0400)]
Add enum values for instructions added after Rev31
Lei Zhang [Thu, 27 Aug 2015 18:20:19 +0000 (14:20 -0400)]
Add GLSL std450 extended instruction 72-80.
Dejan Mircevski [Thu, 27 Aug 2015 17:57:08 +0000 (13:57 -0400)]
Add std450 instructions 53-64.
Lei Zhang [Thu, 27 Aug 2015 17:44:31 +0000 (13:44 -0400)]
Add GLSL std450 extended instruction 65-71.