AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-11-24 20:40:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
07a1019717
SPIRV-Tools/source/val/validate_conversion.cpp

517 lines
22 KiB
C++
Raw Normal View History

Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +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 conversion 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 validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +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 validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +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 validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
// Validates correctness of conversion 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 ConversionPass(ValidationState_t& _, const Instruction* inst) {
const SpvOp opcode = inst->opcode();
const uint32_t result_type = inst->type_id();
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
switch (opcode) {
case SpvOpConvertFToU: {
if (!_.IsUnsignedIntScalarType(result_type) &&
Add validation for SPV_NV_cooperative_matrix (#2404)
2019-02-25 22:43:11 +00:00
!_.IsUnsignedIntVectorType(result_type) &&
!_.IsUnsignedIntCooperativeMatrixType(result_type))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 unsigned int scalar or vector type as Result Type: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
const uint32_t input_type = _.GetOperandTypeId(inst, 2);
if (!input_type || (!_.IsFloatScalarType(input_type) &&
Add validation for SPV_NV_cooperative_matrix (#2404)
2019-02-25 22:43:11 +00:00
!_.IsFloatVectorType(input_type) &&
!_.IsFloatCooperativeMatrixType(input_type)))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input to be float scalar or vector: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
Add validation for SPV_NV_cooperative_matrix (#2404)
2019-02-25 22:43:11 +00:00
if (_.IsCooperativeMatrixType(result_type) ||
_.IsCooperativeMatrixType(input_type)) {
spv_result_t ret =
_.CooperativeMatrixShapesMatch(inst, result_type, input_type);
if (ret != SPV_SUCCESS) return ret;
} else {
if (_.GetDimension(result_type) != _.GetDimension(input_type))
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Expected input to have the same dimension as Result Type: "
<< spvOpcodeString(opcode);
}
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
Add validaton for SPV_KHR_8bit_storage + convert to/from floats. (#1990) The SPV_KHR_8bit_storage extension does not permit 8-bit integers to be cast directly to floating point types. We are seeing shaders in the wild, being produced by toolchains like glslang, that are generating invalid SPIR-V. This change adds validation to check for the patterns not permitted, and some tests that expose the failure.
2018-10-19 17:45:26 +00:00
if (!_.features().use_int8_type && (8 == _.GetBitWidth(result_type)))
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Invalid cast to 8-bit integer from a floating-point: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
break;
}
case SpvOpConvertFToS: {
Add validation for SPV_NV_cooperative_matrix (#2404)
2019-02-25 22:43:11 +00:00
if (!_.IsIntScalarType(result_type) && !_.IsIntVectorType(result_type) &&
!_.IsIntCooperativeMatrixType(result_type))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 int scalar or vector type as Result Type: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
const uint32_t input_type = _.GetOperandTypeId(inst, 2);
if (!input_type || (!_.IsFloatScalarType(input_type) &&
Add validation for SPV_NV_cooperative_matrix (#2404)
2019-02-25 22:43:11 +00:00
!_.IsFloatVectorType(input_type) &&
!_.IsFloatCooperativeMatrixType(input_type)))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input to be float scalar or vector: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
Add validation for SPV_NV_cooperative_matrix (#2404)
2019-02-25 22:43:11 +00:00
if (_.IsCooperativeMatrixType(result_type) ||
_.IsCooperativeMatrixType(input_type)) {
spv_result_t ret =
_.CooperativeMatrixShapesMatch(inst, result_type, input_type);
if (ret != SPV_SUCCESS) return ret;
} else {
if (_.GetDimension(result_type) != _.GetDimension(input_type))
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Expected input to have the same dimension as Result Type: "
<< spvOpcodeString(opcode);
}
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
Add validaton for SPV_KHR_8bit_storage + convert to/from floats. (#1990) The SPV_KHR_8bit_storage extension does not permit 8-bit integers to be cast directly to floating point types. We are seeing shaders in the wild, being produced by toolchains like glslang, that are generating invalid SPIR-V. This change adds validation to check for the patterns not permitted, and some tests that expose the failure.
2018-10-19 17:45:26 +00:00
if (!_.features().use_int8_type && (8 == _.GetBitWidth(result_type)))
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Invalid cast to 8-bit integer from a floating-point: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
break;
}
case SpvOpConvertSToF:
case SpvOpConvertUToF: {
if (!_.IsFloatScalarType(result_type) &&
Add validation for SPV_NV_cooperative_matrix (#2404)
2019-02-25 22:43:11 +00:00
!_.IsFloatVectorType(result_type) &&
!_.IsFloatCooperativeMatrixType(result_type))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 float scalar or vector type as Result Type: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
const uint32_t input_type = _.GetOperandTypeId(inst, 2);
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 (!input_type ||
Add validation for SPV_NV_cooperative_matrix (#2404)
2019-02-25 22:43:11 +00:00
(!_.IsIntScalarType(input_type) && !_.IsIntVectorType(input_type) &&
!_.IsIntCooperativeMatrixType(input_type)))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input to be int scalar or vector: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
Add validation for SPV_NV_cooperative_matrix (#2404)
2019-02-25 22:43:11 +00:00
if (_.IsCooperativeMatrixType(result_type) ||
_.IsCooperativeMatrixType(input_type)) {
spv_result_t ret =
_.CooperativeMatrixShapesMatch(inst, result_type, input_type);
if (ret != SPV_SUCCESS) return ret;
} else {
if (_.GetDimension(result_type) != _.GetDimension(input_type))
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Expected input to have the same dimension as Result Type: "
<< spvOpcodeString(opcode);
}
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
Add validaton for SPV_KHR_8bit_storage + convert to/from floats. (#1990) The SPV_KHR_8bit_storage extension does not permit 8-bit integers to be cast directly to floating point types. We are seeing shaders in the wild, being produced by toolchains like glslang, that are generating invalid SPIR-V. This change adds validation to check for the patterns not permitted, and some tests that expose the failure.
2018-10-19 17:45:26 +00:00
if (!_.features().use_int8_type && (8 == _.GetBitWidth(input_type)))
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Invalid cast to floating-point from an 8-bit integer: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
break;
}
case SpvOpUConvert: {
if (!_.IsUnsignedIntScalarType(result_type) &&
Add validation for SPV_NV_cooperative_matrix (#2404)
2019-02-25 22:43:11 +00:00
!_.IsUnsignedIntVectorType(result_type) &&
!_.IsUnsignedIntCooperativeMatrixType(result_type))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-enabled checks for UConvert
2018-04-06 13:36:08 +00:00
<< "Expected unsigned int scalar or vector type as Result Type: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
const uint32_t input_type = _.GetOperandTypeId(inst, 2);
Re-enabled checks for UConvert
2018-04-06 13:36:08 +00:00
if (!input_type ||
Add validation for SPV_NV_cooperative_matrix (#2404)
2019-02-25 22:43:11 +00:00
(!_.IsIntScalarType(input_type) && !_.IsIntVectorType(input_type) &&
!_.IsIntCooperativeMatrixType(input_type)))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-enabled checks for UConvert
2018-04-06 13:36:08 +00:00
<< "Expected input to be int scalar or vector: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
Add validation for SPV_NV_cooperative_matrix (#2404)
2019-02-25 22:43:11 +00:00
if (_.IsCooperativeMatrixType(result_type) ||
_.IsCooperativeMatrixType(input_type)) {
spv_result_t ret =
_.CooperativeMatrixShapesMatch(inst, result_type, input_type);
if (ret != SPV_SUCCESS) return ret;
} else {
if (_.GetDimension(result_type) != _.GetDimension(input_type))
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Expected input to have the same dimension as Result Type: "
<< spvOpcodeString(opcode);
}
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
if (_.GetBitWidth(result_type) == _.GetBitWidth(input_type))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
Re-enabled checks for UConvert
2018-04-06 13:36:08 +00:00
<< "Expected input to have different bit width from Result "
"Type: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
break;
}
case SpvOpSConvert: {
Add validation for SPV_NV_cooperative_matrix (#2404)
2019-02-25 22:43:11 +00:00
if (!_.IsIntScalarType(result_type) && !_.IsIntVectorType(result_type) &&
!_.IsIntCooperativeMatrixType(result_type))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 int scalar or vector type as Result Type: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
const uint32_t input_type = _.GetOperandTypeId(inst, 2);
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 (!input_type ||
Add validation for SPV_NV_cooperative_matrix (#2404)
2019-02-25 22:43:11 +00:00
(!_.IsIntScalarType(input_type) && !_.IsIntVectorType(input_type) &&
!_.IsIntCooperativeMatrixType(input_type)))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input to be int scalar or vector: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
Add validation for SPV_NV_cooperative_matrix (#2404)
2019-02-25 22:43:11 +00:00
if (_.IsCooperativeMatrixType(result_type) ||
_.IsCooperativeMatrixType(input_type)) {
spv_result_t ret =
_.CooperativeMatrixShapesMatch(inst, result_type, input_type);
if (ret != SPV_SUCCESS) return ret;
} else {
if (_.GetDimension(result_type) != _.GetDimension(input_type))
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Expected input to have the same dimension as Result Type: "
<< spvOpcodeString(opcode);
}
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
if (_.GetBitWidth(result_type) == _.GetBitWidth(input_type))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input to have different bit width from Result "
"Type: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
break;
}
case SpvOpFConvert: {
if (!_.IsFloatScalarType(result_type) &&
Add validation for SPV_NV_cooperative_matrix (#2404)
2019-02-25 22:43:11 +00:00
!_.IsFloatVectorType(result_type) &&
!_.IsFloatCooperativeMatrixType(result_type))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 float scalar or vector type as Result Type: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
const uint32_t input_type = _.GetOperandTypeId(inst, 2);
if (!input_type || (!_.IsFloatScalarType(input_type) &&
Add validation for SPV_NV_cooperative_matrix (#2404)
2019-02-25 22:43:11 +00:00
!_.IsFloatVectorType(input_type) &&
!_.IsFloatCooperativeMatrixType(input_type)))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input to be float scalar or vector: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
Add validation for SPV_NV_cooperative_matrix (#2404)
2019-02-25 22:43:11 +00:00
if (_.IsCooperativeMatrixType(result_type) ||
_.IsCooperativeMatrixType(input_type)) {
spv_result_t ret =
_.CooperativeMatrixShapesMatch(inst, result_type, input_type);
if (ret != SPV_SUCCESS) return ret;
} else {
if (_.GetDimension(result_type) != _.GetDimension(input_type))
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Expected input to have the same dimension as Result Type: "
<< spvOpcodeString(opcode);
}
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
if (_.GetBitWidth(result_type) == _.GetBitWidth(input_type))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input to have different bit width from Result "
"Type: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
break;
}
case SpvOpQuantizeToF16: {
if ((!_.IsFloatScalarType(result_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(result_type)) ||
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
_.GetBitWidth(result_type) != 32)
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 32-bit float scalar or vector type as Result Type: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
const uint32_t input_type = _.GetOperandTypeId(inst, 2);
if (input_type != result_type)
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input type to be equal to Result Type: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
break;
}
case SpvOpConvertPtrToU: {
if (!_.IsUnsignedIntScalarType(result_type))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 unsigned int scalar type as Result Type: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
const uint32_t input_type = _.GetOperandTypeId(inst, 2);
if (!_.IsPointerType(input_type))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input to be a pointer: " << spvOpcodeString(opcode);
SPV_EXT_physical_storage_buffer (#2267)
2019-01-07 18:19:24 +00:00
if (_.addressing_model() == SpvAddressingModelLogical)
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Logical addressing not supported: "
<< spvOpcodeString(opcode);
if (_.addressing_model() ==
SpvAddressingModelPhysicalStorageBuffer64EXT) {
uint32_t input_storage_class = 0;
uint32_t input_data_type = 0;
_.GetPointerTypeInfo(input_type, &input_data_type,
&input_storage_class);
if (input_storage_class != SpvStorageClassPhysicalStorageBufferEXT)
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Pointer storage class must be PhysicalStorageBufferEXT: "
<< spvOpcodeString(opcode);
}
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
break;
}
case SpvOpSatConvertSToU:
case SpvOpSatConvertUToS: {
if (!_.IsIntScalarType(result_type) && !_.IsIntVectorType(result_type))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 int scalar or vector type as Result Type: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
const uint32_t input_type = _.GetOperandTypeId(inst, 2);
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 (!input_type ||
(!_.IsIntScalarType(input_type) && !_.IsIntVectorType(input_type)))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 int scalar or vector as input: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
if (_.GetDimension(result_type) != _.GetDimension(input_type))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input to have the same dimension as Result Type: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
break;
}
case SpvOpConvertUToPtr: {
if (!_.IsPointerType(result_type))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 Result Type to be a pointer: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
const uint32_t input_type = _.GetOperandTypeId(inst, 2);
Catch invalid input type to OpConvertUToPtr (#2078) Fixes https://crbug.com/906426 * Fails validation if the input operand is a type * Added a test
2018-11-19 20:08:38 +00:00
if (!input_type || !_.IsIntScalarType(input_type))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 int scalar as input: " << spvOpcodeString(opcode);
SPV_EXT_physical_storage_buffer (#2267)
2019-01-07 18:19:24 +00:00
if (_.addressing_model() == SpvAddressingModelLogical)
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Logical addressing not supported: "
<< spvOpcodeString(opcode);
if (_.addressing_model() ==
SpvAddressingModelPhysicalStorageBuffer64EXT) {
uint32_t result_storage_class = 0;
uint32_t result_data_type = 0;
_.GetPointerTypeInfo(result_type, &result_data_type,
&result_storage_class);
if (result_storage_class != SpvStorageClassPhysicalStorageBufferEXT)
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Pointer storage class must be PhysicalStorageBufferEXT: "
<< spvOpcodeString(opcode);
}
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
break;
}
case SpvOpPtrCastToGeneric: {
uint32_t result_storage_class = 0;
uint32_t result_data_type = 0;
if (!_.GetPointerTypeInfo(result_type, &result_data_type,
&result_storage_class))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 Result Type to be a pointer: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
if (result_storage_class != SpvStorageClassGeneric)
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 Result Type to have storage class Generic: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
const uint32_t input_type = _.GetOperandTypeId(inst, 2);
uint32_t input_storage_class = 0;
uint32_t input_data_type = 0;
if (!_.GetPointerTypeInfo(input_type, &input_data_type,
&input_storage_class))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input to be a pointer: " << spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
if (input_storage_class != SpvStorageClassWorkgroup &&
input_storage_class != SpvStorageClassCrossWorkgroup &&
input_storage_class != SpvStorageClassFunction)
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input to have storage class Workgroup, "
<< "CrossWorkgroup or Function: " << spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
if (result_data_type != input_data_type)
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input and Result Type to point to the same type: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
break;
}
case SpvOpGenericCastToPtr: {
uint32_t result_storage_class = 0;
uint32_t result_data_type = 0;
if (!_.GetPointerTypeInfo(result_type, &result_data_type,
&result_storage_class))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 Result Type to be a pointer: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
if (result_storage_class != SpvStorageClassWorkgroup &&
result_storage_class != SpvStorageClassCrossWorkgroup &&
result_storage_class != SpvStorageClassFunction)
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 Result Type to have storage class Workgroup, "
<< "CrossWorkgroup or Function: " << spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
const uint32_t input_type = _.GetOperandTypeId(inst, 2);
uint32_t input_storage_class = 0;
uint32_t input_data_type = 0;
if (!_.GetPointerTypeInfo(input_type, &input_data_type,
&input_storage_class))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input to be a pointer: " << spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
if (input_storage_class != SpvStorageClassGeneric)
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input to have storage class Generic: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
if (result_data_type != input_data_type)
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input and Result Type to point to the same type: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
break;
}
case SpvOpGenericCastToPtrExplicit: {
uint32_t result_storage_class = 0;
uint32_t result_data_type = 0;
if (!_.GetPointerTypeInfo(result_type, &result_data_type,
&result_storage_class))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 Result Type to be a pointer: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +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 target_storage_class = inst->word(4);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
if (result_storage_class != target_storage_class)
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 Result Type to be of target storage class: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
const uint32_t input_type = _.GetOperandTypeId(inst, 2);
uint32_t input_storage_class = 0;
uint32_t input_data_type = 0;
if (!_.GetPointerTypeInfo(input_type, &input_data_type,
&input_storage_class))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input to be a pointer: " << spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
if (input_storage_class != SpvStorageClassGeneric)
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input to have storage class Generic: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
if (result_data_type != input_data_type)
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input and Result Type to point to the same type: "
<< spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
if (target_storage_class != SpvStorageClassWorkgroup &&
target_storage_class != SpvStorageClassCrossWorkgroup &&
target_storage_class != SpvStorageClassFunction)
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 target storage class to be Workgroup, "
<< "CrossWorkgroup or Function: " << spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
break;
}
case SpvOpBitcast: {
const uint32_t input_type = _.GetOperandTypeId(inst, 2);
if (!input_type)
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input to have a type: " << spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
const bool result_is_pointer = _.IsPointerType(result_type);
const bool result_is_int_scalar = _.IsIntScalarType(result_type);
const bool input_is_pointer = _.IsPointerType(input_type);
const bool input_is_int_scalar = _.IsIntScalarType(input_type);
if (!result_is_pointer && !result_is_int_scalar &&
!_.IsIntVectorType(result_type) &&
!_.IsFloatScalarType(result_type) &&
!_.IsFloatVectorType(result_type))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 Result Type to be a pointer or int or float vector "
<< "or scalar type: " << spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
if (!input_is_pointer && !input_is_int_scalar &&
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
!_.IsIntVectorType(input_type) && !_.IsFloatScalarType(input_type) &&
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
!_.IsFloatVectorType(input_type))
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input to be a pointer or int or float vector "
<< "or scalar: " << spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
if (result_is_pointer && !input_is_pointer && !input_is_int_scalar)
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input to be a pointer or int scalar if Result Type "
<< "is pointer: " << spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
if (input_is_pointer && !result_is_pointer && !result_is_int_scalar)
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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
<< "Pointer can only be converted to another pointer or int "
<< "scalar: " << spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +00:00
if (!result_is_pointer && !input_is_pointer) {
const uint32_t result_size =
_.GetBitWidth(result_type) * _.GetDimension(result_type);
const uint32_t input_size =
_.GetBitWidth(input_type) * _.GetDimension(input_type);
if (result_size != input_size)
Update diag() calls in validate_conversion. (#1762) This CL updates validate_conversion to provide the instruction to diag() calls.
2018-08-01 14:18:06 +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 input to have the same total bit width as "
<< "Result Type: " << spvOpcodeString(opcode);
Add validation pass for conversion instructions The pass checks correctness of operands of instruction in opcode range OpConvertFToU - OpBitset. Disabled invalid tests Disabled UConvert validation until Vulkan CTS can catch up. Add validate_conversion to Android.mk Also remove duplicate entry in CMakeLists.txt.
2017-09-28 18:53:24 +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