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

tint::ProgramBuilder: Simplify variable constructors 

Expand the Option argument paradigm to:
* Remove the requirement to always pass a 'type' parameter. Type inferencing is the easier, and increasingly common way to declare a variable, so this prevents a whole lot of `nullptr` smell which negatively impacts readability.
* Accept attributes directly as arguments, removing the `utils::Vector{ ... }` smell.

Rename `ProgramBuilder::VarOptionals` to `VarOptions`, and add equivalent `LetOptions`, `ConstOptions` and `OverrideOptions`.

Clean up all the calls to `Var()`, `Let()`, `Const()` and `Override()`:
* Use the `Group()` and `Binding()` helpers where possible
* Removing `nullptr` type arguments
* Replace attribute vectors with the list of attributes.
* Remove already-defaulted `ast::StorageClass::kNone` arguments.
* Remove already-defaulted `ast::Access::kUndefined` arguments.

Finally, remove the `GroupAndBinding()` helper, which only existed because you needed to pass attributes as a vector.

Change-Id: I8890e4eb0ffac9f9df2207b28a6f02a163e34d96
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/99580
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
Commit-Queue: Ben Clayton <bclayton@chromium.org>
This commit is contained in:
Ben Clayton 2022-08-19 17:28:53 +00:00 committed by Dawn LUCI CQ
parent fa289d3a83
commit 58794ae118
113 changed files with 1659 additions and 2455 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tint/ast/override_test.cc
View File

@ -22,12 +22,12 @@ namespace {
using OverrideTest = TestHelper; using OverrideTest = TestHelper;
TEST_F(OverrideTest, Identifier_NoId) { TEST_F(OverrideTest, Identifier_NoId) {
auto* o = Override("o", nullptr, Expr(f32(1.0))); auto* o = Override("o", Expr(f32(1.0)));
EXPECT_EQ(std::string("o"), o->Identifier(Symbols())); EXPECT_EQ(std::string("o"), o->Identifier(Symbols()));
} }
TEST_F(OverrideTest, Identifier_WithId) { TEST_F(OverrideTest, Identifier_WithId) {
auto* o = Override("o", nullptr, Expr(f32(1.0)), utils::Vector{Id(4u)}); auto* o = Override("o", Expr(f32(1.0)), Id(4u));
EXPECT_EQ(std::string("4"), o->Identifier(Symbols())); EXPECT_EQ(std::string("4"), o->Identifier(Symbols()));
} }

8
src/tint/ast/variable_decl_statement_test.cc
View File

@ -23,14 +23,14 @@ namespace {
using VariableDeclStatementTest = TestHelper; using VariableDeclStatementTest = TestHelper;
TEST_F(VariableDeclStatementTest, Creation) { TEST_F(VariableDeclStatementTest, Creation) {
auto* var = Var("a", ty.f32(), StorageClass::kNone); auto* var = Var("a", ty.f32());
auto* stmt = create<VariableDeclStatement>(var); auto* stmt = create<VariableDeclStatement>(var);
EXPECT_EQ(stmt->variable, var); EXPECT_EQ(stmt->variable, var);
} }
TEST_F(VariableDeclStatementTest, Creation_WithSource) { TEST_F(VariableDeclStatementTest, Creation_WithSource) {
auto* var = Var("a", ty.f32(), StorageClass::kNone); auto* var = Var("a", ty.f32());
auto* stmt = create<VariableDeclStatement>(Source{Source::Location{20, 2}}, var); auto* stmt = create<VariableDeclStatement>(Source{Source::Location{20, 2}}, var);
auto src = stmt->source; auto src = stmt->source;
@ -39,7 +39,7 @@ TEST_F(VariableDeclStatementTest, Creation_WithSource) {
} }
TEST_F(VariableDeclStatementTest, IsVariableDecl) { TEST_F(VariableDeclStatementTest, IsVariableDecl) {
auto* var = Var("a", ty.f32(), StorageClass::kNone); auto* var = Var("a", ty.f32());
auto* stmt = create<VariableDeclStatement>(var); auto* stmt = create<VariableDeclStatement>(var);
EXPECT_TRUE(stmt->Is<VariableDeclStatement>()); EXPECT_TRUE(stmt->Is<VariableDeclStatement>());
@ -59,7 +59,7 @@ TEST_F(VariableDeclStatementTest, Assert_DifferentProgramID_Variable) {
{ {
ProgramBuilder b1; ProgramBuilder b1;
ProgramBuilder b2; ProgramBuilder b2;
b1.create<VariableDeclStatement>(b2.Var("a", b2.ty.f32(), StorageClass::kNone)); b1.create<VariableDeclStatement>(b2.Var("a", b2.ty.f32()));
}, },
"internal compiler error"); "internal compiler error");
} }

34
src/tint/ast/variable_test.cc
View File

@ -38,7 +38,7 @@ TEST_F(VariableTest, Creation) {
TEST_F(VariableTest, CreationWithSource) { TEST_F(VariableTest, CreationWithSource) {
auto* v = Var(Source{Source::Range{Source::Location{27, 4}, Source::Location{27, 5}}}, "i", auto* v = Var(Source{Source::Range{Source::Location{27, 4}, Source::Location{27, 5}}}, "i",
ty.f32(), StorageClass::kPrivate, nullptr, utils::Empty); ty.f32(), StorageClass::kPrivate, utils::Empty);
EXPECT_EQ(v->symbol, Symbol(1, ID())); EXPECT_EQ(v->symbol, Symbol(1, ID()));
EXPECT_EQ(v->declared_storage_class, StorageClass::kPrivate); EXPECT_EQ(v->declared_storage_class, StorageClass::kPrivate);
@ -51,7 +51,7 @@ TEST_F(VariableTest, CreationWithSource) {
TEST_F(VariableTest, CreationEmpty) { TEST_F(VariableTest, CreationEmpty) {
auto* v = Var(Source{Source::Range{Source::Location{27, 4}, Source::Location{27, 7}}}, "a_var", auto* v = Var(Source{Source::Range{Source::Location{27, 4}, Source::Location{27, 7}}}, "a_var",
ty.i32(), StorageClass::kWorkgroup, nullptr, utils::Empty); ty.i32(), StorageClass::kWorkgroup, utils::Empty);
EXPECT_EQ(v->symbol, Symbol(1, ID())); EXPECT_EQ(v->symbol, Symbol(1, ID()));
EXPECT_EQ(v->declared_storage_class, StorageClass::kWorkgroup); EXPECT_EQ(v->declared_storage_class, StorageClass::kWorkgroup);
@ -66,7 +66,7 @@ TEST_F(VariableTest, Assert_MissingSymbol) {
EXPECT_FATAL_FAILURE( EXPECT_FATAL_FAILURE(
{ {
ProgramBuilder b; ProgramBuilder b;
b.Var("", b.ty.i32(), StorageClass::kNone); b.Var("", b.ty.i32());
}, },
"internal compiler error"); "internal compiler error");
} }
@ -76,7 +76,7 @@ TEST_F(VariableTest, Assert_DifferentProgramID_Symbol) {
{ {
ProgramBuilder b1; ProgramBuilder b1;
ProgramBuilder b2; ProgramBuilder b2;
b1.Var(b2.Sym("x"), b1.ty.f32(), StorageClass::kNone); b1.Var(b2.Sym("x"), b1.ty.f32());
}, },
"internal compiler error"); "internal compiler error");
} }
@ -86,18 +86,14 @@ TEST_F(VariableTest, Assert_DifferentProgramID_Constructor) {
{ {
ProgramBuilder b1; ProgramBuilder b1;
ProgramBuilder b2; ProgramBuilder b2;
b1.Var("x", b1.ty.f32(), StorageClass::kNone, b2.Expr(1.2_f)); b1.Var("x", b1.ty.f32(), b2.Expr(1.2_f));
}, },
"internal compiler error"); "internal compiler error");
} }
TEST_F(VariableTest, WithAttributes) { TEST_F(VariableTest, WithAttributes) {
auto* var = Var("my_var", ty.i32(), StorageClass::kFunction, nullptr, auto* var = Var("my_var", ty.i32(), StorageClass::kFunction, Location(1u),
utils::Vector{ Builtin(BuiltinValue::kPosition), Id(1200u));
create<LocationAttribute>(1u),
create<BuiltinAttribute>(BuiltinValue::kPosition),
create<IdAttribute>(1200u),
});
auto& attributes = var->attributes; auto& attributes = var->attributes;
EXPECT_TRUE(ast::HasAttribute<ast::LocationAttribute>(attributes)); EXPECT_TRUE(ast::HasAttribute<ast::LocationAttribute>(attributes));
@ -110,11 +106,7 @@ TEST_F(VariableTest, WithAttributes) {
} }
TEST_F(VariableTest, BindingPoint) { TEST_F(VariableTest, BindingPoint) {
auto* var = Var("my_var", ty.i32(), StorageClass::kFunction, nullptr, auto* var = Var("my_var", ty.i32(), StorageClass::kFunction, Binding(2), Group(1));
utils::Vector{
create<BindingAttribute>(2u),
create<GroupAttribute>(1u),
});
EXPECT_TRUE(var->BindingPoint()); EXPECT_TRUE(var->BindingPoint());
ASSERT_NE(var->BindingPoint().binding, nullptr); ASSERT_NE(var->BindingPoint().binding, nullptr);
ASSERT_NE(var->BindingPoint().group, nullptr); ASSERT_NE(var->BindingPoint().group, nullptr);
@ -123,17 +115,14 @@ TEST_F(VariableTest, BindingPoint) {
} }
TEST_F(VariableTest, BindingPointAttributes) { TEST_F(VariableTest, BindingPointAttributes) {
auto* var = Var("my_var", ty.i32(), StorageClass::kFunction, nullptr, utils::Empty); auto* var = Var("my_var", ty.i32(), StorageClass::kFunction, utils::Empty);
EXPECT_FALSE(var->BindingPoint()); EXPECT_FALSE(var->BindingPoint());
EXPECT_EQ(var->BindingPoint().group, nullptr); EXPECT_EQ(var->BindingPoint().group, nullptr);
EXPECT_EQ(var->BindingPoint().binding, nullptr); EXPECT_EQ(var->BindingPoint().binding, nullptr);
} }
TEST_F(VariableTest, BindingPointMissingGroupAttribute) { TEST_F(VariableTest, BindingPointMissingGroupAttribute) {
auto* var = Var("my_var", ty.i32(), StorageClass::kFunction, nullptr, auto* var = Var("my_var", ty.i32(), StorageClass::kFunction, Binding(2));
utils::Vector{
create<BindingAttribute>(2u),
});
EXPECT_FALSE(var->BindingPoint()); EXPECT_FALSE(var->BindingPoint());
ASSERT_NE(var->BindingPoint().binding, nullptr); ASSERT_NE(var->BindingPoint().binding, nullptr);
EXPECT_EQ(var->BindingPoint().binding->value, 2u); EXPECT_EQ(var->BindingPoint().binding->value, 2u);
@ -141,8 +130,7 @@ TEST_F(VariableTest, BindingPointMissingGroupAttribute) {
} }
TEST_F(VariableTest, BindingPointMissingBindingAttribute) { TEST_F(VariableTest, BindingPointMissingBindingAttribute) {
auto* var = Var("my_var", ty.i32(), StorageClass::kFunction, nullptr, auto* var = Var("my_var", ty.i32(), StorageClass::kFunction, Group(1));
utils::Vector{create<GroupAttribute>(1u)});
EXPECT_FALSE(var->BindingPoint()); EXPECT_FALSE(var->BindingPoint());
ASSERT_NE(var->BindingPoint().group, nullptr); ASSERT_NE(var->BindingPoint().group, nullptr);
EXPECT_EQ(var->BindingPoint().group->value, 1u); EXPECT_EQ(var->BindingPoint().group->value, 1u);

124
src/tint/inspector/inspector_test.cc
View File

@ -647,7 +647,7 @@ TEST_F(InspectorGetEntryPointTest, MixInOutVariablesAndStruct) {
} }
TEST_F(InspectorGetEntryPointTest, OverrideUnreferenced) { TEST_F(InspectorGetEntryPointTest, OverrideUnreferenced) {
Override("foo", ty.f32(), nullptr); Override("foo", ty.f32());
MakeEmptyBodyFunction("ep_func", utils::Vector{ MakeEmptyBodyFunction("ep_func", utils::Vector{
Stage(ast::PipelineStage::kCompute), Stage(ast::PipelineStage::kCompute),
WorkgroupSize(1_i), WorkgroupSize(1_i),
@ -662,7 +662,7 @@ TEST_F(InspectorGetEntryPointTest, OverrideUnreferenced) {
} }
TEST_F(InspectorGetEntryPointTest, OverrideReferencedByEntryPoint) { TEST_F(InspectorGetEntryPointTest, OverrideReferencedByEntryPoint) {
Override("foo", ty.f32(), nullptr); Override("foo", ty.f32());
MakePlainGlobalReferenceBodyFunction("ep_func", "foo", ty.f32(), MakePlainGlobalReferenceBodyFunction("ep_func", "foo", ty.f32(),
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kCompute), Stage(ast::PipelineStage::kCompute),
@ -679,7 +679,7 @@ TEST_F(InspectorGetEntryPointTest, OverrideReferencedByEntryPoint) {
} }
TEST_F(InspectorGetEntryPointTest, OverrideReferencedByCallee) { TEST_F(InspectorGetEntryPointTest, OverrideReferencedByCallee) {
Override("foo", ty.f32(), nullptr); Override("foo", ty.f32());
MakePlainGlobalReferenceBodyFunction("callee_func", "foo", ty.f32(), utils::Empty); MakePlainGlobalReferenceBodyFunction("callee_func", "foo", ty.f32(), utils::Empty);
MakeCallerBodyFunction("ep_func", utils::Vector{std::string("callee_func")}, MakeCallerBodyFunction("ep_func", utils::Vector{std::string("callee_func")},
utils::Vector{ utils::Vector{
@ -697,14 +697,8 @@ TEST_F(InspectorGetEntryPointTest, OverrideReferencedByCallee) {
} }
TEST_F(InspectorGetEntryPointTest, OverrideSomeReferenced) { TEST_F(InspectorGetEntryPointTest, OverrideSomeReferenced) {
Override("foo", ty.f32(), nullptr, Override("foo", ty.f32(), Id(1));
utils::Vector{ Override("bar", ty.f32(), Id(2));
Id(1),
});
Override("bar", ty.f32(), nullptr,
utils::Vector{
Id(2),
});
MakePlainGlobalReferenceBodyFunction("callee_func", "foo", ty.f32(), utils::Empty); MakePlainGlobalReferenceBodyFunction("callee_func", "foo", ty.f32(), utils::Empty);
MakeCallerBodyFunction("ep_func", utils::Vector{std::string("callee_func")}, MakeCallerBodyFunction("ep_func", utils::Vector{std::string("callee_func")},
utils::Vector{ utils::Vector{
@ -723,10 +717,10 @@ TEST_F(InspectorGetEntryPointTest, OverrideSomeReferenced) {
} }
TEST_F(InspectorGetEntryPointTest, OverrideTypes) { TEST_F(InspectorGetEntryPointTest, OverrideTypes) {
Override("bool_var", ty.bool_(), nullptr); Override("bool_var", ty.bool_());
Override("float_var", ty.f32(), nullptr); Override("float_var", ty.f32());
Override("u32_var", ty.u32(), nullptr); Override("u32_var", ty.u32());
Override("i32_var", ty.i32(), nullptr); Override("i32_var", ty.i32());
MakePlainGlobalReferenceBodyFunction("bool_func", "bool_var", ty.bool_(), utils::Empty); MakePlainGlobalReferenceBodyFunction("bool_func", "bool_var", ty.bool_(), utils::Empty);
MakePlainGlobalReferenceBodyFunction("float_func", "float_var", ty.f32(), utils::Empty); MakePlainGlobalReferenceBodyFunction("float_func", "float_var", ty.f32(), utils::Empty);
@ -775,7 +769,7 @@ TEST_F(InspectorGetEntryPointTest, OverrideInitialized) {
} }
TEST_F(InspectorGetEntryPointTest, OverrideUninitialized) { TEST_F(InspectorGetEntryPointTest, OverrideUninitialized) {
Override("foo", ty.f32(), nullptr); Override("foo", ty.f32());
MakePlainGlobalReferenceBodyFunction("ep_func", "foo", ty.f32(), MakePlainGlobalReferenceBodyFunction("ep_func", "foo", ty.f32(),
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kCompute), Stage(ast::PipelineStage::kCompute),
@ -794,11 +788,8 @@ TEST_F(InspectorGetEntryPointTest, OverrideUninitialized) {
} }
TEST_F(InspectorGetEntryPointTest, OverrideNumericIDSpecified) { TEST_F(InspectorGetEntryPointTest, OverrideNumericIDSpecified) {
Override("foo_no_id", ty.f32(), nullptr); Override("foo_no_id", ty.f32());
Override("foo_id", ty.f32(), nullptr, Override("foo_id", ty.f32(), Id(1234));
utils::Vector{
Id(1234),
});
MakePlainGlobalReferenceBodyFunction("no_id_func", "foo_no_id", ty.f32(), utils::Empty); MakePlainGlobalReferenceBodyFunction("no_id_func", "foo_no_id", ty.f32(), utils::Empty);
MakePlainGlobalReferenceBodyFunction("id_func", "foo_id", ty.f32(), utils::Empty); MakePlainGlobalReferenceBodyFunction("id_func", "foo_id", ty.f32(), utils::Empty);
@ -1234,18 +1225,9 @@ INSTANTIATE_TEST_SUITE_P(
InterpolationType::kFlat, InterpolationSampling::kNone})); InterpolationType::kFlat, InterpolationSampling::kNone}));
TEST_F(InspectorGetOverrideDefaultValuesTest, Bool) { TEST_F(InspectorGetOverrideDefaultValuesTest, Bool) {
Override("foo", ty.bool_(), nullptr, Override("foo", ty.bool_(), Id(1));
utils::Vector{ Override("bar", ty.bool_(), Expr(true), Id(20));
Id(1), Override("baz", ty.bool_(), Expr(false), Id(300));
});
Override("bar", ty.bool_(), Expr(true),
utils::Vector{
Id(20),
});
Override("baz", ty.bool_(), Expr(false),
utils::Vector{
Id(300),
});
Inspector& inspector = Build(); Inspector& inspector = Build();
@ -1265,14 +1247,8 @@ TEST_F(InspectorGetOverrideDefaultValuesTest, Bool) {
} }
TEST_F(InspectorGetOverrideDefaultValuesTest, U32) { TEST_F(InspectorGetOverrideDefaultValuesTest, U32) {
Override("foo", ty.u32(), nullptr, Override("foo", ty.u32(), Id(1));
utils::Vector{ Override("bar", ty.u32(), Expr(42_u), Id(20));
Id(1),
});
Override("bar", ty.u32(), Expr(42_u),
utils::Vector{
Id(20),
});
Inspector& inspector = Build(); Inspector& inspector = Build();
@ -1288,18 +1264,9 @@ TEST_F(InspectorGetOverrideDefaultValuesTest, U32) {
} }
TEST_F(InspectorGetOverrideDefaultValuesTest, I32) { TEST_F(InspectorGetOverrideDefaultValuesTest, I32) {
Override("foo", ty.i32(), nullptr, Override("foo", ty.i32(), Id(1));
utils::Vector{ Override("bar", ty.i32(), Expr(-42_i), Id(20));
Id(1), Override("baz", ty.i32(), Expr(42_i), Id(300));
});
Override("bar", ty.i32(), Expr(-42_i),
utils::Vector{
Id(20),
});
Override("baz", ty.i32(), Expr(42_i),
utils::Vector{
Id(300),
});
Inspector& inspector = Build(); Inspector& inspector = Build();
@ -1319,22 +1286,10 @@ TEST_F(InspectorGetOverrideDefaultValuesTest, I32) {
} }
TEST_F(InspectorGetOverrideDefaultValuesTest, Float) { TEST_F(InspectorGetOverrideDefaultValuesTest, Float) {
Override("foo", ty.f32(), nullptr, Override("foo", ty.f32(), Id(1));
utils::Vector{ Override("bar", ty.f32(), Expr(0_f), Id(20));
Id(1), Override("baz", ty.f32(), Expr(-10_f), Id(300));
}); Override("x", ty.f32(), Expr(15_f), Id(4000));
Override("bar", ty.f32(), Expr(0_f),
utils::Vector{
Id(20),
});
Override("baz", ty.f32(), Expr(-10_f),
utils::Vector{
Id(300),
});
Override("x", ty.f32(), Expr(15_f),
utils::Vector{
Id(4000),
});
Inspector& inspector = Build(); Inspector& inspector = Build();
@ -1358,21 +1313,12 @@ TEST_F(InspectorGetOverrideDefaultValuesTest, Float) {
} }
TEST_F(InspectorGetConstantNameToIdMapTest, WithAndWithoutIds) { TEST_F(InspectorGetConstantNameToIdMapTest, WithAndWithoutIds) {
Override("v1", ty.f32(), nullptr, Override("v1", ty.f32(), Id(1));
utils::Vector{ Override("v20", ty.f32(), Id(20));
Id(1), Override("v300", ty.f32(), Id(300));
}); auto* a = Override("a", ty.f32());
Override("v20", ty.f32(), nullptr, auto* b = Override("b", ty.f32());
utils::Vector{ auto* c = Override("c", ty.f32());
Id(20),
});
Override("v300", ty.f32(), nullptr,
utils::Vector{
Id(300),
});
auto* a = Override("a", ty.f32(), nullptr);
auto* b = Override("b", ty.f32(), nullptr);
auto* c = Override("c", ty.f32(), nullptr);
Inspector& inspector = Build(); Inspector& inspector = Build();
@ -1416,9 +1362,9 @@ TEST_F(InspectorGetStorageSizeTest, Simple_NonStruct) {
AddStorageBuffer("rosb_var", ty.i32(), ast::Access::kRead, 1, 1); AddStorageBuffer("rosb_var", ty.i32(), ast::Access::kRead, 1, 1);
Func("ep_func", utils::Empty, ty.void_(), Func("ep_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("ub", nullptr, Expr("ub_var"))), Decl(Let("ub", Expr("ub_var"))),
Decl(Let("sb", nullptr, Expr("sb_var"))), Decl(Let("sb", Expr("sb_var"))),
Decl(Let("rosb", nullptr, Expr("rosb_var"))), Decl(Let("rosb", Expr("rosb_var"))),
}, },
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kCompute), Stage(ast::PipelineStage::kCompute),
@ -1474,7 +1420,7 @@ TEST_F(InspectorGetStorageSizeTest, NonStructVec3) {
AddUniformBuffer("ub_var", ty.vec3<f32>(), 0, 0); AddUniformBuffer("ub_var", ty.vec3<f32>(), 0, 0);
Func("ep_func", utils::Empty, ty.void_(), Func("ep_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("ub", nullptr, Expr("ub_var"))), Decl(Let("ub", Expr("ub_var"))),
}, },
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kCompute), Stage(ast::PipelineStage::kCompute),
@ -1493,7 +1439,7 @@ TEST_F(InspectorGetStorageSizeTest, StructVec3) {
AddUniformBuffer("ub_var", ty.Of(ub_struct_type), 0, 0); AddUniformBuffer("ub_var", ty.Of(ub_struct_type), 0, 0);
Func("ep_func", utils::Empty, ty.void_(), Func("ep_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("ub", nullptr, Expr("ub_var"))), Decl(Let("ub", Expr("ub_var"))),
}, },
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kCompute), Stage(ast::PipelineStage::kCompute),

36
src/tint/inspector/test_inspector_builder.cc
View File

@ -126,11 +126,7 @@ void InspectorBuilder::AddUniformBuffer(const std::string& name,
const ast::Type* type, const ast::Type* type,
uint32_t group, uint32_t group,
uint32_t binding) { uint32_t binding) {
GlobalVar(name, type, ast::StorageClass::kUniform, GlobalVar(name, type, ast::StorageClass::kUniform, Binding(binding), Group(group));
utils::Vector{
create<ast::BindingAttribute>(binding),
create<ast::GroupAttribute>(group),
});
} }
void InspectorBuilder::AddWorkgroupStorage(const std::string& name, const ast::Type* type) { void InspectorBuilder::AddWorkgroupStorage(const std::string& name, const ast::Type* type) {
@ -142,11 +138,7 @@ void InspectorBuilder::AddStorageBuffer(const std::string& name,
ast::Access access, ast::Access access,
uint32_t group, uint32_t group,
uint32_t binding) { uint32_t binding) {
GlobalVar(name, type, ast::StorageClass::kStorage, access, GlobalVar(name, type, ast::StorageClass::kStorage, access, Binding(binding), Group(group));
utils::Vector{
create<ast::BindingAttribute>(binding),
create<ast::GroupAttribute>(group),
});
} }
void InspectorBuilder::MakeStructVariableReferenceBodyFunction( void InspectorBuilder::MakeStructVariableReferenceBodyFunction(
@ -178,32 +170,20 @@ void InspectorBuilder::MakeStructVariableReferenceBodyFunction(
} }
void InspectorBuilder::AddSampler(const std::string& name, uint32_t group, uint32_t binding) { void InspectorBuilder::AddSampler(const std::string& name, uint32_t group, uint32_t binding) {
GlobalVar(name, sampler_type(), GlobalVar(name, sampler_type(), Binding(binding), Group(group));
utils::Vector{
create<ast::BindingAttribute>(binding),
create<ast::GroupAttribute>(group),
});
} }
void InspectorBuilder::AddComparisonSampler(const std::string& name, void InspectorBuilder::AddComparisonSampler(const std::string& name,
uint32_t group, uint32_t group,
uint32_t binding) { uint32_t binding) {
GlobalVar(name, comparison_sampler_type(), GlobalVar(name, comparison_sampler_type(), Binding(binding), Group(group));
utils::Vector{
create<ast::BindingAttribute>(binding),
create<ast::GroupAttribute>(group),
});
} }
void InspectorBuilder::AddResource(const std::string& name, void InspectorBuilder::AddResource(const std::string& name,
const ast::Type* type, const ast::Type* type,
uint32_t group, uint32_t group,
uint32_t binding) { uint32_t binding) {
GlobalVar(name, type, GlobalVar(name, type, Binding(binding), Group(group));
utils::Vector{
create<ast::BindingAttribute>(binding),
create<ast::GroupAttribute>(group),
});
} }
void InspectorBuilder::AddGlobalVariable(const std::string& name, const ast::Type* type) { void InspectorBuilder::AddGlobalVariable(const std::string& name, const ast::Type* type) {
@ -305,11 +285,7 @@ void InspectorBuilder::AddStorageTexture(const std::string& name,
const ast::Type* type, const ast::Type* type,
uint32_t group, uint32_t group,
uint32_t binding) { uint32_t binding) {
GlobalVar(name, type, GlobalVar(name, type, Binding(binding), Group(group));
utils::Vector{
create<ast::BindingAttribute>(binding),
create<ast::GroupAttribute>(group),
});
} }
const ast::Function* InspectorBuilder::MakeStorageTextureBodyFunction( const ast::Function* InspectorBuilder::MakeStorageTextureBodyFunction(

7
src/tint/program_builder.cc
View File

@ -26,7 +26,10 @@ using namespace tint::number_suffixes; // NOLINT
namespace tint { namespace tint {
ProgramBuilder::VarOptionals::~VarOptionals() = default; ProgramBuilder::VarOptions::~VarOptions() = default;
ProgramBuilder::LetOptions::~LetOptions() = default;
ProgramBuilder::ConstOptions::~ConstOptions() = default;
ProgramBuilder::OverrideOptions::~OverrideOptions() = default;
ProgramBuilder::ProgramBuilder() ProgramBuilder::ProgramBuilder()
: id_(ProgramID::New()), : id_(ProgramID::New()),
@ -118,7 +121,7 @@ ProgramBuilder::TypesBuilder::TypesBuilder(ProgramBuilder* pb) : builder(pb) {}
const ast::Statement* ProgramBuilder::WrapInStatement(const ast::Expression* expr) { const ast::Statement* ProgramBuilder::WrapInStatement(const ast::Expression* expr) {
// Create a temporary variable of inferred type from expr. // Create a temporary variable of inferred type from expr.
return Decl(Let(symbols_.New(), nullptr, expr)); return Decl(Let(symbols_.New(), expr));
} }
const ast::VariableDeclStatement* ProgramBuilder::WrapInStatement(const ast::Variable* v) { const ast::VariableDeclStatement* ProgramBuilder::WrapInStatement(const ast::Variable* v) {

386
src/tint/program_builder.h
View File

@ -162,32 +162,98 @@ class ProgramBuilder {
using DisableIfVectorLike = traits::EnableIf< using DisableIfVectorLike = traits::EnableIf<
!detail::IsVectorLike<traits::Decay<traits::NthTypeOf<0, TYPES..., void>>>::value>; !detail::IsVectorLike<traits::Decay<traits::NthTypeOf<0, TYPES..., void>>>::value>;
/// VarOptionals is a helper for accepting a number of optional, extra /// VarOptions is a helper for accepting an arbitrary number of order independent options for
/// arguments for Var() and GlobalVar(). /// constructing an ast::Var.
struct VarOptionals { struct VarOptions {
template <typename... ARGS> template <typename... ARGS>
explicit VarOptionals(ARGS&&... args) { explicit VarOptions(ARGS&&... args) {
Apply(std::forward<ARGS>(args)...); (Set(std::forward<ARGS>(args)), ...);
} }
~VarOptionals(); ~VarOptions();
const ast::Type* type = nullptr;
ast::StorageClass storage = ast::StorageClass::kNone; ast::StorageClass storage = ast::StorageClass::kNone;
ast::Access access = ast::Access::kUndefined; ast::Access access = ast::Access::kUndefined;
const ast::Expression* constructor = nullptr; const ast::Expression* constructor = nullptr;
utils::Vector<const ast::Attribute*, 4> attributes; utils::Vector<const ast::Attribute*, 4> attributes;
private: private:
void Set(const ast::Type* t) { type = t; }
void Set(ast::StorageClass sc) { storage = sc; } void Set(ast::StorageClass sc) { storage = sc; }
void Set(ast::Access ac) { access = ac; } void Set(ast::Access ac) { access = ac; }
void Set(const ast::Expression* c) { constructor = c; } void Set(const ast::Expression* c) { constructor = c; }
void Set(utils::VectorRef<const ast::Attribute*> l) { attributes = std::move(l); } void Set(utils::VectorRef<const ast::Attribute*> l) { attributes = std::move(l); }
void Set(const ast::Attribute* a) { attributes.Push(a); }
};
template <typename FIRST, typename... ARGS> /// LetOptions is a helper for accepting an arbitrary number of order independent options for
void Apply(FIRST&& first, ARGS&&... args) { /// constructing an ast::Let.
Set(std::forward<FIRST>(first)); struct LetOptions {
Apply(std::forward<ARGS>(args)...); template <typename... ARGS>
explicit LetOptions(ARGS&&... args) {
static constexpr bool has_init =
(traits::IsTypeOrDerived<std::remove_pointer_t<std::remove_reference_t<ARGS>>,
ast::Expression> ||
...);
static_assert(has_init, "Let() must be constructed with an initializer expression");
(Set(std::forward<ARGS>(args)), ...);
} }
void Apply() {} ~LetOptions();
const ast::Type* type = nullptr;
const ast::Expression* constructor = nullptr;
utils::Vector<const ast::Attribute*, 4> attributes;
private:
void Set(const ast::Type* t) { type = t; }
void Set(const ast::Expression* c) { constructor = c; }
void Set(utils::VectorRef<const ast::Attribute*> l) { attributes = std::move(l); }
void Set(const ast::Attribute* a) { attributes.Push(a); }
};
/// ConstOptions is a helper for accepting an arbitrary number of order independent options for
/// constructing an ast::Const.
struct ConstOptions {
template <typename... ARGS>
explicit ConstOptions(ARGS&&... args) {
static constexpr bool has_init =
(traits::IsTypeOrDerived<std::remove_pointer_t<std::remove_reference_t<ARGS>>,
ast::Expression> ||
...);
static_assert(has_init, "Const() must be constructed with an initializer expression");
(Set(std::forward<ARGS>(args)), ...);
}
~ConstOptions();
const ast::Type* type = nullptr;
const ast::Expression* constructor = nullptr;
utils::Vector<const ast::Attribute*, 4> attributes;
private:
void Set(const ast::Type* t) { type = t; }
void Set(const ast::Expression* c) { constructor = c; }
void Set(utils::VectorRef<const ast::Attribute*> l) { attributes = std::move(l); }
void Set(const ast::Attribute* a) { attributes.Push(a); }
};
/// OverrideOptions is a helper for accepting an arbitrary number of order independent options
/// for constructing an ast::Override.
struct OverrideOptions {
template <typename... ARGS>
explicit OverrideOptions(ARGS&&... args) {
(Set(std::forward<ARGS>(args)), ...);
}
~OverrideOptions();
const ast::Type* type = nullptr;
const ast::Expression* constructor = nullptr;
utils::Vector<const ast::Attribute*, 4> attributes;
private:
void Set(const ast::Type* t) { type = t; }
void Set(const ast::Expression* c) { constructor = c; }
void Set(utils::VectorRef<const ast::Attribute*> l) { attributes = std::move(l); }
void Set(const ast::Attribute* a) { attributes.Push(a); }
}; };
public: public:
@ -1582,102 +1648,101 @@ class ProgramBuilder {
} }
/// @param name the variable name /// @param name the variable name
/// @param type the variable type /// @param options the extra options passed to the ast::Var constructor
/// @param optional the optional variable settings.
/// Can be any of the following, in any order: /// Can be any of the following, in any order:
/// * ast::Type* - specifies the variable type
/// * ast::StorageClass - specifies the variable storage class /// * ast::StorageClass - specifies the variable storage class
/// * ast::Access - specifies the variable's access control /// * ast::Access - specifies the variable's access control
/// * ast::Expression* - specifies the variable's initializer expression /// * ast::Expression* - specifies the variable's initializer expression
/// * ast::AttributeList - specifies the variable's attributes /// * ast::Attribute* - specifies the variable's attributes (repeatable, or vector)
/// Note that repeated arguments of the same type will use the last argument's /// Note that non-repeatable arguments of the same type will use the last argument's value.
/// value.
/// @returns a `ast::Var` with the given name, type and additional /// @returns a `ast::Var` with the given name, type and additional
/// options /// options
template <typename NAME, typename... OPTIONAL> template <typename NAME, typename... OPTIONS, typename = DisableIfSource<NAME>>
const ast::Var* Var(NAME&& name, const ast::Type* type, OPTIONAL&&... optional) { const ast::Var* Var(NAME&& name, OPTIONS&&... options) {
VarOptionals opts(std::forward<OPTIONAL>(optional)...); VarOptions opts(std::forward<OPTIONS>(options)...);
return create<ast::Var>(Sym(std::forward<NAME>(name)), type, opts.storage, opts.access, return create<ast::Var>(Sym(std::forward<NAME>(name)), opts.type, opts.storage, opts.access,
opts.constructor, std::move(opts.attributes)); opts.constructor, std::move(opts.attributes));
} }
/// @param source the variable source /// @param source the variable source
/// @param name the variable name /// @param name the variable name
/// @param type the variable type /// @param options the extra options passed to the ast::Var constructor
/// @param optional the optional variable settings.
/// Can be any of the following, in any order: /// Can be any of the following, in any order:
/// * ast::Type* - specifies the variable type
/// * ast::StorageClass - specifies the variable storage class /// * ast::StorageClass - specifies the variable storage class
/// * ast::Access - specifies the variable's access control /// * ast::Access - specifies the variable's access control
/// * ast::Expression* - specifies the variable's initializer expression /// * ast::Expression* - specifies the variable's initializer expression
/// * ast::AttributeList - specifies the variable's attributes /// * ast::Attribute* - specifies the variable's attributes (repeatable, or vector)
/// Note that repeated arguments of the same type will use the last argument's /// Note that non-repeatable arguments of the same type will use the last argument's value.
/// value.
/// @returns a `ast::Var` with the given name, storage and type /// @returns a `ast::Var` with the given name, storage and type
template <typename NAME, typename... OPTIONAL> template <typename NAME, typename... OPTIONS>
const ast::Var* Var(const Source& source, const ast::Var* Var(const Source& source, NAME&& name, OPTIONS&&... options) {
NAME&& name, VarOptions opts(std::forward<OPTIONS>(options)...);
const ast::Type* type, return create<ast::Var>(source, Sym(std::forward<NAME>(name)), opts.type, opts.storage,
OPTIONAL&&... optional) {
VarOptionals opts(std::forward<OPTIONAL>(optional)...);
return create<ast::Var>(source, Sym(std::forward<NAME>(name)), type, opts.storage,
opts.access, opts.constructor, std::move(opts.attributes)); opts.access, opts.constructor, std::move(opts.attributes));
} }
/// @param name the variable name /// @param name the variable name
/// @param type the variable type /// @param options the extra options passed to the ast::Var constructor
/// @param constructor constructor expression /// Can be any of the following, in any order:
/// @param attributes optional variable attributes /// * ast::Expression* - specifies the variable's initializer expression (required)
/// @returns an `ast::Const` with the given name and type /// * ast::Type* - specifies the variable type
template <typename NAME> /// * ast::Attribute* - specifies the variable's attributes (repeatable, or vector)
const ast::Const* Const(NAME&& name, /// Note that non-repeatable arguments of the same type will use the last argument's value.
const ast::Type* type, /// @returns an `ast::Const` with the given name, type and additional options
const ast::Expression* constructor, template <typename NAME, typename... OPTIONS, typename = DisableIfSource<NAME>>
utils::VectorRef<const ast::Attribute*> attributes = utils::Empty) { const ast::Const* Const(NAME&& name, OPTIONS&&... options) {
return create<ast::Const>(Sym(std::forward<NAME>(name)), type, constructor, attributes); ConstOptions opts(std::forward<OPTIONS>(options)...);
return create<ast::Const>(Sym(std::forward<NAME>(name)), opts.type, opts.constructor,
std::move(opts.attributes));
} }
/// @param source the variable source /// @param source the variable source
/// @param name the variable name /// @param name the variable name
/// @param type the variable type /// @param options the extra options passed to the ast::Var constructor
/// @param constructor constructor expression /// Can be any of the following, in any order:
/// @param attributes optional variable attributes /// * ast::Expression* - specifies the variable's initializer expression (required)
/// @returns an `ast::Const` with the given name and type /// * ast::Type* - specifies the variable type
template <typename NAME> /// * ast::Attribute* - specifies the variable's attributes (repeatable, or vector)
const ast::Const* Const(const Source& source, /// Note that non-repeatable arguments of the same type will use the last argument's value.
NAME&& name, /// @returns an `ast::Const` with the given name, type and additional options
const ast::Type* type, template <typename NAME, typename... OPTIONS>
const ast::Expression* constructor, const ast::Const* Const(const Source& source, NAME&& name, OPTIONS&&... options) {
utils::VectorRef<const ast::Attribute*> attributes = utils::Empty) { ConstOptions opts(std::forward<OPTIONS>(options)...);
return create<ast::Const>(source, Sym(std::forward<NAME>(name)), type, constructor, return create<ast::Const>(source, Sym(std::forward<NAME>(name)), opts.type,
attributes); opts.constructor, std::move(opts.attributes));
} }
/// @param name the variable name /// @param name the variable name
/// @param type the variable type /// @param options the extra options passed to the ast::Var constructor
/// @param constructor constructor expression /// Can be any of the following, in any order:
/// @param attributes optional variable attributes /// * ast::Expression* - specifies the variable's initializer expression (required)
/// @returns an `ast::Let` with the given name and type /// * ast::Type* - specifies the variable type
template <typename NAME> /// * ast::Attribute* - specifies the variable's attributes (repeatable, or vector)
const ast::Let* Let(NAME&& name, /// Note that non-repeatable arguments of the same type will use the last argument's value.
const ast::Type* type, /// @returns an `ast::Let` with the given name, type and additional options
const ast::Expression* constructor, template <typename NAME, typename... OPTIONS, typename = DisableIfSource<NAME>>
utils::VectorRef<const ast::Attribute*> attributes = utils::Empty) { const ast::Let* Let(NAME&& name, OPTIONS&&... options) {
return create<ast::Let>(Sym(std::forward<NAME>(name)), type, constructor, attributes); LetOptions opts(std::forward<OPTIONS>(options)...);
return create<ast::Let>(Sym(std::forward<NAME>(name)), opts.type, opts.constructor,
std::move(opts.attributes));
} }
/// @param source the variable source /// @param source the variable source
/// @param name the variable name /// @param name the variable name
/// @param type the variable type /// @param options the extra options passed to the ast::Var constructor
/// @param constructor constructor expression /// Can be any of the following, in any order:
/// @param attributes optional variable attributes /// * ast::Expression* - specifies the variable's initializer expression (required)
/// @returns an `ast::Let` with the given name and type /// * ast::Type* - specifies the variable type
template <typename NAME> /// * ast::Attribute* - specifies the variable's attributes (repeatable, or vector)
const ast::Let* Let(const Source& source, /// Note that non-repeatable arguments of the same type will use the last argument's value.
NAME&& name, /// @returns an `ast::Let` with the given name, type and additional options
const ast::Type* type, template <typename NAME, typename... OPTIONS>
const ast::Expression* constructor, const ast::Let* Let(const Source& source, NAME&& name, OPTIONS&&... options) {
utils::VectorRef<const ast::Attribute*> attributes = utils::Empty) { LetOptions opts(std::forward<OPTIONS>(options)...);
return create<ast::Let>(source, Sym(std::forward<NAME>(name)), type, constructor, return create<ast::Let>(source, Sym(std::forward<NAME>(name)), opts.type, opts.constructor,
attributes); std::move(opts.attributes));
} }
/// @param name the parameter name /// @param name the parameter name
@ -1705,122 +1770,110 @@ class ProgramBuilder {
} }
/// @param name the variable name /// @param name the variable name
/// @param type the variable type /// @param options the extra options passed to the ast::Var constructor
/// @param optional the optional variable settings.
/// Can be any of the following, in any order: /// Can be any of the following, in any order:
/// * ast::Type* - specifies the variable type
/// * ast::StorageClass - specifies the variable storage class /// * ast::StorageClass - specifies the variable storage class
/// * ast::Access - specifies the variable's access control /// * ast::Access - specifies the variable's access control
/// * ast::Expression* - specifies the variable's initializer expression /// * ast::Expression* - specifies the variable's initializer expression
/// * ast::AttributeList - specifies the variable's attributes /// * ast::Attribute* - specifies the variable's attributes (repeatable, or vector)
/// Note that repeated arguments of the same type will use the last argument's /// Note that non-repeatable arguments of the same type will use the last argument's value.
/// value.
/// @returns a new `ast::Var`, which is automatically registered as a global variable with the /// @returns a new `ast::Var`, which is automatically registered as a global variable with the
/// ast::Module. /// ast::Module.
template <typename NAME, typename... OPTIONAL, typename = DisableIfSource<NAME>> template <typename NAME, typename... OPTIONS, typename = DisableIfSource<NAME>>
const ast::Var* GlobalVar(NAME&& name, const ast::Type* type, OPTIONAL&&... optional) { const ast::Var* GlobalVar(NAME&& name, OPTIONS&&... options) {
auto* var = Var(std::forward<NAME>(name), type, std::forward<OPTIONAL>(optional)...); auto* variable = Var(std::forward<NAME>(name), std::forward<OPTIONS>(options)...);
AST().AddGlobalVariable(var); AST().AddGlobalVariable(variable);
return var; return variable;
} }
/// @param source the variable source /// @param source the variable source
/// @param name the variable name /// @param name the variable name
/// @param type the variable type /// @param options the extra options passed to the ast::Var constructor
/// @param optional the optional variable settings.
/// Can be any of the following, in any order: /// Can be any of the following, in any order:
/// * ast::Type* - specifies the variable type
/// * ast::StorageClass - specifies the variable storage class /// * ast::StorageClass - specifies the variable storage class
/// * ast::Access - specifies the variable's access control /// * ast::Access - specifies the variable's access control
/// * ast::Expression* - specifies the variable's initializer expression /// * ast::Expression* - specifies the variable's initializer expression
/// * ast::AttributeList - specifies the variable's attributes /// * ast::Attribute* - specifies the variable's attributes (repeatable, or vector)
/// Note that repeated arguments of the same type will use the last argument's /// Note that non-repeatable arguments of the same type will use the last argument's value.
/// value.
/// @returns a new `ast::Var`, which is automatically registered as a global variable with the /// @returns a new `ast::Var`, which is automatically registered as a global variable with the
/// ast::Module. /// ast::Module.
template <typename NAME, typename... OPTIONAL> template <typename NAME, typename... OPTIONS>
const ast::Var* GlobalVar(const Source& source, const ast::Var* GlobalVar(const Source& source, NAME&& name, OPTIONS&&... options) {
NAME&& name, auto* variable = Var(source, std::forward<NAME>(name), std::forward<OPTIONS>(options)...);
const ast::Type* type, AST().AddGlobalVariable(variable);
OPTIONAL&&... optional) { return variable;
auto* var =
Var(source, std::forward<NAME>(name), type, std::forward<OPTIONAL>(optional)...);
AST().AddGlobalVariable(var);
return var;
} }
/// @param name the variable name /// @param name the variable name
/// @param type the variable type /// @param options the extra options passed to the ast::Const constructor
/// @param constructor constructor expression /// Can be any of the following, in any order:
/// @param attributes optional variable attributes /// * ast::Expression* - specifies the variable's initializer expression (required)
/// @returns an `ast::Const` constructed by calling Const() with the arguments of `args`, which /// * ast::Type* - specifies the variable type
/// is automatically registered as a global variable with the ast::Module. /// * ast::Attribute* - specifies the variable's attributes (repeatable, or vector)
template <typename NAME> /// Note that non-repeatable arguments of the same type will use the last argument's value.
const ast::Const* GlobalConst( /// @returns an `ast::Const` with the given name, type and additional options, which is
NAME&& name, /// automatically registered as a global variable with the ast::Module.
const ast::Type* type, template <typename NAME, typename... OPTIONS, typename = DisableIfSource<NAME>>
const ast::Expression* constructor, const ast::Const* GlobalConst(NAME&& name, OPTIONS&&... options) {
utils::VectorRef<const ast::Attribute*> attributes = utils::Empty) { auto* variable = Const(std::forward<NAME>(name), std::forward<OPTIONS>(options)...);
auto* var = Const(std::forward<NAME>(name), type, constructor, std::move(attributes)); AST().AddGlobalVariable(variable);
AST().AddGlobalVariable(var); return variable;
return var;
} }
/// @param source the variable source /// @param source the variable source
/// @param name the variable name /// @param name the variable name
/// @param type the variable type /// @param options the extra options passed to the ast::Const constructor
/// @param constructor constructor expression /// Can be any of the following, in any order:
/// @param attributes optional variable attributes /// * ast::Expression* - specifies the variable's initializer expression (required)
/// @returns a const `ast::Const` constructed by calling Var() with the /// * ast::Type* - specifies the variable type
/// arguments of `args`, which is automatically registered as a global /// * ast::Attribute* - specifies the variable's attributes (repeatable, or vector)
/// variable with the ast::Module. /// Note that non-repeatable arguments of the same type will use the last argument's value.
template <typename NAME> /// @returns an `ast::Const` with the given name, type and additional options, which is
const ast::Const* GlobalConst( /// automatically registered as a global variable with the ast::Module.
const Source& source, template <typename NAME, typename... OPTIONS>
NAME&& name, const ast::Const* GlobalConst(const Source& source, NAME&& name, OPTIONS&&... options) {
const ast::Type* type, auto* variable = Const(source, std::forward<NAME>(name), std::forward<OPTIONS>(options)...);
const ast::Expression* constructor, AST().AddGlobalVariable(variable);
utils::VectorRef<const ast::Attribute*> attributes = utils::Empty) { return variable;
auto* var =
Const(source, std::forward<NAME>(name), type, constructor, std::move(attributes));
AST().AddGlobalVariable(var);
return var;
} }
/// @param name the variable name /// @param name the variable name
/// @param type the variable type /// @param options the extra options passed to the ast::Override constructor
/// @param constructor optional constructor expression /// Can be any of the following, in any order:
/// @param attributes optional variable attributes /// * ast::Expression* - specifies the variable's initializer expression (required)
/// @returns an `ast::Override` which is automatically registered as a global variable with the /// * ast::Type* - specifies the variable type
/// ast::Module. /// * ast::Attribute* - specifies the variable's attributes (repeatable, or vector)
template <typename NAME> /// Note that non-repeatable arguments of the same type will use the last argument's value.
const ast::Override* Override( /// @returns an `ast::Override` with the given name, type and additional options, which is
NAME&& name, /// automatically registered as a global variable with the ast::Module.
const ast::Type* type, template <typename NAME, typename... OPTIONS, typename = DisableIfSource<NAME>>
const ast::Expression* constructor, const ast::Override* Override(NAME&& name, OPTIONS&&... options) {
utils::VectorRef<const ast::Attribute*> attributes = utils::Empty) { OverrideOptions opts(std::forward<OPTIONS>(options)...);
auto* var = create<ast::Override>(source_, Sym(std::forward<NAME>(name)), type, constructor, auto* variable = create<ast::Override>(Sym(std::forward<NAME>(name)), opts.type,
std::move(attributes)); opts.constructor, std::move(opts.attributes));
AST().AddGlobalVariable(var); AST().AddGlobalVariable(variable);
return var; return variable;
} }
/// @param source the variable source /// @param source the variable source
/// @param name the variable name /// @param name the variable name
/// @param type the variable type /// @param options the extra options passed to the ast::Override constructor
/// @param constructor constructor expression /// Can be any of the following, in any order:
/// @param attributes optional variable attributes /// * ast::Expression* - specifies the variable's initializer expression (required)
/// @returns an `ast::Override` constructed with the arguments of `args`, which is automatically /// * ast::Type* - specifies the variable type
/// registered as a global variable with the ast::Module. /// * ast::Attribute* - specifies the variable's attributes (repeatable, or vector)
template <typename NAME> /// Note that non-repeatable arguments of the same type will use the last argument's value.
const ast::Override* Override( /// @returns an `ast::Override` with the given name, type and additional options, which is
const Source& source, /// automatically registered as a global variable with the ast::Module.
NAME&& name, template <typename NAME, typename... OPTIONS>
const ast::Type* type, const ast::Override* Override(const Source& source, NAME&& name, OPTIONS&&... options) {
const ast::Expression* constructor, OverrideOptions opts(std::forward<OPTIONS>(options)...);
utils::VectorRef<const ast::Attribute*> attributes = utils::Empty) { auto* variable = create<ast::Override>(source, Sym(std::forward<NAME>(name)), opts.type,
auto* var = create<ast::Override>(source, Sym(std::forward<NAME>(name)), type, constructor, opts.constructor, std::move(opts.attributes));
std::move(attributes)); AST().AddGlobalVariable(variable);
AST().AddGlobalVariable(var); return variable;
return var;
} }
/// @param source the source information /// @param source the source information
@ -2246,15 +2299,6 @@ class ProgramBuilder {
return create<ast::BindingAttribute>(value); return create<ast::BindingAttribute>(value);
} }
/// Convenience function to create both a ast::GroupAttribute and
/// ast::BindingAttribute
/// @param group the group index
/// @param binding the binding index
/// @returns a attribute list with both the group and binding attributes
utils::Vector<const ast::Attribute*, 2> GroupAndBinding(uint32_t group, uint32_t binding) {
return {Group(group), Binding(binding)};
}
/// Creates an ast::Function and registers it with the ast::Module. /// Creates an ast::Function and registers it with the ast::Module.
/// @param source the source information /// @param source the source information
/// @param name the function name /// @param name the function name

63
src/tint/resolver/assignment_validation_test.cc
View File

@ -33,10 +33,7 @@ TEST_F(ResolverAssignmentValidationTest, ReadOnlyBuffer) {
Member("m", ty.i32()), Member("m", ty.i32()),
}); });
GlobalVar(Source{{12, 34}}, "a", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar(Source{{12, 34}}, "a", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead,
utils::Vector{ Binding(0), Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
WrapInFunction(Assign(Source{{56, 78}}, MemberAccessor("a", "m"), 1_i)); WrapInFunction(Assign(Source{{56, 78}}, MemberAccessor("a", "m"), 1_i));
@ -52,7 +49,7 @@ TEST_F(ResolverAssignmentValidationTest, AssignIncompatibleTypes) {
// a = 2.3; // a = 2.3;
// } // }
auto* var = Var("a", ty.i32(), ast::StorageClass::kNone, Expr(2_i)); auto* var = Var("a", ty.i32(), Expr(2_i));
auto* assign = Assign(Source{{12, 34}}, "a", 2.3_f); auto* assign = Assign(Source{{12, 34}}, "a", 2.3_f);
WrapInFunction(var, assign); WrapInFunction(var, assign);
@ -70,7 +67,7 @@ TEST_F(ResolverAssignmentValidationTest, AssignArraysWithDifferentSizeExpression
// a = b; // a = b;
// } // }
GlobalConst("len", nullptr, Expr(4_u)); GlobalConst("len", Expr(4_u));
auto* a = Var("a", ty.array(ty.f32(), 4_u)); auto* a = Var("a", ty.array(ty.f32(), 4_u));
auto* b = Var("b", ty.array(ty.f32(), "len")); auto* b = Var("b", ty.array(ty.f32(), "len"));
@ -89,7 +86,7 @@ TEST_F(ResolverAssignmentValidationTest, AssignArraysWithDifferentSizeExpression
// a = b; // a = b;
// } // }
GlobalConst("len", nullptr, Expr(5_u)); GlobalConst("len", Expr(5_u));
auto* a = Var("a", ty.array(ty.f32(), 4_u)); auto* a = Var("a", ty.array(ty.f32(), 4_u));
auto* b = Var("b", ty.array(ty.f32(), "len")); auto* b = Var("b", ty.array(ty.f32(), "len"));
@ -107,7 +104,7 @@ TEST_F(ResolverAssignmentValidationTest, AssignCompatibleTypesInBlockStatement_P
// var a : i32 = 2i; // var a : i32 = 2i;
// a = 2i // a = 2i
// } // }
auto* var = Var("a", ty.i32(), ast::StorageClass::kNone, Expr(2_i)); auto* var = Var("a", ty.i32(), Expr(2_i));
WrapInFunction(var, Assign("a", 2_i)); WrapInFunction(var, Assign("a", 2_i));
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -119,7 +116,7 @@ TEST_F(ResolverAssignmentValidationTest, AssignIncompatibleTypesInBlockStatement
// a = 2.3; // a = 2.3;
// } // }
auto* var = Var("a", ty.i32(), ast::StorageClass::kNone, Expr(2_i)); auto* var = Var("a", ty.i32(), Expr(2_i));
WrapInFunction(var, Assign(Source{{12, 34}}, "a", 2.3_f)); WrapInFunction(var, Assign(Source{{12, 34}}, "a", 2.3_f));
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -135,7 +132,7 @@ TEST_F(ResolverAssignmentValidationTest, AssignIncompatibleTypesInNestedBlockSta
// } // }
// } // }
auto* var = Var("a", ty.i32(), ast::StorageClass::kNone, Expr(2_i)); auto* var = Var("a", ty.i32(), Expr(2_i));
auto* inner_block = Block(Decl(var), Assign(Source{{12, 34}}, "a", 2.3_f)); auto* inner_block = Block(Decl(var), Assign(Source{{12, 34}}, "a", 2.3_f));
auto* outer_block = Block(inner_block); auto* outer_block = Block(inner_block);
WrapInFunction(outer_block); WrapInFunction(outer_block);
@ -149,7 +146,7 @@ TEST_F(ResolverAssignmentValidationTest, AssignToScalar_Fail) {
// var my_var : i32 = 2i; // var my_var : i32 = 2i;
// 1 = my_var; // 1 = my_var;
WrapInFunction(Var("my_var", ty.i32(), ast::StorageClass::kNone, Expr(2_i)), // WrapInFunction(Var("my_var", ty.i32(), Expr(2_i)), //
Assign(Expr(Source{{12, 34}}, 1_i), "my_var")); Assign(Expr(Source{{12, 34}}, 1_i), "my_var"));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
@ -160,7 +157,7 @@ TEST_F(ResolverAssignmentValidationTest, AssignCompatibleTypes_Pass) {
// var a : i32 = 1i; // var a : i32 = 1i;
// a = 2i; // a = 2i;
// a = 3; // a = 3;
WrapInFunction(Var("a", ty.i32(), ast::StorageClass::kNone, Expr(1_i)), // WrapInFunction(Var("a", ty.i32(), Expr(1_i)), //
Assign("a", 2_i), // Assign("a", 2_i), //
Assign("a", 3_a)); Assign("a", 3_a));
@ -173,7 +170,7 @@ TEST_F(ResolverAssignmentValidationTest, AssignCompatibleTypesThroughAlias_Pass)
// a = 2u; // a = 2u;
// a = 3; // a = 3;
auto* myint = Alias("myint", ty.u32()); auto* myint = Alias("myint", ty.u32());
WrapInFunction(Var("a", ty.Of(myint), ast::StorageClass::kNone, Expr(1_u)), // WrapInFunction(Var("a", ty.Of(myint), Expr(1_u)), //
Assign("a", 2_u), // Assign("a", 2_u), //
Assign("a", 3_a)); Assign("a", 3_a));
@ -184,8 +181,8 @@ TEST_F(ResolverAssignmentValidationTest, AssignCompatibleTypesInferRHSLoad_Pass)
// var a : i32 = 2i; // var a : i32 = 2i;
// var b : i32 = 3i; // var b : i32 = 3i;
// a = b; // a = b;
WrapInFunction(Var("a", ty.i32(), ast::StorageClass::kNone, Expr(2_i)), // WrapInFunction(Var("a", ty.i32(), Expr(2_i)), //
Var("b", ty.i32(), ast::StorageClass::kNone, Expr(3_i)), // Var("b", ty.i32(), Expr(3_i)), //
Assign("a", "b")); Assign("a", "b"));
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -237,16 +234,8 @@ TEST_F(ResolverAssignmentValidationTest, AssignNonConstructible_Handle) {
ast::Access::kWrite); ast::Access::kWrite);
}; };
GlobalVar("a", make_type(), ast::StorageClass::kNone, GlobalVar("a", make_type(), Binding(0), Group(0));
utils::Vector{ GlobalVar("b", make_type(), Binding(1), Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
GlobalVar("b", make_type(), ast::StorageClass::kNone,
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(0u),
});
WrapInFunction(Assign(Source{{56, 78}}, "a", "b")); WrapInFunction(Assign(Source{{56, 78}}, "a", "b"));
@ -263,10 +252,7 @@ TEST_F(ResolverAssignmentValidationTest, AssignNonConstructible_Atomic) {
Member("a", ty.atomic(ty.i32())), Member("a", ty.atomic(ty.i32())),
}); });
GlobalVar(Source{{12, 34}}, "v", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar(Source{{12, 34}}, "v", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite,
utils::Vector{ Binding(0), Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
WrapInFunction(Assign(Source{{56, 78}}, MemberAccessor("v", "a"), MemberAccessor("v", "a"))); WrapInFunction(Assign(Source{{56, 78}}, MemberAccessor("v", "a"), MemberAccessor("v", "a")));
@ -283,10 +269,7 @@ TEST_F(ResolverAssignmentValidationTest, AssignNonConstructible_RuntimeArray) {
Member("a", ty.array(ty.f32())), Member("a", ty.array(ty.f32())),
}); });
GlobalVar(Source{{12, 34}}, "v", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar(Source{{12, 34}}, "v", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite,
utils::Vector{ Binding(0), Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
WrapInFunction(Assign(Source{{56, 78}}, MemberAccessor("v", "a"), MemberAccessor("v", "a"))); WrapInFunction(Assign(Source{{56, 78}}, MemberAccessor("v", "a"), MemberAccessor("v", "a")));
@ -305,7 +288,7 @@ TEST_F(ResolverAssignmentValidationTest, AssignToPhony_NonConstructibleStruct_Fa
auto* s = Structure("S", utils::Vector{ auto* s = Structure("S", utils::Vector{
Member("arr", ty.array<i32>()), Member("arr", ty.array<i32>()),
}); });
GlobalVar("s", ty.Of(s), ast::StorageClass::kStorage, GroupAndBinding(0, 0)); GlobalVar("s", ty.Of(s), ast::StorageClass::kStorage, Group(0), Binding(0));
WrapInFunction(Assign(Phony(), Expr(Source{{12, 34}}, "s"))); WrapInFunction(Assign(Phony(), Expr(Source{{12, 34}}, "s")));
@ -327,7 +310,7 @@ TEST_F(ResolverAssignmentValidationTest, AssignToPhony_DynamicArray_Fail) {
auto* s = Structure("S", utils::Vector{ auto* s = Structure("S", utils::Vector{
Member("arr", ty.array<i32>()), Member("arr", ty.array<i32>()),
}); });
GlobalVar("s", ty.Of(s), ast::StorageClass::kStorage, GroupAndBinding(0, 0)); GlobalVar("s", ty.Of(s), ast::StorageClass::kStorage, Group(0), Binding(0));
WrapInFunction(Assign(Phony(), MemberAccessor(Source{{12, 34}}, "s", "arr"))); WrapInFunction(Assign(Phony(), MemberAccessor(Source{{12, 34}}, "s", "arr")));
@ -377,11 +360,11 @@ TEST_F(ResolverAssignmentValidationTest, AssignToPhony_Pass) {
auto* U = Structure("U", utils::Vector{ auto* U = Structure("U", utils::Vector{
Member("i", ty.i32()), Member("i", ty.i32()),
}); });
GlobalVar("tex", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), GlobalVar("tex", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), Group(0),
GroupAndBinding(0, 0)); Binding(0));
GlobalVar("smp", ty.sampler(ast::SamplerKind::kSampler), GroupAndBinding(0, 1)); GlobalVar("smp", ty.sampler(ast::SamplerKind::kSampler), Group(0), Binding(1));
GlobalVar("u", ty.Of(U), ast::StorageClass::kUniform, GroupAndBinding(0, 2)); GlobalVar("u", ty.Of(U), ast::StorageClass::kUniform, Group(0), Binding(2));
GlobalVar("s", ty.Of(S), ast::StorageClass::kStorage, GroupAndBinding(0, 3)); GlobalVar("s", ty.Of(S), ast::StorageClass::kStorage, Group(0), Binding(3));
GlobalVar("wg", ty.array<f32, 10>(), ast::StorageClass::kWorkgroup); GlobalVar("wg", ty.array<f32, 10>(), ast::StorageClass::kWorkgroup);
WrapInFunction(Assign(Phony(), 1_i), // WrapInFunction(Assign(Phony(), 1_i), //

5
src/tint/resolver/atomics_test.cc
View File

@ -47,10 +47,7 @@ TEST_F(ResolverAtomicTest, GlobalWorkgroupU32) {
TEST_F(ResolverAtomicTest, GlobalStorageStruct) { TEST_F(ResolverAtomicTest, GlobalStorageStruct) {
auto* s = Structure("s", utils::Vector{Member("a", ty.atomic(Source{{12, 34}}, ty.i32()))}); auto* s = Structure("s", utils::Vector{Member("a", ty.atomic(Source{{12, 34}}, ty.i32()))});
auto* g = GlobalVar("g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, auto* g = GlobalVar("g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite,
utils::Vector{ Binding(0), Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
ASSERT_TRUE(TypeOf(g)->Is<sem::Reference>()); ASSERT_TRUE(TypeOf(g)->Is<sem::Reference>());

16
src/tint/resolver/atomics_validation_test.cc
View File

@ -34,15 +34,15 @@ TEST_F(ResolverAtomicValidationTest, StorageClass_WorkGroup) {
TEST_F(ResolverAtomicValidationTest, StorageClass_Storage) { TEST_F(ResolverAtomicValidationTest, StorageClass_Storage) {
GlobalVar("g", ty.atomic(Source{{12, 34}}, ty.i32()), ast::StorageClass::kStorage, GlobalVar("g", ty.atomic(Source{{12, 34}}, ty.i32()), ast::StorageClass::kStorage,
ast::Access::kReadWrite, GroupAndBinding(0, 0)); ast::Access::kReadWrite, Group(0), Binding(0));
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
} }
TEST_F(ResolverAtomicValidationTest, StorageClass_Storage_Struct) { TEST_F(ResolverAtomicValidationTest, StorageClass_Storage_Struct) {
auto* s = Structure("s", utils::Vector{Member("a", ty.atomic(Source{{12, 34}}, ty.i32()))}); auto* s = Structure("s", utils::Vector{Member("a", ty.atomic(Source{{12, 34}}, ty.i32()))});
GlobalVar("g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Group(0),
GroupAndBinding(0, 0)); Binding(0));
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
} }
@ -210,7 +210,7 @@ TEST_F(ResolverAtomicValidationTest, InvalidStorageClass_Complex) {
TEST_F(ResolverAtomicValidationTest, Struct_AccessMode_Read) { TEST_F(ResolverAtomicValidationTest, Struct_AccessMode_Read) {
auto* s = Structure("s", utils::Vector{Member("a", ty.atomic(Source{{12, 34}}, ty.i32()))}); auto* s = Structure("s", utils::Vector{Member("a", ty.atomic(Source{{12, 34}}, ty.i32()))});
GlobalVar(Source{{56, 78}}, "g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar(Source{{56, 78}}, "g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead,
GroupAndBinding(0, 0)); Group(0), Binding(0));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
@ -222,7 +222,7 @@ TEST_F(ResolverAtomicValidationTest, Struct_AccessMode_Read) {
TEST_F(ResolverAtomicValidationTest, InvalidAccessMode_Struct) { TEST_F(ResolverAtomicValidationTest, InvalidAccessMode_Struct) {
auto* s = Structure("s", utils::Vector{Member("a", ty.atomic(Source{{12, 34}}, ty.i32()))}); auto* s = Structure("s", utils::Vector{Member("a", ty.atomic(Source{{12, 34}}, ty.i32()))});
GlobalVar(Source{{56, 78}}, "g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar(Source{{56, 78}}, "g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead,
GroupAndBinding(0, 0)); Group(0), Binding(0));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
@ -240,7 +240,7 @@ TEST_F(ResolverAtomicValidationTest, InvalidAccessMode_StructOfStruct) {
Structure("Inner", utils::Vector{Member("m", ty.atomic(Source{{12, 34}}, ty.i32()))}); Structure("Inner", utils::Vector{Member("m", ty.atomic(Source{{12, 34}}, ty.i32()))});
auto* Outer = Structure("Outer", utils::Vector{Member("m", ty.Of(Inner))}); auto* Outer = Structure("Outer", utils::Vector{Member("m", ty.Of(Inner))});
GlobalVar(Source{{56, 78}}, "g", ty.Of(Outer), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar(Source{{56, 78}}, "g", ty.Of(Outer), ast::StorageClass::kStorage, ast::Access::kRead,
GroupAndBinding(0, 0)); Group(0), Binding(0));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
@ -258,7 +258,7 @@ TEST_F(ResolverAtomicValidationTest, InvalidAccessMode_StructOfStructOfArray) {
Structure("Inner", utils::Vector{Member(Source{{12, 34}}, "m", ty.atomic(ty.i32()))}); Structure("Inner", utils::Vector{Member(Source{{12, 34}}, "m", ty.atomic(ty.i32()))});
auto* Outer = Structure("Outer", utils::Vector{Member("m", ty.Of(Inner))}); auto* Outer = Structure("Outer", utils::Vector{Member("m", ty.Of(Inner))});
GlobalVar(Source{{56, 78}}, "g", ty.Of(Outer), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar(Source{{56, 78}}, "g", ty.Of(Outer), ast::StorageClass::kStorage, ast::Access::kRead,
GroupAndBinding(0, 0)); Group(0), Binding(0));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
@ -300,7 +300,7 @@ TEST_F(ResolverAtomicValidationTest, InvalidAccessMode_Complex) {
auto* s1 = Structure("S1", utils::Vector{Member("x", ty.Of(s2))}); auto* s1 = Structure("S1", utils::Vector{Member("x", ty.Of(s2))});
auto* s0 = Structure("S0", utils::Vector{Member("x", ty.Of(s1))}); auto* s0 = Structure("S0", utils::Vector{Member("x", ty.Of(s1))});
GlobalVar(Source{{56, 78}}, "g", ty.Of(s0), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar(Source{{56, 78}}, "g", ty.Of(s0), ast::StorageClass::kStorage, ast::Access::kRead,
GroupAndBinding(0, 0)); Group(0), Binding(0));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),

71
src/tint/resolver/attribute_validation_test.cc
View File

@ -701,10 +701,10 @@ TEST_P(VariableAttributeTest, IsValid) {
auto& params = GetParam(); auto& params = GetParam();
if (IsBindingAttribute(params.kind)) { if (IsBindingAttribute(params.kind)) {
GlobalVar("a", ty.sampler(ast::SamplerKind::kSampler), ast::StorageClass::kNone, nullptr, GlobalVar("a", ty.sampler(ast::SamplerKind::kSampler),
createAttributes(Source{{12, 34}}, *this, params.kind)); createAttributes(Source{{12, 34}}, *this, params.kind));
} else { } else {
GlobalVar("a", ty.f32(), ast::StorageClass::kPrivate, nullptr, GlobalVar("a", ty.f32(), ast::StorageClass::kPrivate,
createAttributes(Source{{12, 34}}, *this, params.kind)); createAttributes(Source{{12, 34}}, *this, params.kind));
} }
@ -736,11 +736,8 @@ INSTANTIATE_TEST_SUITE_P(ResolverAttributeValidationTest,
TEST_F(VariableAttributeTest, DuplicateAttribute) { TEST_F(VariableAttributeTest, DuplicateAttribute) {
GlobalVar("a", ty.sampler(ast::SamplerKind::kSampler), GlobalVar("a", ty.sampler(ast::SamplerKind::kSampler),
utils::Vector{ create<ast::BindingAttribute>(Source{{12, 34}}, 2u), create<ast::GroupAttribute>(2u),
create<ast::BindingAttribute>(Source{{12, 34}}, 2u), create<ast::BindingAttribute>(Source{{56, 78}}, 3u));
create<ast::GroupAttribute>(2u),
create<ast::BindingAttribute>(Source{{56, 78}}, 3u),
});
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
@ -1003,8 +1000,7 @@ TEST_F(ResourceAttributeTest, StorageBufferMissingBinding) {
} }
TEST_F(ResourceAttributeTest, TextureMissingBinding) { TEST_F(ResourceAttributeTest, TextureMissingBinding) {
GlobalVar(Source{{12, 34}}, "G", ty.depth_texture(ast::TextureDimension::k2d), GlobalVar(Source{{12, 34}}, "G", ty.depth_texture(ast::TextureDimension::k2d));
ast::StorageClass::kNone);
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
@ -1012,8 +1008,7 @@ TEST_F(ResourceAttributeTest, TextureMissingBinding) {
} }
TEST_F(ResourceAttributeTest, SamplerMissingBinding) { TEST_F(ResourceAttributeTest, SamplerMissingBinding) {
GlobalVar(Source{{12, 34}}, "G", ty.sampler(ast::SamplerKind::kSampler), GlobalVar(Source{{12, 34}}, "G", ty.sampler(ast::SamplerKind::kSampler));
ast::StorageClass::kNone);
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
@ -1021,11 +1016,7 @@ TEST_F(ResourceAttributeTest, SamplerMissingBinding) {
} }
TEST_F(ResourceAttributeTest, BindingPairMissingBinding) { TEST_F(ResourceAttributeTest, BindingPairMissingBinding) {
GlobalVar(Source{{12, 34}}, "G", ty.sampler(ast::SamplerKind::kSampler), GlobalVar(Source{{12, 34}}, "G", ty.sampler(ast::SamplerKind::kSampler), Group(1));
ast::StorageClass::kNone,
utils::Vector{
create<ast::GroupAttribute>(1u),
});
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
@ -1033,11 +1024,7 @@ TEST_F(ResourceAttributeTest, BindingPairMissingBinding) {
} }
TEST_F(ResourceAttributeTest, BindingPairMissingGroup) { TEST_F(ResourceAttributeTest, BindingPairMissingGroup) {
GlobalVar(Source{{12, 34}}, "G", ty.sampler(ast::SamplerKind::kSampler), GlobalVar(Source{{12, 34}}, "G", ty.sampler(ast::SamplerKind::kSampler), Binding(1));
ast::StorageClass::kNone,
utils::Vector{
create<ast::BindingAttribute>(1u),
});
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
@ -1046,24 +1033,14 @@ TEST_F(ResourceAttributeTest, BindingPairMissingGroup) {
TEST_F(ResourceAttributeTest, BindingPointUsedTwiceByEntryPoint) { TEST_F(ResourceAttributeTest, BindingPointUsedTwiceByEntryPoint) {
GlobalVar(Source{{12, 34}}, "A", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), GlobalVar(Source{{12, 34}}, "A", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()),
ast::StorageClass::kNone, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
GlobalVar(Source{{56, 78}}, "B", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), GlobalVar(Source{{56, 78}}, "B", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()),
ast::StorageClass::kNone, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
Func("F", utils::Empty, ty.void_(), Func("F", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("a", ty.vec4<f32>(), ast::StorageClass::kNone, Decl(Var("a", ty.vec4<f32>(), Call("textureLoad", "A", vec2<i32>(1_i, 2_i), 0_i))),
Call("textureLoad", "A", vec2<i32>(1_i, 2_i), 0_i))), Decl(Var("b", ty.vec4<f32>(), Call("textureLoad", "B", vec2<i32>(1_i, 2_i), 0_i))),
Decl(Var("b", ty.vec4<f32>(), ast::StorageClass::kNone,
Call("textureLoad", "B", vec2<i32>(1_i, 2_i), 0_i))),
}, },
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kFragment), Stage(ast::PipelineStage::kFragment),
@ -1078,30 +1055,20 @@ TEST_F(ResourceAttributeTest, BindingPointUsedTwiceByEntryPoint) {
TEST_F(ResourceAttributeTest, BindingPointUsedTwiceByDifferentEntryPoints) { TEST_F(ResourceAttributeTest, BindingPointUsedTwiceByDifferentEntryPoints) {
GlobalVar(Source{{12, 34}}, "A", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), GlobalVar(Source{{12, 34}}, "A", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()),
ast::StorageClass::kNone, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
GlobalVar(Source{{56, 78}}, "B", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), GlobalVar(Source{{56, 78}}, "B", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()),
ast::StorageClass::kNone, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
Func("F_A", utils::Empty, ty.void_(), Func("F_A", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("a", ty.vec4<f32>(), ast::StorageClass::kNone, Decl(Var("a", ty.vec4<f32>(), Call("textureLoad", "A", vec2<i32>(1_i, 2_i), 0_i))),
Call("textureLoad", "A", vec2<i32>(1_i, 2_i), 0_i))),
}, },
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kFragment), Stage(ast::PipelineStage::kFragment),
}); });
Func("F_B", utils::Empty, ty.void_(), Func("F_B", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("b", ty.vec4<f32>(), ast::StorageClass::kNone, Decl(Var("b", ty.vec4<f32>(), Call("textureLoad", "B", vec2<i32>(1_i, 2_i), 0_i))),
Call("textureLoad", "B", vec2<i32>(1_i, 2_i), 0_i))),
}, },
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kFragment), Stage(ast::PipelineStage::kFragment),
@ -1111,11 +1078,7 @@ TEST_F(ResourceAttributeTest, BindingPointUsedTwiceByDifferentEntryPoints) {
} }
TEST_F(ResourceAttributeTest, BindingPointOnNonResource) { TEST_F(ResourceAttributeTest, BindingPointOnNonResource) {
GlobalVar(Source{{12, 34}}, "G", ty.f32(), ast::StorageClass::kPrivate, GlobalVar(Source{{12, 34}}, "G", ty.f32(), ast::StorageClass::kPrivate, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),

2
src/tint/resolver/bitcast_validation_test.cc
View File

@ -113,7 +113,7 @@ TEST_P(ResolverBitcastValidationTestInvalidSrcTy, Test) {
auto dst = std::get<1>(GetParam()); auto dst = std::get<1>(GetParam());
auto* cast = Bitcast(dst.ast(*this), Expr(Source{{12, 34}}, "src")); auto* cast = Bitcast(dst.ast(*this), Expr(Source{{12, 34}}, "src"));
WrapInFunction(Let("src", nullptr, src.expr(*this, 0)), cast); WrapInFunction(Let("src", src.expr(*this, 0)), cast);
auto expected = auto expected =
"12:34 error: '" + src.sem(*this)->FriendlyName(Symbols()) + "' cannot be bitcast"; "12:34 error: '" + src.sem(*this)->FriendlyName(Symbols()) + "' cannot be bitcast";

13
src/tint/resolver/builtin_test.cc
View File

@ -212,11 +212,8 @@ using ResolverBuiltinArrayTest = ResolverTest;
TEST_F(ResolverBuiltinArrayTest, ArrayLength_Vector) { TEST_F(ResolverBuiltinArrayTest, ArrayLength_Vector) {
auto* ary = ty.array<i32>(); auto* ary = ty.array<i32>();
auto* str = Structure("S", utils::Vector{Member("x", ary)}); auto* str = Structure("S", utils::Vector{Member("x", ary)});
GlobalVar("a", ty.Of(str), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("a", ty.Of(str), ast::StorageClass::kStorage, ast::Access::kRead, Binding(0),
utils::Vector{ Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
auto* call = Call("arrayLength", AddressOf(MemberAccessor("a", "x"))); auto* call = Call("arrayLength", AddressOf(MemberAccessor("a", "x")));
WrapInFunction(call); WrapInFunction(call);
@ -2146,11 +2143,7 @@ class ResolverBuiltinTest_TextureOperation : public ResolverTestWithParam<Textur
void add_call_param(std::string name, const ast::Type* type, ExpressionList* call_params) { void add_call_param(std::string name, const ast::Type* type, ExpressionList* call_params) {
if (type->IsAnyOf<ast::Texture, ast::Sampler>()) { if (type->IsAnyOf<ast::Texture, ast::Sampler>()) {
GlobalVar(name, type, GlobalVar(name, type, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
} else { } else {
GlobalVar(name, type, ast::StorageClass::kPrivate); GlobalVar(name, type, ast::StorageClass::kPrivate);

2
src/tint/resolver/builtin_validation_test.cc
View File

@ -305,7 +305,7 @@ TEST_P(BuiltinTextureConstExprArgValidationTest, GlobalConst) {
overload.BuildSamplerVariable(this); overload.BuildSamplerVariable(this);
// Build the module-scope const 'G' with the offset value // Build the module-scope const 'G' with the offset value
GlobalConst("G", nullptr, expr({}, *this)); GlobalConst("G", expr({}, *this));
auto args = overload.args(this); auto args = overload.args(this);
auto*& arg_to_replace = (param.position == Position::kFirst) ? args.Front() : args.Back(); auto*& arg_to_replace = (param.position == Position::kFirst) ? args.Front() : args.Back();

4
src/tint/resolver/call_validation_test.cc
View File

@ -250,7 +250,7 @@ TEST_F(ResolverCallValidationTest, LetPointer) {
ty.void_(), utils::Empty); ty.void_(), utils::Empty);
auto* v = Var("v", ty.i32()); auto* v = Var("v", ty.i32());
auto* p = Let("p", ty.pointer(ty.i32(), ast::StorageClass::kFunction), AddressOf(v)); auto* p = Let("p", ty.pointer(ty.i32(), ast::StorageClass::kFunction), AddressOf(v));
auto* c = Var("c", ty.i32(), ast::StorageClass::kNone, Call("x", Expr(Source{{12, 34}}, p))); auto* c = Var("c", ty.i32(), Call("x", Expr(Source{{12, 34}}, p)));
Func("main", utils::Empty, ty.void_(), Func("main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(v), Decl(v),
@ -281,7 +281,7 @@ TEST_F(ResolverCallValidationTest, LetPointerPrivate) {
ty.void_(), utils::Empty); ty.void_(), utils::Empty);
auto* v = GlobalVar("v", ty.i32(), ast::StorageClass::kPrivate); auto* v = GlobalVar("v", ty.i32(), ast::StorageClass::kPrivate);
auto* p = Let("p", ty.pointer(ty.i32(), ast::StorageClass::kPrivate), AddressOf(v)); auto* p = Let("p", ty.pointer(ty.i32(), ast::StorageClass::kPrivate), AddressOf(v));
auto* c = Var("c", ty.i32(), ast::StorageClass::kNone, Call("foo", Expr(Source{{12, 34}}, p))); auto* c = Var("c", ty.i32(), Call("foo", Expr(Source{{12, 34}}, p)));
Func("main", utils::Empty, ty.void_(), Func("main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(p), Decl(p),

28
src/tint/resolver/compound_assignment_validation_test.cc
View File

@ -30,7 +30,7 @@ using ResolverCompoundAssignmentValidationTest = ResolverTest;
TEST_F(ResolverCompoundAssignmentValidationTest, CompatibleTypes) { TEST_F(ResolverCompoundAssignmentValidationTest, CompatibleTypes) {
// var a : i32 = 2; // var a : i32 = 2;
// a += 2 // a += 2
auto* var = Var("a", ty.i32(), ast::StorageClass::kNone, Expr(2_i)); auto* var = Var("a", ty.i32(), Expr(2_i));
WrapInFunction(var, CompoundAssign(Source{{12, 34}}, "a", 2_i, ast::BinaryOp::kAdd)); WrapInFunction(var, CompoundAssign(Source{{12, 34}}, "a", 2_i, ast::BinaryOp::kAdd));
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -41,7 +41,7 @@ TEST_F(ResolverCompoundAssignmentValidationTest, CompatibleTypesThroughAlias) {
// var a : myint = 2; // var a : myint = 2;
// a += 2 // a += 2
auto* myint = Alias("myint", ty.i32()); auto* myint = Alias("myint", ty.i32());
auto* var = Var("a", ty.Of(myint), ast::StorageClass::kNone, Expr(2_i)); auto* var = Var("a", ty.Of(myint), Expr(2_i));
WrapInFunction(var, CompoundAssign(Source{{12, 34}}, "a", 2_i, ast::BinaryOp::kAdd)); WrapInFunction(var, CompoundAssign(Source{{12, 34}}, "a", 2_i, ast::BinaryOp::kAdd));
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -66,7 +66,7 @@ TEST_F(ResolverCompoundAssignmentValidationTest, IncompatibleTypes) {
// a += 2.3; // a += 2.3;
// } // }
auto* var = Var("a", ty.i32(), ast::StorageClass::kNone, Expr(2_i)); auto* var = Var("a", ty.i32(), Expr(2_i));
auto* assign = CompoundAssign(Source{{12, 34}}, "a", 2.3_f, ast::BinaryOp::kAdd); auto* assign = CompoundAssign(Source{{12, 34}}, "a", 2.3_f, ast::BinaryOp::kAdd);
WrapInFunction(var, assign); WrapInFunction(var, assign);
@ -83,7 +83,7 @@ TEST_F(ResolverCompoundAssignmentValidationTest, IncompatibleOp) {
// a |= 2.0; // a |= 2.0;
// } // }
auto* var = Var("a", ty.f32(), ast::StorageClass::kNone, Expr(1_f)); auto* var = Var("a", ty.f32(), Expr(1_f));
auto* assign = CompoundAssign(Source{{12, 34}}, "a", 2_f, ast::BinaryOp::kOr); auto* assign = CompoundAssign(Source{{12, 34}}, "a", 2_f, ast::BinaryOp::kOr);
WrapInFunction(var, assign); WrapInFunction(var, assign);
@ -100,7 +100,7 @@ TEST_F(ResolverCompoundAssignmentValidationTest, VectorScalar_Pass) {
// a += 1.0; // a += 1.0;
// } // }
auto* var = Var("a", ty.vec4<f32>(), ast::StorageClass::kNone); auto* var = Var("a", ty.vec4<f32>());
auto* assign = CompoundAssign(Source{{12, 34}}, "a", 1_f, ast::BinaryOp::kAdd); auto* assign = CompoundAssign(Source{{12, 34}}, "a", 1_f, ast::BinaryOp::kAdd);
WrapInFunction(var, assign); WrapInFunction(var, assign);
@ -114,7 +114,7 @@ TEST_F(ResolverCompoundAssignmentValidationTest, ScalarVector_Fail) {
// a += vec4<f32>(); // a += vec4<f32>();
// } // }
auto* var = Var("a", ty.f32(), ast::StorageClass::kNone); auto* var = Var("a", ty.f32());
auto* assign = CompoundAssign(Source{{12, 34}}, "a", vec4<f32>(), ast::BinaryOp::kAdd); auto* assign = CompoundAssign(Source{{12, 34}}, "a", vec4<f32>(), ast::BinaryOp::kAdd);
WrapInFunction(var, assign); WrapInFunction(var, assign);
@ -130,7 +130,7 @@ TEST_F(ResolverCompoundAssignmentValidationTest, MatrixScalar_Pass) {
// a *= 2.0; // a *= 2.0;
// } // }
auto* var = Var("a", ty.mat4x4<f32>(), ast::StorageClass::kNone); auto* var = Var("a", ty.mat4x4<f32>());
auto* assign = CompoundAssign(Source{{12, 34}}, "a", 2_f, ast::BinaryOp::kMultiply); auto* assign = CompoundAssign(Source{{12, 34}}, "a", 2_f, ast::BinaryOp::kMultiply);
WrapInFunction(var, assign); WrapInFunction(var, assign);
@ -144,7 +144,7 @@ TEST_F(ResolverCompoundAssignmentValidationTest, ScalarMatrix_Fail) {
// a *= mat4x4(); // a *= mat4x4();
// } // }
auto* var = Var("a", ty.f32(), ast::StorageClass::kNone); auto* var = Var("a", ty.f32());
auto* assign = CompoundAssign(Source{{12, 34}}, "a", mat4x4<f32>(), ast::BinaryOp::kMultiply); auto* assign = CompoundAssign(Source{{12, 34}}, "a", mat4x4<f32>(), ast::BinaryOp::kMultiply);
WrapInFunction(var, assign); WrapInFunction(var, assign);
@ -160,7 +160,7 @@ TEST_F(ResolverCompoundAssignmentValidationTest, VectorMatrix_Pass) {
// a *= mat4x4(); // a *= mat4x4();
// } // }
auto* var = Var("a", ty.vec4<f32>(), ast::StorageClass::kNone); auto* var = Var("a", ty.vec4<f32>());
auto* assign = CompoundAssign(Source{{12, 34}}, "a", mat4x4<f32>(), ast::BinaryOp::kMultiply); auto* assign = CompoundAssign(Source{{12, 34}}, "a", mat4x4<f32>(), ast::BinaryOp::kMultiply);
WrapInFunction(var, assign); WrapInFunction(var, assign);
@ -174,7 +174,7 @@ TEST_F(ResolverCompoundAssignmentValidationTest, VectorMatrix_ColumnMismatch) {
// a *= mat4x2(); // a *= mat4x2();
// } // }
auto* var = Var("a", ty.vec4<f32>(), ast::StorageClass::kNone); auto* var = Var("a", ty.vec4<f32>());
auto* assign = CompoundAssign(Source{{12, 34}}, "a", mat4x2<f32>(), ast::BinaryOp::kMultiply); auto* assign = CompoundAssign(Source{{12, 34}}, "a", mat4x2<f32>(), ast::BinaryOp::kMultiply);
WrapInFunction(var, assign); WrapInFunction(var, assign);
@ -192,7 +192,7 @@ TEST_F(ResolverCompoundAssignmentValidationTest, VectorMatrix_ResultMismatch) {
// a *= mat2x4(); // a *= mat2x4();
// } // }
auto* var = Var("a", ty.vec4<f32>(), ast::StorageClass::kNone); auto* var = Var("a", ty.vec4<f32>());
auto* assign = CompoundAssign(Source{{12, 34}}, "a", mat2x4<f32>(), ast::BinaryOp::kMultiply); auto* assign = CompoundAssign(Source{{12, 34}}, "a", mat2x4<f32>(), ast::BinaryOp::kMultiply);
WrapInFunction(var, assign); WrapInFunction(var, assign);
@ -208,7 +208,7 @@ TEST_F(ResolverCompoundAssignmentValidationTest, MatrixVector_Fail) {
// a *= vec4(); // a *= vec4();
// } // }
auto* var = Var("a", ty.mat4x4<f32>(), ast::StorageClass::kNone); auto* var = Var("a", ty.mat4x4<f32>());
auto* assign = CompoundAssign(Source{{12, 34}}, "a", vec4<f32>(), ast::BinaryOp::kMultiply); auto* assign = CompoundAssign(Source{{12, 34}}, "a", vec4<f32>(), ast::BinaryOp::kMultiply);
WrapInFunction(var, assign); WrapInFunction(var, assign);
@ -234,7 +234,7 @@ TEST_F(ResolverCompoundAssignmentValidationTest, ReadOnlyBuffer) {
// a += 1i; // a += 1i;
// } // }
GlobalVar(Source{{12, 34}}, "a", ty.i32(), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar(Source{{12, 34}}, "a", ty.i32(), ast::StorageClass::kStorage, ast::Access::kRead,
GroupAndBinding(0, 0)); Group(0), Binding(0));
WrapInFunction(CompoundAssign(Source{{56, 78}}, "a", 1_i, ast::BinaryOp::kAdd)); WrapInFunction(CompoundAssign(Source{{56, 78}}, "a", 1_i, ast::BinaryOp::kAdd));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
@ -245,7 +245,7 @@ TEST_F(ResolverCompoundAssignmentValidationTest, ReadOnlyBuffer) {
TEST_F(ResolverCompoundAssignmentValidationTest, LhsConstant) { TEST_F(ResolverCompoundAssignmentValidationTest, LhsConstant) {
// let a = 1i; // let a = 1i;
// a += 1i; // a += 1i;
auto* a = Let(Source{{12, 34}}, "a", nullptr, Expr(1_i)); auto* a = Let(Source{{12, 34}}, "a", Expr(1_i));
WrapInFunction(a, CompoundAssign(Expr(Source{{56, 78}}, "a"), 1_i, ast::BinaryOp::kAdd)); WrapInFunction(a, CompoundAssign(Expr(Source{{56, 78}}, "a"), 1_i, ast::BinaryOp::kAdd));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());

24
src/tint/resolver/const_eval_test.cc
View File

@ -3019,7 +3019,7 @@ TEST_P(ResolverConstEvalUnaryOpTest, Test) {
[&](auto&& values) { [&](auto&& values) {
using T = decltype(values.expect); using T = decltype(values.expect);
auto* expr = create<ast::UnaryOpExpression>(op, Expr(values.input)); auto* expr = create<ast::UnaryOpExpression>(op, Expr(values.input));
GlobalConst("C", nullptr, expr); GlobalConst("C", expr);
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -3117,7 +3117,7 @@ INSTANTIATE_TEST_SUITE_P(Negation,
// number. // number.
TEST_F(ResolverConstEvalTest, UnaryNegateLowestAbstract) { TEST_F(ResolverConstEvalTest, UnaryNegateLowestAbstract) {
// const break_me = -(-9223372036854775808); // const break_me = -(-9223372036854775808);
auto* c = GlobalConst("break_me", nullptr, Negation(Negation(Expr(9223372036854775808_a)))); auto* c = GlobalConst("break_me", Negation(Negation(Expr(9223372036854775808_a))));
(void)c; (void)c;
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
auto* sem = Sem().Get(c); auto* sem = Sem().Get(c);
@ -3171,7 +3171,7 @@ TEST_P(ResolverConstEvalBinaryOpTest, Test) {
} }
auto* expr = create<ast::BinaryExpression>(op, Expr(lhs), Expr(rhs)); auto* expr = create<ast::BinaryExpression>(op, Expr(lhs), Expr(rhs));
GlobalConst("C", nullptr, expr); GlobalConst("C", expr);
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -3274,34 +3274,34 @@ INSTANTIATE_TEST_SUITE_P(Sub,
OpSubFloatCases<f16>())))); OpSubFloatCases<f16>()))));
TEST_F(ResolverConstEvalTest, BinaryAbstractAddOverflow_AInt) { TEST_F(ResolverConstEvalTest, BinaryAbstractAddOverflow_AInt) {
GlobalConst("c", nullptr, Add(Source{{1, 1}}, Expr(AInt::Highest()), 1_a)); GlobalConst("c", Add(Source{{1, 1}}, Expr(AInt::Highest()), 1_a));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"1:1 error: '-9223372036854775808' cannot be represented as 'abstract-int'"); "1:1 error: '-9223372036854775808' cannot be represented as 'abstract-int'");
} }
TEST_F(ResolverConstEvalTest, BinaryAbstractAddUnderflow_AInt) { TEST_F(ResolverConstEvalTest, BinaryAbstractAddUnderflow_AInt) {
GlobalConst("c", nullptr, Add(Source{{1, 1}}, Expr(AInt::Lowest()), -1_a)); GlobalConst("c", Add(Source{{1, 1}}, Expr(AInt::Lowest()), -1_a));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"1:1 error: '9223372036854775807' cannot be represented as 'abstract-int'"); "1:1 error: '9223372036854775807' cannot be represented as 'abstract-int'");
} }
TEST_F(ResolverConstEvalTest, BinaryAbstractAddOverflow_AFloat) { TEST_F(ResolverConstEvalTest, BinaryAbstractAddOverflow_AFloat) {
GlobalConst("c", nullptr, Add(Source{{1, 1}}, Expr(AFloat::Highest()), AFloat::Highest())); GlobalConst("c", Add(Source{{1, 1}}, Expr(AFloat::Highest()), AFloat::Highest()));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), "1:1 error: 'inf' cannot be represented as 'abstract-float'"); EXPECT_EQ(r()->error(), "1:1 error: 'inf' cannot be represented as 'abstract-float'");
} }
TEST_F(ResolverConstEvalTest, BinaryAbstractAddUnderflow_AFloat) { TEST_F(ResolverConstEvalTest, BinaryAbstractAddUnderflow_AFloat) {
GlobalConst("c", nullptr, Add(Source{{1, 1}}, Expr(AFloat::Lowest()), AFloat::Lowest())); GlobalConst("c", Add(Source{{1, 1}}, Expr(AFloat::Lowest()), AFloat::Lowest()));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), "1:1 error: '-inf' cannot be represented as 'abstract-float'"); EXPECT_EQ(r()->error(), "1:1 error: '-inf' cannot be represented as 'abstract-float'");
} }
TEST_F(ResolverConstEvalTest, BinaryAbstractMixed_ScalarScalar) { TEST_F(ResolverConstEvalTest, BinaryAbstractMixed_ScalarScalar) {
auto* a = Const("a", nullptr, Expr(1_a)); // AInt auto* a = Const("a", Expr(1_a)); // AInt
auto* b = Const("b", nullptr, Expr(2.3_a)); // AFloat auto* b = Const("b", Expr(2.3_a)); // AFloat
auto* c = Add(Expr("a"), Expr("b")); auto* c = Add(Expr("a"), Expr("b"));
WrapInFunction(a, b, c); WrapInFunction(a, b, c);
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -3313,8 +3313,8 @@ TEST_F(ResolverConstEvalTest, BinaryAbstractMixed_ScalarScalar) {
} }
TEST_F(ResolverConstEvalTest, BinaryAbstractMixed_ScalarVector) { TEST_F(ResolverConstEvalTest, BinaryAbstractMixed_ScalarVector) {
auto* a = Const("a", nullptr, Expr(1_a)); // AInt auto* a = Const("a", Expr(1_a)); // AInt
auto* b = Const("b", nullptr, Construct(ty.vec(nullptr, 3), Expr(2.3_a))); // AFloat auto* b = Const("b", Construct(ty.vec(nullptr, 3), Expr(2.3_a))); // AFloat
auto* c = Add(Expr("a"), Expr("b")); auto* c = Add(Expr("a"), Expr("b"));
WrapInFunction(a, b, c); WrapInFunction(a, b, c);
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -3372,7 +3372,7 @@ TEST_P(ResolverConstEvalBuiltinTest, Test) {
using T = std::decay_t<decltype(result)>; using T = std::decay_t<decltype(result)>;
auto* expr = Call(sem::str(builtin), std::move(args)); auto* expr = Call(sem::str(builtin), std::move(args));
GlobalConst("C", nullptr, expr); GlobalConst("C", expr);
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();

14
src/tint/resolver/dependency_graph_test.cc
View File

@ -970,7 +970,7 @@ TEST_F(ResolverDependencyGraphCyclicRefTest, Mixed_RecursiveDependencies) {
utils::Vector{Return(Expr(Source{{1, 10}}, "Z"))}); utils::Vector{Return(Expr(Source{{1, 10}}, "Z"))});
Alias(Source{{2, 1}}, "A", ty.type_name(Source{{2, 10}}, "S")); Alias(Source{{2, 1}}, "A", ty.type_name(Source{{2, 10}}, "S"));
Structure(Source{{3, 1}}, "S", utils::Vector{Member("a", ty.type_name(Source{{3, 10}}, "A"))}); Structure(Source{{3, 1}}, "S", utils::Vector{Member("a", ty.type_name(Source{{3, 10}}, "A"))});
GlobalVar(Source{{4, 1}}, "Z", nullptr, Expr(Source{{4, 10}}, "L")); GlobalVar(Source{{4, 1}}, "Z", Expr(Source{{4, 10}}, "L"));
Alias(Source{{5, 1}}, "R", ty.type_name(Source{{5, 10}}, "A")); Alias(Source{{5, 1}}, "R", ty.type_name(Source{{5, 10}}, "A"));
GlobalConst(Source{{6, 1}}, "L", ty.type_name(Source{{5, 5}}, "S"), Expr(Source{{5, 10}}, "Z")); GlobalConst(Source{{6, 1}}, "L", ty.type_name(Source{{5, 5}}, "S"), Expr(Source{{5, 10}}, "Z"));
@ -1092,9 +1092,9 @@ TEST_F(ResolverDependencyGraphOrderedGlobalsTest, EnableFirst) {
// Although all enable directives in a valid WGSL program must go before any other global // Although all enable directives in a valid WGSL program must go before any other global
// declaration, a transform may produce such a AST tree that has some declarations before enable // declaration, a transform may produce such a AST tree that has some declarations before enable
// nodes. DependencyGraph should deal with these cases. // nodes. DependencyGraph should deal with these cases.
auto* var_1 = GlobalVar("SYMBOL1", ty.i32(), nullptr); auto* var_1 = GlobalVar("SYMBOL1", ty.i32());
auto* enable_1 = Enable(ast::Extension::kF16); auto* enable_1 = Enable(ast::Extension::kF16);
auto* var_2 = GlobalVar("SYMBOL2", ty.f32(), nullptr); auto* var_2 = GlobalVar("SYMBOL2", ty.f32());
auto* enable_2 = Enable(ast::Extension::kF16); auto* enable_2 = Enable(ast::Extension::kF16);
EXPECT_THAT(AST().GlobalDeclarations(), ElementsAre(var_1, enable_1, var_2, enable_2)); EXPECT_THAT(AST().GlobalDeclarations(), ElementsAre(var_1, enable_1, var_2, enable_2));
@ -1298,10 +1298,10 @@ TEST_F(ResolverDependencyGraphTraversalTest, SymbolsReached) {
TEST_F(ResolverDependencyGraphTraversalTest, InferredType) { TEST_F(ResolverDependencyGraphTraversalTest, InferredType) {
// Check that the nullptr of the var / const / let type doesn't make things explode // Check that the nullptr of the var / const / let type doesn't make things explode
GlobalVar("a", nullptr, Expr(1_i)); GlobalVar("a", Expr(1_i));
GlobalConst("b", nullptr, Expr(1_i)); GlobalConst("b", Expr(1_i));
WrapInFunction(Var("c", nullptr, Expr(1_i)), // WrapInFunction(Var("c", Expr(1_i)), //
Let("d", nullptr, Expr(1_i))); Let("d", Expr(1_i)));
Build(); Build();
} }

48
src/tint/resolver/evaluation_stage_test.cc
View File

@ -51,7 +51,7 @@ TEST_F(ResolverEvaluationStageTest, Vector_Ctor) {
TEST_F(ResolverEvaluationStageTest, Vector_Ctor_Const_Const) { TEST_F(ResolverEvaluationStageTest, Vector_Ctor_Const_Const) {
// const f = 1.f; // const f = 1.f;
// vec2<f32>(f, f); // vec2<f32>(f, f);
auto* f = Const("f", nullptr, Expr(1_f)); auto* f = Const("f", Expr(1_f));
auto* expr = vec2<f32>(f, f); auto* expr = vec2<f32>(f, f);
WrapInFunction(f, expr); WrapInFunction(f, expr);
@ -63,7 +63,7 @@ TEST_F(ResolverEvaluationStageTest, Vector_Ctor_Const_Const) {
TEST_F(ResolverEvaluationStageTest, Vector_Ctor_Runtime_Runtime) { TEST_F(ResolverEvaluationStageTest, Vector_Ctor_Runtime_Runtime) {
// var f = 1.f; // var f = 1.f;
// vec2<f32>(f, f); // vec2<f32>(f, f);
auto* f = Var("f", nullptr, Expr(1_f)); auto* f = Var("f", Expr(1_f));
auto* expr = vec2<f32>(f, f); auto* expr = vec2<f32>(f, f);
WrapInFunction(f, expr); WrapInFunction(f, expr);
@ -75,7 +75,7 @@ TEST_F(ResolverEvaluationStageTest, Vector_Ctor_Runtime_Runtime) {
TEST_F(ResolverEvaluationStageTest, Vector_Conv_Const) { TEST_F(ResolverEvaluationStageTest, Vector_Conv_Const) {
// const f = 1.f; // const f = 1.f;
// vec2<u32>(vec2<f32>(f)); // vec2<u32>(vec2<f32>(f));
auto* f = Const("f", nullptr, Expr(1_f)); auto* f = Const("f", Expr(1_f));
auto* expr = vec2<u32>(vec2<f32>(f)); auto* expr = vec2<u32>(vec2<f32>(f));
WrapInFunction(f, expr); WrapInFunction(f, expr);
@ -87,7 +87,7 @@ TEST_F(ResolverEvaluationStageTest, Vector_Conv_Const) {
TEST_F(ResolverEvaluationStageTest, Vector_Conv_Runtime) { TEST_F(ResolverEvaluationStageTest, Vector_Conv_Runtime) {
// var f = 1.f; // var f = 1.f;
// vec2<u32>(vec2<f32>(f)); // vec2<u32>(vec2<f32>(f));
auto* f = Var("f", nullptr, Expr(1_f)); auto* f = Var("f", Expr(1_f));
auto* expr = vec2<u32>(vec2<f32>(f)); auto* expr = vec2<u32>(vec2<f32>(f));
WrapInFunction(f, expr); WrapInFunction(f, expr);
@ -115,7 +115,7 @@ TEST_F(ResolverEvaluationStageTest, Array_Ctor) {
TEST_F(ResolverEvaluationStageTest, Array_Ctor_Const_Const) { TEST_F(ResolverEvaluationStageTest, Array_Ctor_Const_Const) {
// const f = 1.f; // const f = 1.f;
// array<f32, 2>(f, f); // array<f32, 2>(f, f);
auto* f = Const("f", nullptr, Expr(1_f)); auto* f = Const("f", Expr(1_f));
auto* expr = Construct(ty.array<f32, 2>(), f, f); auto* expr = Construct(ty.array<f32, 2>(), f, f);
WrapInFunction(f, expr); WrapInFunction(f, expr);
@ -128,8 +128,8 @@ TEST_F(ResolverEvaluationStageTest, Array_Ctor_Const_Override) {
// const f1 = 1.f; // const f1 = 1.f;
// override f2 = 2.f; // override f2 = 2.f;
// array<f32, 2>(f1, f2); // array<f32, 2>(f1, f2);
auto* f1 = Const("f1", nullptr, Expr(1_f)); auto* f1 = Const("f1", Expr(1_f));
auto* f2 = Override("f2", nullptr, Expr(2_f)); auto* f2 = Override("f2", Expr(2_f));
auto* expr = Construct(ty.array<f32, 2>(), f1, f2); auto* expr = Construct(ty.array<f32, 2>(), f1, f2);
WrapInFunction(f1, expr); WrapInFunction(f1, expr);
@ -143,8 +143,8 @@ TEST_F(ResolverEvaluationStageTest, Array_Ctor_Override_Runtime) {
// override f1 = 1.f; // override f1 = 1.f;
// var f2 = 2.f; // var f2 = 2.f;
// array<f32, 2>(f1, f2); // array<f32, 2>(f1, f2);
auto* f1 = Override("f1", nullptr, Expr(1_f)); auto* f1 = Override("f1", Expr(1_f));
auto* f2 = Var("f2", nullptr, Expr(2_f)); auto* f2 = Var("f2", Expr(2_f));
auto* expr = Construct(ty.array<f32, 2>(), f1, f2); auto* expr = Construct(ty.array<f32, 2>(), f1, f2);
WrapInFunction(f2, expr); WrapInFunction(f2, expr);
@ -158,8 +158,8 @@ TEST_F(ResolverEvaluationStageTest, Array_Ctor_Const_Runtime) {
// const f1 = 1.f; // const f1 = 1.f;
// var f2 = 2.f; // var f2 = 2.f;
// array<f32, 2>(f1, f2); // array<f32, 2>(f1, f2);
auto* f1 = Const("f1", nullptr, Expr(1_f)); auto* f1 = Const("f1", Expr(1_f));
auto* f2 = Var("f2", nullptr, Expr(2_f)); auto* f2 = Var("f2", Expr(2_f));
auto* expr = Construct(ty.array<f32, 2>(), f1, f2); auto* expr = Construct(ty.array<f32, 2>(), f1, f2);
WrapInFunction(f1, f2, expr); WrapInFunction(f1, f2, expr);
@ -172,7 +172,7 @@ TEST_F(ResolverEvaluationStageTest, Array_Ctor_Const_Runtime) {
TEST_F(ResolverEvaluationStageTest, Array_Ctor_Runtime_Runtime) { TEST_F(ResolverEvaluationStageTest, Array_Ctor_Runtime_Runtime) {
// var f = 1.f; // var f = 1.f;
// array<f32, 2>(f, f); // array<f32, 2>(f, f);
auto* f = Var("f", nullptr, Expr(1_f)); auto* f = Var("f", Expr(1_f));
auto* expr = Construct(ty.array<f32, 2>(), f, f); auto* expr = Construct(ty.array<f32, 2>(), f, f);
WrapInFunction(f, expr); WrapInFunction(f, expr);
@ -185,8 +185,8 @@ TEST_F(ResolverEvaluationStageTest, IndexAccessor_Const_Const) {
// const vec = vec4<f32>(); // const vec = vec4<f32>();
// const idx = 1_i; // const idx = 1_i;
// vec[idx] // vec[idx]
auto* vec = Const("vec", nullptr, vec4<f32>()); auto* vec = Const("vec", vec4<f32>());
auto* idx = Const("idx", nullptr, Expr(1_i)); auto* idx = Const("idx", Expr(1_i));
auto* expr = IndexAccessor(vec, idx); auto* expr = IndexAccessor(vec, idx);
WrapInFunction(vec, idx, expr); WrapInFunction(vec, idx, expr);
@ -200,8 +200,8 @@ TEST_F(ResolverEvaluationStageTest, IndexAccessor_Runtime_Const) {
// var vec = vec4<f32>(); // var vec = vec4<f32>();
// const idx = 1_i; // const idx = 1_i;
// vec[idx] // vec[idx]
auto* vec = Var("vec", nullptr, vec4<f32>()); auto* vec = Var("vec", vec4<f32>());
auto* idx = Const("idx", nullptr, Expr(1_i)); auto* idx = Const("idx", Expr(1_i));
auto* expr = IndexAccessor(vec, idx); auto* expr = IndexAccessor(vec, idx);
WrapInFunction(vec, idx, expr); WrapInFunction(vec, idx, expr);
@ -215,8 +215,8 @@ TEST_F(ResolverEvaluationStageTest, IndexAccessor_Const_Override) {
// const vec = vec4<f32>(); // const vec = vec4<f32>();
// override idx = 1_i; // override idx = 1_i;
// vec[idx] // vec[idx]
auto* vec = Const("vec", nullptr, vec4<f32>()); auto* vec = Const("vec", vec4<f32>());
auto* idx = Override("idx", nullptr, Expr(1_i)); auto* idx = Override("idx", Expr(1_i));
auto* expr = IndexAccessor(vec, idx); auto* expr = IndexAccessor(vec, idx);
WrapInFunction(vec, expr); WrapInFunction(vec, expr);
@ -230,8 +230,8 @@ TEST_F(ResolverEvaluationStageTest, IndexAccessor_Const_Runtime) {
// const vec = vec4<f32>(); // const vec = vec4<f32>();
// let idx = 1_i; // let idx = 1_i;
// vec[idx] // vec[idx]
auto* vec = Const("vec", nullptr, vec4<f32>()); auto* vec = Const("vec", vec4<f32>());
auto* idx = Let("idx", nullptr, Expr(1_i)); auto* idx = Let("idx", Expr(1_i));
auto* expr = IndexAccessor(vec, idx); auto* expr = IndexAccessor(vec, idx);
WrapInFunction(vec, idx, expr); WrapInFunction(vec, idx, expr);
@ -244,7 +244,7 @@ TEST_F(ResolverEvaluationStageTest, IndexAccessor_Const_Runtime) {
TEST_F(ResolverEvaluationStageTest, Swizzle_Const) { TEST_F(ResolverEvaluationStageTest, Swizzle_Const) {
// const vec = S(); // const vec = S();
// vec.m // vec.m
auto* vec = Const("vec", nullptr, vec4<f32>()); auto* vec = Const("vec", vec4<f32>());
auto* expr = MemberAccessor(vec, "xz"); auto* expr = MemberAccessor(vec, "xz");
WrapInFunction(vec, expr); WrapInFunction(vec, expr);
@ -256,7 +256,7 @@ TEST_F(ResolverEvaluationStageTest, Swizzle_Const) {
TEST_F(ResolverEvaluationStageTest, Swizzle_Runtime) { TEST_F(ResolverEvaluationStageTest, Swizzle_Runtime) {
// var vec = S(); // var vec = S();
// vec.m // vec.m
auto* vec = Var("vec", nullptr, vec4<f32>()); auto* vec = Var("vec", vec4<f32>());
auto* expr = MemberAccessor(vec, "rg"); auto* expr = MemberAccessor(vec, "rg");
WrapInFunction(vec, expr); WrapInFunction(vec, expr);
@ -270,7 +270,7 @@ TEST_F(ResolverEvaluationStageTest, MemberAccessor_Const) {
// const str = S(); // const str = S();
// str.m // str.m
Structure("S", utils::Vector{Member("m", ty.i32())}); Structure("S", utils::Vector{Member("m", ty.i32())});
auto* str = Const("str", nullptr, Construct(ty.type_name("S"))); auto* str = Const("str", Construct(ty.type_name("S")));
auto* expr = MemberAccessor(str, "m"); auto* expr = MemberAccessor(str, "m");
WrapInFunction(str, expr); WrapInFunction(str, expr);
@ -284,7 +284,7 @@ TEST_F(ResolverEvaluationStageTest, MemberAccessor_Runtime) {
// var str = S(); // var str = S();
// str.m // str.m
Structure("S", utils::Vector{Member("m", ty.i32())}); Structure("S", utils::Vector{Member("m", ty.i32())});
auto* str = Var("str", nullptr, Construct(ty.type_name("S"))); auto* str = Var("str", Construct(ty.type_name("S")));
auto* expr = MemberAccessor(str, "m"); auto* expr = MemberAccessor(str, "m");
WrapInFunction(str, expr); WrapInFunction(str, expr);

6
src/tint/resolver/function_validation_test.cc
View File

@ -51,7 +51,7 @@ TEST_F(ResolverFunctionValidationTest, LocalConflictsWithParameter) {
// } // }
Func("func", utils::Vector{Param(Source{{12, 34}}, "common_name", ty.f32())}, ty.void_(), Func("func", utils::Vector{Param(Source{{12, 34}}, "common_name", ty.f32())}, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let(Source{{56, 78}}, "common_name", nullptr, Expr(1_i))), Decl(Let(Source{{56, 78}}, "common_name", Expr(1_i))),
}); });
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
@ -67,7 +67,7 @@ TEST_F(ResolverFunctionValidationTest, NestedLocalMayShadowParameter) {
// } // }
Func("func", utils::Vector{Param(Source{{12, 34}}, "common_name", ty.f32())}, ty.void_(), Func("func", utils::Vector{Param(Source{{12, 34}}, "common_name", ty.f32())}, ty.void_(),
utils::Vector{ utils::Vector{
Block(Decl(Let(Source{{56, 78}}, "common_name", nullptr, Expr(1_i)))), Block(Decl(Let(Source{{56, 78}}, "common_name", Expr(1_i)))),
}); });
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -388,7 +388,7 @@ TEST_F(ResolverFunctionValidationTest, CannotCallFunctionAtModuleScope) {
utils::Vector{ utils::Vector{
Return(1_i), Return(1_i),
}); });
GlobalVar("x", nullptr, Call(Source{{12, 34}}, "F"), ast::StorageClass::kPrivate); GlobalVar("x", Call(Source{{12, 34}}, "F"), ast::StorageClass::kPrivate);
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), R"(12:34 error: functions cannot be called at module-scope)"); EXPECT_EQ(r()->error(), R"(12:34 error: functions cannot be called at module-scope)");

25
src/tint/resolver/host_shareable_validation_test.cc
View File

@ -27,10 +27,7 @@ TEST_F(ResolverHostShareableValidationTest, BoolMember) {
auto* s = Structure("S", utils::Vector{Member(Source{{12, 34}}, "x", ty.bool_())}); auto* s = Structure("S", utils::Vector{Member(Source{{12, 34}}, "x", ty.bool_())});
GlobalVar(Source{{56, 78}}, "g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar(Source{{56, 78}}, "g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead,
utils::Vector{ Binding(0), Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -45,10 +42,7 @@ TEST_F(ResolverHostShareableValidationTest, BoolVectorMember) {
auto* s = Structure("S", utils::Vector{Member(Source{{12, 34}}, "x", ty.vec3<bool>())}); auto* s = Structure("S", utils::Vector{Member(Source{{12, 34}}, "x", ty.vec3<bool>())});
GlobalVar(Source{{56, 78}}, "g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar(Source{{56, 78}}, "g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead,
utils::Vector{ Binding(0), Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -64,10 +58,7 @@ TEST_F(ResolverHostShareableValidationTest, Aliases) {
auto* s = Structure("S", utils::Vector{Member(Source{{12, 34}}, "x", ty.Of(a1))}); auto* s = Structure("S", utils::Vector{Member(Source{{12, 34}}, "x", ty.Of(a1))});
auto* a2 = Alias("a2", ty.Of(s)); auto* a2 = Alias("a2", ty.Of(s));
GlobalVar(Source{{56, 78}}, "g", ty.Of(a2), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar(Source{{56, 78}}, "g", ty.Of(a2), ast::StorageClass::kStorage, ast::Access::kRead,
utils::Vector{ Binding(0), Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -86,10 +77,7 @@ TEST_F(ResolverHostShareableValidationTest, NestedStructures) {
auto* s = Structure("S", utils::Vector{Member(Source{{7, 8}}, "m", ty.Of(i3))}); auto* s = Structure("S", utils::Vector{Member(Source{{7, 8}}, "m", ty.Of(i3))});
GlobalVar(Source{{9, 10}}, "g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar(Source{{9, 10}}, "g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead,
utils::Vector{ Binding(0), Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -128,10 +116,7 @@ TEST_F(ResolverHostShareableValidationTest, NoError) {
auto* s = Structure("S", utils::Vector{Member(Source{{7, 8}}, "m", ty.Of(i3))}); auto* s = Structure("S", utils::Vector{Member(Source{{7, 8}}, "m", ty.Of(i3))});
GlobalVar(Source{{9, 10}}, "g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar(Source{{9, 10}}, "g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead,
utils::Vector{ Binding(0), Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
} }

26
src/tint/resolver/increment_decrement_validation_test.cc
View File

@ -27,7 +27,7 @@ using ResolverIncrementDecrementValidationTest = ResolverTest;
TEST_F(ResolverIncrementDecrementValidationTest, Increment_Signed) { TEST_F(ResolverIncrementDecrementValidationTest, Increment_Signed) {
// var a : i32 = 2; // var a : i32 = 2;
// a++; // a++;
auto* var = Var("a", ty.i32(), ast::StorageClass::kNone, Expr(2_i)); auto* var = Var("a", ty.i32(), Expr(2_i));
WrapInFunction(var, Increment(Source{{12, 34}}, "a")); WrapInFunction(var, Increment(Source{{12, 34}}, "a"));
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -36,7 +36,7 @@ TEST_F(ResolverIncrementDecrementValidationTest, Increment_Signed) {
TEST_F(ResolverIncrementDecrementValidationTest, Decrement_Signed) { TEST_F(ResolverIncrementDecrementValidationTest, Decrement_Signed) {
// var a : i32 = 2; // var a : i32 = 2;
// a--; // a--;
auto* var = Var("a", ty.i32(), ast::StorageClass::kNone, Expr(2_i)); auto* var = Var("a", ty.i32(), Expr(2_i));
WrapInFunction(var, Decrement(Source{{12, 34}}, "a")); WrapInFunction(var, Decrement(Source{{12, 34}}, "a"));
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -45,7 +45,7 @@ TEST_F(ResolverIncrementDecrementValidationTest, Decrement_Signed) {
TEST_F(ResolverIncrementDecrementValidationTest, Increment_Unsigned) { TEST_F(ResolverIncrementDecrementValidationTest, Increment_Unsigned) {
// var a : u32 = 2u; // var a : u32 = 2u;
// a++; // a++;
auto* var = Var("a", ty.u32(), ast::StorageClass::kNone, Expr(2_u)); auto* var = Var("a", ty.u32(), Expr(2_u));
WrapInFunction(var, Increment(Source{{12, 34}}, "a")); WrapInFunction(var, Increment(Source{{12, 34}}, "a"));
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -54,7 +54,7 @@ TEST_F(ResolverIncrementDecrementValidationTest, Increment_Unsigned) {
TEST_F(ResolverIncrementDecrementValidationTest, Decrement_Unsigned) { TEST_F(ResolverIncrementDecrementValidationTest, Decrement_Unsigned) {
// var a : u32 = 2u; // var a : u32 = 2u;
// a--; // a--;
auto* var = Var("a", ty.u32(), ast::StorageClass::kNone, Expr(2_u)); auto* var = Var("a", ty.u32(), Expr(2_u));
WrapInFunction(var, Decrement(Source{{12, 34}}, "a")); WrapInFunction(var, Decrement(Source{{12, 34}}, "a"));
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -74,7 +74,7 @@ TEST_F(ResolverIncrementDecrementValidationTest, ThroughPointer) {
TEST_F(ResolverIncrementDecrementValidationTest, ThroughArray) { TEST_F(ResolverIncrementDecrementValidationTest, ThroughArray) {
// var a : array<i32, 4_u>; // var a : array<i32, 4_u>;
// a[1i]++; // a[1i]++;
auto* var_a = Var("a", ty.array(ty.i32(), 4_u), ast::StorageClass::kNone); auto* var_a = Var("a", ty.array(ty.i32(), 4_u));
WrapInFunction(var_a, Increment(Source{{12, 34}}, IndexAccessor("a", 1_i))); WrapInFunction(var_a, Increment(Source{{12, 34}}, IndexAccessor("a", 1_i)));
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -83,7 +83,7 @@ TEST_F(ResolverIncrementDecrementValidationTest, ThroughArray) {
TEST_F(ResolverIncrementDecrementValidationTest, ThroughVector_Index) { TEST_F(ResolverIncrementDecrementValidationTest, ThroughVector_Index) {
// var a : vec4<i32>; // var a : vec4<i32>;
// a[1i]++; // a[1i]++;
auto* var_a = Var("a", ty.vec4(ty.i32()), ast::StorageClass::kNone); auto* var_a = Var("a", ty.vec4(ty.i32()));
WrapInFunction(var_a, Increment(Source{{12, 34}}, IndexAccessor("a", 1_i))); WrapInFunction(var_a, Increment(Source{{12, 34}}, IndexAccessor("a", 1_i)));
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -92,7 +92,7 @@ TEST_F(ResolverIncrementDecrementValidationTest, ThroughVector_Index) {
TEST_F(ResolverIncrementDecrementValidationTest, ThroughVector_Member) { TEST_F(ResolverIncrementDecrementValidationTest, ThroughVector_Member) {
// var a : vec4<i32>; // var a : vec4<i32>;
// a.y++; // a.y++;
auto* var_a = Var("a", ty.vec4(ty.i32()), ast::StorageClass::kNone); auto* var_a = Var("a", ty.vec4(ty.i32()));
WrapInFunction(var_a, Increment(Source{{12, 34}}, MemberAccessor("a", "y"))); WrapInFunction(var_a, Increment(Source{{12, 34}}, MemberAccessor("a", "y")));
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -101,7 +101,7 @@ TEST_F(ResolverIncrementDecrementValidationTest, ThroughVector_Member) {
TEST_F(ResolverIncrementDecrementValidationTest, Float) { TEST_F(ResolverIncrementDecrementValidationTest, Float) {
// var a : f32 = 2.0; // var a : f32 = 2.0;
// a++; // a++;
auto* var = Var("a", ty.f32(), ast::StorageClass::kNone, Expr(2_f)); auto* var = Var("a", ty.f32(), Expr(2_f));
auto* inc = Increment(Expr(Source{{12, 34}}, "a")); auto* inc = Increment(Expr(Source{{12, 34}}, "a"));
WrapInFunction(var, inc); WrapInFunction(var, inc);
@ -114,7 +114,7 @@ TEST_F(ResolverIncrementDecrementValidationTest, Float) {
TEST_F(ResolverIncrementDecrementValidationTest, Vector) { TEST_F(ResolverIncrementDecrementValidationTest, Vector) {
// var a : vec4<f32>; // var a : vec4<f32>;
// a++; // a++;
auto* var = Var("a", ty.vec4<i32>(), ast::StorageClass::kNone); auto* var = Var("a", ty.vec4<i32>());
auto* inc = Increment(Expr(Source{{12, 34}}, "a")); auto* inc = Increment(Expr(Source{{12, 34}}, "a"));
WrapInFunction(var, inc); WrapInFunction(var, inc);
@ -147,7 +147,7 @@ TEST_F(ResolverIncrementDecrementValidationTest, Literal) {
TEST_F(ResolverIncrementDecrementValidationTest, Constant) { TEST_F(ResolverIncrementDecrementValidationTest, Constant) {
// let a = 1; // let a = 1;
// a++; // a++;
auto* a = Let(Source{{12, 34}}, "a", nullptr, Expr(1_i)); auto* a = Let(Source{{12, 34}}, "a", Expr(1_i));
WrapInFunction(a, Increment(Expr(Source{{56, 78}}, "a"))); WrapInFunction(a, Increment(Expr(Source{{56, 78}}, "a")));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
@ -194,7 +194,7 @@ TEST_F(ResolverIncrementDecrementValidationTest, ReadOnlyBuffer) {
// a++; // a++;
// } // }
GlobalVar(Source{{12, 34}}, "a", ty.i32(), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar(Source{{12, 34}}, "a", ty.i32(), ast::StorageClass::kStorage, ast::Access::kRead,
GroupAndBinding(0, 0)); Group(0), Binding(0));
WrapInFunction(Increment(Source{{56, 78}}, "a")); WrapInFunction(Increment(Source{{56, 78}}, "a"));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
@ -213,7 +213,7 @@ TEST_F(ResolverIncrementDecrementValidationTest, InForLoopInit) {
// for (a++; ; ) { // for (a++; ; ) {
// break; // break;
// } // }
auto* a = Var("a", ty.i32(), ast::StorageClass::kNone, Expr(2_i)); auto* a = Var("a", ty.i32(), Expr(2_i));
auto* loop = For(Increment(Source{{56, 78}}, "a"), nullptr, nullptr, Block(Break())); auto* loop = For(Increment(Source{{56, 78}}, "a"), nullptr, nullptr, Block(Break()));
WrapInFunction(a, loop); WrapInFunction(a, loop);
@ -225,7 +225,7 @@ TEST_F(ResolverIncrementDecrementValidationTest, InForLoopCont) {
// for (; ; a++) { // for (; ; a++) {
// break; // break;
// } // }
auto* a = Var("a", ty.i32(), ast::StorageClass::kNone, Expr(2_i)); auto* a = Var("a", ty.i32(), Expr(2_i));
auto* loop = For(nullptr, nullptr, Increment(Source{{56, 78}}, "a"), Block(Break())); auto* loop = For(nullptr, nullptr, Increment(Source{{56, 78}}, "a"), Block(Break()));
WrapInFunction(a, loop); WrapInFunction(a, loop);

12
src/tint/resolver/inferred_type_test.cc
View File

@ -82,7 +82,7 @@ TEST_P(ResolverInferredTypeParamTest, GlobalConst_Pass) {
// const a = <type constructor>; // const a = <type constructor>;
auto* ctor_expr = params.create_value(*this, 0); auto* ctor_expr = params.create_value(*this, 0);
auto* a = GlobalConst("a", nullptr, ctor_expr); auto* a = GlobalConst("a", ctor_expr);
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
EXPECT_EQ(TypeOf(a), expected_type); EXPECT_EQ(TypeOf(a), expected_type);
@ -95,7 +95,7 @@ TEST_P(ResolverInferredTypeParamTest, GlobalVar_Pass) {
// var a = <type constructor>; // var a = <type constructor>;
auto* ctor_expr = params.create_value(*this, 0); auto* ctor_expr = params.create_value(*this, 0);
auto* var = GlobalVar("a", nullptr, ast::StorageClass::kPrivate, ctor_expr); auto* var = GlobalVar("a", ast::StorageClass::kPrivate, ctor_expr);
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
EXPECT_EQ(TypeOf(var)->UnwrapRef(), expected_type); EXPECT_EQ(TypeOf(var)->UnwrapRef(), expected_type);
@ -108,7 +108,7 @@ TEST_P(ResolverInferredTypeParamTest, LocalLet_Pass) {
// let a = <type constructor>; // let a = <type constructor>;
auto* ctor_expr = params.create_value(*this, 0); auto* ctor_expr = params.create_value(*this, 0);
auto* var = Let("a", nullptr, ctor_expr); auto* var = Let("a", ctor_expr);
WrapInFunction(var); WrapInFunction(var);
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -122,7 +122,7 @@ TEST_P(ResolverInferredTypeParamTest, LocalVar_Pass) {
// var a = <type constructor>; // var a = <type constructor>;
auto* ctor_expr = params.create_value(*this, 0); auto* ctor_expr = params.create_value(*this, 0);
auto* var = Var("a", nullptr, ast::StorageClass::kFunction, ctor_expr); auto* var = Var("a", ast::StorageClass::kFunction, ctor_expr);
WrapInFunction(var); WrapInFunction(var);
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -136,7 +136,7 @@ TEST_F(ResolverInferredTypeTest, InferArray_Pass) {
auto* expected_type = create<sem::Array>(create<sem::U32>(), 10u, 4u, 4u * 10u, 4u, 4u); auto* expected_type = create<sem::Array>(create<sem::U32>(), 10u, 4u, 4u * 10u, 4u, 4u);
auto* ctor_expr = Construct(type); auto* ctor_expr = Construct(type);
auto* var = Var("a", nullptr, ast::StorageClass::kFunction, ctor_expr); auto* var = Var("a", ast::StorageClass::kFunction, ctor_expr);
WrapInFunction(var); WrapInFunction(var);
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -155,7 +155,7 @@ TEST_F(ResolverInferredTypeTest, InferStruct_Pass) {
auto* ctor_expr = Construct(ty.Of(str)); auto* ctor_expr = Construct(ty.Of(str));
auto* var = Var("a", nullptr, ast::StorageClass::kFunction, ctor_expr); auto* var = Var("a", ast::StorageClass::kFunction, ctor_expr);
WrapInFunction(var); WrapInFunction(var);
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();

10
src/tint/resolver/materialize_test.cc
View File

@ -328,7 +328,7 @@ TEST_P(MaterializeAbstractNumericToConcreteType, Test) {
WrapInFunction(Decl(Let("a", target_ty(), abstract_expr))); WrapInFunction(Decl(Let("a", target_ty(), abstract_expr)));
break; break;
case Method::kAssign: case Method::kAssign:
WrapInFunction(Decl(Var("a", target_ty(), nullptr)), Assign("a", abstract_expr)); WrapInFunction(Decl(Var("a", target_ty())), Assign("a", abstract_expr));
break; break;
case Method::kPhonyAssign: case Method::kPhonyAssign:
WrapInFunction(Assign(Phony(), abstract_expr)); WrapInFunction(Assign(Phony(), abstract_expr));
@ -381,7 +381,7 @@ TEST_P(MaterializeAbstractNumericToConcreteType, Test) {
Stage(ast::PipelineStage::kCompute)}); Stage(ast::PipelineStage::kCompute)});
break; break;
case Method::kRuntimeIndex: case Method::kRuntimeIndex:
auto* runtime_index = Var("runtime_index", nullptr, Expr(1_i)); auto* runtime_index = Var("runtime_index", Expr(1_i));
WrapInFunction(runtime_index, IndexAccessor(abstract_expr, runtime_index)); WrapInFunction(runtime_index, IndexAccessor(abstract_expr, runtime_index));
break; break;
} }
@ -872,10 +872,10 @@ TEST_P(MaterializeAbstractNumericToDefaultType, Test) {
}; };
switch (method) { switch (method) {
case Method::kVar: case Method::kVar:
WrapInFunction(Decl(Var("a", nullptr, abstract_expr()))); WrapInFunction(Decl(Var("a", abstract_expr())));
break; break;
case Method::kLet: case Method::kLet:
WrapInFunction(Decl(Let("a", nullptr, abstract_expr()))); WrapInFunction(Decl(Let("a", abstract_expr())));
break; break;
case Method::kBuiltinArg: case Method::kBuiltinArg:
WrapInFunction(CallStmt(Call("min", abstract_expr(), abstract_expr()))); WrapInFunction(CallStmt(Call("min", abstract_expr(), abstract_expr())));
@ -904,7 +904,7 @@ TEST_P(MaterializeAbstractNumericToDefaultType, Test) {
WrapInFunction(IndexAccessor("arr", abstract_expr())); WrapInFunction(IndexAccessor("arr", abstract_expr()));
break; break;
case Method::kRuntimeIndex: case Method::kRuntimeIndex:
auto* runtime_index = Var("runtime_index", nullptr, Expr(1_i)); auto* runtime_index = Var("runtime_index", Expr(1_i));
WrapInFunction(runtime_index, IndexAccessor(abstract_expr(), runtime_index)); WrapInFunction(runtime_index, IndexAccessor(abstract_expr(), runtime_index));
break; break;
} }

16
src/tint/resolver/override_test.cc
View File

@ -50,7 +50,7 @@ TEST_F(ResolverOverrideTest, NonOverridable) {
} }
TEST_F(ResolverOverrideTest, WithId) { TEST_F(ResolverOverrideTest, WithId) {
auto* a = Override("a", ty.f32(), Expr(1_f), utils::Vector{Id(7u)}); auto* a = Override("a", ty.f32(), Expr(1_f), Id(7u));
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -69,10 +69,10 @@ TEST_F(ResolverOverrideTest, WithAndWithoutIds) {
std::vector<ast::Variable*> variables; std::vector<ast::Variable*> variables;
auto* a = Override("a", ty.f32(), Expr(1_f)); auto* a = Override("a", ty.f32(), Expr(1_f));
auto* b = Override("b", ty.f32(), Expr(1_f)); auto* b = Override("b", ty.f32(), Expr(1_f));
auto* c = Override("c", ty.f32(), Expr(1_f), utils::Vector{Id(2u)}); auto* c = Override("c", ty.f32(), Expr(1_f), Id(2u));
auto* d = Override("d", ty.f32(), Expr(1_f), utils::Vector{Id(4u)}); auto* d = Override("d", ty.f32(), Expr(1_f), Id(4u));
auto* e = Override("e", ty.f32(), Expr(1_f)); auto* e = Override("e", ty.f32(), Expr(1_f));
auto* f = Override("f", ty.f32(), Expr(1_f), utils::Vector{Id(1u)}); auto* f = Override("f", ty.f32(), Expr(1_f), Id(1u));
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -86,8 +86,8 @@ TEST_F(ResolverOverrideTest, WithAndWithoutIds) {
} }
TEST_F(ResolverOverrideTest, DuplicateIds) { TEST_F(ResolverOverrideTest, DuplicateIds) {
Override("a", ty.f32(), Expr(1_f), utils::Vector{Id(Source{{12, 34}}, 7u)}); Override("a", ty.f32(), Expr(1_f), Id(Source{{12, 34}}, 7u));
Override("b", ty.f32(), Expr(1_f), utils::Vector{Id(Source{{56, 78}}, 7u)}); Override("b", ty.f32(), Expr(1_f), Id(Source{{56, 78}}, 7u));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
@ -96,7 +96,7 @@ TEST_F(ResolverOverrideTest, DuplicateIds) {
} }
TEST_F(ResolverOverrideTest, IdTooLarge) { TEST_F(ResolverOverrideTest, IdTooLarge) {
Override("a", ty.f32(), Expr(1_f), utils::Vector{Id(Source{{12, 34}}, 65536u)}); Override("a", ty.f32(), Expr(1_f), Id(Source{{12, 34}}, 65536u));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
@ -106,7 +106,7 @@ TEST_F(ResolverOverrideTest, IdTooLarge) {
TEST_F(ResolverOverrideTest, F16_TemporallyBan) { TEST_F(ResolverOverrideTest, F16_TemporallyBan) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
Override(Source{{12, 34}}, "a", ty.f16(), Expr(1_h), utils::Vector{Id(1u)}); Override(Source{{12, 34}}, "a", ty.f16(), Expr(1_h), Id(1u));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());

16
src/tint/resolver/ptr_ref_test.cc
View File

@ -27,7 +27,7 @@ TEST_F(ResolverPtrRefTest, AddressOf) {
// var v : i32; // var v : i32;
// &v // &v
auto* v = Var("v", ty.i32(), ast::StorageClass::kNone); auto* v = Var("v", ty.i32());
auto* expr = AddressOf(v); auto* expr = AddressOf(v);
WrapInFunction(v, expr); WrapInFunction(v, expr);
@ -43,7 +43,7 @@ TEST_F(ResolverPtrRefTest, AddressOfThenDeref) {
// var v : i32; // var v : i32;
// *(&v) // *(&v)
auto* v = Var("v", ty.i32(), ast::StorageClass::kNone); auto* v = Var("v", ty.i32());
auto* expr = Deref(AddressOf(v)); auto* expr = Deref(AddressOf(v));
WrapInFunction(v, expr); WrapInFunction(v, expr);
@ -61,16 +61,8 @@ TEST_F(ResolverPtrRefTest, DefaultPtrStorageClass) {
auto* function = Var("f", ty.i32()); auto* function = Var("f", ty.i32());
auto* private_ = GlobalVar("p", ty.i32(), ast::StorageClass::kPrivate); auto* private_ = GlobalVar("p", ty.i32(), ast::StorageClass::kPrivate);
auto* workgroup = GlobalVar("w", ty.i32(), ast::StorageClass::kWorkgroup); auto* workgroup = GlobalVar("w", ty.i32(), ast::StorageClass::kWorkgroup);
auto* uniform = GlobalVar("ub", ty.Of(buf), ast::StorageClass::kUniform, auto* uniform = GlobalVar("ub", ty.Of(buf), ast::StorageClass::kUniform, Binding(0), Group(0));
utils::Vector{ auto* storage = GlobalVar("sb", ty.Of(buf), ast::StorageClass::kStorage, Binding(1), Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
auto* storage = GlobalVar("sb", ty.Of(buf), ast::StorageClass::kStorage,
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(0u),
});
auto* function_ptr = auto* function_ptr =
Let("f_ptr", ty.pointer(ty.i32(), ast::StorageClass::kFunction), AddressOf(function)); Let("f_ptr", ty.pointer(ty.i32(), ast::StorageClass::kFunction), AddressOf(function));

11
src/tint/resolver/ptr_ref_validation_test.cc
View File

@ -54,8 +54,7 @@ TEST_F(ResolverPtrRefValidationTest, AddressOfLet) {
TEST_F(ResolverPtrRefValidationTest, AddressOfHandle) { TEST_F(ResolverPtrRefValidationTest, AddressOfHandle) {
// @group(0) @binding(0) var t: texture_3d<f32>; // @group(0) @binding(0) var t: texture_3d<f32>;
// &t // &t
GlobalVar("t", ty.sampled_texture(ast::TextureDimension::k3d, ty.f32()), GlobalVar("t", ty.sampled_texture(ast::TextureDimension::k3d, ty.f32()), Group(0), Binding(0));
GroupAndBinding(0u, 0u));
auto* expr = AddressOf(Expr(Source{{12, 34}}, "t")); auto* expr = AddressOf(Expr(Source{{12, 34}}, "t"));
WrapInFunction(expr); WrapInFunction(expr);
@ -94,8 +93,7 @@ TEST_F(ResolverPtrRefValidationTest, AddressOfVectorComponent_IndexAccessor) {
TEST_F(ResolverPtrRefValidationTest, IndirectOfAddressOfHandle) { TEST_F(ResolverPtrRefValidationTest, IndirectOfAddressOfHandle) {
// @group(0) @binding(0) var t: texture_3d<f32>; // @group(0) @binding(0) var t: texture_3d<f32>;
// *&t // *&t
GlobalVar("t", ty.sampled_texture(ast::TextureDimension::k3d, ty.f32()), GlobalVar("t", ty.sampled_texture(ast::TextureDimension::k3d, ty.f32()), Group(0), Binding(0));
GroupAndBinding(0u, 0u));
auto* expr = Deref(AddressOf(Expr(Source{{12, 34}}, "t"))); auto* expr = Deref(AddressOf(Expr(Source{{12, 34}}, "t")));
WrapInFunction(expr); WrapInFunction(expr);
@ -144,10 +142,7 @@ TEST_F(ResolverPtrRefValidationTest, InferredPtrAccessMismatch) {
auto* inner = Structure("Inner", utils::Vector{Member("arr", ty.array<i32, 4>())}); auto* inner = Structure("Inner", utils::Vector{Member("arr", ty.array<i32, 4>())});
auto* buf = Structure("S", utils::Vector{Member("inner", ty.Of(inner))}); auto* buf = Structure("S", utils::Vector{Member("inner", ty.Of(inner))});
auto* storage = GlobalVar("s", ty.Of(buf), ast::StorageClass::kStorage, ast::Access::kReadWrite, auto* storage = GlobalVar("s", ty.Of(buf), ast::StorageClass::kStorage, ast::Access::kReadWrite,
utils::Vector{ Binding(0), Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
auto* expr = IndexAccessor(MemberAccessor(MemberAccessor(storage, "inner"), "arr"), 2_i); auto* expr = IndexAccessor(MemberAccessor(MemberAccessor(storage, "inner"), "arr"), 2_i);
auto* ptr = auto* ptr =

105
src/tint/resolver/resolver_test.cc
View File

@ -288,7 +288,7 @@ TEST_F(ResolverTest, Stmt_Call) {
} }
TEST_F(ResolverTest, Stmt_VariableDecl) { TEST_F(ResolverTest, Stmt_VariableDecl) {
auto* var = Var("my_var", ty.i32(), ast::StorageClass::kNone, Expr(2_i)); auto* var = Var("my_var", ty.i32(), Expr(2_i));
auto* init = var->constructor; auto* init = var->constructor;
auto* decl = Decl(var); auto* decl = Decl(var);
@ -302,7 +302,7 @@ TEST_F(ResolverTest, Stmt_VariableDecl) {
TEST_F(ResolverTest, Stmt_VariableDecl_Alias) { TEST_F(ResolverTest, Stmt_VariableDecl_Alias) {
auto* my_int = Alias("MyInt", ty.i32()); auto* my_int = Alias("MyInt", ty.i32());
auto* var = Var("my_var", ty.Of(my_int), ast::StorageClass::kNone, Expr(2_i)); auto* var = Var("my_var", ty.Of(my_int), Expr(2_i));
auto* init = var->constructor; auto* init = var->constructor;
auto* decl = Decl(var); auto* decl = Decl(var);
@ -336,24 +336,24 @@ TEST_F(ResolverTest, Stmt_VariableDecl_OuterScopeAfterInnerScope) {
// } // }
// Declare i32 "foo" inside a block // Declare i32 "foo" inside a block
auto* foo_i32 = Var("foo", ty.i32(), ast::StorageClass::kNone, Expr(2_i)); auto* foo_i32 = Var("foo", ty.i32(), Expr(2_i));
auto* foo_i32_init = foo_i32->constructor; auto* foo_i32_init = foo_i32->constructor;
auto* foo_i32_decl = Decl(foo_i32); auto* foo_i32_decl = Decl(foo_i32);
// Reference "foo" inside the block // Reference "foo" inside the block
auto* bar_i32 = Var("bar", ty.i32(), ast::StorageClass::kNone, Expr("foo")); auto* bar_i32 = Var("bar", ty.i32(), Expr("foo"));
auto* bar_i32_init = bar_i32->constructor; auto* bar_i32_init = bar_i32->constructor;
auto* bar_i32_decl = Decl(bar_i32); auto* bar_i32_decl = Decl(bar_i32);
auto* inner = Block(foo_i32_decl, bar_i32_decl); auto* inner = Block(foo_i32_decl, bar_i32_decl);
// Declare f32 "foo" at function scope // Declare f32 "foo" at function scope
auto* foo_f32 = Var("foo", ty.f32(), ast::StorageClass::kNone, Expr(2_f)); auto* foo_f32 = Var("foo", ty.f32(), Expr(2_f));
auto* foo_f32_init = foo_f32->constructor; auto* foo_f32_init = foo_f32->constructor;
auto* foo_f32_decl = Decl(foo_f32); auto* foo_f32_decl = Decl(foo_f32);
// Reference "foo" at function scope // Reference "foo" at function scope
auto* bar_f32 = Var("bar", ty.f32(), ast::StorageClass::kNone, Expr("foo")); auto* bar_f32 = Var("bar", ty.f32(), Expr("foo"));
auto* bar_f32_init = bar_f32->constructor; auto* bar_f32_init = bar_f32->constructor;
auto* bar_f32_decl = Decl(bar_f32); auto* bar_f32_decl = Decl(bar_f32);
@ -390,7 +390,7 @@ TEST_F(ResolverTest, Stmt_VariableDecl_ModuleScopeAfterFunctionScope) {
// } // }
// Declare i32 "foo" inside a function // Declare i32 "foo" inside a function
auto* fn_i32 = Var("foo", ty.i32(), ast::StorageClass::kNone, Expr(2_i)); auto* fn_i32 = Var("foo", ty.i32(), Expr(2_i));
auto* fn_i32_init = fn_i32->constructor; auto* fn_i32_init = fn_i32->constructor;
auto* fn_i32_decl = Decl(fn_i32); auto* fn_i32_decl = Decl(fn_i32);
Func("func_i32", utils::Empty, ty.void_(), utils::Vector{fn_i32_decl}); Func("func_i32", utils::Empty, ty.void_(), utils::Vector{fn_i32_decl});
@ -401,7 +401,7 @@ TEST_F(ResolverTest, Stmt_VariableDecl_ModuleScopeAfterFunctionScope) {
AST().AddGlobalVariable(mod_f32); AST().AddGlobalVariable(mod_f32);
// Reference "foo" in another function // Reference "foo" in another function
auto* fn_f32 = Var("bar", ty.f32(), ast::StorageClass::kNone, Expr("foo")); auto* fn_f32 = Var("bar", ty.f32(), Expr("foo"));
auto* fn_f32_init = fn_f32->constructor; auto* fn_f32_init = fn_f32->constructor;
auto* fn_f32_decl = Decl(fn_f32); auto* fn_f32_decl = Decl(fn_f32);
Func("func_f32", utils::Empty, ty.void_(), utils::Vector{fn_f32_decl}); Func("func_f32", utils::Empty, ty.void_(), utils::Vector{fn_f32_decl});
@ -451,7 +451,7 @@ TEST_F(ResolverTest, ArraySize_SignedLiteral) {
TEST_F(ResolverTest, ArraySize_UnsignedConst) { TEST_F(ResolverTest, ArraySize_UnsignedConst) {
// const size = 10u; // const size = 10u;
// var<private> a : array<f32, size>; // var<private> a : array<f32, size>;
GlobalConst("size", nullptr, Expr(10_u)); GlobalConst("size", Expr(10_u));
auto* a = GlobalVar("a", ty.array(ty.f32(), Expr("size")), ast::StorageClass::kPrivate); auto* a = GlobalVar("a", ty.array(ty.f32(), Expr("size")), ast::StorageClass::kPrivate);
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -466,7 +466,7 @@ TEST_F(ResolverTest, ArraySize_UnsignedConst) {
TEST_F(ResolverTest, ArraySize_SignedConst) { TEST_F(ResolverTest, ArraySize_SignedConst) {
// const size = 0; // const size = 0;
// var<private> a : array<f32, size>; // var<private> a : array<f32, size>;
GlobalConst("size", nullptr, Expr(10_i)); GlobalConst("size", Expr(10_i));
auto* a = GlobalVar("a", ty.array(ty.f32(), Expr("size")), ast::StorageClass::kPrivate); auto* a = GlobalVar("a", ty.array(ty.f32(), Expr("size")), ast::StorageClass::kPrivate);
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -633,7 +633,7 @@ TEST_F(ResolverTest, Expr_Identifier_GlobalConst) {
TEST_F(ResolverTest, Expr_Identifier_FunctionVariable_Const) { TEST_F(ResolverTest, Expr_Identifier_FunctionVariable_Const) {
auto* my_var_a = Expr("my_var"); auto* my_var_a = Expr("my_var");
auto* var = Let("my_var", ty.f32(), Construct(ty.f32())); auto* var = Let("my_var", ty.f32(), Construct(ty.f32()));
auto* decl = Decl(Var("b", ty.f32(), ast::StorageClass::kNone, my_var_a)); auto* decl = Decl(Var("b", ty.f32(), my_var_a));
Func("my_func", utils::Empty, ty.void_(), Func("my_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -776,12 +776,8 @@ TEST_F(ResolverTest, Function_Parameters) {
TEST_F(ResolverTest, Function_RegisterInputOutputVariables) { TEST_F(ResolverTest, Function_RegisterInputOutputVariables) {
auto* s = Structure("S", utils::Vector{Member("m", ty.u32())}); auto* s = Structure("S", utils::Vector{Member("m", ty.u32())});
auto* sb_var = auto* sb_var = GlobalVar("sb_var", ty.Of(s), ast::StorageClass::kStorage,
GlobalVar("sb_var", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, ast::Access::kReadWrite, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
auto* wg_var = GlobalVar("wg_var", ty.f32(), ast::StorageClass::kWorkgroup); auto* wg_var = GlobalVar("wg_var", ty.f32(), ast::StorageClass::kWorkgroup);
auto* priv_var = GlobalVar("priv_var", ty.f32(), ast::StorageClass::kPrivate); auto* priv_var = GlobalVar("priv_var", ty.f32(), ast::StorageClass::kPrivate);
@ -809,12 +805,8 @@ TEST_F(ResolverTest, Function_RegisterInputOutputVariables) {
TEST_F(ResolverTest, Function_RegisterInputOutputVariables_SubFunction) { TEST_F(ResolverTest, Function_RegisterInputOutputVariables_SubFunction) {
auto* s = Structure("S", utils::Vector{Member("m", ty.u32())}); auto* s = Structure("S", utils::Vector{Member("m", ty.u32())});
auto* sb_var = auto* sb_var = GlobalVar("sb_var", ty.Of(s), ast::StorageClass::kStorage,
GlobalVar("sb_var", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, ast::Access::kReadWrite, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
auto* wg_var = GlobalVar("wg_var", ty.f32(), ast::StorageClass::kWorkgroup); auto* wg_var = GlobalVar("wg_var", ty.f32(), ast::StorageClass::kWorkgroup);
auto* priv_var = GlobalVar("priv_var", ty.f32(), ast::StorageClass::kPrivate); auto* priv_var = GlobalVar("priv_var", ty.f32(), ast::StorageClass::kPrivate);
@ -1009,9 +1001,9 @@ TEST_F(ResolverTest, Function_WorkgroupSize_OverridableConsts) {
// @id(2) override depth = 2i; // @id(2) override depth = 2i;
// @compute @workgroup_size(width, height, depth) // @compute @workgroup_size(width, height, depth)
// fn main() {} // fn main() {}
auto* width = Override("width", ty.i32(), Expr(16_i), utils::Vector{Id(0)}); auto* width = Override("width", ty.i32(), Expr(16_i), Id(0));
auto* height = Override("height", ty.i32(), Expr(8_i), utils::Vector{Id(1)}); auto* height = Override("height", ty.i32(), Expr(8_i), Id(1));
auto* depth = Override("depth", ty.i32(), Expr(2_i), utils::Vector{Id(2)}); auto* depth = Override("depth", ty.i32(), Expr(2_i), Id(2));
auto* func = Func("main", utils::Empty, ty.void_(), utils::Empty, auto* func = Func("main", utils::Empty, ty.void_(), utils::Empty,
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kCompute), Stage(ast::PipelineStage::kCompute),
@ -1037,9 +1029,9 @@ TEST_F(ResolverTest, Function_WorkgroupSize_OverridableConsts_NoInit) {
// @id(2) override depth : i32; // @id(2) override depth : i32;
// @compute @workgroup_size(width, height, depth) // @compute @workgroup_size(width, height, depth)
// fn main() {} // fn main() {}
auto* width = Override("width", ty.i32(), nullptr, utils::Vector{Id(0)}); auto* width = Override("width", ty.i32(), Id(0));
auto* height = Override("height", ty.i32(), nullptr, utils::Vector{Id(1)}); auto* height = Override("height", ty.i32(), Id(1));
auto* depth = Override("depth", ty.i32(), nullptr, utils::Vector{Id(2)}); auto* depth = Override("depth", ty.i32(), Id(2));
auto* func = Func("main", utils::Empty, ty.void_(), utils::Empty, auto* func = Func("main", utils::Empty, ty.void_(), utils::Empty,
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kCompute), Stage(ast::PipelineStage::kCompute),
@ -1064,7 +1056,7 @@ TEST_F(ResolverTest, Function_WorkgroupSize_Mixed) {
// const depth = 3i; // const depth = 3i;
// @compute @workgroup_size(8, height, depth) // @compute @workgroup_size(8, height, depth)
// fn main() {} // fn main() {}
auto* height = Override("height", ty.i32(), Expr(2_i), utils::Vector{Id(0)}); auto* height = Override("height", ty.i32(), Expr(2_i), Id(0));
GlobalConst("depth", ty.i32(), Expr(3_i)); GlobalConst("depth", ty.i32(), Expr(3_i));
auto* func = Func("main", utils::Empty, ty.void_(), utils::Empty, auto* func = Func("main", utils::Empty, ty.void_(), utils::Empty,
utils::Vector{ utils::Vector{
@ -1735,11 +1727,7 @@ TEST_F(ResolverTest, StorageClass_SetsIfMissing) {
TEST_F(ResolverTest, StorageClass_SetForSampler) { TEST_F(ResolverTest, StorageClass_SetForSampler) {
auto* t = ty.sampler(ast::SamplerKind::kSampler); auto* t = ty.sampler(ast::SamplerKind::kSampler);
auto* var = GlobalVar("var", t, auto* var = GlobalVar("var", t, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -1748,11 +1736,7 @@ TEST_F(ResolverTest, StorageClass_SetForSampler) {
TEST_F(ResolverTest, StorageClass_SetForTexture) { TEST_F(ResolverTest, StorageClass_SetForTexture) {
auto* t = ty.sampled_texture(ast::TextureDimension::k1d, ty.f32()); auto* t = ty.sampled_texture(ast::TextureDimension::k1d, ty.f32());
auto* var = GlobalVar("var", t, auto* var = GlobalVar("var", t, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -1773,11 +1757,8 @@ TEST_F(ResolverTest, Access_SetForStorageBuffer) {
// struct S { x : i32 }; // struct S { x : i32 };
// var<storage> g : S; // var<storage> g : S;
auto* s = Structure("S", utils::Vector{Member(Source{{12, 34}}, "x", ty.i32())}); auto* s = Structure("S", utils::Vector{Member(Source{{12, 34}}, "x", ty.i32())});
auto* var = GlobalVar(Source{{56, 78}}, "g", ty.Of(s), ast::StorageClass::kStorage, auto* var = GlobalVar(Source{{56, 78}}, "g", ty.Of(s), ast::StorageClass::kStorage, Binding(0),
utils::Vector{ Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -1787,12 +1768,8 @@ TEST_F(ResolverTest, Access_SetForStorageBuffer) {
TEST_F(ResolverTest, BindingPoint_SetForResources) { TEST_F(ResolverTest, BindingPoint_SetForResources) {
// @group(1) @binding(2) var s1 : sampler; // @group(1) @binding(2) var s1 : sampler;
// @group(3) @binding(4) var s2 : sampler; // @group(3) @binding(4) var s2 : sampler;
auto* s1 = GlobalVar( auto* s1 = GlobalVar(Sym(), ty.sampler(ast::SamplerKind::kSampler), Group(1), Binding(2));
Sym(), ty.sampler(ast::SamplerKind::kSampler), auto* s2 = GlobalVar(Sym(), ty.sampler(ast::SamplerKind::kSampler), Group(3), Binding(4));
utils::Vector{create<ast::GroupAttribute>(1u), create<ast::BindingAttribute>(2u)});
auto* s2 = GlobalVar(
Sym(), ty.sampler(ast::SamplerKind::kSampler),
utils::Vector{create<ast::GroupAttribute>(3u), create<ast::BindingAttribute>(4u)});
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -1995,8 +1972,8 @@ TEST_F(ResolverTest, UnaryOp_Negation) {
} }
TEST_F(ResolverTest, TextureSampler_TextureSample) { TEST_F(ResolverTest, TextureSampler_TextureSample) {
GlobalVar("t", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), GroupAndBinding(1, 1)); GlobalVar("t", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), Group(1), Binding(1));
GlobalVar("s", ty.sampler(ast::SamplerKind::kSampler), GroupAndBinding(1, 2)); GlobalVar("s", ty.sampler(ast::SamplerKind::kSampler), Group(1), Binding(2));
auto* call = CallStmt(Call("textureSample", "t", "s", vec2<f32>(1_f, 2_f))); auto* call = CallStmt(Call("textureSample", "t", "s", vec2<f32>(1_f, 2_f)));
const ast::Function* f = Func("test_function", utils::Empty, ty.void_(), utils::Vector{call}, const ast::Function* f = Func("test_function", utils::Empty, ty.void_(), utils::Vector{call},
@ -2012,8 +1989,8 @@ TEST_F(ResolverTest, TextureSampler_TextureSample) {
} }
TEST_F(ResolverTest, TextureSampler_TextureSampleInFunction) { TEST_F(ResolverTest, TextureSampler_TextureSampleInFunction) {
GlobalVar("t", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), GroupAndBinding(1, 1)); GlobalVar("t", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), Group(1), Binding(1));
GlobalVar("s", ty.sampler(ast::SamplerKind::kSampler), GroupAndBinding(1, 2)); GlobalVar("s", ty.sampler(ast::SamplerKind::kSampler), Group(1), Binding(2));
auto* inner_call = CallStmt(Call("textureSample", "t", "s", vec2<f32>(1_f, 2_f))); auto* inner_call = CallStmt(Call("textureSample", "t", "s", vec2<f32>(1_f, 2_f)));
const ast::Function* inner_func = const ast::Function* inner_func =
@ -2037,8 +2014,8 @@ TEST_F(ResolverTest, TextureSampler_TextureSampleInFunction) {
} }
TEST_F(ResolverTest, TextureSampler_TextureSampleFunctionDiamondSameVariables) { TEST_F(ResolverTest, TextureSampler_TextureSampleFunctionDiamondSameVariables) {
GlobalVar("t", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), GroupAndBinding(1, 1)); GlobalVar("t", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), Group(1), Binding(1));
GlobalVar("s", ty.sampler(ast::SamplerKind::kSampler), GroupAndBinding(1, 2)); GlobalVar("s", ty.sampler(ast::SamplerKind::kSampler), Group(1), Binding(2));
auto* inner_call_1 = CallStmt(Call("textureSample", "t", "s", vec2<f32>(1_f, 2_f))); auto* inner_call_1 = CallStmt(Call("textureSample", "t", "s", vec2<f32>(1_f, 2_f)));
const ast::Function* inner_func_1 = const ast::Function* inner_func_1 =
@ -2071,11 +2048,9 @@ TEST_F(ResolverTest, TextureSampler_TextureSampleFunctionDiamondSameVariables) {
} }
TEST_F(ResolverTest, TextureSampler_TextureSampleFunctionDiamondDifferentVariables) { TEST_F(ResolverTest, TextureSampler_TextureSampleFunctionDiamondDifferentVariables) {
GlobalVar("t1", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), GlobalVar("t1", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), Group(1), Binding(1));
GroupAndBinding(1, 1)); GlobalVar("t2", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), Group(1), Binding(2));
GlobalVar("t2", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), GlobalVar("s", ty.sampler(ast::SamplerKind::kSampler), Group(1), Binding(3));
GroupAndBinding(1, 2));
GlobalVar("s", ty.sampler(ast::SamplerKind::kSampler), GroupAndBinding(1, 3));
auto* inner_call_1 = CallStmt(Call("textureSample", "t1", "s", vec2<f32>(1_f, 2_f))); auto* inner_call_1 = CallStmt(Call("textureSample", "t1", "s", vec2<f32>(1_f, 2_f)));
const ast::Function* inner_func_1 = const ast::Function* inner_func_1 =
@ -2110,7 +2085,7 @@ TEST_F(ResolverTest, TextureSampler_TextureSampleFunctionDiamondDifferentVariabl
} }
TEST_F(ResolverTest, TextureSampler_TextureDimensions) { TEST_F(ResolverTest, TextureSampler_TextureDimensions) {
GlobalVar("t", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), GroupAndBinding(1, 2)); GlobalVar("t", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), Group(1), Binding(2));
auto* call = Call("textureDimensions", "t"); auto* call = Call("textureDimensions", "t");
const ast::Function* f = WrapInFunction(call); const ast::Function* f = WrapInFunction(call);
@ -2153,7 +2128,7 @@ TEST_F(ResolverTest, MaxExpressionDepth_Pass) {
for (size_t i = 0; i < kMaxExpressionDepth; ++i) { for (size_t i = 0; i < kMaxExpressionDepth; ++i) {
chain = Add(chain ? chain : Expr("b"), Expr("b")); chain = Add(chain ? chain : Expr("b"), Expr("b"));
} }
auto* a = Let("a", nullptr, chain); auto* a = Let("a", chain);
WrapInFunction(b, a); WrapInFunction(b, a);
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -2165,7 +2140,7 @@ TEST_F(ResolverTest, MaxExpressionDepth_Fail) {
for (size_t i = 0; i < kMaxExpressionDepth + 1; ++i) { for (size_t i = 0; i < kMaxExpressionDepth + 1; ++i) {
chain = Add(chain ? chain : Expr("b"), Expr("b")); chain = Add(chain ? chain : Expr("b"), Expr("b"));
} }
auto* a = Let("a", nullptr, chain); auto* a = Let("a", chain);
WrapInFunction(b, a); WrapInFunction(b, a);
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());

31
src/tint/resolver/side_effects_test.cc
View File

@ -174,32 +174,31 @@ TEST_P(SideEffectsBuiltinTest, Test) {
GlobalVar("vb", ty.vec3<bool>(), ast::StorageClass::kPrivate); GlobalVar("vb", ty.vec3<bool>(), ast::StorageClass::kPrivate);
GlobalVar("m", ty.mat3x3<f32>(), ast::StorageClass::kPrivate); GlobalVar("m", ty.mat3x3<f32>(), ast::StorageClass::kPrivate);
GlobalVar("arr", ty.array<f32, 10>(), ast::StorageClass::kPrivate); GlobalVar("arr", ty.array<f32, 10>(), ast::StorageClass::kPrivate);
GlobalVar("storage_arr", ty.array<f32>(), ast::StorageClass::kStorage, GlobalVar("storage_arr", ty.array<f32>(), ast::StorageClass::kStorage, Group(0),
GroupAndBinding(0, next_binding++)); Binding(next_binding++));
GlobalVar("a", ty.atomic(ty.i32()), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("a", ty.atomic(ty.i32()), ast::StorageClass::kStorage, ast::Access::kReadWrite,
GroupAndBinding(0, next_binding++)); Group(0), Binding(next_binding++));
if (c.pipeline_stage != ast::PipelineStage::kCompute) { if (c.pipeline_stage != ast::PipelineStage::kCompute) {
GlobalVar("t2d", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), GlobalVar("t2d", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), Group(0),
GroupAndBinding(0, next_binding++)); Binding(next_binding++));
GlobalVar("tdepth2d", ty.depth_texture(ast::TextureDimension::k2d), GlobalVar("tdepth2d", ty.depth_texture(ast::TextureDimension::k2d), Group(0),
GroupAndBinding(0, next_binding++)); Binding(next_binding++));
GlobalVar("t2d_arr", ty.sampled_texture(ast::TextureDimension::k2dArray, ty.f32()), GlobalVar("t2d_arr", ty.sampled_texture(ast::TextureDimension::k2dArray, ty.f32()),
GroupAndBinding(0, next_binding++)); Group(0), Binding(next_binding++));
GlobalVar("t2d_multi", ty.multisampled_texture(ast::TextureDimension::k2d, ty.f32()), GlobalVar("t2d_multi", ty.multisampled_texture(ast::TextureDimension::k2d, ty.f32()),
GroupAndBinding(0, next_binding++)); Group(0), Binding(next_binding++));
GlobalVar("tstorage2d", GlobalVar("tstorage2d",
ty.storage_texture(ast::TextureDimension::k2d, ast::TexelFormat::kR32Float, ty.storage_texture(ast::TextureDimension::k2d, ast::TexelFormat::kR32Float,
ast::Access::kWrite), ast::Access::kWrite),
GroupAndBinding(0, next_binding++)); Group(0), Binding(next_binding++));
GlobalVar("s2d", ty.sampler(ast::SamplerKind::kSampler), GlobalVar("s2d", ty.sampler(ast::SamplerKind::kSampler), Group(0), Binding(next_binding++));
GroupAndBinding(0, next_binding++)); GlobalVar("scomp", ty.sampler(ast::SamplerKind::kComparisonSampler), Group(0),
GlobalVar("scomp", ty.sampler(ast::SamplerKind::kComparisonSampler), Binding(next_binding++));
GroupAndBinding(0, next_binding++));
} }
utils::Vector<const ast::Statement*, 4> stmts; utils::Vector<const ast::Statement*, 4> stmts;
stmts.Push(Decl(Let("pstorage_arr", nullptr, AddressOf("storage_arr")))); stmts.Push(Decl(Let("pstorage_arr", AddressOf("storage_arr"))));
stmts.Push(Decl(Let("pa", nullptr, AddressOf("a")))); stmts.Push(Decl(Let("pa", AddressOf("a"))));
utils::Vector<const ast::Expression*, 5> args; utils::Vector<const ast::Expression*, 5> args;
for (auto& a : c.args) { for (auto& a : c.args) {

24
src/tint/resolver/source_variable_test.cc
View File

@ -48,7 +48,7 @@ TEST_F(ResolverSourceVariableTest, GlobalWorkgroupVar) {
} }
TEST_F(ResolverSourceVariableTest, GlobalStorageVar) { TEST_F(ResolverSourceVariableTest, GlobalStorageVar) {
auto* a = GlobalVar("a", ty.f32(), ast::StorageClass::kStorage, GroupAndBinding(0, 0)); auto* a = GlobalVar("a", ty.f32(), ast::StorageClass::kStorage, Group(0), Binding(0));
auto* expr = Expr(a); auto* expr = Expr(a);
WrapInFunction(expr); WrapInFunction(expr);
@ -59,7 +59,7 @@ TEST_F(ResolverSourceVariableTest, GlobalStorageVar) {
} }
TEST_F(ResolverSourceVariableTest, GlobalUniformVar) { TEST_F(ResolverSourceVariableTest, GlobalUniformVar) {
auto* a = GlobalVar("a", ty.f32(), ast::StorageClass::kUniform, GroupAndBinding(0, 0)); auto* a = GlobalVar("a", ty.f32(), ast::StorageClass::kUniform, Group(0), Binding(0));
auto* expr = Expr(a); auto* expr = Expr(a);
WrapInFunction(expr); WrapInFunction(expr);
@ -71,7 +71,7 @@ TEST_F(ResolverSourceVariableTest, GlobalUniformVar) {
TEST_F(ResolverSourceVariableTest, GlobalTextureVar) { TEST_F(ResolverSourceVariableTest, GlobalTextureVar) {
auto* a = GlobalVar("a", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), auto* a = GlobalVar("a", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()),
ast::StorageClass::kNone, GroupAndBinding(0, 0)); ast::StorageClass::kNone, Group(0), Binding(0));
auto* expr = Expr(a); auto* expr = Expr(a);
WrapInFunction(Call("textureDimensions", expr)); WrapInFunction(Call("textureDimensions", expr));
@ -104,7 +104,7 @@ TEST_F(ResolverSourceVariableTest, GlobalConst) {
} }
TEST_F(ResolverSourceVariableTest, FunctionVar) { TEST_F(ResolverSourceVariableTest, FunctionVar) {
auto* a = Var("a", ty.f32(), ast::StorageClass::kNone); auto* a = Var("a", ty.f32());
auto* expr = Expr(a); auto* expr = Expr(a);
WrapInFunction(a, expr); WrapInFunction(a, expr);
@ -143,7 +143,7 @@ TEST_F(ResolverSourceVariableTest, PointerParameter) {
// } // }
auto* param = Param("a", ty.pointer(ty.f32(), ast::StorageClass::kFunction)); auto* param = Param("a", ty.pointer(ty.f32(), ast::StorageClass::kFunction));
auto* expr_param = Expr(param); auto* expr_param = Expr(param);
auto* let = Let("b", nullptr, expr_param); auto* let = Let("b", expr_param);
auto* expr_let = Expr("b"); auto* expr_let = Expr("b");
Func("foo", utils::Vector{param}, ty.void_(), Func("foo", utils::Vector{param}, ty.void_(),
utils::Vector{WrapInStatement(let), WrapInStatement(expr_let)}); utils::Vector{WrapInStatement(let), WrapInStatement(expr_let)});
@ -160,9 +160,9 @@ TEST_F(ResolverSourceVariableTest, VarCopyVar) {
// var a : f32; // var a : f32;
// var b = a; // var b = a;
// } // }
auto* a = Var("a", ty.f32(), ast::StorageClass::kNone); auto* a = Var("a", ty.f32());
auto* expr_a = Expr(a); auto* expr_a = Expr(a);
auto* b = Var("b", ty.f32(), ast::StorageClass::kNone, expr_a); auto* b = Var("b", ty.f32(), expr_a);
auto* expr_b = Expr(b); auto* expr_b = Expr(b);
WrapInFunction(a, b, expr_b); WrapInFunction(a, b, expr_b);
@ -179,7 +179,7 @@ TEST_F(ResolverSourceVariableTest, LetCopyVar) {
// var a : f32; // var a : f32;
// let b = a; // let b = a;
// } // }
auto* a = Var("a", ty.f32(), ast::StorageClass::kNone); auto* a = Var("a", ty.f32());
auto* expr_a = Expr(a); auto* expr_a = Expr(a);
auto* b = Let("b", ty.f32(), expr_a); auto* b = Let("b", ty.f32(), expr_a);
auto* expr_b = Expr(b); auto* expr_b = Expr(b);
@ -235,10 +235,10 @@ TEST_F(ResolverSourceVariableTest, ThroughPointers) {
auto* address_of_1 = AddressOf(a); auto* address_of_1 = AddressOf(a);
auto* deref_1 = Deref(address_of_1); auto* deref_1 = Deref(address_of_1);
auto* address_of_2 = AddressOf(deref_1); auto* address_of_2 = AddressOf(deref_1);
auto* a_ptr1 = Let("a_ptr1", nullptr, address_of_2); auto* a_ptr1 = Let("a_ptr1", address_of_2);
auto* deref_2 = Deref(a_ptr1); auto* deref_2 = Deref(a_ptr1);
auto* address_of_3 = AddressOf(deref_2); auto* address_of_3 = AddressOf(deref_2);
auto* a_ptr2 = Let("a_ptr2", nullptr, address_of_3); auto* a_ptr2 = Let("a_ptr2", address_of_3);
WrapInFunction(a_ptr1, a_ptr2); WrapInFunction(a_ptr1, a_ptr2);
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -270,7 +270,7 @@ TEST_F(ResolverSourceVariableTest, FunctionReturnValue) {
} }
TEST_F(ResolverSourceVariableTest, BinaryExpression) { TEST_F(ResolverSourceVariableTest, BinaryExpression) {
auto* a = Var("a", ty.f32(), ast::StorageClass::kNone); auto* a = Var("a", ty.f32());
auto* expr = Add(a, Expr(1_f)); auto* expr = Add(a, Expr(1_f));
WrapInFunction(a, expr); WrapInFunction(a, expr);
@ -280,7 +280,7 @@ TEST_F(ResolverSourceVariableTest, BinaryExpression) {
} }
TEST_F(ResolverSourceVariableTest, UnaryExpression) { TEST_F(ResolverSourceVariableTest, UnaryExpression) {
auto* a = Var("a", ty.f32(), ast::StorageClass::kNone); auto* a = Var("a", ty.f32());
auto* expr = create<ast::UnaryOpExpression>(ast::UnaryOp::kNegation, Expr(a)); auto* expr = create<ast::UnaryOpExpression>(ast::UnaryOp::kNegation, Expr(a));
WrapInFunction(a, expr); WrapInFunction(a, expr);

60
src/tint/resolver/storage_class_layout_validation_test.cc
View File

@ -39,8 +39,8 @@ TEST_F(ResolverStorageClassLayoutValidationTest, StorageBuffer_UnalignedMember)
Member(Source{{34, 56}}, "b", ty.f32(), utils::Vector{MemberAlign(1)}), Member(Source{{34, 56}}, "b", ty.f32(), utils::Vector{MemberAlign(1)}),
}); });
GlobalVar(Source{{78, 90}}, "a", ty.type_name("S"), ast::StorageClass::kStorage, GlobalVar(Source{{78, 90}}, "a", ty.type_name("S"), ast::StorageClass::kStorage, Group(0),
GroupAndBinding(0, 0)); Binding(0));
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
EXPECT_EQ( EXPECT_EQ(
@ -69,8 +69,8 @@ TEST_F(ResolverStorageClassLayoutValidationTest, StorageBuffer_UnalignedMember_S
Member(Source{{34, 56}}, "b", ty.f32(), utils::Vector{MemberAlign(4)}), Member(Source{{34, 56}}, "b", ty.f32(), utils::Vector{MemberAlign(4)}),
}); });
GlobalVar(Source{{78, 90}}, "a", ty.type_name("S"), ast::StorageClass::kStorage, GlobalVar(Source{{78, 90}}, "a", ty.type_name("S"), ast::StorageClass::kStorage, Group(0),
GroupAndBinding(0, 0)); Binding(0));
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
} }
@ -100,8 +100,8 @@ TEST_F(ResolverStorageClassLayoutValidationTest, UniformBuffer_UnalignedMember_S
Member(Source{{56, 78}}, "inner", ty.type_name("Inner")), Member(Source{{56, 78}}, "inner", ty.type_name("Inner")),
}); });
GlobalVar(Source{{78, 90}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, GlobalVar(Source{{78, 90}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, Group(0),
GroupAndBinding(0, 0)); Binding(0));
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
EXPECT_EQ( EXPECT_EQ(
@ -145,8 +145,8 @@ TEST_F(ResolverStorageClassLayoutValidationTest,
utils::Vector{MemberAlign(16)}), utils::Vector{MemberAlign(16)}),
}); });
GlobalVar(Source{{78, 90}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, GlobalVar(Source{{78, 90}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, Group(0),
GroupAndBinding(0, 0)); Binding(0));
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
} }
@ -170,8 +170,8 @@ TEST_F(ResolverStorageClassLayoutValidationTest, UniformBuffer_UnalignedMember_A
Member(Source{{56, 78}}, "inner", ty.type_name("Inner")), Member(Source{{56, 78}}, "inner", ty.type_name("Inner")),
}); });
GlobalVar(Source{{78, 90}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, GlobalVar(Source{{78, 90}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, Group(0),
GroupAndBinding(0, 0)); Binding(0));
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
EXPECT_EQ( EXPECT_EQ(
@ -204,8 +204,8 @@ TEST_F(ResolverStorageClassLayoutValidationTest, UniformBuffer_UnalignedMember_A
utils::Vector{MemberAlign(16)}), utils::Vector{MemberAlign(16)}),
}); });
GlobalVar(Source{{78, 90}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, GlobalVar(Source{{78, 90}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, Group(0),
GroupAndBinding(0, 0)); Binding(0));
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
} }
@ -236,8 +236,8 @@ TEST_F(ResolverStorageClassLayoutValidationTest, UniformBuffer_MembersOffsetNotM
Member(Source{{78, 90}}, "scalar", ty.i32()), Member(Source{{78, 90}}, "scalar", ty.i32()),
}); });
GlobalVar(Source{{22, 24}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, GlobalVar(Source{{22, 24}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, Group(0),
GroupAndBinding(0, 0)); Binding(0));
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
EXPECT_EQ( EXPECT_EQ(
@ -288,8 +288,8 @@ TEST_F(ResolverStorageClassLayoutValidationTest,
Member(Source{{78, 90}}, "scalar", ty.i32()), Member(Source{{78, 90}}, "scalar", ty.i32()),
}); });
GlobalVar(Source{{22, 24}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, GlobalVar(Source{{22, 24}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, Group(0),
GroupAndBinding(0, 0)); Binding(0));
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
EXPECT_EQ( EXPECT_EQ(
@ -336,8 +336,8 @@ TEST_F(ResolverStorageClassLayoutValidationTest,
Member(Source{{78, 90}}, "scalar", ty.i32(), utils::Vector{MemberAlign(16)}), Member(Source{{78, 90}}, "scalar", ty.i32(), utils::Vector{MemberAlign(16)}),
}); });
GlobalVar(Source{{22, 34}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, GlobalVar(Source{{22, 34}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, Group(0),
GroupAndBinding(0, 0)); Binding(0));
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
} }
@ -358,7 +358,7 @@ TEST_F(ResolverStorageClassLayoutValidationTest, UniformBuffer_Vec3MemberOffset_
}); });
GlobalVar(Source{{78, 90}}, "a", ty.type_name("ScalarPackedAtEndOfVec3"), GlobalVar(Source{{78, 90}}, "a", ty.type_name("ScalarPackedAtEndOfVec3"),
ast::StorageClass::kUniform, GroupAndBinding(0, 0)); ast::StorageClass::kUniform, Group(0), Binding(0));
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
} }
@ -383,8 +383,8 @@ TEST_F(ResolverStorageClassLayoutValidationTest, UniformBuffer_InvalidArrayStrid
Member("scalar", ty.i32()), Member("scalar", ty.i32()),
}); });
GlobalVar(Source{{78, 90}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, GlobalVar(Source{{78, 90}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, Group(0),
GroupAndBinding(0, 0)); Binding(0));
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
EXPECT_EQ( EXPECT_EQ(
@ -417,8 +417,8 @@ TEST_F(ResolverStorageClassLayoutValidationTest, UniformBuffer_InvalidArrayStrid
Member("scalar", ty.i32()), Member("scalar", ty.i32()),
}); });
GlobalVar(Source{{78, 90}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, GlobalVar(Source{{78, 90}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, Group(0),
GroupAndBinding(0, 0)); Binding(0));
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
EXPECT_EQ( EXPECT_EQ(
@ -460,8 +460,8 @@ TEST_F(ResolverStorageClassLayoutValidationTest, UniformBuffer_InvalidArrayStrid
Member("scalar", ty.i32()), Member("scalar", ty.i32()),
}); });
GlobalVar(Source{{78, 90}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, GlobalVar(Source{{78, 90}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, Group(0),
GroupAndBinding(0, 0)); Binding(0));
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
EXPECT_EQ( EXPECT_EQ(
@ -479,7 +479,7 @@ TEST_F(ResolverStorageClassLayoutValidationTest, UniformBuffer_InvalidArrayStrid
// @group(0) @binding(0) // @group(0) @binding(0)
// var<uniform> a : array<f32, 4u>; // var<uniform> a : array<f32, 4u>;
GlobalVar(Source{{78, 90}}, "a", ty.array(Source{{34, 56}}, ty.f32(), 4_u), GlobalVar(Source{{78, 90}}, "a", ty.array(Source{{34, 56}}, ty.f32(), 4_u),
ast::StorageClass::kUniform, GroupAndBinding(0, 0)); ast::StorageClass::kUniform, Group(0), Binding(0));
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
EXPECT_EQ( EXPECT_EQ(
@ -500,8 +500,8 @@ TEST_F(ResolverStorageClassLayoutValidationTest, UniformBuffer_InvalidArrayStrid
Member("inner", ty.array(Source{{34, 56}}, ty.array(ty.f32(), 4_u), 4_u)), Member("inner", ty.array(Source{{34, 56}}, ty.array(ty.f32(), 4_u), 4_u)),
}); });
GlobalVar(Source{{78, 90}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, GlobalVar(Source{{78, 90}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, Group(0),
GroupAndBinding(0, 0)); Binding(0));
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
EXPECT_EQ( EXPECT_EQ(
@ -533,8 +533,8 @@ TEST_F(ResolverStorageClassLayoutValidationTest, UniformBuffer_InvalidArrayStrid
Member("scalar", ty.i32()), Member("scalar", ty.i32()),
}); });
GlobalVar(Source{{78, 90}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, GlobalVar(Source{{78, 90}}, "a", ty.type_name("Outer"), ast::StorageClass::kUniform, Group(0),
GroupAndBinding(0, 0)); Binding(0));
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
} }

185
src/tint/resolver/storage_class_validation_test.cc
View File

@ -29,7 +29,7 @@ using ResolverStorageClassValidationTest = ResolverTest;
TEST_F(ResolverStorageClassValidationTest, GlobalVariableNoStorageClass_Fail) { TEST_F(ResolverStorageClassValidationTest, GlobalVariableNoStorageClass_Fail) {
// var g : f32; // var g : f32;
GlobalVar(Source{{12, 34}}, "g", ty.f32(), ast::StorageClass::kNone); GlobalVar(Source{{12, 34}}, "g", ty.f32());
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
@ -87,11 +87,7 @@ note: while analysing structure member S.m
TEST_F(ResolverStorageClassValidationTest, StorageBufferBool) { TEST_F(ResolverStorageClassValidationTest, StorageBufferBool) {
// var<storage> g : bool; // var<storage> g : bool;
GlobalVar(Source{{56, 78}}, "g", ty.bool_(), ast::StorageClass::kStorage, GlobalVar(Source{{56, 78}}, "g", ty.bool_(), ast::StorageClass::kStorage, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -105,11 +101,7 @@ TEST_F(ResolverStorageClassValidationTest, StorageBufferBoolAlias) {
// type a = bool; // type a = bool;
// var<storage, read> g : a; // var<storage, read> g : a;
auto* a = Alias("a", ty.bool_()); auto* a = Alias("a", ty.bool_());
GlobalVar(Source{{56, 78}}, "g", ty.Of(a), ast::StorageClass::kStorage, GlobalVar(Source{{56, 78}}, "g", ty.Of(a), ast::StorageClass::kStorage, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -125,11 +117,7 @@ TEST_F(ResolverStorageClassValidationTest, StorageBufferF16_TemporallyBan) {
// var<storage> g : f16; // var<storage> g : f16;
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
GlobalVar("g", ty.f16(Source{{56, 78}}), ast::StorageClass::kStorage, GlobalVar("g", ty.f16(Source{{56, 78}}), ast::StorageClass::kStorage, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -144,11 +132,8 @@ TEST_F(ResolverStorageClassValidationTest, StorageBufferF16Alias_TemporallyBan)
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* a = Alias("a", ty.f16()); auto* a = Alias("a", ty.f16());
GlobalVar("g", ty.type_name(Source{{56, 78}}, a->name), ast::StorageClass::kStorage, GlobalVar("g", ty.type_name(Source{{56, 78}}, a->name), ast::StorageClass::kStorage, Binding(0),
utils::Vector{ Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -161,10 +146,7 @@ TEST_F(ResolverStorageClassValidationTest, StorageBufferVectorF16_TemporallyBan)
// var<storage> g : vec4<f16>; // var<storage> g : vec4<f16>;
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
GlobalVar("g", ty.vec(Source{{56, 78}}, ty.Of<f16>(), 4u), ast::StorageClass::kStorage, GlobalVar("g", ty.vec(Source{{56, 78}}, ty.Of<f16>(), 4u), ast::StorageClass::kStorage,
utils::Vector{ Binding(0), Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -180,11 +162,7 @@ TEST_F(ResolverStorageClassValidationTest, StorageBufferArrayF16_TemporallyBan)
auto* s = Structure("S", utils::Vector{Member("a", ty.f16(Source{{56, 78}}))}); auto* s = Structure("S", utils::Vector{Member("a", ty.f16(Source{{56, 78}}))});
auto* a = ty.array(ty.Of(s), 3_u); auto* a = ty.array(ty.Of(s), 3_u);
GlobalVar("g", a, ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("g", a, ast::StorageClass::kStorage, ast::Access::kRead, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -198,11 +176,7 @@ TEST_F(ResolverStorageClassValidationTest, StorageBufferStructF16_TemporallyBan)
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* s = Structure("S", utils::Vector{Member("x", ty.f16(Source{{12, 34}}))}); auto* s = Structure("S", utils::Vector{Member("x", ty.f16(Source{{12, 34}}))});
GlobalVar("g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -219,11 +193,8 @@ TEST_F(ResolverStorageClassValidationTest, StorageBufferNoErrorStructF16Aliases_
auto* s = Structure("S", utils::Vector{Member("x", ty.f16(Source{{12, 34}}))}); auto* s = Structure("S", utils::Vector{Member("x", ty.f16(Source{{12, 34}}))});
auto* a1 = Alias("a1", ty.Of(s)); auto* a1 = Alias("a1", ty.Of(s));
auto* a2 = Alias("a2", ty.Of(a1)); auto* a2 = Alias("a2", ty.Of(a1));
GlobalVar("g", ty.Of(a2), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("g", ty.Of(a2), ast::StorageClass::kStorage, ast::Access::kRead, Binding(0),
utils::Vector{ Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -234,11 +205,7 @@ TEST_F(ResolverStorageClassValidationTest, StorageBufferNoErrorStructF16Aliases_
TEST_F(ResolverStorageClassValidationTest, StorageBufferPointer) { TEST_F(ResolverStorageClassValidationTest, StorageBufferPointer) {
// var<storage> g : ptr<private, f32>; // var<storage> g : ptr<private, f32>;
GlobalVar(Source{{56, 78}}, "g", ty.pointer(ty.f32(), ast::StorageClass::kPrivate), GlobalVar(Source{{56, 78}}, "g", ty.pointer(ty.f32(), ast::StorageClass::kPrivate),
ast::StorageClass::kStorage, ast::StorageClass::kStorage, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -250,22 +217,15 @@ TEST_F(ResolverStorageClassValidationTest, StorageBufferPointer) {
TEST_F(ResolverStorageClassValidationTest, StorageBufferIntScalar) { TEST_F(ResolverStorageClassValidationTest, StorageBufferIntScalar) {
// var<storage> g : i32; // var<storage> g : i32;
GlobalVar(Source{{56, 78}}, "g", ty.i32(), ast::StorageClass::kStorage, GlobalVar(Source{{56, 78}}, "g", ty.i32(), ast::StorageClass::kStorage, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
} }
TEST_F(ResolverStorageClassValidationTest, StorageBufferVectorF32) { TEST_F(ResolverStorageClassValidationTest, StorageBufferVectorF32) {
// var<storage> g : vec4<f32>; // var<storage> g : vec4<f32>;
GlobalVar(Source{{56, 78}}, "g", ty.vec4<f32>(), ast::StorageClass::kStorage, GlobalVar(Source{{56, 78}}, "g", ty.vec4<f32>(), ast::StorageClass::kStorage, Binding(0),
utils::Vector{ Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
} }
@ -274,11 +234,8 @@ TEST_F(ResolverStorageClassValidationTest, StorageBufferArrayF32) {
// var<storage, read> g : array<S, 3u>; // var<storage, read> g : array<S, 3u>;
auto* s = Structure("S", utils::Vector{Member("a", ty.f32())}); auto* s = Structure("S", utils::Vector{Member("a", ty.f32())});
auto* a = ty.array(ty.Of(s), 3_u); auto* a = ty.array(ty.Of(s), 3_u);
GlobalVar(Source{{56, 78}}, "g", a, ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar(Source{{56, 78}}, "g", a, ast::StorageClass::kStorage, ast::Access::kRead, Binding(0),
utils::Vector{ Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
} }
@ -297,7 +254,7 @@ TEST_F(ResolverStorageClassValidationTest, NotStorage_AccessMode) {
TEST_F(ResolverStorageClassValidationTest, Storage_ReadAccessMode) { TEST_F(ResolverStorageClassValidationTest, Storage_ReadAccessMode) {
// @group(0) @binding(0) var<storage, read> a : i32; // @group(0) @binding(0) var<storage, read> a : i32;
GlobalVar(Source{{56, 78}}, "a", ty.i32(), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar(Source{{56, 78}}, "a", ty.i32(), ast::StorageClass::kStorage, ast::Access::kRead,
GroupAndBinding(0, 0)); Group(0), Binding(0));
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
} }
@ -305,7 +262,7 @@ TEST_F(ResolverStorageClassValidationTest, Storage_ReadAccessMode) {
TEST_F(ResolverStorageClassValidationTest, Storage_ReadWriteAccessMode) { TEST_F(ResolverStorageClassValidationTest, Storage_ReadWriteAccessMode) {
// @group(0) @binding(0) var<storage, read_write> a : i32; // @group(0) @binding(0) var<storage, read_write> a : i32;
GlobalVar(Source{{56, 78}}, "a", ty.i32(), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar(Source{{56, 78}}, "a", ty.i32(), ast::StorageClass::kStorage, ast::Access::kReadWrite,
GroupAndBinding(0, 0)); Group(0), Binding(0));
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
} }
@ -313,7 +270,7 @@ TEST_F(ResolverStorageClassValidationTest, Storage_ReadWriteAccessMode) {
TEST_F(ResolverStorageClassValidationTest, Storage_WriteAccessMode) { TEST_F(ResolverStorageClassValidationTest, Storage_WriteAccessMode) {
// @group(0) @binding(0) var<storage, read_write> a : i32; // @group(0) @binding(0) var<storage, read_write> a : i32;
GlobalVar(Source{{56, 78}}, "a", ty.i32(), ast::StorageClass::kStorage, ast::Access::kWrite, GlobalVar(Source{{56, 78}}, "a", ty.i32(), ast::StorageClass::kStorage, ast::Access::kWrite,
GroupAndBinding(0, 0)); Group(0), Binding(0));
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -326,10 +283,7 @@ TEST_F(ResolverStorageClassValidationTest, StorageBufferStructI32) {
// var<storage, read> g : S; // var<storage, read> g : S;
auto* s = Structure("S", utils::Vector{Member(Source{{12, 34}}, "x", ty.i32())}); auto* s = Structure("S", utils::Vector{Member(Source{{12, 34}}, "x", ty.i32())});
GlobalVar(Source{{56, 78}}, "g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar(Source{{56, 78}}, "g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead,
utils::Vector{ Binding(0), Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_TRUE(r()->Resolve()); ASSERT_TRUE(r()->Resolve());
} }
@ -342,10 +296,7 @@ TEST_F(ResolverStorageClassValidationTest, StorageBufferNoErrorStructI32Aliases)
auto* a1 = Alias("a1", ty.Of(s)); auto* a1 = Alias("a1", ty.Of(s));
auto* a2 = Alias("a2", ty.Of(a1)); auto* a2 = Alias("a2", ty.Of(a1));
GlobalVar(Source{{56, 78}}, "g", ty.Of(a2), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar(Source{{56, 78}}, "g", ty.Of(a2), ast::StorageClass::kStorage, ast::Access::kRead,
utils::Vector{ Binding(0), Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_TRUE(r()->Resolve()); ASSERT_TRUE(r()->Resolve());
} }
@ -356,11 +307,8 @@ TEST_F(ResolverStorageClassValidationTest, UniformBuffer_Struct_Runtime) {
auto* s = Structure(Source{{12, 34}}, "S", utils::Vector{Member("m", ty.array<i32>())}); auto* s = Structure(Source{{12, 34}}, "S", utils::Vector{Member("m", ty.array<i32>())});
GlobalVar(Source{{56, 78}}, "svar", ty.Of(s), ast::StorageClass::kUniform, GlobalVar(Source{{56, 78}}, "svar", ty.Of(s), ast::StorageClass::kUniform, Binding(0),
utils::Vector{ Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
@ -371,11 +319,7 @@ note: while analysing structure member S.m
TEST_F(ResolverStorageClassValidationTest, UniformBufferBool) { TEST_F(ResolverStorageClassValidationTest, UniformBufferBool) {
// var<uniform> g : bool; // var<uniform> g : bool;
GlobalVar(Source{{56, 78}}, "g", ty.bool_(), ast::StorageClass::kUniform, GlobalVar(Source{{56, 78}}, "g", ty.bool_(), ast::StorageClass::kUniform, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -389,11 +333,7 @@ TEST_F(ResolverStorageClassValidationTest, UniformBufferBoolAlias) {
// type a = bool; // type a = bool;
// var<uniform> g : a; // var<uniform> g : a;
auto* a = Alias("a", ty.bool_()); auto* a = Alias("a", ty.bool_());
GlobalVar(Source{{56, 78}}, "g", ty.Of(a), ast::StorageClass::kUniform, GlobalVar(Source{{56, 78}}, "g", ty.Of(a), ast::StorageClass::kUniform, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -409,11 +349,7 @@ TEST_F(ResolverStorageClassValidationTest, UniformBufferF16_TemporallyBan) {
// var<uniform> g : f16; // var<uniform> g : f16;
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
GlobalVar("g", ty.f16(Source{{56, 78}}), ast::StorageClass::kUniform, GlobalVar("g", ty.f16(Source{{56, 78}}), ast::StorageClass::kUniform, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -428,11 +364,8 @@ TEST_F(ResolverStorageClassValidationTest, UniformBufferF16Alias_TemporallyBan)
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* a = Alias("a", ty.f16()); auto* a = Alias("a", ty.f16());
GlobalVar("g", ty.type_name(Source{{56, 78}}, a->name), ast::StorageClass::kUniform, GlobalVar("g", ty.type_name(Source{{56, 78}}, a->name), ast::StorageClass::kUniform, Binding(0),
utils::Vector{ Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -445,10 +378,7 @@ TEST_F(ResolverStorageClassValidationTest, UniformBufferVectorF16_TemporallyBan)
// var<uniform> g : vec4<f16>; // var<uniform> g : vec4<f16>;
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
GlobalVar("g", ty.vec(Source{{56, 78}}, ty.Of<f16>(), 4u), ast::StorageClass::kUniform, GlobalVar("g", ty.vec(Source{{56, 78}}, ty.Of<f16>(), 4u), ast::StorageClass::kUniform,
utils::Vector{ Binding(0), Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -466,11 +396,7 @@ TEST_F(ResolverStorageClassValidationTest, UniformBufferArrayF16_TemporallyBan)
auto* s = Structure( auto* s = Structure(
"S", utils::Vector{Member("a", ty.f16(Source{{56, 78}}), utils::Vector{MemberSize(16)})}); "S", utils::Vector{Member("a", ty.f16(Source{{56, 78}}), utils::Vector{MemberSize(16)})});
auto* a = ty.array(ty.Of(s), 3_u); auto* a = ty.array(ty.Of(s), 3_u);
GlobalVar("g", a, ast::StorageClass::kUniform, GlobalVar("g", a, ast::StorageClass::kUniform, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -484,11 +410,7 @@ TEST_F(ResolverStorageClassValidationTest, UniformBufferStructF16_TemporallyBan)
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* s = Structure("S", utils::Vector{Member("x", ty.f16(Source{{12, 34}}))}); auto* s = Structure("S", utils::Vector{Member("x", ty.f16(Source{{12, 34}}))});
GlobalVar("g", ty.Of(s), ast::StorageClass::kUniform, GlobalVar("g", ty.Of(s), ast::StorageClass::kUniform, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -504,11 +426,7 @@ TEST_F(ResolverStorageClassValidationTest, UniformBufferStructF16Aliases_Tempora
auto* s = Structure("S", utils::Vector{Member("x", ty.f16(Source{{12, 34}}))}); auto* s = Structure("S", utils::Vector{Member("x", ty.f16(Source{{12, 34}}))});
auto* a1 = Alias("a1", ty.Of(s)); auto* a1 = Alias("a1", ty.Of(s));
GlobalVar("g", ty.Of(a1), ast::StorageClass::kUniform, GlobalVar("g", ty.Of(a1), ast::StorageClass::kUniform, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -519,11 +437,7 @@ TEST_F(ResolverStorageClassValidationTest, UniformBufferStructF16Aliases_Tempora
TEST_F(ResolverStorageClassValidationTest, UniformBufferPointer) { TEST_F(ResolverStorageClassValidationTest, UniformBufferPointer) {
// var<uniform> g : ptr<private, f32>; // var<uniform> g : ptr<private, f32>;
GlobalVar(Source{{56, 78}}, "g", ty.pointer(ty.f32(), ast::StorageClass::kPrivate), GlobalVar(Source{{56, 78}}, "g", ty.pointer(ty.f32(), ast::StorageClass::kPrivate),
ast::StorageClass::kUniform, ast::StorageClass::kUniform, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -535,22 +449,15 @@ TEST_F(ResolverStorageClassValidationTest, UniformBufferPointer) {
TEST_F(ResolverStorageClassValidationTest, UniformBufferIntScalar) { TEST_F(ResolverStorageClassValidationTest, UniformBufferIntScalar) {
// var<uniform> g : i32; // var<uniform> g : i32;
GlobalVar(Source{{56, 78}}, "g", ty.i32(), ast::StorageClass::kUniform, GlobalVar(Source{{56, 78}}, "g", ty.i32(), ast::StorageClass::kUniform, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
} }
TEST_F(ResolverStorageClassValidationTest, UniformBufferVectorF32) { TEST_F(ResolverStorageClassValidationTest, UniformBufferVectorF32) {
// var<uniform> g : vec4<f32>; // var<uniform> g : vec4<f32>;
GlobalVar(Source{{56, 78}}, "g", ty.vec4<f32>(), ast::StorageClass::kUniform, GlobalVar(Source{{56, 78}}, "g", ty.vec4<f32>(), ast::StorageClass::kUniform, Binding(0),
utils::Vector{ Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
} }
@ -562,11 +469,7 @@ TEST_F(ResolverStorageClassValidationTest, UniformBufferArrayF32) {
// var<uniform> g : array<S, 3u>; // var<uniform> g : array<S, 3u>;
auto* s = Structure("S", utils::Vector{Member("a", ty.f32(), utils::Vector{MemberSize(16)})}); auto* s = Structure("S", utils::Vector{Member("a", ty.f32(), utils::Vector{MemberSize(16)})});
auto* a = ty.array(ty.Of(s), 3_u); auto* a = ty.array(ty.Of(s), 3_u);
GlobalVar(Source{{56, 78}}, "g", a, ast::StorageClass::kUniform, GlobalVar(Source{{56, 78}}, "g", a, ast::StorageClass::kUniform, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
} }
@ -575,11 +478,7 @@ TEST_F(ResolverStorageClassValidationTest, UniformBufferStructI32) {
// struct S { x : i32 }; // struct S { x : i32 };
// var<uniform> g : S; // var<uniform> g : S;
auto* s = Structure("S", utils::Vector{Member(Source{{12, 34}}, "x", ty.i32())}); auto* s = Structure("S", utils::Vector{Member(Source{{12, 34}}, "x", ty.i32())});
GlobalVar(Source{{56, 78}}, "g", ty.Of(s), ast::StorageClass::kUniform, GlobalVar(Source{{56, 78}}, "g", ty.Of(s), ast::StorageClass::kUniform, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
} }
@ -590,11 +489,7 @@ TEST_F(ResolverStorageClassValidationTest, UniformBufferStructI32Aliases) {
// var<uniform> g : a1; // var<uniform> g : a1;
auto* s = Structure("S", utils::Vector{Member(Source{{12, 34}}, "x", ty.i32())}); auto* s = Structure("S", utils::Vector{Member(Source{{12, 34}}, "x", ty.i32())});
auto* a1 = Alias("a1", ty.Of(s)); auto* a1 = Alias("a1", ty.Of(s));
GlobalVar(Source{{56, 78}}, "g", ty.Of(a1), ast::StorageClass::kUniform, GlobalVar(Source{{56, 78}}, "g", ty.Of(a1), ast::StorageClass::kUniform, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
} }

12
src/tint/resolver/struct_storage_class_use_test.cc
View File

@ -159,16 +159,8 @@ TEST_F(ResolverStorageClassUseTest, StructReachableViaLocalArray) {
TEST_F(ResolverStorageClassUseTest, StructMultipleStorageClassUses) { TEST_F(ResolverStorageClassUseTest, StructMultipleStorageClassUses) {
auto* s = Structure("S", utils::Vector{Member("a", ty.f32())}); auto* s = Structure("S", utils::Vector{Member("a", ty.f32())});
GlobalVar("x", ty.Of(s), ast::StorageClass::kUniform, GlobalVar("x", ty.Of(s), ast::StorageClass::kUniform, Binding(0), Group(0));
utils::Vector{ GlobalVar("y", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(1), Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
GlobalVar("y", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead,
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(0u),
});
WrapInFunction(Var("g", ty.Of(s))); WrapInFunction(Var("g", ty.Of(s)));
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();

24
src/tint/resolver/type_constructor_validation_test.cc
View File

@ -59,8 +59,8 @@ constexpr Params ParamsFor() {
TEST_F(ResolverTypeConstructorValidationTest, InferTypeTest_Simple) { TEST_F(ResolverTypeConstructorValidationTest, InferTypeTest_Simple) {
// var a = 1i; // var a = 1i;
// var b = a; // var b = a;
auto* a = Var("a", nullptr, ast::StorageClass::kNone, Expr(1_i)); auto* a = Var("a", Expr(1_i));
auto* b = Var("b", nullptr, ast::StorageClass::kNone, Expr("a")); auto* b = Var("b", Expr("a"));
auto* a_ident = Expr("a"); auto* a_ident = Expr("a");
auto* b_ident = Expr("b"); auto* b_ident = Expr("b");
@ -87,7 +87,7 @@ TEST_P(InferTypeTest_FromConstructorExpression, All) {
auto* constructor_expr = params.create_rhs_ast_value(*this, 0); auto* constructor_expr = params.create_rhs_ast_value(*this, 0);
auto* a = Var("a", nullptr, ast::StorageClass::kNone, constructor_expr); auto* a = Var("a", constructor_expr);
// Self-assign 'a' to force the expression to be resolved so we can test its // Self-assign 'a' to force the expression to be resolved so we can test its
// type below // type below
auto* a_ident = Expr("a"); auto* a_ident = Expr("a");
@ -141,7 +141,7 @@ TEST_P(InferTypeTest_FromArithmeticExpression, All) {
auto* arith_rhs_expr = params.create_rhs_ast_value(*this, 3); auto* arith_rhs_expr = params.create_rhs_ast_value(*this, 3);
auto* constructor_expr = Mul(arith_lhs_expr, arith_rhs_expr); auto* constructor_expr = Mul(arith_lhs_expr, arith_rhs_expr);
auto* a = Var("a", nullptr, constructor_expr); auto* a = Var("a", constructor_expr);
// Self-assign 'a' to force the expression to be resolved so we can test its // Self-assign 'a' to force the expression to be resolved so we can test its
// type below // type below
auto* a_ident = Expr("a"); auto* a_ident = Expr("a");
@ -189,7 +189,7 @@ TEST_P(InferTypeTest_FromCallExpression, All) {
Func("foo", utils::Empty, params.create_rhs_ast_type(*this), Func("foo", utils::Empty, params.create_rhs_ast_type(*this),
utils::Vector{Return(Construct(params.create_rhs_ast_type(*this)))}, {}); utils::Vector{Return(Construct(params.create_rhs_ast_type(*this)))}, {});
auto* a = Var("a", nullptr, Call("foo")); auto* a = Var("a", Call("foo"));
// Self-assign 'a' to force the expression to be resolved so we can test its // Self-assign 'a' to force the expression to be resolved so we can test its
// type below // type below
auto* a_ident = Expr("a"); auto* a_ident = Expr("a");
@ -355,7 +355,7 @@ TEST_P(ConversionConstructorValidTest, All) {
auto* arg = Construct(rhs_type, rhs_value_expr); auto* arg = Construct(rhs_type, rhs_value_expr);
auto* tc = Construct(lhs_type2, arg); auto* tc = Construct(lhs_type2, arg);
auto* a = Var("a", lhs_type1, ast::StorageClass::kNone, tc); auto* a = Var("a", lhs_type1, tc);
// Self-assign 'a' to force the expression to be resolved so we can test its // Self-assign 'a' to force the expression to be resolved so we can test its
// type below // type below
@ -448,8 +448,7 @@ TEST_P(ConversionConstructorInvalidTest, All) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* a = Var("a", lhs_type1, ast::StorageClass::kNone, auto* a = Var("a", lhs_type1, Construct(lhs_type2, Construct(rhs_type, rhs_value_expr)));
Construct(lhs_type2, Construct(rhs_type, rhs_value_expr)));
// Self-assign 'a' to force the expression to be resolved so we can test its // Self-assign 'a' to force the expression to be resolved so we can test its
// type below // type below
@ -464,8 +463,7 @@ INSTANTIATE_TEST_SUITE_P(ResolverTypeConstructorValidationTest,
testing::ValuesIn(all_types))); testing::ValuesIn(all_types)));
TEST_F(ResolverTypeConstructorValidationTest, ConversionConstructorInvalid_TooManyInitializers) { TEST_F(ResolverTypeConstructorValidationTest, ConversionConstructorInvalid_TooManyInitializers) {
auto* a = Var("a", ty.f32(), ast::StorageClass::kNone, auto* a = Var("a", ty.f32(), Construct(Source{{12, 34}}, ty.f32(), Expr(1_f), Expr(2_f)));
Construct(Source{{12, 34}}, ty.f32(), Expr(1_f), Expr(2_f)));
WrapInFunction(a); WrapInFunction(a);
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -473,8 +471,8 @@ TEST_F(ResolverTypeConstructorValidationTest, ConversionConstructorInvalid_TooMa
} }
TEST_F(ResolverTypeConstructorValidationTest, ConversionConstructorInvalid_InvalidInitializer) { TEST_F(ResolverTypeConstructorValidationTest, ConversionConstructorInvalid_InvalidInitializer) {
auto* a = Var("a", ty.f32(), ast::StorageClass::kNone, auto* a =
Construct(Source{{12, 34}}, ty.f32(), Construct(ty.array<f32, 4>()))); Var("a", ty.f32(), Construct(Source{{12, 34}}, ty.f32(), Construct(ty.array<f32, 4>())));
WrapInFunction(a); WrapInFunction(a);
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -600,7 +598,7 @@ TEST_F(ResolverTypeConstructorValidationTest, ArrayU32_AIAIAI) {
TEST_F(ResolverTypeConstructorValidationTest, InferredArray_AIAIAI) { TEST_F(ResolverTypeConstructorValidationTest, InferredArray_AIAIAI) {
// const c = array(0, 10, 20); // const c = array(0, 10, 20);
auto* tc = array(Source{{12, 34}}, nullptr, nullptr, 0_a, 10_a, 20_a); auto* tc = array(Source{{12, 34}}, nullptr, nullptr, 0_a, 10_a, 20_a);
WrapInFunction(Decl(Const("C", nullptr, tc))); WrapInFunction(Decl(Const("C", tc)));
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();

112
src/tint/resolver/type_validation_test.cc
View File

@ -60,7 +60,7 @@ TEST_F(ResolverTypeValidationTest, VariableDeclNoConstructor_Pass) {
// var a :i32; // var a :i32;
// a = 2; // a = 2;
// } // }
auto* var = Var("a", ty.i32(), ast::StorageClass::kNone, nullptr); auto* var = Var("a", ty.i32());
auto* lhs = Expr("a"); auto* lhs = Expr("a");
auto* rhs = Expr(2_i); auto* rhs = Expr(2_i);
@ -75,10 +75,7 @@ TEST_F(ResolverTypeValidationTest, VariableDeclNoConstructor_Pass) {
TEST_F(ResolverTypeValidationTest, GlobalOverrideNoConstructor_Pass) { TEST_F(ResolverTypeValidationTest, GlobalOverrideNoConstructor_Pass) {
// @id(0) override a :i32; // @id(0) override a :i32;
Override(Source{{12, 34}}, "a", ty.i32(), nullptr, Override(Source{{12, 34}}, "a", ty.i32(), Id(0));
utils::Vector{
Id(0),
});
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
} }
@ -116,7 +113,7 @@ TEST_F(ResolverTypeValidationTest, GlobalVariableFunctionVariableNotUnique_Pass)
Func("my_func", utils::Empty, ty.void_(), Func("my_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("a", ty.f32(), ast::StorageClass::kNone, Expr(2_f))), Decl(Var("a", ty.f32(), Expr(2_f))),
}); });
GlobalVar("a", ty.f32(), ast::StorageClass::kPrivate, Expr(2.1_f)); GlobalVar("a", ty.f32(), ast::StorageClass::kPrivate, Expr(2.1_f));
@ -129,12 +126,12 @@ TEST_F(ResolverTypeValidationTest, RedeclaredIdentifierInnerScope_Pass) {
// if (true) { var a : f32 = 2.0; } // if (true) { var a : f32 = 2.0; }
// var a : f32 = 3.14; // var a : f32 = 3.14;
// } // }
auto* var = Var("a", ty.f32(), ast::StorageClass::kNone, Expr(2_f)); auto* var = Var("a", ty.f32(), Expr(2_f));
auto* cond = Expr(true); auto* cond = Expr(true);
auto* body = Block(Decl(var)); auto* body = Block(Decl(var));
auto* var_a_float = Var("a", ty.f32(), ast::StorageClass::kNone, Expr(3.1_f)); auto* var_a_float = Var("a", ty.f32(), Expr(3.1_f));
auto* outer_body = Block(If(cond, body), Decl(Source{{12, 34}}, var_a_float)); auto* outer_body = Block(If(cond, body), Decl(Source{{12, 34}}, var_a_float));
@ -148,10 +145,10 @@ TEST_F(ResolverTypeValidationTest, RedeclaredIdentifierInnerScopeBlock_Pass) {
// { var a : f32; } // { var a : f32; }
// var a : f32; // var a : f32;
// } // }
auto* var_inner = Var("a", ty.f32(), ast::StorageClass::kNone); auto* var_inner = Var("a", ty.f32());
auto* inner = Block(Decl(Source{{12, 34}}, var_inner)); auto* inner = Block(Decl(Source{{12, 34}}, var_inner));
auto* var_outer = Var("a", ty.f32(), ast::StorageClass::kNone); auto* var_outer = Var("a", ty.f32());
auto* outer_body = Block(inner, Decl(var_outer)); auto* outer_body = Block(inner, Decl(var_outer));
WrapInFunction(outer_body); WrapInFunction(outer_body);
@ -162,9 +159,9 @@ TEST_F(ResolverTypeValidationTest, RedeclaredIdentifierInnerScopeBlock_Pass) {
TEST_F(ResolverTypeValidationTest, RedeclaredIdentifierDifferentFunctions_Pass) { TEST_F(ResolverTypeValidationTest, RedeclaredIdentifierDifferentFunctions_Pass) {
// func0 { var a : f32 = 2.0; return; } // func0 { var a : f32 = 2.0; return; }
// func1 { var a : f32 = 3.0; return; } // func1 { var a : f32 = 3.0; return; }
auto* var0 = Var("a", ty.f32(), ast::StorageClass::kNone, Expr(2_f)); auto* var0 = Var("a", ty.f32(), Expr(2_f));
auto* var1 = Var("a", ty.f32(), ast::StorageClass::kNone, Expr(1_f)); auto* var1 = Var("a", ty.f32(), Expr(1_f));
Func("func0", utils::Empty, ty.void_(), Func("func0", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -202,7 +199,7 @@ TEST_F(ResolverTypeValidationTest, ArraySize_SignedLiteral_Pass) {
TEST_F(ResolverTypeValidationTest, ArraySize_UnsignedConst_Pass) { TEST_F(ResolverTypeValidationTest, ArraySize_UnsignedConst_Pass) {
// const size = 4u; // const size = 4u;
// var<private> a : array<f32, size>; // var<private> a : array<f32, size>;
GlobalConst("size", nullptr, Expr(4_u)); GlobalConst("size", Expr(4_u));
GlobalVar("a", ty.array(ty.f32(), Expr(Source{{12, 34}}, "size")), ast::StorageClass::kPrivate); GlobalVar("a", ty.array(ty.f32(), Expr(Source{{12, 34}}, "size")), ast::StorageClass::kPrivate);
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
} }
@ -210,7 +207,7 @@ TEST_F(ResolverTypeValidationTest, ArraySize_UnsignedConst_Pass) {
TEST_F(ResolverTypeValidationTest, ArraySize_SignedConst_Pass) { TEST_F(ResolverTypeValidationTest, ArraySize_SignedConst_Pass) {
// const size = 4i; // const size = 4i;
// var<private> a : array<f32, size>; // var<private> a : array<f32, size>;
GlobalConst("size", nullptr, Expr(4_i)); GlobalConst("size", Expr(4_i));
GlobalVar("a", ty.array(ty.f32(), Expr(Source{{12, 34}}, "size")), ast::StorageClass::kPrivate); GlobalVar("a", ty.array(ty.f32(), Expr(Source{{12, 34}}, "size")), ast::StorageClass::kPrivate);
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
} }
@ -246,7 +243,7 @@ TEST_F(ResolverTypeValidationTest, ArraySize_SignedLiteral_Negative) {
TEST_F(ResolverTypeValidationTest, ArraySize_UnsignedConst_Zero) { TEST_F(ResolverTypeValidationTest, ArraySize_UnsignedConst_Zero) {
// const size = 0u; // const size = 0u;
// var<private> a : array<f32, size>; // var<private> a : array<f32, size>;
GlobalConst("size", nullptr, Expr(0_u)); GlobalConst("size", Expr(0_u));
GlobalVar("a", ty.array(ty.f32(), Expr(Source{{12, 34}}, "size")), ast::StorageClass::kPrivate); GlobalVar("a", ty.array(ty.f32(), Expr(Source{{12, 34}}, "size")), ast::StorageClass::kPrivate);
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), "12:34 error: array size (0) must be greater than 0"); EXPECT_EQ(r()->error(), "12:34 error: array size (0) must be greater than 0");
@ -255,7 +252,7 @@ TEST_F(ResolverTypeValidationTest, ArraySize_UnsignedConst_Zero) {
TEST_F(ResolverTypeValidationTest, ArraySize_SignedConst_Zero) { TEST_F(ResolverTypeValidationTest, ArraySize_SignedConst_Zero) {
// const size = 0i; // const size = 0i;
// var<private> a : array<f32, size>; // var<private> a : array<f32, size>;
GlobalConst("size", nullptr, Expr(0_i)); GlobalConst("size", Expr(0_i));
GlobalVar("a", ty.array(ty.f32(), Expr(Source{{12, 34}}, "size")), ast::StorageClass::kPrivate); GlobalVar("a", ty.array(ty.f32(), Expr(Source{{12, 34}}, "size")), ast::StorageClass::kPrivate);
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), "12:34 error: array size (0) must be greater than 0"); EXPECT_EQ(r()->error(), "12:34 error: array size (0) must be greater than 0");
@ -264,7 +261,7 @@ TEST_F(ResolverTypeValidationTest, ArraySize_SignedConst_Zero) {
TEST_F(ResolverTypeValidationTest, ArraySize_SignedConst_Negative) { TEST_F(ResolverTypeValidationTest, ArraySize_SignedConst_Negative) {
// const size = -10i; // const size = -10i;
// var<private> a : array<f32, size>; // var<private> a : array<f32, size>;
GlobalConst("size", nullptr, Expr(-10_i)); GlobalConst("size", Expr(-10_i));
GlobalVar("a", ty.array(ty.f32(), Expr(Source{{12, 34}}, "size")), ast::StorageClass::kPrivate); GlobalVar("a", ty.array(ty.f32(), Expr(Source{{12, 34}}, "size")), ast::StorageClass::kPrivate);
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), "12:34 error: array size (-10) must be greater than 0"); EXPECT_EQ(r()->error(), "12:34 error: array size (-10) must be greater than 0");
@ -292,7 +289,7 @@ TEST_F(ResolverTypeValidationTest, ArraySize_IVecLiteral) {
TEST_F(ResolverTypeValidationTest, ArraySize_FloatConst) { TEST_F(ResolverTypeValidationTest, ArraySize_FloatConst) {
// const size = 10.0; // const size = 10.0;
// var<private> a : array<f32, size>; // var<private> a : array<f32, size>;
GlobalConst("size", nullptr, Expr(10_f)); GlobalConst("size", Expr(10_f));
GlobalVar("a", ty.array(ty.f32(), Expr(Source{{12, 34}}, "size")), ast::StorageClass::kPrivate); GlobalVar("a", ty.array(ty.f32(), Expr(Source{{12, 34}}, "size")), ast::StorageClass::kPrivate);
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
@ -303,7 +300,7 @@ TEST_F(ResolverTypeValidationTest, ArraySize_FloatConst) {
TEST_F(ResolverTypeValidationTest, ArraySize_IVecConst) { TEST_F(ResolverTypeValidationTest, ArraySize_IVecConst) {
// const size = vec2<i32>(100, 100); // const size = vec2<i32>(100, 100);
// var<private> a : array<f32, size>; // var<private> a : array<f32, size>;
GlobalConst("size", nullptr, Construct(ty.vec2<i32>(), 100_i, 100_i)); GlobalConst("size", Construct(ty.vec2<i32>(), 100_i, 100_i));
GlobalVar("a", ty.array(ty.f32(), Expr(Source{{12, 34}}, "size")), ast::StorageClass::kPrivate); GlobalVar("a", ty.array(ty.f32(), Expr(Source{{12, 34}}, "size")), ast::StorageClass::kPrivate);
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
@ -331,7 +328,7 @@ TEST_F(ResolverTypeValidationTest, ArraySize_TooBig_ExplicitStride) {
TEST_F(ResolverTypeValidationTest, ArraySize_Overridable) { TEST_F(ResolverTypeValidationTest, ArraySize_Overridable) {
// override size = 10i; // override size = 10i;
// var<private> a : array<f32, size>; // var<private> a : array<f32, size>;
Override("size", nullptr, Expr(10_i)); Override("size", Expr(10_i));
GlobalVar("a", ty.array(ty.f32(), Expr(Source{{12, 34}}, "size")), ast::StorageClass::kPrivate); GlobalVar("a", ty.array(ty.f32(), Expr(Source{{12, 34}}, "size")), ast::StorageClass::kPrivate);
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
@ -354,7 +351,7 @@ TEST_F(ResolverTypeValidationTest, ArraySize_FunctionConst) {
// const size = 10; // const size = 10;
// var a : array<f32, size>; // var a : array<f32, size>;
// } // }
auto* size = Const("size", nullptr, Expr(10_i)); auto* size = Const("size", Expr(10_i));
auto* a = Var("a", ty.array(ty.f32(), Expr(Source{{12, 34}}, "size"))); auto* a = Var("a", ty.array(ty.f32(), Expr(Source{{12, 34}}, "size")));
WrapInFunction(size, a); WrapInFunction(size, a);
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -365,7 +362,7 @@ TEST_F(ResolverTypeValidationTest, ArraySize_FunctionLet) {
// let size = 10; // let size = 10;
// var a : array<f32, size>; // var a : array<f32, size>;
// } // }
auto* size = Let("size", nullptr, Expr(10_i)); auto* size = Let("size", Expr(10_i));
auto* a = Var("a", ty.array(ty.f32(), Expr(Source{{12, 34}}, "size"))); auto* a = Var("a", ty.array(ty.f32(), Expr(Source{{12, 34}}, "size")));
WrapInFunction(size, a); WrapInFunction(size, a);
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
@ -384,7 +381,7 @@ TEST_F(ResolverTypeValidationTest, RuntimeArrayInFunction_Fail) {
/// @vertex /// @vertex
// fn func() { var a : array<i32>; } // fn func() { var a : array<i32>; }
auto* var = Var(Source{{12, 34}}, "a", ty.array<i32>(), ast::StorageClass::kNone); auto* var = Var(Source{{12, 34}}, "a", ty.array<i32>());
Func("func", utils::Empty, ty.void_(), Func("func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -763,11 +760,8 @@ struct DimensionParams {
using SampledTextureDimensionTest = ResolverTestWithParam<DimensionParams>; using SampledTextureDimensionTest = ResolverTestWithParam<DimensionParams>;
TEST_P(SampledTextureDimensionTest, All) { TEST_P(SampledTextureDimensionTest, All) {
auto& params = GetParam(); auto& params = GetParam();
GlobalVar(Source{{12, 34}}, "a", ty.sampled_texture(params.dim, ty.i32()), GlobalVar(Source{{12, 34}}, "a", ty.sampled_texture(params.dim, ty.i32()), Group(0),
ast::StorageClass::kNone, nullptr, Binding(0));
utils::Vector{
GroupAndBinding(0, 0),
});
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
} }
@ -784,11 +778,8 @@ INSTANTIATE_TEST_SUITE_P(ResolverTypeValidationTest,
using MultisampledTextureDimensionTest = ResolverTestWithParam<DimensionParams>; using MultisampledTextureDimensionTest = ResolverTestWithParam<DimensionParams>;
TEST_P(MultisampledTextureDimensionTest, All) { TEST_P(MultisampledTextureDimensionTest, All) {
auto& params = GetParam(); auto& params = GetParam();
GlobalVar("a", ty.multisampled_texture(Source{{12, 34}}, params.dim, ty.i32()), GlobalVar("a", ty.multisampled_texture(Source{{12, 34}}, params.dim, ty.i32()), Group(0),
ast::StorageClass::kNone, nullptr, Binding(0));
utils::Vector{
GroupAndBinding(0, 0),
});
if (params.is_valid) { if (params.is_valid) {
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -841,10 +832,7 @@ TEST_P(SampledTextureTypeTest, All) {
GlobalVar( GlobalVar(
"a", "a",
ty.sampled_texture(Source{{12, 34}}, ast::TextureDimension::k2d, params.type_func(*this)), ty.sampled_texture(Source{{12, 34}}, ast::TextureDimension::k2d, params.type_func(*this)),
ast::StorageClass::kNone, nullptr, Group(0), Binding(0));
utils::Vector{
GroupAndBinding(0, 0),
});
if (params.is_valid) { if (params.is_valid) {
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -863,10 +851,7 @@ TEST_P(MultisampledTextureTypeTest, All) {
GlobalVar("a", GlobalVar("a",
ty.multisampled_texture(Source{{12, 34}}, ast::TextureDimension::k2d, ty.multisampled_texture(Source{{12, 34}}, ast::TextureDimension::k2d,
params.type_func(*this)), params.type_func(*this)),
ast::StorageClass::kNone, nullptr, Group(0), Binding(0));
utils::Vector{
GroupAndBinding(0, 0),
});
if (params.is_valid) { if (params.is_valid) {
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -905,10 +890,7 @@ TEST_P(StorageTextureDimensionTest, All) {
auto* st = ty.storage_texture(Source{{12, 34}}, params.dim, ast::TexelFormat::kR32Uint, auto* st = ty.storage_texture(Source{{12, 34}}, params.dim, ast::TexelFormat::kR32Uint,
ast::Access::kWrite); ast::Access::kWrite);
GlobalVar("a", st, ast::StorageClass::kNone, GlobalVar("a", st, Group(0), Binding(0));
utils::Vector{
GroupAndBinding(0, 0),
});
if (params.is_valid) { if (params.is_valid) {
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -958,29 +940,17 @@ TEST_P(StorageTextureFormatTest, All) {
auto* st_a = ty.storage_texture(Source{{12, 34}}, ast::TextureDimension::k1d, params.format, auto* st_a = ty.storage_texture(Source{{12, 34}}, ast::TextureDimension::k1d, params.format,
ast::Access::kWrite); ast::Access::kWrite);
GlobalVar("a", st_a, ast::StorageClass::kNone, GlobalVar("a", st_a, Group(0), Binding(0));
utils::Vector{
GroupAndBinding(0, 0),
});
auto* st_b = ty.storage_texture(ast::TextureDimension::k2d, params.format, ast::Access::kWrite); auto* st_b = ty.storage_texture(ast::TextureDimension::k2d, params.format, ast::Access::kWrite);
GlobalVar("b", st_b, ast::StorageClass::kNone, GlobalVar("b", st_b, Group(0), Binding(1));
utils::Vector{
GroupAndBinding(0, 1),
});
auto* st_c = auto* st_c =
ty.storage_texture(ast::TextureDimension::k2dArray, params.format, ast::Access::kWrite); ty.storage_texture(ast::TextureDimension::k2dArray, params.format, ast::Access::kWrite);
GlobalVar("c", st_c, ast::StorageClass::kNone, GlobalVar("c", st_c, Group(0), Binding(2));
utils::Vector{
GroupAndBinding(0, 2),
});
auto* st_d = ty.storage_texture(ast::TextureDimension::k3d, params.format, ast::Access::kWrite); auto* st_d = ty.storage_texture(ast::TextureDimension::k3d, params.format, ast::Access::kWrite);
GlobalVar("d", st_d, ast::StorageClass::kNone, GlobalVar("d", st_d, Group(0), Binding(3));
utils::Vector{
GroupAndBinding(0, 3),
});
if (params.is_valid) { if (params.is_valid) {
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
@ -1004,10 +974,7 @@ TEST_F(StorageTextureAccessTest, MissingAccess_Fail) {
auto* st = ty.storage_texture(Source{{12, 34}}, ast::TextureDimension::k1d, auto* st = ty.storage_texture(Source{{12, 34}}, ast::TextureDimension::k1d,
ast::TexelFormat::kR32Uint, ast::Access::kUndefined); ast::TexelFormat::kR32Uint, ast::Access::kUndefined);
GlobalVar("a", st, ast::StorageClass::kNone, GlobalVar("a", st, Group(0), Binding(0));
utils::Vector{
GroupAndBinding(0, 0),
});
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), "12:34 error: storage texture missing access control"); EXPECT_EQ(r()->error(), "12:34 error: storage texture missing access control");
@ -1020,10 +987,7 @@ TEST_F(StorageTextureAccessTest, RWAccess_Fail) {
auto* st = ty.storage_texture(Source{{12, 34}}, ast::TextureDimension::k1d, auto* st = ty.storage_texture(Source{{12, 34}}, ast::TextureDimension::k1d,
ast::TexelFormat::kR32Uint, ast::Access::kReadWrite); ast::TexelFormat::kR32Uint, ast::Access::kReadWrite);
GlobalVar("a", st, ast::StorageClass::kNone, nullptr, GlobalVar("a", st, Group(0), Binding(0));
utils::Vector{
GroupAndBinding(0, 0),
});
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
@ -1037,10 +1001,7 @@ TEST_F(StorageTextureAccessTest, ReadOnlyAccess_Fail) {
auto* st = ty.storage_texture(Source{{12, 34}}, ast::TextureDimension::k1d, auto* st = ty.storage_texture(Source{{12, 34}}, ast::TextureDimension::k1d,
ast::TexelFormat::kR32Uint, ast::Access::kRead); ast::TexelFormat::kR32Uint, ast::Access::kRead);
GlobalVar("a", st, ast::StorageClass::kNone, nullptr, GlobalVar("a", st, Group(0), Binding(0));
utils::Vector{
GroupAndBinding(0, 0),
});
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
@ -1054,10 +1015,7 @@ TEST_F(StorageTextureAccessTest, WriteOnlyAccess_Pass) {
auto* st = ty.storage_texture(ast::TextureDimension::k1d, ast::TexelFormat::kR32Uint, auto* st = ty.storage_texture(ast::TextureDimension::k1d, ast::TexelFormat::kR32Uint,
ast::Access::kWrite); ast::Access::kWrite);
GlobalVar("a", st, ast::StorageClass::kNone, nullptr, GlobalVar("a", st, Group(0), Binding(0));
utils::Vector{
GroupAndBinding(0, 0),
});
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
} }

4
src/tint/resolver/uniformity_test.cc
View File

@ -5289,7 +5289,7 @@ TEST_F(UniformityAnalysisTest, MaximumNumberOfPointerParameters) {
for (int i = 1; i < 255; i++) { for (int i = 1; i < 255; i++) {
rhs_init = b.Add(rhs_init, b.Deref("p" + std::to_string(i))); rhs_init = b.Add(rhs_init, b.Deref("p" + std::to_string(i)));
} }
foo_body.Push(b.Decl(b.Let("rhs", nullptr, rhs_init))); foo_body.Push(b.Decl(b.Let("rhs", rhs_init)));
for (int i = 0; i < 255; i++) { for (int i = 0; i < 255; i++) {
params.Push( params.Push(
b.Param("p" + std::to_string(i), ty.pointer(ty.i32(), ast::StorageClass::kFunction))); b.Param("p" + std::to_string(i), ty.pointer(ty.i32(), ast::StorageClass::kFunction)));
@ -6526,7 +6526,7 @@ TEST_F(UniformityAnalysisTest, StressGraphTraversalDepth) {
std::string v_last = "v0"; std::string v_last = "v0";
for (int i = 1; i < 100000; i++) { for (int i = 1; i < 100000; i++) {
auto v = "v" + std::to_string(i); auto v = "v" + std::to_string(i);
foo_body.Push(b.Decl(b.Var(v, nullptr, b.Expr(v_last)))); foo_body.Push(b.Decl(b.Var(v, b.Expr(v_last))));
v_last = v; v_last = v;
} }
foo_body.Push(b.If(b.Equal(v_last, 0_i), b.Block(b.CallStmt(b.Call("workgroupBarrier"))))); foo_body.Push(b.If(b.Equal(v_last, 0_i), b.Block(b.CallStmt(b.Call("workgroupBarrier")))));

50
src/tint/resolver/validation_test.cc
View File

@ -242,7 +242,7 @@ TEST_F(ResolverValidationTest, UsingUndefinedVariableInnerScope_Fail) {
// if (true) { var a : f32 = 2.0; } // if (true) { var a : f32 = 2.0; }
// a = 3.14; // a = 3.14;
// } // }
auto* var = Var("a", ty.f32(), ast::StorageClass::kNone, Expr(2_f)); auto* var = Var("a", ty.f32(), Expr(2_f));
auto* cond = Expr(true); auto* cond = Expr(true);
auto* body = Block(Decl(var)); auto* body = Block(Decl(var));
@ -264,7 +264,7 @@ TEST_F(ResolverValidationTest, UsingUndefinedVariableOuterScope_Pass) {
// var a : f32 = 2.0; // var a : f32 = 2.0;
// if (true) { a = 3.14; } // if (true) { a = 3.14; }
// } // }
auto* var = Var("a", ty.f32(), ast::StorageClass::kNone, Expr(2_f)); auto* var = Var("a", ty.f32(), Expr(2_f));
auto* lhs = Expr(Source{{12, 34}}, "a"); auto* lhs = Expr(Source{{12, 34}}, "a");
auto* rhs = Expr(3.14_f); auto* rhs = Expr(3.14_f);
@ -284,7 +284,7 @@ TEST_F(ResolverValidationTest, UsingUndefinedVariableDifferentScope_Fail) {
// { var a : f32 = 2.0; } // { var a : f32 = 2.0; }
// { a = 3.14; } // { a = 3.14; }
// } // }
auto* var = Var("a", ty.f32(), ast::StorageClass::kNone, Expr(2_f)); auto* var = Var("a", ty.f32(), Expr(2_f));
auto* first_body = Block(Decl(var)); auto* first_body = Block(Decl(var));
auto* lhs = Expr(Source{{12, 34}}, "a"); auto* lhs = Expr(Source{{12, 34}}, "a");
@ -329,11 +329,7 @@ TEST_F(ResolverValidationTest, StorageClass_FunctionVariableI32) {
TEST_F(ResolverValidationTest, StorageClass_SamplerExplicitStorageClass) { TEST_F(ResolverValidationTest, StorageClass_SamplerExplicitStorageClass) {
auto* t = ty.sampler(ast::SamplerKind::kSampler); auto* t = ty.sampler(ast::SamplerKind::kSampler);
GlobalVar(Source{{12, 34}}, "var", t, ast::StorageClass::kHandle, GlobalVar(Source{{12, 34}}, "var", t, ast::StorageClass::kHandle, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
@ -343,11 +339,7 @@ TEST_F(ResolverValidationTest, StorageClass_SamplerExplicitStorageClass) {
TEST_F(ResolverValidationTest, StorageClass_TextureExplicitStorageClass) { TEST_F(ResolverValidationTest, StorageClass_TextureExplicitStorageClass) {
auto* t = ty.sampled_texture(ast::TextureDimension::k1d, ty.f32()); auto* t = ty.sampled_texture(ast::TextureDimension::k1d, ty.f32());
GlobalVar(Source{{12, 34}}, "var", t, ast::StorageClass::kHandle, GlobalVar(Source{{12, 34}}, "var", t, ast::StorageClass::kHandle, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
EXPECT_FALSE(r()->Resolve()) << r()->error(); EXPECT_FALSE(r()->Resolve()) << r()->error();
@ -472,7 +464,7 @@ TEST_F(ResolverValidationTest,
// } // }
auto error_loc = Source{{12, 34}}; auto error_loc = Source{{12, 34}};
auto* body = Block(Continue(), Decl(error_loc, Var("z", ty.i32(), ast::StorageClass::kNone))); auto* body = Block(Continue(), Decl(error_loc, Var("z", ty.i32())));
auto* continuing = Block(Assign(Expr("z"), 2_i)); auto* continuing = Block(Assign(Expr("z"), 2_i));
auto* loop_stmt = Loop(body, continuing); auto* loop_stmt = Loop(body, continuing);
WrapInFunction(loop_stmt); WrapInFunction(loop_stmt);
@ -497,9 +489,8 @@ TEST_F(ResolverValidationTest, Stmt_Loop_ContinueInLoopBodyAfterDecl_UsageInCont
// } // }
// } // }
auto* body = auto* body = Block(If(false, Block(Break())), //
Block(If(false, Block(Break())), // Decl(Var("z", ty.i32())), Block(Block(Block(Continue()))));
Decl(Var("z", ty.i32(), ast::StorageClass::kNone)), Block(Block(Block(Continue()))));
auto* continuing = Block(Assign(Expr("z"), 2_i)); auto* continuing = Block(Assign(Expr("z"), 2_i));
auto* loop_stmt = Loop(body, continuing); auto* loop_stmt = Loop(body, continuing);
WrapInFunction(loop_stmt); WrapInFunction(loop_stmt);
@ -521,8 +512,8 @@ TEST_F(ResolverValidationTest, Stmt_Loop_ContinueInLoopBodySubscopeBeforeDecl_Us
auto cont_loc = Source{{12, 34}}; auto cont_loc = Source{{12, 34}};
auto decl_loc = Source{{56, 78}}; auto decl_loc = Source{{56, 78}};
auto ref_loc = Source{{90, 12}}; auto ref_loc = Source{{90, 12}};
auto* body = Block(If(Expr(true), Block(Continue(cont_loc))), auto* body =
Decl(Var(decl_loc, "z", ty.i32(), ast::StorageClass::kNone))); Block(If(Expr(true), Block(Continue(cont_loc))), Decl(Var(decl_loc, "z", ty.i32())));
auto* continuing = Block(Assign(Expr(ref_loc, "z"), 2_i)); auto* continuing = Block(Assign(Expr(ref_loc, "z"), 2_i));
auto* loop_stmt = Loop(body, continuing); auto* loop_stmt = Loop(body, continuing);
WrapInFunction(loop_stmt); WrapInFunction(loop_stmt);
@ -551,8 +542,8 @@ TEST_F(ResolverValidationTest,
auto cont_loc = Source{{12, 34}}; auto cont_loc = Source{{12, 34}};
auto decl_loc = Source{{56, 78}}; auto decl_loc = Source{{56, 78}};
auto ref_loc = Source{{90, 12}}; auto ref_loc = Source{{90, 12}};
auto* body = Block(If(Expr(true), Block(Continue(cont_loc))), auto* body =
Decl(Var(decl_loc, "z", ty.i32(), ast::StorageClass::kNone))); Block(If(Expr(true), Block(Continue(cont_loc))), Decl(Var(decl_loc, "z", ty.i32())));
auto* continuing = Block(If(Expr(true), Block(Assign(Expr(ref_loc, "z"), 2_i)))); auto* continuing = Block(If(Expr(true), Block(Assign(Expr(ref_loc, "z"), 2_i))));
auto* loop_stmt = Loop(body, continuing); auto* loop_stmt = Loop(body, continuing);
@ -582,8 +573,8 @@ TEST_F(ResolverValidationTest, Stmt_Loop_ContinueInLoopBodySubscopeBeforeDecl_Us
auto cont_loc = Source{{12, 34}}; auto cont_loc = Source{{12, 34}};
auto decl_loc = Source{{56, 78}}; auto decl_loc = Source{{56, 78}};
auto ref_loc = Source{{90, 12}}; auto ref_loc = Source{{90, 12}};
auto* body = Block(If(Expr(true), Block(Continue(cont_loc))), auto* body =
Decl(Var(decl_loc, "z", ty.i32(), ast::StorageClass::kNone))); Block(If(Expr(true), Block(Continue(cont_loc))), Decl(Var(decl_loc, "z", ty.i32())));
auto* compare = auto* compare =
create<ast::BinaryExpression>(ast::BinaryOp::kLessThan, Expr(ref_loc, "z"), Expr(2_i)); create<ast::BinaryExpression>(ast::BinaryOp::kLessThan, Expr(ref_loc, "z"), Expr(2_i));
auto* continuing = Block(If(compare, Block())); auto* continuing = Block(If(compare, Block()));
@ -614,8 +605,8 @@ TEST_F(ResolverValidationTest,
auto cont_loc = Source{{12, 34}}; auto cont_loc = Source{{12, 34}};
auto decl_loc = Source{{56, 78}}; auto decl_loc = Source{{56, 78}};
auto ref_loc = Source{{90, 12}}; auto ref_loc = Source{{90, 12}};
auto* body = Block(If(Expr(true), Block(Continue(cont_loc))), auto* body =
Decl(Var(decl_loc, "z", ty.i32(), ast::StorageClass::kNone))); Block(If(Expr(true), Block(Continue(cont_loc))), Decl(Var(decl_loc, "z", ty.i32())));
auto* continuing = Block(Loop(Block(Assign(Expr(ref_loc, "z"), 2_i)))); auto* continuing = Block(Loop(Block(Assign(Expr(ref_loc, "z"), 2_i))));
auto* loop_stmt = Loop(body, continuing); auto* loop_stmt = Loop(body, continuing);
@ -645,7 +636,7 @@ TEST_F(ResolverValidationTest, Stmt_Loop_ContinueInNestedLoopBodyBeforeDecl_Usag
If(true, Block(Continue())), // If(true, Block(Continue())), //
Break())); Break()));
auto* body = Block(inner_loop, // auto* body = Block(inner_loop, //
Decl(Var("z", ty.i32(), ast::StorageClass::kNone)), // Decl(Var("z", ty.i32())), //
Break()); Break());
auto* continuing = Block(Assign("z", 2_i)); auto* continuing = Block(Assign("z", 2_i));
auto* loop_stmt = Loop(body, continuing); auto* loop_stmt = Loop(body, continuing);
@ -673,7 +664,7 @@ TEST_F(ResolverValidationTest,
auto* inner_loop = Loop(Block(If(true, Block(Continue())), // auto* inner_loop = Loop(Block(If(true, Block(Continue())), //
Break())); Break()));
auto* body = Block(inner_loop, // auto* body = Block(inner_loop, //
Decl(Var("z", ty.i32(), ast::StorageClass::kNone)), // Decl(Var("z", ty.i32())), //
Break()); Break());
auto* continuing = Block(If(Expr(true), Block(Assign("z", 2_i)))); auto* continuing = Block(If(Expr(true), Block(Assign("z", 2_i))));
auto* loop_stmt = Loop(body, continuing); auto* loop_stmt = Loop(body, continuing);
@ -701,7 +692,7 @@ TEST_F(ResolverValidationTest, Stmt_Loop_ContinueInNestedLoopBodyBeforeDecl_Usag
auto* inner_loop = Loop(Block(If(true, Block(Continue())), // auto* inner_loop = Loop(Block(If(true, Block(Continue())), //
Break())); Break()));
auto* body = Block(inner_loop, // auto* body = Block(inner_loop, //
Decl(Var("z", ty.i32(), ast::StorageClass::kNone)), // Decl(Var("z", ty.i32())), //
Break()); Break());
auto* continuing = Block(Loop(Block(Assign("z", 2_i), // auto* continuing = Block(Loop(Block(Assign("z", 2_i), //
Break()))); Break())));
@ -722,8 +713,7 @@ TEST_F(ResolverTest, Stmt_Loop_ContinueInLoopBodyAfterDecl_UsageInContinuing) {
// } // }
auto error_loc = Source{{12, 34}}; auto error_loc = Source{{12, 34}};
auto* body = auto* body = Block(Decl(Var("z", ty.i32())), If(true, Block(Continue())), //
Block(Decl(Var("z", ty.i32(), ast::StorageClass::kNone)), If(true, Block(Continue())), //
Break()); Break());
auto* continuing = Block(Assign(Expr(error_loc, "z"), 2_i)); auto* continuing = Block(Assign(Expr(error_loc, "z"), 2_i));
auto* loop_stmt = Loop(body, continuing); auto* loop_stmt = Loop(body, continuing);

186
src/tint/resolver/variable_test.cc
View File

@ -46,13 +46,13 @@ TEST_F(ResolverVariableTest, LocalVar_NoConstructor) {
auto* S = Structure("S", utils::Vector{Member("i", ty.i32())}); auto* S = Structure("S", utils::Vector{Member("i", ty.i32())});
auto* A = Alias("A", ty.Of(S)); auto* A = Alias("A", ty.Of(S));
auto* i = Var("i", ty.i32(), ast::StorageClass::kNone); auto* i = Var("i", ty.i32());
auto* u = Var("u", ty.u32(), ast::StorageClass::kNone); auto* u = Var("u", ty.u32());
auto* f = Var("f", ty.f32(), ast::StorageClass::kNone); auto* f = Var("f", ty.f32());
auto* h = Var("h", ty.f16(), ast::StorageClass::kNone); auto* h = Var("h", ty.f16());
auto* b = Var("b", ty.bool_(), ast::StorageClass::kNone); auto* b = Var("b", ty.bool_());
auto* s = Var("s", ty.Of(S), ast::StorageClass::kNone); auto* s = Var("s", ty.Of(S));
auto* a = Var("a", ty.Of(A), ast::StorageClass::kNone); auto* a = Var("a", ty.Of(A));
Func("F", utils::Empty, ty.void_(), Func("F", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -119,13 +119,13 @@ TEST_F(ResolverVariableTest, LocalVar_WithConstructor) {
auto* s_c = Construct(ty.Of(S), Expr(1_i)); auto* s_c = Construct(ty.Of(S), Expr(1_i));
auto* a_c = Construct(ty.Of(A), Expr(1_i)); auto* a_c = Construct(ty.Of(A), Expr(1_i));
auto* i = Var("i", ty.i32(), ast::StorageClass::kNone, i_c); auto* i = Var("i", ty.i32(), i_c);
auto* u = Var("u", ty.u32(), ast::StorageClass::kNone, u_c); auto* u = Var("u", ty.u32(), u_c);
auto* f = Var("f", ty.f32(), ast::StorageClass::kNone, f_c); auto* f = Var("f", ty.f32(), f_c);
auto* h = Var("h", ty.f16(), ast::StorageClass::kNone, h_c); auto* h = Var("h", ty.f16(), h_c);
auto* b = Var("b", ty.bool_(), ast::StorageClass::kNone, b_c); auto* b = Var("b", ty.bool_(), b_c);
auto* s = Var("s", ty.Of(S), ast::StorageClass::kNone, s_c); auto* s = Var("s", ty.Of(S), s_c);
auto* a = Var("a", ty.Of(A), ast::StorageClass::kNone, a_c); auto* a = Var("a", ty.Of(A), a_c);
Func("F", utils::Empty, ty.void_(), Func("F", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -181,7 +181,7 @@ TEST_F(ResolverVariableTest, LocalVar_ShadowsAlias) {
// } // }
auto* t = Alias("a", ty.i32()); auto* t = Alias("a", ty.i32());
auto* v = Var("a", nullptr, Expr(false)); auto* v = Var("a", Expr(false));
Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(v)}); Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(v)});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -202,7 +202,7 @@ TEST_F(ResolverVariableTest, LocalVar_ShadowsStruct) {
// } // }
auto* t = Structure("a", utils::Vector{Member("m", ty.i32())}); auto* t = Structure("a", utils::Vector{Member("m", ty.i32())});
auto* v = Var("a", nullptr, Expr(false)); auto* v = Var("a", Expr(false));
Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(v)}); Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(v)});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -218,7 +218,7 @@ TEST_F(ResolverVariableTest, LocalVar_ShadowsFunction) {
// var a = true; // var a = true;
// } // }
auto* v = Var("a", nullptr, Expr(false)); auto* v = Var("a", Expr(false));
auto* f = Func("a", utils::Empty, ty.void_(), utils::Vector{Decl(v)}); auto* f = Func("a", utils::Empty, ty.void_(), utils::Vector{Decl(v)});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -239,7 +239,7 @@ TEST_F(ResolverVariableTest, LocalVar_ShadowsGlobalVar) {
// } // }
auto* g = GlobalVar("a", ty.i32(), ast::StorageClass::kPrivate); auto* g = GlobalVar("a", ty.i32(), ast::StorageClass::kPrivate);
auto* v = Var("a", nullptr, Expr("a")); auto* v = Var("a", Expr("a"));
Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(v)}); Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(v)});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -262,7 +262,7 @@ TEST_F(ResolverVariableTest, LocalVar_ShadowsGlobalConst) {
// } // }
auto* g = GlobalConst("a", ty.i32(), Expr(1_i)); auto* g = GlobalConst("a", ty.i32(), Expr(1_i));
auto* v = Var("a", nullptr, Expr("a")); auto* v = Var("a", Expr("a"));
Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(v)}); Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(v)});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -286,7 +286,7 @@ TEST_F(ResolverVariableTest, LocalVar_ShadowsLocalVar) {
// } // }
auto* x = Var("a", ty.i32(), Expr(1_i)); auto* x = Var("a", ty.i32(), Expr(1_i));
auto* y = Var("a", nullptr, Expr("a")); auto* y = Var("a", Expr("a"));
Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(x), Block(Decl(y))}); Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(x), Block(Decl(y))});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -312,7 +312,7 @@ TEST_F(ResolverVariableTest, LocalVar_ShadowsLocalConst) {
// } // }
auto* c = Const("a", ty.i32(), Expr(1_i)); auto* c = Const("a", ty.i32(), Expr(1_i));
auto* v = Var("a", nullptr, Expr("a")); auto* v = Var("a", Expr("a"));
Func("X", utils::Empty, ty.void_(), utils::Vector{Decl(c), Block(Decl(v))}); Func("X", utils::Empty, ty.void_(), utils::Vector{Decl(c), Block(Decl(v))});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -338,7 +338,7 @@ TEST_F(ResolverVariableTest, LocalVar_ShadowsLocalLet) {
// } // }
auto* l = Let("a", ty.i32(), Expr(1_i)); auto* l = Let("a", ty.i32(), Expr(1_i));
auto* v = Var("a", nullptr, Expr("a")); auto* v = Var("a", Expr("a"));
Func("X", utils::Empty, ty.void_(), utils::Vector{Decl(l), Block(Decl(v))}); Func("X", utils::Empty, ty.void_(), utils::Vector{Decl(l), Block(Decl(v))});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -363,7 +363,7 @@ TEST_F(ResolverVariableTest, LocalVar_ShadowsParam) {
// } // }
auto* p = Param("a", ty.i32()); auto* p = Param("a", ty.i32());
auto* v = Var("a", nullptr, Expr("a")); auto* v = Var("a", Expr("a"));
Func("X", utils::Vector{p}, ty.void_(), utils::Vector{Block(Decl(v))}); Func("X", utils::Vector{p}, ty.void_(), utils::Vector{Block(Decl(v))});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -401,7 +401,7 @@ TEST_F(ResolverVariableTest, LocalLet) {
auto* S = Structure("S", utils::Vector{Member("i", ty.i32())}); auto* S = Structure("S", utils::Vector{Member("i", ty.i32())});
auto* A = Alias("A", ty.Of(S)); auto* A = Alias("A", ty.Of(S));
auto* v = Var("v", ty.i32(), ast::StorageClass::kNone); auto* v = Var("v", ty.i32());
auto* i_c = Expr(1_i); auto* i_c = Expr(1_i);
auto* u_c = Expr(1_u); auto* u_c = Expr(1_u);
@ -471,13 +471,10 @@ TEST_F(ResolverVariableTest, LocalLet_InheritsAccessFromOriginatingVariable) {
auto* inner = Structure("Inner", utils::Vector{Member("arr", ty.array<i32, 4>())}); auto* inner = Structure("Inner", utils::Vector{Member("arr", ty.array<i32, 4>())});
auto* buf = Structure("S", utils::Vector{Member("inner", ty.Of(inner))}); auto* buf = Structure("S", utils::Vector{Member("inner", ty.Of(inner))});
auto* storage = GlobalVar("s", ty.Of(buf), ast::StorageClass::kStorage, ast::Access::kReadWrite, auto* storage = GlobalVar("s", ty.Of(buf), ast::StorageClass::kStorage, ast::Access::kReadWrite,
utils::Vector{ Binding(0), Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
auto* expr = IndexAccessor(MemberAccessor(MemberAccessor(storage, "inner"), "arr"), 4_i); auto* expr = IndexAccessor(MemberAccessor(MemberAccessor(storage, "inner"), "arr"), 4_i);
auto* ptr = Let("p", nullptr, AddressOf(expr)); auto* ptr = Let("p", AddressOf(expr));
WrapInFunction(ptr); WrapInFunction(ptr);
@ -498,7 +495,7 @@ TEST_F(ResolverVariableTest, LocalLet_ShadowsAlias) {
// } // }
auto* t = Alias("a", ty.i32()); auto* t = Alias("a", ty.i32());
auto* l = Let("a", nullptr, Expr(false)); auto* l = Let("a", Expr(false));
Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(l)}); Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(l)});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -519,7 +516,7 @@ TEST_F(ResolverVariableTest, LocalLet_ShadowsStruct) {
// } // }
auto* t = Structure("a", utils::Vector{Member("m", ty.i32())}); auto* t = Structure("a", utils::Vector{Member("m", ty.i32())});
auto* l = Let("a", nullptr, Expr(false)); auto* l = Let("a", Expr(false));
Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(l)}); Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(l)});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -535,7 +532,7 @@ TEST_F(ResolverVariableTest, LocalLet_ShadowsFunction) {
// let a = false; // let a = false;
// } // }
auto* l = Let("a", nullptr, Expr(false)); auto* l = Let("a", Expr(false));
auto* fb = Func("a", utils::Empty, ty.void_(), utils::Vector{Decl(l)}); auto* fb = Func("a", utils::Empty, ty.void_(), utils::Vector{Decl(l)});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -556,7 +553,7 @@ TEST_F(ResolverVariableTest, LocalLet_ShadowsGlobalVar) {
// } // }
auto* g = GlobalVar("a", ty.i32(), ast::StorageClass::kPrivate); auto* g = GlobalVar("a", ty.i32(), ast::StorageClass::kPrivate);
auto* l = Let("a", nullptr, Expr("a")); auto* l = Let("a", Expr("a"));
Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(l)}); Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(l)});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -579,7 +576,7 @@ TEST_F(ResolverVariableTest, LocalLet_ShadowsGlobalConst) {
// } // }
auto* g = GlobalConst("a", ty.i32(), Expr(1_i)); auto* g = GlobalConst("a", ty.i32(), Expr(1_i));
auto* l = Let("a", nullptr, Expr("a")); auto* l = Let("a", Expr("a"));
Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(l)}); Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(l)});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -603,7 +600,7 @@ TEST_F(ResolverVariableTest, LocalLet_ShadowsLocalVar) {
// } // }
auto* v = Var("a", ty.i32(), Expr(1_i)); auto* v = Var("a", ty.i32(), Expr(1_i));
auto* l = Let("a", nullptr, Expr("a")); auto* l = Let("a", Expr("a"));
Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(v), Block(Decl(l))}); Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(v), Block(Decl(l))});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -629,7 +626,7 @@ TEST_F(ResolverVariableTest, LocalLet_ShadowsLocalConst) {
// } // }
auto* x = Const("a", ty.i32(), Expr(1_i)); auto* x = Const("a", ty.i32(), Expr(1_i));
auto* y = Let("a", nullptr, Expr("a")); auto* y = Let("a", Expr("a"));
Func("X", utils::Empty, ty.void_(), utils::Vector{Decl(x), Block(Decl(y))}); Func("X", utils::Empty, ty.void_(), utils::Vector{Decl(x), Block(Decl(y))});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -655,7 +652,7 @@ TEST_F(ResolverVariableTest, LocalLet_ShadowsLocalLet) {
// } // }
auto* x = Let("a", ty.i32(), Expr(1_i)); auto* x = Let("a", ty.i32(), Expr(1_i));
auto* y = Let("a", nullptr, Expr("a")); auto* y = Let("a", Expr("a"));
Func("X", utils::Empty, ty.void_(), utils::Vector{Decl(x), Block(Decl(y))}); Func("X", utils::Empty, ty.void_(), utils::Vector{Decl(x), Block(Decl(y))});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -680,7 +677,7 @@ TEST_F(ResolverVariableTest, LocalLet_ShadowsParam) {
// } // }
auto* p = Param("a", ty.i32()); auto* p = Param("a", ty.i32());
auto* l = Let("a", nullptr, Expr("a")); auto* l = Let("a", Expr("a"));
Func("X", utils::Vector{p}, ty.void_(), utils::Vector{Block(Decl(l))}); Func("X", utils::Vector{p}, ty.void_(), utils::Vector{Block(Decl(l))});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -708,7 +705,7 @@ TEST_F(ResolverVariableTest, LocalConst_ShadowsAlias) {
// } // }
auto* t = Alias("a", ty.i32()); auto* t = Alias("a", ty.i32());
auto* c = Const("a", nullptr, Expr(false)); auto* c = Const("a", Expr(false));
Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(c)}); Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(c)});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -729,7 +726,7 @@ TEST_F(ResolverVariableTest, LocalConst_ShadowsStruct) {
// } // }
auto* t = Structure("a", utils::Vector{Member("m", ty.i32())}); auto* t = Structure("a", utils::Vector{Member("m", ty.i32())});
auto* c = Const("a", nullptr, Expr(false)); auto* c = Const("a", Expr(false));
Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(c)}); Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(c)});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -745,7 +742,7 @@ TEST_F(ResolverVariableTest, LocalConst_ShadowsFunction) {
// const a = false; // const a = false;
// } // }
auto* c = Const("a", nullptr, Expr(false)); auto* c = Const("a", Expr(false));
auto* fb = Func("a", utils::Empty, ty.void_(), utils::Vector{Decl(c)}); auto* fb = Func("a", utils::Empty, ty.void_(), utils::Vector{Decl(c)});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -766,7 +763,7 @@ TEST_F(ResolverVariableTest, LocalConst_ShadowsGlobalVar) {
// } // }
auto* g = GlobalVar("a", ty.i32(), ast::StorageClass::kPrivate); auto* g = GlobalVar("a", ty.i32(), ast::StorageClass::kPrivate);
auto* c = Const("a", nullptr, Expr(1_i)); auto* c = Const("a", Expr(1_i));
Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(c)}); Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(c)});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -785,7 +782,7 @@ TEST_F(ResolverVariableTest, LocalConst_ShadowsGlobalConst) {
// } // }
auto* g = GlobalConst("a", ty.i32(), Expr(1_i)); auto* g = GlobalConst("a", ty.i32(), Expr(1_i));
auto* c = Const("a", nullptr, Expr("a")); auto* c = Const("a", Expr("a"));
Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(c)}); Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(c)});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -809,7 +806,7 @@ TEST_F(ResolverVariableTest, LocalConst_ShadowsLocalVar) {
// } // }
auto* v = Var("a", ty.i32(), Expr(1_i)); auto* v = Var("a", ty.i32(), Expr(1_i));
auto* c = Const("a", nullptr, Expr(1_i)); auto* c = Const("a", Expr(1_i));
Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(v), Block(Decl(c))}); Func("F", utils::Empty, ty.void_(), utils::Vector{Decl(v), Block(Decl(c))});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -831,7 +828,7 @@ TEST_F(ResolverVariableTest, LocalConst_ShadowsLocalConst) {
// } // }
auto* x = Const("a", ty.i32(), Expr(1_i)); auto* x = Const("a", ty.i32(), Expr(1_i));
auto* y = Const("a", nullptr, Expr("a")); auto* y = Const("a", Expr("a"));
Func("X", utils::Empty, ty.void_(), utils::Vector{Decl(x), Block(Decl(y))}); Func("X", utils::Empty, ty.void_(), utils::Vector{Decl(x), Block(Decl(y))});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -857,7 +854,7 @@ TEST_F(ResolverVariableTest, LocalConst_ShadowsLocalLet) {
// } // }
auto* l = Let("a", ty.i32(), Expr(1_i)); auto* l = Let("a", ty.i32(), Expr(1_i));
auto* c = Const("a", nullptr, Expr(1_i)); auto* c = Const("a", Expr(1_i));
Func("X", utils::Empty, ty.void_(), utils::Vector{Decl(l), Block(Decl(c))}); Func("X", utils::Empty, ty.void_(), utils::Vector{Decl(l), Block(Decl(c))});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -878,7 +875,7 @@ TEST_F(ResolverVariableTest, LocalConst_ShadowsParam) {
// } // }
auto* p = Param("a", ty.i32()); auto* p = Param("a", ty.i32());
auto* c = Const("a", nullptr, Expr(1_i)); auto* c = Const("a", Expr(1_i));
Func("X", utils::Vector{p}, ty.void_(), utils::Vector{Block(Decl(c))}); Func("X", utils::Vector{p}, ty.void_(), utils::Vector{Block(Decl(c))});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -938,23 +935,22 @@ TEST_F(ResolverVariableTest, LocalConst_ExplicitType_Decls) {
TEST_F(ResolverVariableTest, LocalConst_ImplicitType_Decls) { TEST_F(ResolverVariableTest, LocalConst_ImplicitType_Decls) {
Structure("S", utils::Vector{Member("m", ty.u32())}); Structure("S", utils::Vector{Member("m", ty.u32())});
auto* c_i32 = Const("a", nullptr, Expr(0_i)); auto* c_i32 = Const("a", Expr(0_i));
auto* c_u32 = Const("b", nullptr, Expr(0_u)); auto* c_u32 = Const("b", Expr(0_u));
auto* c_f32 = Const("c", nullptr, Expr(0_f)); auto* c_f32 = Const("c", Expr(0_f));
auto* c_ai = Const("d", nullptr, Expr(0_a)); auto* c_ai = Const("d", Expr(0_a));
auto* c_af = Const("e", nullptr, Expr(0._a)); auto* c_af = Const("e", Expr(0._a));
auto* c_vi32 = Const("f", nullptr, vec3<i32>()); auto* c_vi32 = Const("f", vec3<i32>());
auto* c_vu32 = Const("g", nullptr, vec3<u32>()); auto* c_vu32 = Const("g", vec3<u32>());
auto* c_vf32 = Const("h", nullptr, vec3<f32>()); auto* c_vf32 = Const("h", vec3<f32>());
auto* c_vai = Const("i", nullptr, Construct(ty.vec(nullptr, 3), Expr(0_a))); auto* c_vai = Const("i", Construct(ty.vec(nullptr, 3), Expr(0_a)));
auto* c_vaf = Const("j", nullptr, Construct(ty.vec(nullptr, 3), Expr(0._a))); auto* c_vaf = Const("j", Construct(ty.vec(nullptr, 3), Expr(0._a)));
auto* c_mf32 = Const("k", nullptr, mat3x3<f32>()); auto* c_mf32 = Const("k", mat3x3<f32>());
auto* c_maf32 = Const("l", nullptr, auto* c_maf32 = Const("l", Construct(ty.mat(nullptr, 3, 3), //
Construct(ty.mat(nullptr, 3, 3), //
Construct(ty.vec(nullptr, 3), Expr(0._a)), Construct(ty.vec(nullptr, 3), Expr(0._a)),
Construct(ty.vec(nullptr, 3), Expr(0._a)), Construct(ty.vec(nullptr, 3), Expr(0._a)),
Construct(ty.vec(nullptr, 3), Expr(0._a)))); Construct(ty.vec(nullptr, 3), Expr(0._a))));
auto* c_s = Const("m", nullptr, Construct(ty.type_name("S"))); auto* c_s = Const("m", Construct(ty.type_name("S")));
WrapInFunction(c_i32, c_u32, c_f32, c_ai, c_af, c_vi32, c_vu32, c_vf32, c_vai, c_vaf, c_mf32, WrapInFunction(c_i32, c_u32, c_f32, c_ai, c_af, c_vi32, c_vu32, c_vf32, c_vai, c_vaf, c_mf32,
c_maf32, c_s); c_maf32, c_s);
@ -1005,9 +1001,9 @@ TEST_F(ResolverVariableTest, LocalConst_ImplicitType_Decls) {
} }
TEST_F(ResolverVariableTest, LocalConst_PropagateConstValue) { TEST_F(ResolverVariableTest, LocalConst_PropagateConstValue) {
auto* a = Const("a", nullptr, Expr(42_i)); auto* a = Const("a", Expr(42_i));
auto* b = Const("b", nullptr, Expr("a")); auto* b = Const("b", Expr("a"));
auto* c = Const("c", nullptr, Expr("b")); auto* c = Const("c", Expr("b"));
WrapInFunction(a, b, c); WrapInFunction(a, b, c);
@ -1020,7 +1016,7 @@ TEST_F(ResolverVariableTest, LocalConst_PropagateConstValue) {
// Enable when we have @const operators implemented // Enable when we have @const operators implemented
TEST_F(ResolverVariableTest, DISABLED_LocalConst_ConstEval) { TEST_F(ResolverVariableTest, DISABLED_LocalConst_ConstEval) {
auto* c = Const("c", nullptr, Div(Mul(Add(1_i, 2_i), 3_i), 2_i)); auto* c = Const("c", Div(Mul(Add(1_i, 2_i), 3_i), 2_i));
WrapInFunction(c); WrapInFunction(c);
@ -1040,21 +1036,10 @@ TEST_F(ResolverVariableTest, GlobalVar_StorageClass) {
auto* buf = Structure("S", utils::Vector{Member("m", ty.i32())}); auto* buf = Structure("S", utils::Vector{Member("m", ty.i32())});
auto* private_ = GlobalVar("p", ty.i32(), ast::StorageClass::kPrivate); auto* private_ = GlobalVar("p", ty.i32(), ast::StorageClass::kPrivate);
auto* workgroup = GlobalVar("w", ty.i32(), ast::StorageClass::kWorkgroup); auto* workgroup = GlobalVar("w", ty.i32(), ast::StorageClass::kWorkgroup);
auto* uniform = GlobalVar("ub", ty.Of(buf), ast::StorageClass::kUniform, auto* uniform = GlobalVar("ub", ty.Of(buf), ast::StorageClass::kUniform, Binding(0), Group(0));
utils::Vector{ auto* storage = GlobalVar("sb", ty.Of(buf), ast::StorageClass::kStorage, Binding(1), Group(0));
create<ast::BindingAttribute>(0u), auto* handle =
create<ast::GroupAttribute>(0u), GlobalVar("h", ty.depth_texture(ast::TextureDimension::k2d), Binding(2), Group(0));
});
auto* storage = GlobalVar("sb", ty.Of(buf), ast::StorageClass::kStorage,
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(0u),
});
auto* handle = GlobalVar("h", ty.depth_texture(ast::TextureDimension::k2d),
utils::Vector{
create<ast::BindingAttribute>(2u),
create<ast::GroupAttribute>(0u),
});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -1075,12 +1060,8 @@ TEST_F(ResolverVariableTest, GlobalVar_ExplicitStorageClass) {
// https://gpuweb.github.io/gpuweb/wgsl/#storage-class // https://gpuweb.github.io/gpuweb/wgsl/#storage-class
auto* buf = Structure("S", utils::Vector{Member("m", ty.i32())}); auto* buf = Structure("S", utils::Vector{Member("m", ty.i32())});
auto* storage = auto* storage = GlobalVar("sb", ty.Of(buf), ast::StorageClass::kStorage,
GlobalVar("sb", ty.Of(buf), ast::StorageClass::kStorage, ast::Access::kReadWrite, ast::Access::kReadWrite, Binding(1), Group(0));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(0u),
});
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -1129,19 +1110,18 @@ TEST_F(ResolverVariableTest, GlobalConst_ExplicitType_Decls) {
} }
TEST_F(ResolverVariableTest, GlobalConst_ImplicitType_Decls) { TEST_F(ResolverVariableTest, GlobalConst_ImplicitType_Decls) {
auto* c_i32 = GlobalConst("a", nullptr, Expr(0_i)); auto* c_i32 = GlobalConst("a", Expr(0_i));
auto* c_u32 = GlobalConst("b", nullptr, Expr(0_u)); auto* c_u32 = GlobalConst("b", Expr(0_u));
auto* c_f32 = GlobalConst("c", nullptr, Expr(0_f)); auto* c_f32 = GlobalConst("c", Expr(0_f));
auto* c_ai = GlobalConst("d", nullptr, Expr(0_a)); auto* c_ai = GlobalConst("d", Expr(0_a));
auto* c_af = GlobalConst("e", nullptr, Expr(0._a)); auto* c_af = GlobalConst("e", Expr(0._a));
auto* c_vi32 = GlobalConst("f", nullptr, vec3<i32>()); auto* c_vi32 = GlobalConst("f", vec3<i32>());
auto* c_vu32 = GlobalConst("g", nullptr, vec3<u32>()); auto* c_vu32 = GlobalConst("g", vec3<u32>());
auto* c_vf32 = GlobalConst("h", nullptr, vec3<f32>()); auto* c_vf32 = GlobalConst("h", vec3<f32>());
auto* c_vai = GlobalConst("i", nullptr, Construct(ty.vec(nullptr, 3), Expr(0_a))); auto* c_vai = GlobalConst("i", Construct(ty.vec(nullptr, 3), Expr(0_a)));
auto* c_vaf = GlobalConst("j", nullptr, Construct(ty.vec(nullptr, 3), Expr(0._a))); auto* c_vaf = GlobalConst("j", Construct(ty.vec(nullptr, 3), Expr(0._a)));
auto* c_mf32 = GlobalConst("k", nullptr, mat3x3<f32>()); auto* c_mf32 = GlobalConst("k", mat3x3<f32>());
auto* c_maf32 = GlobalConst("l", nullptr, auto* c_maf32 = GlobalConst("l", Construct(ty.mat(nullptr, 3, 3), //
Construct(ty.mat(nullptr, 3, 3), //
Construct(ty.vec(nullptr, 3), Expr(0._a)), Construct(ty.vec(nullptr, 3), Expr(0._a)),
Construct(ty.vec(nullptr, 3), Expr(0._a)), Construct(ty.vec(nullptr, 3), Expr(0._a)),
Construct(ty.vec(nullptr, 3), Expr(0._a)))); Construct(ty.vec(nullptr, 3), Expr(0._a))));
@ -1189,9 +1169,9 @@ TEST_F(ResolverVariableTest, GlobalConst_ImplicitType_Decls) {
} }
TEST_F(ResolverVariableTest, GlobalConst_PropagateConstValue) { TEST_F(ResolverVariableTest, GlobalConst_PropagateConstValue) {
GlobalConst("b", nullptr, Expr("a")); GlobalConst("b", Expr("a"));
auto* c = GlobalConst("c", nullptr, Expr("b")); auto* c = GlobalConst("c", Expr("b"));
GlobalConst("a", nullptr, Expr(42_i)); GlobalConst("a", Expr(42_i));
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();
@ -1202,7 +1182,7 @@ TEST_F(ResolverVariableTest, GlobalConst_PropagateConstValue) {
// Enable when we have @const operators implemented // Enable when we have @const operators implemented
TEST_F(ResolverVariableTest, DISABLED_GlobalConst_ConstEval) { TEST_F(ResolverVariableTest, DISABLED_GlobalConst_ConstEval) {
auto* c = GlobalConst("c", nullptr, Div(Mul(Add(1_i, 2_i), 3_i), 2_i)); auto* c = GlobalConst("c", Div(Mul(Add(1_i, 2_i), 3_i), 2_i));
ASSERT_TRUE(r()->Resolve()) << r()->error(); ASSERT_TRUE(r()->Resolve()) << r()->error();

75
src/tint/resolver/variable_validation_test.cc
View File

@ -26,7 +26,7 @@ struct ResolverVariableValidationTest : public resolver::TestHelper, public test
TEST_F(ResolverVariableValidationTest, VarNoInitializerNoType) { TEST_F(ResolverVariableValidationTest, VarNoInitializerNoType) {
// var a; // var a;
WrapInFunction(Var(Source{{12, 34}}, "a", nullptr)); WrapInFunction(Var(Source{{12, 34}}, "a"));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), "12:34 error: var declaration requires a type or initializer"); EXPECT_EQ(r()->error(), "12:34 error: var declaration requires a type or initializer");
@ -34,7 +34,7 @@ TEST_F(ResolverVariableValidationTest, VarNoInitializerNoType) {
TEST_F(ResolverVariableValidationTest, GlobalVarNoInitializerNoType) { TEST_F(ResolverVariableValidationTest, GlobalVarNoInitializerNoType) {
// var a; // var a;
GlobalVar(Source{{12, 34}}, "a", nullptr); GlobalVar(Source{{12, 34}}, "a");
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), "12:34 error: var declaration requires a type or initializer"); EXPECT_EQ(r()->error(), "12:34 error: var declaration requires a type or initializer");
@ -43,7 +43,7 @@ TEST_F(ResolverVariableValidationTest, GlobalVarNoInitializerNoType) {
TEST_F(ResolverVariableValidationTest, VarInitializerNoReturnValueBuiltin) { TEST_F(ResolverVariableValidationTest, VarInitializerNoReturnValueBuiltin) {
// fn f() { var a = storageBarrier(); } // fn f() { var a = storageBarrier(); }
auto* NoReturnValueBuiltin = Call(Source{{12, 34}}, "storageBarrier"); auto* NoReturnValueBuiltin = Call(Source{{12, 34}}, "storageBarrier");
WrapInFunction(Var("a", nullptr, ast::StorageClass::kNone, NoReturnValueBuiltin)); WrapInFunction(Var("a", NoReturnValueBuiltin));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), "12:34 error: builtin 'storageBarrier' does not return a value"); EXPECT_EQ(r()->error(), "12:34 error: builtin 'storageBarrier' does not return a value");
@ -52,7 +52,7 @@ TEST_F(ResolverVariableValidationTest, VarInitializerNoReturnValueBuiltin) {
TEST_F(ResolverVariableValidationTest, GlobalVarInitializerNoReturnValueBuiltin) { TEST_F(ResolverVariableValidationTest, GlobalVarInitializerNoReturnValueBuiltin) {
// var a = storageBarrier(); // var a = storageBarrier();
auto* NoReturnValueBuiltin = Call(Source{{12, 34}}, "storageBarrier"); auto* NoReturnValueBuiltin = Call(Source{{12, 34}}, "storageBarrier");
GlobalVar("a", nullptr, ast::StorageClass::kNone, NoReturnValueBuiltin); GlobalVar("a", NoReturnValueBuiltin);
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), "12:34 error: builtin 'storageBarrier' does not return a value"); EXPECT_EQ(r()->error(), "12:34 error: builtin 'storageBarrier' does not return a value");
@ -61,7 +61,7 @@ TEST_F(ResolverVariableValidationTest, GlobalVarInitializerNoReturnValueBuiltin)
TEST_F(ResolverVariableValidationTest, GlobalVarUsedAtModuleScope) { TEST_F(ResolverVariableValidationTest, GlobalVarUsedAtModuleScope) {
// var<private> a : i32; // var<private> a : i32;
// var<private> b : i32 = a; // var<private> b : i32 = a;
GlobalVar(Source{{12, 34}}, "a", ty.i32(), ast::StorageClass::kPrivate, nullptr); GlobalVar(Source{{12, 34}}, "a", ty.i32(), ast::StorageClass::kPrivate);
GlobalVar("b", ty.i32(), ast::StorageClass::kPrivate, Expr(Source{{56, 78}}, "a")); GlobalVar("b", ty.i32(), ast::StorageClass::kPrivate, Expr(Source{{56, 78}}, "a"));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
@ -71,7 +71,7 @@ TEST_F(ResolverVariableValidationTest, GlobalVarUsedAtModuleScope) {
TEST_F(ResolverVariableValidationTest, OverrideNoInitializerNoType) { TEST_F(ResolverVariableValidationTest, OverrideNoInitializerNoType) {
// override a; // override a;
Override(Source{{12, 34}}, "a", nullptr, nullptr); Override(Source{{12, 34}}, "a");
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), "12:34 error: override declaration requires a type or initializer"); EXPECT_EQ(r()->error(), "12:34 error: override declaration requires a type or initializer");
@ -84,9 +84,9 @@ TEST_F(ResolverVariableValidationTest, OverrideExceedsIDLimit_LastUnreserved) {
// override bang : i32; // override bang : i32;
constexpr size_t kLimit = std::numeric_limits<decltype(OverrideId::value)>::max(); constexpr size_t kLimit = std::numeric_limits<decltype(OverrideId::value)>::max();
for (size_t i = 0; i <= kLimit; i++) { for (size_t i = 0; i <= kLimit; i++) {
Override("o" + std::to_string(i), ty.i32(), nullptr); Override("o" + std::to_string(i), ty.i32());
} }
Override(Source{{12, 34}}, "bang", ty.i32(), nullptr); Override(Source{{12, 34}}, "bang", ty.i32());
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), "12:34 error: number of 'override' variables exceeded limit of 65535"); EXPECT_EQ(r()->error(), "12:34 error: number of 'override' variables exceeded limit of 65535");
@ -98,14 +98,11 @@ TEST_F(ResolverVariableValidationTest, OverrideExceedsIDLimit_LastReserved) {
// ... // ...
// @id(N) override oN : i32; // @id(N) override oN : i32;
constexpr size_t kLimit = std::numeric_limits<decltype(OverrideId::value)>::max(); constexpr size_t kLimit = std::numeric_limits<decltype(OverrideId::value)>::max();
Override("reserved", ty.i32(), nullptr, Override("reserved", ty.i32(), Id(kLimit));
utils::Vector{
Id(kLimit),
});
for (size_t i = 0; i < kLimit; i++) { for (size_t i = 0; i < kLimit; i++) {
Override("o" + std::to_string(i), ty.i32(), nullptr); Override("o" + std::to_string(i), ty.i32());
} }
Override(Source{{12, 34}}, "bang", ty.i32(), nullptr); Override(Source{{12, 34}}, "bang", ty.i32());
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), "12:34 error: number of 'override' variables exceeded limit of 65535"); EXPECT_EQ(r()->error(), "12:34 error: number of 'override' variables exceeded limit of 65535");
@ -114,7 +111,7 @@ TEST_F(ResolverVariableValidationTest, OverrideExceedsIDLimit_LastReserved) {
TEST_F(ResolverVariableValidationTest, VarTypeNotConstructible) { TEST_F(ResolverVariableValidationTest, VarTypeNotConstructible) {
// var i : i32; // var i : i32;
// var p : pointer<function, i32> = &v; // var p : pointer<function, i32> = &v;
auto* i = Var("i", ty.i32(), ast::StorageClass::kNone); auto* i = Var("i", ty.i32());
auto* p = Var("a", ty.pointer<i32>(Source{{56, 78}}, ast::StorageClass::kFunction), auto* p = Var("a", ty.pointer<i32>(Source{{56, 78}}, ast::StorageClass::kFunction),
ast::StorageClass::kNone, AddressOf(Source{{12, 34}}, "i")); ast::StorageClass::kNone, AddressOf(Source{{12, 34}}, "i"));
WrapInFunction(i, p); WrapInFunction(i, p);
@ -126,9 +123,9 @@ TEST_F(ResolverVariableValidationTest, VarTypeNotConstructible) {
TEST_F(ResolverVariableValidationTest, LetTypeNotConstructible) { TEST_F(ResolverVariableValidationTest, LetTypeNotConstructible) {
// @group(0) @binding(0) var t1 : texture_2d<f32>; // @group(0) @binding(0) var t1 : texture_2d<f32>;
// let t2 : t1; // let t2 : t1;
auto* t1 = GlobalVar("t1", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), auto* t1 = GlobalVar("t1", ty.sampled_texture(ast::TextureDimension::k2d, ty.f32()), Group(0),
GroupAndBinding(0, 0)); Binding(0));
auto* t2 = Let(Source{{56, 78}}, "t2", nullptr, Expr(t1)); auto* t2 = Let(Source{{56, 78}}, "t2", Expr(t1));
WrapInFunction(t2); WrapInFunction(t2);
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
@ -137,7 +134,7 @@ TEST_F(ResolverVariableValidationTest, LetTypeNotConstructible) {
TEST_F(ResolverVariableValidationTest, OverrideExplicitTypeNotScalar) { TEST_F(ResolverVariableValidationTest, OverrideExplicitTypeNotScalar) {
// override o : vec3<f32>; // override o : vec3<f32>;
Override(Source{{56, 78}}, "o", ty.vec3<f32>(), nullptr); Override(Source{{56, 78}}, "o", ty.vec3<f32>());
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), "56:78 error: vec3<f32> cannot be used as the type of a 'override'"); EXPECT_EQ(r()->error(), "56:78 error: vec3<f32> cannot be used as the type of a 'override'");
@ -145,7 +142,7 @@ TEST_F(ResolverVariableValidationTest, OverrideExplicitTypeNotScalar) {
TEST_F(ResolverVariableValidationTest, OverrideInferedTypeNotScalar) { TEST_F(ResolverVariableValidationTest, OverrideInferedTypeNotScalar) {
// override o = vec3(1.0f); // override o = vec3(1.0f);
Override(Source{{56, 78}}, "o", nullptr, vec3<f32>(1.0_f)); Override(Source{{56, 78}}, "o", vec3<f32>(1.0_f));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), "56:78 error: vec3<f32> cannot be used as the type of a 'override'"); EXPECT_EQ(r()->error(), "56:78 error: vec3<f32> cannot be used as the type of a 'override'");
@ -171,7 +168,7 @@ TEST_F(ResolverVariableValidationTest, LetConstructorWrongType) {
TEST_F(ResolverVariableValidationTest, VarConstructorWrongType) { TEST_F(ResolverVariableValidationTest, VarConstructorWrongType) {
// var v : i32 = 2u // var v : i32 = 2u
WrapInFunction(Var(Source{{3, 3}}, "v", ty.i32(), ast::StorageClass::kNone, Expr(2_u))); WrapInFunction(Var(Source{{3, 3}}, "v", ty.i32(), Expr(2_u)));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
@ -198,7 +195,7 @@ TEST_F(ResolverVariableValidationTest, LetConstructorWrongTypeViaAlias) {
TEST_F(ResolverVariableValidationTest, VarConstructorWrongTypeViaAlias) { TEST_F(ResolverVariableValidationTest, VarConstructorWrongTypeViaAlias) {
auto* a = Alias("I32", ty.i32()); auto* a = Alias("I32", ty.i32());
WrapInFunction(Var(Source{{3, 3}}, "v", ty.Of(a), ast::StorageClass::kNone, Expr(2_u))); WrapInFunction(Var(Source{{3, 3}}, "v", ty.Of(a), Expr(2_u)));
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
@ -210,7 +207,7 @@ TEST_F(ResolverVariableValidationTest, LetOfPtrConstructedWithRef) {
// let b : ptr<function,f32> = a; // let b : ptr<function,f32> = a;
const auto priv = ast::StorageClass::kFunction; const auto priv = ast::StorageClass::kFunction;
auto* var_a = Var("a", ty.f32(), priv); auto* var_a = Var("a", ty.f32(), priv);
auto* var_b = Let(Source{{12, 34}}, "b", ty.pointer<f32>(priv), Expr("a"), {}); auto* var_b = Let(Source{{12, 34}}, "b", ty.pointer<f32>(priv), Expr("a"));
WrapInFunction(var_a, var_b); WrapInFunction(var_a, var_b);
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
@ -241,7 +238,7 @@ TEST_F(ResolverVariableValidationTest, GlobalVarRedeclaredAsLocal) {
GlobalVar("v", ty.f32(), ast::StorageClass::kPrivate, Expr(2.1_f)); GlobalVar("v", ty.f32(), ast::StorageClass::kPrivate, Expr(2.1_f));
WrapInFunction(Var(Source{{12, 34}}, "v", ty.f32(), ast::StorageClass::kNone, Expr(2_f))); WrapInFunction(Var(Source{{12, 34}}, "v", ty.f32(), Expr(2_f)));
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
} }
@ -251,8 +248,8 @@ TEST_F(ResolverVariableValidationTest, VarRedeclaredInInnerBlock) {
// var v : f32; // var v : f32;
// { var v : f32; } // { var v : f32; }
// } // }
auto* var_outer = Var("v", ty.f32(), ast::StorageClass::kNone); auto* var_outer = Var("v", ty.f32());
auto* var_inner = Var(Source{{12, 34}}, "v", ty.f32(), ast::StorageClass::kNone); auto* var_inner = Var(Source{{12, 34}}, "v", ty.f32());
auto* inner = Block(Decl(var_inner)); auto* inner = Block(Decl(var_inner));
auto* outer_body = Block(Decl(var_outer), inner); auto* outer_body = Block(Decl(var_outer), inner);
@ -266,9 +263,9 @@ TEST_F(ResolverVariableValidationTest, VarRedeclaredInIfBlock) {
// var v : f32 = 3.14; // var v : f32 = 3.14;
// if (true) { var v : f32 = 2.0; } // if (true) { var v : f32 = 2.0; }
// } // }
auto* var_a_float = Var("v", ty.f32(), ast::StorageClass::kNone, Expr(3.1_f)); auto* var_a_float = Var("v", ty.f32(), Expr(3.1_f));
auto* var = Var(Source{{12, 34}}, "v", ty.f32(), ast::StorageClass::kNone, Expr(2_f)); auto* var = Var(Source{{12, 34}}, "v", ty.f32(), Expr(2_f));
auto* cond = Expr(true); auto* cond = Expr(true);
auto* body = Block(Decl(var)); auto* body = Block(Decl(var));
@ -297,11 +294,7 @@ TEST_F(ResolverVariableValidationTest, InferredPtrStorageAccessMismatch) {
auto* buf = Structure("S", utils::Vector{ auto* buf = Structure("S", utils::Vector{
Member("inner", ty.Of(inner)), Member("inner", ty.Of(inner)),
}); });
auto* storage = GlobalVar("s", ty.Of(buf), ast::StorageClass::kStorage, auto* storage = GlobalVar("s", ty.Of(buf), ast::StorageClass::kStorage, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
auto* expr = IndexAccessor(MemberAccessor(MemberAccessor(storage, "inner"), "arr"), 2_i); auto* expr = IndexAccessor(MemberAccessor(MemberAccessor(storage, "inner"), "arr"), 2_i);
auto* ptr = auto* ptr =
@ -355,8 +348,8 @@ TEST_F(ResolverVariableValidationTest, NonConstructibleType_InferredType) {
// fn foo() { // fn foo() {
// var v = s; // var v = s;
// } // }
GlobalVar("s", ty.sampler(ast::SamplerKind::kSampler), GroupAndBinding(0, 0)); GlobalVar("s", ty.sampler(ast::SamplerKind::kSampler), Group(0), Binding(0));
auto* v = Var(Source{{12, 34}}, "v", nullptr, Expr("s")); auto* v = Var(Source{{12, 34}}, "v", Expr("s"));
WrapInFunction(v); WrapInFunction(v);
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
@ -424,8 +417,8 @@ TEST_F(ResolverVariableValidationTest, MatrixVarNoType) {
} }
TEST_F(ResolverVariableValidationTest, ConstInitWithVar) { TEST_F(ResolverVariableValidationTest, ConstInitWithVar) {
auto* v = Var("v", nullptr, Expr(1_i)); auto* v = Var("v", Expr(1_i));
auto* c = Const("c", nullptr, Expr(Source{{12, 34}}, v)); auto* c = Const("c", Expr(Source{{12, 34}}, v));
WrapInFunction(v, c); WrapInFunction(v, c);
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
@ -433,8 +426,8 @@ TEST_F(ResolverVariableValidationTest, ConstInitWithVar) {
} }
TEST_F(ResolverVariableValidationTest, ConstInitWithOverride) { TEST_F(ResolverVariableValidationTest, ConstInitWithOverride) {
auto* o = Override("v", nullptr, Expr(1_i)); auto* o = Override("v", Expr(1_i));
auto* c = Const("c", nullptr, Expr(Source{{12, 34}}, o)); auto* c = Const("c", Expr(Source{{12, 34}}, o));
WrapInFunction(c); WrapInFunction(c);
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
@ -442,8 +435,8 @@ TEST_F(ResolverVariableValidationTest, ConstInitWithOverride) {
} }
TEST_F(ResolverVariableValidationTest, ConstInitWithLet) { TEST_F(ResolverVariableValidationTest, ConstInitWithLet) {
auto* l = Let("v", nullptr, Expr(1_i)); auto* l = Let("v", Expr(1_i));
auto* c = Const("c", nullptr, Expr(Source{{12, 34}}, l)); auto* c = Const("c", Expr(Source{{12, 34}}, l));
WrapInFunction(l, c); WrapInFunction(l, c);
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());

2
src/tint/transform/array_length_from_uniform.cc
View File

@ -148,7 +148,7 @@ void ArrayLengthFromUniform::Run(CloneContext& ctx, const DataMap& inputs, DataM
}); });
buffer_size_ubo = ctx.dst->GlobalVar( buffer_size_ubo = ctx.dst->GlobalVar(
ctx.dst->Sym(), ctx.dst->ty.Of(buffer_size_struct), ast::StorageClass::kUniform, ctx.dst->Sym(), ctx.dst->ty.Of(buffer_size_struct), ast::StorageClass::kUniform,
ctx.dst->GroupAndBinding(cfg->ubo_binding.group, cfg->ubo_binding.binding)); ctx.dst->Group(cfg->ubo_binding.group), ctx.dst->Binding(cfg->ubo_binding.binding));
} }
return buffer_size_ubo; return buffer_size_ubo;
}; };

95
src/tint/transform/builtin_polyfill.cc
View File

@ -154,40 +154,39 @@ struct BuiltinPolyfill::State {
auto V = [&](uint32_t value) -> const ast::Expression* { auto V = [&](uint32_t value) -> const ast::Expression* {
return ScalarOrVector(width, u32(value)); return ScalarOrVector(width, u32(value));
}; };
b.Func( b.Func(name,
name,
utils::Vector{ utils::Vector{
b.Param("v", T(ty)), b.Param("v", T(ty)),
}, },
T(ty), T(ty),
utils::Vector{ utils::Vector{
// var x = U(v); // var x = U(v);
b.Decl(b.Var("x", nullptr, b.Construct(U(), b.Expr("v")))), b.Decl(b.Var("x", b.Construct(U(), b.Expr("v")))),
// let b16 = select(0, 16, x <= 0x0000ffff); // let b16 = select(0, 16, x <= 0x0000ffff);
b.Decl(b.Let("b16", nullptr, b.Decl(b.Let(
b.Call("select", V(0), V(16), b.LessThanEqual("x", V(0x0000ffff))))), "b16", b.Call("select", V(0), V(16), b.LessThanEqual("x", V(0x0000ffff))))),
// x = x << b16; // x = x << b16;
b.Assign("x", b.Shl("x", "b16")), b.Assign("x", b.Shl("x", "b16")),
// let b8 = select(0, 8, x <= 0x00ffffff); // let b8 = select(0, 8, x <= 0x00ffffff);
b.Decl(b.Let("b8", nullptr, b.Decl(b.Let("b8",
b.Call("select", V(0), V(8), b.LessThanEqual("x", V(0x00ffffff))))), b.Call("select", V(0), V(8), b.LessThanEqual("x", V(0x00ffffff))))),
// x = x << b8; // x = x << b8;
b.Assign("x", b.Shl("x", "b8")), b.Assign("x", b.Shl("x", "b8")),
// let b4 = select(0, 4, x <= 0x0fffffff); // let b4 = select(0, 4, x <= 0x0fffffff);
b.Decl(b.Let("b4", nullptr, b.Decl(b.Let("b4",
b.Call("select", V(0), V(4), b.LessThanEqual("x", V(0x0fffffff))))), b.Call("select", V(0), V(4), b.LessThanEqual("x", V(0x0fffffff))))),
// x = x << b4; // x = x << b4;
b.Assign("x", b.Shl("x", "b4")), b.Assign("x", b.Shl("x", "b4")),
// let b2 = select(0, 2, x <= 0x3fffffff); // let b2 = select(0, 2, x <= 0x3fffffff);
b.Decl(b.Let("b2", nullptr, b.Decl(b.Let("b2",
b.Call("select", V(0), V(2), b.LessThanEqual("x", V(0x3fffffff))))), b.Call("select", V(0), V(2), b.LessThanEqual("x", V(0x3fffffff))))),
// x = x << b2; // x = x << b2;
b.Assign("x", b.Shl("x", "b2")), b.Assign("x", b.Shl("x", "b2")),
// let b1 = select(0, 1, x <= 0x7fffffff); // let b1 = select(0, 1, x <= 0x7fffffff);
b.Decl(b.Let("b1", nullptr, b.Decl(b.Let("b1",
b.Call("select", V(0), V(1), b.LessThanEqual("x", V(0x7fffffff))))), b.Call("select", V(0), V(1), b.LessThanEqual("x", V(0x7fffffff))))),
// let is_zero = select(0, 1, x == 0); // let is_zero = select(0, 1, x == 0);
b.Decl(b.Let("is_zero", nullptr, b.Call("select", V(0), V(1), b.Equal("x", V(0))))), b.Decl(b.Let("is_zero", b.Call("select", V(0), V(1), b.Equal("x", V(0))))),
// return R((b16 | b8 | b4 | b2 | b1) + zero); // return R((b16 | b8 | b4 | b2 | b1) + zero);
b.Return(b.Construct( b.Return(b.Construct(
T(ty), T(ty),
@ -227,32 +226,27 @@ struct BuiltinPolyfill::State {
T(ty), T(ty),
utils::Vector{ utils::Vector{
// var x = U(v); // var x = U(v);
b.Decl(b.Var("x", nullptr, b.Construct(U(), b.Expr("v")))), b.Decl(b.Var("x", b.Construct(U(), b.Expr("v")))),
// let b16 = select(16, 0, bool(x & 0x0000ffff)); // let b16 = select(16, 0, bool(x & 0x0000ffff));
b.Decl(b.Let("b16", nullptr, b.Decl(b.Let("b16", b.Call("select", V(16), V(0), B(b.And("x", V(0x0000ffff)))))),
b.Call("select", V(16), V(0), B(b.And("x", V(0x0000ffff)))))),
// x = x >> b16; // x = x >> b16;
b.Assign("x", b.Shr("x", "b16")), b.Assign("x", b.Shr("x", "b16")),
// let b8 = select(8, 0, bool(x & 0x000000ff)); // let b8 = select(8, 0, bool(x & 0x000000ff));
b.Decl(b.Let("b8", nullptr, b.Decl(b.Let("b8", b.Call("select", V(8), V(0), B(b.And("x", V(0x000000ff)))))),
b.Call("select", V(8), V(0), B(b.And("x", V(0x000000ff)))))),
// x = x >> b8; // x = x >> b8;
b.Assign("x", b.Shr("x", "b8")), b.Assign("x", b.Shr("x", "b8")),
// let b4 = select(4, 0, bool(x & 0x0000000f)); // let b4 = select(4, 0, bool(x & 0x0000000f));
b.Decl(b.Let("b4", nullptr, b.Decl(b.Let("b4", b.Call("select", V(4), V(0), B(b.And("x", V(0x0000000f)))))),
b.Call("select", V(4), V(0), B(b.And("x", V(0x0000000f)))))),
// x = x >> b4; // x = x >> b4;
b.Assign("x", b.Shr("x", "b4")), b.Assign("x", b.Shr("x", "b4")),
// let b2 = select(2, 0, bool(x & 0x00000003)); // let b2 = select(2, 0, bool(x & 0x00000003));
b.Decl(b.Let("b2", nullptr, b.Decl(b.Let("b2", b.Call("select", V(2), V(0), B(b.And("x", V(0x00000003)))))),
b.Call("select", V(2), V(0), B(b.And("x", V(0x00000003)))))),
// x = x >> b2; // x = x >> b2;
b.Assign("x", b.Shr("x", "b2")), b.Assign("x", b.Shr("x", "b2")),
// let b1 = select(1, 0, bool(x & 0x00000001)); // let b1 = select(1, 0, bool(x & 0x00000001));
b.Decl(b.Let("b1", nullptr, b.Decl(b.Let("b1", b.Call("select", V(1), V(0), B(b.And("x", V(0x00000001)))))),
b.Call("select", V(1), V(0), B(b.And("x", V(0x00000001)))))),
// let is_zero = select(0, 1, x == 0); // let is_zero = select(0, 1, x == 0);
b.Decl(b.Let("is_zero", nullptr, b.Call("select", V(0), V(1), b.Equal("x", V(0))))), b.Decl(b.Let("is_zero", b.Call("select", V(0), V(1), b.Equal("x", V(0))))),
// return R((b16 | b8 | b4 | b2 | b1) + zero); // return R((b16 | b8 | b4 | b2 | b1) + zero);
b.Return(b.Construct( b.Return(b.Construct(
T(ty), T(ty),
@ -278,14 +272,14 @@ struct BuiltinPolyfill::State {
}; };
utils::Vector<const ast::Statement*, 8> body{ utils::Vector<const ast::Statement*, 8> body{
b.Decl(b.Let("s", nullptr, b.Call("min", "offset", u32(W)))), b.Decl(b.Let("s", b.Call("min", "offset", u32(W)))),
b.Decl(b.Let("e", nullptr, b.Call("min", u32(W), b.Add("s", "count")))), b.Decl(b.Let("e", b.Call("min", u32(W), b.Add("s", "count")))),
}; };
switch (polyfill.extract_bits) { switch (polyfill.extract_bits) {
case Level::kFull: case Level::kFull:
body.Push(b.Decl(b.Let("shl", nullptr, b.Sub(u32(W), "e")))); body.Push(b.Decl(b.Let("shl", b.Sub(u32(W), "e"))));
body.Push(b.Decl(b.Let("shr", nullptr, b.Add("shl", "s")))); body.Push(b.Decl(b.Let("shr", b.Add("shl", "s"))));
body.Push( body.Push(
b.Return(b.Shr(b.Shl("v", vecN_u32(b.Expr("shl"))), vecN_u32(b.Expr("shr"))))); b.Return(b.Shr(b.Shl("v", vecN_u32(b.Expr("shl"))), vecN_u32(b.Expr("shr")))));
break; break;
@ -353,33 +347,27 @@ struct BuiltinPolyfill::State {
utils::Vector{ utils::Vector{
// var x = v; (unsigned) // var x = v; (unsigned)
// var x = select(U(v), ~U(v), v < 0); (signed) // var x = select(U(v), ~U(v), v < 0); (signed)
b.Decl(b.Var("x", nullptr, x)), b.Decl(b.Var("x", x)),
// let b16 = select(0, 16, bool(x & 0xffff0000)); // let b16 = select(0, 16, bool(x & 0xffff0000));
b.Decl(b.Let("b16", nullptr, b.Decl(b.Let("b16", b.Call("select", V(0), V(16), B(b.And("x", V(0xffff0000)))))),
b.Call("select", V(0), V(16), B(b.And("x", V(0xffff0000)))))),
// x = x >> b16; // x = x >> b16;
b.Assign("x", b.Shr("x", "b16")), b.Assign("x", b.Shr("x", "b16")),
// let b8 = select(0, 8, bool(x & 0x0000ff00)); // let b8 = select(0, 8, bool(x & 0x0000ff00));
b.Decl(b.Let("b8", nullptr, b.Decl(b.Let("b8", b.Call("select", V(0), V(8), B(b.And("x", V(0x0000ff00)))))),
b.Call("select", V(0), V(8), B(b.And("x", V(0x0000ff00)))))),
// x = x >> b8; // x = x >> b8;
b.Assign("x", b.Shr("x", "b8")), b.Assign("x", b.Shr("x", "b8")),
// let b4 = select(0, 4, bool(x & 0x000000f0)); // let b4 = select(0, 4, bool(x & 0x000000f0));
b.Decl(b.Let("b4", nullptr, b.Decl(b.Let("b4", b.Call("select", V(0), V(4), B(b.And("x", V(0x000000f0)))))),
b.Call("select", V(0), V(4), B(b.And("x", V(0x000000f0)))))),
// x = x >> b4; // x = x >> b4;
b.Assign("x", b.Shr("x", "b4")), b.Assign("x", b.Shr("x", "b4")),
// let b2 = select(0, 2, bool(x & 0x0000000c)); // let b2 = select(0, 2, bool(x & 0x0000000c));
b.Decl(b.Let("b2", nullptr, b.Decl(b.Let("b2", b.Call("select", V(0), V(2), B(b.And("x", V(0x0000000c)))))),
b.Call("select", V(0), V(2), B(b.And("x", V(0x0000000c)))))),
// x = x >> b2; // x = x >> b2;
b.Assign("x", b.Shr("x", "b2")), b.Assign("x", b.Shr("x", "b2")),
// let b1 = select(0, 1, bool(x & 0x00000002)); // let b1 = select(0, 1, bool(x & 0x00000002));
b.Decl(b.Let("b1", nullptr, b.Decl(b.Let("b1", b.Call("select", V(0), V(1), B(b.And("x", V(0x00000002)))))),
b.Call("select", V(0), V(1), B(b.And("x", V(0x00000002)))))),
// let is_zero = select(0, 0xffffffff, x == 0); // let is_zero = select(0, 0xffffffff, x == 0);
b.Decl(b.Let("is_zero", nullptr, b.Decl(b.Let("is_zero", b.Call("select", V(0), V(0xffffffff), b.Equal("x", V(0))))),
b.Call("select", V(0), V(0xffffffff), b.Equal("x", V(0))))),
// return R(b16 | b8 | b4 | b2 | b1 | zero); // return R(b16 | b8 | b4 | b2 | b1 | zero);
b.Return(b.Construct( b.Return(b.Construct(
T(ty), b.Or(b.Or(b.Or(b.Or(b.Or("b16", "b8"), "b4"), "b2"), "b1"), "is_zero"))), T(ty), b.Or(b.Or(b.Or(b.Or(b.Or("b16", "b8"), "b4"), "b2"), "b1"), "is_zero"))),
@ -418,33 +406,27 @@ struct BuiltinPolyfill::State {
T(ty), T(ty),
utils::Vector{ utils::Vector{
// var x = U(v); // var x = U(v);
b.Decl(b.Var("x", nullptr, b.Construct(U(), b.Expr("v")))), b.Decl(b.Var("x", b.Construct(U(), b.Expr("v")))),
// let b16 = select(16, 0, bool(x & 0x0000ffff)); // let b16 = select(16, 0, bool(x & 0x0000ffff));
b.Decl(b.Let("b16", nullptr, b.Decl(b.Let("b16", b.Call("select", V(16), V(0), B(b.And("x", V(0x0000ffff)))))),
b.Call("select", V(16), V(0), B(b.And("x", V(0x0000ffff)))))),
// x = x >> b16; // x = x >> b16;
b.Assign("x", b.Shr("x", "b16")), b.Assign("x", b.Shr("x", "b16")),
// let b8 = select(8, 0, bool(x & 0x000000ff)); // let b8 = select(8, 0, bool(x & 0x000000ff));
b.Decl(b.Let("b8", nullptr, b.Decl(b.Let("b8", b.Call("select", V(8), V(0), B(b.And("x", V(0x000000ff)))))),
b.Call("select", V(8), V(0), B(b.And("x", V(0x000000ff)))))),
// x = x >> b8; // x = x >> b8;
b.Assign("x", b.Shr("x", "b8")), b.Assign("x", b.Shr("x", "b8")),
// let b4 = select(4, 0, bool(x & 0x0000000f)); // let b4 = select(4, 0, bool(x & 0x0000000f));
b.Decl(b.Let("b4", nullptr, b.Decl(b.Let("b4", b.Call("select", V(4), V(0), B(b.And("x", V(0x0000000f)))))),
b.Call("select", V(4), V(0), B(b.And("x", V(0x0000000f)))))),
// x = x >> b4; // x = x >> b4;
b.Assign("x", b.Shr("x", "b4")), b.Assign("x", b.Shr("x", "b4")),
// let b2 = select(2, 0, bool(x & 0x00000003)); // let b2 = select(2, 0, bool(x & 0x00000003));
b.Decl(b.Let("b2", nullptr, b.Decl(b.Let("b2", b.Call("select", V(2), V(0), B(b.And("x", V(0x00000003)))))),
b.Call("select", V(2), V(0), B(b.And("x", V(0x00000003)))))),
// x = x >> b2; // x = x >> b2;
b.Assign("x", b.Shr("x", "b2")), b.Assign("x", b.Shr("x", "b2")),
// let b1 = select(1, 0, bool(x & 0x00000001)); // let b1 = select(1, 0, bool(x & 0x00000001));
b.Decl(b.Let("b1", nullptr, b.Decl(b.Let("b1", b.Call("select", V(1), V(0), B(b.And("x", V(0x00000001)))))),
b.Call("select", V(1), V(0), B(b.And("x", V(0x00000001)))))),
// let is_zero = select(0, 0xffffffff, x == 0); // let is_zero = select(0, 0xffffffff, x == 0);
b.Decl(b.Let("is_zero", nullptr, b.Decl(b.Let("is_zero", b.Call("select", V(0), V(0xffffffff), b.Equal("x", V(0))))),
b.Call("select", V(0), V(0xffffffff), b.Equal("x", V(0))))),
// return R(b16 | b8 | b4 | b2 | b1 | is_zero); // return R(b16 | b8 | b4 | b2 | b1 | is_zero);
b.Return(b.Construct( b.Return(b.Construct(
T(ty), b.Or(b.Or(b.Or(b.Or(b.Or("b16", "b8"), "b4"), "b2"), "b1"), "is_zero"))), T(ty), b.Or(b.Or(b.Or(b.Or(b.Or("b16", "b8"), "b4"), "b2"), "b1"), "is_zero"))),
@ -479,16 +461,15 @@ struct BuiltinPolyfill::State {
}; };
utils::Vector<const ast::Statement*, 8> body = { utils::Vector<const ast::Statement*, 8> body = {
b.Decl(b.Let("s", nullptr, b.Call("min", "offset", u32(W)))), b.Decl(b.Let("s", b.Call("min", "offset", u32(W)))),
b.Decl(b.Let("e", nullptr, b.Call("min", u32(W), b.Add("s", "count")))), b.Decl(b.Let("e", b.Call("min", u32(W), b.Add("s", "count")))),
}; };
switch (polyfill.insert_bits) { switch (polyfill.insert_bits) {
case Level::kFull: case Level::kFull:
// let mask = ((1 << s) - 1) ^ ((1 << e) - 1) // let mask = ((1 << s) - 1) ^ ((1 << e) - 1)
body.Push( body.Push(b.Decl(b.Let(
b.Decl(b.Let("mask", nullptr, "mask", b.Xor(b.Sub(b.Shl(1_u, "s"), 1_u), b.Sub(b.Shl(1_u, "e"), 1_u)))));
b.Xor(b.Sub(b.Shl(1_u, "s"), 1_u), b.Sub(b.Shl(1_u, "e"), 1_u)))));
// return ((n << s) & mask) | (v & ~mask) // return ((n << s) & mask) | (v & ~mask)
body.Push(b.Return(b.Or(b.And(b.Shl("n", U("s")), V("mask")), body.Push(b.Return(b.Or(b.And(b.Shl("n", U("s")), V("mask")),
b.And("v", V(b.Complement("mask")))))); b.And("v", V(b.Complement("mask"))))));

5
src/tint/transform/calculate_array_length.cc
View File

@ -169,9 +169,8 @@ void CalculateArrayLength::Run(CloneContext& ctx, const DataMap&, DataMap&) cons
// Construct the variable that'll hold the result of // Construct the variable that'll hold the result of
// RWByteAddressBuffer.GetDimensions() // RWByteAddressBuffer.GetDimensions()
auto* buffer_size_result = ctx.dst->Decl( auto* buffer_size_result = ctx.dst->Decl(ctx.dst->Var(
ctx.dst->Var(ctx.dst->Sym(), ctx.dst->ty.u32(), ctx.dst->Sym(), ctx.dst->ty.u32(), ctx.dst->Expr(0_u)));
ast::StorageClass::kNone, ctx.dst->Expr(0_u)));
// Call storage_buffer.GetDimensions(&buffer_size_result) // Call storage_buffer.GetDimensions(&buffer_size_result)
auto* call_get_dims = ctx.dst->CallStmt(ctx.dst->Call( auto* call_get_dims = ctx.dst->CallStmt(ctx.dst->Call(

3
src/tint/transform/canonicalize_entry_point_io.cc
View File

@ -544,8 +544,7 @@ struct CanonicalizeEntryPointIO::State {
wrapper_body.Push(ctx.dst->CallStmt(call_inner)); wrapper_body.Push(ctx.dst->CallStmt(call_inner));
} else { } else {
// Capture the result of calling the original function. // Capture the result of calling the original function.
auto* inner_result = auto* inner_result = ctx.dst->Let(ctx.dst->Symbols().New("inner_result"), call_inner);
ctx.dst->Let(ctx.dst->Symbols().New("inner_result"), nullptr, call_inner);
wrapper_body.Push(ctx.dst->Decl(inner_result)); wrapper_body.Push(ctx.dst->Decl(inner_result));
// Process the original return type to determine the outputs that the // Process the original return type to determine the outputs that the

2
src/tint/transform/combine_samplers.cc
View File

@ -79,7 +79,7 @@ struct CombineSamplers::State {
/// Group 0 and binding 0 are used, with collisions disabled. /// Group 0 and binding 0 are used, with collisions disabled.
/// @returns the newly-created attribute list /// @returns the newly-created attribute list
auto Attributes() const { auto Attributes() const {
utils::Vector<const ast::Attribute*, 3> attributes = ctx.dst->GroupAndBinding(0, 0); utils::Vector<const ast::Attribute*, 3> attributes{ctx.dst->Group(0), ctx.dst->Binding(0)};
attributes.Push(ctx.dst->Disable(ast::DisabledValidation::kBindingPointCollision)); attributes.Push(ctx.dst->Disable(ast::DisabledValidation::kBindingPointCollision));
return attributes; return attributes;
} }

6
src/tint/transform/decompose_memory_access.cc
View File

@ -469,7 +469,7 @@ struct DecomposeMemoryAccess::State {
// } // }
auto load = LoadFunc(buf_ty, arr_ty->ElemType()->UnwrapRef(), var_user); auto load = LoadFunc(buf_ty, arr_ty->ElemType()->UnwrapRef(), var_user);
auto* arr = b.Var(b.Symbols().New("arr"), CreateASTTypeFor(ctx, arr_ty)); auto* arr = b.Var(b.Symbols().New("arr"), CreateASTTypeFor(ctx, arr_ty));
auto* i = b.Var(b.Symbols().New("i"), nullptr, b.Expr(0_u)); auto* i = b.Var(b.Symbols().New("i"), b.Expr(0_u));
auto* for_init = b.Decl(i); auto* for_init = b.Decl(i);
auto* for_cond = b.create<ast::BinaryExpression>( auto* for_cond = b.create<ast::BinaryExpression>(
ast::BinaryOp::kLessThan, b.Expr(i), b.Expr(u32(arr_ty->Count()))); ast::BinaryOp::kLessThan, b.Expr(i), b.Expr(u32(arr_ty->Count())));
@ -557,10 +557,10 @@ struct DecomposeMemoryAccess::State {
// } // }
// return arr; // return arr;
// } // }
auto* array = b.Var(b.Symbols().New("array"), nullptr, b.Expr("value")); auto* array = b.Var(b.Symbols().New("array"), b.Expr("value"));
auto store = auto store =
StoreFunc(buf_ty, arr_ty->ElemType()->UnwrapRef(), var_user); StoreFunc(buf_ty, arr_ty->ElemType()->UnwrapRef(), var_user);
auto* i = b.Var(b.Symbols().New("i"), nullptr, b.Expr(0_u)); auto* i = b.Var(b.Symbols().New("i"), b.Expr(0_u));
auto* for_init = b.Decl(i); auto* for_init = b.Decl(i);
auto* for_cond = b.create<ast::BinaryExpression>( auto* for_cond = b.create<ast::BinaryExpression>(
ast::BinaryOp::kLessThan, b.Expr(i), b.Expr(u32(arr_ty->Count()))); ast::BinaryOp::kLessThan, b.Expr(i), b.Expr(u32(arr_ty->Count())));

36
src/tint/transform/decompose_strided_array_test.cc
View File

@ -158,7 +158,7 @@ TEST_F(DecomposeStridedArrayTest, ReadUniformStridedArray) {
// } // }
ProgramBuilder b; ProgramBuilder b;
auto* S = b.Structure("S", utils::Vector{b.Member("a", b.ty.array<f32, 4u>(32))}); auto* S = b.Structure("S", utils::Vector{b.Member("a", b.ty.array<f32, 4u>(32))});
b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kUniform, b.GroupAndBinding(0, 0)); b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kUniform, b.Group(0), b.Binding(0));
b.Func("f", utils::Empty, b.ty.void_(), b.Func("f", utils::Empty, b.ty.void_(),
utils::Vector{ utils::Vector{
b.Decl(b.Let("a", b.ty.array<f32, 4u>(32), b.MemberAccessor("s", "a"))), b.Decl(b.Let("a", b.ty.array<f32, 4u>(32), b.MemberAccessor("s", "a"))),
@ -206,7 +206,7 @@ TEST_F(DecomposeStridedArrayTest, ReadUniformDefaultStridedArray) {
// } // }
ProgramBuilder b; ProgramBuilder b;
auto* S = b.Structure("S", utils::Vector{b.Member("a", b.ty.array(b.ty.vec4<f32>(), 4_u, 16))}); auto* S = b.Structure("S", utils::Vector{b.Member("a", b.ty.array(b.ty.vec4<f32>(), 4_u, 16))});
b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kUniform, b.GroupAndBinding(0, 0)); b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kUniform, b.Group(0), b.Binding(0));
b.Func( b.Func(
"f", utils::Empty, b.ty.void_(), "f", utils::Empty, b.ty.void_(),
utils::Vector{ utils::Vector{
@ -252,7 +252,7 @@ TEST_F(DecomposeStridedArrayTest, ReadStorageStridedArray) {
// } // }
ProgramBuilder b; ProgramBuilder b;
auto* S = b.Structure("S", utils::Vector{b.Member("a", b.ty.array<f32, 4u>(32))}); auto* S = b.Structure("S", utils::Vector{b.Member("a", b.ty.array<f32, 4u>(32))});
b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, b.GroupAndBinding(0, 0)); b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, b.Group(0), b.Binding(0));
b.Func("f", utils::Empty, b.ty.void_(), b.Func("f", utils::Empty, b.ty.void_(),
utils::Vector{ utils::Vector{
b.Decl(b.Let("a", b.ty.array<f32, 4u>(32), b.MemberAccessor("s", "a"))), b.Decl(b.Let("a", b.ty.array<f32, 4u>(32), b.MemberAccessor("s", "a"))),
@ -300,7 +300,7 @@ TEST_F(DecomposeStridedArrayTest, ReadStorageDefaultStridedArray) {
// } // }
ProgramBuilder b; ProgramBuilder b;
auto* S = b.Structure("S", utils::Vector{b.Member("a", b.ty.array<f32, 4u>(4))}); auto* S = b.Structure("S", utils::Vector{b.Member("a", b.ty.array<f32, 4u>(4))});
b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, b.GroupAndBinding(0, 0)); b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, b.Group(0), b.Binding(0));
b.Func("f", utils::Empty, b.ty.void_(), b.Func("f", utils::Empty, b.ty.void_(),
utils::Vector{ utils::Vector{
b.Decl(b.Let("a", b.ty.array<f32, 4u>(4), b.MemberAccessor("s", "a"))), b.Decl(b.Let("a", b.ty.array<f32, 4u>(4), b.MemberAccessor("s", "a"))),
@ -344,8 +344,8 @@ TEST_F(DecomposeStridedArrayTest, WriteStorageStridedArray) {
// } // }
ProgramBuilder b; ProgramBuilder b;
auto* S = b.Structure("S", utils::Vector{b.Member("a", b.ty.array<f32, 4u>(32))}); auto* S = b.Structure("S", utils::Vector{b.Member("a", b.ty.array<f32, 4u>(32))});
b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.Group(0),
b.GroupAndBinding(0, 0)); b.Binding(0));
b.Func("f", utils::Empty, b.ty.void_(), b.Func("f", utils::Empty, b.ty.void_(),
utils::Vector{ utils::Vector{
b.Assign(b.MemberAccessor("s", "a"), b.Construct(b.ty.array<f32, 4u>(32))), b.Assign(b.MemberAccessor("s", "a"), b.Construct(b.ty.array<f32, 4u>(32))),
@ -398,8 +398,8 @@ TEST_F(DecomposeStridedArrayTest, WriteStorageDefaultStridedArray) {
// } // }
ProgramBuilder b; ProgramBuilder b;
auto* S = b.Structure("S", utils::Vector{b.Member("a", b.ty.array<f32, 4u>(4))}); auto* S = b.Structure("S", utils::Vector{b.Member("a", b.ty.array<f32, 4u>(4))});
b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.Group(0),
b.GroupAndBinding(0, 0)); b.Binding(0));
b.Func("f", utils::Empty, b.ty.void_(), b.Func("f", utils::Empty, b.ty.void_(),
utils::Vector{ utils::Vector{
b.Assign(b.MemberAccessor("s", "a"), b.Construct(b.ty.array<f32, 4u>(4))), b.Assign(b.MemberAccessor("s", "a"), b.Construct(b.ty.array<f32, 4u>(4))),
@ -450,14 +450,14 @@ TEST_F(DecomposeStridedArrayTest, ReadWriteViaPointerLets) {
// } // }
ProgramBuilder b; ProgramBuilder b;
auto* S = b.Structure("S", utils::Vector{b.Member("a", b.ty.array<f32, 4u>(32))}); auto* S = b.Structure("S", utils::Vector{b.Member("a", b.ty.array<f32, 4u>(32))});
b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.Group(0),
b.GroupAndBinding(0, 0)); b.Binding(0));
b.Func("f", utils::Empty, b.ty.void_(), b.Func("f", utils::Empty, b.ty.void_(),
utils::Vector{ utils::Vector{
b.Decl(b.Let("a", nullptr, b.AddressOf(b.MemberAccessor("s", "a")))), b.Decl(b.Let("a", b.AddressOf(b.MemberAccessor("s", "a")))),
b.Decl(b.Let("b", nullptr, b.AddressOf(b.Deref(b.AddressOf(b.Deref("a")))))), b.Decl(b.Let("b", b.AddressOf(b.Deref(b.AddressOf(b.Deref("a")))))),
b.Decl(b.Let("c", nullptr, b.Deref("b"))), b.Decl(b.Let("c", b.Deref("b"))),
b.Decl(b.Let("d", nullptr, b.IndexAccessor(b.Deref("b"), 1_i))), b.Decl(b.Let("d", b.IndexAccessor(b.Deref("b"), 1_i))),
b.Assign(b.Deref("b"), b.Construct(b.ty.array<f32, 4u>(32), 1_f, 2_f, 3_f, 4_f)), b.Assign(b.Deref("b"), b.Construct(b.ty.array<f32, 4u>(32), 1_f, 2_f, 3_f, 4_f)),
b.Assign(b.IndexAccessor(b.Deref("b"), 1_i), 5_f), b.Assign(b.IndexAccessor(b.Deref("b"), 1_i), 5_f),
}, },
@ -511,8 +511,8 @@ TEST_F(DecomposeStridedArrayTest, PrivateAliasedStridedArray) {
ProgramBuilder b; ProgramBuilder b;
b.Alias("ARR", b.ty.array<f32, 4u>(32)); b.Alias("ARR", b.ty.array<f32, 4u>(32));
auto* S = b.Structure("S", utils::Vector{b.Member("a", b.ty.type_name("ARR"))}); auto* S = b.Structure("S", utils::Vector{b.Member("a", b.ty.type_name("ARR"))});
b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.Group(0),
b.GroupAndBinding(0, 0)); b.Binding(0));
b.Func("f", utils::Empty, b.ty.void_(), b.Func("f", utils::Empty, b.ty.void_(),
utils::Vector{ utils::Vector{
b.Decl(b.Let("a", b.ty.type_name("ARR"), b.MemberAccessor("s", "a"))), b.Decl(b.Let("a", b.ty.type_name("ARR"), b.MemberAccessor("s", "a"))),
@ -581,8 +581,8 @@ TEST_F(DecomposeStridedArrayTest, PrivateNestedStridedArray) {
b.ty.array(b.ty.type_name("ARR_A"), 3_u, 16), // b.ty.array(b.ty.type_name("ARR_A"), 3_u, 16), //
4_u, 128)); 4_u, 128));
auto* S = b.Structure("S", utils::Vector{b.Member("a", b.ty.type_name("ARR_B"))}); auto* S = b.Structure("S", utils::Vector{b.Member("a", b.ty.type_name("ARR_B"))});
b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.Group(0),
b.GroupAndBinding(0, 0)); b.Binding(0));
b.Func("f", utils::Empty, b.ty.void_(), b.Func("f", utils::Empty, b.ty.void_(),
utils::Vector{ utils::Vector{
b.Decl(b.Let("a", b.ty.type_name("ARR_B"), b.MemberAccessor("s", "a"))), b.Decl(b.Let("a", b.ty.type_name("ARR_B"), b.MemberAccessor("s", "a"))),

36
src/tint/transform/decompose_strided_matrix_test.cc
View File

@ -76,7 +76,7 @@ TEST_F(DecomposeStridedMatrixTest, ReadUniformMatrix) {
b.Disable(ast::DisabledValidation::kIgnoreStrideAttribute), b.Disable(ast::DisabledValidation::kIgnoreStrideAttribute),
}), }),
}); });
b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kUniform, b.GroupAndBinding(0, 0)); b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kUniform, b.Group(0), b.Binding(0));
b.Func("f", utils::Empty, b.ty.void_(), b.Func("f", utils::Empty, b.ty.void_(),
utils::Vector{ utils::Vector{
b.Decl(b.Let("x", b.ty.mat2x2<f32>(), b.MemberAccessor("s", "m"))), b.Decl(b.Let("x", b.ty.mat2x2<f32>(), b.MemberAccessor("s", "m"))),
@ -132,7 +132,7 @@ TEST_F(DecomposeStridedMatrixTest, ReadUniformColumn) {
b.Disable(ast::DisabledValidation::kIgnoreStrideAttribute), b.Disable(ast::DisabledValidation::kIgnoreStrideAttribute),
}), }),
}); });
b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kUniform, b.GroupAndBinding(0, 0)); b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kUniform, b.Group(0), b.Binding(0));
b.Func( b.Func(
"f", utils::Empty, b.ty.void_(), "f", utils::Empty, b.ty.void_(),
utils::Vector{ utils::Vector{
@ -185,7 +185,7 @@ TEST_F(DecomposeStridedMatrixTest, ReadUniformMatrix_DefaultStride) {
b.Disable(ast::DisabledValidation::kIgnoreStrideAttribute), b.Disable(ast::DisabledValidation::kIgnoreStrideAttribute),
}), }),
}); });
b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kUniform, b.GroupAndBinding(0, 0)); b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kUniform, b.Group(0), b.Binding(0));
b.Func("f", utils::Empty, b.ty.void_(), b.Func("f", utils::Empty, b.ty.void_(),
utils::Vector{ utils::Vector{
b.Decl(b.Let("x", b.ty.mat2x2<f32>(), b.MemberAccessor("s", "m"))), b.Decl(b.Let("x", b.ty.mat2x2<f32>(), b.MemberAccessor("s", "m"))),
@ -238,8 +238,8 @@ TEST_F(DecomposeStridedMatrixTest, ReadStorageMatrix) {
b.Disable(ast::DisabledValidation::kIgnoreStrideAttribute), b.Disable(ast::DisabledValidation::kIgnoreStrideAttribute),
}), }),
}); });
b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.Group(0),
b.GroupAndBinding(0, 0)); b.Binding(0));
b.Func("f", utils::Empty, b.ty.void_(), b.Func("f", utils::Empty, b.ty.void_(),
utils::Vector{ utils::Vector{
b.Decl(b.Let("x", b.ty.mat2x2<f32>(), b.MemberAccessor("s", "m"))), b.Decl(b.Let("x", b.ty.mat2x2<f32>(), b.MemberAccessor("s", "m"))),
@ -295,8 +295,8 @@ TEST_F(DecomposeStridedMatrixTest, ReadStorageColumn) {
b.Disable(ast::DisabledValidation::kIgnoreStrideAttribute), b.Disable(ast::DisabledValidation::kIgnoreStrideAttribute),
}), }),
}); });
b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.Group(0),
b.GroupAndBinding(0, 0)); b.Binding(0));
b.Func( b.Func(
"f", utils::Empty, b.ty.void_(), "f", utils::Empty, b.ty.void_(),
utils::Vector{ utils::Vector{
@ -349,8 +349,8 @@ TEST_F(DecomposeStridedMatrixTest, WriteStorageMatrix) {
b.Disable(ast::DisabledValidation::kIgnoreStrideAttribute), b.Disable(ast::DisabledValidation::kIgnoreStrideAttribute),
}), }),
}); });
b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.Group(0),
b.GroupAndBinding(0, 0)); b.Binding(0));
b.Func("f", utils::Empty, b.ty.void_(), b.Func("f", utils::Empty, b.ty.void_(),
utils::Vector{ utils::Vector{
b.Assign(b.MemberAccessor("s", "m"), b.Assign(b.MemberAccessor("s", "m"),
@ -407,8 +407,8 @@ TEST_F(DecomposeStridedMatrixTest, WriteStorageColumn) {
b.Disable(ast::DisabledValidation::kIgnoreStrideAttribute), b.Disable(ast::DisabledValidation::kIgnoreStrideAttribute),
}), }),
}); });
b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.Group(0),
b.GroupAndBinding(0, 0)); b.Binding(0));
b.Func("f", utils::Empty, b.ty.void_(), b.Func("f", utils::Empty, b.ty.void_(),
utils::Vector{ utils::Vector{
b.Assign(b.IndexAccessor(b.MemberAccessor("s", "m"), 1_i), b.vec2<f32>(1_f, 2_f)), b.Assign(b.IndexAccessor(b.MemberAccessor("s", "m"), 1_i), b.vec2<f32>(1_f, 2_f)),
@ -466,15 +466,15 @@ TEST_F(DecomposeStridedMatrixTest, ReadWriteViaPointerLets) {
b.Disable(ast::DisabledValidation::kIgnoreStrideAttribute), b.Disable(ast::DisabledValidation::kIgnoreStrideAttribute),
}), }),
}); });
b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.GlobalVar("s", b.ty.Of(S), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.Group(0),
b.GroupAndBinding(0, 0)); b.Binding(0));
b.Func("f", utils::Empty, b.ty.void_(), b.Func("f", utils::Empty, b.ty.void_(),
utils::Vector{ utils::Vector{
b.Decl(b.Let("a", nullptr, b.AddressOf(b.MemberAccessor("s", "m")))), b.Decl(b.Let("a", b.AddressOf(b.MemberAccessor("s", "m")))),
b.Decl(b.Let("b", nullptr, b.AddressOf(b.Deref(b.AddressOf(b.Deref("a")))))), b.Decl(b.Let("b", b.AddressOf(b.Deref(b.AddressOf(b.Deref("a")))))),
b.Decl(b.Let("x", nullptr, b.Deref("b"))), b.Decl(b.Let("x", b.Deref("b"))),
b.Decl(b.Let("y", nullptr, b.IndexAccessor(b.Deref("b"), 1_i))), b.Decl(b.Let("y", b.IndexAccessor(b.Deref("b"), 1_i))),
b.Decl(b.Let("z", nullptr, b.IndexAccessor("x", 1_i))), b.Decl(b.Let("z", b.IndexAccessor("x", 1_i))),
b.Assign(b.Deref("b"), b.mat2x2<f32>(b.vec2<f32>(1_f, 2_f), b.vec2<f32>(3_f, 4_f))), b.Assign(b.Deref("b"), b.mat2x2<f32>(b.vec2<f32>(1_f, 2_f), b.vec2<f32>(3_f, 4_f))),
b.Assign(b.IndexAccessor(b.Deref("b"), 1_i), b.vec2<f32>(5_f, 6_f)), b.Assign(b.IndexAccessor(b.Deref("b"), 1_i), b.vec2<f32>(5_f, 6_f)),
}, },

4
src/tint/transform/expand_compound_assignment.cc
View File

@ -84,7 +84,7 @@ class State {
auto hoist_pointer_to = [&](const ast::Expression* expr) { auto hoist_pointer_to = [&](const ast::Expression* expr) {
auto name = b.Sym(); auto name = b.Sym();
auto* ptr = b.AddressOf(ctx.Clone(expr)); auto* ptr = b.AddressOf(ctx.Clone(expr));
auto* decl = b.Decl(b.Let(name, nullptr, ptr)); auto* decl = b.Decl(b.Let(name, ptr));
hoist_to_decl_before.InsertBefore(ctx.src->Sem().Get(stmt), decl); hoist_to_decl_before.InsertBefore(ctx.src->Sem().Get(stmt), decl);
return name; return name;
}; };
@ -92,7 +92,7 @@ class State {
// Helper function to hoist `expr` to a let declaration. // Helper function to hoist `expr` to a let declaration.
auto hoist_expr_to_let = [&](const ast::Expression* expr) { auto hoist_expr_to_let = [&](const ast::Expression* expr) {
auto name = b.Sym(); auto name = b.Sym();
auto* decl = b.Decl(b.Let(name, nullptr, ctx.Clone(expr))); auto* decl = b.Decl(b.Let(name, ctx.Clone(expr)));
hoist_to_decl_before.InsertBefore(ctx.src->Sem().Get(stmt), decl); hoist_to_decl_before.InsertBefore(ctx.src->Sem().Get(stmt), decl);
return name; return name;
}; };

1
src/tint/transform/first_index_offset.cc
View File

@ -122,7 +122,6 @@ void FirstIndexOffset::Run(CloneContext& ctx, const DataMap& inputs, DataMap& ou
// Create a global to hold the uniform buffer // Create a global to hold the uniform buffer
Symbol buffer_name = ctx.dst->Sym(); Symbol buffer_name = ctx.dst->Sym();
ctx.dst->GlobalVar(buffer_name, ctx.dst->ty.Of(struct_), ast::StorageClass::kUniform, ctx.dst->GlobalVar(buffer_name, ctx.dst->ty.Of(struct_), ast::StorageClass::kUniform,
nullptr,
utils::Vector{ utils::Vector{
ctx.dst->create<ast::BindingAttribute>(ub_binding), ctx.dst->create<ast::BindingAttribute>(ub_binding),
ctx.dst->create<ast::GroupAttribute>(ub_group), ctx.dst->create<ast::GroupAttribute>(ub_group),

6
src/tint/transform/localize_struct_array_assignment.cc
View File

@ -158,8 +158,7 @@ class LocalizeStructArrayAssignment::State {
// Store the address of the member access into a let as we need to read // Store the address of the member access into a let as we need to read
// the value twice e.g. let tint_symbol = &(s.a1); // the value twice e.g. let tint_symbol = &(s.a1);
auto mem_access_ptr = b.Sym(); auto mem_access_ptr = b.Sym();
s.insert_before_stmts.Push( s.insert_before_stmts.Push(b.Decl(b.Let(mem_access_ptr, b.AddressOf(mem_access))));
b.Decl(b.Let(mem_access_ptr, nullptr, b.AddressOf(mem_access))));
// Disable further transforms when cloning // Disable further transforms when cloning
TINT_SCOPED_ASSIGNMENT(s.process_nested_nodes, false); TINT_SCOPED_ASSIGNMENT(s.process_nested_nodes, false);
@ -167,8 +166,7 @@ class LocalizeStructArrayAssignment::State {
// Copy entire array out of struct into local temp var // Copy entire array out of struct into local temp var
// e.g. var tint_symbol_1 = *(tint_symbol); // e.g. var tint_symbol_1 = *(tint_symbol);
auto tmp_var = b.Sym(); auto tmp_var = b.Sym();
s.insert_before_stmts.Push( s.insert_before_stmts.Push(b.Decl(b.Var(tmp_var, b.Deref(mem_access_ptr))));
b.Decl(b.Var(tmp_var, nullptr, b.Deref(mem_access_ptr))));
// Replace input index_access with a clone of itself, but with its // Replace input index_access with a clone of itself, but with its
// .object replaced by the new temp var. This is returned from this // .object replaced by the new temp var. This is returned from this

16
src/tint/transform/multiplanar_external_texture.cc
View File

@ -132,11 +132,11 @@ struct MultiplanarExternalTexture::State {
syms.plane_0 = ctx.Clone(global->symbol); syms.plane_0 = ctx.Clone(global->symbol);
syms.plane_1 = b.Symbols().New("ext_tex_plane_1"); syms.plane_1 = b.Symbols().New("ext_tex_plane_1");
b.GlobalVar(syms.plane_1, b.ty.sampled_texture(ast::TextureDimension::k2d, b.ty.f32()), b.GlobalVar(syms.plane_1, b.ty.sampled_texture(ast::TextureDimension::k2d, b.ty.f32()),
b.GroupAndBinding(bps.plane_1.group, bps.plane_1.binding)); b.Group(bps.plane_1.group), b.Binding(bps.plane_1.binding));
syms.params = b.Symbols().New("ext_tex_params"); syms.params = b.Symbols().New("ext_tex_params");
b.GlobalVar(syms.params, b.ty.type_name("ExternalTextureParams"), b.GlobalVar(syms.params, b.ty.type_name("ExternalTextureParams"),
ast::StorageClass::kUniform, ast::StorageClass::kUniform, b.Group(bps.params.group),
b.GroupAndBinding(bps.params.group, bps.params.binding)); b.Binding(bps.params.binding));
// Replace the original texture_external binding with a texture_2d<f32> // Replace the original texture_external binding with a texture_2d<f32>
// binding. // binding.
@ -276,18 +276,16 @@ struct MultiplanarExternalTexture::State {
b.ty.vec3<f32>(), b.ty.vec3<f32>(),
utils::Vector{ utils::Vector{
// let cond = abs(v) < vec3(params.D); // let cond = abs(v) < vec3(params.D);
b.Decl(b.Let( b.Decl(b.Let("cond", b.LessThan(b.Call("abs", "v"),
"cond", nullptr, b.vec3<f32>(b.MemberAccessor("params", "D"))))),
b.LessThan(b.Call("abs", "v"), b.vec3<f32>(b.MemberAccessor("params", "D"))))),
// let t = sign(v) * ((params.C * abs(v)) + params.F); // let t = sign(v) * ((params.C * abs(v)) + params.F);
b.Decl(b.Let("t", nullptr, b.Decl(b.Let("t",
b.Mul(b.Call("sign", "v"), b.Mul(b.Call("sign", "v"),
b.Add(b.Mul(b.MemberAccessor("params", "C"), b.Call("abs", "v")), b.Add(b.Mul(b.MemberAccessor("params", "C"), b.Call("abs", "v")),
b.MemberAccessor("params", "F"))))), b.MemberAccessor("params", "F"))))),
// let f = (sign(v) * pow(((params.A * abs(v)) + params.B), // let f = (sign(v) * pow(((params.A * abs(v)) + params.B),
// vec3(params.G))) + params.E; // vec3(params.G))) + params.E;
b.Decl(b.Let("f", nullptr, b.Decl(b.Let("f", b.Mul(b.Call("sign", "v"),
b.Mul(b.Call("sign", "v"),
b.Add(b.Call("pow", b.Add(b.Call("pow",
b.Add(b.Mul(b.MemberAccessor("params", "A"), b.Add(b.Mul(b.MemberAccessor("params", "A"),
b.Call("abs", "v")), b.Call("abs", "v")),

2
src/tint/transform/num_workgroups_from_uniform.cc
View File

@ -148,7 +148,7 @@ void NumWorkgroupsFromUniform::Run(CloneContext& ctx, const DataMap& inputs, Dat
num_workgroups_ubo = ctx.dst->GlobalVar( num_workgroups_ubo = ctx.dst->GlobalVar(
ctx.dst->Sym(), ctx.dst->ty.Of(num_workgroups_struct), ast::StorageClass::kUniform, ctx.dst->Sym(), ctx.dst->ty.Of(num_workgroups_struct), ast::StorageClass::kUniform,
ctx.dst->GroupAndBinding(group, binding)); ctx.dst->Group(group), ctx.dst->Binding(binding));
} }
return num_workgroups_ubo; return num_workgroups_ubo;
}; };

4
src/tint/transform/promote_side_effects_to_decl.cc
View File

@ -427,7 +427,7 @@ class DecomposeSideEffects::DecomposeState : public StateBase {
auto clone_maybe_hoisted = [&](const ast::Expression* e) -> const ast::Expression* { auto clone_maybe_hoisted = [&](const ast::Expression* e) -> const ast::Expression* {
if (to_hoist.count(e)) { if (to_hoist.count(e)) {
auto name = b.Symbols().New(); auto name = b.Symbols().New();
auto* v = b.Let(name, nullptr, ctx.Clone(e)); auto* v = b.Let(name, ctx.Clone(e));
auto* decl = b.Decl(v); auto* decl = b.Decl(v);
curr_stmts->Push(decl); curr_stmts->Push(decl);
return b.Expr(name); return b.Expr(name);
@ -476,7 +476,7 @@ class DecomposeSideEffects::DecomposeState : public StateBase {
// let r = temp; // let r = temp;
auto name = b.Sym(); auto name = b.Sym();
curr_stmts->Push(b.Decl(b.Var(name, nullptr, decompose(bin_expr->lhs)))); curr_stmts->Push(b.Decl(b.Var(name, decompose(bin_expr->lhs))));
const ast::Expression* if_cond = nullptr; const ast::Expression* if_cond = nullptr;
if (bin_expr->IsLogicalOr()) { if (bin_expr->IsLogicalOr()) {

3
src/tint/transform/simplify_pointers.cc
View File

@ -181,8 +181,7 @@ struct SimplifyPointers::State {
// Create a new variable // Create a new variable
auto saved_name = ctx.dst->Symbols().New( auto saved_name = ctx.dst->Symbols().New(
ctx.src->Symbols().NameFor(var->Declaration()->symbol) + "_save"); ctx.src->Symbols().NameFor(var->Declaration()->symbol) + "_save");
auto* decl = auto* decl = ctx.dst->Decl(ctx.dst->Let(saved_name, ctx.Clone(idx_expr)));
ctx.dst->Decl(ctx.dst->Let(saved_name, nullptr, ctx.Clone(idx_expr)));
saved.emplace_back(decl); saved.emplace_back(decl);
// Record the substitution of `idx_expr` to the saved variable // Record the substitution of `idx_expr` to the saved variable
// with the symbol `saved_name`. This will be used by the // with the symbol `saved_name`. This will be used by the

2
src/tint/transform/spirv_atomic.cc
View File

@ -79,7 +79,7 @@ struct SpirvAtomic::State {
auto* block = call->Stmt()->Block()->Declaration(); auto* block = call->Stmt()->Block()->Declaration();
auto old_value = b.Symbols().New("old_value"); auto old_value = b.Symbols().New("old_value");
auto old_value_decl = b.Decl(b.Let( auto old_value_decl = b.Decl(b.Let(
old_value, nullptr, old_value,
b.MemberAccessor(b.Call(sem::str(stub->builtin), std::move(out_args)), b.MemberAccessor(b.Call(sem::str(stub->builtin), std::move(out_args)),
b.Expr("old_value")))); b.Expr("old_value"))));
ctx.InsertBefore(block->statements, call->Stmt()->Declaration(), ctx.InsertBefore(block->statements, call->Stmt()->Declaration(),

2
src/tint/transform/unwind_discard_functions.cc
View File

@ -141,7 +141,7 @@ class State {
auto ip = utils::GetInsertionPoint(ctx, stmt); auto ip = utils::GetInsertionPoint(ctx, stmt);
auto var_name = b.Sym(); auto var_name = b.Sym();
auto* decl = b.Decl(b.Var(var_name, nullptr, ctx.Clone(expr))); auto* decl = b.Decl(b.Var(var_name, ctx.Clone(expr)));
ctx.InsertBefore(ip.first->Declaration()->statements, ip.second, decl); ctx.InsertBefore(ip.first->Declaration()->statements, ip.second, decl);
ctx.InsertBefore(ip.first->Declaration()->statements, ip.second, IfDiscardReturn(stmt)); ctx.InsertBefore(ip.first->Declaration()->statements, ip.second, IfDiscardReturn(stmt));

6
src/tint/transform/utils/get_insertion_point_test.cc
View File

@ -33,7 +33,7 @@ TEST_F(GetInsertionPointTest, Block) {
// } // }
ProgramBuilder b; ProgramBuilder b;
auto* expr = b.Expr(1_i); auto* expr = b.Expr(1_i);
auto* var = b.Decl(b.Var("a", nullptr, expr)); auto* var = b.Decl(b.Var("a", expr));
auto* block = b.Block(var); auto* block = b.Block(var);
b.Func("f", tint::utils::Empty, b.ty.void_(), tint::utils::Vector{block}); b.Func("f", tint::utils::Empty, b.ty.void_(), tint::utils::Vector{block});
@ -55,7 +55,7 @@ TEST_F(GetInsertionPointTest, ForLoopInit) {
// } // }
ProgramBuilder b; ProgramBuilder b;
auto* expr = b.Expr(1_i); auto* expr = b.Expr(1_i);
auto* var = b.Decl(b.Var("a", nullptr, expr)); auto* var = b.Decl(b.Var("a", expr));
auto* fl = b.For(var, b.Expr(true), nullptr, b.Block()); auto* fl = b.For(var, b.Expr(true), nullptr, b.Block());
auto* func_block = b.Block(fl); auto* func_block = b.Block(fl);
b.Func("f", tint::utils::Empty, b.ty.void_(), tint::utils::Vector{func_block}); b.Func("f", tint::utils::Empty, b.ty.void_(), tint::utils::Vector{func_block});
@ -77,7 +77,7 @@ TEST_F(GetInsertionPointTest, ForLoopCont_Invalid) {
// } // }
ProgramBuilder b; ProgramBuilder b;
auto* expr = b.Expr(1_i); auto* expr = b.Expr(1_i);
auto* var = b.Decl(b.Var("a", nullptr, expr)); auto* var = b.Decl(b.Var("a", expr));
auto* s = b.For({}, b.Expr(true), var, b.Block()); auto* s = b.For({}, b.Expr(true), var, b.Block());
b.Func("f", tint::utils::Empty, b.ty.void_(), tint::utils::Vector{s}); b.Func("f", tint::utils::Empty, b.ty.void_(), tint::utils::Vector{s});

4
src/tint/transform/utils/hoist_to_decl_before.cc
View File

@ -199,8 +199,8 @@ class HoistToDeclBefore::State {
auto name = b.Symbols().New(decl_name); auto name = b.Symbols().New(decl_name);
// Construct the let/var that holds the hoisted expr // Construct the let/var that holds the hoisted expr
auto* v = as_let ? static_cast<const ast::Variable*>(b.Let(name, nullptr, ctx.Clone(expr))) auto* v = as_let ? static_cast<const ast::Variable*>(b.Let(name, ctx.Clone(expr)))
: static_cast<const ast::Variable*>(b.Var(name, nullptr, ctx.Clone(expr))); : static_cast<const ast::Variable*>(b.Var(name, ctx.Clone(expr)));
auto* decl = b.Decl(v); auto* decl = b.Decl(v);
if (!InsertBefore(before_expr->Stmt(), decl)) { if (!InsertBefore(before_expr->Stmt(), decl)) {

18
src/tint/transform/utils/hoist_to_decl_before_test.cc
View File

@ -35,7 +35,7 @@ TEST_F(HoistToDeclBeforeTest, VarInit) {
// } // }
ProgramBuilder b; ProgramBuilder b;
auto* expr = b.Expr(1_i); auto* expr = b.Expr(1_i);
auto* var = b.Decl(b.Var("a", nullptr, expr)); auto* var = b.Decl(b.Var("a", expr));
b.Func("f", utils::Empty, b.ty.void_(), utils::Vector{var}); b.Func("f", utils::Empty, b.ty.void_(), utils::Vector{var});
Program original(std::move(b)); Program original(std::move(b));
@ -67,7 +67,7 @@ TEST_F(HoistToDeclBeforeTest, ForLoopInit) {
// } // }
ProgramBuilder b; ProgramBuilder b;
auto* expr = b.Expr(1_i); auto* expr = b.Expr(1_i);
auto* s = b.For(b.Decl(b.Var("a", nullptr, expr)), b.Expr(true), nullptr, b.Block()); auto* s = b.For(b.Decl(b.Var("a", expr)), b.Expr(true), nullptr, b.Block());
b.Func("f", utils::Empty, b.ty.void_(), utils::Vector{s}); b.Func("f", utils::Empty, b.ty.void_(), utils::Vector{s});
Program original(std::move(b)); Program original(std::move(b));
@ -141,7 +141,7 @@ TEST_F(HoistToDeclBeforeTest, ForLoopCont) {
// } // }
ProgramBuilder b; ProgramBuilder b;
auto* expr = b.Expr(1_i); auto* expr = b.Expr(1_i);
auto* s = b.For(nullptr, b.Expr(true), b.Decl(b.Var("a", nullptr, expr)), b.Block()); auto* s = b.For(nullptr, b.Expr(true), b.Decl(b.Var("a", expr)), b.Block());
b.Func("f", utils::Empty, b.ty.void_(), utils::Vector{s}); b.Func("f", utils::Empty, b.ty.void_(), utils::Vector{s});
Program original(std::move(b)); Program original(std::move(b));
@ -269,7 +269,7 @@ TEST_F(HoistToDeclBeforeTest, Array1D) {
ProgramBuilder b; ProgramBuilder b;
auto* var1 = b.Decl(b.Var("a", b.ty.array<i32, 10>())); auto* var1 = b.Decl(b.Var("a", b.ty.array<i32, 10>()));
auto* expr = b.IndexAccessor("a", 0_i); auto* expr = b.IndexAccessor("a", 0_i);
auto* var2 = b.Decl(b.Var("b", nullptr, expr)); auto* var2 = b.Decl(b.Var("b", expr));
b.Func("f", utils::Empty, b.ty.void_(), utils::Vector{var1, var2}); b.Func("f", utils::Empty, b.ty.void_(), utils::Vector{var1, var2});
Program original(std::move(b)); Program original(std::move(b));
@ -304,7 +304,7 @@ TEST_F(HoistToDeclBeforeTest, Array2D) {
auto* var1 = b.Decl(b.Var("a", b.ty.array(b.ty.array<i32, 10>(), 10_i))); auto* var1 = b.Decl(b.Var("a", b.ty.array(b.ty.array<i32, 10>(), 10_i)));
auto* expr = b.IndexAccessor(b.IndexAccessor("a", 0_i), 0_i); auto* expr = b.IndexAccessor(b.IndexAccessor("a", 0_i), 0_i);
auto* var2 = b.Decl(b.Var("b", nullptr, expr)); auto* var2 = b.Decl(b.Var("b", expr));
b.Func("f", utils::Empty, b.ty.void_(), utils::Vector{var1, var2}); b.Func("f", utils::Empty, b.ty.void_(), utils::Vector{var1, var2});
Program original(std::move(b)); Program original(std::move(b));
@ -377,7 +377,7 @@ TEST_F(HoistToDeclBeforeTest, Prepare_ForLoopCont) {
// } // }
ProgramBuilder b; ProgramBuilder b;
auto* expr = b.Expr(1_i); auto* expr = b.Expr(1_i);
auto* s = b.For(nullptr, b.Expr(true), b.Decl(b.Var("a", nullptr, expr)), b.Block()); auto* s = b.For(nullptr, b.Expr(true), b.Decl(b.Var("a", expr)), b.Block());
b.Func("f", utils::Empty, b.ty.void_(), utils::Vector{s}); b.Func("f", utils::Empty, b.ty.void_(), utils::Vector{s});
Program original(std::move(b)); Program original(std::move(b));
@ -462,7 +462,7 @@ TEST_F(HoistToDeclBeforeTest, InsertBefore_Block) {
// } // }
ProgramBuilder b; ProgramBuilder b;
b.Func("foo", utils::Empty, b.ty.void_(), utils::Empty); b.Func("foo", utils::Empty, b.ty.void_(), utils::Empty);
auto* var = b.Decl(b.Var("a", nullptr, b.Expr(1_i))); auto* var = b.Decl(b.Var("a", b.Expr(1_i)));
b.Func("f", utils::Empty, b.ty.void_(), utils::Vector{var}); b.Func("f", utils::Empty, b.ty.void_(), utils::Vector{var});
Program original(std::move(b)); Program original(std::move(b));
@ -500,7 +500,7 @@ TEST_F(HoistToDeclBeforeTest, InsertBefore_ForLoopInit) {
// } // }
ProgramBuilder b; ProgramBuilder b;
b.Func("foo", utils::Empty, b.ty.void_(), utils::Empty); b.Func("foo", utils::Empty, b.ty.void_(), utils::Empty);
auto* var = b.Decl(b.Var("a", nullptr, b.Expr(1_i))); auto* var = b.Decl(b.Var("a", b.Expr(1_i)));
auto* s = b.For(var, b.Expr(true), nullptr, b.Block()); auto* s = b.For(var, b.Expr(true), nullptr, b.Block());
b.Func("f", utils::Empty, b.ty.void_(), utils::Vector{s}); b.Func("f", utils::Empty, b.ty.void_(), utils::Vector{s});
@ -541,7 +541,7 @@ TEST_F(HoistToDeclBeforeTest, InsertBefore_ForLoopCont) {
// } // }
ProgramBuilder b; ProgramBuilder b;
b.Func("foo", utils::Empty, b.ty.void_(), utils::Empty); b.Func("foo", utils::Empty, b.ty.void_(), utils::Empty);
auto* var = b.Decl(b.Var("a", nullptr, b.Expr(1_i))); auto* var = b.Decl(b.Var("a", b.Expr(1_i)));
auto* cont = b.CompoundAssign("a", b.Expr(1_i), ast::BinaryOp::kAdd); auto* cont = b.CompoundAssign("a", b.Expr(1_i), ast::BinaryOp::kAdd);
auto* s = b.For(nullptr, b.Expr(true), cont, b.Block()); auto* s = b.For(nullptr, b.Expr(true), cont, b.Block());
b.Func("f", utils::Empty, b.ty.void_(), utils::Vector{var, s}); b.Func("f", utils::Empty, b.ty.void_(), utils::Vector{var, s});

9
src/tint/transform/vertex_pulling.cc
View File

@ -260,11 +260,8 @@ struct State {
for (uint32_t i = 0; i < cfg.vertex_state.size(); ++i) { for (uint32_t i = 0; i < cfg.vertex_state.size(); ++i) {
// The decorated variable with struct type // The decorated variable with struct type
ctx.dst->GlobalVar(GetVertexBufferName(i), ctx.dst->ty.Of(struct_type), ctx.dst->GlobalVar(GetVertexBufferName(i), ctx.dst->ty.Of(struct_type),
ast::StorageClass::kStorage, ast::Access::kRead, ast::StorageClass::kStorage, ast::Access::kRead, ctx.dst->Binding(i),
utils::Vector{ ctx.dst->Group(cfg.pulling_group));
ctx.dst->create<ast::BindingAttribute>(i),
ctx.dst->create<ast::GroupAttribute>(cfg.pulling_group),
});
} }
} }
@ -303,7 +300,7 @@ struct State {
} }
// let pulling_offset_n = <attribute_offset> // let pulling_offset_n = <attribute_offset>
stmts.Push(ctx.dst->Decl(ctx.dst->Let(buffer_array_base, nullptr, attribute_offset))); stmts.Push(ctx.dst->Decl(ctx.dst->Let(buffer_array_base, attribute_offset)));
for (const VertexAttributeDescriptor& attribute_desc : buffer_layout.attributes) { for (const VertexAttributeDescriptor& attribute_desc : buffer_layout.attributes) {
auto it = location_info.find(attribute_desc.shader_location); auto it = location_info.find(attribute_desc.shader_location);

42
src/tint/writer/flatten_bindings_test.cc
View File

@ -40,9 +40,9 @@ TEST_F(FlattenBindingsTest, NoBindings) {
TEST_F(FlattenBindingsTest, AlreadyFlat) { TEST_F(FlattenBindingsTest, AlreadyFlat) {
ProgramBuilder b; ProgramBuilder b;
b.GlobalVar("a", b.ty.i32(), ast::StorageClass::kUniform, b.GroupAndBinding(0, 0)); b.GlobalVar("a", b.ty.i32(), ast::StorageClass::kUniform, b.Group(0), b.Binding(0));
b.GlobalVar("b", b.ty.i32(), ast::StorageClass::kUniform, b.GroupAndBinding(0, 1)); b.GlobalVar("b", b.ty.i32(), ast::StorageClass::kUniform, b.Group(0), b.Binding(1));
b.GlobalVar("c", b.ty.i32(), ast::StorageClass::kUniform, b.GroupAndBinding(0, 2)); b.GlobalVar("c", b.ty.i32(), ast::StorageClass::kUniform, b.Group(0), b.Binding(2));
resolver::Resolver resolver(&b); resolver::Resolver resolver(&b);
@ -55,9 +55,9 @@ TEST_F(FlattenBindingsTest, AlreadyFlat) {
TEST_F(FlattenBindingsTest, NotFlat_SingleNamespace) { TEST_F(FlattenBindingsTest, NotFlat_SingleNamespace) {
ProgramBuilder b; ProgramBuilder b;
b.GlobalVar("a", b.ty.i32(), ast::StorageClass::kUniform, b.GroupAndBinding(0, 0)); b.GlobalVar("a", b.ty.i32(), ast::StorageClass::kUniform, b.Group(0), b.Binding(0));
b.GlobalVar("b", b.ty.i32(), ast::StorageClass::kUniform, b.GroupAndBinding(1, 1)); b.GlobalVar("b", b.ty.i32(), ast::StorageClass::kUniform, b.Group(1), b.Binding(1));
b.GlobalVar("c", b.ty.i32(), ast::StorageClass::kUniform, b.GroupAndBinding(2, 2)); b.GlobalVar("c", b.ty.i32(), ast::StorageClass::kUniform, b.Group(2), b.Binding(2));
b.WrapInFunction(b.Expr("a"), b.Expr("b"), b.Expr("c")); b.WrapInFunction(b.Expr("a"), b.Expr("b"), b.Expr("c"));
resolver::Resolver resolver(&b); resolver::Resolver resolver(&b);
@ -81,30 +81,30 @@ TEST_F(FlattenBindingsTest, NotFlat_MultipleNamespaces) {
ProgramBuilder b; ProgramBuilder b;
const size_t num_buffers = 3; const size_t num_buffers = 3;
b.GlobalVar("buffer1", b.ty.i32(), ast::StorageClass::kUniform, b.GroupAndBinding(0, 0)); b.GlobalVar("buffer1", b.ty.i32(), ast::StorageClass::kUniform, b.Group(0), b.Binding(0));
b.GlobalVar("buffer2", b.ty.i32(), ast::StorageClass::kStorage, b.GroupAndBinding(1, 1)); b.GlobalVar("buffer2", b.ty.i32(), ast::StorageClass::kStorage, b.Group(1), b.Binding(1));
b.GlobalVar("buffer3", b.ty.i32(), ast::StorageClass::kStorage, ast::Access::kRead, b.GlobalVar("buffer3", b.ty.i32(), ast::StorageClass::kStorage, ast::Access::kRead, b.Group(2),
b.GroupAndBinding(2, 2)); b.Binding(2));
const size_t num_samplers = 2; const size_t num_samplers = 2;
b.GlobalVar("sampler1", b.ty.sampler(ast::SamplerKind::kSampler), b.GroupAndBinding(3, 3)); b.GlobalVar("sampler1", b.ty.sampler(ast::SamplerKind::kSampler), b.Group(3), b.Binding(3));
b.GlobalVar("sampler2", b.ty.sampler(ast::SamplerKind::kComparisonSampler), b.GlobalVar("sampler2", b.ty.sampler(ast::SamplerKind::kComparisonSampler), b.Group(4),
b.GroupAndBinding(4, 4)); b.Binding(4));
const size_t num_textures = 6; const size_t num_textures = 6;
b.GlobalVar("texture1", b.ty.sampled_texture(ast::TextureDimension::k2d, b.ty.f32()), b.GlobalVar("texture1", b.ty.sampled_texture(ast::TextureDimension::k2d, b.ty.f32()),
b.GroupAndBinding(5, 5)); b.Group(5), b.Binding(5));
b.GlobalVar("texture2", b.ty.multisampled_texture(ast::TextureDimension::k2d, b.ty.f32()), b.GlobalVar("texture2", b.ty.multisampled_texture(ast::TextureDimension::k2d, b.ty.f32()),
b.GroupAndBinding(6, 6)); b.Group(6), b.Binding(6));
b.GlobalVar("texture3", b.GlobalVar("texture3",
b.ty.storage_texture(ast::TextureDimension::k2d, ast::TexelFormat::kR32Float, b.ty.storage_texture(ast::TextureDimension::k2d, ast::TexelFormat::kR32Float,
ast::Access::kWrite), ast::Access::kWrite),
b.GroupAndBinding(7, 7)); b.Group(7), b.Binding(7));
b.GlobalVar("texture4", b.ty.depth_texture(ast::TextureDimension::k2d), b.GlobalVar("texture4", b.ty.depth_texture(ast::TextureDimension::k2d), b.Group(8),
b.GroupAndBinding(8, 8)); b.Binding(8));
b.GlobalVar("texture5", b.ty.depth_multisampled_texture(ast::TextureDimension::k2d), b.GlobalVar("texture5", b.ty.depth_multisampled_texture(ast::TextureDimension::k2d), b.Group(9),
b.GroupAndBinding(9, 9)); b.Binding(9));
b.GlobalVar("texture6", b.ty.external_texture(), b.GroupAndBinding(10, 10)); b.GlobalVar("texture6", b.ty.external_texture(), b.Group(10), b.Binding(10));
b.WrapInFunction(b.Assign(b.Phony(), "buffer1"), b.Assign(b.Phony(), "buffer2"), b.WrapInFunction(b.Assign(b.Phony(), "buffer1"), b.Assign(b.Phony(), "buffer2"),
b.Assign(b.Phony(), "buffer3"), b.Assign(b.Phony(), "sampler1"), b.Assign(b.Phony(), "buffer3"), b.Assign(b.Phony(), "sampler1"),

20
src/tint/writer/generate_external_texture_bindings_test.cc
View File

@ -36,7 +36,7 @@ TEST_F(GenerateExternalTextureBindingsTest, None) {
TEST_F(GenerateExternalTextureBindingsTest, One) { TEST_F(GenerateExternalTextureBindingsTest, One) {
ProgramBuilder b; ProgramBuilder b;
b.GlobalVar("v0", b.ty.external_texture(), b.GroupAndBinding(0, 0)); b.GlobalVar("v0", b.ty.external_texture(), b.Group(0), b.Binding(0));
tint::Program program(std::move(b)); tint::Program program(std::move(b));
ASSERT_TRUE(program.IsValid()); ASSERT_TRUE(program.IsValid());
@ -52,8 +52,8 @@ TEST_F(GenerateExternalTextureBindingsTest, One) {
TEST_F(GenerateExternalTextureBindingsTest, Two_SameGroup) { TEST_F(GenerateExternalTextureBindingsTest, Two_SameGroup) {
ProgramBuilder b; ProgramBuilder b;
b.GlobalVar("v0", b.ty.external_texture(), b.GroupAndBinding(0, 0)); b.GlobalVar("v0", b.ty.external_texture(), b.Group(0), b.Binding(0));
b.GlobalVar("v1", b.ty.external_texture(), b.GroupAndBinding(0, 1)); b.GlobalVar("v1", b.ty.external_texture(), b.Group(0), b.Binding(1));
tint::Program program(std::move(b)); tint::Program program(std::move(b));
ASSERT_TRUE(program.IsValid()); ASSERT_TRUE(program.IsValid());
@ -75,8 +75,8 @@ TEST_F(GenerateExternalTextureBindingsTest, Two_SameGroup) {
TEST_F(GenerateExternalTextureBindingsTest, Two_DifferentGroup) { TEST_F(GenerateExternalTextureBindingsTest, Two_DifferentGroup) {
ProgramBuilder b; ProgramBuilder b;
b.GlobalVar("v0", b.ty.external_texture(), b.GroupAndBinding(0, 0)); b.GlobalVar("v0", b.ty.external_texture(), b.Group(0), b.Binding(0));
b.GlobalVar("v1", b.ty.external_texture(), b.GroupAndBinding(1, 0)); b.GlobalVar("v1", b.ty.external_texture(), b.Group(1), b.Binding(0));
tint::Program program(std::move(b)); tint::Program program(std::move(b));
ASSERT_TRUE(program.IsValid()); ASSERT_TRUE(program.IsValid());
@ -98,11 +98,11 @@ TEST_F(GenerateExternalTextureBindingsTest, Two_DifferentGroup) {
TEST_F(GenerateExternalTextureBindingsTest, Two_WithOtherBindingsInSameGroup) { TEST_F(GenerateExternalTextureBindingsTest, Two_WithOtherBindingsInSameGroup) {
ProgramBuilder b; ProgramBuilder b;
b.GlobalVar("v0", b.ty.i32(), b.GroupAndBinding(0, 0), kUniform); b.GlobalVar("v0", b.ty.i32(), b.Group(0), b.Binding(0), kUniform);
b.GlobalVar("v1", b.ty.external_texture(), b.GroupAndBinding(0, 1)); b.GlobalVar("v1", b.ty.external_texture(), b.Group(0), b.Binding(1));
b.GlobalVar("v2", b.ty.i32(), b.GroupAndBinding(0, 2), kUniform); b.GlobalVar("v2", b.ty.i32(), b.Group(0), b.Binding(2), kUniform);
b.GlobalVar("v3", b.ty.external_texture(), b.GroupAndBinding(0, 3)); b.GlobalVar("v3", b.ty.external_texture(), b.Group(0), b.Binding(3));
b.GlobalVar("v4", b.ty.i32(), b.GroupAndBinding(0, 4), kUniform); b.GlobalVar("v4", b.ty.i32(), b.Group(0), b.Binding(4), kUniform);
tint::Program program(std::move(b)); tint::Program program(std::move(b));
ASSERT_TRUE(program.IsValid()) << program.Diagnostics().str(); ASSERT_TRUE(program.IsValid()) << program.Diagnostics().str();

2
src/tint/writer/glsl/generator_impl_binary_test.cc
View File

@ -760,7 +760,7 @@ TEST_F(GlslGeneratorImplTest_Binary, Decl_WithLogical) {
GlobalVar("d", ty.bool_(), ast::StorageClass::kPrivate); GlobalVar("d", ty.bool_(), ast::StorageClass::kPrivate);
auto* var = auto* var =
Var("a", ty.bool_(), ast::StorageClass::kNone, Var("a", ty.bool_(),
create<ast::BinaryExpression>( create<ast::BinaryExpression>(
ast::BinaryOp::kLogicalOr, ast::BinaryOp::kLogicalOr,
create<ast::BinaryExpression>(ast::BinaryOp::kLogicalAnd, Expr("b"), Expr("c")), create<ast::BinaryExpression>(ast::BinaryOp::kLogicalAnd, Expr("b"), Expr("c")),

4
src/tint/writer/glsl/generator_impl_constructor_test.cc
View File

@ -181,7 +181,7 @@ TEST_F(GlslGeneratorImplTest_Constructor, EmitConstructor_Type_Vec_SingleScalar_
} }
TEST_F(GlslGeneratorImplTest_Constructor, EmitConstructor_Type_Vec_SingleScalar_F32_Var) { TEST_F(GlslGeneratorImplTest_Constructor, EmitConstructor_Type_Vec_SingleScalar_F32_Var) {
auto* var = Var("v", nullptr, Expr(2_f)); auto* var = Var("v", Expr(2_f));
auto* cast = vec3<f32>(var); auto* cast = vec3<f32>(var);
WrapInFunction(var, cast); WrapInFunction(var, cast);
@ -195,7 +195,7 @@ TEST_F(GlslGeneratorImplTest_Constructor, EmitConstructor_Type_Vec_SingleScalar_
TEST_F(GlslGeneratorImplTest_Constructor, EmitConstructor_Type_Vec_SingleScalar_F16_Var) { TEST_F(GlslGeneratorImplTest_Constructor, EmitConstructor_Type_Vec_SingleScalar_F16_Var) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* var = Var("v", nullptr, Expr(2_h)); auto* var = Var("v", Expr(2_h));
auto* cast = vec3<f16>(var); auto* cast = vec3<f16>(var);
WrapInFunction(var, cast); WrapInFunction(var, cast);

83
src/tint/writer/glsl/generator_impl_function_test.cc
View File

@ -351,11 +351,7 @@ tint_symbol_2 vert_main2() {
TEST_F(GlslGeneratorImplTest_Function, Emit_Attribute_EntryPoint_With_Uniform) { TEST_F(GlslGeneratorImplTest_Function, Emit_Attribute_EntryPoint_With_Uniform) {
auto* ubo_ty = Structure("UBO", utils::Vector{Member("coord", ty.vec4<f32>())}); auto* ubo_ty = Structure("UBO", utils::Vector{Member("coord", ty.vec4<f32>())});
auto* ubo = GlobalVar("ubo", ty.Of(ubo_ty), ast::StorageClass::kUniform, auto* ubo = GlobalVar("ubo", ty.Of(ubo_ty), ast::StorageClass::kUniform, Binding(0), Group(1));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(1u),
});
Func("sub_func", Func("sub_func",
utils::Vector{ utils::Vector{
@ -366,7 +362,7 @@ TEST_F(GlslGeneratorImplTest_Function, Emit_Attribute_EntryPoint_With_Uniform) {
Return(MemberAccessor(MemberAccessor(ubo, "coord"), "x")), Return(MemberAccessor(MemberAccessor(ubo, "coord"), "x")),
}); });
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, Call("sub_func", 1_f)); auto* var = Var("v", ty.f32(), Call("sub_func", 1_f));
Func("frag_main", utils::Empty, ty.void_(), Func("frag_main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -405,14 +401,9 @@ void frag_main() {
TEST_F(GlslGeneratorImplTest_Function, Emit_Attribute_EntryPoint_With_UniformStruct) { TEST_F(GlslGeneratorImplTest_Function, Emit_Attribute_EntryPoint_With_UniformStruct) {
auto* s = Structure("Uniforms", utils::Vector{Member("coord", ty.vec4<f32>())}); auto* s = Structure("Uniforms", utils::Vector{Member("coord", ty.vec4<f32>())});
GlobalVar("uniforms", ty.Of(s), ast::StorageClass::kUniform, GlobalVar("uniforms", ty.Of(s), ast::StorageClass::kUniform, Binding(0), Group(1));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(1u),
});
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, auto* var = Var("v", ty.f32(), MemberAccessor(MemberAccessor("uniforms", "coord"), "x"));
MemberAccessor(MemberAccessor("uniforms", "coord"), "x"));
Func("frag_main", utils::Empty, ty.void_(), Func("frag_main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -450,13 +441,10 @@ TEST_F(GlslGeneratorImplTest_Function, Emit_Attribute_EntryPoint_With_RW_Storage
Member("b", ty.f32()), Member("b", ty.f32()),
}); });
GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Binding(0),
utils::Vector{ Group(1));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(1u),
});
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, MemberAccessor("coord", "b")); auto* var = Var("v", ty.f32(), MemberAccessor("coord", "b"));
Func("frag_main", utils::Empty, ty.void_(), Func("frag_main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -500,13 +488,10 @@ TEST_F(GlslGeneratorImplTest_Function, Emit_Attribute_EntryPoint_With_RO_Storage
Member("b", ty.f32()), Member("b", ty.f32()),
}); });
GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(0),
utils::Vector{ Group(1));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(1u),
});
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, MemberAccessor("coord", "b")); auto* var = Var("v", ty.f32(), MemberAccessor("coord", "b"));
Func("frag_main", utils::Empty, ty.void_(), Func("frag_main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -551,11 +536,8 @@ TEST_F(GlslGeneratorImplTest_Function, Emit_Attribute_EntryPoint_With_WO_Storage
Member("b", ty.f32()), Member("b", ty.f32()),
}); });
GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Binding(0),
utils::Vector{ Group(1));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(1u),
});
Func("frag_main", utils::Empty, ty.void_(), Func("frag_main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -599,11 +581,8 @@ TEST_F(GlslGeneratorImplTest_Function, Emit_Attribute_EntryPoint_With_StorageBuf
Member("b", ty.f32()), Member("b", ty.f32()),
}); });
GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Binding(0),
utils::Vector{ Group(1));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(1u),
});
Func("frag_main", utils::Empty, ty.void_(), Func("frag_main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -643,18 +622,14 @@ void main() {
TEST_F(GlslGeneratorImplTest_Function, Emit_Attribute_Called_By_EntryPoint_With_Uniform) { TEST_F(GlslGeneratorImplTest_Function, Emit_Attribute_Called_By_EntryPoint_With_Uniform) {
auto* s = Structure("S", utils::Vector{Member("x", ty.f32())}); auto* s = Structure("S", utils::Vector{Member("x", ty.f32())});
GlobalVar("coord", ty.Of(s), ast::StorageClass::kUniform, GlobalVar("coord", ty.Of(s), ast::StorageClass::kUniform, Binding(0), Group(1));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(1u),
});
Func("sub_func", utils::Vector{Param("param", ty.f32())}, ty.f32(), Func("sub_func", utils::Vector{Param("param", ty.f32())}, ty.f32(),
utils::Vector{ utils::Vector{
Return(MemberAccessor("coord", "x")), Return(MemberAccessor("coord", "x")),
}); });
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, Call("sub_func", 1_f)); auto* var = Var("v", ty.f32(), Call("sub_func", 1_f));
Func("frag_main", utils::Empty, ty.void_(), Func("frag_main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -692,18 +667,15 @@ void frag_main() {
TEST_F(GlslGeneratorImplTest_Function, Emit_Attribute_Called_By_EntryPoint_With_StorageBuffer) { TEST_F(GlslGeneratorImplTest_Function, Emit_Attribute_Called_By_EntryPoint_With_StorageBuffer) {
auto* s = Structure("S", utils::Vector{Member("x", ty.f32())}); auto* s = Structure("S", utils::Vector{Member("x", ty.f32())});
GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Binding(0),
utils::Vector{ Group(1));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(1u),
});
Func("sub_func", utils::Vector{Param("param", ty.f32())}, ty.f32(), Func("sub_func", utils::Vector{Param("param", ty.f32())}, ty.f32(),
utils::Vector{ utils::Vector{
Return(MemberAccessor("coord", "x")), Return(MemberAccessor("coord", "x")),
}); });
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, Call("sub_func", 1_f)); auto* var = Var("v", ty.f32(), Call("sub_func", 1_f));
Func("frag_main", utils::Empty, ty.void_(), Func("frag_main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -831,9 +803,9 @@ void main() {
TEST_F(GlslGeneratorImplTest_Function, TEST_F(GlslGeneratorImplTest_Function,
Emit_Attribute_EntryPoint_Compute_WithWorkgroup_OverridableConst) { Emit_Attribute_EntryPoint_Compute_WithWorkgroup_OverridableConst) {
Override("width", ty.i32(), Construct(ty.i32(), 2_i), utils::Vector{Id(7u)}); Override("width", ty.i32(), Construct(ty.i32(), 2_i), Id(7u));
Override("height", ty.i32(), Construct(ty.i32(), 3_i), utils::Vector{Id(8u)}); Override("height", ty.i32(), Construct(ty.i32(), 3_i), Id(8u));
Override("depth", ty.i32(), Construct(ty.i32(), 4_i), utils::Vector{Id(9u)}); Override("depth", ty.i32(), Construct(ty.i32(), 4_i), Id(9u));
Func("main", utils::Empty, ty.void_(), {}, Func("main", utils::Empty, ty.void_(), {},
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kCompute), Stage(ast::PipelineStage::kCompute),
@ -921,14 +893,11 @@ TEST_F(GlslGeneratorImplTest_Function, Emit_Multiple_EntryPoint_With_Same_Module
auto* s = Structure("Data", utils::Vector{Member("d", ty.f32())}); auto* s = Structure("Data", utils::Vector{Member("d", ty.f32())});
GlobalVar("data", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("data", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Binding(0),
utils::Vector{ Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
{ {
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, MemberAccessor("data", "d")); auto* var = Var("v", ty.f32(), MemberAccessor("data", "d"));
Func("a", utils::Empty, ty.void_(), Func("a", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -942,7 +911,7 @@ TEST_F(GlslGeneratorImplTest_Function, Emit_Multiple_EntryPoint_With_Same_Module
} }
{ {
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, MemberAccessor("data", "d")); auto* var = Var("v", ty.f32(), MemberAccessor("data", "d"));
Func("b", utils::Empty, ty.void_(), Func("b", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{

5
src/tint/writer/glsl/generator_impl_loop_test.cc
View File

@ -188,7 +188,7 @@ TEST_F(GlslGeneratorImplTest_Loop, Emit_ForLoopWithMultiStmtInit) {
auto* multi_stmt = auto* multi_stmt =
create<ast::BinaryExpression>(ast::BinaryOp::kLogicalAnd, Expr(true), Expr(false)); create<ast::BinaryExpression>(ast::BinaryOp::kLogicalAnd, Expr(true), Expr(false));
auto* f = For(Decl(Var("b", nullptr, multi_stmt)), nullptr, nullptr, Block(Return())); auto* f = For(Decl(Var("b", multi_stmt)), nullptr, nullptr, Block(Return()));
WrapInFunction(f); WrapInFunction(f);
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -348,8 +348,7 @@ TEST_F(GlslGeneratorImplTest_Loop, Emit_ForLoopWithMultiStmtInitCondCont) {
auto* multi_stmt_c = auto* multi_stmt_c =
create<ast::BinaryExpression>(ast::BinaryOp::kLogicalAnd, Expr(true), Expr(false)); create<ast::BinaryExpression>(ast::BinaryOp::kLogicalAnd, Expr(true), Expr(false));
auto* f = auto* f = For(Decl(Var("i", multi_stmt_a)), multi_stmt_b, Assign("i", multi_stmt_c), //
For(Decl(Var("i", nullptr, multi_stmt_a)), multi_stmt_b, Assign("i", multi_stmt_c), //
Block(Return())); Block(Return()));
WrapInFunction(f); WrapInFunction(f);

39
src/tint/writer/glsl/generator_impl_member_accessor_test.cc
View File

@ -92,7 +92,7 @@ class GlslGeneratorImplTest_MemberAccessorBase : public BASE {
auto* s = b.Structure("Data", members); auto* s = b.Structure("Data", members);
b.GlobalVar("data", b.ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.GlobalVar("data", b.ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite,
b.GroupAndBinding(1u, 0u)); b.Group(1), b.Binding(0));
} }
void SetupFunction(utils::VectorRef<const ast::Statement*> statements) { void SetupFunction(utils::VectorRef<const ast::Statement*> statements) {
@ -115,7 +115,7 @@ TEST_F(GlslGeneratorImplTest_MemberAccessor, EmitExpression_MemberAccessor) {
GlobalVar("str", ty.Of(s), ast::StorageClass::kPrivate); GlobalVar("str", ty.Of(s), ast::StorageClass::kPrivate);
auto* expr = MemberAccessor("str", "mem"); auto* expr = MemberAccessor("str", "mem");
WrapInFunction(Var("expr", ty.f32(), ast::StorageClass::kNone, expr)); WrapInFunction(Var("expr", ty.f32(), expr));
GeneratorImpl& gen = SanitizeAndBuild(); GeneratorImpl& gen = SanitizeAndBuild();
@ -168,7 +168,7 @@ TEST_P(GlslGeneratorImplTest_MemberAccessor_StorageBufferLoad, Test) {
}); });
SetupFunction(utils::Vector{ SetupFunction(utils::Vector{
Decl(Var("x", nullptr, ast::StorageClass::kNone, MemberAccessor("data", "b"))), Decl(Var("x", MemberAccessor("data", "b"))),
}); });
GeneratorImpl& gen = SanitizeAndBuild(); GeneratorImpl& gen = SanitizeAndBuild();
@ -219,8 +219,7 @@ TEST_P(GlslGeneratorImplTest_MemberAccessor_StorageBufferStore, Test) {
}); });
SetupFunction(utils::Vector{ SetupFunction(utils::Vector{
Decl(Var("value", p.member_type(ty), ast::StorageClass::kNone, Decl(Var("value", p.member_type(ty), Construct(p.member_type(ty)))),
Construct(p.member_type(ty)))),
Assign(MemberAccessor("data", "b"), Expr("value")), Assign(MemberAccessor("data", "b"), Expr("value")),
}); });
@ -313,8 +312,7 @@ TEST_F(GlslGeneratorImplTest_MemberAccessor, StorageBuffer_Load_Matrix_Single_El
}); });
SetupFunction(utils::Vector{ SetupFunction(utils::Vector{
Decl(Var("x", nullptr, ast::StorageClass::kNone, Decl(Var("x", IndexAccessor(IndexAccessor(MemberAccessor("data", "a"), 2_i), 1_i))),
IndexAccessor(IndexAccessor(MemberAccessor("data", "a"), 2_i), 1_i))),
}); });
GeneratorImpl& gen = SanitizeAndBuild(); GeneratorImpl& gen = SanitizeAndBuild();
@ -359,8 +357,7 @@ TEST_F(GlslGeneratorImplTest_MemberAccessor,
}); });
SetupFunction(utils::Vector{ SetupFunction(utils::Vector{
Decl(Var("x", nullptr, ast::StorageClass::kNone, Decl(Var("x", IndexAccessor(MemberAccessor("data", "a"), 2_i))),
IndexAccessor(MemberAccessor("data", "a"), 2_i))),
}); });
GeneratorImpl& gen = SanitizeAndBuild(); GeneratorImpl& gen = SanitizeAndBuild();
@ -405,11 +402,10 @@ TEST_F(GlslGeneratorImplTest_MemberAccessor,
}); });
SetupFunction(utils::Vector{ SetupFunction(utils::Vector{
Decl(Var("a", nullptr, Expr(2_i))), Decl(Var("a", Expr(2_i))),
Decl(Var("b", nullptr, Expr(4_i))), Decl(Var("b", Expr(4_i))),
Decl(Var("c", nullptr, Expr(3_i))), Decl(Var("c", Expr(3_i))),
Decl(Var("x", nullptr, ast::StorageClass::kNone, Decl(Var("x", IndexAccessor(MemberAccessor("data", "a"), Sub(Add("a", "b"), "c")))),
IndexAccessor(MemberAccessor("data", "a"), Sub(Add("a", "b"), "c")))),
}); });
GeneratorImpl& gen = SanitizeAndBuild(); GeneratorImpl& gen = SanitizeAndBuild();
@ -509,8 +505,7 @@ TEST_F(GlslGeneratorImplTest_MemberAccessor, StorageBuffer_Load_MultiLevel) {
}); });
SetupFunction(utils::Vector{ SetupFunction(utils::Vector{
Decl(Var("x", nullptr, ast::StorageClass::kNone, Decl(Var("x", MemberAccessor(IndexAccessor(MemberAccessor("data", "c"), 2_i), "b"))),
MemberAccessor(IndexAccessor(MemberAccessor("data", "c"), 2_i), "b"))),
}); });
GeneratorImpl& gen = SanitizeAndBuild(); GeneratorImpl& gen = SanitizeAndBuild();
@ -566,7 +561,7 @@ TEST_F(GlslGeneratorImplTest_MemberAccessor, StorageBuffer_Load_MultiLevel_Swizz
}); });
SetupFunction(utils::Vector{ SetupFunction(utils::Vector{
Decl(Var("x", nullptr, ast::StorageClass::kNone, Decl(Var("x",
MemberAccessor( MemberAccessor(
MemberAccessor(IndexAccessor(MemberAccessor("data", "c"), 2_i), "b"), "xy"))), MemberAccessor(IndexAccessor(MemberAccessor("data", "c"), 2_i), "b"), "xy"))),
}); });
@ -625,7 +620,7 @@ TEST_F(GlslGeneratorImplTest_MemberAccessor,
}); });
SetupFunction(utils::Vector{ SetupFunction(utils::Vector{
Decl(Var("x", nullptr, ast::StorageClass::kNone, Decl(Var("x",
MemberAccessor( MemberAccessor(
MemberAccessor(IndexAccessor(MemberAccessor("data", "c"), 2_i), "b"), "g"))), MemberAccessor(IndexAccessor(MemberAccessor("data", "c"), 2_i), "b"), "g"))),
}); });
@ -683,7 +678,7 @@ TEST_F(GlslGeneratorImplTest_MemberAccessor, StorageBuffer_Load_MultiLevel_Index
}); });
SetupFunction(utils::Vector{ SetupFunction(utils::Vector{
Decl(Var("x", nullptr, ast::StorageClass::kNone, Decl(Var("x",
IndexAccessor(MemberAccessor(IndexAccessor(MemberAccessor("data", "c"), 2_i), "b"), IndexAccessor(MemberAccessor(IndexAccessor(MemberAccessor("data", "c"), 2_i), "b"),
1_i))), 1_i))),
}); });
@ -835,8 +830,7 @@ void main() {
} }
TEST_F(GlslGeneratorImplTest_MemberAccessor, Swizzle_xyz) { TEST_F(GlslGeneratorImplTest_MemberAccessor, Swizzle_xyz) {
auto* var = auto* var = Var("my_vec", ty.vec4<f32>(), vec4<f32>(1_f, 2_f, 3_f, 4_f));
Var("my_vec", ty.vec4<f32>(), ast::StorageClass::kNone, vec4<f32>(1_f, 2_f, 3_f, 4_f));
auto* expr = MemberAccessor("my_vec", "xyz"); auto* expr = MemberAccessor("my_vec", "xyz");
WrapInFunction(var, expr); WrapInFunction(var, expr);
@ -846,8 +840,7 @@ TEST_F(GlslGeneratorImplTest_MemberAccessor, Swizzle_xyz) {
} }
TEST_F(GlslGeneratorImplTest_MemberAccessor, Swizzle_gbr) { TEST_F(GlslGeneratorImplTest_MemberAccessor, Swizzle_gbr) {
auto* var = auto* var = Var("my_vec", ty.vec4<f32>(), vec4<f32>(1_f, 2_f, 3_f, 4_f));
Var("my_vec", ty.vec4<f32>(), ast::StorageClass::kNone, vec4<f32>(1_f, 2_f, 3_f, 4_f));
auto* expr = MemberAccessor("my_vec", "gbr"); auto* expr = MemberAccessor("my_vec", "gbr");
WrapInFunction(var, expr); WrapInFunction(var, expr);

78
src/tint/writer/glsl/generator_impl_module_constant_test.cc
View File

@ -33,10 +33,10 @@ TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalLet) {
} }
TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_AInt) { TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_AInt) {
auto* var = GlobalConst("G", nullptr, Expr(1_a)); auto* var = GlobalConst("G", Expr(1_a));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("l", nullptr, Expr(var))), Decl(Let("l", Expr(var))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -53,10 +53,10 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_AFloat) { TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_AFloat) {
auto* var = GlobalConst("G", nullptr, Expr(1._a)); auto* var = GlobalConst("G", Expr(1._a));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("l", nullptr, Expr(var))), Decl(Let("l", Expr(var))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -73,10 +73,10 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_i32) { TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_i32) {
auto* var = GlobalConst("G", nullptr, Expr(1_i)); auto* var = GlobalConst("G", Expr(1_i));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("l", nullptr, Expr(var))), Decl(Let("l", Expr(var))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -93,10 +93,10 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_u32) { TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_u32) {
auto* var = GlobalConst("G", nullptr, Expr(1_u)); auto* var = GlobalConst("G", Expr(1_u));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("l", nullptr, Expr(var))), Decl(Let("l", Expr(var))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -113,10 +113,10 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_f32) { TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_f32) {
auto* var = GlobalConst("G", nullptr, Expr(1_f)); auto* var = GlobalConst("G", Expr(1_f));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("l", nullptr, Expr(var))), Decl(Let("l", Expr(var))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -135,10 +135,10 @@ void f() {
TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_f16) { TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* var = GlobalConst("G", nullptr, Expr(1_h)); auto* var = GlobalConst("G", Expr(1_h));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("l", nullptr, Expr(var))), Decl(Let("l", Expr(var))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -156,10 +156,10 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_vec3_AInt) { TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_vec3_AInt) {
auto* var = GlobalConst("G", nullptr, Construct(ty.vec3(nullptr), 1_a, 2_a, 3_a)); auto* var = GlobalConst("G", Construct(ty.vec3(nullptr), 1_a, 2_a, 3_a));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("l", nullptr, Expr(var))), Decl(Let("l", Expr(var))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -176,10 +176,10 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_vec3_AFloat) { TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_vec3_AFloat) {
auto* var = GlobalConst("G", nullptr, Construct(ty.vec3(nullptr), 1._a, 2._a, 3._a)); auto* var = GlobalConst("G", Construct(ty.vec3(nullptr), 1._a, 2._a, 3._a));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("l", nullptr, Expr(var))), Decl(Let("l", Expr(var))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -196,10 +196,10 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_vec3_f32) { TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_vec3_f32) {
auto* var = GlobalConst("G", nullptr, vec3<f32>(1_f, 2_f, 3_f)); auto* var = GlobalConst("G", vec3<f32>(1_f, 2_f, 3_f));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("l", nullptr, Expr(var))), Decl(Let("l", Expr(var))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -218,10 +218,10 @@ void f() {
TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_vec3_f16) { TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_vec3_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* var = GlobalConst("G", nullptr, vec3<f16>(1_h, 2_h, 3_h)); auto* var = GlobalConst("G", vec3<f16>(1_h, 2_h, 3_h));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("l", nullptr, Expr(var))), Decl(Let("l", Expr(var))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -239,11 +239,11 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_mat2x3_AFloat) { TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_mat2x3_AFloat) {
auto* var = GlobalConst("G", nullptr, auto* var =
Construct(ty.mat(nullptr, 2, 3), 1._a, 2._a, 3._a, 4._a, 5._a, 6._a)); GlobalConst("G", Construct(ty.mat(nullptr, 2, 3), 1._a, 2._a, 3._a, 4._a, 5._a, 6._a));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("l", nullptr, Expr(var))), Decl(Let("l", Expr(var))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -260,10 +260,10 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_mat2x3_f32) { TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_mat2x3_f32) {
auto* var = GlobalConst("G", nullptr, mat2x3<f32>(1_f, 2_f, 3_f, 4_f, 5_f, 6_f)); auto* var = GlobalConst("G", mat2x3<f32>(1_f, 2_f, 3_f, 4_f, 5_f, 6_f));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("l", nullptr, Expr(var))), Decl(Let("l", Expr(var))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -282,10 +282,10 @@ void f() {
TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_mat2x3_f16) { TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_mat2x3_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* var = GlobalConst("G", nullptr, mat2x3<f16>(1_h, 2_h, 3_h, 4_h, 5_h, 6_h)); auto* var = GlobalConst("G", mat2x3<f16>(1_h, 2_h, 3_h, 4_h, 5_h, 6_h));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("l", nullptr, Expr(var))), Decl(Let("l", Expr(var))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -303,10 +303,10 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_arr_f32) { TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_arr_f32) {
auto* var = GlobalConst("G", nullptr, Construct(ty.array<f32, 3>(), 1_f, 2_f, 3_f)); auto* var = GlobalConst("G", Construct(ty.array<f32, 3>(), 1_f, 2_f, 3_f));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("l", nullptr, Expr(var))), Decl(Let("l", Expr(var))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -323,14 +323,13 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_arr_vec2_bool) { TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_arr_vec2_bool) {
auto* var = GlobalConst("G", nullptr, auto* var = GlobalConst("G", Construct(ty.array(ty.vec2<bool>(), 3_u), //
Construct(ty.array(ty.vec2<bool>(), 3_u), //
vec2<bool>(true, false), // vec2<bool>(true, false), //
vec2<bool>(false, true), // vec2<bool>(false, true), //
vec2<bool>(true, true))); vec2<bool>(true, true)));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("l", nullptr, Expr(var))), Decl(Let("l", Expr(var))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -347,10 +346,7 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_Override) { TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_Override) {
auto* var = Override("pos", ty.f32(), Expr(3_f), auto* var = Override("pos", ty.f32(), Expr(3_f), Id(23));
utils::Vector{
Id(23),
});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -363,10 +359,7 @@ const float pos = WGSL_SPEC_CONSTANT_23;
} }
TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_Override_NoConstructor) { TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_Override_NoConstructor) {
auto* var = Override("pos", ty.f32(), nullptr, auto* var = Override("pos", ty.f32(), Id(23));
utils::Vector{
Id(23),
});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -379,10 +372,7 @@ const float pos = WGSL_SPEC_CONSTANT_23;
} }
TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_Override_NoId) { TEST_F(GlslGeneratorImplTest_ModuleConstant, Emit_Override_NoId) {
auto* a = Override("a", ty.f32(), Expr(3_f), auto* a = Override("a", ty.f32(), Expr(3_f), Id(0));
utils::Vector{
Id(0),
});
auto* b = Override("b", ty.f32(), Expr(2_f)); auto* b = Override("b", ty.f32(), Expr(2_f));
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();

38
src/tint/writer/glsl/generator_impl_sanitizer_test.cc
View File

@ -26,16 +26,11 @@ using GlslSanitizerTest = TestHelper;
TEST_F(GlslSanitizerTest, Call_ArrayLength) { TEST_F(GlslSanitizerTest, Call_ArrayLength) {
auto* s = Structure("my_struct", utils::Vector{Member(0, "a", ty.array<f32>(4))}); auto* s = Structure("my_struct", utils::Vector{Member(0, "a", ty.array<f32>(4))});
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("len", ty.u32(), ast::StorageClass::kNone, Decl(Var("len", ty.u32(), Call("arrayLength", AddressOf(MemberAccessor("b", "a"))))),
Call("arrayLength", AddressOf(MemberAccessor("b", "a"))))),
}, },
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kFragment), Stage(ast::PipelineStage::kFragment),
@ -69,16 +64,11 @@ TEST_F(GlslSanitizerTest, Call_ArrayLength_OtherMembersInStruct) {
Member(0, "z", ty.f32()), Member(0, "z", ty.f32()),
Member(4, "a", ty.array<f32>(4)), Member(4, "a", ty.array<f32>(4)),
}); });
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("len", ty.u32(), ast::StorageClass::kNone, Decl(Var("len", ty.u32(), Call("arrayLength", AddressOf(MemberAccessor("b", "a"))))),
Call("arrayLength", AddressOf(MemberAccessor("b", "a"))))),
}, },
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kFragment), Stage(ast::PipelineStage::kFragment),
@ -111,20 +101,16 @@ void main() {
TEST_F(GlslSanitizerTest, Call_ArrayLength_ViaLets) { TEST_F(GlslSanitizerTest, Call_ArrayLength_ViaLets) {
auto* s = Structure("my_struct", utils::Vector{Member(0, "a", ty.array<f32>(4))}); auto* s = Structure("my_struct", utils::Vector{Member(0, "a", ty.array<f32>(4))});
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
auto* p = Let("p", nullptr, AddressOf("b")); auto* p = Let("p", AddressOf("b"));
auto* p2 = Let("p2", nullptr, AddressOf(MemberAccessor(Deref(p), "a"))); auto* p2 = Let("p2", AddressOf(MemberAccessor(Deref(p), "a")));
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(p), Decl(p),
Decl(p2), Decl(p2),
Decl(Var("len", ty.u32(), ast::StorageClass::kNone, Call("arrayLength", p2))), Decl(Var("len", ty.u32(), Call("arrayLength", p2))),
}, },
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kFragment), Stage(ast::PipelineStage::kFragment),
@ -159,7 +145,7 @@ TEST_F(GlslSanitizerTest, PromoteArrayInitializerToConstVar) {
Func("main", utils::Empty, ty.void_(), Func("main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("idx", nullptr, Expr(3_i))), Decl(Var("idx", Expr(3_i))),
Decl(Var("pos", ty.i32(), IndexAccessor(array_init, "idx"))), Decl(Var("pos", ty.i32(), IndexAccessor(array_init, "idx"))),
}, },
utils::Vector{ utils::Vector{
@ -196,7 +182,7 @@ TEST_F(GlslSanitizerTest, PromoteStructInitializerToConstVar) {
}); });
auto* struct_init = Construct(ty.Of(str), 1_i, vec3<f32>(2_f, 3_f, 4_f), 4_i); auto* struct_init = Construct(ty.Of(str), 1_i, vec3<f32>(2_f, 3_f, 4_f), 4_i);
auto* struct_access = MemberAccessor(struct_init, "b"); auto* struct_access = MemberAccessor(struct_init, "b");
auto* pos = Var("pos", ty.vec3<f32>(), ast::StorageClass::kNone, struct_access); auto* pos = Var("pos", ty.vec3<f32>(), struct_access);
Func("main", utils::Empty, ty.void_(), Func("main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -239,7 +225,7 @@ TEST_F(GlslSanitizerTest, InlinePtrLetsBasic) {
// let x : i32 = *p; // let x : i32 = *p;
auto* v = Var("v", ty.i32()); auto* v = Var("v", ty.i32());
auto* p = Let("p", ty.pointer<i32>(ast::StorageClass::kFunction), AddressOf(v)); auto* p = Let("p", ty.pointer<i32>(ast::StorageClass::kFunction), AddressOf(v));
auto* x = Var("x", ty.i32(), ast::StorageClass::kNone, Deref(p)); auto* x = Var("x", ty.i32(), Deref(p));
Func("main", utils::Empty, ty.void_(), Func("main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -285,7 +271,7 @@ TEST_F(GlslSanitizerTest, InlinePtrLetsComplexChain) {
AddressOf(IndexAccessor(Deref(ap), 3_i))); AddressOf(IndexAccessor(Deref(ap), 3_i)));
auto* vp = Let("vp", ty.pointer(ty.vec4<f32>(), ast::StorageClass::kFunction), auto* vp = Let("vp", ty.pointer(ty.vec4<f32>(), ast::StorageClass::kFunction),
AddressOf(IndexAccessor(Deref(mp), 2_i))); AddressOf(IndexAccessor(Deref(mp), 2_i)));
auto* v = Var("v", ty.vec4<f32>(), ast::StorageClass::kNone, Deref(vp)); auto* v = Var("v", ty.vec4<f32>(), Deref(vp));
Func("main", utils::Empty, ty.void_(), Func("main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{

7
src/tint/writer/glsl/generator_impl_storage_buffer_test.cc
View File

@ -35,11 +35,8 @@ void TestAlign(ProgramBuilder* ctx) {
ctx->Member("dewey", ctx->ty.f32(), utils::Vector{ctx->MemberAlign(256)}), ctx->Member("dewey", ctx->ty.f32(), utils::Vector{ctx->MemberAlign(256)}),
ctx->Member("louie", ctx->ty.f32(), utils::Vector{ctx->MemberAlign(256)}), ctx->Member("louie", ctx->ty.f32(), utils::Vector{ctx->MemberAlign(256)}),
}); });
ctx->GlobalVar("nephews", ctx->ty.Of(nephews), ast::StorageClass::kStorage, ctx->GlobalVar("nephews", ctx->ty.Of(nephews), ast::StorageClass::kStorage, ctx->Binding(0),
utils::Vector{ ctx->Group(0));
ctx->create<ast::BindingAttribute>(0u),
ctx->create<ast::GroupAttribute>(0u),
});
} }
TEST_F(GlslGeneratorImplTest_StorageBuffer, Align) { TEST_F(GlslGeneratorImplTest_StorageBuffer, Align) {

24
src/tint/writer/glsl/generator_impl_type_test.cc
View File

@ -312,11 +312,7 @@ TEST_P(GlslDepthTexturesTest, Emit) {
auto* t = ty.depth_texture(params.dim); auto* t = ty.depth_texture(params.dim);
GlobalVar("tex", t, GlobalVar("tex", t, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
Func("main", utils::Empty, ty.void_(), Func("main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -344,11 +340,7 @@ using GlslDepthMultisampledTexturesTest = TestHelper;
TEST_F(GlslDepthMultisampledTexturesTest, Emit) { TEST_F(GlslDepthMultisampledTexturesTest, Emit) {
auto* t = ty.depth_multisampled_texture(ast::TextureDimension::k2d); auto* t = ty.depth_multisampled_texture(ast::TextureDimension::k2d);
GlobalVar("tex", t, GlobalVar("tex", t, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
Func("main", utils::Empty, ty.void_(), Func("main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -392,11 +384,7 @@ TEST_P(GlslSampledTexturesTest, Emit) {
} }
auto* t = ty.sampled_texture(params.dim, datatype); auto* t = ty.sampled_texture(params.dim, datatype);
GlobalVar("tex", t, GlobalVar("tex", t, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
Func("main", utils::Empty, ty.void_(), Func("main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -531,11 +519,7 @@ TEST_P(GlslStorageTexturesTest, Emit) {
auto* t = ty.storage_texture(params.dim, params.imgfmt, ast::Access::kWrite); auto* t = ty.storage_texture(params.dim, params.imgfmt, ast::Access::kWrite);
GlobalVar("tex", t, GlobalVar("tex", t, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
Func("main", utils::Empty, ty.void_(), Func("main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{

3
src/tint/writer/glsl/generator_impl_unary_op_test.cc
View File

@ -45,8 +45,7 @@ TEST_F(GlslUnaryOpTest, Complement) {
TEST_F(GlslUnaryOpTest, Indirection) { TEST_F(GlslUnaryOpTest, Indirection) {
GlobalVar("G", ty.f32(), ast::StorageClass::kPrivate); GlobalVar("G", ty.f32(), ast::StorageClass::kPrivate);
auto* p = auto* p = Let("expr", create<ast::UnaryOpExpression>(ast::UnaryOp::kAddressOf, Expr("G")));
Let("expr", nullptr, create<ast::UnaryOpExpression>(ast::UnaryOp::kAddressOf, Expr("G")));
auto* op = create<ast::UnaryOpExpression>(ast::UnaryOp::kIndirection, Expr("expr")); auto* op = create<ast::UnaryOpExpression>(ast::UnaryOp::kIndirection, Expr("expr"));
WrapInFunction(p, op); WrapInFunction(p, op);

4
src/tint/writer/glsl/generator_impl_uniform_buffer_test.cc
View File

@ -24,7 +24,7 @@ using GlslGeneratorImplTest_UniformBuffer = TestHelper;
TEST_F(GlslGeneratorImplTest_UniformBuffer, Simple) { TEST_F(GlslGeneratorImplTest_UniformBuffer, Simple) {
auto* simple = Structure("Simple", utils::Vector{Member("member", ty.f32())}); auto* simple = Structure("Simple", utils::Vector{Member("member", ty.f32())});
GlobalVar("simple", ty.Of(simple), ast::StorageClass::kUniform, GroupAndBinding(0, 0)); GlobalVar("simple", ty.Of(simple), ast::StorageClass::kUniform, Group(0), Binding(0));
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -44,7 +44,7 @@ layout(binding = 0) uniform Simple_1 {
TEST_F(GlslGeneratorImplTest_UniformBuffer, Simple_Desktop) { TEST_F(GlslGeneratorImplTest_UniformBuffer, Simple_Desktop) {
auto* simple = Structure("Simple", utils::Vector{Member("member", ty.f32())}); auto* simple = Structure("Simple", utils::Vector{Member("member", ty.f32())});
GlobalVar("simple", ty.Of(simple), ast::StorageClass::kUniform, GroupAndBinding(0, 0)); GlobalVar("simple", ty.Of(simple), ast::StorageClass::kUniform, Group(0), Binding(0));
GeneratorImpl& gen = Build(Version(Version::Standard::kDesktop, 4, 4)); GeneratorImpl& gen = Build(Version(Version::Standard::kDesktop, 4, 4));

70
src/tint/writer/glsl/generator_impl_variable_decl_statement_test.cc
View File

@ -65,11 +65,11 @@ TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const) {
} }
TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_AInt) { TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_AInt) {
auto* C = Const("C", nullptr, Expr(1_a)); auto* C = Const("C", Expr(1_a));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -86,11 +86,11 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_AFloat) { TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_AFloat) {
auto* C = Const("C", nullptr, Expr(1._a)); auto* C = Const("C", Expr(1._a));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -107,11 +107,11 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_i32) { TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_i32) {
auto* C = Const("C", nullptr, Expr(1_i)); auto* C = Const("C", Expr(1_i));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -128,11 +128,11 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_u32) { TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_u32) {
auto* C = Const("C", nullptr, Expr(1_u)); auto* C = Const("C", Expr(1_u));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -149,11 +149,11 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_f32) { TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_f32) {
auto* C = Const("C", nullptr, Expr(1_f)); auto* C = Const("C", Expr(1_f));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -172,11 +172,11 @@ void f() {
TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_f16) { TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* C = Const("C", nullptr, Expr(1_h)); auto* C = Const("C", Expr(1_h));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -194,11 +194,11 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_vec3_AInt) { TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_vec3_AInt) {
auto* C = Const("C", nullptr, Construct(ty.vec3(nullptr), 1_a, 2_a, 3_a)); auto* C = Const("C", Construct(ty.vec3(nullptr), 1_a, 2_a, 3_a));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -215,11 +215,11 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_vec3_AFloat) { TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_vec3_AFloat) {
auto* C = Const("C", nullptr, Construct(ty.vec3(nullptr), 1._a, 2._a, 3._a)); auto* C = Const("C", Construct(ty.vec3(nullptr), 1._a, 2._a, 3._a));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -236,11 +236,11 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_vec3_f32) { TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_vec3_f32) {
auto* C = Const("C", nullptr, vec3<f32>(1_f, 2_f, 3_f)); auto* C = Const("C", vec3<f32>(1_f, 2_f, 3_f));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -259,11 +259,11 @@ void f() {
TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_vec3_f16) { TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_vec3_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* C = Const("C", nullptr, vec3<f16>(1_h, 2_h, 3_h)); auto* C = Const("C", vec3<f16>(1_h, 2_h, 3_h));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -281,12 +281,11 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_mat2x3_AFloat) { TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_mat2x3_AFloat) {
auto* C = auto* C = Const("C", Construct(ty.mat(nullptr, 2, 3), 1._a, 2._a, 3._a, 4._a, 5._a, 6._a));
Const("C", nullptr, Construct(ty.mat(nullptr, 2, 3), 1._a, 2._a, 3._a, 4._a, 5._a, 6._a));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -303,11 +302,11 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_mat2x3_f32) { TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_mat2x3_f32) {
auto* C = Const("C", nullptr, mat2x3<f32>(1_f, 2_f, 3_f, 4_f, 5_f, 6_f)); auto* C = Const("C", mat2x3<f32>(1_f, 2_f, 3_f, 4_f, 5_f, 6_f));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -326,11 +325,11 @@ void f() {
TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_mat2x3_f16) { TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_mat2x3_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* C = Const("C", nullptr, mat2x3<f16>(1_h, 2_h, 3_h, 4_h, 5_h, 6_h)); auto* C = Const("C", mat2x3<f16>(1_h, 2_h, 3_h, 4_h, 5_h, 6_h));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -348,11 +347,11 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_arr_f32) { TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_arr_f32) {
auto* C = Const("C", nullptr, Construct(ty.array<f32, 3>(), 1_f, 2_f, 3_f)); auto* C = Const("C", Construct(ty.array<f32, 3>(), 1_f, 2_f, 3_f));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -369,15 +368,14 @@ void f() {
} }
TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_arr_vec2_bool) { TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_arr_vec2_bool) {
auto* C = Const("C", nullptr, auto* C = Const("C", Construct(ty.array(ty.vec2<bool>(), 3_u), //
Construct(ty.array(ty.vec2<bool>(), 3_u), //
vec2<bool>(true, false), // vec2<bool>(true, false), //
vec2<bool>(false, true), // vec2<bool>(false, true), //
vec2<bool>(true, true))); vec2<bool>(true, true)));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -421,7 +419,7 @@ TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Private) {
} }
TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initializer_ZeroVec_f32) { TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initializer_ZeroVec_f32) {
auto* var = Var("a", ty.vec3<f32>(), ast::StorageClass::kNone, vec3<f32>()); auto* var = Var("a", ty.vec3<f32>(), vec3<f32>());
auto* stmt = Decl(var); auto* stmt = Decl(var);
WrapInFunction(stmt); WrapInFunction(stmt);
@ -436,7 +434,7 @@ TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initialize
TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initializer_ZeroVec_f16) { TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initializer_ZeroVec_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* var = Var("a", ty.vec3<f16>(), ast::StorageClass::kNone, vec3<f16>()); auto* var = Var("a", ty.vec3<f16>(), vec3<f16>());
auto* stmt = Decl(var); auto* stmt = Decl(var);
WrapInFunction(stmt); WrapInFunction(stmt);
@ -449,7 +447,7 @@ TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initialize
} }
TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initializer_ZeroMat_f32) { TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initializer_ZeroMat_f32) {
auto* var = Var("a", ty.mat2x3<f32>(), ast::StorageClass::kNone, mat2x3<f32>()); auto* var = Var("a", ty.mat2x3<f32>(), mat2x3<f32>());
auto* stmt = Decl(var); auto* stmt = Decl(var);
WrapInFunction(stmt); WrapInFunction(stmt);
@ -465,7 +463,7 @@ TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initialize
TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initializer_ZeroMat_f16) { TEST_F(GlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initializer_ZeroMat_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* var = Var("a", ty.mat2x3<f16>(), ast::StorageClass::kNone, mat2x3<f16>()); auto* var = Var("a", ty.mat2x3<f16>(), mat2x3<f16>());
auto* stmt = Decl(var); auto* stmt = Decl(var);
WrapInFunction(stmt); WrapInFunction(stmt);

28
src/tint/writer/hlsl/generator_impl_binary_test.cc
View File

@ -678,7 +678,7 @@ TEST_P(HlslGeneratorDivModTest, DivOrModByLiteralZero_i32) {
Func("fn", utils::Empty, ty.void_(), Func("fn", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("a", ty.i32())), Decl(Var("a", ty.i32())),
Decl(Let("r", nullptr, Op("a", 0_i))), Decl(Let("r", Op("a", 0_i))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -696,7 +696,7 @@ TEST_P(HlslGeneratorDivModTest, DivOrModByLiteralZero_u32) {
Func("fn", utils::Empty, ty.void_(), Func("fn", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("a", ty.u32())), Decl(Var("a", ty.u32())),
Decl(Let("r", nullptr, Op("a", 0_u))), Decl(Let("r", Op("a", 0_u))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -713,8 +713,8 @@ TEST_P(HlslGeneratorDivModTest, DivOrModByLiteralZero_u32) {
TEST_P(HlslGeneratorDivModTest, DivOrModByLiteralZero_vec_by_vec_i32) { TEST_P(HlslGeneratorDivModTest, DivOrModByLiteralZero_vec_by_vec_i32) {
Func("fn", utils::Empty, ty.void_(), Func("fn", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("a", nullptr, vec4<i32>(100_i, 100_i, 100_i, 100_i))), Decl(Var("a", vec4<i32>(100_i, 100_i, 100_i, 100_i))),
Decl(Let("r", nullptr, Op("a", vec4<i32>(50_i, 0_i, 25_i, 0_i)))), Decl(Let("r", Op("a", vec4<i32>(50_i, 0_i, 25_i, 0_i)))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -731,8 +731,8 @@ TEST_P(HlslGeneratorDivModTest, DivOrModByLiteralZero_vec_by_vec_i32) {
TEST_P(HlslGeneratorDivModTest, DivOrModByLiteralZero_vec_by_scalar_i32) { TEST_P(HlslGeneratorDivModTest, DivOrModByLiteralZero_vec_by_scalar_i32) {
Func("fn", utils::Empty, ty.void_(), Func("fn", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("a", nullptr, vec4<i32>(100_i, 100_i, 100_i, 100_i))), Decl(Var("a", vec4<i32>(100_i, 100_i, 100_i, 100_i))),
Decl(Let("r", nullptr, Op("a", 0_i))), Decl(Let("r", Op("a", 0_i))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -750,7 +750,7 @@ TEST_P(HlslGeneratorDivModTest, DivOrModByIdentifier_i32) {
Func("fn", utils::Vector{Param("b", ty.i32())}, ty.void_(), Func("fn", utils::Vector{Param("b", ty.i32())}, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("a", ty.i32())), Decl(Var("a", ty.i32())),
Decl(Let("r", nullptr, Op("a", "b"))), Decl(Let("r", Op("a", "b"))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -768,7 +768,7 @@ TEST_P(HlslGeneratorDivModTest, DivOrModByIdentifier_u32) {
Func("fn", utils::Vector{Param("b", ty.u32())}, ty.void_(), Func("fn", utils::Vector{Param("b", ty.u32())}, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("a", ty.u32())), Decl(Var("a", ty.u32())),
Decl(Let("r", nullptr, Op("a", "b"))), Decl(Let("r", Op("a", "b"))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -786,7 +786,7 @@ TEST_P(HlslGeneratorDivModTest, DivOrModByIdentifier_vec_by_vec_i32) {
Func("fn", utils::Vector{Param("b", ty.vec3<i32>())}, ty.void_(), Func("fn", utils::Vector{Param("b", ty.vec3<i32>())}, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("a", ty.vec3<i32>())), Decl(Var("a", ty.vec3<i32>())),
Decl(Let("r", nullptr, Op("a", "b"))), Decl(Let("r", Op("a", "b"))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -804,7 +804,7 @@ TEST_P(HlslGeneratorDivModTest, DivOrModByIdentifier_vec_by_scalar_i32) {
Func("fn", utils::Vector{Param("b", ty.i32())}, ty.void_(), Func("fn", utils::Vector{Param("b", ty.i32())}, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("a", ty.vec3<i32>())), Decl(Var("a", ty.vec3<i32>())),
Decl(Let("r", nullptr, Op("a", "b"))), Decl(Let("r", Op("a", "b"))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -827,7 +827,7 @@ TEST_P(HlslGeneratorDivModTest, DivOrModByExpression_i32) {
Func("fn", utils::Empty, ty.void_(), Func("fn", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("a", ty.i32())), Decl(Var("a", ty.i32())),
Decl(Let("r", nullptr, Op("a", Call("zero")))), Decl(Let("r", Op("a", Call("zero")))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -858,7 +858,7 @@ TEST_P(HlslGeneratorDivModTest, DivOrModByExpression_u32) {
Func("fn", utils::Empty, ty.void_(), Func("fn", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("a", ty.u32())), Decl(Var("a", ty.u32())),
Decl(Let("r", nullptr, Op("a", Call("zero")))), Decl(Let("r", Op("a", Call("zero")))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -889,7 +889,7 @@ TEST_P(HlslGeneratorDivModTest, DivOrModByExpression_vec_by_vec_i32) {
Func("fn", utils::Empty, ty.void_(), Func("fn", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("a", ty.vec3<i32>())), Decl(Var("a", ty.vec3<i32>())),
Decl(Let("r", nullptr, Op("a", Call("zero")))), Decl(Let("r", Op("a", Call("zero")))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -920,7 +920,7 @@ TEST_P(HlslGeneratorDivModTest, DivOrModByExpression_vec_by_scalar_i32) {
Func("fn", utils::Empty, ty.void_(), Func("fn", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("a", ty.vec3<i32>())), Decl(Var("a", ty.vec3<i32>())),
Decl(Let("r", nullptr, Op("a", Call("zero")))), Decl(Let("r", Op("a", Call("zero")))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();

6
src/tint/writer/hlsl/generator_impl_constructor_test.cc
View File

@ -183,7 +183,7 @@ TEST_F(HlslGeneratorImplTest_Constructor, EmitConstructor_Type_Vec_SingleScalar_
} }
TEST_F(HlslGeneratorImplTest_Constructor, EmitConstructor_Type_Vec_SingleScalar_F32_Var) { TEST_F(HlslGeneratorImplTest_Constructor, EmitConstructor_Type_Vec_SingleScalar_F32_Var) {
auto* var = Var("v", nullptr, Expr(2_f)); auto* var = Var("v", Expr(2_f));
auto* cast = vec3<f32>(var); auto* cast = vec3<f32>(var);
WrapInFunction(var, cast); WrapInFunction(var, cast);
@ -197,7 +197,7 @@ TEST_F(HlslGeneratorImplTest_Constructor, EmitConstructor_Type_Vec_SingleScalar_
TEST_F(HlslGeneratorImplTest_Constructor, EmitConstructor_Type_Vec_SingleScalar_F16_Var) { TEST_F(HlslGeneratorImplTest_Constructor, EmitConstructor_Type_Vec_SingleScalar_F16_Var) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* var = Var("v", nullptr, Expr(2_h)); auto* var = Var("v", Expr(2_h));
auto* cast = vec3<f16>(var); auto* cast = vec3<f16>(var);
WrapInFunction(var, cast); WrapInFunction(var, cast);
@ -218,7 +218,7 @@ TEST_F(HlslGeneratorImplTest_Constructor, EmitConstructor_Type_Vec_SingleScalar_
} }
TEST_F(HlslGeneratorImplTest_Constructor, EmitConstructor_Type_Vec_SingleScalar_Bool_Var) { TEST_F(HlslGeneratorImplTest_Constructor, EmitConstructor_Type_Vec_SingleScalar_Bool_Var) {
auto* var = Var("v", nullptr, Expr(true)); auto* var = Var("v", Expr(true));
auto* cast = vec3<bool>(var); auto* cast = vec3<bool>(var);
WrapInFunction(var, cast); WrapInFunction(var, cast);

83
src/tint/writer/hlsl/generator_impl_function_test.cc
View File

@ -360,11 +360,7 @@ tint_symbol_1 vert_main2() {
TEST_F(HlslGeneratorImplTest_Function, Emit_Attribute_EntryPoint_With_Uniform) { TEST_F(HlslGeneratorImplTest_Function, Emit_Attribute_EntryPoint_With_Uniform) {
auto* ubo_ty = Structure("UBO", utils::Vector{Member("coord", ty.vec4<f32>())}); auto* ubo_ty = Structure("UBO", utils::Vector{Member("coord", ty.vec4<f32>())});
auto* ubo = GlobalVar("ubo", ty.Of(ubo_ty), ast::StorageClass::kUniform, auto* ubo = GlobalVar("ubo", ty.Of(ubo_ty), ast::StorageClass::kUniform, Binding(0), Group(1));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(1u),
});
Func("sub_func", Func("sub_func",
utils::Vector{ utils::Vector{
@ -375,7 +371,7 @@ TEST_F(HlslGeneratorImplTest_Function, Emit_Attribute_EntryPoint_With_Uniform) {
Return(MemberAccessor(MemberAccessor(ubo, "coord"), "x")), Return(MemberAccessor(MemberAccessor(ubo, "coord"), "x")),
}); });
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, Call("sub_func", 1_f)); auto* var = Var("v", ty.f32(), Call("sub_func", 1_f));
Func("frag_main", utils::Empty, ty.void_(), Func("frag_main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -407,14 +403,9 @@ void frag_main() {
TEST_F(HlslGeneratorImplTest_Function, Emit_Attribute_EntryPoint_With_UniformStruct) { TEST_F(HlslGeneratorImplTest_Function, Emit_Attribute_EntryPoint_With_UniformStruct) {
auto* s = Structure("Uniforms", utils::Vector{Member("coord", ty.vec4<f32>())}); auto* s = Structure("Uniforms", utils::Vector{Member("coord", ty.vec4<f32>())});
GlobalVar("uniforms", ty.Of(s), ast::StorageClass::kUniform, GlobalVar("uniforms", ty.Of(s), ast::StorageClass::kUniform, Binding(0), Group(1));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(1u),
});
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, auto* var = Var("v", ty.f32(), MemberAccessor(MemberAccessor("uniforms", "coord"), "x"));
MemberAccessor(MemberAccessor("uniforms", "coord"), "x"));
Func("frag_main", utils::Empty, ty.void_(), Func("frag_main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -445,13 +436,10 @@ TEST_F(HlslGeneratorImplTest_Function, Emit_Attribute_EntryPoint_With_RW_Storage
Member("b", ty.f32()), Member("b", ty.f32()),
}); });
GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Binding(0),
utils::Vector{ Group(1));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(1u),
});
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, MemberAccessor("coord", "b")); auto* var = Var("v", ty.f32(), MemberAccessor("coord", "b"));
Func("frag_main", utils::Empty, ty.void_(), Func("frag_main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -481,13 +469,10 @@ TEST_F(HlslGeneratorImplTest_Function, Emit_Attribute_EntryPoint_With_RO_Storage
Member("b", ty.f32()), Member("b", ty.f32()),
}); });
GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(0),
utils::Vector{ Group(1));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(1u),
});
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, MemberAccessor("coord", "b")); auto* var = Var("v", ty.f32(), MemberAccessor("coord", "b"));
Func("frag_main", utils::Empty, ty.void_(), Func("frag_main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -517,11 +502,8 @@ TEST_F(HlslGeneratorImplTest_Function, Emit_Attribute_EntryPoint_With_WO_Storage
Member("b", ty.f32()), Member("b", ty.f32()),
}); });
GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Binding(0),
utils::Vector{ Group(1));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(1u),
});
Func("frag_main", utils::Empty, ty.void_(), Func("frag_main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -551,11 +533,8 @@ TEST_F(HlslGeneratorImplTest_Function, Emit_Attribute_EntryPoint_With_StorageBuf
Member("b", ty.f32()), Member("b", ty.f32()),
}); });
GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Binding(0),
utils::Vector{ Group(1));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(1u),
});
Func("frag_main", utils::Empty, ty.void_(), Func("frag_main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -581,11 +560,7 @@ void frag_main() {
TEST_F(HlslGeneratorImplTest_Function, Emit_Attribute_Called_By_EntryPoint_With_Uniform) { TEST_F(HlslGeneratorImplTest_Function, Emit_Attribute_Called_By_EntryPoint_With_Uniform) {
auto* s = Structure("S", utils::Vector{Member("x", ty.f32())}); auto* s = Structure("S", utils::Vector{Member("x", ty.f32())});
GlobalVar("coord", ty.Of(s), ast::StorageClass::kUniform, GlobalVar("coord", ty.Of(s), ast::StorageClass::kUniform, Binding(0), Group(1));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(1u),
});
Func("sub_func", Func("sub_func",
utils::Vector{ utils::Vector{
@ -596,7 +571,7 @@ TEST_F(HlslGeneratorImplTest_Function, Emit_Attribute_Called_By_EntryPoint_With_
Return(MemberAccessor("coord", "x")), Return(MemberAccessor("coord", "x")),
}); });
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, Call("sub_func", 1_f)); auto* var = Var("v", ty.f32(), Call("sub_func", 1_f));
Func("frag_main", utils::Empty, ty.void_(), Func("frag_main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -627,11 +602,8 @@ void frag_main() {
TEST_F(HlslGeneratorImplTest_Function, Emit_Attribute_Called_By_EntryPoint_With_StorageBuffer) { TEST_F(HlslGeneratorImplTest_Function, Emit_Attribute_Called_By_EntryPoint_With_StorageBuffer) {
auto* s = Structure("S", utils::Vector{Member("x", ty.f32())}); auto* s = Structure("S", utils::Vector{Member("x", ty.f32())});
GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Binding(0),
utils::Vector{ Group(1));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(1u),
});
Func("sub_func", Func("sub_func",
utils::Vector{ utils::Vector{
@ -642,7 +614,7 @@ TEST_F(HlslGeneratorImplTest_Function, Emit_Attribute_Called_By_EntryPoint_With_
Return(MemberAccessor("coord", "x")), Return(MemberAccessor("coord", "x")),
}); });
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, Call("sub_func", 1_f)); auto* var = Var("v", ty.f32(), Call("sub_func", 1_f));
Func("frag_main", utils::Empty, ty.void_(), Func("frag_main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -741,9 +713,9 @@ void main() {
TEST_F(HlslGeneratorImplTest_Function, TEST_F(HlslGeneratorImplTest_Function,
Emit_Attribute_EntryPoint_Compute_WithWorkgroup_OverridableConst) { Emit_Attribute_EntryPoint_Compute_WithWorkgroup_OverridableConst) {
Override("width", ty.i32(), Construct(ty.i32(), 2_i), utils::Vector{Id(7u)}); Override("width", ty.i32(), Construct(ty.i32(), 2_i), Id(7u));
Override("height", ty.i32(), Construct(ty.i32(), 3_i), utils::Vector{Id(8u)}); Override("height", ty.i32(), Construct(ty.i32(), 3_i), Id(8u));
Override("depth", ty.i32(), Construct(ty.i32(), 4_i), utils::Vector{Id(9u)}); Override("depth", ty.i32(), Construct(ty.i32(), 4_i), Id(9u));
Func("main", utils::Empty, ty.void_(), utils::Empty, Func("main", utils::Empty, ty.void_(), utils::Empty,
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kCompute), Stage(ast::PipelineStage::kCompute),
@ -873,14 +845,11 @@ TEST_F(HlslGeneratorImplTest_Function, Emit_Multiple_EntryPoint_With_Same_Module
auto* s = Structure("Data", utils::Vector{Member("d", ty.f32())}); auto* s = Structure("Data", utils::Vector{Member("d", ty.f32())});
GlobalVar("data", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("data", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Binding(0),
utils::Vector{ Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
{ {
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, MemberAccessor("data", "d")); auto* var = Var("v", ty.f32(), MemberAccessor("data", "d"));
Func("a", utils::Empty, ty.void_(), Func("a", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -894,7 +863,7 @@ TEST_F(HlslGeneratorImplTest_Function, Emit_Multiple_EntryPoint_With_Same_Module
} }
{ {
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, MemberAccessor("data", "d")); auto* var = Var("v", ty.f32(), MemberAccessor("data", "d"));
Func("b", utils::Empty, ty.void_(), Func("b", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{

6
src/tint/writer/hlsl/generator_impl_loop_test.cc
View File

@ -187,7 +187,7 @@ TEST_F(HlslGeneratorImplTest_Loop, Emit_ForLoopWithMultiStmtInit) {
auto* multi_stmt = auto* multi_stmt =
create<ast::BinaryExpression>(ast::BinaryOp::kLogicalAnd, Expr(true), Expr(false)); create<ast::BinaryExpression>(ast::BinaryOp::kLogicalAnd, Expr(true), Expr(false));
auto* f = For(Decl(Var("b", nullptr, multi_stmt)), nullptr, nullptr, Block(Return())); auto* f = For(Decl(Var("b", multi_stmt)), nullptr, nullptr, Block(Return()));
WrapInFunction(f); WrapInFunction(f);
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -341,8 +341,8 @@ TEST_F(HlslGeneratorImplTest_Loop, Emit_ForLoopWithMultiStmtInitCondCont) {
auto* multi_stmt_c = auto* multi_stmt_c =
create<ast::BinaryExpression>(ast::BinaryOp::kLogicalAnd, Expr(true), Expr(false)); create<ast::BinaryExpression>(ast::BinaryOp::kLogicalAnd, Expr(true), Expr(false));
auto* f = For(Decl(Var("i", nullptr, multi_stmt_a)), multi_stmt_b, Assign("i", multi_stmt_c), auto* f =
Block(Return())); For(Decl(Var("i", multi_stmt_a)), multi_stmt_b, Assign("i", multi_stmt_c), Block(Return()));
WrapInFunction(f); WrapInFunction(f);
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();

39
src/tint/writer/hlsl/generator_impl_member_accessor_test.cc
View File

@ -91,7 +91,7 @@ class HlslGeneratorImplTest_MemberAccessorBase : public BASE {
auto* s = b.Structure("Data", members); auto* s = b.Structure("Data", members);
b.GlobalVar("data", b.ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, b.GlobalVar("data", b.ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite,
b.GroupAndBinding(1, 0)); b.Group(1), b.Binding(0));
} }
void SetupFunction(utils::VectorRef<const ast::Statement*> statements) { void SetupFunction(utils::VectorRef<const ast::Statement*> statements) {
@ -114,7 +114,7 @@ TEST_F(HlslGeneratorImplTest_MemberAccessor, EmitExpression_MemberAccessor) {
GlobalVar("str", ty.Of(s), ast::StorageClass::kPrivate); GlobalVar("str", ty.Of(s), ast::StorageClass::kPrivate);
auto* expr = MemberAccessor("str", "mem"); auto* expr = MemberAccessor("str", "mem");
WrapInFunction(Var("expr", ty.f32(), ast::StorageClass::kNone, expr)); WrapInFunction(Var("expr", ty.f32(), expr));
GeneratorImpl& gen = SanitizeAndBuild(); GeneratorImpl& gen = SanitizeAndBuild();
@ -162,7 +162,7 @@ TEST_P(HlslGeneratorImplTest_MemberAccessor_StorageBufferLoad, Test) {
}); });
SetupFunction(utils::Vector{ SetupFunction(utils::Vector{
Decl(Var("x", nullptr, ast::StorageClass::kNone, MemberAccessor("data", "b"))), Decl(Var("x", MemberAccessor("data", "b"))),
}); });
GeneratorImpl& gen = SanitizeAndBuild(); GeneratorImpl& gen = SanitizeAndBuild();
@ -233,8 +233,7 @@ TEST_P(HlslGeneratorImplTest_MemberAccessor_StorageBufferStore, Test) {
}); });
SetupFunction(utils::Vector{ SetupFunction(utils::Vector{
Decl(Var("value", p.member_type(ty), ast::StorageClass::kNone, Decl(Var("value", p.member_type(ty), Construct(p.member_type(ty)))),
Construct(p.member_type(ty)))),
Assign(MemberAccessor("data", "b"), Expr("value")), Assign(MemberAccessor("data", "b"), Expr("value")),
}); });
@ -354,8 +353,7 @@ TEST_F(HlslGeneratorImplTest_MemberAccessor, StorageBuffer_Load_Matrix_Single_El
}); });
SetupFunction(utils::Vector{ SetupFunction(utils::Vector{
Decl(Var("x", nullptr, ast::StorageClass::kNone, Decl(Var("x", IndexAccessor(IndexAccessor(MemberAccessor("data", "a"), 2_i), 1_i))),
IndexAccessor(IndexAccessor(MemberAccessor("data", "a"), 2_i), 1_i))),
}); });
GeneratorImpl& gen = SanitizeAndBuild(); GeneratorImpl& gen = SanitizeAndBuild();
@ -386,8 +384,7 @@ TEST_F(HlslGeneratorImplTest_MemberAccessor,
}); });
SetupFunction(utils::Vector{ SetupFunction(utils::Vector{
Decl(Var("x", nullptr, ast::StorageClass::kNone, Decl(Var("x", IndexAccessor(MemberAccessor("data", "a"), 2_i))),
IndexAccessor(MemberAccessor("data", "a"), 2_i))),
}); });
GeneratorImpl& gen = SanitizeAndBuild(); GeneratorImpl& gen = SanitizeAndBuild();
@ -418,11 +415,10 @@ TEST_F(HlslGeneratorImplTest_MemberAccessor,
}); });
SetupFunction(utils::Vector{ SetupFunction(utils::Vector{
Decl(Var("a", nullptr, Expr(2_i))), Decl(Var("a", Expr(2_i))),
Decl(Var("b", nullptr, Expr(4_i))), Decl(Var("b", Expr(4_i))),
Decl(Var("c", nullptr, Expr(3_i))), Decl(Var("c", Expr(3_i))),
Decl(Var("x", nullptr, ast::StorageClass::kNone, Decl(Var("x", IndexAccessor(MemberAccessor("data", "a"), Sub(Add("a", "b"), "c")))),
IndexAccessor(MemberAccessor("data", "a"), Sub(Add("a", "b"), "c")))),
}); });
GeneratorImpl& gen = SanitizeAndBuild(); GeneratorImpl& gen = SanitizeAndBuild();
@ -494,8 +490,7 @@ TEST_F(HlslGeneratorImplTest_MemberAccessor, StorageBuffer_Load_MultiLevel) {
}); });
SetupFunction(utils::Vector{ SetupFunction(utils::Vector{
Decl(Var("x", nullptr, ast::StorageClass::kNone, Decl(Var("x", MemberAccessor(IndexAccessor(MemberAccessor("data", "c"), 2_i), "b"))),
MemberAccessor(IndexAccessor(MemberAccessor("data", "c"), 2_i), "b"))),
}); });
GeneratorImpl& gen = SanitizeAndBuild(); GeneratorImpl& gen = SanitizeAndBuild();
@ -534,7 +529,7 @@ TEST_F(HlslGeneratorImplTest_MemberAccessor, StorageBuffer_Load_MultiLevel_Swizz
}); });
SetupFunction(utils::Vector{ SetupFunction(utils::Vector{
Decl(Var("x", nullptr, ast::StorageClass::kNone, Decl(Var("x",
MemberAccessor( MemberAccessor(
MemberAccessor(IndexAccessor(MemberAccessor("data", "c"), 2_i), "b"), "xy"))), MemberAccessor(IndexAccessor(MemberAccessor("data", "c"), 2_i), "b"), "xy"))),
}); });
@ -576,7 +571,7 @@ TEST_F(HlslGeneratorImplTest_MemberAccessor,
}); });
SetupFunction(utils::Vector{ SetupFunction(utils::Vector{
Decl(Var("x", nullptr, ast::StorageClass::kNone, Decl(Var("x",
MemberAccessor( MemberAccessor(
MemberAccessor(IndexAccessor(MemberAccessor("data", "c"), 2_i), "b"), "g"))), MemberAccessor(IndexAccessor(MemberAccessor("data", "c"), 2_i), "b"), "g"))),
}); });
@ -617,7 +612,7 @@ TEST_F(HlslGeneratorImplTest_MemberAccessor, StorageBuffer_Load_MultiLevel_Index
}); });
SetupFunction(utils::Vector{ SetupFunction(utils::Vector{
Decl(Var("x", nullptr, ast::StorageClass::kNone, Decl(Var("x",
IndexAccessor(MemberAccessor(IndexAccessor(MemberAccessor("data", "c"), 2_i), "b"), IndexAccessor(MemberAccessor(IndexAccessor(MemberAccessor("data", "c"), 2_i), "b"),
1_i))), 1_i))),
}); });
@ -718,8 +713,7 @@ void main() {
} }
TEST_F(HlslGeneratorImplTest_MemberAccessor, Swizzle_xyz) { TEST_F(HlslGeneratorImplTest_MemberAccessor, Swizzle_xyz) {
auto* var = auto* var = Var("my_vec", ty.vec4<f32>(), vec4<f32>(1_f, 2_f, 3_f, 4_f));
Var("my_vec", ty.vec4<f32>(), ast::StorageClass::kNone, vec4<f32>(1_f, 2_f, 3_f, 4_f));
auto* expr = MemberAccessor("my_vec", "xyz"); auto* expr = MemberAccessor("my_vec", "xyz");
WrapInFunction(var, expr); WrapInFunction(var, expr);
@ -729,8 +723,7 @@ TEST_F(HlslGeneratorImplTest_MemberAccessor, Swizzle_xyz) {
} }
TEST_F(HlslGeneratorImplTest_MemberAccessor, Swizzle_gbr) { TEST_F(HlslGeneratorImplTest_MemberAccessor, Swizzle_gbr) {
auto* var = auto* var = Var("my_vec", ty.vec4<f32>(), vec4<f32>(1_f, 2_f, 3_f, 4_f));
Var("my_vec", ty.vec4<f32>(), ast::StorageClass::kNone, vec4<f32>(1_f, 2_f, 3_f, 4_f));
auto* expr = MemberAccessor("my_vec", "gbr"); auto* expr = MemberAccessor("my_vec", "gbr");
WrapInFunction(var, expr); WrapInFunction(var, expr);

69
src/tint/writer/hlsl/generator_impl_module_constant_test.cc
View File

@ -23,8 +23,8 @@ namespace {
using HlslGeneratorImplTest_ModuleConstant = TestHelper; using HlslGeneratorImplTest_ModuleConstant = TestHelper;
TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_AInt) { TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_AInt) {
auto* var = GlobalConst("G", nullptr, Expr(1_a)); auto* var = GlobalConst("G", Expr(1_a));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -37,8 +37,8 @@ TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_AInt) {
} }
TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_AFloat) { TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_AFloat) {
auto* var = GlobalConst("G", nullptr, Expr(1._a)); auto* var = GlobalConst("G", Expr(1._a));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -51,8 +51,8 @@ TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_AFloat) {
} }
TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_i32) { TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_i32) {
auto* var = GlobalConst("G", nullptr, Expr(1_i)); auto* var = GlobalConst("G", Expr(1_i));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -65,8 +65,8 @@ TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_i32) {
} }
TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_u32) { TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_u32) {
auto* var = GlobalConst("G", nullptr, Expr(1_u)); auto* var = GlobalConst("G", Expr(1_u));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -79,8 +79,8 @@ TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_u32) {
} }
TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_f32) { TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_f32) {
auto* var = GlobalConst("G", nullptr, Expr(1_f)); auto* var = GlobalConst("G", Expr(1_f));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -95,8 +95,8 @@ TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_f32) {
TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_f16) { TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* var = GlobalConst("G", nullptr, Expr(1_h)); auto* var = GlobalConst("G", Expr(1_h));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -109,8 +109,8 @@ TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_f16) {
} }
TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_vec3_AInt) { TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_vec3_AInt) {
auto* var = GlobalConst("G", nullptr, Construct(ty.vec3(nullptr), 1_a, 2_a, 3_a)); auto* var = GlobalConst("G", Construct(ty.vec3(nullptr), 1_a, 2_a, 3_a));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -123,8 +123,8 @@ TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_vec3_AInt) {
} }
TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_vec3_AFloat) { TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_vec3_AFloat) {
auto* var = GlobalConst("G", nullptr, Construct(ty.vec3(nullptr), 1._a, 2._a, 3._a)); auto* var = GlobalConst("G", Construct(ty.vec3(nullptr), 1._a, 2._a, 3._a));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -137,8 +137,8 @@ TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_vec3_AFloat) {
} }
TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_vec3_f32) { TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_vec3_f32) {
auto* var = GlobalConst("G", nullptr, vec3<f32>(1_f, 2_f, 3_f)); auto* var = GlobalConst("G", vec3<f32>(1_f, 2_f, 3_f));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -153,8 +153,8 @@ TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_vec3_f32) {
TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_vec3_f16) { TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_vec3_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* var = GlobalConst("G", nullptr, vec3<f16>(1_h, 2_h, 3_h)); auto* var = GlobalConst("G", vec3<f16>(1_h, 2_h, 3_h));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -167,9 +167,9 @@ TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_vec3_f16) {
} }
TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_mat2x3_AFloat) { TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_mat2x3_AFloat) {
auto* var = GlobalConst("G", nullptr, auto* var =
Construct(ty.mat(nullptr, 2, 3), 1._a, 2._a, 3._a, 4._a, 5._a, 6._a)); GlobalConst("G", Construct(ty.mat(nullptr, 2, 3), 1._a, 2._a, 3._a, 4._a, 5._a, 6._a));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -182,8 +182,8 @@ TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_mat2x3_AFloat) {
} }
TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_mat2x3_f32) { TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_mat2x3_f32) {
auto* var = GlobalConst("G", nullptr, mat2x3<f32>(1_f, 2_f, 3_f, 4_f, 5_f, 6_f)); auto* var = GlobalConst("G", mat2x3<f32>(1_f, 2_f, 3_f, 4_f, 5_f, 6_f));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -198,8 +198,8 @@ TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_mat2x3_f32) {
TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_mat2x3_f16) { TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_mat2x3_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* var = GlobalConst("G", nullptr, mat2x3<f16>(1_h, 2_h, 3_h, 4_h, 5_h, 6_h)); auto* var = GlobalConst("G", mat2x3<f16>(1_h, 2_h, 3_h, 4_h, 5_h, 6_h));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -212,8 +212,8 @@ TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_mat2x3_f16) {
} }
TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_arr_f32) { TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_arr_f32) {
auto* var = GlobalConst("G", nullptr, Construct(ty.array<f32, 3>(), 1_f, 2_f, 3_f)); auto* var = GlobalConst("G", Construct(ty.array<f32, 3>(), 1_f, 2_f, 3_f));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -226,12 +226,11 @@ TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_arr_f32) {
} }
TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_arr_vec2_bool) { TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_arr_vec2_bool) {
auto* var = GlobalConst("G", nullptr, auto* var = GlobalConst("G", Construct(ty.array(ty.vec2<bool>(), 3_u), //
Construct(ty.array(ty.vec2<bool>(), 3_u), //
vec2<bool>(true, false), // vec2<bool>(true, false), //
vec2<bool>(false, true), // vec2<bool>(false, true), //
vec2<bool>(true, true))); vec2<bool>(true, true)));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -244,7 +243,7 @@ TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_GlobalConst_arr_vec2_bool) {
} }
TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_Override) { TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_Override) {
auto* var = Override("pos", ty.f32(), Expr(3_f), utils::Vector{Id(23)}); auto* var = Override("pos", ty.f32(), Expr(3_f), Id(23));
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -257,7 +256,7 @@ static const float pos = WGSL_SPEC_CONSTANT_23;
} }
TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_Override_NoConstructor) { TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_Override_NoConstructor) {
auto* var = Override("pos", ty.f32(), nullptr, utils::Vector{Id(23)}); auto* var = Override("pos", ty.f32(), Id(23));
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -270,7 +269,7 @@ static const float pos = WGSL_SPEC_CONSTANT_23;
} }
TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_Override_NoId) { TEST_F(HlslGeneratorImplTest_ModuleConstant, Emit_Override_NoId) {
auto* a = Override("a", ty.f32(), Expr(3_f), utils::Vector{Id(0)}); auto* a = Override("a", ty.f32(), Expr(3_f), Id(0));
auto* b = Override("b", ty.f32(), Expr(2_f)); auto* b = Override("b", ty.f32(), Expr(2_f));
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();

52
src/tint/writer/hlsl/generator_impl_sanitizer_test.cc
View File

@ -26,16 +26,11 @@ using HlslSanitizerTest = TestHelper;
TEST_F(HlslSanitizerTest, Call_ArrayLength) { TEST_F(HlslSanitizerTest, Call_ArrayLength) {
auto* s = Structure("my_struct", utils::Vector{Member(0, "a", ty.array<f32>(4))}); auto* s = Structure("my_struct", utils::Vector{Member(0, "a", ty.array<f32>(4))});
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("len", ty.u32(), ast::StorageClass::kNone, Decl(Var("len", ty.u32(), Call("arrayLength", AddressOf(MemberAccessor("b", "a"))))),
Call("arrayLength", AddressOf(MemberAccessor("b", "a"))))),
}, },
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kFragment), Stage(ast::PipelineStage::kFragment),
@ -64,16 +59,11 @@ TEST_F(HlslSanitizerTest, Call_ArrayLength_OtherMembersInStruct) {
Member(0, "z", ty.f32()), Member(0, "z", ty.f32()),
Member(4, "a", ty.array<f32>(4)), Member(4, "a", ty.array<f32>(4)),
}); });
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("len", ty.u32(), ast::StorageClass::kNone, Decl(Var("len", ty.u32(), Call("arrayLength", AddressOf(MemberAccessor("b", "a"))))),
Call("arrayLength", AddressOf(MemberAccessor("b", "a"))))),
}, },
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kFragment), Stage(ast::PipelineStage::kFragment),
@ -100,20 +90,16 @@ void a_func() {
TEST_F(HlslSanitizerTest, Call_ArrayLength_ViaLets) { TEST_F(HlslSanitizerTest, Call_ArrayLength_ViaLets) {
auto* s = Structure("my_struct", utils::Vector{Member(0, "a", ty.array<f32>(4))}); auto* s = Structure("my_struct", utils::Vector{Member(0, "a", ty.array<f32>(4))});
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
auto* p = Let("p", nullptr, AddressOf("b")); auto* p = Let("p", AddressOf("b"));
auto* p2 = Let("p2", nullptr, AddressOf(MemberAccessor(Deref(p), "a"))); auto* p2 = Let("p2", AddressOf(MemberAccessor(Deref(p), "a")));
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(p), Decl(p),
Decl(p2), Decl(p2),
Decl(Var("len", ty.u32(), ast::StorageClass::kNone, Call("arrayLength", p2))), Decl(Var("len", ty.u32(), Call("arrayLength", p2))),
}, },
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kFragment), Stage(ast::PipelineStage::kFragment),
@ -140,20 +126,12 @@ void a_func() {
TEST_F(HlslSanitizerTest, Call_ArrayLength_ArrayLengthFromUniform) { TEST_F(HlslSanitizerTest, Call_ArrayLength_ArrayLengthFromUniform) {
auto* s = Structure("my_struct", utils::Vector{Member(0, "a", ty.array<f32>(4))}); auto* s = Structure("my_struct", utils::Vector{Member(0, "a", ty.array<f32>(4))});
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(1), Group(2));
utils::Vector{ GlobalVar("c", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(2), Group(2));
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
GlobalVar("c", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead,
utils::Vector{
create<ast::BindingAttribute>(2u),
create<ast::GroupAttribute>(2u),
});
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("len", ty.u32(), ast::StorageClass::kNone, Decl(Var("len", ty.u32(),
Add(Call("arrayLength", AddressOf(MemberAccessor("b", "a"))), Add(Call("arrayLength", AddressOf(MemberAccessor("b", "a"))),
Call("arrayLength", AddressOf(MemberAccessor("c", "a")))))), Call("arrayLength", AddressOf(MemberAccessor("c", "a")))))),
}, },
@ -191,7 +169,7 @@ TEST_F(HlslSanitizerTest, PromoteArrayInitializerToConstVar) {
Func("main", utils::Empty, ty.void_(), Func("main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("idx", nullptr, Expr(3_i))), Decl(Var("idx", Expr(3_i))),
Decl(Var("pos", ty.i32(), IndexAccessor(array_init, "idx"))), Decl(Var("pos", ty.i32(), IndexAccessor(array_init, "idx"))),
}, },
utils::Vector{ utils::Vector{
@ -221,7 +199,7 @@ TEST_F(HlslSanitizerTest, PromoteStructInitializerToConstVar) {
}); });
auto* struct_init = Construct(ty.Of(str), 1_i, vec3<f32>(2_f, 3_f, 4_f), 4_i); auto* struct_init = Construct(ty.Of(str), 1_i, vec3<f32>(2_f, 3_f, 4_f), 4_i);
auto* struct_access = MemberAccessor(struct_init, "b"); auto* struct_access = MemberAccessor(struct_init, "b");
auto* pos = Var("pos", ty.vec3<f32>(), ast::StorageClass::kNone, struct_access); auto* pos = Var("pos", ty.vec3<f32>(), struct_access);
Func("main", utils::Empty, ty.void_(), Func("main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -257,7 +235,7 @@ TEST_F(HlslSanitizerTest, InlinePtrLetsBasic) {
// let x : i32 = *p; // let x : i32 = *p;
auto* v = Var("v", ty.i32()); auto* v = Var("v", ty.i32());
auto* p = Let("p", ty.pointer<i32>(ast::StorageClass::kFunction), AddressOf(v)); auto* p = Let("p", ty.pointer<i32>(ast::StorageClass::kFunction), AddressOf(v));
auto* x = Var("x", ty.i32(), ast::StorageClass::kNone, Deref(p)); auto* x = Var("x", ty.i32(), Deref(p));
Func("main", utils::Empty, ty.void_(), Func("main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -296,7 +274,7 @@ TEST_F(HlslSanitizerTest, InlinePtrLetsComplexChain) {
AddressOf(IndexAccessor(Deref(ap), 3_i))); AddressOf(IndexAccessor(Deref(ap), 3_i)));
auto* vp = Let("vp", ty.pointer(ty.vec4<f32>(), ast::StorageClass::kFunction), auto* vp = Let("vp", ty.pointer(ty.vec4<f32>(), ast::StorageClass::kFunction),
AddressOf(IndexAccessor(Deref(mp), 2_i))); AddressOf(IndexAccessor(Deref(mp), 2_i)));
auto* v = Var("v", ty.vec4<f32>(), ast::StorageClass::kNone, Deref(vp)); auto* v = Var("v", ty.vec4<f32>(), Deref(vp));
Func("main", utils::Empty, ty.void_(), Func("main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{

28
src/tint/writer/hlsl/generator_impl_type_test.cc
View File

@ -177,11 +177,8 @@ TEST_F(HlslGeneratorImplTest_Type, EmitType_StructDecl_OmittedIfStorageBuffer) {
Member("a", ty.i32()), Member("a", ty.i32()),
Member("b", ty.f32()), Member("b", ty.f32()),
}); });
GlobalVar("g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Binding(0),
utils::Vector{ Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -311,11 +308,7 @@ TEST_P(HlslDepthTexturesTest, Emit) {
auto* t = ty.depth_texture(params.dim); auto* t = ty.depth_texture(params.dim);
GlobalVar("tex", t, GlobalVar("tex", t, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
Func("main", utils::Empty, ty.void_(), Func("main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -346,11 +339,7 @@ using HlslDepthMultisampledTexturesTest = TestHelper;
TEST_F(HlslDepthMultisampledTexturesTest, Emit) { TEST_F(HlslDepthMultisampledTexturesTest, Emit) {
auto* t = ty.depth_multisampled_texture(ast::TextureDimension::k2d); auto* t = ty.depth_multisampled_texture(ast::TextureDimension::k2d);
GlobalVar("tex", t, GlobalVar("tex", t, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
Func("main", utils::Empty, ty.void_(), Func("main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -394,11 +383,7 @@ TEST_P(HlslSampledTexturesTest, Emit) {
} }
auto* t = ty.sampled_texture(params.dim, datatype); auto* t = ty.sampled_texture(params.dim, datatype);
GlobalVar("tex", t, GlobalVar("tex", t, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
Func("main", utils::Empty, ty.void_(), Func("main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -536,7 +521,8 @@ TEST_P(HlslStorageTexturesTest, Emit) {
GlobalVar("tex", t, GlobalVar("tex", t,
utils::Vector{ utils::Vector{
GroupAndBinding(2, 1), Group(2),
Binding(1),
}); });
Func("main", utils::Empty, ty.void_(), Func("main", utils::Empty, ty.void_(),

3
src/tint/writer/hlsl/generator_impl_unary_op_test.cc
View File

@ -45,8 +45,7 @@ TEST_F(HlslUnaryOpTest, Complement) {
TEST_F(HlslUnaryOpTest, Indirection) { TEST_F(HlslUnaryOpTest, Indirection) {
GlobalVar("G", ty.f32(), ast::StorageClass::kPrivate); GlobalVar("G", ty.f32(), ast::StorageClass::kPrivate);
auto* p = auto* p = Let("expr", create<ast::UnaryOpExpression>(ast::UnaryOp::kAddressOf, Expr("G")));
Let("expr", nullptr, create<ast::UnaryOpExpression>(ast::UnaryOp::kAddressOf, Expr("G")));
auto* op = create<ast::UnaryOpExpression>(ast::UnaryOp::kIndirection, Expr("expr")); auto* op = create<ast::UnaryOpExpression>(ast::UnaryOp::kIndirection, Expr("expr"));
WrapInFunction(p, op); WrapInFunction(p, op);

70
src/tint/writer/hlsl/generator_impl_variable_decl_statement_test.cc
View File

@ -65,11 +65,11 @@ TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const) {
} }
TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_AInt) { TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_AInt) {
auto* C = Const("C", nullptr, Expr(1_a)); auto* C = Const("C", Expr(1_a));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -83,11 +83,11 @@ TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_AInt
} }
TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_AFloat) { TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_AFloat) {
auto* C = Const("C", nullptr, Expr(1._a)); auto* C = Const("C", Expr(1._a));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -101,11 +101,11 @@ TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_AFlo
} }
TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_i32) { TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_i32) {
auto* C = Const("C", nullptr, Expr(1_i)); auto* C = Const("C", Expr(1_i));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -119,11 +119,11 @@ TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_i32)
} }
TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_u32) { TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_u32) {
auto* C = Const("C", nullptr, Expr(1_u)); auto* C = Const("C", Expr(1_u));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -137,11 +137,11 @@ TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_u32)
} }
TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_f32) { TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_f32) {
auto* C = Const("C", nullptr, Expr(1_f)); auto* C = Const("C", Expr(1_f));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -157,11 +157,11 @@ TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_f32)
TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_f16) { TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* C = Const("C", nullptr, Expr(1_h)); auto* C = Const("C", Expr(1_h));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -175,11 +175,11 @@ TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_f16)
} }
TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_vec3_AInt) { TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_vec3_AInt) {
auto* C = Const("C", nullptr, Construct(ty.vec3(nullptr), 1_a, 2_a, 3_a)); auto* C = Const("C", Construct(ty.vec3(nullptr), 1_a, 2_a, 3_a));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -193,11 +193,11 @@ TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_vec3
} }
TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_vec3_AFloat) { TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_vec3_AFloat) {
auto* C = Const("C", nullptr, Construct(ty.vec3(nullptr), 1._a, 2._a, 3._a)); auto* C = Const("C", Construct(ty.vec3(nullptr), 1._a, 2._a, 3._a));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -211,11 +211,11 @@ TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_vec3
} }
TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_vec3_f32) { TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_vec3_f32) {
auto* C = Const("C", nullptr, vec3<f32>(1_f, 2_f, 3_f)); auto* C = Const("C", vec3<f32>(1_f, 2_f, 3_f));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -231,11 +231,11 @@ TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_vec3
TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_vec3_f16) { TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_vec3_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* C = Const("C", nullptr, vec3<f16>(1_h, 2_h, 3_h)); auto* C = Const("C", vec3<f16>(1_h, 2_h, 3_h));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -249,12 +249,11 @@ TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_vec3
} }
TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_mat2x3_AFloat) { TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_mat2x3_AFloat) {
auto* C = auto* C = Const("C", Construct(ty.mat(nullptr, 2, 3), 1._a, 2._a, 3._a, 4._a, 5._a, 6._a));
Const("C", nullptr, Construct(ty.mat(nullptr, 2, 3), 1._a, 2._a, 3._a, 4._a, 5._a, 6._a));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -268,11 +267,11 @@ TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_mat2
} }
TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_mat2x3_f32) { TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_mat2x3_f32) {
auto* C = Const("C", nullptr, mat2x3<f32>(1_f, 2_f, 3_f, 4_f, 5_f, 6_f)); auto* C = Const("C", mat2x3<f32>(1_f, 2_f, 3_f, 4_f, 5_f, 6_f));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -288,11 +287,11 @@ TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_mat2
TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_mat2x3_f16) { TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_mat2x3_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* C = Const("C", nullptr, mat2x3<f16>(1_h, 2_h, 3_h, 4_h, 5_h, 6_h)); auto* C = Const("C", mat2x3<f16>(1_h, 2_h, 3_h, 4_h, 5_h, 6_h));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -306,11 +305,11 @@ TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_mat2
} }
TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_arr_f32) { TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_arr_f32) {
auto* C = Const("C", nullptr, Construct(ty.array<f32, 3>(), 1_f, 2_f, 3_f)); auto* C = Const("C", Construct(ty.array<f32, 3>(), 1_f, 2_f, 3_f));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -324,15 +323,14 @@ TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_arr_
} }
TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_arr_vec2_bool) { TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Const_arr_vec2_bool) {
auto* C = Const("C", nullptr, auto* C = Const("C", Construct(ty.array(ty.vec2<bool>(), 3_u), //
Construct(ty.array(ty.vec2<bool>(), 3_u), //
vec2<bool>(true, false), // vec2<bool>(true, false), //
vec2<bool>(false, true), // vec2<bool>(false, true), //
vec2<bool>(true, true))); vec2<bool>(true, true)));
Func("f", utils::Empty, ty.void_(), Func("f", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(C), Decl(C),
Decl(Let("l", nullptr, Expr(C))), Decl(Let("l", Expr(C))),
}); });
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -372,7 +370,7 @@ TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Private) {
} }
TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initializer_ZeroVec_F32) { TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initializer_ZeroVec_F32) {
auto* var = Var("a", ty.vec3<f32>(), ast::StorageClass::kNone, vec3<f32>()); auto* var = Var("a", ty.vec3<f32>(), vec3<f32>());
auto* stmt = Decl(var); auto* stmt = Decl(var);
WrapInFunction(stmt); WrapInFunction(stmt);
@ -387,7 +385,7 @@ TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initialize
TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initializer_ZeroVec_F16) { TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initializer_ZeroVec_F16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* var = Var("a", ty.vec3<f16>(), ast::StorageClass::kNone, vec3<f16>()); auto* var = Var("a", ty.vec3<f16>(), vec3<f16>());
auto* stmt = Decl(var); auto* stmt = Decl(var);
WrapInFunction(stmt); WrapInFunction(stmt);
@ -400,7 +398,7 @@ TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initialize
} }
TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initializer_ZeroMat_F32) { TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initializer_ZeroMat_F32) {
auto* var = Var("a", ty.mat2x3<f32>(), ast::StorageClass::kNone, mat2x3<f32>()); auto* var = Var("a", ty.mat2x3<f32>(), mat2x3<f32>());
auto* stmt = Decl(var); auto* stmt = Decl(var);
WrapInFunction(stmt); WrapInFunction(stmt);
@ -416,7 +414,7 @@ TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initialize
TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initializer_ZeroMat_F16) { TEST_F(HlslGeneratorImplTest_VariableDecl, Emit_VariableDeclStatement_Initializer_ZeroMat_F16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* var = Var("a", ty.mat2x3<f16>(), ast::StorageClass::kNone, mat2x3<f16>()); auto* var = Var("a", ty.mat2x3<f16>(), mat2x3<f16>());
auto* stmt = Decl(var); auto* stmt = Decl(var);
WrapInFunction(stmt); WrapInFunction(stmt);

2
src/tint/writer/msl/generator_impl_array_accessor_test.cc
View File

@ -36,7 +36,7 @@ TEST_F(MslGeneratorImplTest, IndexAccessor) {
TEST_F(MslGeneratorImplTest, IndexAccessor_OfDref) { TEST_F(MslGeneratorImplTest, IndexAccessor_OfDref) {
GlobalVar("ary", ty.array<i32, 10>(), ast::StorageClass::kPrivate); GlobalVar("ary", ty.array<i32, 10>(), ast::StorageClass::kPrivate);
auto* p = Let("p", nullptr, AddressOf("ary")); auto* p = Let("p", AddressOf("ary"));
auto* expr = IndexAccessor(Deref("p"), 5_i); auto* expr = IndexAccessor(Deref("p"), 5_i);
WrapInFunction(p, expr); WrapInFunction(p, expr);

8
src/tint/writer/msl/generator_impl_binary_test.cc
View File

@ -202,8 +202,8 @@ TEST_F(MslBinaryTest, ModVec3F16) {
} }
TEST_F(MslBinaryTest, BoolAnd) { TEST_F(MslBinaryTest, BoolAnd) {
auto* left = Var("left", nullptr, Expr(true)); auto* left = Var("left", Expr(true));
auto* right = Var("right", nullptr, Expr(false)); auto* right = Var("right", Expr(false));
auto* expr = create<ast::BinaryExpression>(ast::BinaryOp::kAnd, Expr(left), Expr(right)); auto* expr = create<ast::BinaryExpression>(ast::BinaryOp::kAnd, Expr(left), Expr(right));
WrapInFunction(left, right, expr); WrapInFunction(left, right, expr);
@ -215,8 +215,8 @@ TEST_F(MslBinaryTest, BoolAnd) {
} }
TEST_F(MslBinaryTest, BoolOr) { TEST_F(MslBinaryTest, BoolOr) {
auto* left = Var("left", nullptr, Expr(true)); auto* left = Var("left", Expr(true));
auto* right = Var("right", nullptr, Expr(false)); auto* right = Var("right", Expr(false));
auto* expr = create<ast::BinaryExpression>(ast::BinaryOp::kOr, Expr(left), Expr(right)); auto* expr = create<ast::BinaryExpression>(ast::BinaryOp::kOr, Expr(left), Expr(right));
WrapInFunction(left, right, expr); WrapInFunction(left, right, expr);

4
src/tint/writer/msl/generator_impl_constructor_test.cc
View File

@ -181,7 +181,7 @@ TEST_F(MslGeneratorImplTest, EmitConstructor_Type_Vec_SingleScalar_F16_Literal)
} }
TEST_F(MslGeneratorImplTest, EmitConstructor_Type_Vec_SingleScalar_F32_Var) { TEST_F(MslGeneratorImplTest, EmitConstructor_Type_Vec_SingleScalar_F32_Var) {
auto* var = Var("v", nullptr, Expr(2_f)); auto* var = Var("v", Expr(2_f));
auto* cast = vec3<f32>(var); auto* cast = vec3<f32>(var);
WrapInFunction(var, cast); WrapInFunction(var, cast);
@ -195,7 +195,7 @@ TEST_F(MslGeneratorImplTest, EmitConstructor_Type_Vec_SingleScalar_F32_Var) {
TEST_F(MslGeneratorImplTest, EmitConstructor_Type_Vec_SingleScalar_F16_Var) { TEST_F(MslGeneratorImplTest, EmitConstructor_Type_Vec_SingleScalar_F16_Var) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* var = Var("v", nullptr, Expr(2_h)); auto* var = Var("v", Expr(2_h));
auto* cast = vec3<f16>(var); auto* cast = vec3<f16>(var);
WrapInFunction(var, cast); WrapInFunction(var, cast);

36
src/tint/writer/msl/generator_impl_function_test.cc
View File

@ -342,10 +342,10 @@ TEST_F(MslGeneratorImplTest, Emit_FunctionAttribute_EntryPoint_With_RW_StorageBu
Member("b", ty.f32()), Member("b", ty.f32()),
}); });
GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Group(0),
GroupAndBinding(0, 0)); Binding(0));
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, MemberAccessor("coord", "b")); auto* var = Var("v", ty.f32(), MemberAccessor("coord", "b"));
Func("frag_main", utils::Empty, ty.void_(), Func("frag_main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -381,10 +381,10 @@ TEST_F(MslGeneratorImplTest, Emit_FunctionAttribute_EntryPoint_With_RO_StorageBu
Member("b", ty.f32()), Member("b", ty.f32()),
}); });
GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Group(0),
GroupAndBinding(0, 0)); Binding(0));
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, MemberAccessor("coord", "b")); auto* var = Var("v", ty.f32(), MemberAccessor("coord", "b"));
Func("frag_main", utils::Empty, ty.void_(), Func("frag_main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -416,7 +416,7 @@ fragment void frag_main(const device Data* tint_symbol [[buffer(0)]]) {
TEST_F(MslGeneratorImplTest, Emit_Attribute_Called_By_EntryPoint_With_Uniform) { TEST_F(MslGeneratorImplTest, Emit_Attribute_Called_By_EntryPoint_With_Uniform) {
auto* ubo_ty = Structure("UBO", utils::Vector{Member("coord", ty.vec4<f32>())}); auto* ubo_ty = Structure("UBO", utils::Vector{Member("coord", ty.vec4<f32>())});
auto* ubo = GlobalVar("ubo", ty.Of(ubo_ty), ast::StorageClass::kUniform, GroupAndBinding(0, 0)); auto* ubo = GlobalVar("ubo", ty.Of(ubo_ty), ast::StorageClass::kUniform, Group(0), Binding(0));
Func("sub_func", Func("sub_func",
utils::Vector{ utils::Vector{
@ -427,7 +427,7 @@ TEST_F(MslGeneratorImplTest, Emit_Attribute_Called_By_EntryPoint_With_Uniform) {
Return(MemberAccessor(MemberAccessor(ubo, "coord"), "x")), Return(MemberAccessor(MemberAccessor(ubo, "coord"), "x")),
}); });
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, Call("sub_func", 1_f)); auto* var = Var("v", ty.f32(), Call("sub_func", 1_f));
Func("frag_main", utils::Empty, ty.void_(), Func("frag_main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -466,8 +466,8 @@ TEST_F(MslGeneratorImplTest, Emit_FunctionAttribute_Called_By_EntryPoint_With_RW
Member("b", ty.f32()), Member("b", ty.f32()),
}); });
GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Group(0),
GroupAndBinding(0, 0)); Binding(0));
Func("sub_func", Func("sub_func",
utils::Vector{ utils::Vector{
@ -478,7 +478,7 @@ TEST_F(MslGeneratorImplTest, Emit_FunctionAttribute_Called_By_EntryPoint_With_RW
Return(MemberAccessor("coord", "b")), Return(MemberAccessor("coord", "b")),
}); });
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, Call("sub_func", 1_f)); auto* var = Var("v", ty.f32(), Call("sub_func", 1_f));
Func("frag_main", utils::Empty, ty.void_(), Func("frag_main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -518,8 +518,8 @@ TEST_F(MslGeneratorImplTest, Emit_FunctionAttribute_Called_By_EntryPoint_With_RO
Member("b", ty.f32()), Member("b", ty.f32()),
}); });
GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("coord", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Group(0),
GroupAndBinding(0, 0)); Binding(0));
Func("sub_func", Func("sub_func",
utils::Vector{ utils::Vector{
@ -530,7 +530,7 @@ TEST_F(MslGeneratorImplTest, Emit_FunctionAttribute_Called_By_EntryPoint_With_RO
Return(MemberAccessor("coord", "b")), Return(MemberAccessor("coord", "b")),
}); });
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, Call("sub_func", 1_f)); auto* var = Var("v", ty.f32(), Call("sub_func", 1_f));
Func("frag_main", utils::Empty, ty.void_(), Func("frag_main", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -656,11 +656,11 @@ TEST_F(MslGeneratorImplTest, Emit_Function_Multiple_EntryPoint_With_Same_ModuleV
auto* s = Structure("Data", utils::Vector{Member("d", ty.f32())}); auto* s = Structure("Data", utils::Vector{Member("d", ty.f32())});
GlobalVar("data", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("data", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Group(0),
GroupAndBinding(0, 0)); Binding(0));
{ {
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, MemberAccessor("data", "d")); auto* var = Var("v", ty.f32(), MemberAccessor("data", "d"));
Func("a", utils::Empty, ty.void_(), Func("a", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -674,7 +674,7 @@ TEST_F(MslGeneratorImplTest, Emit_Function_Multiple_EntryPoint_With_Same_ModuleV
} }
{ {
auto* var = Var("v", ty.f32(), ast::StorageClass::kNone, MemberAccessor("data", "d")); auto* var = Var("v", ty.f32(), MemberAccessor("data", "d"));
Func("b", utils::Empty, ty.void_(), Func("b", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{

75
src/tint/writer/msl/generator_impl_module_constant_test.cc
View File

@ -23,8 +23,8 @@ namespace {
using MslGeneratorImplTest = TestHelper; using MslGeneratorImplTest = TestHelper;
TEST_F(MslGeneratorImplTest, Emit_GlobalConst_AInt) { TEST_F(MslGeneratorImplTest, Emit_GlobalConst_AInt) {
auto* var = GlobalConst("G", nullptr, Expr(1_a)); auto* var = GlobalConst("G", Expr(1_a));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -41,8 +41,8 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_GlobalConst_AFloat) { TEST_F(MslGeneratorImplTest, Emit_GlobalConst_AFloat) {
auto* var = GlobalConst("G", nullptr, Expr(1._a)); auto* var = GlobalConst("G", Expr(1._a));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -59,8 +59,8 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_GlobalConst_i32) { TEST_F(MslGeneratorImplTest, Emit_GlobalConst_i32) {
auto* var = GlobalConst("G", nullptr, Expr(1_i)); auto* var = GlobalConst("G", Expr(1_i));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -77,8 +77,8 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_GlobalConst_u32) { TEST_F(MslGeneratorImplTest, Emit_GlobalConst_u32) {
auto* var = GlobalConst("G", nullptr, Expr(1_u)); auto* var = GlobalConst("G", Expr(1_u));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -95,8 +95,8 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_GlobalConst_f32) { TEST_F(MslGeneratorImplTest, Emit_GlobalConst_f32) {
auto* var = GlobalConst("G", nullptr, Expr(1_f)); auto* var = GlobalConst("G", Expr(1_f));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -115,8 +115,8 @@ void f() {
TEST_F(MslGeneratorImplTest, Emit_GlobalConst_f16) { TEST_F(MslGeneratorImplTest, Emit_GlobalConst_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* var = GlobalConst("G", nullptr, Expr(1_h)); auto* var = GlobalConst("G", Expr(1_h));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -133,8 +133,8 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_GlobalConst_vec3_AInt) { TEST_F(MslGeneratorImplTest, Emit_GlobalConst_vec3_AInt) {
auto* var = GlobalConst("G", nullptr, Construct(ty.vec3(nullptr), 1_a, 2_a, 3_a)); auto* var = GlobalConst("G", Construct(ty.vec3(nullptr), 1_a, 2_a, 3_a));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -151,8 +151,8 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_GlobalConst_vec3_AFloat) { TEST_F(MslGeneratorImplTest, Emit_GlobalConst_vec3_AFloat) {
auto* var = GlobalConst("G", nullptr, Construct(ty.vec3(nullptr), 1._a, 2._a, 3._a)); auto* var = GlobalConst("G", Construct(ty.vec3(nullptr), 1._a, 2._a, 3._a));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -169,8 +169,8 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_GlobalConst_vec3_f32) { TEST_F(MslGeneratorImplTest, Emit_GlobalConst_vec3_f32) {
auto* var = GlobalConst("G", nullptr, vec3<f32>(1_f, 2_f, 3_f)); auto* var = GlobalConst("G", vec3<f32>(1_f, 2_f, 3_f));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -189,8 +189,8 @@ void f() {
TEST_F(MslGeneratorImplTest, Emit_GlobalConst_vec3_f16) { TEST_F(MslGeneratorImplTest, Emit_GlobalConst_vec3_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* var = GlobalConst("G", nullptr, vec3<f16>(1_h, 2_h, 3_h)); auto* var = GlobalConst("G", vec3<f16>(1_h, 2_h, 3_h));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -207,9 +207,9 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_GlobalConst_mat2x3_AFloat) { TEST_F(MslGeneratorImplTest, Emit_GlobalConst_mat2x3_AFloat) {
auto* var = GlobalConst("G", nullptr, auto* var =
Construct(ty.mat(nullptr, 2, 3), 1._a, 2._a, 3._a, 4._a, 5._a, 6._a)); GlobalConst("G", Construct(ty.mat(nullptr, 2, 3), 1._a, 2._a, 3._a, 4._a, 5._a, 6._a));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -226,8 +226,8 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_GlobalConst_mat2x3_f32) { TEST_F(MslGeneratorImplTest, Emit_GlobalConst_mat2x3_f32) {
auto* var = GlobalConst("G", nullptr, mat2x3<f32>(1_f, 2_f, 3_f, 4_f, 5_f, 6_f)); auto* var = GlobalConst("G", mat2x3<f32>(1_f, 2_f, 3_f, 4_f, 5_f, 6_f));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -246,8 +246,8 @@ void f() {
TEST_F(MslGeneratorImplTest, Emit_GlobalConst_mat2x3_f16) { TEST_F(MslGeneratorImplTest, Emit_GlobalConst_mat2x3_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* var = GlobalConst("G", nullptr, mat2x3<f16>(1_h, 2_h, 3_h, 4_h, 5_h, 6_h)); auto* var = GlobalConst("G", mat2x3<f16>(1_h, 2_h, 3_h, 4_h, 5_h, 6_h));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -264,8 +264,8 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_GlobalConst_arr_f32) { TEST_F(MslGeneratorImplTest, Emit_GlobalConst_arr_f32) {
auto* var = GlobalConst("G", nullptr, Construct(ty.array<f32, 3>(), 1_f, 2_f, 3_f)); auto* var = GlobalConst("G", Construct(ty.array<f32, 3>(), 1_f, 2_f, 3_f));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -295,12 +295,11 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_GlobalConst_arr_vec2_bool) { TEST_F(MslGeneratorImplTest, Emit_GlobalConst_arr_vec2_bool) {
auto* var = GlobalConst("G", nullptr, auto* var = GlobalConst("G", Construct(ty.array(ty.vec2<bool>(), 3_u), //
Construct(ty.array(ty.vec2<bool>(), 3_u), //
vec2<bool>(true, false), // vec2<bool>(true, false), //
vec2<bool>(false, true), // vec2<bool>(false, true), //
vec2<bool>(true, true))); vec2<bool>(true, true)));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", nullptr, Expr(var)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(Let("l", Expr(var)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -330,10 +329,7 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_Override) { TEST_F(MslGeneratorImplTest, Emit_Override) {
auto* var = Override("pos", ty.f32(), Expr(3_f), auto* var = Override("pos", ty.f32(), Expr(3_f), Id(23));
utils::Vector{
Id(23),
});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -342,11 +338,8 @@ TEST_F(MslGeneratorImplTest, Emit_Override) {
} }
TEST_F(MslGeneratorImplTest, Emit_Override_NoId) { TEST_F(MslGeneratorImplTest, Emit_Override_NoId) {
auto* var_a = Override("a", ty.f32(), nullptr, auto* var_a = Override("a", ty.f32(), Id(0));
utils::Vector{ auto* var_b = Override("b", ty.f32());
Id(0),
});
auto* var_b = Override("b", ty.f32(), nullptr);
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();

58
src/tint/writer/msl/generator_impl_sanitizer_test.cc
View File

@ -27,16 +27,11 @@ using MslSanitizerTest = TestHelper;
TEST_F(MslSanitizerTest, Call_ArrayLength) { TEST_F(MslSanitizerTest, Call_ArrayLength) {
auto* s = Structure("my_struct", utils::Vector{Member(0, "a", ty.array<f32>(4))}); auto* s = Structure("my_struct", utils::Vector{Member(0, "a", ty.array<f32>(4))});
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("len", ty.u32(), ast::StorageClass::kNone, Decl(Var("len", ty.u32(), Call("arrayLength", AddressOf(MemberAccessor("b", "a"))))),
Call("arrayLength", AddressOf(MemberAccessor("b", "a"))))),
}, },
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kFragment), Stage(ast::PipelineStage::kFragment),
@ -85,16 +80,11 @@ TEST_F(MslSanitizerTest, Call_ArrayLength_OtherMembersInStruct) {
Member(0, "z", ty.f32()), Member(0, "z", ty.f32()),
Member(4, "a", ty.array<f32>(4)), Member(4, "a", ty.array<f32>(4)),
}); });
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("len", ty.u32(), ast::StorageClass::kNone, Decl(Var("len", ty.u32(), Call("arrayLength", AddressOf(MemberAccessor("b", "a"))))),
Call("arrayLength", AddressOf(MemberAccessor("b", "a"))))),
}, },
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kFragment), Stage(ast::PipelineStage::kFragment),
@ -142,20 +132,16 @@ fragment void a_func(const constant tint_symbol* tint_symbol_2 [[buffer(30)]]) {
TEST_F(MslSanitizerTest, Call_ArrayLength_ViaLets) { TEST_F(MslSanitizerTest, Call_ArrayLength_ViaLets) {
auto* s = Structure("my_struct", utils::Vector{Member(0, "a", ty.array<f32>(4))}); auto* s = Structure("my_struct", utils::Vector{Member(0, "a", ty.array<f32>(4))});
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
auto* p = Let("p", nullptr, AddressOf("b")); auto* p = Let("p", AddressOf("b"));
auto* p2 = Let("p2", nullptr, AddressOf(MemberAccessor(Deref(p), "a"))); auto* p2 = Let("p2", AddressOf(MemberAccessor(Deref(p), "a")));
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(p), Decl(p),
Decl(p2), Decl(p2),
Decl(Var("len", ty.u32(), ast::StorageClass::kNone, Call("arrayLength", p2))), Decl(Var("len", ty.u32(), Call("arrayLength", p2))),
}, },
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kFragment), Stage(ast::PipelineStage::kFragment),
@ -202,20 +188,12 @@ fragment void a_func(const constant tint_symbol* tint_symbol_2 [[buffer(30)]]) {
TEST_F(MslSanitizerTest, Call_ArrayLength_ArrayLengthFromUniform) { TEST_F(MslSanitizerTest, Call_ArrayLength_ArrayLengthFromUniform) {
auto* s = Structure("my_struct", utils::Vector{Member(0, "a", ty.array<f32>(4))}); auto* s = Structure("my_struct", utils::Vector{Member(0, "a", ty.array<f32>(4))});
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(1), Group(0));
utils::Vector{ GlobalVar("c", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(2), Group(0));
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(0u),
});
GlobalVar("c", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead,
utils::Vector{
create<ast::BindingAttribute>(2u),
create<ast::GroupAttribute>(0u),
});
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("len", ty.u32(), ast::StorageClass::kNone, Decl(Var("len", ty.u32(),
Add(Call("arrayLength", AddressOf(MemberAccessor("b", "a"))), Add(Call("arrayLength", AddressOf(MemberAccessor("b", "a"))),
Call("arrayLength", AddressOf(MemberAccessor("c", "a")))))), Call("arrayLength", AddressOf(MemberAccessor("c", "a")))))),
}, },
@ -267,20 +245,12 @@ fragment void a_func(const constant tint_symbol* tint_symbol_2 [[buffer(29)]]) {
TEST_F(MslSanitizerTest, Call_ArrayLength_ArrayLengthFromUniformMissingBinding) { TEST_F(MslSanitizerTest, Call_ArrayLength_ArrayLengthFromUniformMissingBinding) {
auto* s = Structure("my_struct", utils::Vector{Member(0, "a", ty.array<f32>(4))}); auto* s = Structure("my_struct", utils::Vector{Member(0, "a", ty.array<f32>(4))});
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(1), Group(0));
utils::Vector{ GlobalVar("c", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(2), Group(0));
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(0u),
});
GlobalVar("c", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead,
utils::Vector{
create<ast::BindingAttribute>(2u),
create<ast::GroupAttribute>(0u),
});
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("len", ty.u32(), ast::StorageClass::kNone, Decl(Var("len", ty.u32(),
Add(Call("arrayLength", AddressOf(MemberAccessor("b", "a"))), Add(Call("arrayLength", AddressOf(MemberAccessor("b", "a"))),
Call("arrayLength", AddressOf(MemberAccessor("c", "a")))))), Call("arrayLength", AddressOf(MemberAccessor("c", "a")))))),
}, },

24
src/tint/writer/msl/generator_impl_test.cc
View File

@ -155,7 +155,7 @@ vertex Out vert_main() {
TEST_F(MslGeneratorImplTest, WorkgroupMatrix) { TEST_F(MslGeneratorImplTest, WorkgroupMatrix) {
GlobalVar("m", ty.mat2x2<f32>(), ast::StorageClass::kWorkgroup); GlobalVar("m", ty.mat2x2<f32>(), ast::StorageClass::kWorkgroup);
Func("comp_main", utils::Empty, ty.void_(), utils::Vector{Decl(Let("x", nullptr, Expr("m")))}, Func("comp_main", utils::Empty, ty.void_(), utils::Vector{Decl(Let("x", Expr("m")))},
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kCompute), Stage(ast::PipelineStage::kCompute),
WorkgroupSize(1_i), WorkgroupSize(1_i),
@ -195,7 +195,7 @@ kernel void comp_main(threadgroup tint_symbol_3* tint_symbol_2 [[threadgroup(0)]
TEST_F(MslGeneratorImplTest, WorkgroupMatrixInArray) { TEST_F(MslGeneratorImplTest, WorkgroupMatrixInArray) {
GlobalVar("m", ty.array(ty.mat2x2<f32>(), 4_i), ast::StorageClass::kWorkgroup); GlobalVar("m", ty.array(ty.mat2x2<f32>(), 4_i), ast::StorageClass::kWorkgroup);
Func("comp_main", utils::Empty, ty.void_(), utils::Vector{Decl(Let("x", nullptr, Expr("m")))}, Func("comp_main", utils::Empty, ty.void_(), utils::Vector{Decl(Let("x", Expr("m")))},
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kCompute), Stage(ast::PipelineStage::kCompute),
WorkgroupSize(1_i), WorkgroupSize(1_i),
@ -256,7 +256,7 @@ TEST_F(MslGeneratorImplTest, WorkgroupMatrixInStruct) {
Member("s", ty.type_name("S1")), Member("s", ty.type_name("S1")),
}); });
GlobalVar("s", ty.type_name("S2"), ast::StorageClass::kWorkgroup); GlobalVar("s", ty.type_name("S2"), ast::StorageClass::kWorkgroup);
Func("comp_main", utils::Empty, ty.void_(), utils::Vector{Decl(Let("x", nullptr, Expr("s")))}, Func("comp_main", utils::Empty, ty.void_(), utils::Vector{Decl(Let("x", Expr("s")))},
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kCompute), Stage(ast::PipelineStage::kCompute),
WorkgroupSize(1_i), WorkgroupSize(1_i),
@ -316,9 +316,9 @@ TEST_F(MslGeneratorImplTest, WorkgroupMatrix_Multiples) {
GlobalVar("m9", ty.mat4x4<f32>(), ast::StorageClass::kWorkgroup); GlobalVar("m9", ty.mat4x4<f32>(), ast::StorageClass::kWorkgroup);
Func("main1", utils::Empty, ty.void_(), Func("main1", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("a1", nullptr, Expr("m1"))), Decl(Let("a1", Expr("m1"))),
Decl(Let("a2", nullptr, Expr("m2"))), Decl(Let("a2", Expr("m2"))),
Decl(Let("a3", nullptr, Expr("m3"))), Decl(Let("a3", Expr("m3"))),
}, },
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kCompute), Stage(ast::PipelineStage::kCompute),
@ -326,9 +326,9 @@ TEST_F(MslGeneratorImplTest, WorkgroupMatrix_Multiples) {
}); });
Func("main2", utils::Empty, ty.void_(), Func("main2", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("a1", nullptr, Expr("m4"))), Decl(Let("a1", Expr("m4"))),
Decl(Let("a2", nullptr, Expr("m5"))), Decl(Let("a2", Expr("m5"))),
Decl(Let("a3", nullptr, Expr("m6"))), Decl(Let("a3", Expr("m6"))),
}, },
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kCompute), Stage(ast::PipelineStage::kCompute),
@ -336,9 +336,9 @@ TEST_F(MslGeneratorImplTest, WorkgroupMatrix_Multiples) {
}); });
Func("main3", utils::Empty, ty.void_(), Func("main3", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("a1", nullptr, Expr("m7"))), Decl(Let("a1", Expr("m7"))),
Decl(Let("a2", nullptr, Expr("m8"))), Decl(Let("a2", Expr("m8"))),
Decl(Let("a3", nullptr, Expr("m9"))), Decl(Let("a3", Expr("m9"))),
}, },
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kCompute), Stage(ast::PipelineStage::kCompute),

42
src/tint/writer/msl/generator_impl_type_test.cc
View File

@ -282,11 +282,7 @@ TEST_F(MslGeneratorImplTest, EmitType_Struct_Layout_NonComposites) {
Member("z", ty.f32()), Member("z", ty.f32()),
}); });
GlobalVar("G", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("G", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -391,11 +387,7 @@ TEST_F(MslGeneratorImplTest, EmitType_Struct_Layout_Structures) {
Member("e", ty.f32()), Member("e", ty.f32()),
}); });
GlobalVar("G", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("G", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -485,11 +477,7 @@ TEST_F(MslGeneratorImplTest, EmitType_Struct_Layout_ArrayDefaultStride) {
Member("f", array_z), Member("f", array_z),
}); });
GlobalVar("G", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("G", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -571,11 +559,7 @@ TEST_F(MslGeneratorImplTest, EmitType_Struct_Layout_ArrayVec3DefaultStride) {
Member("c", ty.i32()), Member("c", ty.i32()),
}); });
GlobalVar("G", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("G", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -635,11 +619,7 @@ TEST_F(MslGeneratorImplTest, AttemptTintPadSymbolCollision) {
Member("tint_pad_21", ty.f32()), Member("tint_pad_21", ty.f32()),
}); });
GlobalVar("G", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("G", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -696,11 +676,7 @@ TEST_F(MslGeneratorImplTest, EmitType_Struct_WithAttribute) {
Member("b", ty.f32()), Member("b", ty.f32()),
}); });
GlobalVar("G", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("G", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -863,11 +839,7 @@ TEST_P(MslStorageTexturesTest, Emit) {
auto params = GetParam(); auto params = GetParam();
auto* s = ty.storage_texture(params.dim, ast::TexelFormat::kR32Float, ast::Access::kWrite); auto* s = ty.storage_texture(params.dim, ast::TexelFormat::kR32Float, ast::Access::kWrite);
GlobalVar("test_var", s, GlobalVar("test_var", s, Binding(0), Group(0));
utils::Vector{
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();

3
src/tint/writer/msl/generator_impl_unary_op_test.cc
View File

@ -45,8 +45,7 @@ TEST_F(MslUnaryOpTest, Complement) {
TEST_F(MslUnaryOpTest, Indirection) { TEST_F(MslUnaryOpTest, Indirection) {
GlobalVar("G", ty.f32(), ast::StorageClass::kPrivate); GlobalVar("G", ty.f32(), ast::StorageClass::kPrivate);
auto* p = auto* p = Let("expr", create<ast::UnaryOpExpression>(ast::UnaryOp::kAddressOf, Expr("G")));
Let("expr", nullptr, create<ast::UnaryOpExpression>(ast::UnaryOp::kAddressOf, Expr("G")));
auto* op = create<ast::UnaryOpExpression>(ast::UnaryOp::kIndirection, Expr("expr")); auto* op = create<ast::UnaryOpExpression>(ast::UnaryOp::kIndirection, Expr("expr"));
WrapInFunction(p, op); WrapInFunction(p, op);

76
src/tint/writer/msl/generator_impl_variable_decl_statement_test.cc
View File

@ -26,7 +26,7 @@ using ::testing::HasSubstr;
using MslGeneratorImplTest = TestHelper; using MslGeneratorImplTest = TestHelper;
TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement) { TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement) {
auto* var = Var("a", ty.f32(), ast::StorageClass::kNone); auto* var = Var("a", ty.f32());
auto* stmt = Decl(var); auto* stmt = Decl(var);
WrapInFunction(stmt); WrapInFunction(stmt);
@ -65,8 +65,8 @@ TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const) {
} }
TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_AInt) { TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_AInt) {
auto* C = Const("C", nullptr, Expr(1_a)); auto* C = Const("C", Expr(1_a));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", nullptr, Expr(C)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", Expr(C)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -83,8 +83,8 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_AFloat) { TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_AFloat) {
auto* C = Const("C", nullptr, Expr(1._a)); auto* C = Const("C", Expr(1._a));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", nullptr, Expr(C)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", Expr(C)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -101,8 +101,8 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_i32) { TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_i32) {
auto* C = Const("C", nullptr, Expr(1_i)); auto* C = Const("C", Expr(1_i));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", nullptr, Expr(C)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", Expr(C)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -119,8 +119,8 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_u32) { TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_u32) {
auto* C = Const("C", nullptr, Expr(1_u)); auto* C = Const("C", Expr(1_u));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", nullptr, Expr(C)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", Expr(C)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -137,8 +137,8 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_f32) { TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_f32) {
auto* C = Const("C", nullptr, Expr(1_f)); auto* C = Const("C", Expr(1_f));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", nullptr, Expr(C)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", Expr(C)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -157,8 +157,8 @@ void f() {
TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_f16) { TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* C = Const("C", nullptr, Expr(1_h)); auto* C = Const("C", Expr(1_h));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", nullptr, Expr(C)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", Expr(C)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -175,8 +175,8 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_vec3_AInt) { TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_vec3_AInt) {
auto* C = Const("C", nullptr, Construct(ty.vec3(nullptr), 1_a, 2_a, 3_a)); auto* C = Const("C", Construct(ty.vec3(nullptr), 1_a, 2_a, 3_a));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", nullptr, Expr(C)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", Expr(C)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -193,8 +193,8 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_vec3_AFloat) { TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_vec3_AFloat) {
auto* C = Const("C", nullptr, Construct(ty.vec3(nullptr), 1._a, 2._a, 3._a)); auto* C = Const("C", Construct(ty.vec3(nullptr), 1._a, 2._a, 3._a));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", nullptr, Expr(C)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", Expr(C)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -211,8 +211,8 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_vec3_f32) { TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_vec3_f32) {
auto* C = Const("C", nullptr, vec3<f32>(1_f, 2_f, 3_f)); auto* C = Const("C", vec3<f32>(1_f, 2_f, 3_f));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", nullptr, Expr(C)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", Expr(C)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -231,8 +231,8 @@ void f() {
TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_vec3_f16) { TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_vec3_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* C = Const("C", nullptr, vec3<f16>(1_h, 2_h, 3_h)); auto* C = Const("C", vec3<f16>(1_h, 2_h, 3_h));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", nullptr, Expr(C)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", Expr(C)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -249,9 +249,8 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_mat2x3_AFloat) { TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_mat2x3_AFloat) {
auto* C = auto* C = Const("C", Construct(ty.mat(nullptr, 2, 3), 1._a, 2._a, 3._a, 4._a, 5._a, 6._a));
Const("C", nullptr, Construct(ty.mat(nullptr, 2, 3), 1._a, 2._a, 3._a, 4._a, 5._a, 6._a)); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", Expr(C)))});
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", nullptr, Expr(C)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -268,8 +267,8 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_mat2x3_f32) { TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_mat2x3_f32) {
auto* C = Const("C", nullptr, mat2x3<f32>(1_f, 2_f, 3_f, 4_f, 5_f, 6_f)); auto* C = Const("C", mat2x3<f32>(1_f, 2_f, 3_f, 4_f, 5_f, 6_f));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", nullptr, Expr(C)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", Expr(C)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -288,8 +287,8 @@ void f() {
TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_mat2x3_f16) { TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_mat2x3_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* C = Const("C", nullptr, mat2x3<f16>(1_h, 2_h, 3_h, 4_h, 5_h, 6_h)); auto* C = Const("C", mat2x3<f16>(1_h, 2_h, 3_h, 4_h, 5_h, 6_h));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", nullptr, Expr(C)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", Expr(C)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -306,8 +305,8 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_arr_f32) { TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_arr_f32) {
auto* C = Const("C", nullptr, Construct(ty.array<f32, 3>(), 1_f, 2_f, 3_f)); auto* C = Const("C", Construct(ty.array<f32, 3>(), 1_f, 2_f, 3_f));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", nullptr, Expr(C)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", Expr(C)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -337,12 +336,11 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_arr_vec2_bool) { TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Const_arr_vec2_bool) {
auto* C = Const("C", nullptr, auto* C = Const("C", Construct(ty.array(ty.vec2<bool>(), 3_u), //
Construct(ty.array(ty.vec2<bool>(), 3_u), //
vec2<bool>(true, false), // vec2<bool>(true, false), //
vec2<bool>(false, true), // vec2<bool>(false, true), //
vec2<bool>(true, true))); vec2<bool>(true, true)));
Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", nullptr, Expr(C)))}); Func("f", utils::Empty, ty.void_(), utils::Vector{Decl(C), Decl(Let("l", Expr(C)))});
GeneratorImpl& gen = Build(); GeneratorImpl& gen = Build();
@ -372,7 +370,7 @@ void f() {
} }
TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Array) { TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Array) {
auto* var = Var("a", ty.array<f32, 5>(), ast::StorageClass::kNone); auto* var = Var("a", ty.array<f32, 5>());
auto* stmt = Decl(var); auto* stmt = Decl(var);
WrapInFunction(stmt); WrapInFunction(stmt);
@ -390,7 +388,7 @@ TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Struct) {
Member("b", ty.f32()), Member("b", ty.f32()),
}); });
auto* var = Var("a", ty.Of(s), ast::StorageClass::kNone); auto* var = Var("a", ty.Of(s));
auto* stmt = Decl(var); auto* stmt = Decl(var);
WrapInFunction(stmt); WrapInFunction(stmt);
@ -462,7 +460,7 @@ TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Matrix_f16) {
} }
TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Initializer_ZeroVec_f32) { TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Initializer_ZeroVec_f32) {
auto* var = Var("a", ty.vec3<f32>(), ast::StorageClass::kNone, vec3<f32>()); auto* var = Var("a", ty.vec3<f32>(), vec3<f32>());
auto* stmt = Decl(var); auto* stmt = Decl(var);
WrapInFunction(stmt); WrapInFunction(stmt);
@ -477,7 +475,7 @@ TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Initializer_ZeroVec_f32)
TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Initializer_ZeroVec_f16) { TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Initializer_ZeroVec_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* var = Var("a", ty.vec3<f16>(), ast::StorageClass::kNone, vec3<f16>()); auto* var = Var("a", ty.vec3<f16>(), vec3<f16>());
auto* stmt = Decl(var); auto* stmt = Decl(var);
WrapInFunction(stmt); WrapInFunction(stmt);
@ -490,7 +488,7 @@ TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Initializer_ZeroVec_f16)
} }
TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Initializer_ZeroMat_f32) { TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Initializer_ZeroMat_f32) {
auto* var = Var("a", ty.mat2x3<f32>(), ast::StorageClass::kNone, mat2x3<f32>()); auto* var = Var("a", ty.mat2x3<f32>(), mat2x3<f32>());
auto* stmt = Decl(var); auto* stmt = Decl(var);
WrapInFunction(stmt); WrapInFunction(stmt);
@ -506,7 +504,7 @@ TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Initializer_ZeroMat_f32)
TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Initializer_ZeroMat_f16) { TEST_F(MslGeneratorImplTest, Emit_VariableDeclStatement_Initializer_ZeroMat_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* var = Var("a", ty.mat2x3<f16>(), ast::StorageClass::kNone, mat2x3<f16>()); auto* var = Var("a", ty.mat2x3<f16>(), mat2x3<f16>());
auto* stmt = Decl(var); auto* stmt = Decl(var);
WrapInFunction(stmt); WrapInFunction(stmt);

73
src/tint/writer/spirv/builder_accessor_expression_test.cc
View File

@ -26,8 +26,8 @@ TEST_F(BuilderTest, Let_IndexAccessor_Vector) {
// let ary = vec3<i32>(1, 2, 3); // let ary = vec3<i32>(1, 2, 3);
// var x = ary[1i]; // var x = ary[1i];
auto* ary = Let("ary", nullptr, vec3<i32>(1_i, 2_i, 3_i)); auto* ary = Let("ary", vec3<i32>(1_i, 2_i, 3_i));
auto* x = Var("x", nullptr, IndexAccessor(ary, 1_i)); auto* x = Var("x", IndexAccessor(ary, 1_i));
WrapInFunction(ary, x); WrapInFunction(ary, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
@ -60,8 +60,8 @@ TEST_F(BuilderTest, Const_IndexAccessor_Vector) {
// const ary = vec3<i32>(1, 2, 3); // const ary = vec3<i32>(1, 2, 3);
// var x = ary[1i]; // var x = ary[1i];
auto* ary = Const("ary", nullptr, vec3<i32>(1_i, 2_i, 3_i)); auto* ary = Const("ary", vec3<i32>(1_i, 2_i, 3_i));
auto* x = Var("x", nullptr, IndexAccessor(ary, 1_i)); auto* x = Var("x", IndexAccessor(ary, 1_i));
WrapInFunction(ary, x); WrapInFunction(ary, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
@ -90,7 +90,7 @@ TEST_F(BuilderTest, Runtime_IndexAccessor_Vector) {
// var x = ary[1i]; // var x = ary[1i];
auto* ary = Var("ary", ty.vec3<u32>()); auto* ary = Var("ary", ty.vec3<u32>());
auto* x = Var("x", nullptr, IndexAccessor(ary, 1_i)); auto* x = Var("x", IndexAccessor(ary, 1_i));
WrapInFunction(ary, x); WrapInFunction(ary, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
@ -127,7 +127,7 @@ TEST_F(BuilderTest, Dynamic_IndexAccessor_Vector) {
auto* ary = Var("ary", ty.vec3<f32>()); auto* ary = Var("ary", ty.vec3<f32>());
auto* idx = Var("idx", ty.i32()); auto* idx = Var("idx", ty.i32());
auto* x = Var("x", nullptr, IndexAccessor(ary, idx)); auto* x = Var("x", IndexAccessor(ary, idx));
WrapInFunction(ary, idx, x); WrapInFunction(ary, idx, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
@ -164,8 +164,8 @@ TEST_F(BuilderTest, Const_IndexAccessor_Vector2) {
// let ary : vec3<i32>(1, 2, 3); // let ary : vec3<i32>(1, 2, 3);
// var x = ary[1i + 1i]; // var x = ary[1i + 1i];
auto* ary = Let("ary", nullptr, vec3<i32>(1_i, 2_i, 3_i)); auto* ary = Let("ary", vec3<i32>(1_i, 2_i, 3_i));
auto* x = Var("x", nullptr, IndexAccessor(ary, Add(1_i, 1_i))); auto* x = Var("x", IndexAccessor(ary, Add(1_i, 1_i)));
WrapInFunction(ary, x); WrapInFunction(ary, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
@ -199,7 +199,7 @@ TEST_F(BuilderTest, Runtime_IndexAccessor_Vector2) {
// var x = ary[1i + 1i]; // var x = ary[1i + 1i];
auto* ary = Var("ary", ty.vec3<f32>()); auto* ary = Var("ary", ty.vec3<f32>());
auto* x = Var("x", nullptr, IndexAccessor(ary, Add(1_i, 1_i))); auto* x = Var("x", IndexAccessor(ary, Add(1_i, 1_i)));
WrapInFunction(ary, x); WrapInFunction(ary, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
@ -235,8 +235,8 @@ TEST_F(BuilderTest, Dynamic_IndexAccessor_Vector2) {
// var x = ary[one + 2i]; // var x = ary[one + 2i];
auto* ary = Var("ary", ty.vec3<f32>()); auto* ary = Var("ary", ty.vec3<f32>());
auto* one = Var("one", nullptr, Expr(1_i)); auto* one = Var("one", Expr(1_i));
auto* x = Var("x", nullptr, IndexAccessor(ary, Add(one, 2_i))); auto* x = Var("x", IndexAccessor(ary, Add(one, 2_i)));
WrapInFunction(ary, one, x); WrapInFunction(ary, one, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
@ -277,10 +277,9 @@ TEST_F(BuilderTest, Let_IndexAccessor_Array_MultiLevel) {
// let ary = array<vec3<f32>, 2u>(vec3<f32>(1.0f, 2.0f, 3.0f), vec3<f32>(4.0f, 5.0f, 6.0f)); // let ary = array<vec3<f32>, 2u>(vec3<f32>(1.0f, 2.0f, 3.0f), vec3<f32>(4.0f, 5.0f, 6.0f));
// var x = ary[1i][2i]; // var x = ary[1i][2i];
auto* ary = auto* ary = Let("ary", array(ty.vec3<f32>(), 2_u, vec3<f32>(1._f, 2._f, 3._f),
Let("ary", nullptr, vec3<f32>(4._f, 5._f, 6._f)));
array(ty.vec3<f32>(), 2_u, vec3<f32>(1._f, 2._f, 3._f), vec3<f32>(4._f, 5._f, 6._f))); auto* x = Var("x", IndexAccessor(IndexAccessor(ary, 1_i), 2_i));
auto* x = Var("x", nullptr, IndexAccessor(IndexAccessor(ary, 1_i), 2_i));
WrapInFunction(ary, x); WrapInFunction(ary, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
@ -325,10 +324,9 @@ TEST_F(BuilderTest, Const_IndexAccessor_Array_MultiLevel) {
// const ary = array<vec3<f32>, 2u>(vec3<f32>(1.0f, 2.0f, 3.0f), vec3<f32>(4.0f, 5.0f, 6.0f)); // const ary = array<vec3<f32>, 2u>(vec3<f32>(1.0f, 2.0f, 3.0f), vec3<f32>(4.0f, 5.0f, 6.0f));
// var x = ary[1i][2i]; // var x = ary[1i][2i];
auto* ary = auto* ary = Const("ary", array(ty.vec3<f32>(), 2_u, vec3<f32>(1._f, 2._f, 3._f),
Const("ary", nullptr, vec3<f32>(4._f, 5._f, 6._f)));
array(ty.vec3<f32>(), 2_u, vec3<f32>(1._f, 2._f, 3._f), vec3<f32>(4._f, 5._f, 6._f))); auto* x = Var("x", IndexAccessor(IndexAccessor(ary, 1_i), 2_i));
auto* x = Var("x", nullptr, IndexAccessor(IndexAccessor(ary, 1_i), 2_i));
WrapInFunction(ary, x); WrapInFunction(ary, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
@ -357,7 +355,7 @@ TEST_F(BuilderTest, Runtime_IndexAccessor_Array_MultiLevel) {
// var x = ary[1i][2i]; // var x = ary[1i][2i];
auto* ary = Var("ary", ty.array(ty.vec3<f32>(), 4_u)); auto* ary = Var("ary", ty.array(ty.vec3<f32>(), 4_u));
auto* x = Var("x", nullptr, IndexAccessor(IndexAccessor(ary, 1_i), 2_i)); auto* x = Var("x", IndexAccessor(IndexAccessor(ary, 1_i), 2_i));
WrapInFunction(ary, x); WrapInFunction(ary, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
@ -398,8 +396,8 @@ TEST_F(BuilderTest, Dynamic_IndexAccessor_Array_MultiLevel) {
// var x = ary[one][2i]; // var x = ary[one][2i];
auto* ary = Var("ary", ty.array(ty.vec3<f32>(), 4_u)); auto* ary = Var("ary", ty.array(ty.vec3<f32>(), 4_u));
auto* one = Var("one", nullptr, Expr(3_i)); auto* one = Var("one", Expr(3_i));
auto* x = Var("x", nullptr, IndexAccessor(IndexAccessor(ary, one), 2_i)); auto* x = Var("x", IndexAccessor(IndexAccessor(ary, one), 2_i));
WrapInFunction(ary, one, x); WrapInFunction(ary, one, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
@ -442,10 +440,9 @@ TEST_F(BuilderTest, Const_IndexAccessor_Array_ArrayWithSwizzle) {
// let ary = array<vec3<f32>, 2u>(vec3<f32>(1.0f, 2.0f, 3.0f), vec3<f32>(4.0f, 5.0f, 6.0f)); // let ary = array<vec3<f32>, 2u>(vec3<f32>(1.0f, 2.0f, 3.0f), vec3<f32>(4.0f, 5.0f, 6.0f));
// var x = a[1i].xy; // var x = a[1i].xy;
auto* ary = auto* ary = Let("ary", array(ty.vec3<f32>(), 2_u, vec3<f32>(1._f, 2._f, 3._f),
Let("ary", nullptr, vec3<f32>(4._f, 5._f, 6._f)));
array(ty.vec3<f32>(), 2_u, vec3<f32>(1._f, 2._f, 3._f), vec3<f32>(4._f, 5._f, 6._f))); auto* x = Var("x", MemberAccessor(IndexAccessor("ary", 1_i), "xy"));
auto* x = Var("x", nullptr, MemberAccessor(IndexAccessor("ary", 1_i), "xy"));
WrapInFunction(ary, x); WrapInFunction(ary, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
@ -491,7 +488,7 @@ TEST_F(BuilderTest, Runtime_IndexAccessor_Array_ArrayWithSwizzle) {
// var x = ary[1i].xy; // var x = ary[1i].xy;
auto* ary = Var("ary", ty.array(ty.vec3<f32>(), 4_u)); auto* ary = Var("ary", ty.array(ty.vec3<f32>(), 4_u));
auto* x = Var("x", nullptr, MemberAccessor(IndexAccessor("ary", 1_i), "xy")); auto* x = Var("x", MemberAccessor(IndexAccessor("ary", 1_i), "xy"));
WrapInFunction(ary, x); WrapInFunction(ary, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
@ -533,8 +530,8 @@ TEST_F(BuilderTest, Dynamic_IndexAccessor_Array_ArrayWithSwizzle) {
// var x = ary[one].xy; // var x = ary[one].xy;
auto* ary = Var("ary", ty.array(ty.vec3<f32>(), 4_u)); auto* ary = Var("ary", ty.array(ty.vec3<f32>(), 4_u));
auto* one = Var("one", nullptr, Expr(1_i)); auto* one = Var("one", Expr(1_i));
auto* x = Var("x", nullptr, MemberAccessor(IndexAccessor("ary", one), "xy")); auto* x = Var("x", MemberAccessor(IndexAccessor("ary", one), "xy"));
WrapInFunction(ary, one, x); WrapInFunction(ary, one, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
@ -585,7 +582,7 @@ TEST_F(BuilderTest, Let_IndexAccessor_Nested_Array_f32) {
auto* pos = Let("pos", ty.array(ty.vec2<f32>(), 3_u), auto* pos = Let("pos", ty.array(ty.vec2<f32>(), 3_u),
Construct(ty.array(ty.vec2<f32>(), 3_u), vec2<f32>(0_f, 0.5_f), Construct(ty.array(ty.vec2<f32>(), 3_u), vec2<f32>(0_f, 0.5_f),
vec2<f32>(-0.5_f, -0.5_f), vec2<f32>(0.5_f, -0.5_f))); vec2<f32>(-0.5_f, -0.5_f), vec2<f32>(0.5_f, -0.5_f)));
auto* x = Var("x", nullptr, IndexAccessor(IndexAccessor(pos, 1_u), 0_u)); auto* x = Var("x", IndexAccessor(IndexAccessor(pos, 1_u), 0_u));
WrapInFunction(pos, x); WrapInFunction(pos, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
@ -632,7 +629,7 @@ TEST_F(BuilderTest, Const_IndexAccessor_Nested_Array_f32) {
auto* pos = Const("pos", ty.array(ty.vec2<f32>(), 3_u), auto* pos = Const("pos", ty.array(ty.vec2<f32>(), 3_u),
Construct(ty.array(ty.vec2<f32>(), 3_u), vec2<f32>(0_f, 0.5_f), Construct(ty.array(ty.vec2<f32>(), 3_u), vec2<f32>(0_f, 0.5_f),
vec2<f32>(-0.5_f, -0.5_f), vec2<f32>(0.5_f, -0.5_f))); vec2<f32>(-0.5_f, -0.5_f), vec2<f32>(0.5_f, -0.5_f)));
auto* x = Var("x", nullptr, IndexAccessor(IndexAccessor(pos, 1_u), 0_u)); auto* x = Var("x", IndexAccessor(IndexAccessor(pos, 1_u), 0_u));
WrapInFunction(pos, x); WrapInFunction(pos, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
@ -661,7 +658,7 @@ TEST_F(BuilderTest, Runtime_IndexAccessor_Nested_Array_f32) {
// var x = pos[1u][2u]; // var x = pos[1u][2u];
auto* pos = Var("pos", ty.array(ty.vec2<f32>(), 3_u)); auto* pos = Var("pos", ty.array(ty.vec2<f32>(), 3_u));
auto* x = Var("x", nullptr, IndexAccessor(IndexAccessor(pos, 1_u), 2_u)); auto* x = Var("x", IndexAccessor(IndexAccessor(pos, 1_u), 2_u));
WrapInFunction(pos, x); WrapInFunction(pos, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
@ -701,8 +698,8 @@ TEST_F(BuilderTest, Dynamic_IndexAccessor_Nested_Array_f32) {
// var x = pos[one][2u]; // var x = pos[one][2u];
auto* pos = Var("pos", ty.array(ty.vec2<f32>(), 3_u)); auto* pos = Var("pos", ty.array(ty.vec2<f32>(), 3_u));
auto* one = Var("one", nullptr, Expr(2_u)); auto* one = Var("one", Expr(2_u));
auto* x = Var("x", nullptr, IndexAccessor(IndexAccessor(pos, "one"), 2_u)); auto* x = Var("x", IndexAccessor(IndexAccessor(pos, "one"), 2_u));
WrapInFunction(pos, one, x); WrapInFunction(pos, one, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
@ -746,7 +743,7 @@ TEST_F(BuilderTest, Let_IndexAccessor_Matrix) {
auto* a = Let("a", ty.mat2x2<f32>(), auto* a = Let("a", ty.mat2x2<f32>(),
Construct(ty.mat2x2<f32>(), Construct(ty.vec2<f32>(), 1_f, 2_f), Construct(ty.mat2x2<f32>(), Construct(ty.vec2<f32>(), 1_f, 2_f),
Construct(ty.vec2<f32>(), 3_f, 4_f))); Construct(ty.vec2<f32>(), 3_f, 4_f)));
auto* x = Var("x", nullptr, IndexAccessor("a", 1_i)); auto* x = Var("x", IndexAccessor("a", 1_i));
WrapInFunction(a, x); WrapInFunction(a, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
@ -788,7 +785,7 @@ TEST_F(BuilderTest, Const_IndexAccessor_Matrix) {
auto* a = Const("a", ty.mat2x2<f32>(), auto* a = Const("a", ty.mat2x2<f32>(),
Construct(ty.mat2x2<f32>(), Construct(ty.vec2<f32>(), 1_f, 2_f), Construct(ty.mat2x2<f32>(), Construct(ty.vec2<f32>(), 1_f, 2_f),
Construct(ty.vec2<f32>(), 3_f, 4_f))); Construct(ty.vec2<f32>(), 3_f, 4_f)));
auto* x = Var("x", nullptr, IndexAccessor("a", 1_i)); auto* x = Var("x", IndexAccessor("a", 1_i));
WrapInFunction(a, x); WrapInFunction(a, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
@ -820,7 +817,7 @@ TEST_F(BuilderTest, Runtime_IndexAccessor_Matrix) {
// var x = a[1i] // var x = a[1i]
auto* a = Var("a", ty.mat2x2<f32>()); auto* a = Var("a", ty.mat2x2<f32>());
auto* x = Var("x", nullptr, IndexAccessor("a", 1_i)); auto* x = Var("x", IndexAccessor("a", 1_i));
WrapInFunction(a, x); WrapInFunction(a, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
@ -858,7 +855,7 @@ TEST_F(BuilderTest, Dynamic_IndexAccessor_Matrix) {
auto* a = Var("a", ty.mat2x2<f32>()); auto* a = Var("a", ty.mat2x2<f32>());
auto* idx = Var("idx", ty.i32()); auto* idx = Var("idx", ty.i32());
auto* x = Var("x", nullptr, IndexAccessor("a", idx)); auto* x = Var("x", IndexAccessor("a", idx));
WrapInFunction(a, idx, x); WrapInFunction(a, idx, x);
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();

4
src/tint/writer/spirv/builder_block_test.cc
View File

@ -25,8 +25,8 @@ using BuilderTest = TestHelper;
TEST_F(BuilderTest, Block) { TEST_F(BuilderTest, Block) {
// Note, this test uses shadow variables which aren't allowed in WGSL but // Note, this test uses shadow variables which aren't allowed in WGSL but
// serves to prove the block code is pushing new scopes as needed. // serves to prove the block code is pushing new scopes as needed.
auto* inner = Block(Decl(Var("var", ty.f32(), ast::StorageClass::kNone)), Assign("var", 2_f)); auto* inner = Block(Decl(Var("var", ty.f32())), Assign("var", 2_f));
auto* outer = Block(Decl(Var("var", ty.f32(), ast::StorageClass::kNone)), Assign("var", 1_f), auto* outer = Block(Decl(Var("var", ty.f32())), Assign("var", 1_f),
inner, Assign("var", 3_f)); inner, Assign("var", 3_f));
WrapInFunction(outer); WrapInFunction(outer);

199
src/tint/writer/spirv/builder_builtin_test.cc
View File

@ -43,17 +43,8 @@ TEST_F(BuiltinBuilderTest, Call_TextureSampleCompare_Twice) {
auto* s = ty.sampler(ast::SamplerKind::kComparisonSampler); auto* s = ty.sampler(ast::SamplerKind::kComparisonSampler);
auto* t = ty.depth_texture(ast::TextureDimension::k2d); auto* t = ty.depth_texture(ast::TextureDimension::k2d);
auto* tex = GlobalVar("texture", t, auto* tex = GlobalVar("texture", t, Binding(0), Group(0));
utils::Vector{ auto* sampler = GlobalVar("sampler", s, Binding(1), Group(0));
create<ast::BindingAttribute>(0u),
create<ast::GroupAttribute>(0u),
});
auto* sampler = GlobalVar("sampler", s,
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(0u),
});
auto* expr1 = Call("textureSampleCompare", "texture", "sampler", vec2<f32>(1_f, 2_f), 2_f); auto* expr1 = Call("textureSampleCompare", "texture", "sampler", vec2<f32>(1_f, 2_f), 2_f);
auto* expr2 = Call("textureSampleCompare", "texture", "sampler", vec2<f32>(1_f, 2_f), 2_f); auto* expr2 = Call("textureSampleCompare", "texture", "sampler", vec2<f32>(1_f, 2_f), 2_f);
@ -286,11 +277,7 @@ TEST_F(BuiltinBuilderTest, Call_ArrayLength) {
auto* s = Structure("my_struct", utils::Vector{ auto* s = Structure("my_struct", utils::Vector{
Member("a", ty.array<f32>(4)), Member("a", ty.array<f32>(4)),
}); });
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
auto* expr = Call("arrayLength", AddressOf(MemberAccessor("b", "a"))); auto* expr = Call("arrayLength", AddressOf(MemberAccessor("b", "a")));
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
@ -333,11 +320,7 @@ TEST_F(BuiltinBuilderTest, Call_ArrayLength_OtherMembersInStruct) {
Member("z", ty.f32()), Member("z", ty.f32()),
Member(4, "a", ty.array<f32>(4)), Member(4, "a", ty.array<f32>(4)),
}); });
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
auto* expr = Call("arrayLength", AddressOf(MemberAccessor("b", "a"))); auto* expr = Call("arrayLength", AddressOf(MemberAccessor("b", "a")));
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
@ -379,14 +362,10 @@ TEST_F(BuiltinBuilderTest, Call_ArrayLength_ViaLets) {
auto* s = Structure("my_struct", utils::Vector{ auto* s = Structure("my_struct", utils::Vector{
Member("a", ty.array<f32>(4)), Member("a", ty.array<f32>(4)),
}); });
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
auto* p = Let("p", nullptr, AddressOf("b")); auto* p = Let("p", AddressOf("b"));
auto* p2 = Let("p2", nullptr, AddressOf(MemberAccessor(Deref(p), "a"))); auto* p2 = Let("p2", AddressOf(MemberAccessor(Deref(p), "a")));
auto* expr = Call("arrayLength", p2); auto* expr = Call("arrayLength", p2);
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
@ -441,15 +420,11 @@ TEST_F(BuiltinBuilderTest, Call_ArrayLength_ViaLets_WithPtrNoise) {
auto* s = Structure("my_struct", utils::Vector{ auto* s = Structure("my_struct", utils::Vector{
Member("a", ty.array<f32>(4)), Member("a", ty.array<f32>(4)),
}); });
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kRead, Binding(1), Group(2));
utils::Vector{
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
auto* p = Let("p", nullptr, AddressOf(Deref(AddressOf("b")))); auto* p = Let("p", AddressOf(Deref(AddressOf("b"))));
auto* p2 = Let("p2", nullptr, AddressOf(Deref(p))); auto* p2 = Let("p2", AddressOf(Deref(p)));
auto* p3 = Let("p3", nullptr, AddressOf(MemberAccessor(Deref(p2), "a"))); auto* p3 = Let("p3", AddressOf(MemberAccessor(Deref(p2), "a")));
auto* expr = Call("arrayLength", AddressOf(Deref(p3))); auto* expr = Call("arrayLength", AddressOf(Deref(p3)));
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
@ -499,7 +474,7 @@ using Builtin_Builder_SingleParam_Float_Test = BuiltinBuilderTestWithParam<Built
TEST_P(Builtin_Builder_SingleParam_Float_Test, Call_Scalar_f32) { TEST_P(Builtin_Builder_SingleParam_Float_Test, Call_Scalar_f32) {
auto param = GetParam(); auto param = GetParam();
// Use a variable to prevent the function being evaluated as constant. // Use a variable to prevent the function being evaluated as constant.
auto* scalar = Var("a", nullptr, Expr(1_f)); auto* scalar = Var("a", Expr(1_f));
auto* expr = Call(param.name, scalar); auto* expr = Call(param.name, scalar);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -540,7 +515,7 @@ TEST_P(Builtin_Builder_SingleParam_Float_Test, Call_Scalar_f16) {
auto param = GetParam(); auto param = GetParam();
// Use a variable to prevent the function being evaluated as constant. // Use a variable to prevent the function being evaluated as constant.
auto* scalar = Var("a", nullptr, Expr(1_h)); auto* scalar = Var("a", Expr(1_h));
auto* expr = Call(param.name, scalar); auto* expr = Call(param.name, scalar);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -580,7 +555,7 @@ TEST_P(Builtin_Builder_SingleParam_Float_Test, Call_Vector_f32) {
auto param = GetParam(); auto param = GetParam();
// Use a variable to prevent the function being evaluated as constant. // Use a variable to prevent the function being evaluated as constant.
auto* vec = Var("a", nullptr, vec2<f32>(1_f, 1_f)); auto* vec = Var("a", vec2<f32>(1_f, 1_f));
auto* expr = Call(param.name, vec); auto* expr = Call(param.name, vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -624,7 +599,7 @@ TEST_P(Builtin_Builder_SingleParam_Float_Test, Call_Vector_f16) {
auto param = GetParam(); auto param = GetParam();
// Use a variable to prevent the function being evaluated as constant. // Use a variable to prevent the function being evaluated as constant.
auto* vec = Var("a", nullptr, vec2<f16>(1_h, 1_h)); auto* vec = Var("a", vec2<f16>(1_h, 1_h));
auto* expr = Call(param.name, vec); auto* expr = Call(param.name, vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -690,7 +665,7 @@ INSTANTIATE_TEST_SUITE_P(BuiltinBuilderTest,
BuiltinData{"trunc", "Trunc"})); BuiltinData{"trunc", "Trunc"}));
TEST_F(BuiltinBuilderTest, Call_Length_Scalar_f32) { TEST_F(BuiltinBuilderTest, Call_Length_Scalar_f32) {
auto* scalar = Var("a", nullptr, Expr(1_f)); auto* scalar = Var("a", Expr(1_f));
auto* expr = Call("length", scalar); auto* expr = Call("length", scalar);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -727,7 +702,7 @@ OpFunctionEnd
TEST_F(BuiltinBuilderTest, Call_Length_Scalar_f16) { TEST_F(BuiltinBuilderTest, Call_Length_Scalar_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* scalar = Var("a", nullptr, Expr(1_h)); auto* scalar = Var("a", Expr(1_h));
auto* expr = Call("length", scalar); auto* expr = Call("length", scalar);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -762,7 +737,7 @@ OpFunctionEnd
} }
TEST_F(BuiltinBuilderTest, Call_Length_Vector_f32) { TEST_F(BuiltinBuilderTest, Call_Length_Vector_f32) {
auto* vec = Var("a", nullptr, vec2<f32>(1_f, 1_f)); auto* vec = Var("a", vec2<f32>(1_f, 1_f));
auto* expr = Call("length", vec); auto* expr = Call("length", vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -801,7 +776,7 @@ OpFunctionEnd
TEST_F(BuiltinBuilderTest, Call_Length_Vector_f16) { TEST_F(BuiltinBuilderTest, Call_Length_Vector_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* vec = Var("a", nullptr, vec2<f16>(1_h, 1_h)); auto* vec = Var("a", vec2<f16>(1_h, 1_h));
auto* expr = Call("length", vec); auto* expr = Call("length", vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -838,7 +813,7 @@ OpFunctionEnd
} }
TEST_F(BuiltinBuilderTest, Call_Normalize_f32) { TEST_F(BuiltinBuilderTest, Call_Normalize_f32) {
auto* vec = Var("a", nullptr, vec2<f32>(1_f, 1_f)); auto* vec = Var("a", vec2<f32>(1_f, 1_f));
auto* expr = Call("normalize", vec); auto* expr = Call("normalize", vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -877,7 +852,7 @@ OpFunctionEnd
TEST_F(BuiltinBuilderTest, Call_Normalize_f16) { TEST_F(BuiltinBuilderTest, Call_Normalize_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* vec = Var("a", nullptr, vec2<f16>(1_h, 1_h)); auto* vec = Var("a", vec2<f16>(1_h, 1_h));
auto* expr = Call("normalize", vec); auto* expr = Call("normalize", vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -916,7 +891,7 @@ OpFunctionEnd
using Builtin_Builder_DualParam_Float_Test = BuiltinBuilderTestWithParam<BuiltinData>; using Builtin_Builder_DualParam_Float_Test = BuiltinBuilderTestWithParam<BuiltinData>;
TEST_P(Builtin_Builder_DualParam_Float_Test, Call_Scalar_f32) { TEST_P(Builtin_Builder_DualParam_Float_Test, Call_Scalar_f32) {
auto param = GetParam(); auto param = GetParam();
auto* scalar = Var("scalar", nullptr, Expr(1_f)); auto* scalar = Var("scalar", Expr(1_f));
auto* expr = Call(param.name, scalar, scalar); auto* expr = Call(param.name, scalar, scalar);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -957,7 +932,7 @@ TEST_P(Builtin_Builder_DualParam_Float_Test, Call_Scalar_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto param = GetParam(); auto param = GetParam();
auto* scalar = Var("scalar", nullptr, Expr(1_h)); auto* scalar = Var("scalar", Expr(1_h));
auto* expr = Call(param.name, scalar, scalar); auto* expr = Call(param.name, scalar, scalar);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -996,7 +971,7 @@ OpFunctionEnd
TEST_P(Builtin_Builder_DualParam_Float_Test, Call_Vector_f32) { TEST_P(Builtin_Builder_DualParam_Float_Test, Call_Vector_f32) {
auto param = GetParam(); auto param = GetParam();
auto* vec = Var("vec", nullptr, vec2<f32>(1_f, 1_f)); auto* vec = Var("vec", vec2<f32>(1_f, 1_f));
auto* expr = Call(param.name, vec, vec); auto* expr = Call(param.name, vec, vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -1039,7 +1014,7 @@ TEST_P(Builtin_Builder_DualParam_Float_Test, Call_Vector_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto param = GetParam(); auto param = GetParam();
auto* vec = Var("vec", nullptr, vec2<f16>(1_h, 1_h)); auto* vec = Var("vec", vec2<f16>(1_h, 1_h));
auto* expr = Call(param.name, vec, vec); auto* expr = Call(param.name, vec, vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -1087,7 +1062,7 @@ INSTANTIATE_TEST_SUITE_P(BuiltinBuilderTest,
BuiltinData{"step", "Step"})); BuiltinData{"step", "Step"}));
TEST_F(BuiltinBuilderTest, Call_Reflect_Vector_f32) { TEST_F(BuiltinBuilderTest, Call_Reflect_Vector_f32) {
auto* vec = Var("vec", nullptr, vec2<f32>(1_f, 1_f)); auto* vec = Var("vec", vec2<f32>(1_f, 1_f));
auto* expr = Call("reflect", vec, vec); auto* expr = Call("reflect", vec, vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -1127,7 +1102,7 @@ OpFunctionEnd
TEST_F(BuiltinBuilderTest, Call_Reflect_Vector_f16) { TEST_F(BuiltinBuilderTest, Call_Reflect_Vector_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* vec = Var("vec", nullptr, vec2<f16>(1_h, 1_h)); auto* vec = Var("vec", vec2<f16>(1_h, 1_h));
auto* expr = Call("reflect", vec, vec); auto* expr = Call("reflect", vec, vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -1165,7 +1140,7 @@ OpFunctionEnd
} }
TEST_F(BuiltinBuilderTest, Call_Distance_Scalar_f32) { TEST_F(BuiltinBuilderTest, Call_Distance_Scalar_f32) {
auto* scalar = Var("scalar", nullptr, Expr(1_f)); auto* scalar = Var("scalar", Expr(1_f));
auto* expr = Call("distance", scalar, scalar); auto* expr = Call("distance", scalar, scalar);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -1203,7 +1178,7 @@ OpFunctionEnd
TEST_F(BuiltinBuilderTest, Call_Distance_Scalar_f16) { TEST_F(BuiltinBuilderTest, Call_Distance_Scalar_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* scalar = Var("scalar", nullptr, Expr(1_h)); auto* scalar = Var("scalar", Expr(1_h));
auto* expr = Call("distance", scalar, scalar); auto* expr = Call("distance", scalar, scalar);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -1239,7 +1214,7 @@ OpFunctionEnd
} }
TEST_F(BuiltinBuilderTest, Call_Distance_Vector_f32) { TEST_F(BuiltinBuilderTest, Call_Distance_Vector_f32) {
auto* vec = Var("vec", nullptr, vec2<f32>(1_f, 1_f)); auto* vec = Var("vec", vec2<f32>(1_f, 1_f));
auto* expr = Call("distance", vec, vec); auto* expr = Call("distance", vec, vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -1279,7 +1254,7 @@ OpFunctionEnd
TEST_F(BuiltinBuilderTest, Call_Distance_Vector_f16) { TEST_F(BuiltinBuilderTest, Call_Distance_Vector_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* vec = Var("vec", nullptr, vec2<f16>(1_h, 1_h)); auto* vec = Var("vec", vec2<f16>(1_h, 1_h));
auto* expr = Call("distance", vec, vec); auto* expr = Call("distance", vec, vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -1317,7 +1292,7 @@ OpFunctionEnd
} }
TEST_F(BuiltinBuilderTest, Call_Cross_f32) { TEST_F(BuiltinBuilderTest, Call_Cross_f32) {
auto* vec = Var("vec", nullptr, vec3<f32>(1_f, 1_f, 1_f)); auto* vec = Var("vec", vec3<f32>(1_f, 1_f, 1_f));
auto* expr = Call("cross", vec, vec); auto* expr = Call("cross", vec, vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -1357,7 +1332,7 @@ OpFunctionEnd
TEST_F(BuiltinBuilderTest, Call_Cross_f16) { TEST_F(BuiltinBuilderTest, Call_Cross_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* vec = Var("vec", nullptr, vec3<f16>(1_h, 1_h, 1_h)); auto* vec = Var("vec", vec3<f16>(1_h, 1_h, 1_h));
auto* expr = Call("cross", vec, vec); auto* expr = Call("cross", vec, vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -1397,7 +1372,7 @@ OpFunctionEnd
using Builtin_Builder_ThreeParam_Float_Test = BuiltinBuilderTestWithParam<BuiltinData>; using Builtin_Builder_ThreeParam_Float_Test = BuiltinBuilderTestWithParam<BuiltinData>;
TEST_P(Builtin_Builder_ThreeParam_Float_Test, Call_Scalar_f32) { TEST_P(Builtin_Builder_ThreeParam_Float_Test, Call_Scalar_f32) {
auto param = GetParam(); auto param = GetParam();
auto* scalar = Var("scalar", nullptr, Expr(1_f)); auto* scalar = Var("scalar", Expr(1_f));
auto* expr = Call(param.name, scalar, scalar, scalar); auto* expr = Call(param.name, scalar, scalar, scalar);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -1439,7 +1414,7 @@ TEST_P(Builtin_Builder_ThreeParam_Float_Test, Call_Scalar_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto param = GetParam(); auto param = GetParam();
auto* scalar = Var("scalar", nullptr, Expr(1_h)); auto* scalar = Var("scalar", Expr(1_h));
auto* expr = Call(param.name, scalar, scalar, scalar); auto* expr = Call(param.name, scalar, scalar, scalar);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -1479,7 +1454,7 @@ OpFunctionEnd
TEST_P(Builtin_Builder_ThreeParam_Float_Test, Call_Vector_f32) { TEST_P(Builtin_Builder_ThreeParam_Float_Test, Call_Vector_f32) {
auto param = GetParam(); auto param = GetParam();
auto* vec = Var("vec", nullptr, vec2<f32>(1_f, 1_f)); auto* vec = Var("vec", vec2<f32>(1_f, 1_f));
auto* expr = Call(param.name, vec, vec, vec); auto* expr = Call(param.name, vec, vec, vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -1523,7 +1498,7 @@ TEST_P(Builtin_Builder_ThreeParam_Float_Test, Call_Vector_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto param = GetParam(); auto param = GetParam();
auto* vec = Var("vec", nullptr, vec2<f16>(1_h, 1_h)); auto* vec = Var("vec", vec2<f16>(1_h, 1_h));
auto* expr = Call(param.name, vec, vec, vec); auto* expr = Call(param.name, vec, vec, vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -1572,7 +1547,7 @@ INSTANTIATE_TEST_SUITE_P(BuiltinBuilderTest,
BuiltinData{"smoothstep", "SmoothStep"})); BuiltinData{"smoothstep", "SmoothStep"}));
TEST_F(BuiltinBuilderTest, Call_FaceForward_Vector_f32) { TEST_F(BuiltinBuilderTest, Call_FaceForward_Vector_f32) {
auto* vec = Var("vec", nullptr, vec2<f32>(1_f, 1_f)); auto* vec = Var("vec", vec2<f32>(1_f, 1_f));
auto* expr = Call("faceForward", vec, vec, vec); auto* expr = Call("faceForward", vec, vec, vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -1613,7 +1588,7 @@ OpFunctionEnd
TEST_F(BuiltinBuilderTest, Call_FaceForward_Vector_f16) { TEST_F(BuiltinBuilderTest, Call_FaceForward_Vector_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* vec = Var("vec", nullptr, vec2<f16>(1_h, 1_h)); auto* vec = Var("vec", vec2<f16>(1_h, 1_h));
auto* expr = Call("faceForward", vec, vec, vec); auto* expr = Call("faceForward", vec, vec, vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -1652,7 +1627,7 @@ OpFunctionEnd
} }
TEST_F(BuiltinBuilderTest, Call_Modf_f32) { TEST_F(BuiltinBuilderTest, Call_Modf_f32) {
auto* vec = Var("vec", nullptr, vec2<f32>(1_f, 2_f)); auto* vec = Var("vec", vec2<f32>(1_f, 2_f));
auto* expr = Call("modf", vec); auto* expr = Call("modf", vec);
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -1706,7 +1681,7 @@ OpFunctionEnd
TEST_F(BuiltinBuilderTest, Call_Modf_f16) { TEST_F(BuiltinBuilderTest, Call_Modf_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* vec = Var("vec", nullptr, vec2<f16>(1_h, 2_h)); auto* vec = Var("vec", vec2<f16>(1_h, 2_h));
auto* expr = Call("modf", vec); auto* expr = Call("modf", vec);
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -1762,7 +1737,7 @@ OpFunctionEnd
} }
TEST_F(BuiltinBuilderTest, Call_Frexp_f32) { TEST_F(BuiltinBuilderTest, Call_Frexp_f32) {
auto* vec = Var("vec", nullptr, vec2<f32>(1_f, 2_f)); auto* vec = Var("vec", vec2<f32>(1_f, 2_f));
auto* expr = Call("frexp", vec); auto* expr = Call("frexp", vec);
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -1818,7 +1793,7 @@ OpFunctionEnd
TEST_F(BuiltinBuilderTest, Call_Frexp_f16) { TEST_F(BuiltinBuilderTest, Call_Frexp_f16) {
Enable(ast::Extension::kF16); Enable(ast::Extension::kF16);
auto* vec = Var("vec", nullptr, vec2<f16>(1_h, 2_h)); auto* vec = Var("vec", vec2<f16>(1_h, 2_h));
auto* expr = Call("frexp", vec); auto* expr = Call("frexp", vec);
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -2010,7 +1985,7 @@ INSTANTIATE_TEST_SUITE_P(BuiltinBuilderTest,
using Builtin_Builder_SingleParam_Sint_Test = BuiltinBuilderTestWithParam<BuiltinData>; using Builtin_Builder_SingleParam_Sint_Test = BuiltinBuilderTestWithParam<BuiltinData>;
TEST_P(Builtin_Builder_SingleParam_Sint_Test, Call_Scalar) { TEST_P(Builtin_Builder_SingleParam_Sint_Test, Call_Scalar) {
auto param = GetParam(); auto param = GetParam();
auto* scalar = Var("scalar", nullptr, Expr(1_i)); auto* scalar = Var("scalar", Expr(1_i));
auto* expr = Call(param.name, scalar); auto* expr = Call(param.name, scalar);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -2048,7 +2023,7 @@ OpFunctionEnd
TEST_P(Builtin_Builder_SingleParam_Sint_Test, Call_Vector) { TEST_P(Builtin_Builder_SingleParam_Sint_Test, Call_Vector) {
auto param = GetParam(); auto param = GetParam();
auto* vec = Var("vec", nullptr, vec2<i32>(1_i, 1_i)); auto* vec = Var("vec", vec2<i32>(1_i, 1_i));
auto* expr = Call(param.name, vec); auto* expr = Call(param.name, vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -2092,7 +2067,7 @@ INSTANTIATE_TEST_SUITE_P(BuiltinBuilderTest,
// Calling abs() on an unsigned integer scalar / vector is a no-op. // Calling abs() on an unsigned integer scalar / vector is a no-op.
using Builtin_Builder_Abs_Uint_Test = BuiltinBuilderTest; using Builtin_Builder_Abs_Uint_Test = BuiltinBuilderTest;
TEST_F(Builtin_Builder_Abs_Uint_Test, Call_Scalar) { TEST_F(Builtin_Builder_Abs_Uint_Test, Call_Scalar) {
auto* scalar = Var("scalar", nullptr, Expr(1_u)); auto* scalar = Var("scalar", Expr(1_u));
auto* expr = Call("abs", scalar); auto* expr = Call("abs", scalar);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -2125,7 +2100,7 @@ OpFunctionEnd
} }
TEST_F(Builtin_Builder_Abs_Uint_Test, Call_Vector) { TEST_F(Builtin_Builder_Abs_Uint_Test, Call_Vector) {
auto* scalar = Var("scalar", nullptr, vec2<u32>(1_u, 1_u)); auto* scalar = Var("scalar", vec2<u32>(1_u, 1_u));
auto* expr = Call("abs", scalar); auto* expr = Call("abs", scalar);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -2162,7 +2137,7 @@ OpFunctionEnd
using Builtin_Builder_DualParam_SInt_Test = BuiltinBuilderTestWithParam<BuiltinData>; using Builtin_Builder_DualParam_SInt_Test = BuiltinBuilderTestWithParam<BuiltinData>;
TEST_P(Builtin_Builder_DualParam_SInt_Test, Call_Scalar) { TEST_P(Builtin_Builder_DualParam_SInt_Test, Call_Scalar) {
auto param = GetParam(); auto param = GetParam();
auto* scalar = Var("scalar", nullptr, Expr(1_i)); auto* scalar = Var("scalar", Expr(1_i));
auto* expr = Call(param.name, scalar, scalar); auto* expr = Call(param.name, scalar, scalar);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -2201,7 +2176,7 @@ OpFunctionEnd
TEST_P(Builtin_Builder_DualParam_SInt_Test, Call_Vector) { TEST_P(Builtin_Builder_DualParam_SInt_Test, Call_Vector) {
auto param = GetParam(); auto param = GetParam();
auto* vec = Var("vec", nullptr, vec2<i32>(1_i, 1_i)); auto* vec = Var("vec", vec2<i32>(1_i, 1_i));
auto* expr = Call(param.name, vec, vec); auto* expr = Call(param.name, vec, vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -2246,7 +2221,7 @@ INSTANTIATE_TEST_SUITE_P(BuiltinBuilderTest,
using Builtin_Builder_DualParam_UInt_Test = BuiltinBuilderTestWithParam<BuiltinData>; using Builtin_Builder_DualParam_UInt_Test = BuiltinBuilderTestWithParam<BuiltinData>;
TEST_P(Builtin_Builder_DualParam_UInt_Test, Call_Scalar) { TEST_P(Builtin_Builder_DualParam_UInt_Test, Call_Scalar) {
auto param = GetParam(); auto param = GetParam();
auto* scalar = Var("scalar", nullptr, Expr(1_u)); auto* scalar = Var("scalar", Expr(1_u));
auto* expr = Call(param.name, scalar, scalar); auto* expr = Call(param.name, scalar, scalar);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -2285,7 +2260,7 @@ OpFunctionEnd
TEST_P(Builtin_Builder_DualParam_UInt_Test, Call_Vector) { TEST_P(Builtin_Builder_DualParam_UInt_Test, Call_Vector) {
auto param = GetParam(); auto param = GetParam();
auto* vec = Var("vec", nullptr, vec2<u32>(1_u, 1_u)); auto* vec = Var("vec", vec2<u32>(1_u, 1_u));
auto* expr = Call(param.name, vec, vec); auto* expr = Call(param.name, vec, vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -2330,7 +2305,7 @@ INSTANTIATE_TEST_SUITE_P(BuiltinBuilderTest,
using Builtin_Builder_ThreeParam_Sint_Test = BuiltinBuilderTestWithParam<BuiltinData>; using Builtin_Builder_ThreeParam_Sint_Test = BuiltinBuilderTestWithParam<BuiltinData>;
TEST_P(Builtin_Builder_ThreeParam_Sint_Test, Call_Scalar) { TEST_P(Builtin_Builder_ThreeParam_Sint_Test, Call_Scalar) {
auto param = GetParam(); auto param = GetParam();
auto* scalar = Var("scalar", nullptr, Expr(1_i)); auto* scalar = Var("scalar", Expr(1_i));
auto* expr = Call(param.name, scalar, scalar, scalar); auto* expr = Call(param.name, scalar, scalar, scalar);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -2370,7 +2345,7 @@ OpFunctionEnd
TEST_P(Builtin_Builder_ThreeParam_Sint_Test, Call_Vector) { TEST_P(Builtin_Builder_ThreeParam_Sint_Test, Call_Vector) {
auto param = GetParam(); auto param = GetParam();
auto* vec = Var("vec", nullptr, vec2<i32>(1_i, 1_i)); auto* vec = Var("vec", vec2<i32>(1_i, 1_i));
auto* expr = Call(param.name, vec, vec, vec); auto* expr = Call(param.name, vec, vec, vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -2416,7 +2391,7 @@ INSTANTIATE_TEST_SUITE_P(BuiltinBuilderTest,
using Builtin_Builder_ThreeParam_Uint_Test = BuiltinBuilderTestWithParam<BuiltinData>; using Builtin_Builder_ThreeParam_Uint_Test = BuiltinBuilderTestWithParam<BuiltinData>;
TEST_P(Builtin_Builder_ThreeParam_Uint_Test, Call_Scalar) { TEST_P(Builtin_Builder_ThreeParam_Uint_Test, Call_Scalar) {
auto param = GetParam(); auto param = GetParam();
auto* scalar = Var("scalar", nullptr, Expr(1_u)); auto* scalar = Var("scalar", Expr(1_u));
auto* expr = Call(param.name, scalar, scalar, scalar); auto* expr = Call(param.name, scalar, scalar, scalar);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -2456,7 +2431,7 @@ OpFunctionEnd
TEST_P(Builtin_Builder_ThreeParam_Uint_Test, Call_Vector) { TEST_P(Builtin_Builder_ThreeParam_Uint_Test, Call_Vector) {
auto param = GetParam(); auto param = GetParam();
auto* vec = Var("vec", nullptr, vec2<u32>(1_u, 1_u)); auto* vec = Var("vec", vec2<u32>(1_u, 1_u));
auto* expr = Call(param.name, vec, vec, vec); auto* expr = Call(param.name, vec, vec, vec);
auto* func = Func("a_func", utils::Empty, ty.void_(), auto* func = Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -3244,11 +3219,8 @@ TEST_F(BuiltinBuilderTest, Call_AtomicLoad) {
Member("u", ty.atomic<u32>()), Member("u", ty.atomic<u32>()),
Member("i", ty.atomic<i32>()), Member("i", ty.atomic<i32>()),
}); });
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Binding(1),
utils::Vector{ Group(2));
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
@ -3310,16 +3282,13 @@ TEST_F(BuiltinBuilderTest, Call_AtomicStore) {
Member("u", ty.atomic<u32>()), Member("u", ty.atomic<u32>()),
Member("i", ty.atomic<i32>()), Member("i", ty.atomic<i32>()),
}); });
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Binding(1),
utils::Vector{ Group(2));
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("u", nullptr, Expr(1_u))), Decl(Var("u", Expr(1_u))),
Decl(Var("i", nullptr, Expr(2_i))), Decl(Var("i", Expr(2_i))),
CallStmt(Call("atomicStore", AddressOf(MemberAccessor("b", "u")), "u")), CallStmt(Call("atomicStore", AddressOf(MemberAccessor("b", "u")), "u")),
CallStmt(Call("atomicStore", AddressOf(MemberAccessor("b", "i")), "i")), CallStmt(Call("atomicStore", AddressOf(MemberAccessor("b", "i")), "i")),
}, },
@ -3384,15 +3353,12 @@ TEST_P(Builtin_Builder_AtomicRMW_i32, Test) {
auto* s = Structure("S", utils::Vector{ auto* s = Structure("S", utils::Vector{
Member("v", ty.atomic<i32>()), Member("v", ty.atomic<i32>()),
}); });
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Binding(1),
utils::Vector{ Group(2));
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("v", nullptr, Expr(10_i))), Decl(Var("v", Expr(10_i))),
Decl(Let("x", ty.i32(), Decl(Let("x", ty.i32(),
Call(GetParam().name, AddressOf(MemberAccessor("b", "v")), "v"))), Call(GetParam().name, AddressOf(MemberAccessor("b", "v")), "v"))),
}, },
@ -3459,15 +3425,12 @@ TEST_P(Builtin_Builder_AtomicRMW_u32, Test) {
auto* s = Structure("S", utils::Vector{ auto* s = Structure("S", utils::Vector{
Member("v", ty.atomic<u32>()), Member("v", ty.atomic<u32>()),
}); });
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Binding(1),
utils::Vector{ Group(2));
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("v", nullptr, Expr(10_u))), Decl(Var("v", Expr(10_u))),
Decl(Let("x", ty.u32(), Decl(Let("x", ty.u32(),
Call(GetParam().name, AddressOf(MemberAccessor("b", "v")), "v"))), Call(GetParam().name, AddressOf(MemberAccessor("b", "v")), "v"))),
}, },
@ -3536,16 +3499,13 @@ TEST_F(BuiltinBuilderTest, Call_AtomicExchange) {
Member("u", ty.atomic<u32>()), Member("u", ty.atomic<u32>()),
Member("i", ty.atomic<i32>()), Member("i", ty.atomic<i32>()),
}); });
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Binding(1),
utils::Vector{ Group(2));
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Var("u", nullptr, Expr(10_u))), Decl(Var("u", Expr(10_u))),
Decl(Var("i", nullptr, Expr(10_i))), Decl(Var("i", Expr(10_i))),
Decl(Let("r", ty.u32(), Decl(Let("r", ty.u32(),
Call("atomicExchange", AddressOf(MemberAccessor("b", "u")), "u"))), Call("atomicExchange", AddressOf(MemberAccessor("b", "u")), "u"))),
Decl(Let("s", ty.i32(), Decl(Let("s", ty.i32(),
@ -3614,20 +3574,15 @@ TEST_F(BuiltinBuilderTest, Call_AtomicCompareExchangeWeak) {
Member("u", ty.atomic<u32>()), Member("u", ty.atomic<u32>()),
Member("i", ty.atomic<i32>()), Member("i", ty.atomic<i32>()),
}); });
GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, GlobalVar("b", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Binding(1),
utils::Vector{ Group(2));
create<ast::BindingAttribute>(1u),
create<ast::GroupAttribute>(2u),
});
Func("a_func", utils::Empty, ty.void_(), Func("a_func", utils::Empty, ty.void_(),
utils::Vector{ utils::Vector{
Decl(Let("u", nullptr, Decl(Let("u", Call("atomicCompareExchangeWeak", AddressOf(MemberAccessor("b", "u")),
Call("atomicCompareExchangeWeak", AddressOf(MemberAccessor("b", "u")), 10_u, 10_u, 20_u))),
20_u))), Decl(Let("i", Call("atomicCompareExchangeWeak", AddressOf(MemberAccessor("b", "i")),
Decl(Let("i", nullptr, 10_i, 20_i))),
Call("atomicCompareExchangeWeak", AddressOf(MemberAccessor("b", "i")), 10_i,
20_i))),
}, },
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kFragment), Stage(ast::PipelineStage::kFragment),

76
src/tint/writer/spirv/builder_constructor_expression_test.cc
View File

@ -122,7 +122,7 @@ TEST_F(SpvBuilderConstructorTest, Type_IdentifierExpression_Param) {
} }
TEST_F(SpvBuilderConstructorTest, Vector_Bitcast_Params) { TEST_F(SpvBuilderConstructorTest, Vector_Bitcast_Params) {
auto* var = Var("v", nullptr, vec3<f32>(1_f, 2_f, 3_f)); auto* var = Var("v", vec3<f32>(1_f, 2_f, 3_f));
auto* cast = Bitcast(ty.vec3<u32>(), var); auto* cast = Bitcast(ty.vec3<u32>(), var);
WrapInFunction(var, cast); WrapInFunction(var, cast);
@ -247,7 +247,7 @@ TEST_F(SpvBuilderConstructorTest, Type_Vec2_With_Bool_Literal) {
} }
TEST_F(SpvBuilderConstructorTest, Type_Vec2_With_Bool_Var) { TEST_F(SpvBuilderConstructorTest, Type_Vec2_With_Bool_Var) {
auto* var = Var("v", nullptr, Expr(true)); auto* var = Var("v", Expr(true));
auto* cast = vec2<bool>(var); auto* cast = vec2<bool>(var);
WrapInFunction(var, cast); WrapInFunction(var, cast);
@ -1892,7 +1892,7 @@ TEST_F(SpvBuilderConstructorTest, Type_Vec4_F16_With_Vec4) {
TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_F32_With_F32) { TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_F32_With_F32) {
auto* ctor = Construct<f32>(2_f); auto* ctor = Construct<f32>(2_f);
GlobalConst("g", ty.f32(), ctor); GlobalConst("g", ty.f32(), ctor);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -1915,7 +1915,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_F16_With_F16) {
auto* ctor = Construct<f16>(2_h); auto* ctor = Construct<f16>(2_h);
GlobalConst("g", ty.f16(), ctor); GlobalConst("g", ty.f16(), ctor);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -1972,7 +1972,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalVar_F16_With_F16) {
TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_U32_With_F32) { TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_U32_With_F32) {
auto* ctor = Construct<u32>(1.5_f); auto* ctor = Construct<u32>(1.5_f);
GlobalConst("g", ty.u32(), ctor); GlobalConst("g", ty.u32(), ctor);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -1995,7 +1995,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_U32_With_F16) {
auto* ctor = Construct<u32>(1.5_h); auto* ctor = Construct<u32>(1.5_h);
GlobalConst("g", ty.u32(), ctor); GlobalConst("g", ty.u32(), ctor);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2052,7 +2052,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalVar_U32_With_F16) {
TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec2_With_F32) { TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec2_With_F32) {
auto* cast = vec2<f32>(2_f); auto* cast = vec2<f32>(2_f);
GlobalConst("g", ty.vec2<f32>(), cast); GlobalConst("g", ty.vec2<f32>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2077,7 +2077,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec2_With_F16) {
auto* cast = vec2<f16>(2_h); auto* cast = vec2<f16>(2_h);
GlobalConst("g", ty.vec2<f16>(), cast); GlobalConst("g", ty.vec2<f16>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2134,7 +2134,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalVar_Vec2_With_F16) {
TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec2_F32_With_Vec2) { TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec2_F32_With_Vec2) {
auto* cast = vec2<f32>(vec2<f32>(2_f, 2_f)); auto* cast = vec2<f32>(vec2<f32>(2_f, 2_f));
GlobalConst("g", ty.vec2<f32>(), cast); GlobalConst("g", ty.vec2<f32>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2159,7 +2159,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec2_F16_With_Vec2) {
auto* cast = vec2<f16>(vec2<f16>(2_h, 2_h)); auto* cast = vec2<f16>(vec2<f16>(2_h, 2_h));
GlobalConst("g", ty.vec2<f16>(), cast); GlobalConst("g", ty.vec2<f16>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2224,7 +2224,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalVar_Vec2_F16_With_Vec2) {
TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec3_F32_With_Vec3) { TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec3_F32_With_Vec3) {
auto* cast = vec3<f32>(vec3<f32>(2_f, 2_f, 2_f)); auto* cast = vec3<f32>(vec3<f32>(2_f, 2_f, 2_f));
GlobalConst("g", ty.vec3<f32>(), cast); GlobalConst("g", ty.vec3<f32>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2249,7 +2249,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec3_F16_With_Vec3) {
auto* cast = vec3<f16>(vec3<f16>(2_h, 2_h, 2_h)); auto* cast = vec3<f16>(vec3<f16>(2_h, 2_h, 2_h));
GlobalConst("g", ty.vec3<f16>(), cast); GlobalConst("g", ty.vec3<f16>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2314,7 +2314,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalVar_Vec3_F16_With_Vec3) {
TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_F32_With_Vec4) { TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_F32_With_Vec4) {
auto* cast = vec4<f32>(vec4<f32>(2_f, 2_f, 2_f, 2_f)); auto* cast = vec4<f32>(vec4<f32>(2_f, 2_f, 2_f, 2_f));
GlobalConst("g", ty.vec4<f32>(), cast); GlobalConst("g", ty.vec4<f32>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2339,7 +2339,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_F16_With_Vec4) {
auto* cast = vec4<f16>(vec4<f16>(2_h, 2_h, 2_h, 2_h)); auto* cast = vec4<f16>(vec4<f16>(2_h, 2_h, 2_h, 2_h));
GlobalConst("g", ty.vec4<f16>(), cast); GlobalConst("g", ty.vec4<f16>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2404,7 +2404,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalVar_Vec4_F16_With_Vec4) {
TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec3_With_F32) { TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec3_With_F32) {
auto* cast = vec3<f32>(2_f); auto* cast = vec3<f32>(2_f);
GlobalConst("g", ty.vec3<f32>(), cast); GlobalConst("g", ty.vec3<f32>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2429,7 +2429,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec3_With_F16) {
auto* cast = vec3<f16>(2_h); auto* cast = vec3<f16>(2_h);
GlobalConst("g", ty.vec3<f16>(), cast); GlobalConst("g", ty.vec3<f16>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2486,7 +2486,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalVar_Vec3_With_F16) {
TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec3_With_F32_Vec2) { TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec3_With_F32_Vec2) {
auto* cast = vec3<f32>(2_f, vec2<f32>(2_f, 2_f)); auto* cast = vec3<f32>(2_f, vec2<f32>(2_f, 2_f));
GlobalConst("g", ty.vec3<f32>(), cast); GlobalConst("g", ty.vec3<f32>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2511,7 +2511,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec3_With_F16_Vec2) {
auto* cast = vec3<f16>(2_h, vec2<f16>(2_h, 2_h)); auto* cast = vec3<f16>(2_h, vec2<f16>(2_h, 2_h));
GlobalConst("g", ty.vec3<f16>(), cast); GlobalConst("g", ty.vec3<f16>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2568,7 +2568,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalVar_Vec3_With_F16_Vec2) {
TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec3_With_Vec2_F32) { TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec3_With_Vec2_F32) {
auto* cast = vec3<f32>(vec2<f32>(2_f, 2_f), 2_f); auto* cast = vec3<f32>(vec2<f32>(2_f, 2_f), 2_f);
GlobalConst("g", ty.vec3<f32>(), cast); GlobalConst("g", ty.vec3<f32>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2593,7 +2593,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec3_With_Vec2_F16) {
auto* cast = vec3<f16>(vec2<f16>(2_h, 2_h), 2_h); auto* cast = vec3<f16>(vec2<f16>(2_h, 2_h), 2_h);
GlobalConst("g", ty.vec3<f16>(), cast); GlobalConst("g", ty.vec3<f16>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2650,7 +2650,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalVar_Vec3_With_Vec2_F16) {
TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_With_F32) { TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_With_F32) {
auto* cast = vec4<f32>(2_f); auto* cast = vec4<f32>(2_f);
GlobalConst("g", ty.vec4<f32>(), cast); GlobalConst("g", ty.vec4<f32>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2675,7 +2675,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_With_F16) {
auto* cast = vec4<f16>(2_h); auto* cast = vec4<f16>(2_h);
GlobalConst("g", ty.vec4<f16>(), cast); GlobalConst("g", ty.vec4<f16>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2732,7 +2732,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalVar_Vec4_With_F16) {
TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_With_F32_F32_Vec2) { TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_With_F32_F32_Vec2) {
auto* cast = vec4<f32>(2_f, 2_f, vec2<f32>(2_f, 2_f)); auto* cast = vec4<f32>(2_f, 2_f, vec2<f32>(2_f, 2_f));
GlobalConst("g", ty.vec4<f32>(), cast); GlobalConst("g", ty.vec4<f32>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2757,7 +2757,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_With_F16_F16_Vec2) {
auto* cast = vec4<f16>(2_h, 2_h, vec2<f16>(2_h, 2_h)); auto* cast = vec4<f16>(2_h, 2_h, vec2<f16>(2_h, 2_h));
GlobalConst("g", ty.vec4<f16>(), cast); GlobalConst("g", ty.vec4<f16>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2814,7 +2814,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalVar_Vec4_With_F16_F16_Vec2) {
TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_With_F32_Vec2_F32) { TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_With_F32_Vec2_F32) {
auto* cast = vec4<f32>(2_f, vec2<f32>(2_f, 2_f), 2_f); auto* cast = vec4<f32>(2_f, vec2<f32>(2_f, 2_f), 2_f);
GlobalConst("g", ty.vec4<f32>(), cast); GlobalConst("g", ty.vec4<f32>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2839,7 +2839,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_With_F16_Vec2_F16) {
auto* cast = vec4<f16>(2_h, vec2<f16>(2_h, 2_h), 2_h); auto* cast = vec4<f16>(2_h, vec2<f16>(2_h, 2_h), 2_h);
GlobalConst("g", ty.vec4<f16>(), cast); GlobalConst("g", ty.vec4<f16>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2896,7 +2896,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalVar_Vec4_With_F16_Vec2_F16) {
TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_With_Vec2_F32_F32) { TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_With_Vec2_F32_F32) {
auto* cast = vec4<f32>(vec2<f32>(2_f, 2_f), 2_f, 2_f); auto* cast = vec4<f32>(vec2<f32>(2_f, 2_f), 2_f, 2_f);
GlobalConst("g", ty.vec4<f32>(), cast); GlobalConst("g", ty.vec4<f32>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2921,7 +2921,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_With_Vec2_F16_F16) {
auto* cast = vec4<f16>(vec2<f16>(2_h, 2_h), 2_h, 2_h); auto* cast = vec4<f16>(vec2<f16>(2_h, 2_h), 2_h, 2_h);
GlobalConst("g", ty.vec4<f16>(), cast); GlobalConst("g", ty.vec4<f16>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -2978,7 +2978,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalVar_Vec4_With_Vec2_F16_F16) {
TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_F32_With_Vec2_Vec2) { TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_F32_With_Vec2_Vec2) {
auto* cast = vec4<f32>(vec2<f32>(2_f, 2_f), vec2<f32>(2_f, 2_f)); auto* cast = vec4<f32>(vec2<f32>(2_f, 2_f), vec2<f32>(2_f, 2_f));
GlobalConst("g", ty.vec4<f32>(), cast); GlobalConst("g", ty.vec4<f32>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -3003,7 +3003,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_F16_With_Vec2_Vec2) {
auto* cast = vec4<f16>(vec2<f16>(2_h, 2_h), vec2<f16>(2_h, 2_h)); auto* cast = vec4<f16>(vec2<f16>(2_h, 2_h), vec2<f16>(2_h, 2_h));
GlobalConst("g", ty.vec4<f16>(), cast); GlobalConst("g", ty.vec4<f16>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -3060,7 +3060,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalVar_Vec4_F16_With_Vec2_Vec2) {
TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_With_F32_Vec3) { TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_With_F32_Vec3) {
auto* cast = vec4<f32>(2_f, vec3<f32>(2_f, 2_f, 2_f)); auto* cast = vec4<f32>(2_f, vec3<f32>(2_f, 2_f, 2_f));
GlobalConst("g", ty.vec4<f32>(), cast); GlobalConst("g", ty.vec4<f32>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -3117,7 +3117,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalVar_Vec4_With_F16_Vec3) {
TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_With_Vec3_F32) { TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_With_Vec3_F32) {
auto* cast = vec4<f32>(vec3<f32>(2_f, 2_f, 2_f), 2_f); auto* cast = vec4<f32>(vec3<f32>(2_f, 2_f, 2_f), 2_f);
GlobalConst("g", ty.vec4<f32>(), cast); GlobalConst("g", ty.vec4<f32>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -3142,7 +3142,7 @@ TEST_F(SpvBuilderConstructorTest, Type_GlobalConst_Vec4_With_Vec3_F16) {
auto* cast = vec4<f16>(vec3<f16>(2_h, 2_h, 2_h), 2_h); auto* cast = vec4<f16>(vec3<f16>(2_h, 2_h, 2_h), 2_h);
GlobalConst("g", ty.vec4<f16>(), cast); GlobalConst("g", ty.vec4<f16>(), cast);
WrapInFunction(Decl(Var("l", nullptr, Expr("g")))); WrapInFunction(Decl(Var("l", Expr("g"))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -4572,8 +4572,8 @@ TEST_F(SpvBuilderConstructorTest, ConstantCompositeScoping) {
// } // }
// let y = vec3<f32>(1.0, 2.0, 3.0); // Reuses the ID 'x' // let y = vec3<f32>(1.0, 2.0, 3.0); // Reuses the ID 'x'
WrapInFunction(If(true, Block(Decl(Let("x", nullptr, vec3<f32>(1_f, 2_f, 3_f))))), WrapInFunction(If(true, Block(Decl(Let("x", vec3<f32>(1_f, 2_f, 3_f))))),
Decl(Let("y", nullptr, vec3<f32>(1_f, 2_f, 3_f)))); Decl(Let("y", vec3<f32>(1_f, 2_f, 3_f))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());
@ -4616,9 +4616,9 @@ TEST_F(SpvBuilderConstructorTest, CompositeConstructScoping) {
// } // }
// let y = vec3<f32>(one, 2.0, 3.0); // Mustn't reuse the ID 'x' // let y = vec3<f32>(one, 2.0, 3.0); // Mustn't reuse the ID 'x'
WrapInFunction(Decl(Var("one", nullptr, Expr(1_f))), WrapInFunction(Decl(Var("one", Expr(1_f))),
If(true, Block(Decl(Let("x", nullptr, vec3<f32>("one", 2_f, 3_f))))), If(true, Block(Decl(Let("x", vec3<f32>("one", 2_f, 3_f))))),
Decl(Let("y", nullptr, vec3<f32>("one", 2_f, 3_f)))); Decl(Let("y", vec3<f32>("one", 2_f, 3_f))));
spirv::Builder& b = SanitizeAndBuild(); spirv::Builder& b = SanitizeAndBuild();
ASSERT_TRUE(b.Build()); ASSERT_TRUE(b.Build());

2
src/tint/writer/spirv/builder_entry_point_test.cc
View File

@ -51,7 +51,7 @@ TEST_F(BuilderTest, EntryPoint_Parameters) {
Location(1u), Location(1u),
}); });
auto* mul = Mul(Expr(MemberAccessor("coord", "x")), Expr("loc1")); auto* mul = Mul(Expr(MemberAccessor("coord", "x")), Expr("loc1"));
auto* col = Var("col", ty.f32(), ast::StorageClass::kNone, mul); auto* col = Var("col", ty.f32(), mul);
Func("frag_main", utils::Vector{coord, loc1}, ty.void_(), utils::Vector{WrapInStatement(col)}, Func("frag_main", utils::Vector{coord, loc1}, ty.void_(), utils::Vector{WrapInStatement(col)},
utils::Vector{ utils::Vector{
Stage(ast::PipelineStage::kFragment), Stage(ast::PipelineStage::kFragment),

8
src/tint/writer/spirv/builder_function_attribute_test.cc
View File

@ -150,9 +150,9 @@ TEST_F(BuilderTest, Decoration_ExecutionMode_WorkgroupSize_Const) {
} }
TEST_F(BuilderTest, Decoration_ExecutionMode_WorkgroupSize_OverridableConst) { TEST_F(BuilderTest, Decoration_ExecutionMode_WorkgroupSize_OverridableConst) {
Override("width", ty.i32(), Construct(ty.i32(), 2_i), utils::Vector{Id(7u)}); Override("width", ty.i32(), Construct(ty.i32(), 2_i), Id(7u));
Override("height", ty.i32(), Construct(ty.i32(), 3_i), utils::Vector{Id(8u)}); Override("height", ty.i32(), Construct(ty.i32(), 3_i), Id(8u));
Override("depth", ty.i32(), Construct(ty.i32(), 4_i), utils::Vector{Id(9u)}); Override("depth", ty.i32(), Construct(ty.i32(), 4_i), Id(9u));
auto* func = Func("main", utils::Empty, ty.void_(), utils::Empty, auto* func = Func("main", utils::Empty, ty.void_(), utils::Empty,
utils::Vector{ utils::Vector{
WorkgroupSize("width", "height", "depth"), WorkgroupSize("width", "height", "depth"),
@ -180,7 +180,7 @@ OpDecorate %3 BuiltIn WorkgroupSize
} }
TEST_F(BuilderTest, Decoration_ExecutionMode_WorkgroupSize_LiteralAndConst) { TEST_F(BuilderTest, Decoration_ExecutionMode_WorkgroupSize_LiteralAndConst) {
Override("height", ty.i32(), Construct(ty.i32(), 2_i), utils::Vector{Id(7u)}); Override("height", ty.i32(), Construct(ty.i32(), 2_i), Id(7u));
GlobalConst("depth", ty.i32(), Construct(ty.i32(), 3_i)); GlobalConst("depth", ty.i32(), Construct(ty.i32(), 3_i));
auto* func = Func("main", utils::Empty, ty.void_(), utils::Empty, auto* func = Func("main", utils::Empty, ty.void_(), utils::Empty,
utils::Vector{ utils::Vector{

Some files were not shown because too many files have changed in this diff Show More