[tint][ir] Rename Builder.Declare() to Builder.Var()
Seems to better match usage. I don't feel like it's any less intuitive
in terms of what the function does.
Change-Id: I3df4d1a6468b85c1531a3d700265191a7f90c235
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/136441
Commit-Queue: Dan Sinclair <dsinclair@chromium.org>
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: James Price <jrprice@google.com>
diff --git a/src/tint/ir/access_test.cc b/src/tint/ir/access_test.cc
index 9e09930..932f4f0 100644
--- a/src/tint/ir/access_test.cc
+++ b/src/tint/ir/access_test.cc
@@ -26,7 +26,7 @@
TEST_F(IR_AccessTest, SetsUsage) {
auto* ty = mod.Types().pointer(mod.Types().i32(), builtin::AddressSpace::kFunction,
builtin::Access::kReadWrite);
- auto* var = b.Declare(ty);
+ auto* var = b.Var(ty);
auto* idx = b.Constant(u32(1));
auto* a = b.Access(mod.Types().i32(), var, utils::Vector{idx});
@@ -41,7 +41,7 @@
Builder b{mod};
auto* ty = mod.Types().pointer(mod.Types().i32(), builtin::AddressSpace::kFunction,
builtin::Access::kReadWrite);
- auto* var = b.Declare(ty);
+ auto* var = b.Var(ty);
b.Access(nullptr, var, utils::Vector{b.Constant(u32(1))});
},
"");
@@ -64,7 +64,7 @@
Builder b{mod};
auto* ty = mod.Types().pointer(mod.Types().i32(), builtin::AddressSpace::kFunction,
builtin::Access::kReadWrite);
- auto* var = b.Declare(ty);
+ auto* var = b.Var(ty);
b.Access(mod.Types().i32(), var, utils::Empty);
},
"");
@@ -77,7 +77,7 @@
Builder b{mod};
auto* ty = mod.Types().pointer(mod.Types().i32(), builtin::AddressSpace::kFunction,
builtin::Access::kReadWrite);
- auto* var = b.Declare(ty);
+ auto* var = b.Var(ty);
b.Access(mod.Types().i32(), var, utils::Vector<Value*, 1>{nullptr});
},
"");
diff --git a/src/tint/ir/builder.cc b/src/tint/ir/builder.cc
index b42ee59..b1c9597 100644
--- a/src/tint/ir/builder.cc
+++ b/src/tint/ir/builder.cc
@@ -207,7 +207,7 @@
return ir.values.Create<ir::Store>(to, from);
}
-ir::Var* Builder::Declare(const type::Pointer* type) {
+ir::Var* Builder::Var(const type::Pointer* type) {
return ir.values.Create<ir::Var>(type);
}
diff --git a/src/tint/ir/builder.h b/src/tint/ir/builder.h
index 6e04bb8..57144a8 100644
--- a/src/tint/ir/builder.h
+++ b/src/tint/ir/builder.h
@@ -339,7 +339,7 @@
/// Creates a new `var` declaration
/// @param type the var type
/// @returns the instruction
- ir::Var* Declare(const type::Pointer* type);
+ ir::Var* Var(const type::Pointer* type);
/// Creates a return instruction
/// @param func the function being returned
diff --git a/src/tint/ir/from_program.cc b/src/tint/ir/from_program.cc
index ecab124..9c097c6 100644
--- a/src/tint/ir/from_program.cc
+++ b/src/tint/ir/from_program.cc
@@ -1077,7 +1077,7 @@
ref->StoreType()->Clone(clone_ctx_.type_ctx), ref->AddressSpace(),
ref->Access());
- auto* val = builder_.Declare(ty);
+ auto* val = builder_.Var(ty);
if (v->initializer) {
auto init = EmitExpression(v->initializer);
if (!init) {
diff --git a/src/tint/ir/load_test.cc b/src/tint/ir/load_test.cc
index e14671a..be53fc6 100644
--- a/src/tint/ir/load_test.cc
+++ b/src/tint/ir/load_test.cc
@@ -27,8 +27,8 @@
TEST_F(IR_LoadTest, Create) {
auto* store_type = mod.Types().i32();
- auto* var = b.Declare(mod.Types().pointer(store_type, builtin::AddressSpace::kFunction,
- builtin::Access::kReadWrite));
+ auto* var = b.Var(mod.Types().pointer(store_type, builtin::AddressSpace::kFunction,
+ builtin::Access::kReadWrite));
const auto* inst = b.Load(var);
ASSERT_TRUE(inst->Is<Load>());
@@ -42,8 +42,8 @@
TEST_F(IR_LoadTest, Usage) {
auto* store_type = mod.Types().i32();
- auto* var = b.Declare(mod.Types().pointer(store_type, builtin::AddressSpace::kFunction,
- builtin::Access::kReadWrite));
+ auto* var = b.Var(mod.Types().pointer(store_type, builtin::AddressSpace::kFunction,
+ builtin::Access::kReadWrite));
auto* inst = b.Load(var);
ASSERT_NE(inst->From(), nullptr);
@@ -57,8 +57,8 @@
Builder b{mod};
auto* store_type = mod.Types().i32();
- auto* var = b.Declare(mod.Types().pointer(store_type, builtin::AddressSpace::kFunction,
- builtin::Access::kReadWrite));
+ auto* var = b.Var(mod.Types().pointer(store_type, builtin::AddressSpace::kFunction,
+ builtin::Access::kReadWrite));
Load l(nullptr, var);
},
"");
diff --git a/src/tint/ir/store_test.cc b/src/tint/ir/store_test.cc
index a28ecad..4f25dc1 100644
--- a/src/tint/ir/store_test.cc
+++ b/src/tint/ir/store_test.cc
@@ -26,8 +26,8 @@
using IR_StoreTest = IRTestHelper;
TEST_F(IR_StoreTest, CreateStore) {
- auto* to = b.Declare(mod.Types().pointer(mod.Types().i32(), builtin::AddressSpace::kPrivate,
- builtin::Access::kReadWrite));
+ auto* to = b.Var(mod.Types().pointer(mod.Types().i32(), builtin::AddressSpace::kPrivate,
+ builtin::Access::kReadWrite));
const auto* inst = b.Store(to, b.Constant(4_i));
ASSERT_TRUE(inst->Is<Store>());
@@ -65,8 +65,8 @@
{
Module mod;
Builder b{mod};
- auto* to = b.Declare(mod.Types().pointer(
- mod.Types().i32(), builtin::AddressSpace::kPrivate, builtin::Access::kReadWrite));
+ auto* to = b.Var(mod.Types().pointer(mod.Types().i32(), builtin::AddressSpace::kPrivate,
+ builtin::Access::kReadWrite));
b.Store(to, nullptr);
},
"");
diff --git a/src/tint/ir/swizzle_test.cc b/src/tint/ir/swizzle_test.cc
index 64df5c6..bf1fb56 100644
--- a/src/tint/ir/swizzle_test.cc
+++ b/src/tint/ir/swizzle_test.cc
@@ -26,7 +26,7 @@
TEST_F(IR_SwizzleTest, SetsUsage) {
auto* ty = mod.Types().pointer(mod.Types().i32(), builtin::AddressSpace::kFunction,
builtin::Access::kReadWrite);
- auto* var = b.Declare(ty);
+ auto* var = b.Var(ty);
auto* a = b.Swizzle(mod.Types().i32(), var, utils::Vector{1u});
EXPECT_THAT(var->Usages(), testing::UnorderedElementsAre(Usage{a, 0u}));
@@ -39,7 +39,7 @@
Builder b{mod};
auto* ty = mod.Types().pointer(mod.Types().i32(), builtin::AddressSpace::kFunction,
builtin::Access::kReadWrite);
- auto* var = b.Declare(ty);
+ auto* var = b.Var(ty);
b.Swizzle(nullptr, var, utils::Vector{1u});
},
"");
@@ -62,7 +62,7 @@
Builder b{mod};
auto* ty = mod.Types().pointer(mod.Types().i32(), builtin::AddressSpace::kFunction,
builtin::Access::kReadWrite);
- auto* var = b.Declare(ty);
+ auto* var = b.Var(ty);
b.Swizzle(mod.Types().i32(), var, utils::Empty);
},
"");
@@ -75,7 +75,7 @@
Builder b{mod};
auto* ty = mod.Types().pointer(mod.Types().i32(), builtin::AddressSpace::kFunction,
builtin::Access::kReadWrite);
- auto* var = b.Declare(ty);
+ auto* var = b.Var(ty);
b.Swizzle(mod.Types().i32(), var, utils::Vector{1u, 1u, 1u, 1u, 1u});
},
"");
@@ -88,7 +88,7 @@
Builder b{mod};
auto* ty = mod.Types().pointer(mod.Types().i32(), builtin::AddressSpace::kFunction,
builtin::Access::kReadWrite);
- auto* var = b.Declare(ty);
+ auto* var = b.Var(ty);
b.Swizzle(mod.Types().i32(), var, utils::Vector{4u});
},
"");
diff --git a/src/tint/ir/transform/block_decorated_structs.cc b/src/tint/ir/transform/block_decorated_structs.cc
index f9f191c..6f0e7c3 100644
--- a/src/tint/ir/transform/block_decorated_structs.cc
+++ b/src/tint/ir/transform/block_decorated_structs.cc
@@ -93,7 +93,7 @@
// Replace the old variable declaration with one that uses the block-decorated struct type.
auto* new_var =
- builder.Declare(ir->Types().pointer(block_struct, ptr->AddressSpace(), ptr->Access()));
+ builder.Var(ir->Types().pointer(block_struct, ptr->AddressSpace(), ptr->Access()));
new_var->SetBindingPoint(var->BindingPoint()->group, var->BindingPoint()->binding);
var->ReplaceWith(new_var);
diff --git a/src/tint/ir/transform/block_decorated_structs_test.cc b/src/tint/ir/transform/block_decorated_structs_test.cc
index a308f68..597c821 100644
--- a/src/tint/ir/transform/block_decorated_structs_test.cc
+++ b/src/tint/ir/transform/block_decorated_structs_test.cc
@@ -47,8 +47,8 @@
}
TEST_F(IR_BlockDecoratedStructsTest, Scalar_Uniform) {
- auto* buffer = b.Declare(
- ty.pointer(ty.i32(), builtin::AddressSpace::kUniform, builtin::Access::kReadWrite));
+ auto* buffer =
+ b.Var(ty.pointer(ty.i32(), builtin::AddressSpace::kUniform, builtin::Access::kReadWrite));
buffer->SetBindingPoint(0, 0);
b.CreateRootBlockIfNeeded()->Append(buffer);
@@ -83,8 +83,8 @@
}
TEST_F(IR_BlockDecoratedStructsTest, Scalar_Storage) {
- auto* buffer = b.Declare(
- ty.pointer(ty.i32(), builtin::AddressSpace::kStorage, builtin::Access::kReadWrite));
+ auto* buffer =
+ b.Var(ty.pointer(ty.i32(), builtin::AddressSpace::kStorage, builtin::Access::kReadWrite));
buffer->SetBindingPoint(0, 0);
b.CreateRootBlockIfNeeded()->Append(buffer);
@@ -118,8 +118,8 @@
}
TEST_F(IR_BlockDecoratedStructsTest, RuntimeArray) {
- auto* buffer = b.Declare(ty.pointer(ty.runtime_array(ty.i32()), builtin::AddressSpace::kStorage,
- builtin::Access::kReadWrite));
+ auto* buffer = b.Var(ty.pointer(ty.runtime_array(ty.i32()), builtin::AddressSpace::kStorage,
+ builtin::Access::kReadWrite));
buffer->SetBindingPoint(0, 0);
b.CreateRootBlockIfNeeded()->Append(buffer);
@@ -165,8 +165,8 @@
4u, 4u, type::StructMemberAttributes{}));
auto* structure = ty.Get<type::Struct>(mod.symbols.New(), members, 4u, 8u, 8u);
- auto* buffer = b.Declare(
- ty.pointer(structure, builtin::AddressSpace::kStorage, builtin::Access::kReadWrite));
+ auto* buffer =
+ b.Var(ty.pointer(structure, builtin::AddressSpace::kStorage, builtin::Access::kReadWrite));
buffer->SetBindingPoint(0, 0);
b.CreateRootBlockIfNeeded()->Append(buffer);
@@ -224,13 +224,13 @@
type::StructMemberAttributes{}));
auto* structure = ty.Get<type::Struct>(mod.symbols.New(), members, 4u, 8u, 8u);
- auto* buffer = b.Declare(
- ty.pointer(structure, builtin::AddressSpace::kStorage, builtin::Access::kReadWrite));
+ auto* buffer =
+ b.Var(ty.pointer(structure, builtin::AddressSpace::kStorage, builtin::Access::kReadWrite));
buffer->SetBindingPoint(0, 0);
b.CreateRootBlockIfNeeded()->Append(buffer);
- auto* private_var = b.Declare(
- ty.pointer(structure, builtin::AddressSpace::kPrivate, builtin::Access::kReadWrite));
+ auto* private_var =
+ b.Var(ty.pointer(structure, builtin::AddressSpace::kPrivate, builtin::Access::kReadWrite));
b.CreateRootBlockIfNeeded()->Append(private_var);
auto* func = b.CreateFunction("foo", ty.void_());
@@ -269,12 +269,12 @@
}
TEST_F(IR_BlockDecoratedStructsTest, MultipleBuffers) {
- auto* buffer_a = b.Declare(
- ty.pointer(ty.i32(), builtin::AddressSpace::kStorage, builtin::Access::kReadWrite));
- auto* buffer_b = b.Declare(
- ty.pointer(ty.i32(), builtin::AddressSpace::kStorage, builtin::Access::kReadWrite));
- auto* buffer_c = b.Declare(
- ty.pointer(ty.i32(), builtin::AddressSpace::kStorage, builtin::Access::kReadWrite));
+ auto* buffer_a =
+ b.Var(ty.pointer(ty.i32(), builtin::AddressSpace::kStorage, builtin::Access::kReadWrite));
+ auto* buffer_b =
+ b.Var(ty.pointer(ty.i32(), builtin::AddressSpace::kStorage, builtin::Access::kReadWrite));
+ auto* buffer_c =
+ b.Var(ty.pointer(ty.i32(), builtin::AddressSpace::kStorage, builtin::Access::kReadWrite));
buffer_a->SetBindingPoint(0, 0);
buffer_b->SetBindingPoint(0, 1);
buffer_c->SetBindingPoint(0, 2);
diff --git a/src/tint/ir/transform/var_for_dynamic_index.cc b/src/tint/ir/transform/var_for_dynamic_index.cc
index fa063e7..d5693a6 100644
--- a/src/tint/ir/transform/var_for_dynamic_index.cc
+++ b/src/tint/ir/transform/var_for_dynamic_index.cc
@@ -143,9 +143,9 @@
// Declare a local variable and copy the source object to it.
auto* local = object_to_local.GetOrCreate(source_object, [&]() {
- auto* decl = builder.Declare(ir->Types().pointer(to_replace.dynamic_index_source_type,
- builtin::AddressSpace::kFunction,
- builtin::Access::kReadWrite));
+ auto* decl = builder.Var(ir->Types().pointer(to_replace.dynamic_index_source_type,
+ builtin::AddressSpace::kFunction,
+ builtin::Access::kReadWrite));
decl->SetInitializer(source_object);
decl->InsertBefore(access);
return decl;
diff --git a/src/tint/ir/validate_test.cc b/src/tint/ir/validate_test.cc
index fcb1997..dfd0d47 100644
--- a/src/tint/ir/validate_test.cc
+++ b/src/tint/ir/validate_test.cc
@@ -27,7 +27,7 @@
TEST_F(IR_ValidateTest, RootBlock_Var) {
mod.root_block = b.CreateRootBlockIfNeeded();
- mod.root_block->Append(b.Declare(mod.Types().pointer(
+ mod.root_block->Append(b.Var(mod.Types().pointer(
mod.Types().i32(), builtin::AddressSpace::kPrivate, builtin::Access::kReadWrite)));
auto res = ir::Validate(mod);
EXPECT_TRUE(res) << res.Failure().str();
diff --git a/src/tint/ir/var_test.cc b/src/tint/ir/var_test.cc
index 5bcb47d..831b070 100644
--- a/src/tint/ir/var_test.cc
+++ b/src/tint/ir/var_test.cc
@@ -31,7 +31,7 @@
{
Module mod;
Builder b{mod};
- b.Declare(nullptr);
+ b.Var(nullptr);
},
"");
}
@@ -39,8 +39,8 @@
TEST_F(IR_VarTest, Initializer_Usage) {
Module mod;
Builder b{mod};
- auto* var = b.Declare(
- ty.pointer(ty.f32(), builtin::AddressSpace::kFunction, builtin::Access::kReadWrite));
+ auto* var =
+ b.Var(ty.pointer(ty.f32(), builtin::AddressSpace::kFunction, builtin::Access::kReadWrite));
auto* init = b.Constant(1_f);
var->SetInitializer(init);
diff --git a/src/tint/writer/spirv/ir/generator_impl_ir_access_test.cc b/src/tint/writer/spirv/ir/generator_impl_ir_access_test.cc
index bdc0e27..a8e7868 100644
--- a/src/tint/writer/spirv/ir/generator_impl_ir_access_test.cc
+++ b/src/tint/writer/spirv/ir/generator_impl_ir_access_test.cc
@@ -54,7 +54,7 @@
}
TEST_F(SpvGeneratorImplTest_Access, Array_Pointer_ConstantIndex) {
- auto* arr_var = b.Declare(ptr(ty.array(ty.i32(), 4)));
+ auto* arr_var = b.Var(ptr(ty.array(ty.i32(), 4)));
auto* access = b.Access(ptr(ty.i32()), arr_var, utils::Vector{b.Constant(1_u)});
auto* func = b.CreateFunction("foo", ty.void_());
func->StartTarget()->SetInstructions(utils::Vector{arr_var, access, b.Return(func)});
@@ -83,8 +83,8 @@
}
TEST_F(SpvGeneratorImplTest_Access, Array_Pointer_DynamicIndex) {
- auto* arr_var = b.Declare(ptr(ty.array(ty.i32(), 4)));
- auto* idx_var = b.Declare(ptr(ty.i32()));
+ auto* arr_var = b.Var(ptr(ty.array(ty.i32(), 4)));
+ auto* idx_var = b.Var(ptr(ty.i32()));
auto* idx = b.Load(idx_var);
auto* access = b.Access(ptr(ty.i32()), arr_var, utils::Vector{idx});
auto* func = b.CreateFunction("foo", ty.void_());
@@ -143,7 +143,7 @@
}
TEST_F(SpvGeneratorImplTest_Access, Matrix_Pointer_ConstantIndex) {
- auto* mat_var = b.Declare(ptr(ty.mat2x2(ty.f32())));
+ auto* mat_var = b.Var(ptr(ty.mat2x2(ty.f32())));
auto* access_vec = b.Access(ptr(ty.vec2(ty.f32())), mat_var, utils::Vector{b.Constant(1_u)});
auto* access_el =
b.Access(ptr(ty.f32()), mat_var, utils::Vector{b.Constant(1_u), b.Constant(0_u)});
@@ -173,8 +173,8 @@
}
TEST_F(SpvGeneratorImplTest_Access, Matrix_Pointer_DynamicIndex) {
- auto* mat_var = b.Declare(ptr(ty.mat2x2(ty.f32())));
- auto* idx_var = b.Declare(ptr(ty.i32()));
+ auto* mat_var = b.Var(ptr(ty.mat2x2(ty.f32())));
+ auto* idx_var = b.Var(ptr(ty.i32()));
auto* idx = b.Load(idx_var);
auto* access_vec = b.Access(ptr(ty.vec2(ty.f32())), mat_var, utils::Vector{idx});
auto* access_el = b.Access(ptr(ty.f32()), mat_var, utils::Vector{idx, idx});
@@ -234,7 +234,7 @@
TEST_F(SpvGeneratorImplTest_Access, Vector_Value_DynamicIndex) {
auto* vec_val = b.FunctionParam(ty.vec4(ty.i32()));
- auto* idx_var = b.Declare(ptr(ty.i32()));
+ auto* idx_var = b.Var(ptr(ty.i32()));
auto* idx = b.Load(idx_var);
auto* access = b.Access(ty.i32(), vec_val, utils::Vector{idx});
auto* func = b.CreateFunction("foo", ty.void_());
@@ -262,7 +262,7 @@
}
TEST_F(SpvGeneratorImplTest_Access, Vector_Pointer_ConstantIndex) {
- auto* vec_var = b.Declare(ptr(ty.vec4(ty.i32())));
+ auto* vec_var = b.Var(ptr(ty.vec4(ty.i32())));
auto* access = b.Access(ptr(ty.i32()), vec_var, utils::Vector{b.Constant(1_u)});
auto* func = b.CreateFunction("foo", ty.void_());
func->StartTarget()->SetInstructions(utils::Vector{vec_var, access, b.Return(func)});
@@ -289,8 +289,8 @@
}
TEST_F(SpvGeneratorImplTest_Access, Vector_Pointer_DynamicIndex) {
- auto* vec_var = b.Declare(ptr(ty.vec4(ty.i32())));
- auto* idx_var = b.Declare(ptr(ty.i32()));
+ auto* vec_var = b.Var(ptr(ty.vec4(ty.i32())));
+ auto* idx_var = b.Var(ptr(ty.i32()));
auto* idx = b.Load(idx_var);
auto* access = b.Access(ptr(ty.i32()), vec_var, utils::Vector{idx});
auto* func = b.CreateFunction("foo", ty.void_());
@@ -320,7 +320,7 @@
TEST_F(SpvGeneratorImplTest_Access, NestedVector_Value_DynamicIndex) {
auto* val = b.FunctionParam(ty.array(ty.array(ty.vec4(ty.i32()), 4), 4));
- auto* idx_var = b.Declare(ptr(ty.i32()));
+ auto* idx_var = b.Var(ptr(ty.i32()));
auto* idx = b.Load(idx_var);
auto* access = b.Access(ty.i32(), val, utils::Vector{b.Constant(1_u), b.Constant(2_u), idx});
auto* func = b.CreateFunction("foo", ty.void_());
@@ -406,7 +406,7 @@
16u, type::StructMemberAttributes{}),
},
16u, 32u, 32u);
- auto* str_var = b.Declare(ptr(str));
+ auto* str_var = b.Var(ptr(str));
auto* access_vec = b.Access(ptr(ty.i32()), str_var, utils::Vector{b.Constant(1_u)});
auto* access_el =
b.Access(ptr(ty.i32()), str_var, utils::Vector{b.Constant(1_u), b.Constant(2_u)});
diff --git a/src/tint/writer/spirv/ir/generator_impl_ir_var_test.cc b/src/tint/writer/spirv/ir/generator_impl_ir_var_test.cc
index 70c1712..0a63e09 100644
--- a/src/tint/writer/spirv/ir/generator_impl_ir_var_test.cc
+++ b/src/tint/writer/spirv/ir/generator_impl_ir_var_test.cc
@@ -23,10 +23,9 @@
TEST_F(SpvGeneratorImplTest, FunctionVar_NoInit) {
auto* func = b.CreateFunction("foo", ty.void_());
- func->StartTarget()->SetInstructions(
- utils::Vector{b.Declare(ty.pointer(ty.i32(), builtin::AddressSpace::kFunction,
- builtin::Access::kReadWrite)),
- b.Return(func)});
+ func->StartTarget()->SetInstructions(utils::Vector{
+ b.Var(ty.pointer(ty.i32(), builtin::AddressSpace::kFunction, builtin::Access::kReadWrite)),
+ b.Return(func)});
ASSERT_TRUE(IRIsValid()) << Error();
@@ -47,8 +46,8 @@
TEST_F(SpvGeneratorImplTest, FunctionVar_WithInit) {
auto* func = b.CreateFunction("foo", ty.void_());
- auto* v = b.Declare(
- ty.pointer(ty.i32(), builtin::AddressSpace::kFunction, builtin::Access::kReadWrite));
+ auto* v =
+ b.Var(ty.pointer(ty.i32(), builtin::AddressSpace::kFunction, builtin::Access::kReadWrite));
v->SetInitializer(b.Constant(42_i));
func->StartTarget()->SetInstructions(utils::Vector{v, b.Return(func)});
@@ -74,8 +73,8 @@
TEST_F(SpvGeneratorImplTest, FunctionVar_Name) {
auto* func = b.CreateFunction("foo", ty.void_());
- auto* v = b.Declare(
- ty.pointer(ty.i32(), builtin::AddressSpace::kFunction, builtin::Access::kReadWrite));
+ auto* v =
+ b.Var(ty.pointer(ty.i32(), builtin::AddressSpace::kFunction, builtin::Access::kReadWrite));
func->StartTarget()->SetInstructions(utils::Vector{v, b.Return(func)});
mod.SetName(v, "myvar");
@@ -99,8 +98,8 @@
TEST_F(SpvGeneratorImplTest, FunctionVar_DeclInsideBlock) {
auto* func = b.CreateFunction("foo", ty.void_());
- auto* v = b.Declare(
- ty.pointer(ty.i32(), builtin::AddressSpace::kFunction, builtin::Access::kReadWrite));
+ auto* v =
+ b.Var(ty.pointer(ty.i32(), builtin::AddressSpace::kFunction, builtin::Access::kReadWrite));
v->SetInitializer(b.Constant(42_i));
auto* i = b.CreateIf(b.Constant(true));
@@ -141,8 +140,8 @@
auto* func = b.CreateFunction("foo", ty.void_());
auto* store_ty = ty.i32();
- auto* v = b.Declare(
- ty.pointer(store_ty, builtin::AddressSpace::kFunction, builtin::Access::kReadWrite));
+ auto* v =
+ b.Var(ty.pointer(store_ty, builtin::AddressSpace::kFunction, builtin::Access::kReadWrite));
func->StartTarget()->SetInstructions(utils::Vector{v, b.Load(v), b.Return(func)});
ASSERT_TRUE(IRIsValid()) << Error();
@@ -165,8 +164,8 @@
TEST_F(SpvGeneratorImplTest, FunctionVar_Store) {
auto* func = b.CreateFunction("foo", ty.void_());
- auto* v = b.Declare(
- ty.pointer(ty.i32(), builtin::AddressSpace::kFunction, builtin::Access::kReadWrite));
+ auto* v =
+ b.Var(ty.pointer(ty.i32(), builtin::AddressSpace::kFunction, builtin::Access::kReadWrite));
func->StartTarget()->SetInstructions(
utils::Vector{v, b.Store(v, b.Constant(42_i)), b.Return(func)});
@@ -189,8 +188,8 @@
}
TEST_F(SpvGeneratorImplTest, PrivateVar_NoInit) {
- b.CreateRootBlockIfNeeded()->SetInstructions(utils::Vector{b.Declare(
- ty.pointer(ty.i32(), builtin::AddressSpace::kPrivate, builtin::Access::kReadWrite))});
+ b.CreateRootBlockIfNeeded()->SetInstructions(utils::Vector{
+ b.Var(ty.pointer(ty.i32(), builtin::AddressSpace::kPrivate, builtin::Access::kReadWrite))});
ASSERT_TRUE(generator_.Generate()) << generator_.Diagnostics().str();
EXPECT_EQ(DumpModule(generator_.Module()), R"(OpCapability Shader
@@ -211,8 +210,8 @@
}
TEST_F(SpvGeneratorImplTest, PrivateVar_WithInit) {
- auto* v = b.Declare(
- ty.pointer(ty.i32(), builtin::AddressSpace::kPrivate, builtin::Access::kReadWrite));
+ auto* v =
+ b.Var(ty.pointer(ty.i32(), builtin::AddressSpace::kPrivate, builtin::Access::kReadWrite));
b.CreateRootBlockIfNeeded()->SetInstructions(utils::Vector{v});
v->SetInitializer(b.Constant(42_i));
@@ -236,8 +235,8 @@
}
TEST_F(SpvGeneratorImplTest, PrivateVar_Name) {
- auto* v = b.Declare(
- ty.pointer(ty.i32(), builtin::AddressSpace::kPrivate, builtin::Access::kReadWrite));
+ auto* v =
+ b.Var(ty.pointer(ty.i32(), builtin::AddressSpace::kPrivate, builtin::Access::kReadWrite));
b.CreateRootBlockIfNeeded()->SetInstructions(utils::Vector{v});
v->SetInitializer(b.Constant(42_i));
mod.SetName(v, "myvar");
@@ -267,8 +266,8 @@
mod.functions.Push(func);
auto* store_ty = ty.i32();
- auto* v = b.Declare(
- ty.pointer(store_ty, builtin::AddressSpace::kPrivate, builtin::Access::kReadWrite));
+ auto* v =
+ b.Var(ty.pointer(store_ty, builtin::AddressSpace::kPrivate, builtin::Access::kReadWrite));
b.CreateRootBlockIfNeeded()->SetInstructions(utils::Vector{v});
v->SetInitializer(b.Constant(42_i));
@@ -301,7 +300,7 @@
}
TEST_F(SpvGeneratorImplTest, WorkgroupVar) {
- b.CreateRootBlockIfNeeded()->SetInstructions(utils::Vector{b.Declare(
+ b.CreateRootBlockIfNeeded()->SetInstructions(utils::Vector{b.Var(
ty.pointer(ty.i32(), builtin::AddressSpace::kWorkgroup, builtin::Access::kReadWrite))});
ASSERT_TRUE(generator_.Generate()) << generator_.Diagnostics().str();
@@ -323,8 +322,8 @@
}
TEST_F(SpvGeneratorImplTest, WorkgroupVar_Name) {
- auto* v = b.Declare(
- ty.pointer(ty.i32(), builtin::AddressSpace::kWorkgroup, builtin::Access::kReadWrite));
+ auto* v =
+ b.Var(ty.pointer(ty.i32(), builtin::AddressSpace::kWorkgroup, builtin::Access::kReadWrite));
b.CreateRootBlockIfNeeded()->SetInstructions(utils::Vector{v});
mod.SetName(v, "myvar");
@@ -353,8 +352,8 @@
mod.functions.Push(func);
auto* store_ty = ty.i32();
- auto* v = b.Declare(
- ty.pointer(store_ty, builtin::AddressSpace::kWorkgroup, builtin::Access::kReadWrite));
+ auto* v =
+ b.Var(ty.pointer(store_ty, builtin::AddressSpace::kWorkgroup, builtin::Access::kReadWrite));
b.CreateRootBlockIfNeeded()->SetInstructions(utils::Vector{v});
auto* load = b.Load(v);
@@ -385,7 +384,7 @@
}
TEST_F(SpvGeneratorImplTest, WorkgroupVar_ZeroInitializeWithExtension) {
- b.CreateRootBlockIfNeeded()->SetInstructions(utils::Vector{b.Declare(
+ b.CreateRootBlockIfNeeded()->SetInstructions(utils::Vector{b.Var(
ty.pointer(ty.i32(), builtin::AddressSpace::kWorkgroup, builtin::Access::kReadWrite))});
// Create a generator with the zero_init_workgroup_memory flag set to `true`.
@@ -410,8 +409,8 @@
}
TEST_F(SpvGeneratorImplTest, StorageVar) {
- auto* v = b.Declare(
- ty.pointer(ty.i32(), builtin::AddressSpace::kStorage, builtin::Access::kReadWrite));
+ auto* v =
+ b.Var(ty.pointer(ty.i32(), builtin::AddressSpace::kStorage, builtin::Access::kReadWrite));
v->SetBindingPoint(0, 0);
b.CreateRootBlockIfNeeded()->SetInstructions(utils::Vector{v});
@@ -441,8 +440,8 @@
}
TEST_F(SpvGeneratorImplTest, StorageVar_Name) {
- auto* v = b.Declare(
- ty.pointer(ty.i32(), builtin::AddressSpace::kStorage, builtin::Access::kReadWrite));
+ auto* v =
+ b.Var(ty.pointer(ty.i32(), builtin::AddressSpace::kStorage, builtin::Access::kReadWrite));
v->SetBindingPoint(0, 0);
b.CreateRootBlockIfNeeded()->SetInstructions(utils::Vector{v});
mod.SetName(v, "myvar");
@@ -473,8 +472,8 @@
}
TEST_F(SpvGeneratorImplTest, StorageVar_LoadAndStore) {
- auto* v = b.Declare(
- ty.pointer(ty.i32(), builtin::AddressSpace::kStorage, builtin::Access::kReadWrite));
+ auto* v =
+ b.Var(ty.pointer(ty.i32(), builtin::AddressSpace::kStorage, builtin::Access::kReadWrite));
v->SetBindingPoint(0, 0);
b.CreateRootBlockIfNeeded()->SetInstructions(utils::Vector{v});
@@ -523,8 +522,8 @@
}
TEST_F(SpvGeneratorImplTest, UniformVar) {
- auto* v = b.Declare(
- ty.pointer(ty.i32(), builtin::AddressSpace::kUniform, builtin::Access::kReadWrite));
+ auto* v =
+ b.Var(ty.pointer(ty.i32(), builtin::AddressSpace::kUniform, builtin::Access::kReadWrite));
v->SetBindingPoint(0, 0);
b.CreateRootBlockIfNeeded()->SetInstructions(utils::Vector{v});
@@ -554,8 +553,8 @@
}
TEST_F(SpvGeneratorImplTest, UniformVar_Name) {
- auto* v = b.Declare(
- ty.pointer(ty.i32(), builtin::AddressSpace::kUniform, builtin::Access::kReadWrite));
+ auto* v =
+ b.Var(ty.pointer(ty.i32(), builtin::AddressSpace::kUniform, builtin::Access::kReadWrite));
v->SetBindingPoint(0, 0);
b.CreateRootBlockIfNeeded()->SetInstructions(utils::Vector{v});
mod.SetName(v, "myvar");
@@ -586,8 +585,8 @@
}
TEST_F(SpvGeneratorImplTest, UniformVar_Load) {
- auto* v = b.Declare(
- ty.pointer(ty.i32(), builtin::AddressSpace::kUniform, builtin::Access::kReadWrite));
+ auto* v =
+ b.Var(ty.pointer(ty.i32(), builtin::AddressSpace::kUniform, builtin::Access::kReadWrite));
v->SetBindingPoint(0, 0);
b.CreateRootBlockIfNeeded()->SetInstructions(utils::Vector{v});
