AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-11-23 04:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
3a252a267b
SPIRV-Tools/test/val/val_extensions_test.cpp

349 lines
15 KiB
C++
Raw Normal View History

Validator parses and registers OpExtension Known extensions are saved in validation state. Unknown extension produce a dignostic message, but do not fail the validation. Moved extension definitions to their own file.
2017-03-08 18:59:01 +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.
// Tests for OpExtension validator rules.
#include <string>
Cleanup includes. (#1795) This Cl cleans up the include paths to be relative to the top level directory. Various include-what-you-use fixes have been added.
2018-08-03 19:06:09 +00:00
#include <vector>
Validator parses and registers OpExtension Known extensions are saved in validation state. Unknown extension produce a dignostic message, but do not fail the validation. Moved extension definitions to their own file.
2017-03-08 18:59:01 +00:00
#include "gmock/gmock.h"
Cleanup includes. (#1795) This Cl cleans up the include paths to be relative to the top level directory. Various include-what-you-use fixes have been added.
2018-08-03 19:06:09 +00:00
#include "source/enum_string_mapping.h"
#include "source/extensions.h"
#include "source/spirv_target_env.h"
#include "test/test_fixture.h"
#include "test/unit_spirv.h"
#include "test/val/val_fixtures.h"
Validator parses and registers OpExtension Known extensions are saved in validation state. Unknown extension produce a dignostic message, but do not fail the validation. Moved extension definitions to their own file.
2017-03-08 18:59:01 +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 tests into namespaces (#1689) This CL moves the test into namespaces based on their directories.
2018-07-11 13:24:49 +00:00
namespace val {
Validator parses and registers OpExtension Known extensions are saved in validation state. Unknown extension produce a dignostic message, but do not fail the validation. Moved extension definitions to their own file.
2017-03-08 18:59:01 +00:00
namespace {
using ::testing::HasSubstr;
using ::testing::Not;
using ::testing::Values;
Fix validation of group ops in SPV_AMD_shader_ballot This needs custom code since the rules from the extension are not encoded in the grammar. Changes are: - The new group instructions don't require Group capability when the extension is declared. - The Reduce, InclusiveScan, ExclusiveScan normally require the Kernel capability, but don't when the extension is declared. Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/991
2017-11-24 19:18:17 +00:00
using ::testing::ValuesIn;
Validator parses and registers OpExtension Known extensions are saved in validation state. Unknown extension produce a dignostic message, but do not fail the validation. Moved extension definitions to their own file.
2017-03-08 18:59:01 +00:00
Remove using std::<foo> statements. (#1756) Many of the files have using std::<foo> statements in them, but then the use of <foo> will be inconsistently std::<foo> or <foo> scattered through the file. This CL removes all of the using statements and updates the code to have the required std:: prefix.
2018-08-01 18:58:12 +00:00
using ValidateKnownExtensions = spvtest::ValidateBase<std::string>;
using ValidateUnknownExtensions = spvtest::ValidateBase<std::string>;
Validator checks if operands require extension If required extension is not found, returning new error SPV_ERROR_MISSING_EXTENSION.
2017-03-10 20:58:15 +00:00
using ValidateExtensionCapabilities = spvtest::ValidateBase<bool>;
Validator parses and registers OpExtension Known extensions are saved in validation state. Unknown extension produce a dignostic message, but do not fail the validation. Moved extension definitions to their own file.
2017-03-08 18:59:01 +00:00
// Returns expected error string if |extension| is not recognized.
Remove using std::<foo> statements. (#1756) Many of the files have using std::<foo> statements in them, but then the use of <foo> will be inconsistently std::<foo> or <foo> scattered through the file. This CL removes all of the using statements and updates the code to have the required std:: prefix.
2018-08-01 18:58:12 +00:00
std::string GetErrorString(const std::string& extension) {
Validator checks if operands require extension If required extension is not found, returning new error SPV_ERROR_MISSING_EXTENSION.
2017-03-10 20:58:15 +00:00
return "Found unrecognized extension " + extension;
Validator parses and registers OpExtension Known extensions are saved in validation state. Unknown extension produce a dignostic message, but do not fail the validation. Moved extension definitions to their own file.
2017-03-08 18:59:01 +00:00
}
Remove use of deprecated googletest macro (#2286) * Remove use of deprecated googletest macro INSTANTIATE_TEST_CASE_P has been deprecated. We need to use INSTANTIATE_TEST_SUITE_P instead. * Remove extra commas from test suites.
2019-01-29 23:56:52 +00:00
INSTANTIATE_TEST_SUITE_P(
Re-format source tree - NFC. Re-formatted the source tree with the command: $ /usr/bin/clang-format -style=file -i \ $(find include source tools test utils -name '*.cpp' -or -name '*.h') This required a fix to source/val/decoration.h. It was not including spirv.h, which broke builds when the #include headers were re-ordered by clang-format.
2017-11-27 15:16:41 +00:00
ExpectSuccess, ValidateKnownExtensions,
Values(
// Match the order as published on the SPIR-V Registry.
"SPV_AMD_shader_explicit_vertex_parameter",
"SPV_AMD_shader_trinary_minmax", "SPV_AMD_gcn_shader",
"SPV_KHR_shader_ballot", "SPV_AMD_shader_ballot",
"SPV_AMD_gpu_shader_half_float", "SPV_KHR_shader_draw_parameters",
"SPV_KHR_subgroup_vote", "SPV_KHR_16bit_storage",
"SPV_KHR_device_group", "SPV_KHR_multiview",
"SPV_NVX_multiview_per_view_attributes", "SPV_NV_viewport_array2",
"SPV_NV_stereo_view_rendering", "SPV_NV_sample_mask_override_coverage",
"SPV_NV_geometry_shader_passthrough", "SPV_AMD_texture_gather_bias_lod",
"SPV_KHR_storage_buffer_storage_class", "SPV_KHR_variable_pointers",
"SPV_AMD_gpu_shader_int16", "SPV_KHR_post_depth_coverage",
"SPV_KHR_shader_atomic_counter_ops", "SPV_EXT_shader_stencil_export",
"SPV_EXT_shader_viewport_index_layer",
Support SPV_GOOGLE_decorate_string and SPV_GOOGLE_hlsl_functionality1 This commit add assembling, disassembling, and basic validation for two Google extensions to better support HLSL translation.
2018-03-05 18:34:13 +00:00
"SPV_AMD_shader_image_load_store_lod", "SPV_AMD_shader_fragment_mask",
More automatic extension support Update grammar table generation: - Get extensions from instructions, not just operand-kinds - Don't explicitly list extensions that come from the SPIR-V core grammar or from a KHR extended instruction set grammar. This makes it easier to support new extensions since the recommended extension strategy is to add instructions to the core grammar file. Also, test the validator has trivial support for passing through the extensions SPV_NV_shader_subgroup_partitioned and SPV_EXT_descriptor_indexing.
2018-04-05 22:04:27 +00:00
"SPV_GOOGLE_decorate_string", "SPV_GOOGLE_hlsl_functionality1",
"SPV_NV_shader_subgroup_partitioned", "SPV_EXT_descriptor_indexing"));
Re-format source tree - NFC. Re-formatted the source tree with the command: $ /usr/bin/clang-format -style=file -i \ $(find include source tools test utils -name '*.cpp' -or -name '*.h') This required a fix to source/val/decoration.h. It was not including spirv.h, which broke builds when the #include headers were re-ordered by clang-format.
2017-11-27 15:16:41 +00:00
Remove use of deprecated googletest macro (#2286) * Remove use of deprecated googletest macro INSTANTIATE_TEST_CASE_P has been deprecated. We need to use INSTANTIATE_TEST_SUITE_P instead. * Remove extra commas from test suites.
2019-01-29 23:56:52 +00:00
INSTANTIATE_TEST_SUITE_P(FailSilently, ValidateUnknownExtensions,
Values("ERROR_unknown_extension", "SPV_KHR_",
"SPV_KHR_shader_ballot_ERROR"));
Validator parses and registers OpExtension Known extensions are saved in validation state. Unknown extension produce a dignostic message, but do not fail the validation. Moved extension definitions to their own file.
2017-03-08 18:59:01 +00:00
TEST_P(ValidateKnownExtensions, ExpectSuccess) {
const std::string extension = GetParam();
Remove using std::<foo> statements. (#1756) Many of the files have using std::<foo> statements in them, but then the use of <foo> will be inconsistently std::<foo> or <foo> scattered through the file. This CL removes all of the using statements and updates the code to have the required std:: prefix.
2018-08-01 18:58:12 +00:00
const std::string str =
Validator parses and registers OpExtension Known extensions are saved in validation state. Unknown extension produce a dignostic message, but do not fail the validation. Moved extension definitions to their own file.
2017-03-08 18:59:01 +00:00
"OpCapability Shader\nOpCapability Linkage\nOpExtension \"" + extension +
"\"\nOpMemoryModel Logical GLSL450";
CompileSuccessfully(str.c_str());
ASSERT_EQ(SPV_SUCCESS, ValidateInstructions());
EXPECT_THAT(getDiagnosticString(), Not(HasSubstr(GetErrorString(extension))));
}
TEST_P(ValidateUnknownExtensions, FailSilently) {
const std::string extension = GetParam();
Remove using std::<foo> statements. (#1756) Many of the files have using std::<foo> statements in them, but then the use of <foo> will be inconsistently std::<foo> or <foo> scattered through the file. This CL removes all of the using statements and updates the code to have the required std:: prefix.
2018-08-01 18:58:12 +00:00
const std::string str =
Validator parses and registers OpExtension Known extensions are saved in validation state. Unknown extension produce a dignostic message, but do not fail the validation. Moved extension definitions to their own file.
2017-03-08 18:59:01 +00:00
"OpCapability Shader\nOpCapability Linkage\nOpExtension \"" + extension +
"\"\nOpMemoryModel Logical GLSL450";
CompileSuccessfully(str.c_str());
ASSERT_EQ(SPV_SUCCESS, ValidateInstructions());
EXPECT_THAT(getDiagnosticString(), HasSubstr(GetErrorString(extension)));
}
Change handling of unknown extentions in validtor. (#1951) This commit will change the message for unknown extensions from an error to a warning. Code was added to limit the number of warning messages so that consummer of the messages are not overwhelmed. This is standard practice in compilers. Many other issues were found at while looking into this. They have been documented in #1950. Fixes http://crbug.com/875547.
2018-10-03 19:59:40 +00:00
TEST_F(ValidateUnknownExtensions, HitMaxNumOfWarnings) {
const std::string str =
std::string("OpCapability Shader\n") + "OpCapability Linkage\n" +
"OpExtension \"bad_ext\"\n" + "OpExtension \"bad_ext\"\n" +
"OpExtension \"bad_ext\"\n" + "OpExtension \"bad_ext\"\n" +
"OpExtension \"bad_ext\"\n" + "OpExtension \"bad_ext\"\n" +
"OpExtension \"bad_ext\"\n" + "OpExtension \"bad_ext\"\n" +
"OpExtension \"bad_ext\"\n" + "OpExtension \"bad_ext\"\n" +
"OpExtension \"bad_ext\"\n" + "OpExtension \"bad_ext\"\n" +
"OpExtension \"bad_ext\"\n" + "OpExtension \"bad_ext\"\n" +
"OpExtension \"bad_ext\"\n" + "OpExtension \"bad_ext\"\n" +
"OpExtension \"bad_ext\"\n" + "OpExtension \"bad_ext\"\n" +
"OpExtension \"bad_ext\"\n" + "OpExtension \"bad_ext\"\n" +
"OpExtension \"bad_ext\"\n" + "OpExtension \"bad_ext\"\n" +
"OpExtension \"bad_ext\"\n" + "OpExtension \"bad_ext\"\n" +
"OpExtension \"bad_ext\"\n" + "OpExtension \"bad_ext\"\n" +
"OpMemoryModel Logical GLSL450";
CompileSuccessfully(str.c_str());
ASSERT_EQ(SPV_SUCCESS, ValidateInstructions());
EXPECT_THAT(getDiagnosticString(),
HasSubstr("Other warnings have been suppressed."));
}
Validator checks if operands require extension If required extension is not found, returning new error SPV_ERROR_MISSING_EXTENSION.
2017-03-10 20:58:15 +00:00
TEST_F(ValidateExtensionCapabilities, DeclCapabilitySuccess) {
Remove using std::<foo> statements. (#1756) Many of the files have using std::<foo> statements in them, but then the use of <foo> will be inconsistently std::<foo> or <foo> scattered through the file. This CL removes all of the using statements and updates the code to have the required std:: prefix.
2018-08-01 18:58:12 +00:00
const std::string str =
Validator checks if operands require extension If required extension is not found, returning new error SPV_ERROR_MISSING_EXTENSION.
2017-03-10 20:58:15 +00:00
"OpCapability Shader\nOpCapability Linkage\nOpCapability DeviceGroup\n"
"OpExtension \"SPV_KHR_device_group\""
"\nOpMemoryModel Logical GLSL450";
CompileSuccessfully(str.c_str());
ASSERT_EQ(SPV_SUCCESS, ValidateInstructions());
}
TEST_F(ValidateExtensionCapabilities, DeclCapabilityFailure) {
Remove using std::<foo> statements. (#1756) Many of the files have using std::<foo> statements in them, but then the use of <foo> will be inconsistently std::<foo> or <foo> scattered through the file. This CL removes all of the using statements and updates the code to have the required std:: prefix.
2018-08-01 18:58:12 +00:00
const std::string str =
Validator checks if operands require extension If required extension is not found, returning new error SPV_ERROR_MISSING_EXTENSION.
2017-03-10 20:58:15 +00:00
"OpCapability Shader\nOpCapability Linkage\nOpCapability DeviceGroup\n"
"\nOpMemoryModel Logical GLSL450";
CompileSuccessfully(str.c_str());
ASSERT_EQ(SPV_ERROR_MISSING_EXTENSION, ValidateInstructions());
EXPECT_THAT(getDiagnosticString(), HasSubstr("1st operand of Capability"));
Re-format source tree - NFC. Re-formatted the source tree with the command: $ /usr/bin/clang-format -style=file -i \ $(find include source tools test utils -name '*.cpp' -or -name '*.h') This required a fix to source/val/decoration.h. It was not including spirv.h, which broke builds when the #include headers were re-ordered by clang-format.
2017-11-27 15:16:41 +00:00
EXPECT_THAT(getDiagnosticString(),
HasSubstr("requires one of these extensions"));
Validator checks if operands require extension If required extension is not found, returning new error SPV_ERROR_MISSING_EXTENSION.
2017-03-10 20:58:15 +00:00
EXPECT_THAT(getDiagnosticString(), HasSubstr("SPV_KHR_device_group"));
}
Remove using std::<foo> statements. (#1756) Many of the files have using std::<foo> statements in them, but then the use of <foo> will be inconsistently std::<foo> or <foo> scattered through the file. This CL removes all of the using statements and updates the code to have the required std:: prefix.
2018-08-01 18:58:12 +00:00
using ValidateAMDShaderBallotCapabilities = spvtest::ValidateBase<std::string>;
Fix validation of group ops in SPV_AMD_shader_ballot This needs custom code since the rules from the extension are not encoded in the grammar. Changes are: - The new group instructions don't require Group capability when the extension is declared. - The Reduce, InclusiveScan, ExclusiveScan normally require the Kernel capability, but don't when the extension is declared. Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/991
2017-11-24 19:18:17 +00:00
// Returns a vector of strings for the prefix of a SPIR-V assembly shader
// that can use the group instructions introduced by SPV_AMD_shader_ballot.
Remove using std::<foo> statements. (#1756) Many of the files have using std::<foo> statements in them, but then the use of <foo> will be inconsistently std::<foo> or <foo> scattered through the file. This CL removes all of the using statements and updates the code to have the required std:: prefix.
2018-08-01 18:58:12 +00:00
std::vector<std::string> ShaderPartsForAMDShaderBallot() {
return std::vector<std::string>{R"(
Fix validation of group ops in SPV_AMD_shader_ballot This needs custom code since the rules from the extension are not encoded in the grammar. Changes are: - The new group instructions don't require Group capability when the extension is declared. - The Reduce, InclusiveScan, ExclusiveScan normally require the Kernel capability, but don't when the extension is declared. Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/991
2017-11-24 19:18:17 +00:00
OpCapability Shader
OpCapability Linkage
)",
Remove using std::<foo> statements. (#1756) Many of the files have using std::<foo> statements in them, but then the use of <foo> will be inconsistently std::<foo> or <foo> scattered through the file. This CL removes all of the using statements and updates the code to have the required std:: prefix.
2018-08-01 18:58:12 +00:00
R"(
Fix validation of group ops in SPV_AMD_shader_ballot This needs custom code since the rules from the extension are not encoded in the grammar. Changes are: - The new group instructions don't require Group capability when the extension is declared. - The Reduce, InclusiveScan, ExclusiveScan normally require the Kernel capability, but don't when the extension is declared. Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/991
2017-11-24 19:18:17 +00:00
OpMemoryModel Logical GLSL450
%float = OpTypeFloat 32
%uint = OpTypeInt 32 0
%int = OpTypeInt 32 1
%scope = OpConstant %uint 3
%uint_const = OpConstant %uint 42
%int_const = OpConstant %uint 45
%float_const = OpConstant %float 3.5
%void = OpTypeVoid
%fn_ty = OpTypeFunction %void
%fn = OpFunction %void None %fn_ty
%entry = OpLabel
)"};
}
// Returns a list of SPIR-V assembly strings, where each uses only types
// and IDs that can fit with a shader made from parts from the result
// of ShaderPartsForAMDShaderBallot.
Remove using std::<foo> statements. (#1756) Many of the files have using std::<foo> statements in them, but then the use of <foo> will be inconsistently std::<foo> or <foo> scattered through the file. This CL removes all of the using statements and updates the code to have the required std:: prefix.
2018-08-01 18:58:12 +00:00
std::vector<std::string> AMDShaderBallotGroupInstructions() {
return std::vector<std::string>{
Support SPV_GOOGLE_decorate_string and SPV_GOOGLE_hlsl_functionality1 This commit add assembling, disassembling, and basic validation for two Google extensions to better support HLSL translation.
2018-03-05 18:34:13 +00:00
"%iadd_reduce = OpGroupIAddNonUniformAMD %uint %scope Reduce %uint_const",
"%iadd_iscan = OpGroupIAddNonUniformAMD %uint %scope InclusiveScan "
"%uint_const",
"%iadd_escan = OpGroupIAddNonUniformAMD %uint %scope ExclusiveScan "
"%uint_const",
"%fadd_reduce = OpGroupFAddNonUniformAMD %float %scope Reduce "
"%float_const",
"%fadd_iscan = OpGroupFAddNonUniformAMD %float %scope InclusiveScan "
"%float_const",
"%fadd_escan = OpGroupFAddNonUniformAMD %float %scope ExclusiveScan "
"%float_const",
"%fmin_reduce = OpGroupFMinNonUniformAMD %float %scope Reduce "
"%float_const",
"%fmin_iscan = OpGroupFMinNonUniformAMD %float %scope InclusiveScan "
"%float_const",
"%fmin_escan = OpGroupFMinNonUniformAMD %float %scope ExclusiveScan "
"%float_const",
"%umin_reduce = OpGroupUMinNonUniformAMD %uint %scope Reduce %uint_const",
"%umin_iscan = OpGroupUMinNonUniformAMD %uint %scope InclusiveScan "
"%uint_const",
"%umin_escan = OpGroupUMinNonUniformAMD %uint %scope ExclusiveScan "
"%uint_const",
"%smin_reduce = OpGroupUMinNonUniformAMD %int %scope Reduce %int_const",
"%smin_iscan = OpGroupUMinNonUniformAMD %int %scope InclusiveScan "
"%int_const",
"%smin_escan = OpGroupUMinNonUniformAMD %int %scope ExclusiveScan "
"%int_const",
"%fmax_reduce = OpGroupFMaxNonUniformAMD %float %scope Reduce "
"%float_const",
"%fmax_iscan = OpGroupFMaxNonUniformAMD %float %scope InclusiveScan "
"%float_const",
"%fmax_escan = OpGroupFMaxNonUniformAMD %float %scope ExclusiveScan "
"%float_const",
"%umax_reduce = OpGroupUMaxNonUniformAMD %uint %scope Reduce %uint_const",
"%umax_iscan = OpGroupUMaxNonUniformAMD %uint %scope InclusiveScan "
"%uint_const",
"%umax_escan = OpGroupUMaxNonUniformAMD %uint %scope ExclusiveScan "
"%uint_const",
"%smax_reduce = OpGroupUMaxNonUniformAMD %int %scope Reduce %int_const",
"%smax_iscan = OpGroupUMaxNonUniformAMD %int %scope InclusiveScan "
"%int_const",
"%smax_escan = OpGroupUMaxNonUniformAMD %int %scope ExclusiveScan "
"%int_const"};
Fix validation of group ops in SPV_AMD_shader_ballot This needs custom code since the rules from the extension are not encoded in the grammar. Changes are: - The new group instructions don't require Group capability when the extension is declared. - The Reduce, InclusiveScan, ExclusiveScan normally require the Kernel capability, but don't when the extension is declared. Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/991
2017-11-24 19:18:17 +00:00
}
TEST_P(ValidateAMDShaderBallotCapabilities, ExpectSuccess) {
// Succeed because the module specifies the SPV_AMD_shader_ballot extension.
auto parts = ShaderPartsForAMDShaderBallot();
Remove using std::<foo> statements. (#1756) Many of the files have using std::<foo> statements in them, but then the use of <foo> will be inconsistently std::<foo> or <foo> scattered through the file. This CL removes all of the using statements and updates the code to have the required std:: prefix.
2018-08-01 18:58:12 +00:00
const std::string assembly =
parts[0] + "OpExtension \"SPV_AMD_shader_ballot\"\n" + parts[1] +
GetParam() + "\nOpReturn OpFunctionEnd";
Fix validation of group ops in SPV_AMD_shader_ballot This needs custom code since the rules from the extension are not encoded in the grammar. Changes are: - The new group instructions don't require Group capability when the extension is declared. - The Reduce, InclusiveScan, ExclusiveScan normally require the Kernel capability, but don't when the extension is declared. Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/991
2017-11-24 19:18:17 +00:00
CompileSuccessfully(assembly.c_str());
EXPECT_EQ(SPV_SUCCESS, ValidateInstructions()) << getDiagnosticString();
}
Remove use of deprecated googletest macro (#2286) * Remove use of deprecated googletest macro INSTANTIATE_TEST_CASE_P has been deprecated. We need to use INSTANTIATE_TEST_SUITE_P instead. * Remove extra commas from test suites.
2019-01-29 23:56:52 +00:00
INSTANTIATE_TEST_SUITE_P(ExpectSuccess, ValidateAMDShaderBallotCapabilities,
ValuesIn(AMDShaderBallotGroupInstructions()));
Fix validation of group ops in SPV_AMD_shader_ballot This needs custom code since the rules from the extension are not encoded in the grammar. Changes are: - The new group instructions don't require Group capability when the extension is declared. - The Reduce, InclusiveScan, ExclusiveScan normally require the Kernel capability, but don't when the extension is declared. Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/991
2017-11-24 19:18:17 +00:00
TEST_P(ValidateAMDShaderBallotCapabilities, ExpectFailure) {
Support SPV_GOOGLE_decorate_string and SPV_GOOGLE_hlsl_functionality1 This commit add assembling, disassembling, and basic validation for two Google extensions to better support HLSL translation.
2018-03-05 18:34:13 +00:00
// Fail because the module does not specify the SPV_AMD_shader_ballot
// extension.
Fix validation of group ops in SPV_AMD_shader_ballot This needs custom code since the rules from the extension are not encoded in the grammar. Changes are: - The new group instructions don't require Group capability when the extension is declared. - The Reduce, InclusiveScan, ExclusiveScan normally require the Kernel capability, but don't when the extension is declared. Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/991
2017-11-24 19:18:17 +00:00
auto parts = ShaderPartsForAMDShaderBallot();
Remove using std::<foo> statements. (#1756) Many of the files have using std::<foo> statements in them, but then the use of <foo> will be inconsistently std::<foo> or <foo> scattered through the file. This CL removes all of the using statements and updates the code to have the required std:: prefix.
2018-08-01 18:58:12 +00:00
const std::string assembly =
Fix validation of group ops in SPV_AMD_shader_ballot This needs custom code since the rules from the extension are not encoded in the grammar. Changes are: - The new group instructions don't require Group capability when the extension is declared. - The Reduce, InclusiveScan, ExclusiveScan normally require the Kernel capability, but don't when the extension is declared. Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/991
2017-11-24 19:18:17 +00:00
parts[0] + parts[1] + GetParam() + "\nOpReturn OpFunctionEnd";
CompileSuccessfully(assembly.c_str());
EXPECT_EQ(SPV_ERROR_INVALID_CAPABILITY, ValidateInstructions());
// Make sure we get an appropriate error message.
// Find just the opcode name, skipping over the "Op" part.
auto prefix_with_opcode = GetParam().substr(GetParam().find("Group"));
auto opcode = prefix_with_opcode.substr(0, prefix_with_opcode.find(' '));
Remove using std::<foo> statements. (#1756) Many of the files have using std::<foo> statements in them, but then the use of <foo> will be inconsistently std::<foo> or <foo> scattered through the file. This CL removes all of the using statements and updates the code to have the required std:: prefix.
2018-08-01 18:58:12 +00:00
EXPECT_THAT(
getDiagnosticString(),
HasSubstr(std::string("Opcode " + opcode +
" requires one of these capabilities: Groups")));
Fix validation of group ops in SPV_AMD_shader_ballot This needs custom code since the rules from the extension are not encoded in the grammar. Changes are: - The new group instructions don't require Group capability when the extension is declared. - The Reduce, InclusiveScan, ExclusiveScan normally require the Kernel capability, but don't when the extension is declared. Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/991
2017-11-24 19:18:17 +00:00
}
Remove use of deprecated googletest macro (#2286) * Remove use of deprecated googletest macro INSTANTIATE_TEST_CASE_P has been deprecated. We need to use INSTANTIATE_TEST_SUITE_P instead. * Remove extra commas from test suites.
2019-01-29 23:56:52 +00:00
INSTANTIATE_TEST_SUITE_P(ExpectFailure, ValidateAMDShaderBallotCapabilities,
ValuesIn(AMDShaderBallotGroupInstructions()));
Fix validation of group ops in SPV_AMD_shader_ballot This needs custom code since the rules from the extension are not encoded in the grammar. Changes are: - The new group instructions don't require Group capability when the extension is declared. - The Reduce, InclusiveScan, ExclusiveScan normally require the Kernel capability, but don't when the extension is declared. Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/991
2017-11-24 19:18:17 +00:00
Stop asking for extensions if feature avaiable in core SPIR-V Migrating to unified grammar means we sometimes have two fields for a certain feature: version and extensions. It means the feature in question can be used either in SPIR-V of advanced-enough versions or in any SPIR-V with with the specified extensions. Validator now respects the above rules.
2018-03-27 18:07:11 +00:00
struct ExtIntoCoreCase {
const char* ext;
const char* cap;
const char* builtin;
spv_target_env env;
bool success;
};
using ValidateExtIntoCore = spvtest::ValidateBase<ExtIntoCoreCase>;
// Make sure that we don't panic about missing extensions for using
// functionalities that introduced in extensions but became core SPIR-V later.
TEST_P(ValidateExtIntoCore, DoNotAskForExtensionInLaterVersion) {
Remove using std::<foo> statements. (#1756) Many of the files have using std::<foo> statements in them, but then the use of <foo> will be inconsistently std::<foo> or <foo> scattered through the file. This CL removes all of the using statements and updates the code to have the required std:: prefix.
2018-08-01 18:58:12 +00:00
const std::string code = std::string(R"(
Stop asking for extensions if feature avaiable in core SPIR-V Migrating to unified grammar means we sometimes have two fields for a certain feature: version and extensions. It means the feature in question can be used either in SPIR-V of advanced-enough versions or in any SPIR-V with with the specified extensions. Validator now respects the above rules.
2018-03-27 18:07:11 +00:00
OpCapability Shader
OpCapability )") +
Remove using std::<foo> statements. (#1756) Many of the files have using std::<foo> statements in them, but then the use of <foo> will be inconsistently std::<foo> or <foo> scattered through the file. This CL removes all of the using statements and updates the code to have the required std:: prefix.
2018-08-01 18:58:12 +00:00
GetParam().cap + R"(
Stop asking for extensions if feature avaiable in core SPIR-V Migrating to unified grammar means we sometimes have two fields for a certain feature: version and extensions. It means the feature in question can be used either in SPIR-V of advanced-enough versions or in any SPIR-V with with the specified extensions. Validator now respects the above rules.
2018-03-27 18:07:11 +00:00
OpMemoryModel Logical GLSL450
OpEntryPoint Vertex %main "main" %builtin
OpDecorate %builtin BuiltIn )" + GetParam().builtin + R"(
%void = OpTypeVoid
%3 = OpTypeFunction %void
%int = OpTypeInt 32 1
%_ptr_Input_int = OpTypePointer Input %int
%builtin = OpVariable %_ptr_Input_int Input
%main = OpFunction %void None %3
%5 = OpLabel
%18 = OpLoad %int %builtin
OpReturn
OpFunctionEnd)";
CompileSuccessfully(code.c_str(), GetParam().env);
if (GetParam().success) {
Support SPIR-V 1.4 (#2550) * SPIR-V 1.4 headers, add SPV_ENV_UNIVERSAL_1_4 * Support --target-env spv1.4 in help for command line tools * Support asm/dis of UniformId decoration * Validate UniformId decoration * Fix version check on instructions and operands Also register decorations used with OpDecorateId * Extension lists can differ between enums that match Example: SubgroupMaskEq vs SubgroupMaskEqKHR * Validate scope value for Uniform decoration, for SPIR-V 1.4 * More unioning of exts * Preserve grammar order within an enum value * 1.4: Validate OpSelect over composites * Tools default to 1.4 * Add asm/dis test for OpCopyLogical * 1.4: asm/dis tests for PtrEqual, PtrNotEqual, PtrDiff * Basic asm/Dis test for OpCopyMemory * Test asm/dis OpCopyMemory with 2-memory access Add asm/dis tests for OpCopyMemorySized Requires grammar update to add second optional memory access operand to OpCopyMemory and OpCopyMemorySized * Validate one or two memory accesses on OpCopyMemory* * Check av/vis on CopyMemory source and target memory access This is a proposed rule. See https://gitlab.khronos.org/spirv/SPIR-V/issues/413 * Validate operation for OpSpecConstantOp * Validate NonWritable decoration Also permit NonWritable on members of UBO and SSBO. * SPIR-V 1.4: NonWrtiable can decorate Function and Private vars * Update optimizer CLI tests for SPIR-V 1.4 * Testing tools: Give expected SPIR-V version in message * SPIR-V 1.4 validation for entry point interfaces * Allow only unique interfaces * Allow all global variables * Check that all statically used global variables are listed * new tests * Add validation fixture CompileFailure * Add 1.4 validation for pointer comparisons * New tests * Validate with image operands SignExtend, ZeroExtend Since we don't actually know the image texel format, we can't fully validate. We need more context. But we can make sure we allow the new image operands in known-good cases. * Validate OpCopyLogical * Recursively checks subtypes * new tests * Add SPIR-V 1.4 tests for NoSignedWrap, NoUnsignedWrap * Allow scalar conditions in 1.4 with OpSelect * Allows scalar conditions with vector operands * new tests * Validate uniform id scope as an execution scope * Validate the values of memory and execution scopes are valid scope values * new test * Remove SPIR-V 1.4 Vulkan 1.0 environment * SPIR-V 1.4 requires Vulkan 1.1 * FIX: include string for spvLog * FIX: validate nonwritable * FIX: test case suite for member decorate string * FIX: test case for hlsl functionality1 * Validation test fixture: ease debugging * Use binary version for SPIR-V 1.4 specific features * Switch checks based on the SPIR-V version from the target environment to instead use the version from the binary * Moved header parsing into the ValidationState_t constructor (where version based features are set) * Added new versions of tests that assemble a 1.3 binary and validate a 1.4 environment * Fix test for update to SPIR-V 1.4 headers * Fix formatting * Ext inst lookup: Add Vulkan 1.1 env with SPIR-V 1.4 * Update spirv-val help * Operand version checks should use module version Use the module version instead of the target environment version. * Fix comment about two-access form of OpCopyMemory
2019-05-07 16:27:18 +00:00
ASSERT_EQ(SPV_SUCCESS, ValidateInstructions(GetParam().env))
<< getDiagnosticString();
Stop asking for extensions if feature avaiable in core SPIR-V Migrating to unified grammar means we sometimes have two fields for a certain feature: version and extensions. It means the feature in question can be used either in SPIR-V of advanced-enough versions or in any SPIR-V with with the specified extensions. Validator now respects the above rules.
2018-03-27 18:07:11 +00:00
} else {
Support SPIR-V 1.4 (#2550) * SPIR-V 1.4 headers, add SPV_ENV_UNIVERSAL_1_4 * Support --target-env spv1.4 in help for command line tools * Support asm/dis of UniformId decoration * Validate UniformId decoration * Fix version check on instructions and operands Also register decorations used with OpDecorateId * Extension lists can differ between enums that match Example: SubgroupMaskEq vs SubgroupMaskEqKHR * Validate scope value for Uniform decoration, for SPIR-V 1.4 * More unioning of exts * Preserve grammar order within an enum value * 1.4: Validate OpSelect over composites * Tools default to 1.4 * Add asm/dis test for OpCopyLogical * 1.4: asm/dis tests for PtrEqual, PtrNotEqual, PtrDiff * Basic asm/Dis test for OpCopyMemory * Test asm/dis OpCopyMemory with 2-memory access Add asm/dis tests for OpCopyMemorySized Requires grammar update to add second optional memory access operand to OpCopyMemory and OpCopyMemorySized * Validate one or two memory accesses on OpCopyMemory* * Check av/vis on CopyMemory source and target memory access This is a proposed rule. See https://gitlab.khronos.org/spirv/SPIR-V/issues/413 * Validate operation for OpSpecConstantOp * Validate NonWritable decoration Also permit NonWritable on members of UBO and SSBO. * SPIR-V 1.4: NonWrtiable can decorate Function and Private vars * Update optimizer CLI tests for SPIR-V 1.4 * Testing tools: Give expected SPIR-V version in message * SPIR-V 1.4 validation for entry point interfaces * Allow only unique interfaces * Allow all global variables * Check that all statically used global variables are listed * new tests * Add validation fixture CompileFailure * Add 1.4 validation for pointer comparisons * New tests * Validate with image operands SignExtend, ZeroExtend Since we don't actually know the image texel format, we can't fully validate. We need more context. But we can make sure we allow the new image operands in known-good cases. * Validate OpCopyLogical * Recursively checks subtypes * new tests * Add SPIR-V 1.4 tests for NoSignedWrap, NoUnsignedWrap * Allow scalar conditions in 1.4 with OpSelect * Allows scalar conditions with vector operands * new tests * Validate uniform id scope as an execution scope * Validate the values of memory and execution scopes are valid scope values * new test * Remove SPIR-V 1.4 Vulkan 1.0 environment * SPIR-V 1.4 requires Vulkan 1.1 * FIX: include string for spvLog * FIX: validate nonwritable * FIX: test case suite for member decorate string * FIX: test case for hlsl functionality1 * Validation test fixture: ease debugging * Use binary version for SPIR-V 1.4 specific features * Switch checks based on the SPIR-V version from the target environment to instead use the version from the binary * Moved header parsing into the ValidationState_t constructor (where version based features are set) * Added new versions of tests that assemble a 1.3 binary and validate a 1.4 environment * Fix test for update to SPIR-V 1.4 headers * Fix formatting * Ext inst lookup: Add Vulkan 1.1 env with SPIR-V 1.4 * Update spirv-val help * Operand version checks should use module version Use the module version instead of the target environment version. * Fix comment about two-access form of OpCopyMemory
2019-05-07 16:27:18 +00:00
ASSERT_NE(SPV_SUCCESS, ValidateInstructions(GetParam().env))
<< " in " << spvTargetEnvDescription(GetParam().env) << ":\n"
<< code;
Remove using std::<foo> statements. (#1756) Many of the files have using std::<foo> statements in them, but then the use of <foo> will be inconsistently std::<foo> or <foo> scattered through the file. This CL removes all of the using statements and updates the code to have the required std:: prefix.
2018-08-01 18:58:12 +00:00
const std::string message = getDiagnosticString();
Stop asking for extensions if feature avaiable in core SPIR-V Migrating to unified grammar means we sometimes have two fields for a certain feature: version and extensions. It means the feature in question can be used either in SPIR-V of advanced-enough versions or in any SPIR-V with with the specified extensions. Validator now respects the above rules.
2018-03-27 18:07:11 +00:00
if (spvIsVulkanEnv(GetParam().env)) {
Remove using std::<foo> statements. (#1756) Many of the files have using std::<foo> statements in them, but then the use of <foo> will be inconsistently std::<foo> or <foo> scattered through the file. This CL removes all of the using statements and updates the code to have the required std:: prefix.
2018-08-01 18:58:12 +00:00
EXPECT_THAT(message, HasSubstr(std::string(GetParam().cap) +
Stop asking for extensions if feature avaiable in core SPIR-V Migrating to unified grammar means we sometimes have two fields for a certain feature: version and extensions. It means the feature in question can be used either in SPIR-V of advanced-enough versions or in any SPIR-V with with the specified extensions. Validator now respects the above rules.
2018-03-27 18:07:11 +00:00
" is not allowed by Vulkan"));
Remove using std::<foo> statements. (#1756) Many of the files have using std::<foo> statements in them, but then the use of <foo> will be inconsistently std::<foo> or <foo> scattered through the file. This CL removes all of the using statements and updates the code to have the required std:: prefix.
2018-08-01 18:58:12 +00:00
EXPECT_THAT(message, HasSubstr(std::string("or requires extension")));
Stop asking for extensions if feature avaiable in core SPIR-V Migrating to unified grammar means we sometimes have two fields for a certain feature: version and extensions. It means the feature in question can be used either in SPIR-V of advanced-enough versions or in any SPIR-V with with the specified extensions. Validator now respects the above rules.
2018-03-27 18:07:11 +00:00
} else {
EXPECT_THAT(message,
Remove using std::<foo> statements. (#1756) Many of the files have using std::<foo> statements in them, but then the use of <foo> will be inconsistently std::<foo> or <foo> scattered through the file. This CL removes all of the using statements and updates the code to have the required std:: prefix.
2018-08-01 18:58:12 +00:00
HasSubstr(std::string("requires one of these extensions: ") +
Stop asking for extensions if feature avaiable in core SPIR-V Migrating to unified grammar means we sometimes have two fields for a certain feature: version and extensions. It means the feature in question can be used either in SPIR-V of advanced-enough versions or in any SPIR-V with with the specified extensions. Validator now respects the above rules.
2018-03-27 18:07:11 +00:00
GetParam().ext));
}
}
}
// clang-format off
Remove use of deprecated googletest macro (#2286) * Remove use of deprecated googletest macro INSTANTIATE_TEST_CASE_P has been deprecated. We need to use INSTANTIATE_TEST_SUITE_P instead. * Remove extra commas from test suites.
2019-01-29 23:56:52 +00:00
INSTANTIATE_TEST_SUITE_P(
Stop asking for extensions if feature avaiable in core SPIR-V Migrating to unified grammar means we sometimes have two fields for a certain feature: version and extensions. It means the feature in question can be used either in SPIR-V of advanced-enough versions or in any SPIR-V with with the specified extensions. Validator now respects the above rules.
2018-03-27 18:07:11 +00:00
KHR_extensions, ValidateExtIntoCore,
ValuesIn(std::vector<ExtIntoCoreCase>{
// SPV_KHR_shader_draw_parameters became core SPIR-V 1.3
{"SPV_KHR_shader_draw_parameters", "DrawParameters", "BaseVertex", SPV_ENV_UNIVERSAL_1_3, true},
{"SPV_KHR_shader_draw_parameters", "DrawParameters", "BaseVertex", SPV_ENV_UNIVERSAL_1_2, false},
{"SPV_KHR_shader_draw_parameters", "DrawParameters", "BaseVertex", SPV_ENV_UNIVERSAL_1_1, false},
{"SPV_KHR_shader_draw_parameters", "DrawParameters", "BaseVertex", SPV_ENV_UNIVERSAL_1_0, false},
{"SPV_KHR_shader_draw_parameters", "DrawParameters", "BaseVertex", SPV_ENV_VULKAN_1_1, true},
{"SPV_KHR_shader_draw_parameters", "DrawParameters", "BaseVertex", SPV_ENV_VULKAN_1_0, false},
{"SPV_KHR_shader_draw_parameters", "DrawParameters", "BaseInstance", SPV_ENV_UNIVERSAL_1_3, true},
{"SPV_KHR_shader_draw_parameters", "DrawParameters", "BaseInstance", SPV_ENV_VULKAN_1_0, false},
{"SPV_KHR_shader_draw_parameters", "DrawParameters", "DrawIndex", SPV_ENV_UNIVERSAL_1_3, true},
{"SPV_KHR_shader_draw_parameters", "DrawParameters", "DrawIndex", SPV_ENV_UNIVERSAL_1_1, false},
// SPV_KHR_multiview became core SPIR-V 1.3
{"SPV_KHR_multiview", "MultiView", "ViewIndex", SPV_ENV_UNIVERSAL_1_3, true},
{"SPV_KHR_multiview", "MultiView", "ViewIndex", SPV_ENV_UNIVERSAL_1_2, false},
{"SPV_KHR_multiview", "MultiView", "ViewIndex", SPV_ENV_UNIVERSAL_1_1, false},
{"SPV_KHR_multiview", "MultiView", "ViewIndex", SPV_ENV_UNIVERSAL_1_0, false},
{"SPV_KHR_multiview", "MultiView", "ViewIndex", SPV_ENV_VULKAN_1_1, true},
{"SPV_KHR_multiview", "MultiView", "ViewIndex", SPV_ENV_VULKAN_1_0, false},
// SPV_KHR_device_group became core SPIR-V 1.3
{"SPV_KHR_device_group", "DeviceGroup", "DeviceIndex", SPV_ENV_UNIVERSAL_1_3, true},
{"SPV_KHR_device_group", "DeviceGroup", "DeviceIndex", SPV_ENV_UNIVERSAL_1_2, false},
{"SPV_KHR_device_group", "DeviceGroup", "DeviceIndex", SPV_ENV_UNIVERSAL_1_1, false},
{"SPV_KHR_device_group", "DeviceGroup", "DeviceIndex", SPV_ENV_UNIVERSAL_1_0, false},
{"SPV_KHR_device_group", "DeviceGroup", "DeviceIndex", SPV_ENV_VULKAN_1_1, true},
{"SPV_KHR_device_group", "DeviceGroup", "DeviceIndex", SPV_ENV_VULKAN_1_0, false},
}));
// clang-format on
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
Move tests into namespaces (#1689) This CL moves the test into namespaces based on their directories.
2018-07-11 13:24:49 +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