Remove AST transforms from WGSL generation.
This CL removes the use of the AST transforms in the WGSL generation.
The transforms will eventually be moved into the respective backends as
IR transforms, the WGSL backend does not use the IR as it's just dumping
out the AST. So, remove the transform usage.
Bug: 380043961
Change-Id: Ifc8f78eda4c114861692c585c9add2ca434716d7
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/218295
Commit-Queue: James Price <jrprice@google.com>
Reviewed-by: James Price <jrprice@google.com>
diff --git a/src/tint/cmd/tint/main.cc b/src/tint/cmd/tint/main.cc
index 54d7a26..5eeb7e5 100644
--- a/src/tint/cmd/tint/main.cc
+++ b/src/tint/cmd/tint/main.cc
@@ -135,6 +135,7 @@
tint::Hashmap<std::string, double, 8> overrides;
std::string ep_name;
+ bool emit_single_entry_point = false;
Format format = Format::kUnknown;
@@ -145,7 +146,6 @@
bool validate = false;
bool print_hash = false;
bool dump_inspector_bindings = false;
- bool emit_single_entry_point = false;
bool rename_all = false;
bool enable_robustness = true;
@@ -679,7 +679,11 @@
tint::ast::transform::Manager transform_manager;
tint::ast::transform::DataMap transform_inputs;
- // Renaming must always come first
+ if (options.emit_single_entry_point) {
+ transform_manager.append(std::make_unique<tint::ast::transform::SingleEntryPoint>());
+ transform_inputs.Add<tint::ast::transform::SingleEntryPoint::Config>(options.ep_name);
+ }
+
AddRenamer(options, transform_manager, transform_inputs);
auto res = CreateOverrideMap(options, inspector);
@@ -688,11 +692,6 @@
}
AddSubstituteOverrides(res.Get(), transform_manager, transform_inputs);
- if (options.emit_single_entry_point) {
- transform_manager.append(std::make_unique<tint::ast::transform::SingleEntryPoint>());
- transform_inputs.Add<tint::ast::transform::SingleEntryPoint::Config>(options.ep_name);
- }
-
tint::ast::transform::DataMap outputs;
return transform_manager.Run(program, std::move(transform_inputs), outputs);
}
@@ -746,7 +745,6 @@
[[maybe_unused]] tint::inspector::Inspector& inspector,
[[maybe_unused]] tint::Program& src_program) {
#if TINT_BUILD_SPV_WRITER
-
auto res = ProcessASTTransforms(options, inspector, src_program);
if (res != tint::Success || !res->IsValid()) {
tint::cmd::PrintWGSL(std::cerr, res.Get());
@@ -813,23 +811,15 @@
/// Generate WGSL code for a program.
/// @param options the options that Tint was invoked with
/// @param inspector the inspector
-/// @param src_program the program to generate
+/// @param program the program to generate
/// @returns true on success
bool GenerateWgsl([[maybe_unused]] Options& options,
[[maybe_unused]] tint::inspector::Inspector& inspector,
- [[maybe_unused]] tint::Program& src_program) {
+ [[maybe_unused]] tint::Program& program) {
#if TINT_BUILD_WGSL_WRITER
-
- auto res = ProcessASTTransforms(options, inspector, src_program);
- if (res != tint::Success || !res->IsValid()) {
- tint::cmd::PrintWGSL(std::cerr, res.Get());
- std::cerr << res->Diagnostics() << "\n";
- return 1;
- }
-
// TODO(jrprice): Provide a way for the user to set non-default options.
tint::wgsl::writer::Options gen_options;
- auto result = tint::wgsl::writer::Generate(res.Get(), gen_options);
+ auto result = tint::wgsl::writer::Generate(program, gen_options);
if (result != tint::Success) {
std::cerr << "Failed to generate: " << result.Failure() << "\n";
return false;
@@ -875,7 +865,6 @@
[[maybe_unused]] tint::inspector::Inspector& inspector,
[[maybe_unused]] tint::Program& src_program) {
#if TINT_BUILD_MSL_WRITER
-
auto transform_res = ProcessASTTransforms(options, inspector, src_program);
if (transform_res != tint::Success || !transform_res->IsValid()) {
tint::cmd::PrintWGSL(std::cerr, transform_res.Get());
@@ -965,7 +954,7 @@
const char* default_xcrun_exe = "metal.exe";
#else
const char* default_xcrun_exe = "xcrun";
-#endif
+#endif // _WIN32
auto xcrun = tint::Command::LookPath(
options.xcrun_path.empty() ? default_xcrun_exe : std::string(options.xcrun_path));
if (xcrun.Found()) {
@@ -1131,7 +1120,6 @@
[[maybe_unused]] tint::inspector::Inspector& src_inspector,
[[maybe_unused]] tint::Program& src_program) {
#if TINT_BUILD_GLSL_WRITER
-
auto res = ProcessASTTransforms(options, src_inspector, src_program);
if (res != tint::Success || !res->IsValid()) {
tint::cmd::PrintWGSL(std::cerr, res.Get());
@@ -1216,7 +1204,7 @@
return false;
}
}
-#endif
+#endif // !TINT_BUILD_GLSL_VALIDATOR
}
return true;
};
@@ -1343,6 +1331,11 @@
if (options.dump_inspector_bindings) {
tint::cmd::PrintInspectorBindings(inspector);
}
+ // Handle WGSL special as we want multiple shaders in a single file, unlike other formats where
+ // we run single entry point.
+ if (options.format == Format::kWgsl) {
+ return GenerateWgsl(options, inspector, info.program) ? 0 : 1;
+ }
bool success = false;
switch (options.format) {
@@ -1350,9 +1343,6 @@
case Format::kSpvAsm:
success = GenerateSpirv(options, inspector, info.program);
break;
- case Format::kWgsl:
- success = GenerateWgsl(options, inspector, info.program);
- break;
case Format::kMsl:
success = GenerateMsl(options, inspector, info.program);
break;
@@ -1363,6 +1353,8 @@
case Format::kGlsl:
success = GenerateGlsl(options, inspector, info.program);
break;
+ case Format::kWgsl:
+ TINT_UNREACHABLE();
case Format::kNone:
break;
default:
diff --git a/test/tint/bug/chromium/1236161.wgsl.expected.wgsl b/test/tint/bug/chromium/1236161.wgsl.expected.wgsl
index ec28ed3..bfc8f28 100644
--- a/test/tint/bug/chromium/1236161.wgsl.expected.wgsl
+++ b/test/tint/bug/chromium/1236161.wgsl.expected.wgsl
@@ -1,3 +1,3 @@
-fn tint_symbol() {
- let tint_symbol_1 = modf(1.0).whole;
+fn i() {
+ let s = modf(1.0).whole;
}
diff --git a/test/tint/bug/tint/1660.wgsl.expected.wgsl b/test/tint/bug/tint/1660.wgsl.expected.wgsl
index f996d52..5fa2f54 100644
--- a/test/tint/bug/tint/1660.wgsl.expected.wgsl
+++ b/test/tint/bug/tint/1660.wgsl.expected.wgsl
@@ -1,3 +1,3 @@
-const size = 2;
+override size = 2;
var<workgroup> a : array<f32, size>;
diff --git a/test/tint/bug/tint/1697.wgsl.expected.wgsl b/test/tint/bug/tint/1697.wgsl.expected.wgsl
index 93b0004..a319398 100644
--- a/test/tint/bug/tint/1697.wgsl.expected.wgsl
+++ b/test/tint/bug/tint/1697.wgsl.expected.wgsl
@@ -1,12 +1,6 @@
-SKIP: FAILED
-
-<dawn>/test/tint/bug/tint/1697.wgsl:5:11 error: missing initializer for 'var' declaration
- var v = __tint_materialize(vec2(0))[i32(((__tint_materialize(vec2(smaller_than_any_f32))[O] * 1000000000000000013287555072.0) * 1000000000000000013287555072.0))];
- ^
-
-const O = 0;
+override O = 0;
fn f() {
const smaller_than_any_f32 = 1e-50;
- var v = __tint_materialize(vec2(0))[i32(((__tint_materialize(vec2(smaller_than_any_f32))[O] * 1000000000000000013287555072.0) * 1000000000000000013287555072.0))];
+ var v = vec2(0)[i32(((vec2(smaller_than_any_f32)[O] * 1000000000000000013287555072.0) * 1000000000000000013287555072.0))];
}
diff --git a/test/tint/bug/tint/1725.wgsl.expected.wgsl b/test/tint/bug/tint/1725.wgsl.expected.wgsl
index b20dd47..3af3348 100644
--- a/test/tint/bug/tint/1725.wgsl.expected.wgsl
+++ b/test/tint/bug/tint/1725.wgsl.expected.wgsl
@@ -1,9 +1,9 @@
-@group(0) @binding(0) var<storage> tint_symbol : array<u32>;
+@group(0) @binding(0) var<storage> data : array<u32>;
@compute @workgroup_size(1)
-fn tint_symbol_1(@builtin(local_invocation_index) tint_symbol_2 : u32) {
- let tint_symbol_3 = 0;
- let tint_symbol_4 = 0;
- let tint_symbol_5 = 0;
- let tint_symbol_6 = tint_symbol[tint_symbol_2];
+fn main(@builtin(local_invocation_index) local_invocation_index : u32) {
+ let min = 0;
+ let max = 0;
+ let arrayLength = 0;
+ let x = data[local_invocation_index];
}
diff --git a/test/tint/bug/tint/1737.wgsl.expected.wgsl b/test/tint/bug/tint/1737.wgsl.expected.wgsl
index ff19d2a..d251513 100644
--- a/test/tint/bug/tint/1737.wgsl.expected.wgsl
+++ b/test/tint/bug/tint/1737.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const wgsize : u32 = 10u;
+override wgsize : u32;
var<workgroup> a : array<f32, wgsize>;
diff --git a/test/tint/bug/tint/1764.wgsl.expected.wgsl b/test/tint/bug/tint/1764.wgsl.expected.wgsl
index e8d12e9..36e8540 100644
--- a/test/tint/bug/tint/1764.wgsl.expected.wgsl
+++ b/test/tint/bug/tint/1764.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const O = 123;
+override O = 123;
alias A = array<i32, (O * 2)>;
diff --git a/test/tint/bug/tint/2175.wgsl.expected.wgsl b/test/tint/bug/tint/2175.wgsl.expected.wgsl
index d043338..7832501 100644
--- a/test/tint/bug/tint/2175.wgsl.expected.wgsl
+++ b/test/tint/bug/tint/2175.wgsl.expected.wgsl
@@ -1,10 +1,10 @@
-const tint_symbol = vec4();
+const v = vec4();
-const tint_symbol_1 = (tint_symbol.x * 2u);
+const x = (v.x * 2u);
-@group(0) @binding(0) var<storage, read_write> tint_symbol_2 : u32;
+@group(0) @binding(0) var<storage, read_write> output : u32;
@compute @workgroup_size(1)
-fn tint_symbol_3() {
- tint_symbol_2 = tint_symbol_1;
+fn main() {
+ output = x;
}
diff --git a/test/tint/builtins/workgroupUniformLoad/array_overridable_count.wgsl.expected.wgsl b/test/tint/builtins/workgroupUniformLoad/array_overridable_count.wgsl.expected.wgsl
index 3afe732..e8616b9 100644
--- a/test/tint/builtins/workgroupUniformLoad/array_overridable_count.wgsl.expected.wgsl
+++ b/test/tint/builtins/workgroupUniformLoad/array_overridable_count.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const wgsize : i32 = 64i;
+override wgsize : i32;
var<workgroup> v : array<i32, (wgsize * 2)>;
diff --git a/test/tint/builtins/workgroupUniformLoad/array_overridable_count_aliased.wgsl.expected.wgsl b/test/tint/builtins/workgroupUniformLoad/array_overridable_count_aliased.wgsl.expected.wgsl
index e4ff0d4..24ffd9c 100644
--- a/test/tint/builtins/workgroupUniformLoad/array_overridable_count_aliased.wgsl.expected.wgsl
+++ b/test/tint/builtins/workgroupUniformLoad/array_overridable_count_aliased.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const wgsize : i32 = 64i;
+override wgsize : i32;
alias Array = array<i32, (wgsize * 2)>;
diff --git a/test/tint/shadowing/short_names/renamer/function.wgsl.expected.wgsl b/test/tint/shadowing/short_names/renamer/function.wgsl.expected.wgsl
index 41ee0e7..38d1571 100644
--- a/test/tint/shadowing/short_names/renamer/function.wgsl.expected.wgsl
+++ b/test/tint/shadowing/short_names/renamer/function.wgsl.expected.wgsl
@@ -1,16 +1,16 @@
-fn tint_symbol() -> i32 {
+fn vec4f() -> i32 {
return 0;
}
-fn tint_symbol_1(tint_symbol_2 : i32) -> f32 {
- return f32(tint_symbol_2);
+fn vec2f(i : i32) -> f32 {
+ return f32(i);
}
-fn tint_symbol_3(tint_symbol_4 : f32) -> bool {
- return bool(tint_symbol_4);
+fn vec2i(f : f32) -> bool {
+ return bool(f);
}
@vertex
-fn tint_symbol_5(@builtin(vertex_index) tint_symbol_6 : u32) -> @builtin(position) vec4<f32> {
- return select(vec4<f32>(), vec4<f32>(1), tint_symbol_3(tint_symbol_1(tint_symbol())));
+fn main(@builtin(vertex_index) VertexIndex : u32) -> @builtin(position) vec4<f32> {
+ return select(vec4<f32>(), vec4<f32>(1), vec2i(vec2f(vec4f())));
}
diff --git a/test/tint/shadowing/short_names/renamer/renamer.wgsl.expected.wgsl b/test/tint/shadowing/short_names/renamer/renamer.wgsl.expected.wgsl
index 0369839..c78b01b 100644
--- a/test/tint/shadowing/short_names/renamer/renamer.wgsl.expected.wgsl
+++ b/test/tint/shadowing/short_names/renamer/renamer.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
@vertex
-fn tint_symbol(@builtin(vertex_index) tint_symbol_1 : u32) -> @builtin(position) vec4f {
+fn main(@builtin(vertex_index) VertexIndex : u32) -> @builtin(position) vec4f {
return vec4f(vec2f(vec2i()), 0.0, 1.0);
}
diff --git a/test/tint/shadowing/short_names/renamer/type.wgsl.expected.wgsl b/test/tint/shadowing/short_names/renamer/type.wgsl.expected.wgsl
index b07672f..4282037 100644
--- a/test/tint/shadowing/short_names/renamer/type.wgsl.expected.wgsl
+++ b/test/tint/shadowing/short_names/renamer/type.wgsl.expected.wgsl
@@ -1,15 +1,15 @@
-struct tint_symbol {
- tint_symbol_1 : i32,
+struct vec4f {
+ i : i32,
}
-alias tint_symbol_2 = f32;
+alias vec2f = f32;
-alias tint_symbol_3 = bool;
+alias vec2i = bool;
@vertex
-fn tint_symbol_4(@builtin(vertex_index) tint_symbol_5 : u32) -> @builtin(position) vec4<f32> {
- let tint_symbol_6 = tint_symbol(1);
- let tint_symbol_7 : f32 = tint_symbol_2(tint_symbol_6.tint_symbol_1);
- let tint_symbol_8 : bool = tint_symbol_3(tint_symbol_7);
- return select(vec4<f32>(), vec4<f32>(1), tint_symbol_8);
+fn main(@builtin(vertex_index) VertexIndex : u32) -> @builtin(position) vec4<f32> {
+ let s = vec4f(1);
+ let f : f32 = vec2f(s.i);
+ let b : bool = vec2i(f);
+ return select(vec4<f32>(), vec4<f32>(1), b);
}
diff --git a/test/tint/types/functions/shader_io/compute_workgroup_expression.wgsl.expected.wgsl b/test/tint/types/functions/shader_io/compute_workgroup_expression.wgsl.expected.wgsl
index 1bd5a15..c2b260b 100644
--- a/test/tint/types/functions/shader_io/compute_workgroup_expression.wgsl.expected.wgsl
+++ b/test/tint/types/functions/shader_io/compute_workgroup_expression.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const x_dim = 2;
+@id(0) override x_dim = 2;
@compute @workgroup_size((1 + 2), x_dim, clamp(((1 - 2) + 4), 0, 5))
fn main() {
diff --git a/test/tint/var/override/named/no_init/bool.wgsl.expected.wgsl b/test/tint/var/override/named/no_init/bool.wgsl.expected.wgsl
index 5321598..98dbd50 100644
--- a/test/tint/var/override/named/no_init/bool.wgsl.expected.wgsl
+++ b/test/tint/var/override/named/no_init/bool.wgsl.expected.wgsl
@@ -1,6 +1,6 @@
-const o : bool = false;
+override o : bool;
-const j : bool = true;
+override j : bool;
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/named/no_init/f32.wgsl.expected.wgsl b/test/tint/var/override/named/no_init/f32.wgsl.expected.wgsl
index 362776f..16daf8c 100644
--- a/test/tint/var/override/named/no_init/f32.wgsl.expected.wgsl
+++ b/test/tint/var/override/named/no_init/f32.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const o : f32 = 0.0f;
+override o : f32;
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/named/no_init/i32.wgsl.expected.wgsl b/test/tint/var/override/named/no_init/i32.wgsl.expected.wgsl
index 88b26b3..dd3b050 100644
--- a/test/tint/var/override/named/no_init/i32.wgsl.expected.wgsl
+++ b/test/tint/var/override/named/no_init/i32.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const o : i32 = 0i;
+override o : i32;
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/named/no_init/u32.wgsl.expected.wgsl b/test/tint/var/override/named/no_init/u32.wgsl.expected.wgsl
index b7ac534..35981fe 100644
--- a/test/tint/var/override/named/no_init/u32.wgsl.expected.wgsl
+++ b/test/tint/var/override/named/no_init/u32.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const o : u32 = 0u;
+override o : u32;
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/named/val_init/bool.wgsl.expected.wgsl b/test/tint/var/override/named/val_init/bool.wgsl.expected.wgsl
index c6e8c19..be7438e 100644
--- a/test/tint/var/override/named/val_init/bool.wgsl.expected.wgsl
+++ b/test/tint/var/override/named/val_init/bool.wgsl.expected.wgsl
@@ -1,6 +1,6 @@
-const o : bool = false;
+override o : bool = true;
-const j : bool = true;
+override j : bool = false;
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/named/val_init/f32.wgsl.expected.wgsl b/test/tint/var/override/named/val_init/f32.wgsl.expected.wgsl
index 8017194..af413a9 100644
--- a/test/tint/var/override/named/val_init/f32.wgsl.expected.wgsl
+++ b/test/tint/var/override/named/val_init/f32.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const o : f32 = 0.0f;
+override o : f32 = 1.0;
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/named/val_init/i32.wgsl.expected.wgsl b/test/tint/var/override/named/val_init/i32.wgsl.expected.wgsl
index 6675efc..d9646bd 100644
--- a/test/tint/var/override/named/val_init/i32.wgsl.expected.wgsl
+++ b/test/tint/var/override/named/val_init/i32.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const o : i32 = 0i;
+override o : i32 = 1;
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/named/val_init/u32.wgsl.expected.wgsl b/test/tint/var/override/named/val_init/u32.wgsl.expected.wgsl
index 020319a..46639da 100644
--- a/test/tint/var/override/named/val_init/u32.wgsl.expected.wgsl
+++ b/test/tint/var/override/named/val_init/u32.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const o : u32 = 0u;
+override o : u32 = 1u;
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/named/zero_init/bool.wgsl.expected.wgsl b/test/tint/var/override/named/zero_init/bool.wgsl.expected.wgsl
index c6e8c19..04a58e7 100644
--- a/test/tint/var/override/named/zero_init/bool.wgsl.expected.wgsl
+++ b/test/tint/var/override/named/zero_init/bool.wgsl.expected.wgsl
@@ -1,6 +1,6 @@
-const o : bool = false;
+override o : bool = bool();
-const j : bool = true;
+override j : bool = bool();
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/named/zero_init/f32.wgsl.expected.wgsl b/test/tint/var/override/named/zero_init/f32.wgsl.expected.wgsl
index 8017194..4cf0ca2 100644
--- a/test/tint/var/override/named/zero_init/f32.wgsl.expected.wgsl
+++ b/test/tint/var/override/named/zero_init/f32.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const o : f32 = 0.0f;
+override o : f32 = f32();
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/named/zero_init/i32.wgsl.expected.wgsl b/test/tint/var/override/named/zero_init/i32.wgsl.expected.wgsl
index 6675efc..0a959ba 100644
--- a/test/tint/var/override/named/zero_init/i32.wgsl.expected.wgsl
+++ b/test/tint/var/override/named/zero_init/i32.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const o : i32 = 0i;
+override o : i32 = i32();
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/named/zero_init/u32.wgsl.expected.wgsl b/test/tint/var/override/named/zero_init/u32.wgsl.expected.wgsl
index 020319a..4527095 100644
--- a/test/tint/var/override/named/zero_init/u32.wgsl.expected.wgsl
+++ b/test/tint/var/override/named/zero_init/u32.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const o : u32 = 0u;
+override o : u32 = u32();
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/numbered/no_init/bool.wgsl.expected.wgsl b/test/tint/var/override/numbered/no_init/bool.wgsl.expected.wgsl
index f662a7e..51c213c 100644
--- a/test/tint/var/override/numbered/no_init/bool.wgsl.expected.wgsl
+++ b/test/tint/var/override/numbered/no_init/bool.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const o : bool = false;
+@id(1234) override o : bool;
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/numbered/no_init/f32.wgsl.expected.wgsl b/test/tint/var/override/numbered/no_init/f32.wgsl.expected.wgsl
index 8017194..5b3ae94 100644
--- a/test/tint/var/override/numbered/no_init/f32.wgsl.expected.wgsl
+++ b/test/tint/var/override/numbered/no_init/f32.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const o : f32 = 0.0f;
+@id(1234) override o : f32;
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/numbered/no_init/i32.wgsl.expected.wgsl b/test/tint/var/override/numbered/no_init/i32.wgsl.expected.wgsl
index 04d8f90..220b822 100644
--- a/test/tint/var/override/numbered/no_init/i32.wgsl.expected.wgsl
+++ b/test/tint/var/override/numbered/no_init/i32.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const o : i32 = 0i;
+@id(1234) override o : i32;
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/numbered/no_init/u32.wgsl.expected.wgsl b/test/tint/var/override/numbered/no_init/u32.wgsl.expected.wgsl
index b7ac534..b1dfa6c 100644
--- a/test/tint/var/override/numbered/no_init/u32.wgsl.expected.wgsl
+++ b/test/tint/var/override/numbered/no_init/u32.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const o : u32 = 0u;
+@id(1234) override o : u32;
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/numbered/val_init/bool.wgsl.expected.wgsl b/test/tint/var/override/numbered/val_init/bool.wgsl.expected.wgsl
index f662a7e..bf3df76 100644
--- a/test/tint/var/override/numbered/val_init/bool.wgsl.expected.wgsl
+++ b/test/tint/var/override/numbered/val_init/bool.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const o : bool = false;
+@id(1234) override o : bool = true;
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/numbered/val_init/f32.wgsl.expected.wgsl b/test/tint/var/override/numbered/val_init/f32.wgsl.expected.wgsl
index c97a28d..484a3c0 100644
--- a/test/tint/var/override/numbered/val_init/f32.wgsl.expected.wgsl
+++ b/test/tint/var/override/numbered/val_init/f32.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const o : f32 = 0.0f;
+@id(1234) override o : f32 = 1.0;
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/numbered/val_init/i32.wgsl.expected.wgsl b/test/tint/var/override/numbered/val_init/i32.wgsl.expected.wgsl
index 88b26b3..5f7b71b 100644
--- a/test/tint/var/override/numbered/val_init/i32.wgsl.expected.wgsl
+++ b/test/tint/var/override/numbered/val_init/i32.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const o : i32 = 0i;
+@id(1234) override o : i32 = 1;
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/numbered/val_init/u32.wgsl.expected.wgsl b/test/tint/var/override/numbered/val_init/u32.wgsl.expected.wgsl
index b7ac534..54ea244 100644
--- a/test/tint/var/override/numbered/val_init/u32.wgsl.expected.wgsl
+++ b/test/tint/var/override/numbered/val_init/u32.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const o : u32 = 0u;
+@id(1234) override o : u32 = 1u;
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/numbered/zero_init/bool.wgsl.expected.wgsl b/test/tint/var/override/numbered/zero_init/bool.wgsl.expected.wgsl
index f662a7e..fce28f6 100644
--- a/test/tint/var/override/numbered/zero_init/bool.wgsl.expected.wgsl
+++ b/test/tint/var/override/numbered/zero_init/bool.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const o : bool = false;
+@id(1234) override o : bool = bool();
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/numbered/zero_init/f32.wgsl.expected.wgsl b/test/tint/var/override/numbered/zero_init/f32.wgsl.expected.wgsl
index 8017194..497a4f9 100644
--- a/test/tint/var/override/numbered/zero_init/f32.wgsl.expected.wgsl
+++ b/test/tint/var/override/numbered/zero_init/f32.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const o : f32 = 0.0f;
+@id(1234) override o : f32 = f32();
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/numbered/zero_init/i32.wgsl.expected.wgsl b/test/tint/var/override/numbered/zero_init/i32.wgsl.expected.wgsl
index 88b26b3..a462f8e1 100644
--- a/test/tint/var/override/numbered/zero_init/i32.wgsl.expected.wgsl
+++ b/test/tint/var/override/numbered/zero_init/i32.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const o : i32 = 0i;
+@id(1234) override o : i32 = i32();
@compute @workgroup_size(1)
fn main() {
diff --git a/test/tint/var/override/numbered/zero_init/u32.wgsl.expected.wgsl b/test/tint/var/override/numbered/zero_init/u32.wgsl.expected.wgsl
index b7ac534..a095df5 100644
--- a/test/tint/var/override/numbered/zero_init/u32.wgsl.expected.wgsl
+++ b/test/tint/var/override/numbered/zero_init/u32.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-const o : u32 = 0u;
+@id(1234) override o : u32 = u32();
@compute @workgroup_size(1)
fn main() {
