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] Simplify null composites 

Use the shortcut for zero-values: a type constructor without
any parameters.  Scalars still use plain literals like false, 1u, 1.0.

Change-Id: Ie436f1af28cbab0b4c87a07b057deb04632eb534
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/23680
Reviewed-by: dan sinclair <dsinclair@google.com>
This commit is contained in:
David Neto 2020-06-22 23:15:52 +00:00 committed by dan sinclair
parent 13d2a3b96c
commit 1ca5382749
4 changed files with 4 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/reader/spirv/function_misc_test.cc
View File

@ -135,8 +135,6 @@ TEST_F(SpvParserTestMiscInstruction, OpUndef_InFunction_Vector) {
{ {
TypeConstructor{ TypeConstructor{
__vec_2__u32 __vec_2__u32
ScalarConstructor{0}
ScalarConstructor{0}
} }
} }
} }
@ -149,8 +147,6 @@ VariableDeclStatement{
{ {
TypeConstructor{ TypeConstructor{
__vec_2__i32 __vec_2__i32
ScalarConstructor{0}
ScalarConstructor{0}
} }
} }
} }
@ -163,8 +159,6 @@ VariableDeclStatement{
{ {
TypeConstructor{ TypeConstructor{
__vec_2__f32 __vec_2__f32
ScalarConstructor{0.000000}
ScalarConstructor{0.000000}
} }
} }
} }
@ -195,16 +189,6 @@ TEST_F(SpvParserTestMiscInstruction, OpUndef_InFunction_Matrix) {
{ {
TypeConstructor{ TypeConstructor{
__mat_2_2__f32 __mat_2_2__f32
TypeConstructor{
__vec_2__f32
ScalarConstructor{0.000000}
ScalarConstructor{0.000000}
}
TypeConstructor{
__vec_2__f32
ScalarConstructor{0.000000}
ScalarConstructor{0.000000}
}
} }
} }
} }
@ -236,8 +220,6 @@ TEST_F(SpvParserTestMiscInstruction, OpUndef_InFunction_Array) {
{ {
TypeConstructor{ TypeConstructor{
__array__u32_2 __array__u32_2
ScalarConstructor{0}
ScalarConstructor{0}
} }
} }
} }
@ -268,10 +250,6 @@ TEST_F(SpvParserTestMiscInstruction, OpUndef_InFunction_Struct) {
{ {
TypeConstructor{ TypeConstructor{
__alias_S__struct_S __alias_S__struct_S
ScalarConstructor{false}
ScalarConstructor{0}
ScalarConstructor{0}
ScalarConstructor{0.000000}
} }
} }
} }

11
src/reader/spirv/function_var_test.cc
View File

@ -492,8 +492,6 @@ TEST_F(SpvParserTest, EmitFunctionVariables_ArrayInitializer_Null) {
{ {
TypeConstructor{ TypeConstructor{
__array__u32_2 __array__u32_2
ScalarConstructor{0}
ScalarConstructor{0}
} }
} }
} }
@ -526,8 +524,6 @@ TEST_F(SpvParserTest, EmitFunctionVariables_ArrayInitializer_AliasType_Null) {
{ {
TypeConstructor{ TypeConstructor{
__alias_Arr__array__u32_2_16 __alias_Arr__array__u32_2_16
ScalarConstructor{0}
ScalarConstructor{0}
} }
} }
} }
@ -599,13 +595,6 @@ TEST_F(SpvParserTest, EmitFunctionVariables_StructInitializer_Null) {
{ {
TypeConstructor{ TypeConstructor{
__alias_S__struct_S __alias_S__struct_S
ScalarConstructor{0}
ScalarConstructor{0.000000}
TypeConstructor{
__array__u32_2
ScalarConstructor{0}
ScalarConstructor{0}
}
} }
} }
} }

46
src/reader/spirv/parser_impl.cc
View File

