mirror of
https://github.com/KhronosGroup/SPIRV-Tools
synced 2024-11-22 03:30:06 +00:00
3ab0d22608
* Support SPV_KHR_untyped_pointers Covers: - assembler - disassembler - validator fix copyright Validate OpTypeUntypedPointerKHR * Disallow an untyped pointer in a typed pointer * Validate capability requirements for untyped pointer * Allow duplicate untyped pointer declarations Add round trip tests Validate OpUntypedVariableKHR Validate untyped access chains * Add a test for opcodes that generate untyped pointers * simplify some checks for operands needing types * validate OpUnypedAccessChainKHR, OpUntypedInBoundsAccessChainKHR, OpUntypedPtrAccessChainKHR, OpUntypedInBoundsPtrAccessChainKHR Unify variable validation Validate OpCopyMemorySized * Fix some opcode tests to accound for untyped pointers * Add validation for OpCopyMemorySized for shaders and untyped pointers * fix up tests Validate pointer comparisons and bitcast * Update more helpers * Fix entry validation to allow OpUntypedVariableKHR * Validate OpPtrEqual, OpPtrNotEqual and OpPtrDiff * Validate OpBitcast Validate atomics and untyped pointers Make interface variable validation aware of untyped pointers * Check OpUntypedVariableKHR in interface validation More untyped pointer validation * Validate interfaces more thoroughly * Validate layouts for untyped pointer uses * Improve capability checks for vulkan with OpTypeUntypedPointerKHR * workgroup member explicit layout validation updates More validation * validate function arguments and parameters * handle untyped pointer and variable in more places Add a friendly assembly name for untyped pointers Update OpCopyMemory validation and tests Fix test for token update Fixes for validation * Allow typed pointers to contain untyped pointers * Fix decoration validation * add untyped pointer as a case for size and alignments Fix interface validation * Grabbed the wrong storage class operand for untyped variables * Add ability to specify assembler options in validation tests Add passthrough validation for OpUntypedArrayLengthKHR More validation of untyped pointers * Validate OpUntypedArrayLengthKHR * Validate layout for OpLoad, OpStore, and OpUntypedArrayLengthKHR Validation support for cooperative matrix and untyped pointers * Allow untyped pointers for cooperative matrix KHR load and store Updates to match spec * Remove extra capability references * Swap untyped variable data type and storage class operands * update validation of variables * update deps --------- Co-authored-by: David Neto <dneto@google.com>
107 lines
4.7 KiB
C++
107 lines
4.7 KiB
C++
// Copyright (c) 2015-2016 The Khronos Group 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.
|
|
|
|
#include "test/unit_spirv.h"
|
|
|
|
#include "source/enum_set.h"
|
|
|
|
namespace spvtools {
|
|
namespace {
|
|
|
|
using spvtest::ElementsIn;
|
|
|
|
// Capabilities required by an Opcode.
|
|
struct ExpectedOpCodeCapabilities {
|
|
spv::Op opcode;
|
|
CapabilitySet capabilities;
|
|
};
|
|
|
|
using OpcodeTableCapabilitiesTest =
|
|
::testing::TestWithParam<ExpectedOpCodeCapabilities>;
|
|
|
|
TEST_P(OpcodeTableCapabilitiesTest, TableEntryMatchesExpectedCapabilities) {
|
|
auto env = SPV_ENV_UNIVERSAL_1_1;
|
|
spv_opcode_table opcodeTable;
|
|
ASSERT_EQ(SPV_SUCCESS, spvOpcodeTableGet(&opcodeTable, env));
|
|
spv_opcode_desc entry;
|
|
ASSERT_EQ(SPV_SUCCESS, spvOpcodeTableValueLookup(env, opcodeTable,
|
|
GetParam().opcode, &entry));
|
|
EXPECT_EQ(
|
|
ElementsIn(GetParam().capabilities),
|
|
ElementsIn(CapabilitySet(entry->numCapabilities, entry->capabilities)));
|
|
}
|
|
|
|
INSTANTIATE_TEST_SUITE_P(
|
|
TableRowTest, OpcodeTableCapabilitiesTest,
|
|
// Spot-check a few opcodes.
|
|
::testing::Values(
|
|
ExpectedOpCodeCapabilities{spv::Op::OpImageQuerySize,
|
|
CapabilitySet{spv::Capability::Kernel,
|
|
spv::Capability::ImageQuery}},
|
|
ExpectedOpCodeCapabilities{spv::Op::OpImageQuerySizeLod,
|
|
CapabilitySet{spv::Capability::Kernel,
|
|
spv::Capability::ImageQuery}},
|
|
ExpectedOpCodeCapabilities{spv::Op::OpImageQueryLevels,
|
|
CapabilitySet{spv::Capability::Kernel,
|
|
spv::Capability::ImageQuery}},
|
|
ExpectedOpCodeCapabilities{spv::Op::OpImageQuerySamples,
|
|
CapabilitySet{spv::Capability::Kernel,
|
|
spv::Capability::ImageQuery}},
|
|
ExpectedOpCodeCapabilities{
|
|
spv::Op::OpImageSparseSampleImplicitLod,
|
|
CapabilitySet{spv::Capability::SparseResidency}},
|
|
ExpectedOpCodeCapabilities{
|
|
spv::Op::OpCopyMemorySized,
|
|
CapabilitySet{spv::Capability::Addresses,
|
|
spv::Capability::UntypedPointersKHR}},
|
|
ExpectedOpCodeCapabilities{spv::Op::OpArrayLength,
|
|
CapabilitySet{spv::Capability::Shader}},
|
|
ExpectedOpCodeCapabilities{spv::Op::OpFunction, CapabilitySet()},
|
|
ExpectedOpCodeCapabilities{spv::Op::OpConvertFToS, CapabilitySet()},
|
|
ExpectedOpCodeCapabilities{
|
|
spv::Op::OpEmitStreamVertex,
|
|
CapabilitySet{spv::Capability::GeometryStreams}},
|
|
ExpectedOpCodeCapabilities{
|
|
spv::Op::OpTypeNamedBarrier,
|
|
CapabilitySet{spv::Capability::NamedBarrier}},
|
|
ExpectedOpCodeCapabilities{
|
|
spv::Op::OpGetKernelMaxNumSubgroups,
|
|
CapabilitySet{spv::Capability::SubgroupDispatch}},
|
|
ExpectedOpCodeCapabilities{spv::Op::OpImageQuerySamples,
|
|
CapabilitySet{spv::Capability::Kernel,
|
|
spv::Capability::ImageQuery}},
|
|
ExpectedOpCodeCapabilities{
|
|
spv::Op::OpImageSparseSampleImplicitLod,
|
|
CapabilitySet{spv::Capability::SparseResidency}},
|
|
ExpectedOpCodeCapabilities{
|
|
spv::Op::OpCopyMemorySized,
|
|
CapabilitySet{spv::Capability::Addresses,
|
|
spv::Capability::UntypedPointersKHR}},
|
|
ExpectedOpCodeCapabilities{spv::Op::OpArrayLength,
|
|
CapabilitySet{spv::Capability::Shader}},
|
|
ExpectedOpCodeCapabilities{spv::Op::OpFunction, CapabilitySet()},
|
|
ExpectedOpCodeCapabilities{spv::Op::OpConvertFToS, CapabilitySet()},
|
|
ExpectedOpCodeCapabilities{
|
|
spv::Op::OpEmitStreamVertex,
|
|
CapabilitySet{spv::Capability::GeometryStreams}},
|
|
ExpectedOpCodeCapabilities{
|
|
spv::Op::OpTypeNamedBarrier,
|
|
CapabilitySet{spv::Capability::NamedBarrier}},
|
|
ExpectedOpCodeCapabilities{
|
|
spv::Op::OpGetKernelMaxNumSubgroups,
|
|
CapabilitySet{spv::Capability::SubgroupDispatch}}));
|
|
|
|
} // namespace
|
|
} // namespace spvtools
|