AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-11-29 22:41:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
2937538210
SPIRV-Tools/source/val/validate_conversion.cpp

586 lines
24 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/diagnostic.h"
#include "source/opcode.h"
Relaxed bitcast with pointers (#2878) * When input or result is a pointer type also allow 32-bit integer vectors for the other type * Relaxation only applies to SPIR-V 1.5 or in the presence of SPV_KHR_physical_storage_buffer * new tests
2019-09-18 15:55:39 +00:00
#include "source/spirv_constant.h"
spirv-val: Add Vulkan PSB64 convert VUID (#4122)
2021-02-01 15:39:44 +00:00
#include "source/spirv_target_env.h"
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/instruction.h"
spirv-val: Add Vulkan PSB64 convert VUID (#4122)
2021-02-01 15:39:44 +00:00
#include "source/val/validate.h"
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/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) {
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
const spv::Op opcode = inst->opcode();
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 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) {
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
case spv::Op::OpConvertFToU: {
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 (!_.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
break;
}
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
case spv::Op::OpConvertFToS: {
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
break;
}
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
case spv::Op::OpConvertSToF:
case spv::Op::OpConvertUToF: {
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 (!_.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
break;
}
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
case spv::Op::OpUConvert: {
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 (!_.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;
}
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
case spv::Op::OpSConvert: {
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;
}
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
case spv::Op::OpFConvert: {
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 (!_.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;
}
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
case spv::Op::OpQuantizeToF16: {
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 ((!_.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;
}
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
case spv::Op::OpConvertPtrToU: {
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 (!_.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
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
if (_.addressing_model() == spv::AddressingModel::Logical)
SPV_EXT_physical_storage_buffer (#2267)
2019-01-07 18:19:24 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Logical addressing not supported: "
<< spvOpcodeString(opcode);
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
if (_.addressing_model() ==
spv::AddressingModel::PhysicalStorageBuffer64) {
spv::StorageClass input_storage_class;
SPV_EXT_physical_storage_buffer (#2267)
2019-01-07 18:19:24 +00:00
uint32_t input_data_type = 0;
_.GetPointerTypeInfo(input_type, &input_data_type,
&input_storage_class);
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
if (input_storage_class != spv::StorageClass::PhysicalStorageBuffer)
SPV_EXT_physical_storage_buffer (#2267)
2019-01-07 18:19:24 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
spirv-val: Add Vulkan PSB64 convert VUID (#4122)
2021-02-01 15:39:44 +00:00
<< "Pointer storage class must be PhysicalStorageBuffer: "
SPV_EXT_physical_storage_buffer (#2267)
2019-01-07 18:19:24 +00:00
<< spvOpcodeString(opcode);
spirv-val: Add Vulkan PSB64 convert VUID (#4122)
2021-02-01 15:39:44 +00:00
if (spvIsVulkanEnv(_.context()->target_env)) {
if (_.GetBitWidth(result_type) != 64) {
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< _.VkErrorID(4710)
<< "PhysicalStorageBuffer64 addressing mode requires the "
"result integer type to have a 64-bit width for Vulkan "
"environment.";
}
}
SPV_EXT_physical_storage_buffer (#2267)
2019-01-07 18:19:24 +00:00
}
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;
}
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
case spv::Op::OpSatConvertSToU:
case spv::Op::OpSatConvertUToS: {
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 (!_.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;
}
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
case spv::Op::OpConvertUToPtr: {
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 (!_.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
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
if (_.addressing_model() == spv::AddressingModel::Logical)
SPV_EXT_physical_storage_buffer (#2267)
2019-01-07 18:19:24 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Logical addressing not supported: "
<< spvOpcodeString(opcode);
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
if (_.addressing_model() ==
spv::AddressingModel::PhysicalStorageBuffer64) {
spv::StorageClass result_storage_class;
SPV_EXT_physical_storage_buffer (#2267)
2019-01-07 18:19:24 +00:00
uint32_t result_data_type = 0;
_.GetPointerTypeInfo(result_type, &result_data_type,
&result_storage_class);
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
if (result_storage_class != spv::StorageClass::PhysicalStorageBuffer)
SPV_EXT_physical_storage_buffer (#2267)
2019-01-07 18:19:24 +00:00
return _.diag(SPV_ERROR_INVALID_DATA, inst)
spirv-val: Add Vulkan PSB64 convert VUID (#4122)
2021-02-01 15:39:44 +00:00
<< "Pointer storage class must be PhysicalStorageBuffer: "
SPV_EXT_physical_storage_buffer (#2267)
2019-01-07 18:19:24 +00:00
<< spvOpcodeString(opcode);
spirv-val: Add Vulkan PSB64 convert VUID (#4122)
2021-02-01 15:39:44 +00:00
if (spvIsVulkanEnv(_.context()->target_env)) {
if (_.GetBitWidth(input_type) != 64) {
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< _.VkErrorID(4710)
<< "PhysicalStorageBuffer64 addressing mode requires the "
"input integer to have a 64-bit width for Vulkan "
"environment.";
}
}
SPV_EXT_physical_storage_buffer (#2267)
2019-01-07 18:19:24 +00:00
}
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;
}
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
case spv::Op::OpPtrCastToGeneric: {
spv::StorageClass result_storage_class;
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
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
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
if (result_storage_class != spv::StorageClass::Generic)
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);
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
spv::StorageClass input_storage_class;
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
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
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
if (input_storage_class != spv::StorageClass::Workgroup &&
input_storage_class != spv::StorageClass::CrossWorkgroup &&
input_storage_class != spv::StorageClass::Function)
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;
}
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
case spv::Op::OpGenericCastToPtr: {
spv::StorageClass result_storage_class;
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
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
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
if (result_storage_class != spv::StorageClass::Workgroup &&
result_storage_class != spv::StorageClass::CrossWorkgroup &&
result_storage_class != spv::StorageClass::Function)
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);
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
spv::StorageClass input_storage_class;
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
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
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
if (input_storage_class != spv::StorageClass::Generic)
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;
}
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
case spv::Op::OpGenericCastToPtrExplicit: {
spv::StorageClass result_storage_class;
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
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
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
const auto target_storage_class =
inst->GetOperandAs<spv::StorageClass>(3);
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);
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
spv::StorageClass input_storage_class;
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
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
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
if (input_storage_class != spv::StorageClass::Generic)
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
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
if (target_storage_class != spv::StorageClass::Workgroup &&
target_storage_class != spv::StorageClass::CrossWorkgroup &&
target_storage_class != spv::StorageClass::Function)
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;
}
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
case spv::Op::OpBitcast: {
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)
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
Relaxed bitcast with pointers (#2878) * When input or result is a pointer type also allow 32-bit integer vectors for the other type * Relaxation only applies to SPIR-V 1.5 or in the presence of SPV_KHR_physical_storage_buffer * new tests
2019-09-18 15:55:39 +00:00
if (_.version() >= SPV_SPIRV_VERSION_WORD(1, 5) ||
_.HasExtension(kSPV_KHR_physical_storage_buffer)) {
const bool result_is_int_vector = _.IsIntVectorType(result_type);
const bool result_has_int32 =
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
_.ContainsSizedIntOrFloatType(result_type, spv::Op::OpTypeInt, 32);
Relaxed bitcast with pointers (#2878) * When input or result is a pointer type also allow 32-bit integer vectors for the other type * Relaxation only applies to SPIR-V 1.5 or in the presence of SPV_KHR_physical_storage_buffer * new tests
2019-09-18 15:55:39 +00:00
const bool input_is_int_vector = _.IsIntVectorType(input_type);
const bool input_has_int32 =
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
_.ContainsSizedIntOrFloatType(input_type, spv::Op::OpTypeInt, 32);
Relaxed bitcast with pointers (#2878) * When input or result is a pointer type also allow 32-bit integer vectors for the other type * Relaxation only applies to SPIR-V 1.5 or in the presence of SPV_KHR_physical_storage_buffer * new tests
2019-09-18 15:55:39 +00:00
if (result_is_pointer && !input_is_pointer && !input_is_int_scalar &&
!(input_is_int_vector && input_has_int32))
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Expected input to be a pointer, int scalar or 32-bit int "
"vector 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
Relaxed bitcast with pointers (#2878) * When input or result is a pointer type also allow 32-bit integer vectors for the other type * Relaxation only applies to SPIR-V 1.5 or in the presence of SPV_KHR_physical_storage_buffer * new tests
2019-09-18 15:55:39 +00:00
if (input_is_pointer && !result_is_pointer && !result_is_int_scalar &&
!(result_is_int_vector && result_has_int32))
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Pointer can only be converted to another pointer, int "
"scalar or 32-bit int vector: "
<< spvOpcodeString(opcode);
} else {
if (result_is_pointer && !input_is_pointer && !input_is_int_scalar)
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Expected input to be a pointer or int scalar if Result "
"Type is pointer: "
<< spvOpcodeString(opcode);
if (input_is_pointer && !result_is_pointer && !result_is_int_scalar)
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "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;
}
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
case spv::Op::OpConvertUToAccelerationStructureKHR: {
spirv-val: Add OpConvertUToAccelerationStructureKHR (#4838)
2022-07-15 13:55:33 +00:00
if (!_.IsAccelerationStructureType(result_type)) {
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Expected Result Type to be a Acceleration Structure: "
<< spvOpcodeString(opcode);
}
const uint32_t input_type = _.GetOperandTypeId(inst, 2);
if (!input_type || !_.IsUnsigned64BitHandle(input_type)) {
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Expected 64-bit uint scalar or 2-component 32-bit uint "
"vector as input: "
<< spvOpcodeString(opcode);
}
break;
}
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
default:
break;
}
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
if (_.HasCapability(spv::Capability::Shader)) {
Validate usage of 8- and 16-bit types with only storage capabilities (#2704) Fixes #2669 * Check capabilities when validating variables * validate load and store types * Constant check * Don't checks pointers for stores, constants and loads * Validate composite instructions * Validate conversions for 8- and 16-bit limited types * Unified tests and expanded them * Disallow OpCopyMemory * new tests and update old tests
2019-07-08 18:10:13 +00:00
switch (inst->opcode()) {
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981) Fixes #4960 * Switches to using enum classes with an underlying type to avoid undefined behaviour
2022-11-04 21:27:10 +00:00
case spv::Op::OpConvertFToU:
case spv::Op::OpConvertFToS:
case spv::Op::OpConvertSToF:
case spv::Op::OpConvertUToF:
case spv::Op::OpBitcast:
Validate usage of 8- and 16-bit types with only storage capabilities (#2704) Fixes #2669 * Check capabilities when validating variables * validate load and store types * Constant check * Don't checks pointers for stores, constants and loads * Validate composite instructions * Validate conversions for 8- and 16-bit limited types * Unified tests and expanded them * Disallow OpCopyMemory * new tests and update old tests
2019-07-08 18:10:13 +00:00
if (_.ContainsLimitedUseIntOrFloatType(inst->type_id()) ||
_.ContainsLimitedUseIntOrFloatType(_.GetOperandTypeId(inst, 2u))) {
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "8- or 16-bit types can only be used with width-only "
"conversions";
}
break;
default:
break;
}
}
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
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