AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-11-26 21:30:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
4075b921f9
SPIRV-Tools/source/val/validate_logicals.cpp

287 lines
10 KiB
C++
Raw Normal View History

Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
// Copyright (c) 2017 Google 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.
// Validates correctness of logical SPIR-V instructions.
Move validation files to val/ directory (#1692) This CL moves the various validate files into the val/ directory with the rest of the validation infrastructure. This matches how opt/ is setup with the passes with the infrastructure.
2018-07-11 14:27:34 +00:00
#include "source/val/validate.h"
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
Move validation files to val/ directory (#1692) This CL moves the various validate files into the val/ directory with the rest of the validation infrastructure. This matches how opt/ is setup with the passes with the infrastructure.
2018-07-11 14:27:34 +00:00
#include "source/diagnostic.h"
#include "source/opcode.h"
#include "source/val/instruction.h"
#include "source/val/validation_state.h"
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
Change libspirv to spvtools namespace (#1678) This CL changes all of the libspirv namespace code to spvtools to match the rest of the code base.
2018-07-07 13:38:00 +00:00
namespace spvtools {
Move the validation code into the val:: namespace (#1682) This CL moves the validation code to the val:: namespace. This makes it clearer which instance of the Instruction and other classes are being referred too.
2018-07-10 03:18:44 +00:00
namespace val {
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
// Validates correctness of logical instructions.
Convert validation to use libspriv::Instruction where possible. (#1663) For the instructions which execute after the IdPass check we can provide the Instruction instead of the spv_parsed_instruction_t. This Instruction class provides a bit more context (like the source line) that is not available from spv_parsed_instruction_t.
2018-07-10 14:57:52 +00:00
spv_result_t LogicalsPass(ValidationState_t& _, const Instruction* inst) {
const SpvOp opcode = inst->opcode();
const uint32_t result_type = inst->type_id();
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
switch (opcode) {
case SpvOpAny:
case SpvOpAll: {
if (!_.IsBoolScalarType(result_type))
Update diag() calls in validate_logicals. (#1772) This CL updates the diag() calls in validate_logicals to provide the Instruction.
2018-08-01 16:41:57 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
<< "Expected bool scalar type as Result Type: "
<< spvOpcodeString(opcode);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
Convert validation to use libspriv::Instruction where possible. (#1663) For the instructions which execute after the IdPass check we can provide the Instruction instead of the spv_parsed_instruction_t. This Instruction class provides a bit more context (like the source line) that is not available from spv_parsed_instruction_t.
2018-07-10 14:57:52 +00:00
const uint32_t vector_type = _.GetOperandTypeId(inst, 2);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
if (!vector_type || !_.IsBoolVectorType(vector_type))
Update diag() calls in validate_logicals. (#1772) This CL updates the diag() calls in validate_logicals to provide the Instruction.
2018-08-01 16:41:57 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
<< "Expected operand to be vector bool: "
<< spvOpcodeString(opcode);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
break;
}
case SpvOpIsNan:
case SpvOpIsInf:
case SpvOpIsFinite:
case SpvOpIsNormal:
case SpvOpSignBitSet: {
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
if (!_.IsBoolScalarType(result_type) && !_.IsBoolVectorType(result_type))
Update diag() calls in validate_logicals. (#1772) This CL updates the diag() calls in validate_logicals to provide the Instruction.
2018-08-01 16:41:57 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
<< "Expected bool scalar or vector type as Result Type: "
<< spvOpcodeString(opcode);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
Convert validation to use libspriv::Instruction where possible. (#1663) For the instructions which execute after the IdPass check we can provide the Instruction instead of the spv_parsed_instruction_t. This Instruction class provides a bit more context (like the source line) that is not available from spv_parsed_instruction_t.
2018-07-10 14:57:52 +00:00
const uint32_t operand_type = _.GetOperandTypeId(inst, 2);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
if (!operand_type || (!_.IsFloatScalarType(operand_type) &&
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
!_.IsFloatVectorType(operand_type)))
Update diag() calls in validate_logicals. (#1772) This CL updates the diag() calls in validate_logicals to provide the Instruction.
2018-08-01 16:41:57 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
<< "Expected operand to be scalar or vector float: "
<< spvOpcodeString(opcode);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
if (_.GetDimension(result_type) != _.GetDimension(operand_type))
Update diag() calls in validate_logicals. (#1772) This CL updates the diag() calls in validate_logicals to provide the Instruction.
2018-08-01 16:41:57 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
<< "Expected vector sizes of Result Type and the operand to be "
"equal: "
<< spvOpcodeString(opcode);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
break;
}
case SpvOpFOrdEqual:
case SpvOpFUnordEqual:
case SpvOpFOrdNotEqual:
case SpvOpFUnordNotEqual:
case SpvOpFOrdLessThan:
case SpvOpFUnordLessThan:
case SpvOpFOrdGreaterThan:
case SpvOpFUnordGreaterThan:
case SpvOpFOrdLessThanEqual:
case SpvOpFUnordLessThanEqual:
case SpvOpFOrdGreaterThanEqual:
case SpvOpFUnordGreaterThanEqual:
case SpvOpLessOrGreater:
case SpvOpOrdered:
case SpvOpUnordered: {
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
if (!_.IsBoolScalarType(result_type) && !_.IsBoolVectorType(result_type))
Update diag() calls in validate_logicals. (#1772) This CL updates the diag() calls in validate_logicals to provide the Instruction.
2018-08-01 16:41:57 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
<< "Expected bool scalar or vector type as Result Type: "
<< spvOpcodeString(opcode);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
Convert validation to use libspriv::Instruction where possible. (#1663) For the instructions which execute after the IdPass check we can provide the Instruction instead of the spv_parsed_instruction_t. This Instruction class provides a bit more context (like the source line) that is not available from spv_parsed_instruction_t.
2018-07-10 14:57:52 +00:00
const uint32_t left_operand_type = _.GetOperandTypeId(inst, 2);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
if (!left_operand_type || (!_.IsFloatScalarType(left_operand_type) &&
!_.IsFloatVectorType(left_operand_type)))
Update diag() calls in validate_logicals. (#1772) This CL updates the diag() calls in validate_logicals to provide the Instruction.
2018-08-01 16:41:57 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
<< "Expected operands to be scalar or vector float: "
<< spvOpcodeString(opcode);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
if (_.GetDimension(result_type) != _.GetDimension(left_operand_type))
Update diag() calls in validate_logicals. (#1772) This CL updates the diag() calls in validate_logicals to provide the Instruction.
2018-08-01 16:41:57 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
<< "Expected vector sizes of Result Type and the operands to be "
"equal: "
<< spvOpcodeString(opcode);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
Convert validation to use libspriv::Instruction where possible. (#1663) For the instructions which execute after the IdPass check we can provide the Instruction instead of the spv_parsed_instruction_t. This Instruction class provides a bit more context (like the source line) that is not available from spv_parsed_instruction_t.
2018-07-10 14:57:52 +00:00
if (left_operand_type != _.GetOperandTypeId(inst, 3))
Update diag() calls in validate_logicals. (#1772) This CL updates the diag() calls in validate_logicals to provide the Instruction.
2018-08-01 16:41:57 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
<< "Expected left and right operands to have the same type: "
<< spvOpcodeString(opcode);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
break;
}
case SpvOpLogicalEqual:
case SpvOpLogicalNotEqual:
case SpvOpLogicalOr:
case SpvOpLogicalAnd: {
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
if (!_.IsBoolScalarType(result_type) && !_.IsBoolVectorType(result_type))
Update diag() calls in validate_logicals. (#1772) This CL updates the diag() calls in validate_logicals to provide the Instruction.
2018-08-01 16:41:57 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
<< "Expected bool scalar or vector type as Result Type: "
<< spvOpcodeString(opcode);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
Convert validation to use libspriv::Instruction where possible. (#1663) For the instructions which execute after the IdPass check we can provide the Instruction instead of the spv_parsed_instruction_t. This Instruction class provides a bit more context (like the source line) that is not available from spv_parsed_instruction_t.
2018-07-10 14:57:52 +00:00
if (result_type != _.GetOperandTypeId(inst, 2) ||
result_type != _.GetOperandTypeId(inst, 3))
Update diag() calls in validate_logicals. (#1772) This CL updates the diag() calls in validate_logicals to provide the Instruction.
2018-08-01 16:41:57 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
<< "Expected both operands to be of Result Type: "
<< spvOpcodeString(opcode);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
break;
}
case SpvOpLogicalNot: {
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
if (!_.IsBoolScalarType(result_type) && !_.IsBoolVectorType(result_type))
Update diag() calls in validate_logicals. (#1772) This CL updates the diag() calls in validate_logicals to provide the Instruction.
2018-08-01 16:41:57 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
<< "Expected bool scalar or vector type as Result Type: "
<< spvOpcodeString(opcode);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
Convert validation to use libspriv::Instruction where possible. (#1663) For the instructions which execute after the IdPass check we can provide the Instruction instead of the spv_parsed_instruction_t. This Instruction class provides a bit more context (like the source line) that is not available from spv_parsed_instruction_t.
2018-07-10 14:57:52 +00:00
if (result_type != _.GetOperandTypeId(inst, 2))
Update diag() calls in validate_logicals. (#1772) This CL updates the diag() calls in validate_logicals to provide the Instruction.
2018-08-01 16:41:57 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
<< "Expected operand to be of Result Type: "
<< spvOpcodeString(opcode);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
break;
}
case SpvOpSelect: {
uint32_t dimension = 1;
{
const Instruction* type_inst = _.FindDef(result_type);
assert(type_inst);
Support SPIR-V 1.4 (#2550) * SPIR-V 1.4 headers, add SPV_ENV_UNIVERSAL_1_4 * Support --target-env spv1.4 in help for command line tools * Support asm/dis of UniformId decoration * Validate UniformId decoration * Fix version check on instructions and operands Also register decorations used with OpDecorateId * Extension lists can differ between enums that match Example: SubgroupMaskEq vs SubgroupMaskEqKHR * Validate scope value for Uniform decoration, for SPIR-V 1.4 * More unioning of exts * Preserve grammar order within an enum value * 1.4: Validate OpSelect over composites * Tools default to 1.4 * Add asm/dis test for OpCopyLogical * 1.4: asm/dis tests for PtrEqual, PtrNotEqual, PtrDiff * Basic asm/Dis test for OpCopyMemory * Test asm/dis OpCopyMemory with 2-memory access Add asm/dis tests for OpCopyMemorySized Requires grammar update to add second optional memory access operand to OpCopyMemory and OpCopyMemorySized * Validate one or two memory accesses on OpCopyMemory* * Check av/vis on CopyMemory source and target memory access This is a proposed rule. See https://gitlab.khronos.org/spirv/SPIR-V/issues/413 * Validate operation for OpSpecConstantOp * Validate NonWritable decoration Also permit NonWritable on members of UBO and SSBO. * SPIR-V 1.4: NonWrtiable can decorate Function and Private vars * Update optimizer CLI tests for SPIR-V 1.4 * Testing tools: Give expected SPIR-V version in message * SPIR-V 1.4 validation for entry point interfaces * Allow only unique interfaces * Allow all global variables * Check that all statically used global variables are listed * new tests * Add validation fixture CompileFailure * Add 1.4 validation for pointer comparisons * New tests * Validate with image operands SignExtend, ZeroExtend Since we don't actually know the image texel format, we can't fully validate. We need more context. But we can make sure we allow the new image operands in known-good cases. * Validate OpCopyLogical * Recursively checks subtypes * new tests * Add SPIR-V 1.4 tests for NoSignedWrap, NoUnsignedWrap * Allow scalar conditions in 1.4 with OpSelect * Allows scalar conditions with vector operands * new tests * Validate uniform id scope as an execution scope * Validate the values of memory and execution scopes are valid scope values * new test * Remove SPIR-V 1.4 Vulkan 1.0 environment * SPIR-V 1.4 requires Vulkan 1.1 * FIX: include string for spvLog * FIX: validate nonwritable * FIX: test case suite for member decorate string * FIX: test case for hlsl functionality1 * Validation test fixture: ease debugging * Use binary version for SPIR-V 1.4 specific features * Switch checks based on the SPIR-V version from the target environment to instead use the version from the binary * Moved header parsing into the ValidationState_t constructor (where version based features are set) * Added new versions of tests that assemble a 1.3 binary and validate a 1.4 environment * Fix test for update to SPIR-V 1.4 headers * Fix formatting * Ext inst lookup: Add Vulkan 1.1 env with SPIR-V 1.4 * Update spirv-val help * Operand version checks should use module version Use the module version instead of the target environment version. * Fix comment about two-access form of OpCopyMemory
2019-05-07 16:27:18 +00:00
const auto composites = _.features().select_between_composites;
auto fail = [&_, composites, inst, opcode]() -> spv_result_t {
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Expected scalar or "
<< (composites ? "composite" : "vector")
<< " type as Result Type: " << spvOpcodeString(opcode);
};
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
const SpvOp type_opcode = type_inst->opcode();
switch (type_opcode) {
case SpvOpTypePointer: {
SPV_EXT_physical_storage_buffer (#2267)
2019-01-07 18:19:24 +00:00
if (_.addressing_model() == SpvAddressingModelLogical &&
!_.features().variable_pointers &&
Validator: fix logicals pass for OpSelect pointers OpSelect works with pointers also when capability VariablePointersStorageBuffer is declared (before worked only with capability VariablePointers).
2017-09-21 20:12:14 +00:00
!_.features().variable_pointers_storage_buffer)
Update diag() calls in validate_logicals. (#1772) This CL updates the diag() calls in validate_logicals to provide the Instruction.
2018-08-01 16:41:57 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
<< "Using pointers with OpSelect requires capability "
<< "VariablePointers or VariablePointersStorageBuffer";
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
break;
}
case SpvOpTypeVector: {
dimension = type_inst->word(3);
break;
}
case SpvOpTypeBool:
case SpvOpTypeInt:
case SpvOpTypeFloat: {
break;
}
Support SPIR-V 1.4 (#2550) * SPIR-V 1.4 headers, add SPV_ENV_UNIVERSAL_1_4 * Support --target-env spv1.4 in help for command line tools * Support asm/dis of UniformId decoration * Validate UniformId decoration * Fix version check on instructions and operands Also register decorations used with OpDecorateId * Extension lists can differ between enums that match Example: SubgroupMaskEq vs SubgroupMaskEqKHR * Validate scope value for Uniform decoration, for SPIR-V 1.4 * More unioning of exts * Preserve grammar order within an enum value * 1.4: Validate OpSelect over composites * Tools default to 1.4 * Add asm/dis test for OpCopyLogical * 1.4: asm/dis tests for PtrEqual, PtrNotEqual, PtrDiff * Basic asm/Dis test for OpCopyMemory * Test asm/dis OpCopyMemory with 2-memory access Add asm/dis tests for OpCopyMemorySized Requires grammar update to add second optional memory access operand to OpCopyMemory and OpCopyMemorySized * Validate one or two memory accesses on OpCopyMemory* * Check av/vis on CopyMemory source and target memory access This is a proposed rule. See https://gitlab.khronos.org/spirv/SPIR-V/issues/413 * Validate operation for OpSpecConstantOp * Validate NonWritable decoration Also permit NonWritable on members of UBO and SSBO. * SPIR-V 1.4: NonWrtiable can decorate Function and Private vars * Update optimizer CLI tests for SPIR-V 1.4 * Testing tools: Give expected SPIR-V version in message * SPIR-V 1.4 validation for entry point interfaces * Allow only unique interfaces * Allow all global variables * Check that all statically used global variables are listed * new tests * Add validation fixture CompileFailure * Add 1.4 validation for pointer comparisons * New tests * Validate with image operands SignExtend, ZeroExtend Since we don't actually know the image texel format, we can't fully validate. We need more context. But we can make sure we allow the new image operands in known-good cases. * Validate OpCopyLogical * Recursively checks subtypes * new tests * Add SPIR-V 1.4 tests for NoSignedWrap, NoUnsignedWrap * Allow scalar conditions in 1.4 with OpSelect * Allows scalar conditions with vector operands * new tests * Validate uniform id scope as an execution scope * Validate the values of memory and execution scopes are valid scope values * new test * Remove SPIR-V 1.4 Vulkan 1.0 environment * SPIR-V 1.4 requires Vulkan 1.1 * FIX: include string for spvLog * FIX: validate nonwritable * FIX: test case suite for member decorate string * FIX: test case for hlsl functionality1 * Validation test fixture: ease debugging * Use binary version for SPIR-V 1.4 specific features * Switch checks based on the SPIR-V version from the target environment to instead use the version from the binary * Moved header parsing into the ValidationState_t constructor (where version based features are set) * Added new versions of tests that assemble a 1.3 binary and validate a 1.4 environment * Fix test for update to SPIR-V 1.4 headers * Fix formatting * Ext inst lookup: Add Vulkan 1.1 env with SPIR-V 1.4 * Update spirv-val help * Operand version checks should use module version Use the module version instead of the target environment version. * Fix comment about two-access form of OpCopyMemory
2019-05-07 16:27:18 +00:00
// Not RuntimeArray because of other rules.
case SpvOpTypeArray:
case SpvOpTypeMatrix:
case SpvOpTypeStruct: {
if (!composites) return fail();
break;
};
default:
return fail();
}
const uint32_t condition_type = _.GetOperandTypeId(inst, 2);
const uint32_t left_type = _.GetOperandTypeId(inst, 3);
const uint32_t right_type = _.GetOperandTypeId(inst, 4);
if (!condition_type || (!_.IsBoolScalarType(condition_type) &&
!_.IsBoolVectorType(condition_type)))
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Expected bool scalar or vector type as condition: "
<< spvOpcodeString(opcode);
if (_.GetDimension(condition_type) != dimension) {
// If the condition is a vector type, then the result must also be a
// vector with matching dimensions. In SPIR-V 1.4, a scalar condition
// can be used to select between vector types. |composites| is a
// proxy for SPIR-V 1.4 functionality.
if (!composites || _.IsBoolVectorType(condition_type)) {
Update diag() calls in validate_logicals. (#1772) This CL updates the diag() calls in validate_logicals to provide the Instruction.
2018-08-01 16:41:57 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Support SPIR-V 1.4 (#2550) * SPIR-V 1.4 headers, add SPV_ENV_UNIVERSAL_1_4 * Support --target-env spv1.4 in help for command line tools * Support asm/dis of UniformId decoration * Validate UniformId decoration * Fix version check on instructions and operands Also register decorations used with OpDecorateId * Extension lists can differ between enums that match Example: SubgroupMaskEq vs SubgroupMaskEqKHR * Validate scope value for Uniform decoration, for SPIR-V 1.4 * More unioning of exts * Preserve grammar order within an enum value * 1.4: Validate OpSelect over composites * Tools default to 1.4 * Add asm/dis test for OpCopyLogical * 1.4: asm/dis tests for PtrEqual, PtrNotEqual, PtrDiff * Basic asm/Dis test for OpCopyMemory * Test asm/dis OpCopyMemory with 2-memory access Add asm/dis tests for OpCopyMemorySized Requires grammar update to add second optional memory access operand to OpCopyMemory and OpCopyMemorySized * Validate one or two memory accesses on OpCopyMemory* * Check av/vis on CopyMemory source and target memory access This is a proposed rule. See https://gitlab.khronos.org/spirv/SPIR-V/issues/413 * Validate operation for OpSpecConstantOp * Validate NonWritable decoration Also permit NonWritable on members of UBO and SSBO. * SPIR-V 1.4: NonWrtiable can decorate Function and Private vars * Update optimizer CLI tests for SPIR-V 1.4 * Testing tools: Give expected SPIR-V version in message * SPIR-V 1.4 validation for entry point interfaces * Allow only unique interfaces * Allow all global variables * Check that all statically used global variables are listed * new tests * Add validation fixture CompileFailure * Add 1.4 validation for pointer comparisons * New tests * Validate with image operands SignExtend, ZeroExtend Since we don't actually know the image texel format, we can't fully validate. We need more context. But we can make sure we allow the new image operands in known-good cases. * Validate OpCopyLogical * Recursively checks subtypes * new tests * Add SPIR-V 1.4 tests for NoSignedWrap, NoUnsignedWrap * Allow scalar conditions in 1.4 with OpSelect * Allows scalar conditions with vector operands * new tests * Validate uniform id scope as an execution scope * Validate the values of memory and execution scopes are valid scope values * new test * Remove SPIR-V 1.4 Vulkan 1.0 environment * SPIR-V 1.4 requires Vulkan 1.1 * FIX: include string for spvLog * FIX: validate nonwritable * FIX: test case suite for member decorate string * FIX: test case for hlsl functionality1 * Validation test fixture: ease debugging * Use binary version for SPIR-V 1.4 specific features * Switch checks based on the SPIR-V version from the target environment to instead use the version from the binary * Moved header parsing into the ValidationState_t constructor (where version based features are set) * Added new versions of tests that assemble a 1.3 binary and validate a 1.4 environment * Fix test for update to SPIR-V 1.4 headers * Fix formatting * Ext inst lookup: Add Vulkan 1.1 env with SPIR-V 1.4 * Update spirv-val help * Operand version checks should use module version Use the module version instead of the target environment version. * Fix comment about two-access form of OpCopyMemory
2019-05-07 16:27:18 +00:00
<< "Expected vector sizes of Result Type and the condition "
"to be equal: "
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
<< spvOpcodeString(opcode);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
}
}
Support SPIR-V 1.4 (#2550) * SPIR-V 1.4 headers, add SPV_ENV_UNIVERSAL_1_4 * Support --target-env spv1.4 in help for command line tools * Support asm/dis of UniformId decoration * Validate UniformId decoration * Fix version check on instructions and operands Also register decorations used with OpDecorateId * Extension lists can differ between enums that match Example: SubgroupMaskEq vs SubgroupMaskEqKHR * Validate scope value for Uniform decoration, for SPIR-V 1.4 * More unioning of exts * Preserve grammar order within an enum value * 1.4: Validate OpSelect over composites * Tools default to 1.4 * Add asm/dis test for OpCopyLogical * 1.4: asm/dis tests for PtrEqual, PtrNotEqual, PtrDiff * Basic asm/Dis test for OpCopyMemory * Test asm/dis OpCopyMemory with 2-memory access Add asm/dis tests for OpCopyMemorySized Requires grammar update to add second optional memory access operand to OpCopyMemory and OpCopyMemorySized * Validate one or two memory accesses on OpCopyMemory* * Check av/vis on CopyMemory source and target memory access This is a proposed rule. See https://gitlab.khronos.org/spirv/SPIR-V/issues/413 * Validate operation for OpSpecConstantOp * Validate NonWritable decoration Also permit NonWritable on members of UBO and SSBO. * SPIR-V 1.4: NonWrtiable can decorate Function and Private vars * Update optimizer CLI tests for SPIR-V 1.4 * Testing tools: Give expected SPIR-V version in message * SPIR-V 1.4 validation for entry point interfaces * Allow only unique interfaces * Allow all global variables * Check that all statically used global variables are listed * new tests * Add validation fixture CompileFailure * Add 1.4 validation for pointer comparisons * New tests * Validate with image operands SignExtend, ZeroExtend Since we don't actually know the image texel format, we can't fully validate. We need more context. But we can make sure we allow the new image operands in known-good cases. * Validate OpCopyLogical * Recursively checks subtypes * new tests * Add SPIR-V 1.4 tests for NoSignedWrap, NoUnsignedWrap * Allow scalar conditions in 1.4 with OpSelect * Allows scalar conditions with vector operands * new tests * Validate uniform id scope as an execution scope * Validate the values of memory and execution scopes are valid scope values * new test * Remove SPIR-V 1.4 Vulkan 1.0 environment * SPIR-V 1.4 requires Vulkan 1.1 * FIX: include string for spvLog * FIX: validate nonwritable * FIX: test case suite for member decorate string * FIX: test case for hlsl functionality1 * Validation test fixture: ease debugging * Use binary version for SPIR-V 1.4 specific features * Switch checks based on the SPIR-V version from the target environment to instead use the version from the binary * Moved header parsing into the ValidationState_t constructor (where version based features are set) * Added new versions of tests that assemble a 1.3 binary and validate a 1.4 environment * Fix test for update to SPIR-V 1.4 headers * Fix formatting * Ext inst lookup: Add Vulkan 1.1 env with SPIR-V 1.4 * Update spirv-val help * Operand version checks should use module version Use the module version instead of the target environment version. * Fix comment about two-access form of OpCopyMemory
2019-05-07 16:27:18 +00:00
if (result_type != left_type || result_type != right_type)
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Expected both objects to be of Result Type: "
<< spvOpcodeString(opcode);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
Support SPIR-V 1.4 (#2550) * SPIR-V 1.4 headers, add SPV_ENV_UNIVERSAL_1_4 * Support --target-env spv1.4 in help for command line tools * Support asm/dis of UniformId decoration * Validate UniformId decoration * Fix version check on instructions and operands Also register decorations used with OpDecorateId * Extension lists can differ between enums that match Example: SubgroupMaskEq vs SubgroupMaskEqKHR * Validate scope value for Uniform decoration, for SPIR-V 1.4 * More unioning of exts * Preserve grammar order within an enum value * 1.4: Validate OpSelect over composites * Tools default to 1.4 * Add asm/dis test for OpCopyLogical * 1.4: asm/dis tests for PtrEqual, PtrNotEqual, PtrDiff * Basic asm/Dis test for OpCopyMemory * Test asm/dis OpCopyMemory with 2-memory access Add asm/dis tests for OpCopyMemorySized Requires grammar update to add second optional memory access operand to OpCopyMemory and OpCopyMemorySized * Validate one or two memory accesses on OpCopyMemory* * Check av/vis on CopyMemory source and target memory access This is a proposed rule. See https://gitlab.khronos.org/spirv/SPIR-V/issues/413 * Validate operation for OpSpecConstantOp * Validate NonWritable decoration Also permit NonWritable on members of UBO and SSBO. * SPIR-V 1.4: NonWrtiable can decorate Function and Private vars * Update optimizer CLI tests for SPIR-V 1.4 * Testing tools: Give expected SPIR-V version in message * SPIR-V 1.4 validation for entry point interfaces * Allow only unique interfaces * Allow all global variables * Check that all statically used global variables are listed * new tests * Add validation fixture CompileFailure * Add 1.4 validation for pointer comparisons * New tests * Validate with image operands SignExtend, ZeroExtend Since we don't actually know the image texel format, we can't fully validate. We need more context. But we can make sure we allow the new image operands in known-good cases. * Validate OpCopyLogical * Recursively checks subtypes * new tests * Add SPIR-V 1.4 tests for NoSignedWrap, NoUnsignedWrap * Allow scalar conditions in 1.4 with OpSelect * Allows scalar conditions with vector operands * new tests * Validate uniform id scope as an execution scope * Validate the values of memory and execution scopes are valid scope values * new test * Remove SPIR-V 1.4 Vulkan 1.0 environment * SPIR-V 1.4 requires Vulkan 1.1 * FIX: include string for spvLog * FIX: validate nonwritable * FIX: test case suite for member decorate string * FIX: test case for hlsl functionality1 * Validation test fixture: ease debugging * Use binary version for SPIR-V 1.4 specific features * Switch checks based on the SPIR-V version from the target environment to instead use the version from the binary * Moved header parsing into the ValidationState_t constructor (where version based features are set) * Added new versions of tests that assemble a 1.3 binary and validate a 1.4 environment * Fix test for update to SPIR-V 1.4 headers * Fix formatting * Ext inst lookup: Add Vulkan 1.1 env with SPIR-V 1.4 * Update spirv-val help * Operand version checks should use module version Use the module version instead of the target environment version. * Fix comment about two-access form of OpCopyMemory
2019-05-07 16:27:18 +00:00
break;
}
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
}
case SpvOpIEqual:
case SpvOpINotEqual:
case SpvOpUGreaterThan:
case SpvOpUGreaterThanEqual:
case SpvOpULessThan:
case SpvOpULessThanEqual:
case SpvOpSGreaterThan:
case SpvOpSGreaterThanEqual:
case SpvOpSLessThan:
case SpvOpSLessThanEqual: {
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
if (!_.IsBoolScalarType(result_type) && !_.IsBoolVectorType(result_type))
Update diag() calls in validate_logicals. (#1772) This CL updates the diag() calls in validate_logicals to provide the Instruction.
2018-08-01 16:41:57 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
<< "Expected bool scalar or vector type as Result Type: "
<< spvOpcodeString(opcode);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
Convert validation to use libspriv::Instruction where possible. (#1663) For the instructions which execute after the IdPass check we can provide the Instruction instead of the spv_parsed_instruction_t. This Instruction class provides a bit more context (like the source line) that is not available from spv_parsed_instruction_t.
2018-07-10 14:57:52 +00:00
const uint32_t left_type = _.GetOperandTypeId(inst, 2);
const uint32_t right_type = _.GetOperandTypeId(inst, 3);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
if (!left_type ||
(!_.IsIntScalarType(left_type) && !_.IsIntVectorType(left_type)))
Update diag() calls in validate_logicals. (#1772) This CL updates the diag() calls in validate_logicals to provide the Instruction.
2018-08-01 16:41:57 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
<< "Expected operands to be scalar or vector int: "
<< spvOpcodeString(opcode);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
if (_.GetDimension(result_type) != _.GetDimension(left_type))
Update diag() calls in validate_logicals. (#1772) This CL updates the diag() calls in validate_logicals to provide the Instruction.
2018-08-01 16:41:57 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
<< "Expected vector sizes of Result Type and the operands to be"
<< " equal: " << spvOpcodeString(opcode);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
if (!right_type ||
(!_.IsIntScalarType(right_type) && !_.IsIntVectorType(right_type)))
Update diag() calls in validate_logicals. (#1772) This CL updates the diag() calls in validate_logicals to provide the Instruction.
2018-08-01 16:41:57 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
<< "Expected operands to be scalar or vector int: "
<< spvOpcodeString(opcode);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
if (_.GetDimension(result_type) != _.GetDimension(right_type))
Update diag() calls in validate_logicals. (#1772) This CL updates the diag() calls in validate_logicals to provide the Instruction.
2018-08-01 16:41:57 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
<< "Expected vector sizes of Result Type and the operands to be"
<< " equal: " << spvOpcodeString(opcode);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
if (_.GetBitWidth(left_type) != _.GetBitWidth(right_type))
Update diag() calls in validate_logicals. (#1772) This CL updates the diag() calls in validate_logicals to provide the Instruction.
2018-08-01 16:41:57 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-format files in source, source/opt, source/util, source/val and tools. NFC. This just makes sure every file is formatted following the formatting definition in .clang-format. Re-formatted with: $ clang-format -i $(find source tools include -name '*.cpp') $ clang-format -i $(find source tools include -name '*.h')
2017-11-08 17:40:02 +00:00
<< "Expected both operands to have the same component bit "
"width: "
<< spvOpcodeString(opcode);
Add validate logicals pass to the validator New pass checks operands of all instructions listed under 3.32.15. Relational and Logical Instructions
2017-09-07 21:27:57 +00:00
break;
}
default:
break;
}
return SPV_SUCCESS;
}
Move the validation code into the val:: namespace (#1682) This CL moves the validation code to the val:: namespace. This makes it clearer which instance of the Instruction and other classes are being referred too.
2018-07-10 03:18:44 +00:00
} // namespace val
Change libspirv to spvtools namespace (#1678) This CL changes all of the libspirv namespace code to spvtools to match the rest of the code base.
2018-07-07 13:38:00 +00:00
} // namespace spvtools
Reference in New Issue Copy Permalink