encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spirv-reader: handle tests SPIR-V validity, part 4 

Bug: tint:765
Change-Id: I6c25ed2c9d40d686e75517815b9d31d544d913ba
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/50424
Commit-Queue: David Neto <dneto@google.com>
Reviewed-by: Alan Baker <alanbaker@google.com>
This commit is contained in:
David Neto 2021-05-11 03:43:43 +00:00 committed by Commit Bot service account
parent b7b30b7598
commit 2e80c83d7b
1 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/reader/spirv/parser_impl_handle_test.cc
View File

@ -392,6 +392,9 @@ TEST_F(SpvParserHandleTest,
ASSERT_TRUE(image != nullptr); ASSERT_TRUE(image != nullptr);
EXPECT_EQ(image->result_id(), 20u); EXPECT_EQ(image->result_id(), 20u);
// Variable pointers is not allowed for WGSL. So don't dump it.
p->DeliberatelyInvalidSpirv();
} }
TEST_F(SpvParserHandleTest, TEST_F(SpvParserHandleTest,
@ -429,6 +432,9 @@ TEST_F(SpvParserHandleTest,
ASSERT_TRUE(image != nullptr); ASSERT_TRUE(image != nullptr);
EXPECT_EQ(image->result_id(), 20u); EXPECT_EQ(image->result_id(), 20u);
// Variable pointers is not allowed for WGSL. So don't dump it.
p->DeliberatelyInvalidSpirv();
} }
TEST_F(SpvParserHandleTest, TEST_F(SpvParserHandleTest,
@ -685,6 +691,9 @@ TEST_F(SpvParserHandleTest,
ASSERT_TRUE(image != nullptr); ASSERT_TRUE(image != nullptr);
EXPECT_EQ(image->result_id(), 20u); EXPECT_EQ(image->result_id(), 20u);
// Variable pointers is not allowed for WGSL. So don't dump it.
p->DeliberatelyInvalidSpirv();
} }
TEST_F(SpvParserHandleTest, TEST_F(SpvParserHandleTest,
@ -720,6 +729,9 @@ TEST_F(SpvParserHandleTest,
ASSERT_TRUE(image != nullptr); ASSERT_TRUE(image != nullptr);
EXPECT_EQ(image->result_id(), 20u); EXPECT_EQ(image->result_id(), 20u);
// Variable pointers is not allowed for WGSL. So don't dump it.
p->DeliberatelyInvalidSpirv();
} }
TEST_F(SpvParserHandleTest, TEST_F(SpvParserHandleTest,
@ -865,6 +877,7 @@ TEST_P(SpvParserHandleTest_RegisterHandleUsage_SampledImage, Variable) {
CommonTypes() + R"( CommonTypes() + R"(
%si_ty = OpTypeSampledImage %f_texture_2d %si_ty = OpTypeSampledImage %f_texture_2d
%coords = OpConstantNull %v2float %coords = OpConstantNull %v2float
%coords3d = OpConstantNull %v3float ; needed for Proj variants
%10 = OpVariable %ptr_sampler UniformConstant %10 = OpVariable %ptr_sampler UniformConstant
%20 = OpVariable %ptr_f_texture_2d UniformConstant %20 = OpVariable %ptr_f_texture_2d UniformConstant
@ -897,6 +910,7 @@ TEST_P(SpvParserHandleTest_RegisterHandleUsage_SampledImage, FunctionParam) {
%f_ty = OpTypeFunction %void %ptr_sampler %ptr_f_texture_2d %f_ty = OpTypeFunction %void %ptr_sampler %ptr_f_texture_2d
%si_ty = OpTypeSampledImage %f_texture_2d %si_ty = OpTypeSampledImage %f_texture_2d
%coords = OpConstantNull %v2float %coords = OpConstantNull %v2float
%coords3d = OpConstantNull %v3float ; needed for Proj variants
%component = OpConstant %uint 1 %component = OpConstant %uint 1
%10 = OpVariable %ptr_sampler UniformConstant %10 = OpVariable %ptr_sampler UniformConstant
@ -937,16 +951,8 @@ INSTANTIATE_TEST_SUITE_P(
SpvParserHandleTest_RegisterHandleUsage_SampledImage, SpvParserHandleTest_RegisterHandleUsage_SampledImage,
::testing::Values( ::testing::Values(
// OpImageGather // TODO(dneto): OpImageGather
UsageImageAccessCase{"%result = OpImageGather " // TODO(dneto): OpImageDrefGather
"%v4float %sampled_image %coords %uint_1",
"Usage(Sampler( ))",
"Usage(Texture( is_sampled ))"},
// OpImageDrefGather
UsageImageAccessCase{"%result = OpImageDrefGather "
"%v4float %sampled_image %coords %depth",
"Usage(Sampler( comparison ))",
"Usage(Texture( is_sampled depth ))"},
// Sample the texture. // Sample the texture.
@ -977,23 +983,23 @@ INSTANTIATE_TEST_SUITE_P(
// OpImageSampleProjImplicitLod // OpImageSampleProjImplicitLod
UsageImageAccessCase{"%result = OpImageSampleProjImplicitLod " UsageImageAccessCase{"%result = OpImageSampleProjImplicitLod "
"%v4float %sampled_image %coords", "%v4float %sampled_image %coords3d",
"Usage(Sampler( ))", "Usage(Sampler( ))",
"Usage(Texture( is_sampled ))"}, "Usage(Texture( is_sampled ))"},
// OpImageSampleProjExplicitLod // OpImageSampleProjExplicitLod
UsageImageAccessCase{"%result = OpImageSampleProjExplicitLod " UsageImageAccessCase{
"%v4float %sampled_image %coords Lod %float_null", "%result = OpImageSampleProjExplicitLod "
"Usage(Sampler( ))", "%v4float %sampled_image %coords3d Lod %float_null",
"Usage(Texture( is_sampled ))"}, "Usage(Sampler( ))", "Usage(Texture( is_sampled ))"},
// OpImageSampleProjDrefImplicitLod // OpImageSampleProjDrefImplicitLod
UsageImageAccessCase{"%result = OpImageSampleProjDrefImplicitLod " UsageImageAccessCase{"%result = OpImageSampleProjDrefImplicitLod "
"%float %sampled_image %coords %depth", "%float %sampled_image %coords3d %depth",
"Usage(Sampler( comparison ))", "Usage(Sampler( comparison ))",
"Usage(Texture( is_sampled depth ))"}, "Usage(Texture( is_sampled depth ))"},
// OpImageSampleProjDrefExplicitLod // OpImageSampleProjDrefExplicitLod
UsageImageAccessCase{ UsageImageAccessCase{
"%result = OpImageSampleProjDrefExplicitLod " "%result = OpImageSampleProjDrefExplicitLod "
"%float %sampled_image %coords %depth Lod %float_null", "%float %sampled_image %coords3d %depth Lod %float_null",
"Usage(Sampler( comparison ))", "Usage(Sampler( comparison ))",
"Usage(Texture( is_sampled depth ))"}, "Usage(Texture( is_sampled depth ))"},
@ -1101,7 +1107,7 @@ INSTANTIATE_TEST_SUITE_P(
// OpImageFetch // OpImageFetch
UsageRawImageCase{"f_texture_1d", UsageRawImageCase{"f_texture_1d",
"%result = OpImageFetch " "%result = OpImageFetch "
"%v4float %im %float_null", "%v4float %im %uint_0",
"Usage(Texture( is_sampled ))"}, "Usage(Texture( is_sampled ))"},
// Image queries // Image queries
@ -4285,8 +4291,12 @@ INSTANTIATE_TEST_SUITE_P(
// There is no 3D array // There is no 3D array
// Cube array // Cube array
//
// Currently textureDimension on cube returns vec3 but maybe should
// return vec2
// https://github.com/gpuweb/gpuweb/issues/1345
{"%float Cube 0 1 0 1 Unknown", {"%float Cube 0 1 0 1 Unknown",
"%99 = OpImageQuerySizeLod %v4int %im %i1\n", "%99 = OpImageQuerySizeLod %v3int %im %i1\n",
R"(Variable{ R"(Variable{
Decorations{ Decorations{
GroupDecoration{2} GroupDecoration{2}
@ -4300,10 +4310,10 @@ INSTANTIATE_TEST_SUITE_P(
VariableConst{ VariableConst{
x_99 x_99
none none
__vec_4__i32 __vec_3__i32
{ {
TypeConstructor[not set]{ TypeConstructor[not set]{
__vec_4__i32 __vec_3__i32
Call[not set]{ Call[not set]{
Identifier[not set]{textureDimensions} Identifier[not set]{textureDimensions}
( (
@ -4361,8 +4371,12 @@ INSTANTIATE_TEST_SUITE_P(
})"}, })"},
// Depth Cube Array // Depth Cube Array
//
// Currently textureDimension on cube returns vec3 but maybe should
// return vec2
// https://github.com/gpuweb/gpuweb/issues/1345
{"%float Cube 1 1 0 1 Unknown", {"%float Cube 1 1 0 1 Unknown",
"%99 = OpImageQuerySizeLod %v4int %im %i1\n", "%99 = OpImageQuerySizeLod %v3int %im %i1\n",
R"(Variable{ R"(Variable{
Decorations{ Decorations{
GroupDecoration{2} GroupDecoration{2}
@ -4376,10 +4390,10 @@ INSTANTIATE_TEST_SUITE_P(
VariableConst{ VariableConst{
x_99 x_99
none none
__vec_4__i32 __vec_3__i32
{ {
TypeConstructor[not set]{ TypeConstructor[not set]{
__vec_4__i32 __vec_3__i32
Call[not set]{ Call[not set]{
Identifier[not set]{textureDimensions} Identifier[not set]{textureDimensions}
( (