tint/writer/wgsl: Print @offset attributes as comment

We use WGSL to visualize the AST. Make sure we don't hide anything. Bug: tint:1776 Change-Id: Iedd7ca797fb745d9db7d0aba8a5718039241afbb Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/112602 Reviewed-by: Dan Sinclair <dsinclair@chromium.org> Commit-Queue: Ben Clayton <bclayton@google.com> Kokoro: Ben Clayton <bclayton@google.com> Auto-Submit: Ben Clayton <bclayton@google.com>
2022-12-01 17:37:56 +00:00 · 2022-12-01 17:37:56 +00:00 · efb17b0254
parent f745e4e2bf
commit efb17b0254
74 changed files with 240 additions and 1 deletions
--- a/src/tint/reader/spirv/function_memory_test.cc
+++ b/src/tint/reader/spirv/function_memory_test.cc
@ -953,7 +953,9 @@ TEST_F(SpvParserMemoryTest, RemapStorageBuffer_TypesAndVarDeclarations) {
    EXPECT_THAT(module_str, HasSubstr(R"(type RTArr = @stride(4) array<u32>;

 struct S {
+  /* @offset(0) */
  field0 : u32,
+  /* @offset(4) */
  field1 : RTArr,
 }

--- a/src/tint/reader/spirv/parser_impl_module_var_test.cc
+++ b/src/tint/reader/spirv/parser_impl_module_var_test.cc
@ -1254,8 +1254,11 @@ TEST_F(SpvModuleScopeVarParserTest, StructMember_NonReadableDecoration_Dropped)
    EXPECT_THAT(module_str, HasSubstr(R"(type Arr = @stride(4) array<u32, 2u>;

 struct S {
+  /* @offset(0) */
  field0 : u32,
+  /* @offset(4) */
  field1 : f32,
+  /* @offset(8) */
  field2 : Arr,
 }

@ -1286,6 +1289,7 @@ TEST_F(SpvModuleScopeVarParserTest, ColMajorDecoration_Dropped) {
    EXPECT_TRUE(p->error().empty());
    const auto module_str = test::ToString(p->program());
    EXPECT_THAT(module_str, HasSubstr(R"(struct S {
+  /* @offset(0) */
  field0 : mat3x2<f32>,
 }

@ -1316,6 +1320,7 @@ TEST_F(SpvModuleScopeVarParserTest, MatrixStrideDecoration_Natural_Dropped) {
    EXPECT_TRUE(p->error().empty());
    const auto module_str = test::ToString(p->program());
    EXPECT_THAT(module_str, HasSubstr(R"(struct S {
+  /* @offset(0) */
  field0 : mat3x2<f32>,
 }

@ -1346,6 +1351,7 @@ TEST_F(SpvModuleScopeVarParserTest, MatrixStrideDecoration) {
    EXPECT_TRUE(p->error().empty());
    const auto module_str = test::ToString(p->program());
    EXPECT_THAT(module_str, HasSubstr(R"(struct S {
+  /* @offset(0) */
  @stride(64) @internal(disable_validation__ignore_stride)
  field0 : mat3x2<f32>,
 }
@ -1399,7 +1405,9 @@ TEST_F(SpvModuleScopeVarParserTest, StorageBuffer_NonWritable_AllMembers) {
    EXPECT_TRUE(p->error().empty());
    const auto module_str = test::ToString(p->program());
    EXPECT_THAT(module_str, HasSubstr(R"(struct S {
+  /* @offset(0) */
  field0 : f32,
+  /* @offset(4) */
  field1 : f32,
 }

@ -1428,7 +1436,9 @@ TEST_F(SpvModuleScopeVarParserTest, StorageBuffer_NonWritable_NotAllMembers) {
    EXPECT_TRUE(p->error().empty());
    const auto module_str = test::ToString(p->program());
    EXPECT_THAT(module_str, HasSubstr(R"(struct S {
+  /* @offset(0) */
  field0 : f32,
+  /* @offset(4) */
  field1 : f32,
 }

@ -1459,7 +1469,9 @@ TEST_F(SpvModuleScopeVarParserTest,
    EXPECT_TRUE(p->error().empty());
    const auto module_str = test::ToString(p->program());
    EXPECT_THAT(module_str, HasSubstr(R"(struct S {
+  /* @offset(0) */
  field0 : f32,
+  /* @offset(4) */
  field1 : f32,
 }

--- a/src/tint/transform/decompose_strided_matrix_test.cc
+++ b/src/tint/transform/decompose_strided_matrix_test.cc
@ -90,6 +90,7 @@ TEST_F(DecomposeStridedMatrixTest, ReadUniformMatrix) {
 struct S {
  @size(16)
  padding : u32,
+  /* @offset(16) */
  m : @stride(32) array<vec2<f32>, 2u>,
 }

@ -147,6 +148,7 @@ TEST_F(DecomposeStridedMatrixTest, ReadUniformColumn) {
 struct S {
  @size(16)
  padding : u32,
+  /* @offset(16) */
  m : @stride(32) array<vec2<f32>, 2u>,
 }

@ -199,6 +201,7 @@ TEST_F(DecomposeStridedMatrixTest, ReadUniformMatrix_DefaultStride) {
 struct S {
  @size(16)
  padding : u32,
+  /* @offset(16u) */
  @stride(8) @internal(disable_validation__ignore_stride)
  m : mat2x2<f32>,
 }
@ -253,6 +256,7 @@ TEST_F(DecomposeStridedMatrixTest, ReadStorageMatrix) {
 struct S {
  @size(8)
  padding : u32,
+  /* @offset(8) */
  m : @stride(32) array<vec2<f32>, 2u>,
 }

@ -311,6 +315,7 @@ TEST_F(DecomposeStridedMatrixTest, ReadStorageColumn) {
 struct S {
  @size(16)
  padding : u32,
+  /* @offset(16) */
  m : @stride(32) array<vec2<f32>, 2u>,
 }

@ -365,6 +370,7 @@ TEST_F(DecomposeStridedMatrixTest, WriteStorageMatrix) {
 struct S {
  @size(8)
  padding : u32,
+  /* @offset(8) */
  m : @stride(32) array<vec2<f32>, 2u>,
 }

@ -422,6 +428,7 @@ TEST_F(DecomposeStridedMatrixTest, WriteStorageColumn) {
 struct S {
  @size(8)
  padding : u32,
+  /* @offset(8) */
  m : @stride(32) array<vec2<f32>, 2u>,
 }

@ -487,6 +494,7 @@ TEST_F(DecomposeStridedMatrixTest, ReadWriteViaPointerLets) {
 struct S {
  @size(8)
  padding : u32,
+  /* @offset(8) */
  m : @stride(32) array<vec2<f32>, 2u>,
 }

@ -551,6 +559,7 @@ TEST_F(DecomposeStridedMatrixTest, ReadPrivateMatrix) {
 struct S {
  @size(8)
  padding : u32,
+  /* @offset(8u) */
  @stride(32) @internal(disable_validation__ignore_stride)
  m : mat2x2<f32>,
 }
@ -605,6 +614,7 @@ TEST_F(DecomposeStridedMatrixTest, WritePrivateMatrix) {
 struct S {
  @size(8)
  padding : u32,
+  /* @offset(8u) */
  @stride(32) @internal(disable_validation__ignore_stride)
  m : mat2x2<f32>,
 }
--- a/src/tint/writer/wgsl/generator_impl.cc
+++ b/src/tint/writer/wgsl/generator_impl.cc
@ -623,7 +623,14 @@ bool GeneratorImpl::EmitStructType(const ast::Struct* str) {
        utils::Vector<const ast::Attribute*, 4> attributes_sanitized;
        attributes_sanitized.Reserve(mem->attributes.Length());
        for (auto* attr : mem->attributes) {
-            if (!attr->Is<ast::StructMemberOffsetAttribute>()) {
+            if (attr->Is<ast::StructMemberOffsetAttribute>()) {
+                auto l = line();
+                l << "/* ";
+                if (!EmitAttributes(l, utils::Vector{attr})) {
+                    return false;
+                }
+                l << " */";
+            } else {
                attributes_sanitized.Push(attr);
            }
        }
@ -792,6 +799,14 @@ bool GeneratorImpl::EmitAttributes(std::ostream& out,
                out << ")";
                return true;
            },
+            [&](const ast::StructMemberOffsetAttribute* offset) {
+                out << "offset(";
+                if (!EmitExpression(out, offset->expr)) {
+                    return false;
+                }
+                out << ")";
+                return true;
+            },
            [&](const ast::StructMemberSizeAttribute* size) {
                out << "size(";
                if (!EmitExpression(out, size->expr)) {
--- a/src/tint/writer/wgsl/generator_impl_type_test.cc
+++ b/src/tint/writer/wgsl/generator_impl_type_test.cc
@ -188,9 +188,11 @@ TEST_F(WgslGeneratorImplTest, EmitType_StructOffsetDecl) {
    EXPECT_EQ(gen.result(), R"(struct S {
  @size(8)
  padding : u32,
+  /* @offset(8) */
  a : i32,
  @size(4)
  padding_1 : u32,
+  /* @offset(16) */
  b : f32,
 }
 )");
@ -209,9 +211,11 @@ TEST_F(WgslGeneratorImplTest, EmitType_StructOffsetDecl_WithSymbolCollisions) {
    EXPECT_EQ(gen.result(), R"(struct S {
  @size(8)
  padding : u32,
+  /* @offset(8) */
  tint_0_padding : i32,
  @size(4)
  padding_1 : u32,
+  /* @offset(16) */
  tint_2_padding : f32,
 }
 )");
--- a/test/tint/array/strides.spvasm.expected.wgsl
+++ b/test/tint/array/strides.spvasm.expected.wgsl
@ -15,6 +15,7 @@ struct strided_arr_1 {
 type Arr_2 = array<strided_arr_1, 4u>;

 struct S {
+  /* @offset(0) */
  a : Arr_2,
 }

--- a/test/tint/bug/tint/1061.spvasm.expected.wgsl
+++ b/test/tint/bug/tint/1061.spvasm.expected.wgsl
@ -1,4 +1,5 @@
 struct buf0 {
+  /* @offset(0) */
  r : vec4<f32>,
 }

--- a/test/tint/bug/tint/1088.spvasm.expected.wgsl
+++ b/test/tint/bug/tint/1088.spvasm.expected.wgsl
@ -8,11 +8,15 @@ struct strided_arr {
 type Arr_1 = array<strided_arr, 4u>;

 struct LeftOver {
+  /* @offset(0) */
  worldViewProjection : mat4x4<f32>,
+  /* @offset(64) */
  time : f32,
  @size(12)
  padding : u32,
+  /* @offset(80) */
  test2 : Arr,
+  /* @offset(208) */
  test : Arr_1,
 }

--- a/test/tint/bug/tint/1520.spvasm.expected.wgsl
+++ b/test/tint/bug/tint/1520.spvasm.expected.wgsl
@ -1,11 +1,15 @@
 struct UniformBuffer {
  @size(16)
  padding : u32,
+  /* @offset(16) */
  unknownInput_S1_c0 : f32,
  @size(12)
  padding_1 : u32,
+  /* @offset(32) */
  ucolorRed_S1_c0 : vec4<f32>,
+  /* @offset(48) */
  ucolorGreen_S1_c0 : vec4<f32>,
+  /* @offset(64) */
  umatrix_S1 : mat3x3<f32>,
 }

--- a/test/tint/bug/tint/870.spvasm.expected.wgsl
+++ b/test/tint/bug/tint/870.spvasm.expected.wgsl
@ -1,13 +1,18 @@
 type Arr = array<i32, 6u>;

 struct sspp962805860buildInformationS {
+  /* @offset(0) */
  footprint : vec4<f32>,
+  /* @offset(16) */
  offset : vec4<f32>,
+  /* @offset(32) */
  essence : i32,
+  /* @offset(36) */
  orientation : Arr,
 }

 struct x_B4_BuildInformation {
+  /* @offset(0) */
  passthru : sspp962805860buildInformationS,
 }

--- a/test/tint/bug/tint/977.spvasm.expected.wgsl
+++ b/test/tint/bug/tint/977.spvasm.expected.wgsl
@ -3,22 +3,28 @@ type RTArr = array<f32>;
 type RTArr_1 = array<f32>;

 struct ResultMatrix {
+  /* @offset(0) */
  numbers : RTArr_1,
 }

 type RTArr_2 = array<f32>;

 struct FirstMatrix {
+  /* @offset(0) */
  numbers : RTArr_1,
 }

 struct SecondMatrix {
+  /* @offset(0) */
  numbers : RTArr_1,
 }

 struct Uniforms {
+  /* @offset(0) */
  NAN : f32,
+  /* @offset(4) */
  sizeA : i32,
+  /* @offset(8) */
  sizeB : i32,
 }

--- a/test/tint/builtins/atomicStore/struct/array_of_struct.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomicStore/struct/array_of_struct.spvasm.expected.wgsl
@ -1,12 +1,18 @@
 struct S_atomic {
+  /* @offset(0) */
  x : i32,
+  /* @offset(4) */
  a : atomic<u32>,
+  /* @offset(8) */
  y : u32,
 }

 struct S {
+  /* @offset(0) */
  x : i32,
+  /* @offset(4) */
  a : u32,
+  /* @offset(8) */
  y : u32,
 }

--- a/test/tint/builtins/atomicStore/struct/flat_multiple_atomics.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomicStore/struct/flat_multiple_atomics.spvasm.expected.wgsl
@ -1,12 +1,18 @@
 struct S_atomic {
+  /* @offset(0) */
  x : i32,
+  /* @offset(4) */
  a : atomic<u32>,
+  /* @offset(8) */
  b : atomic<u32>,
 }

 struct S {
+  /* @offset(0) */
  x : i32,
+  /* @offset(4) */
  a : u32,
+  /* @offset(8) */
  b : u32,
 }

--- a/test/tint/builtins/atomicStore/struct/flat_single_atomic.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomicStore/struct/flat_single_atomic.spvasm.expected.wgsl
@ -1,12 +1,18 @@
 struct S_atomic {
+  /* @offset(0) */
  x : i32,
+  /* @offset(4) */
  a : atomic<u32>,
+  /* @offset(8) */
  y : u32,
 }

 struct S {
+  /* @offset(0) */
  x : i32,
+  /* @offset(4) */
  a : u32,
+  /* @offset(8) */
  y : u32,
 }

--- a/test/tint/builtins/atomicStore/struct/nested.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomicStore/struct/nested.spvasm.expected.wgsl
@ -1,42 +1,66 @@
 struct S0_atomic {
+  /* @offset(0) */
  x : i32,
+  /* @offset(4) */
  a : atomic<u32>,
+  /* @offset(8) */
  y : i32,
+  /* @offset(12) */
  z : i32,
 }

 struct S0 {
+  /* @offset(0) */
  x : i32,
+  /* @offset(4) */
  a : u32,
+  /* @offset(8) */
  y : i32,
+  /* @offset(12) */
  z : i32,
 }

 struct S1_atomic {
+  /* @offset(0) */
  x : i32,
+  /* @offset(4) */
  a : S0_atomic,
+  /* @offset(20) */
  y : i32,
+  /* @offset(24) */
  z : i32,
 }

 struct S1 {
+  /* @offset(0) */
  x : i32,
+  /* @offset(4) */
  a : S0,
+  /* @offset(20) */
  y : i32,
+  /* @offset(24) */
  z : i32,
 }

 struct S2_atomic {
+  /* @offset(0) */
  x : i32,
+  /* @offset(4) */
  y : i32,
+  /* @offset(8) */
  z : i32,
+  /* @offset(12) */
  a : S1_atomic,
 }

 struct S2 {
+  /* @offset(0) */
  x : i32,
+  /* @offset(4) */
  y : i32,
+  /* @offset(8) */
  z : i32,
+  /* @offset(12) */
  a : S1,
 }

--- a/test/tint/builtins/atomicStore/struct/struct_of_array.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomicStore/struct/struct_of_array.spvasm.expected.wgsl
@ -1,14 +1,20 @@
 type Arr = array<u32, 10u>;

 struct S_atomic {
+  /* @offset(0) */
  x : i32,
+  /* @offset(4) */
  a : array<atomic<u32>, 10u>,
+  /* @offset(44) */
  y : u32,
 }

 struct S {
+  /* @offset(0) */
  x : i32,
+  /* @offset(4) */
  a : Arr,
+  /* @offset(44) */
  y : u32,
 }

--- a/test/tint/builtins/atomicStore/struct/via_ptr_let.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomicStore/struct/via_ptr_let.spvasm.expected.wgsl
@ -1,12 +1,18 @@
 struct S_atomic {
+  /* @offset(0) */
  x : i32,
+  /* @offset(4) */
  a : atomic<u32>,
+  /* @offset(8) */
  y : u32,
 }

 struct S {
+  /* @offset(0) */
  x : i32,
+  /* @offset(4) */
  a : u32,
+  /* @offset(8) */
  y : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicAdd/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicAdd/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicAdd/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicAdd/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicAnd/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicAnd/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicAnd/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicAnd/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/storage_i32.spvasm.expected.wgsl
@ -1,13 +1,17 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

 struct x__atomic_compare_exchange_resulti32 {
+  /* @offset(0) */
  old_value : i32,
+  /* @offset(4) */
  exchanged : bool,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/storage_u32.spvasm.expected.wgsl
@ -1,13 +1,17 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

 struct x__atomic_compare_exchange_resultu32 {
+  /* @offset(0) */
  old_value : u32,
+  /* @offset(4) */
  exchanged : bool,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/workgroup_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/workgroup_i32.spvasm.expected.wgsl
@ -1,5 +1,7 @@
 struct x__atomic_compare_exchange_resulti32 {
+  /* @offset(0) */
  old_value : i32,
+  /* @offset(4) */
  exchanged : bool,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/workgroup_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/workgroup_u32.spvasm.expected.wgsl
@ -1,5 +1,7 @@
 struct x__atomic_compare_exchange_resultu32 {
+  /* @offset(0) */
  old_value : u32,
+  /* @offset(4) */
  exchanged : bool,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicExchange/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicExchange/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicExchange/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicExchange/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicLoad/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicLoad/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicLoad/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicLoad/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicMax/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicMax/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicMax/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicMax/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicMin/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicMin/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicMin/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicMin/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicOr/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicOr/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicOr/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicOr/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicStore/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicStore/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicStore/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicStore/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicSub/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicSub/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicSub/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicSub/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicXor/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicXor/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/atomicXor/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicXor/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/spvAtomicDecrement/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/spvAtomicDecrement/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/spvAtomicDecrement/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/spvAtomicDecrement/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/spvAtomicIncrement/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/spvAtomicIncrement/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/literal/spvAtomicIncrement/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/literal/spvAtomicIncrement/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicAdd/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicAdd/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicAdd/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicAdd/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicAnd/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicAnd/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicAnd/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicAnd/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/storage_i32.spvasm.expected.wgsl
@ -1,13 +1,17 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

 struct x__atomic_compare_exchange_resulti32 {
+  /* @offset(0) */
  old_value : i32,
+  /* @offset(4) */
  exchanged : bool,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/storage_u32.spvasm.expected.wgsl
@ -1,13 +1,17 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

 struct x__atomic_compare_exchange_resultu32 {
+  /* @offset(0) */
  old_value : u32,
+  /* @offset(4) */
  exchanged : bool,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/workgroup_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/workgroup_i32.spvasm.expected.wgsl
@ -1,5 +1,7 @@
 struct x__atomic_compare_exchange_resulti32 {
+  /* @offset(0) */
  old_value : i32,
+  /* @offset(4) */
  exchanged : bool,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/workgroup_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/workgroup_u32.spvasm.expected.wgsl
@ -1,5 +1,7 @@
 struct x__atomic_compare_exchange_resultu32 {
+  /* @offset(0) */
  old_value : u32,
+  /* @offset(4) */
  exchanged : bool,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicExchange/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicExchange/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicExchange/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicExchange/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicLoad/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicLoad/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicLoad/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicLoad/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicMax/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicMax/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicMax/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicMax/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicMin/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicMin/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicMin/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicMin/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicOr/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicOr/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicOr/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicOr/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicStore/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicStore/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicStore/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicStore/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicSub/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicSub/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicSub/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicSub/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicXor/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicXor/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/atomicXor/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicXor/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/spvAtomicDecrement/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/spvAtomicDecrement/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/spvAtomicDecrement/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/spvAtomicDecrement/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/spvAtomicIncrement/storage_i32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/spvAtomicIncrement/storage_i32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<i32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : i32,
 }

--- a/test/tint/builtins/atomics/from_gen/var/spvAtomicIncrement/storage_u32.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomics/from_gen/var/spvAtomicIncrement/storage_u32.spvasm.expected.wgsl
@ -1,8 +1,10 @@
 struct SB_RW_atomic {
+  /* @offset(0) */
  arg_0 : atomic<u32>,
 }

 struct SB_RW {
+  /* @offset(0) */
  arg_0 : u32,
 }

--- a/test/tint/layout/storage/mat2x2/stride/16.spvasm.expected.wgsl
+++ b/test/tint/layout/storage/mat2x2/stride/16.spvasm.expected.wgsl
@ -4,6 +4,7 @@ struct strided_arr {
 }

 struct SSBO {
+  /* @offset(0) */
  m : array<strided_arr, 2u>,
 }