summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/3rdparty/spirv-tools/source/val/validate_constants.cpp
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/bgfx/3rdparty/spirv-tools/source/val/validate_constants.cpp')
-rw-r--r--3rdparty/bgfx/3rdparty/spirv-tools/source/val/validate_constants.cpp140
1 files changed, 131 insertions, 9 deletions
diff --git a/3rdparty/bgfx/3rdparty/spirv-tools/source/val/validate_constants.cpp b/3rdparty/bgfx/3rdparty/spirv-tools/source/val/validate_constants.cpp
index 5dbe6c6df22..dea95c8a2e6 100644
--- a/3rdparty/bgfx/3rdparty/spirv-tools/source/val/validate_constants.cpp
+++ b/3rdparty/bgfx/3rdparty/spirv-tools/source/val/validate_constants.cpp
@@ -12,10 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "source/val/validate.h"
-
#include "source/opcode.h"
#include "source/val/instruction.h"
+#include "source/val/validate.h"
#include "source/val/validation_state.h"
namespace spvtools {
@@ -117,15 +116,13 @@ spv_result_t ValidateConstantComposite(ValidationState_t& _,
inst->GetOperandAs<uint32_t>(constituent_index);
const auto constituent = _.FindDef(constituent_id);
if (!constituent ||
- !(SpvOpConstantComposite == constituent->opcode() ||
- SpvOpSpecConstantComposite == constituent->opcode() ||
- SpvOpUndef == constituent->opcode())) {
+ !spvOpcodeIsConstantOrUndef(constituent->opcode())) {
// The message says "... or undef" because the spec does not say
// undef is a constant.
return _.diag(SPV_ERROR_INVALID_ID, inst)
<< opcode_name << " Constituent <id> '"
<< _.getIdName(constituent_id)
- << "' is not a constant composite or undef.";
+ << "' is not a constant or undef.";
}
const auto vector = _.FindDef(constituent->type_id());
if (!vector) {
@@ -174,8 +171,7 @@ spv_result_t ValidateConstantComposite(ValidationState_t& _,
bool is_const;
uint32_t value;
std::tie(is_int32, is_const, value) = _.EvalInt32IfConst(length->id());
- if (is_int32 && is_const && !spvOpcodeIsSpecConstant(length->opcode()) &&
- value != constituent_count) {
+ if (is_int32 && is_const && value != constituent_count) {
return _.diag(SPV_ERROR_INVALID_ID, inst)
<< opcode_name
<< " Constituent count does not match "
@@ -248,6 +244,36 @@ spv_result_t ValidateConstantComposite(ValidationState_t& _,
}
}
} break;
+ case SpvOpTypeCooperativeMatrixNV: {
+ if (1 != constituent_count) {
+ return _.diag(SPV_ERROR_INVALID_ID, inst)
+ << opcode_name << " Constituent <id> '"
+ << _.getIdName(inst->type_id()) << "' count must be one.";
+ }
+ const auto constituent_id = inst->GetOperandAs<uint32_t>(2);
+ const auto constituent = _.FindDef(constituent_id);
+ if (!constituent || !spvOpcodeIsConstantOrUndef(constituent->opcode())) {
+ return _.diag(SPV_ERROR_INVALID_ID, inst)
+ << opcode_name << " Constituent <id> '"
+ << _.getIdName(constituent_id)
+ << "' is not a constant or undef.";
+ }
+ const auto constituent_type = _.FindDef(constituent->type_id());
+ if (!constituent_type) {
+ return _.diag(SPV_ERROR_INVALID_ID, constituent)
+ << "Result type is not defined.";
+ }
+
+ const auto component_type_id = result_type->GetOperandAs<uint32_t>(1);
+ const auto component_type = _.FindDef(component_type_id);
+ if (!component_type || component_type->id() != constituent_type->id()) {
+ return _.diag(SPV_ERROR_INVALID_ID, inst)
+ << opcode_name << " Constituent <id> '"
+ << _.getIdName(constituent_id)
+ << "' type does not match the Result Type <id> '"
+ << _.getIdName(result_type->id()) << "'s component type.";
+ }
+ } break;
default:
break;
}
@@ -278,7 +304,6 @@ bool IsTypeNullable(const std::vector<uint32_t>& instruction,
case SpvOpTypeBool:
case SpvOpTypeInt:
case SpvOpTypeFloat:
- case SpvOpTypePointer:
case SpvOpTypeEvent:
case SpvOpTypeDeviceEvent:
case SpvOpTypeReserveId:
@@ -286,6 +311,7 @@ bool IsTypeNullable(const std::vector<uint32_t>& instruction,
return true;
case SpvOpTypeArray:
case SpvOpTypeMatrix:
+ case SpvOpTypeCooperativeMatrixNV:
case SpvOpTypeVector: {
auto base_type = _.FindDef(instruction[2]);
return base_type && IsTypeNullable(base_type->words(), _);
@@ -298,6 +324,11 @@ bool IsTypeNullable(const std::vector<uint32_t>& instruction,
}
return true;
}
+ case SpvOpTypePointer:
+ if (instruction[2] == SpvStorageClassPhysicalStorageBuffer) {
+ return false;
+ }
+ return true;
default:
return false;
}
@@ -315,6 +346,81 @@ spv_result_t ValidateConstantNull(ValidationState_t& _,
return SPV_SUCCESS;
}
+// Validates that OpSpecConstant specializes to either int or float type.
+spv_result_t ValidateSpecConstant(ValidationState_t& _,
+ const Instruction* inst) {
+ // Operand 0 is the <id> of the type that we're specializing to.
+ auto type_id = inst->GetOperandAs<const uint32_t>(0);
+ auto type_instruction = _.FindDef(type_id);
+ auto type_opcode = type_instruction->opcode();
+ if (type_opcode != SpvOpTypeInt && type_opcode != SpvOpTypeFloat) {
+ return _.diag(SPV_ERROR_INVALID_DATA, inst) << "Specialization constant "
+ "must be an integer or "
+ "floating-point number.";
+ }
+ return SPV_SUCCESS;
+}
+
+spv_result_t ValidateSpecConstantOp(ValidationState_t& _,
+ const Instruction* inst) {
+ const auto op = inst->GetOperandAs<SpvOp>(2);
+
+ // The binary parser already ensures that the op is valid for *some*
+ // environment. Here we check restrictions.
+ switch (op) {
+ case SpvOpQuantizeToF16:
+ if (!_.HasCapability(SpvCapabilityShader)) {
+ return _.diag(SPV_ERROR_INVALID_ID, inst)
+ << "Specialization constant operation " << spvOpcodeString(op)
+ << " requires Shader capability";
+ }
+ break;
+
+ case SpvOpUConvert:
+ if (!_.features().uconvert_spec_constant_op &&
+ !_.HasCapability(SpvCapabilityKernel)) {
+ return _.diag(SPV_ERROR_INVALID_ID, inst)
+ << "Prior to SPIR-V 1.4, specialization constant operation "
+ "UConvert requires Kernel capability or extension "
+ "SPV_AMD_gpu_shader_int16";
+ }
+ break;
+
+ case SpvOpConvertFToS:
+ case SpvOpConvertSToF:
+ case SpvOpConvertFToU:
+ case SpvOpConvertUToF:
+ case SpvOpConvertPtrToU:
+ case SpvOpConvertUToPtr:
+ case SpvOpGenericCastToPtr:
+ case SpvOpPtrCastToGeneric:
+ case SpvOpBitcast:
+ case SpvOpFNegate:
+ case SpvOpFAdd:
+ case SpvOpFSub:
+ case SpvOpFMul:
+ case SpvOpFDiv:
+ case SpvOpFRem:
+ case SpvOpFMod:
+ case SpvOpAccessChain:
+ case SpvOpInBoundsAccessChain:
+ case SpvOpPtrAccessChain:
+ case SpvOpInBoundsPtrAccessChain:
+ if (!_.HasCapability(SpvCapabilityKernel)) {
+ return _.diag(SPV_ERROR_INVALID_ID, inst)
+ << "Specialization constant operation " << spvOpcodeString(op)
+ << " requires Kernel capability";
+ }
+ break;
+
+ default:
+ break;
+ }
+
+ // TODO(dneto): Validate result type and arguments to the various operations.
+ return SPV_SUCCESS;
+}
+
} // namespace
spv_result_t ConstantPass(ValidationState_t& _, const Instruction* inst) {
@@ -335,10 +441,26 @@ spv_result_t ConstantPass(ValidationState_t& _, const Instruction* inst) {
case SpvOpConstantNull:
if (auto error = ValidateConstantNull(_, inst)) return error;
break;
+ case SpvOpSpecConstant:
+ if (auto error = ValidateSpecConstant(_, inst)) return error;
+ break;
+ case SpvOpSpecConstantOp:
+ if (auto error = ValidateSpecConstantOp(_, inst)) return error;
+ break;
default:
break;
}
+ // Generally disallow creating 8- or 16-bit constants unless the full
+ // capabilities are present.
+ if (spvOpcodeIsConstant(inst->opcode()) &&
+ _.HasCapability(SpvCapabilityShader) &&
+ !_.IsPointerType(inst->type_id()) &&
+ _.ContainsLimitedUseIntOrFloatType(inst->type_id())) {
+ return _.diag(SPV_ERROR_INVALID_ID, inst)
+ << "Cannot form constants of 8- or 16-bit types";
+ }
+
return SPV_SUCCESS;
}