mirror of
https://github.com/KhronosGroup/SPIRV-Tools
synced 2024-11-22 19:50:05 +00:00
3ab0d22608
* Support SPV_KHR_untyped_pointers Covers: - assembler - disassembler - validator fix copyright Validate OpTypeUntypedPointerKHR * Disallow an untyped pointer in a typed pointer * Validate capability requirements for untyped pointer * Allow duplicate untyped pointer declarations Add round trip tests Validate OpUntypedVariableKHR Validate untyped access chains * Add a test for opcodes that generate untyped pointers * simplify some checks for operands needing types * validate OpUnypedAccessChainKHR, OpUntypedInBoundsAccessChainKHR, OpUntypedPtrAccessChainKHR, OpUntypedInBoundsPtrAccessChainKHR Unify variable validation Validate OpCopyMemorySized * Fix some opcode tests to accound for untyped pointers * Add validation for OpCopyMemorySized for shaders and untyped pointers * fix up tests Validate pointer comparisons and bitcast * Update more helpers * Fix entry validation to allow OpUntypedVariableKHR * Validate OpPtrEqual, OpPtrNotEqual and OpPtrDiff * Validate OpBitcast Validate atomics and untyped pointers Make interface variable validation aware of untyped pointers * Check OpUntypedVariableKHR in interface validation More untyped pointer validation * Validate interfaces more thoroughly * Validate layouts for untyped pointer uses * Improve capability checks for vulkan with OpTypeUntypedPointerKHR * workgroup member explicit layout validation updates More validation * validate function arguments and parameters * handle untyped pointer and variable in more places Add a friendly assembly name for untyped pointers Update OpCopyMemory validation and tests Fix test for token update Fixes for validation * Allow typed pointers to contain untyped pointers * Fix decoration validation * add untyped pointer as a case for size and alignments Fix interface validation * Grabbed the wrong storage class operand for untyped variables * Add ability to specify assembler options in validation tests Add passthrough validation for OpUntypedArrayLengthKHR More validation of untyped pointers * Validate OpUntypedArrayLengthKHR * Validate layout for OpLoad, OpStore, and OpUntypedArrayLengthKHR Validation support for cooperative matrix and untyped pointers * Allow untyped pointers for cooperative matrix KHR load and store Updates to match spec * Remove extra capability references * Swap untyped variable data type and storage class operands * update validation of variables * update deps --------- Co-authored-by: David Neto <dneto@google.com>
140 lines
5.1 KiB
C++
140 lines
5.1 KiB
C++
// Copyright (c) 2018 LunarG 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 the intra-block preconditions of SPIR-V
|
|
// instructions.
|
|
|
|
#include <string>
|
|
|
|
#include "source/val/instruction.h"
|
|
#include "source/val/validate.h"
|
|
#include "source/val/validation_state.h"
|
|
|
|
namespace spvtools {
|
|
namespace val {
|
|
|
|
enum {
|
|
// Status right after meeting OpFunction.
|
|
IN_NEW_FUNCTION,
|
|
// Status right after meeting the entry block.
|
|
IN_ENTRY_BLOCK,
|
|
// Status right after meeting non-entry blocks.
|
|
PHI_VALID,
|
|
// Status right after meeting non-OpVariable instructions in the entry block
|
|
// or non-OpPhi instructions in non-entry blocks, except OpLine.
|
|
PHI_AND_VAR_INVALID,
|
|
};
|
|
|
|
spv_result_t ValidateAdjacency(ValidationState_t& _) {
|
|
const auto& instructions = _.ordered_instructions();
|
|
int adjacency_status = PHI_AND_VAR_INVALID;
|
|
|
|
for (size_t i = 0; i < instructions.size(); ++i) {
|
|
const auto& inst = instructions[i];
|
|
switch (inst.opcode()) {
|
|
case spv::Op::OpFunction:
|
|
case spv::Op::OpFunctionParameter:
|
|
adjacency_status = IN_NEW_FUNCTION;
|
|
break;
|
|
case spv::Op::OpLabel:
|
|
adjacency_status =
|
|
adjacency_status == IN_NEW_FUNCTION ? IN_ENTRY_BLOCK : PHI_VALID;
|
|
break;
|
|
case spv::Op::OpExtInst:
|
|
case spv::Op::OpExtInstWithForwardRefsKHR:
|
|
// If it is a debug info instruction, we do not change the status to
|
|
// allow debug info instructions before OpVariable in a function.
|
|
// TODO(https://gitlab.khronos.org/spirv/SPIR-V/issues/533): We need
|
|
// to discuss the location of DebugScope, DebugNoScope, DebugDeclare,
|
|
// and DebugValue.
|
|
// NOTE: This does not apply to the non-semantic vulkan debug info.
|
|
if (!spvExtInstIsDebugInfo(inst.ext_inst_type()) ||
|
|
inst.ext_inst_type() ==
|
|
SPV_EXT_INST_TYPE_NONSEMANTIC_SHADER_DEBUGINFO_100) {
|
|
adjacency_status = PHI_AND_VAR_INVALID;
|
|
}
|
|
break;
|
|
case spv::Op::OpPhi:
|
|
if (adjacency_status != PHI_VALID) {
|
|
return _.diag(SPV_ERROR_INVALID_DATA, &inst)
|
|
<< "OpPhi must appear within a non-entry block before all "
|
|
<< "non-OpPhi instructions "
|
|
<< "(except for OpLine, which can be mixed with OpPhi).";
|
|
}
|
|
break;
|
|
case spv::Op::OpLine:
|
|
case spv::Op::OpNoLine:
|
|
break;
|
|
case spv::Op::OpLoopMerge:
|
|
adjacency_status = PHI_AND_VAR_INVALID;
|
|
if (i != (instructions.size() - 1)) {
|
|
switch (instructions[i + 1].opcode()) {
|
|
case spv::Op::OpBranch:
|
|
case spv::Op::OpBranchConditional:
|
|
break;
|
|
default:
|
|
return _.diag(SPV_ERROR_INVALID_DATA, &inst)
|
|
<< "OpLoopMerge must immediately precede either an "
|
|
<< "OpBranch or OpBranchConditional instruction. "
|
|
<< "OpLoopMerge must be the second-to-last instruction in "
|
|
<< "its block.";
|
|
}
|
|
}
|
|
break;
|
|
case spv::Op::OpSelectionMerge:
|
|
adjacency_status = PHI_AND_VAR_INVALID;
|
|
if (i != (instructions.size() - 1)) {
|
|
switch (instructions[i + 1].opcode()) {
|
|
case spv::Op::OpBranchConditional:
|
|
case spv::Op::OpSwitch:
|
|
break;
|
|
default:
|
|
return _.diag(SPV_ERROR_INVALID_DATA, &inst)
|
|
<< "OpSelectionMerge must immediately precede either an "
|
|
<< "OpBranchConditional or OpSwitch instruction. "
|
|
<< "OpSelectionMerge must be the second-to-last "
|
|
<< "instruction in its block.";
|
|
}
|
|
}
|
|
break;
|
|
case spv::Op::OpVariable:
|
|
if (inst.GetOperandAs<spv::StorageClass>(2) ==
|
|
spv::StorageClass::Function &&
|
|
adjacency_status != IN_ENTRY_BLOCK) {
|
|
return _.diag(SPV_ERROR_INVALID_DATA, &inst)
|
|
<< "All OpVariable instructions in a function must be the "
|
|
"first instructions in the first block.";
|
|
}
|
|
break;
|
|
case spv::Op::OpUntypedVariableKHR:
|
|
if (inst.GetOperandAs<spv::StorageClass>(2) ==
|
|
spv::StorageClass::Function &&
|
|
adjacency_status != IN_ENTRY_BLOCK) {
|
|
return _.diag(SPV_ERROR_INVALID_DATA, &inst)
|
|
<< "All OpUntypedVariableKHR instructions in a function must "
|
|
"be the first instructions in the first block.";
|
|
}
|
|
break;
|
|
default:
|
|
adjacency_status = PHI_AND_VAR_INVALID;
|
|
break;
|
|
}
|
|
}
|
|
|
|
return SPV_SUCCESS;
|
|
}
|
|
|
|
} // namespace val
|
|
} // namespace spvtools
|