@ -38,6 +38,7 @@
#include "src/ast/bool_literal.h" #include "src/ast/bool_literal.h"
#include "src/ast/builtin_decoration.h" #include "src/ast/builtin_decoration.h"
#include "src/ast/decorated_variable.h" #include "src/ast/decorated_variable.h"
#include "src/ast/expression.h"
#include "src/ast/float_literal.h" #include "src/ast/float_literal.h"
#include "src/ast/scalar_constructor_expression.h" #include "src/ast/scalar_constructor_expression.h"
#include "src/ast/sint_literal.h" #include "src/ast/sint_literal.h"
@ -969,10 +970,6 @@ TypedExpression ParserImpl::MakeConstantExpression(uint32_t id) {
std::unique_ptr<ast::Expression> ParserImpl::MakeNullValue( std::unique_ptr<ast::Expression> ParserImpl::MakeNullValue(
ast::type::Type* type) { ast::type::Type* type) {
// TODO(dneto): Use the no-operands constructor syntax when it becomes
// available in Tint.
// https://github.com/gpuweb/gpuweb/issues/685
// https://bugs.chromium.org/p/tint/issues/detail?id=34
if (!type) { if (!type) {
Fail() << "trying to create null value for a null type"; Fail() << "trying to create null value for a null type";
@ -998,45 +995,10 @@ std::unique_ptr<ast::Expression> ParserImpl::MakeNullValue(
return std::make_unique<ast::ScalarConstructorExpression>( return std::make_unique<ast::ScalarConstructorExpression>(
std::make_unique<ast::FloatLiteral>(type, 0.0f)); std::make_unique<ast::FloatLiteral>(type, 0.0f));
} }
if (type->IsVector()) { if (type->IsVector() || type->IsMatrix() || type->IsArray() ||
const auto* vec_ty = type->AsVector(); type->IsStruct()) {
ast::ExpressionList ast_components;
for (size_t i = 0; i < vec_ty->size(); ++i) {
ast_components.emplace_back(MakeNullValue(vec_ty->type()));
}
return std::make_unique<ast::TypeConstructorExpression>( return std::make_unique<ast::TypeConstructorExpression>(
type, std::move(ast_components)); original_type, ast::ExpressionList{});
}
if (type->IsMatrix()) {
const auto* mat_ty = type->AsMatrix();
// Matrix components are columns
auto* column_ty =
ctx_.type_mgr().Get(std::make_unique<ast::type::VectorType>(
mat_ty->type(), mat_ty->rows()));
ast::ExpressionList ast_components;
for (size_t i = 0; i < mat_ty->columns(); ++i) {
ast_components.emplace_back(MakeNullValue(column_ty));
}
return std::make_unique<ast::TypeConstructorExpression>(
type, std::move(ast_components));
}
if (type->IsArray()) {
auto* arr_ty = type->AsArray();
ast::ExpressionList ast_components;
for (size_t i = 0; i < arr_ty->size(); ++i) {
ast_components.emplace_back(MakeNullValue(arr_ty->type()));
}
return std::make_unique<ast::TypeConstructorExpression>(
original_type, std::move(ast_components));
}
if (type->IsStruct()) {
auto* struct_ty = type->AsStruct();
ast::ExpressionList ast_components;
for (auto& member : struct_ty->impl()->members()) {
ast_components.emplace_back(MakeNullValue(member->type()));
}
return std::make_unique<ast::TypeConstructorExpression>(
original_type, std::move(ast_components));
} }
Fail() << "can't make null value for type: " << type->type_name(); Fail() << "can't make null value for type: " << type->type_name();
return nullptr; return nullptr;

64
src/reader/spirv/parser_impl_module_var_test.cc
View File

@ -382,8 +382,6 @@ TEST_F(SpvParserTest, ModuleScopeVar_VectorBoolNullInitializer) {
{ {
TypeConstructor{ TypeConstructor{
__vec_2__bool __vec_2__bool
ScalarConstructor{false}
ScalarConstructor{false}
} }
} }
})")); })"));
@ -405,8 +403,6 @@ TEST_F(SpvParserTest, ModuleScopeVar_VectorBoolUndefInitializer) {
{ {
TypeConstructor{ TypeConstructor{
__vec_2__bool __vec_2__bool
ScalarConstructor{false}
ScalarConstructor{false}
} }
} }
})")); })"));
@ -428,8 +424,6 @@ TEST_F(SpvParserTest, ModuleScopeVar_VectorUintNullInitializer) {
{ {
TypeConstructor{ TypeConstructor{
__vec_2__u32 __vec_2__u32
ScalarConstructor{0}
ScalarConstructor{0}
} }
} }
})")); })"));
@ -451,8 +445,6 @@ TEST_F(SpvParserTest, ModuleScopeVar_VectorUintUndefInitializer) {
{ {
TypeConstructor{ TypeConstructor{
__vec_2__u32 __vec_2__u32
ScalarConstructor{0}
ScalarConstructor{0}
} }
} }
})")); })"));
@ -474,8 +466,6 @@ TEST_F(SpvParserTest, ModuleScopeVar_VectorIntNullInitializer) {
{ {
TypeConstructor{ TypeConstructor{
__vec_2__i32 __vec_2__i32
ScalarConstructor{0}
ScalarConstructor{0}
} }
} }
})")); })"));
@ -497,8 +487,6 @@ TEST_F(SpvParserTest, ModuleScopeVar_VectorIntUndefInitializer) {
{ {
TypeConstructor{ TypeConstructor{
__vec_2__i32 __vec_2__i32
ScalarConstructor{0}
ScalarConstructor{0}
} }
} }
})")); })"));
@ -520,8 +508,6 @@ TEST_F(SpvParserTest, ModuleScopeVar_VectorFloatNullInitializer) {
{ {
TypeConstructor{ TypeConstructor{
__vec_2__f32 __vec_2__f32
ScalarConstructor{0.000000}
ScalarConstructor{0.000000}
} }
} }
})")); })"));
@ -543,8 +529,6 @@ TEST_F(SpvParserTest, ModuleScopeVar_VectorFloatUndefInitializer) {
{ {
TypeConstructor{ TypeConstructor{
__vec_2__f32 __vec_2__f32
ScalarConstructor{0.000000}
ScalarConstructor{0.000000}
} }
} }
})")); })"));
@ -608,21 +592,6 @@ TEST_F(SpvParserTest, ModuleScopeVar_MatrixNullInitializer) {
{ {
TypeConstructor{ TypeConstructor{
__mat_2_3__f32 __mat_2_3__f32
TypeConstructor{
__vec_2__f32
ScalarConstructor{0.000000}
ScalarConstructor{0.000000}
}
TypeConstructor{
__vec_2__f32
ScalarConstructor{0.000000}
ScalarConstructor{0.000000}
}
TypeConstructor{
__vec_2__f32
ScalarConstructor{0.000000}
ScalarConstructor{0.000000}
}
} }
} }
})")); })"));
@ -644,21 +613,6 @@ TEST_F(SpvParserTest, ModuleScopeVar_MatrixUndefInitializer) {
{ {
TypeConstructor{ TypeConstructor{
__mat_2_3__f32 __mat_2_3__f32
TypeConstructor{
__vec_2__f32
ScalarConstructor{0.000000}
ScalarConstructor{0.000000}
}
TypeConstructor{
__vec_2__f32
ScalarConstructor{0.000000}
ScalarConstructor{0.000000}
}
TypeConstructor{
__vec_2__f32
ScalarConstructor{0.000000}
ScalarConstructor{0.000000}
}
} }
} }
})")); })"));
@ -704,8 +658,6 @@ TEST_F(SpvParserTest, ModuleScopeVar_ArrayNullInitializer) {
{ {
TypeConstructor{ TypeConstructor{
__array__u32_2 __array__u32_2
ScalarConstructor{0}
ScalarConstructor{0}
} }
} }
})")); })"));
@ -727,8 +679,6 @@ TEST_F(SpvParserTest, ModuleScopeVar_ArrayUndefInitializer) {
{ {
TypeConstructor{ TypeConstructor{
__array__u32_2 __array__u32_2
ScalarConstructor{0}
ScalarConstructor{0}
} }
} }
})")); })"));
@ -781,13 +731,6 @@ TEST_F(SpvParserTest, ModuleScopeVar_StructNullInitializer) {
{ {
TypeConstructor{ TypeConstructor{
__alias_S__struct_S __alias_S__struct_S
ScalarConstructor{0}
ScalarConstructor{0.000000}
TypeConstructor{
__array__u32_2
ScalarConstructor{0}
ScalarConstructor{0}
}
} }
} }
})")) })"))
@ -810,13 +753,6 @@ TEST_F(SpvParserTest, ModuleScopeVar_StructUndefInitializer) {
{ {
TypeConstructor{ TypeConstructor{
__alias_S__struct_S __alias_S__struct_S
ScalarConstructor{0}
ScalarConstructor{0.000000}
TypeConstructor{
__array__u32_2
ScalarConstructor{0}
ScalarConstructor{0}
}
} }
} }
})")) })"))