Rename StorageClass to AddressSpace.

This CL updates the internals to use AddressSpace instead of the old StorageClass name. Bug: tint:1404 Change-Id: Iecc208e839453437f4d630f65e0152206a52db7e Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/104420 Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Dan Sinclair <dsinclair@chromium.org> Auto-Submit: Dan Sinclair <dsinclair@chromium.org>
2025-12-09 13:38:00 +00:00 · 2022-10-03 14:05:23 +00:00
parent d5b64ecd78
commit ff7cf21021
300 changed files with 2696 additions and 2766 deletions
--- a/test/tint/array/assign_to_function_var.wgsl
+++ b/test/tint/array/assign_to_function_var.wgsl
@@ -35,12 +35,12 @@ fn foo(src_param : ArrayType) {
  let src_let : ArrayType = ArrayType();
  dst = src_let;

-  // Assign from var, various storage classes.
+  // Assign from var, various address spaces.
  dst = src_function;
  dst = src_private;
  dst = src_workgroup;

-  // Assign from struct.arr, various storage classes.
+  // Assign from struct.arr, various address spaces.
  dst = ret_struct_arr().arr;
  dst = src_uniform.arr;
  dst = src_storage.arr;
--- a/test/tint/array/assign_to_private_var.wgsl
+++ b/test/tint/array/assign_to_private_var.wgsl
@@ -36,12 +36,12 @@ fn foo(src_param : ArrayType) {
  let src_let : ArrayType = ArrayType();
  dst = src_let;

-  // Assign from var, various storage classes.
+  // Assign from var, various address spaces.
  dst = src_function;
  dst = src_private;
  dst = src_workgroup;

-  // Assign from struct.arr, various storage classes.
+  // Assign from struct.arr, various address spaces.
  dst = ret_struct_arr().arr;
  dst = src_uniform.arr;
  dst = src_storage.arr;
--- a/test/tint/array/assign_to_storage_var.wgsl
+++ b/test/tint/array/assign_to_storage_var.wgsl
@@ -40,12 +40,12 @@ fn foo(src_param : ArrayType) {
  let src_let : ArrayType = ArrayType();
  dst.arr = src_let;

-  // Assign from var, various storage classes.
+  // Assign from var, various address spaces.
  dst.arr = src_function;
  dst.arr = src_private;
  dst.arr = src_workgroup;

-  // Assign from struct.arr, various storage classes.
+  // Assign from struct.arr, various address spaces.
  dst.arr = ret_struct_arr().arr;
  dst.arr = src_uniform.arr;
  dst.arr = src_storage.arr;
--- a/test/tint/array/assign_to_workgroup_var.wgsl
+++ b/test/tint/array/assign_to_workgroup_var.wgsl
@@ -36,12 +36,12 @@ fn foo(src_param : ArrayType) {
  let src_let : ArrayType = ArrayType();
  dst = src_let;

-  // Assign from var, various storage classes.
+  // Assign from var, various address spaces.
  dst = src_function;
  dst = src_private;
  dst = src_workgroup;

-  // Assign from struct.arr, various storage classes.
+  // Assign from struct.arr, various address spaces.
  dst = ret_struct_arr().arr;
  dst = src_uniform.arr;
  dst = src_storage.arr;
--- a/test/tint/builtins/gen/gen.wgsl.tmpl
+++ b/test/tint/builtins/gen/gen.wgsl.tmpl
@@ -81,7 +81,7 @@ struct UB {

 {{- /* Generate module-scoped handle variables */ -}}
 {{-   range $i, $p := $overload.Parameters  }}
-{{-     $class := Eval "StorageClass" $p.Type -}}
+{{-     $class := Eval "AddressSpace" $p.Type -}}
 {{-     if eq "ptr" $p.Type.Target.Name -}}
 {{-       $el_type := Eval "Type" (index $p.Type.TemplateArguments 1)}}
 {{-       if eq "handle" $class -}}
@@ -115,7 +115,7 @@ struct UB {
 fn {{$permutation}}() {
 {{/* Build the parameters either as 'var' or inline values */ -}}
 {{-   range $i, $p := $overload.Parameters -}}
-{{-     $class       := Eval "StorageClass" $p.Type -}}
+{{-     $class       := Eval "AddressSpace" $p.Type -}}
 {{-     $is_abstract := DeepestElementType $p.Type | IsAbstract -}}
 {{-     if eq "function" $class -}}
 {{-       if eq "ptr" $p.Type.Target.Name -}}
@@ -193,12 +193,12 @@ enable f16;

 {{- /* ------------------------------------------------------------------ */ -}}
 {{-                       define "EmitBufferFields"                          -}}
-{{- /* Emits a struct with the fields that match the given storage class  */ -}}
+{{- /* Emits a struct with the fields that match the given address space  */ -}}
 {{- /* and access.                                                        */ -}}
 {{- /* Argument is a map with the following expected keys:                */ -}}
 {{- /*  'overload' - the current overload                                 */ -}}
 {{- /*  'var_name' - name of the variable of the structure type           */ -}}
-{{- /*  'storage'  - filtered storage class                               */ -}}
+{{- /*  'storage'  - filtered address space                               */ -}}
 {{- /*  'access'   - filtered access                                      */ -}}
 {{- /*  'args'     - argument map that's populated with the fields        */ -}}
 {{- /* ------------------------------------------------------------------ */ -}}
@@ -208,9 +208,9 @@ enable f16;
 {{- $filter_access  := .Get "access"   -}}
 {{- $args           := .Get "args"     -}}
 {{-   range $i, $p := $overload.Parameters  }}
-{{-     $storage := Eval "StorageClass" $p.Type -}}
+{{-     $address_space := Eval "AddressSpace" $p.Type -}}
 {{-     $access  := Eval "Access"       $p.Type -}}
-{{-     if and (eq $filter_storage $storage) (eq $filter_access $access) }}
+{{-     if and (eq $filter_storage $address_space) (eq $filter_access $access) }}
 {{-       if eq "ptr" $p.Type.Target.Name  }}
  arg_{{$i}}: {{template "Type" (index $p.Type.TemplateArguments 1)}},
 {{          $args.Put $i (printf "&%v.arg_%v" $var_name $i) -}}
@@ -224,8 +224,8 @@ enable f16;


 {{- /* ------------------------------------------------------------------ */ -}}
-{{-                           define "StorageClass"                          -}}
-{{- /* Returns the storage class for the given Fully Qualified Name       */ -}}
+{{-                           define "AddressSpace"                          -}}
+{{- /* Returns the address space for the given Fully Qualified Name       */ -}}
 {{- /* ------------------------------------------------------------------ */ -}}
 {{-   $name := .Target.Name -}}
 {{-   if             eq $name "array"   -}}storage
@@ -244,15 +244,15 @@ enable f16;
 {{-   $name := .Target.Name -}}
 {{-   if eq $name "ptr"     -}}{{(index .TemplateArguments 2).Target.Name}}
 {{-   else -}}
-{{- /*  Emit the default for the storage class */ -}}
+{{- /*  Emit the default for the address space */ -}}
 {{- /*  https://gpuweb.github.io/gpuweb/wgsl/#storage-class */ -}}
-{{-     $storage := Eval "StorageClass" . -}}
-{{-          if eq $storage "function"  -}}read_write
-{{-     else if eq $storage "private"   -}}read_write
-{{-     else if eq $storage "workgroup" -}}read_write
-{{-     else if eq $storage "uniform"   -}}read
-{{-     else if eq $storage "storage"   -}}read
-{{-     else if eq $storage "handle"    -}}read
+{{-     $address_space := Eval "AddressSpace" . -}}
+{{-          if eq $address_space "function"  -}}read_write
+{{-     else if eq $address_space "private"   -}}read_write
+{{-     else if eq $address_space "workgroup" -}}read_write
+{{-     else if eq $address_space "uniform"   -}}read
+{{-     else if eq $address_space "storage"   -}}read
+{{-     else if eq $address_space "handle"    -}}read
 {{-     end -}}
 {{-   end -}}
 {{- end -}}
@@ -325,4 +325,4 @@ enable f16;
 {{-    end -}}
 >
 {{-   end -}}
-{{- end -}}
+{{- end -}}
--- a/test/tint/builtins/gen/literal/arrayLength/8421b9.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/gen/literal/arrayLength/8421b9.wgsl.expected.dxc.hlsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-gen/literal/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+gen/literal/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/literal/arrayLength/8421b9.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/gen/literal/arrayLength/8421b9.wgsl.expected.fxc.hlsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-gen/literal/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+gen/literal/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/literal/arrayLength/8421b9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/arrayLength/8421b9.wgsl.expected.glsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-builtins/gen/literal/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+builtins/gen/literal/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/literal/arrayLength/8421b9.wgsl.expected.msl
+++ b/test/tint/builtins/gen/literal/arrayLength/8421b9.wgsl.expected.msl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-gen/literal/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+gen/literal/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/literal/arrayLength/8421b9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/arrayLength/8421b9.wgsl.expected.spvasm
@@ -1,6 +1,6 @@
 SKIP: FAILED

-gen/literal/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+gen/literal/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/literal/arrayLength/8421b9.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/arrayLength/8421b9.wgsl.expected.wgsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-gen/literal/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+gen/literal/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/literal/arrayLength/cbd6b5.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/gen/literal/arrayLength/cbd6b5.wgsl.expected.dxc.hlsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-gen/literal/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+gen/literal/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/literal/arrayLength/cbd6b5.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/gen/literal/arrayLength/cbd6b5.wgsl.expected.fxc.hlsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-gen/literal/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+gen/literal/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/literal/arrayLength/cbd6b5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/arrayLength/cbd6b5.wgsl.expected.glsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-builtins/gen/literal/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+builtins/gen/literal/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/literal/arrayLength/cbd6b5.wgsl.expected.msl
+++ b/test/tint/builtins/gen/literal/arrayLength/cbd6b5.wgsl.expected.msl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-gen/literal/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+gen/literal/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/literal/arrayLength/cbd6b5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/arrayLength/cbd6b5.wgsl.expected.spvasm
@@ -1,6 +1,6 @@
 SKIP: FAILED

-gen/literal/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+gen/literal/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/literal/arrayLength/cbd6b5.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/arrayLength/cbd6b5.wgsl.expected.wgsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-gen/literal/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+gen/literal/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/var/arrayLength/8421b9.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/gen/var/arrayLength/8421b9.wgsl.expected.dxc.hlsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-gen/var/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+gen/var/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/var/arrayLength/8421b9.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/gen/var/arrayLength/8421b9.wgsl.expected.fxc.hlsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-gen/var/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+gen/var/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/var/arrayLength/8421b9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/arrayLength/8421b9.wgsl.expected.glsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-builtins/gen/var/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+builtins/gen/var/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/var/arrayLength/8421b9.wgsl.expected.msl
+++ b/test/tint/builtins/gen/var/arrayLength/8421b9.wgsl.expected.msl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-gen/var/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+gen/var/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/var/arrayLength/8421b9.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/arrayLength/8421b9.wgsl.expected.spvasm
@@ -1,6 +1,6 @@
 SKIP: FAILED

-gen/var/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+gen/var/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/var/arrayLength/8421b9.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/arrayLength/8421b9.wgsl.expected.wgsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-gen/var/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+gen/var/arrayLength/8421b9.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/var/arrayLength/cbd6b5.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/gen/var/arrayLength/cbd6b5.wgsl.expected.dxc.hlsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-gen/var/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+gen/var/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/var/arrayLength/cbd6b5.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/gen/var/arrayLength/cbd6b5.wgsl.expected.fxc.hlsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-gen/var/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+gen/var/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/var/arrayLength/cbd6b5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/arrayLength/cbd6b5.wgsl.expected.glsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-builtins/gen/var/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+builtins/gen/var/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/var/arrayLength/cbd6b5.wgsl.expected.msl
+++ b/test/tint/builtins/gen/var/arrayLength/cbd6b5.wgsl.expected.msl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-gen/var/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+gen/var/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/var/arrayLength/cbd6b5.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/arrayLength/cbd6b5.wgsl.expected.spvasm
@@ -1,6 +1,6 @@
 SKIP: FAILED

-gen/var/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+gen/var/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/builtins/gen/var/arrayLength/cbd6b5.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/arrayLength/cbd6b5.wgsl.expected.wgsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-gen/var/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' storage class is not implemented yet
+gen/var/arrayLength/cbd6b5.wgsl:26:10 error: using f16 types in 'storage' address space is not implemented yet
  arg_0: array<f16>,
         ^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/mat3x2-vec3/f16.wgsl.expected.dxc.hlsl
+++ b/test/tint/expressions/binary/mul/mat3x2-vec3/f16.wgsl.expected.dxc.hlsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-binary/mul/mat3x2-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+binary/mul/mat3x2-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat3x2<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/mat3x2-vec3/f16.wgsl.expected.fxc.hlsl
+++ b/test/tint/expressions/binary/mul/mat3x2-vec3/f16.wgsl.expected.fxc.hlsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-binary/mul/mat3x2-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+binary/mul/mat3x2-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat3x2<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/mat3x2-vec3/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/binary/mul/mat3x2-vec3/f16.wgsl.expected.glsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-expressions/binary/mul/mat3x2-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+expressions/binary/mul/mat3x2-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat3x2<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/mat3x2-vec3/f16.wgsl.expected.msl
+++ b/test/tint/expressions/binary/mul/mat3x2-vec3/f16.wgsl.expected.msl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-binary/mul/mat3x2-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+binary/mul/mat3x2-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat3x2<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/mat3x2-vec3/f16.wgsl.expected.spvasm
+++ b/test/tint/expressions/binary/mul/mat3x2-vec3/f16.wgsl.expected.spvasm
@@ -1,6 +1,6 @@
 SKIP: FAILED

-binary/mul/mat3x2-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+binary/mul/mat3x2-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat3x2<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/mat3x2-vec3/f16.wgsl.expected.wgsl
+++ b/test/tint/expressions/binary/mul/mat3x2-vec3/f16.wgsl.expected.wgsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-binary/mul/mat3x2-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+binary/mul/mat3x2-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat3x2<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/mat3x3-vec3/f16.wgsl.expected.dxc.hlsl
+++ b/test/tint/expressions/binary/mul/mat3x3-vec3/f16.wgsl.expected.dxc.hlsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-binary/mul/mat3x3-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+binary/mul/mat3x3-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat3x3<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/mat3x3-vec3/f16.wgsl.expected.fxc.hlsl
+++ b/test/tint/expressions/binary/mul/mat3x3-vec3/f16.wgsl.expected.fxc.hlsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-binary/mul/mat3x3-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+binary/mul/mat3x3-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat3x3<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/mat3x3-vec3/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/binary/mul/mat3x3-vec3/f16.wgsl.expected.glsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-expressions/binary/mul/mat3x3-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+expressions/binary/mul/mat3x3-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat3x3<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/mat3x3-vec3/f16.wgsl.expected.msl
+++ b/test/tint/expressions/binary/mul/mat3x3-vec3/f16.wgsl.expected.msl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-binary/mul/mat3x3-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+binary/mul/mat3x3-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat3x3<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/mat3x3-vec3/f16.wgsl.expected.spvasm
+++ b/test/tint/expressions/binary/mul/mat3x3-vec3/f16.wgsl.expected.spvasm
@@ -1,6 +1,6 @@
 SKIP: FAILED

-binary/mul/mat3x3-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+binary/mul/mat3x3-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat3x3<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/mat3x3-vec3/f16.wgsl.expected.wgsl
+++ b/test/tint/expressions/binary/mul/mat3x3-vec3/f16.wgsl.expected.wgsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-binary/mul/mat3x3-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+binary/mul/mat3x3-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat3x3<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/vec3-mat3x3/f16.wgsl.expected.dxc.hlsl
+++ b/test/tint/expressions/binary/mul/vec3-mat3x3/f16.wgsl.expected.dxc.hlsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-binary/mul/vec3-mat3x3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+binary/mul/vec3-mat3x3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat3x3<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/vec3-mat3x3/f16.wgsl.expected.fxc.hlsl
+++ b/test/tint/expressions/binary/mul/vec3-mat3x3/f16.wgsl.expected.fxc.hlsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-binary/mul/vec3-mat3x3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+binary/mul/vec3-mat3x3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat3x3<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/vec3-mat3x3/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/binary/mul/vec3-mat3x3/f16.wgsl.expected.glsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-expressions/binary/mul/vec3-mat3x3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+expressions/binary/mul/vec3-mat3x3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat3x3<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/vec3-mat3x3/f16.wgsl.expected.msl
+++ b/test/tint/expressions/binary/mul/vec3-mat3x3/f16.wgsl.expected.msl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-binary/mul/vec3-mat3x3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+binary/mul/vec3-mat3x3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat3x3<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/vec3-mat3x3/f16.wgsl.expected.spvasm
+++ b/test/tint/expressions/binary/mul/vec3-mat3x3/f16.wgsl.expected.spvasm
@@ -1,6 +1,6 @@
 SKIP: FAILED

-binary/mul/vec3-mat3x3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+binary/mul/vec3-mat3x3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat3x3<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/vec3-mat3x3/f16.wgsl.expected.wgsl
+++ b/test/tint/expressions/binary/mul/vec3-mat3x3/f16.wgsl.expected.wgsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-binary/mul/vec3-mat3x3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+binary/mul/vec3-mat3x3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat3x3<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/vec3-mat4x3/f16.wgsl.expected.dxc.hlsl
+++ b/test/tint/expressions/binary/mul/vec3-mat4x3/f16.wgsl.expected.dxc.hlsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-binary/mul/vec3-mat4x3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+binary/mul/vec3-mat4x3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat4x3<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/vec3-mat4x3/f16.wgsl.expected.fxc.hlsl
+++ b/test/tint/expressions/binary/mul/vec3-mat4x3/f16.wgsl.expected.fxc.hlsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-binary/mul/vec3-mat4x3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+binary/mul/vec3-mat4x3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat4x3<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/vec3-mat4x3/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/binary/mul/vec3-mat4x3/f16.wgsl.expected.glsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-expressions/binary/mul/vec3-mat4x3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+expressions/binary/mul/vec3-mat4x3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat4x3<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/vec3-mat4x3/f16.wgsl.expected.msl
+++ b/test/tint/expressions/binary/mul/vec3-mat4x3/f16.wgsl.expected.msl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-binary/mul/vec3-mat4x3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+binary/mul/vec3-mat4x3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat4x3<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/vec3-mat4x3/f16.wgsl.expected.spvasm
+++ b/test/tint/expressions/binary/mul/vec3-mat4x3/f16.wgsl.expected.spvasm
@@ -1,6 +1,6 @@
 SKIP: FAILED

-binary/mul/vec3-mat4x3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+binary/mul/vec3-mat4x3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat4x3<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/binary/mul/vec3-mat4x3/f16.wgsl.expected.wgsl
+++ b/test/tint/expressions/binary/mul/vec3-mat4x3/f16.wgsl.expected.wgsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-binary/mul/vec3-mat4x3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
+binary/mul/vec3-mat4x3/f16.wgsl:3:14 error: using f16 types in 'uniform' address space is not implemented yet
    matrix : mat4x3<f16>,
             ^^^^^^^^^^^

--- a/test/tint/expressions/swizzle/read/packed_vec3/f16.wgsl.expected.dxc.hlsl
+++ b/test/tint/expressions/swizzle/read/packed_vec3/f16.wgsl.expected.dxc.hlsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-swizzle/read/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'uniform' storage class is not implemented yet
+swizzle/read/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'uniform' address space is not implemented yet
    v: vec3<f16>,
       ^^^^^^^^^

--- a/test/tint/expressions/swizzle/read/packed_vec3/f16.wgsl.expected.fxc.hlsl
+++ b/test/tint/expressions/swizzle/read/packed_vec3/f16.wgsl.expected.fxc.hlsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-swizzle/read/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'uniform' storage class is not implemented yet
+swizzle/read/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'uniform' address space is not implemented yet
    v: vec3<f16>,
       ^^^^^^^^^

--- a/test/tint/expressions/swizzle/read/packed_vec3/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/swizzle/read/packed_vec3/f16.wgsl.expected.glsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-expressions/swizzle/read/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'uniform' storage class is not implemented yet
+expressions/swizzle/read/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'uniform' address space is not implemented yet
    v: vec3<f16>,
       ^^^^^^^^^

--- a/test/tint/expressions/swizzle/read/packed_vec3/f16.wgsl.expected.msl
+++ b/test/tint/expressions/swizzle/read/packed_vec3/f16.wgsl.expected.msl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-swizzle/read/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'uniform' storage class is not implemented yet
+swizzle/read/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'uniform' address space is not implemented yet
    v: vec3<f16>,
       ^^^^^^^^^

--- a/test/tint/expressions/swizzle/read/packed_vec3/f16.wgsl.expected.spvasm
+++ b/test/tint/expressions/swizzle/read/packed_vec3/f16.wgsl.expected.spvasm
@@ -1,6 +1,6 @@
 SKIP: FAILED

-swizzle/read/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'uniform' storage class is not implemented yet
+swizzle/read/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'uniform' address space is not implemented yet
    v: vec3<f16>,
       ^^^^^^^^^

--- a/test/tint/expressions/swizzle/read/packed_vec3/f16.wgsl.expected.wgsl
+++ b/test/tint/expressions/swizzle/read/packed_vec3/f16.wgsl.expected.wgsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-swizzle/read/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'uniform' storage class is not implemented yet
+swizzle/read/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'uniform' address space is not implemented yet
    v: vec3<f16>,
       ^^^^^^^^^

--- a/test/tint/expressions/swizzle/write/packed_vec3/f16.wgsl.expected.dxc.hlsl
+++ b/test/tint/expressions/swizzle/write/packed_vec3/f16.wgsl.expected.dxc.hlsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-swizzle/write/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'storage' storage class is not implemented yet
+swizzle/write/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'storage' address space is not implemented yet
    v: vec3<f16>,
       ^^^^^^^^^

--- a/test/tint/expressions/swizzle/write/packed_vec3/f16.wgsl.expected.fxc.hlsl
+++ b/test/tint/expressions/swizzle/write/packed_vec3/f16.wgsl.expected.fxc.hlsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-swizzle/write/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'storage' storage class is not implemented yet
+swizzle/write/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'storage' address space is not implemented yet
    v: vec3<f16>,
       ^^^^^^^^^

--- a/test/tint/expressions/swizzle/write/packed_vec3/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/swizzle/write/packed_vec3/f16.wgsl.expected.glsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-expressions/swizzle/write/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'storage' storage class is not implemented yet
+expressions/swizzle/write/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'storage' address space is not implemented yet
    v: vec3<f16>,
       ^^^^^^^^^

--- a/test/tint/expressions/swizzle/write/packed_vec3/f16.wgsl.expected.msl
+++ b/test/tint/expressions/swizzle/write/packed_vec3/f16.wgsl.expected.msl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-swizzle/write/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'storage' storage class is not implemented yet
+swizzle/write/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'storage' address space is not implemented yet
    v: vec3<f16>,
       ^^^^^^^^^

--- a/test/tint/expressions/swizzle/write/packed_vec3/f16.wgsl.expected.spvasm
+++ b/test/tint/expressions/swizzle/write/packed_vec3/f16.wgsl.expected.spvasm
@@ -1,6 +1,6 @@
 SKIP: FAILED

-swizzle/write/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'storage' storage class is not implemented yet
+swizzle/write/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'storage' address space is not implemented yet
    v: vec3<f16>,
       ^^^^^^^^^

--- a/test/tint/expressions/swizzle/write/packed_vec3/f16.wgsl.expected.wgsl
+++ b/test/tint/expressions/swizzle/write/packed_vec3/f16.wgsl.expected.wgsl
@@ -1,6 +1,6 @@
 SKIP: FAILED

-swizzle/write/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'storage' storage class is not implemented yet
+swizzle/write/packed_vec3/f16.wgsl:3:8 error: using f16 types in 'storage' address space is not implemented yet
    v: vec3<f16>,
       ^^^^^^^^^

--- a/test/tint/var/uses/push_constant.wgsl.expected.dxc.hlsl
+++ b/test/tint/var/uses/push_constant.wgsl.expected.dxc.hlsl
@@ -40,4 +40,4 @@ fn main3() {
 fn main4() {
 }

-Failed to generate: error: unhandled storage class push_constant
+Failed to generate: error: unhandled address space push_constant
--- a/test/tint/var/uses/push_constant.wgsl.expected.fxc.hlsl
+++ b/test/tint/var/uses/push_constant.wgsl.expected.fxc.hlsl
@@ -40,4 +40,4 @@ fn main3() {
 fn main4() {
 }

-Failed to generate: error: unhandled storage class push_constant
+Failed to generate: error: unhandled address space push_constant
--- a/test/tint/var/uses/push_constant.wgsl.expected.glsl
+++ b/test/tint/var/uses/push_constant.wgsl.expected.glsl
@@ -40,7 +40,7 @@ fn main3() {
 fn main4() {
 }

-Failed to generate: error: unhandled storage class push_constant
+Failed to generate: error: unhandled address space push_constant

 enable chromium_experimental_push_constant;

@@ -81,7 +81,7 @@ fn main3() {
 fn main4() {
 }

-Failed to generate: error: unhandled storage class push_constant
+Failed to generate: error: unhandled address space push_constant

 enable chromium_experimental_push_constant;

@@ -122,7 +122,7 @@ fn main3() {
 fn main4() {
 }

-Failed to generate: error: unhandled storage class push_constant
+Failed to generate: error: unhandled address space push_constant
 #version 310 es

 void main4() {
--- a/test/tint/var/uses/push_constant.wgsl.expected.msl
+++ b/test/tint/var/uses/push_constant.wgsl.expected.msl
@@ -40,9 +40,9 @@ fn main3() {
 fn main4() {
 }

-Failed to generate: error: unhandled module-scope storage class (push_constant)
-error: unhandled module-scope storage class (push_constant)
-error: unhandled module-scope storage class (push_constant)
-error: unhandled module-scope storage class (push_constant)
-error: unhandled module-scope storage class (push_constant)
-error: unhandled module-scope storage class (push_constant)
+Failed to generate: error: unhandled module-scope address space (push_constant)
+error: unhandled module-scope address space (push_constant)
+error: unhandled module-scope address space (push_constant)
+error: unhandled module-scope address space (push_constant)
+error: unhandled module-scope address space (push_constant)
+error: unhandled module-scope address space (push_constant)