tint: Add builtin type aliases (vec3f, etc)
Fixed: tint:1772
Change-Id: I4bed36ded91ca5288875ed6ea819ff4bbb432186
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/112340
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: James Price <jrprice@google.com>
diff --git a/test/tint/shadowing/alias/builtin/const.wgsl b/test/tint/shadowing/alias/builtin/const.wgsl
new file mode 100644
index 0000000..e1fb581
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/const.wgsl
@@ -0,0 +1,10 @@
+type a = vec3f;
+
+fn f() {
+ {
+ const vec3f = 1;
+ const b = vec3f;
+ }
+ const c = a();
+ const d = vec3f();
+}
diff --git a/test/tint/shadowing/alias/const.wgsl.expected.dxc.hlsl b/test/tint/shadowing/alias/builtin/const.wgsl.expected.dxc.hlsl
similarity index 100%
copy from test/tint/shadowing/alias/const.wgsl.expected.dxc.hlsl
copy to test/tint/shadowing/alias/builtin/const.wgsl.expected.dxc.hlsl
diff --git a/test/tint/shadowing/alias/const.wgsl.expected.fxc.hlsl b/test/tint/shadowing/alias/builtin/const.wgsl.expected.fxc.hlsl
similarity index 100%
copy from test/tint/shadowing/alias/const.wgsl.expected.fxc.hlsl
copy to test/tint/shadowing/alias/builtin/const.wgsl.expected.fxc.hlsl
diff --git a/test/tint/shadowing/alias/const.wgsl.expected.glsl b/test/tint/shadowing/alias/builtin/const.wgsl.expected.glsl
similarity index 100%
copy from test/tint/shadowing/alias/const.wgsl.expected.glsl
copy to test/tint/shadowing/alias/builtin/const.wgsl.expected.glsl
diff --git a/test/tint/shadowing/alias/const.wgsl.expected.msl b/test/tint/shadowing/alias/builtin/const.wgsl.expected.msl
similarity index 100%
copy from test/tint/shadowing/alias/const.wgsl.expected.msl
copy to test/tint/shadowing/alias/builtin/const.wgsl.expected.msl
diff --git a/test/tint/shadowing/alias/const.wgsl.expected.spvasm b/test/tint/shadowing/alias/builtin/const.wgsl.expected.spvasm
similarity index 100%
copy from test/tint/shadowing/alias/const.wgsl.expected.spvasm
copy to test/tint/shadowing/alias/builtin/const.wgsl.expected.spvasm
diff --git a/test/tint/shadowing/alias/builtin/const.wgsl.expected.wgsl b/test/tint/shadowing/alias/builtin/const.wgsl.expected.wgsl
new file mode 100644
index 0000000..e1fb581
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/const.wgsl.expected.wgsl
@@ -0,0 +1,10 @@
+type a = vec3f;
+
+fn f() {
+ {
+ const vec3f = 1;
+ const b = vec3f;
+ }
+ const c = a();
+ const d = vec3f();
+}
diff --git a/test/tint/shadowing/alias/builtin/let.wgsl b/test/tint/shadowing/alias/builtin/let.wgsl
new file mode 100644
index 0000000..9dc6ab9
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/let.wgsl
@@ -0,0 +1,10 @@
+type a = vec3f;
+
+fn f() {
+ {
+ let vec3f = 1;
+ let b = vec3f;
+ }
+ let c = a();
+ let d = vec3f();
+}
diff --git a/test/tint/shadowing/alias/builtin/let.wgsl.expected.dxc.hlsl b/test/tint/shadowing/alias/builtin/let.wgsl.expected.dxc.hlsl
new file mode 100644
index 0000000..0e6094b
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/let.wgsl.expected.dxc.hlsl
@@ -0,0 +1,13 @@
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+ return;
+}
+
+void f() {
+ {
+ const int vec3f = 1;
+ const int b = vec3f;
+ }
+ const float3 c = (0.0f).xxx;
+ const float3 d = (0.0f).xxx;
+}
diff --git a/test/tint/shadowing/alias/builtin/let.wgsl.expected.fxc.hlsl b/test/tint/shadowing/alias/builtin/let.wgsl.expected.fxc.hlsl
new file mode 100644
index 0000000..0e6094b
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/let.wgsl.expected.fxc.hlsl
@@ -0,0 +1,13 @@
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+ return;
+}
+
+void f() {
+ {
+ const int vec3f = 1;
+ const int b = vec3f;
+ }
+ const float3 c = (0.0f).xxx;
+ const float3 d = (0.0f).xxx;
+}
diff --git a/test/tint/shadowing/alias/builtin/let.wgsl.expected.glsl b/test/tint/shadowing/alias/builtin/let.wgsl.expected.glsl
new file mode 100644
index 0000000..fc24838
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/let.wgsl.expected.glsl
@@ -0,0 +1,15 @@
+#version 310 es
+
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
+void unused_entry_point() {
+ return;
+}
+void f() {
+ {
+ int vec3f = 1;
+ int b = vec3f;
+ }
+ vec3 c = vec3(0.0f);
+ vec3 d = vec3(0.0f);
+}
+
diff --git a/test/tint/shadowing/alias/builtin/let.wgsl.expected.msl b/test/tint/shadowing/alias/builtin/let.wgsl.expected.msl
new file mode 100644
index 0000000..34d9028
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/let.wgsl.expected.msl
@@ -0,0 +1,12 @@
+#include <metal_stdlib>
+
+using namespace metal;
+void f() {
+ {
+ int const vec3f = 1;
+ int const b = vec3f;
+ }
+ float3 const c = float3(0.0f);
+ float3 const d = float3(0.0f);
+}
+
diff --git a/test/tint/shadowing/alias/builtin/let.wgsl.expected.spvasm b/test/tint/shadowing/alias/builtin/let.wgsl.expected.spvasm
new file mode 100644
index 0000000..af04d0b
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/let.wgsl.expected.spvasm
@@ -0,0 +1,26 @@
+; SPIR-V
+; Version: 1.3
+; Generator: Google Tint Compiler; 0
+; Bound: 12
+; Schema: 0
+ OpCapability Shader
+ OpMemoryModel Logical GLSL450
+ OpEntryPoint GLCompute %unused_entry_point "unused_entry_point"
+ OpExecutionMode %unused_entry_point LocalSize 1 1 1
+ OpName %unused_entry_point "unused_entry_point"
+ OpName %f "f"
+ %void = OpTypeVoid
+ %1 = OpTypeFunction %void
+ %int = OpTypeInt 32 1
+ %int_1 = OpConstant %int 1
+ %float = OpTypeFloat 32
+ %v3float = OpTypeVector %float 3
+ %11 = OpConstantNull %v3float
+%unused_entry_point = OpFunction %void None %1
+ %4 = OpLabel
+ OpReturn
+ OpFunctionEnd
+ %f = OpFunction %void None %1
+ %6 = OpLabel
+ OpReturn
+ OpFunctionEnd
diff --git a/test/tint/shadowing/alias/builtin/let.wgsl.expected.wgsl b/test/tint/shadowing/alias/builtin/let.wgsl.expected.wgsl
new file mode 100644
index 0000000..9dc6ab9
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/let.wgsl.expected.wgsl
@@ -0,0 +1,10 @@
+type a = vec3f;
+
+fn f() {
+ {
+ let vec3f = 1;
+ let b = vec3f;
+ }
+ let c = a();
+ let d = vec3f();
+}
diff --git a/test/tint/shadowing/alias/builtin/param.wgsl b/test/tint/shadowing/alias/builtin/param.wgsl
new file mode 100644
index 0000000..fd91034
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/param.wgsl
@@ -0,0 +1,3 @@
+fn f(vec3f : vec3f) {
+ let b = vec3f;
+}
diff --git a/test/tint/shadowing/alias/builtin/param.wgsl.expected.dxc.hlsl b/test/tint/shadowing/alias/builtin/param.wgsl.expected.dxc.hlsl
new file mode 100644
index 0000000..9cd33b7
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/param.wgsl.expected.dxc.hlsl
@@ -0,0 +1,8 @@
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+ return;
+}
+
+void f(float3 vec3f) {
+ const float3 b = vec3f;
+}
diff --git a/test/tint/shadowing/alias/builtin/param.wgsl.expected.fxc.hlsl b/test/tint/shadowing/alias/builtin/param.wgsl.expected.fxc.hlsl
new file mode 100644
index 0000000..9cd33b7
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/param.wgsl.expected.fxc.hlsl
@@ -0,0 +1,8 @@
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+ return;
+}
+
+void f(float3 vec3f) {
+ const float3 b = vec3f;
+}
diff --git a/test/tint/shadowing/alias/builtin/param.wgsl.expected.glsl b/test/tint/shadowing/alias/builtin/param.wgsl.expected.glsl
new file mode 100644
index 0000000..1d19750
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/param.wgsl.expected.glsl
@@ -0,0 +1,10 @@
+#version 310 es
+
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
+void unused_entry_point() {
+ return;
+}
+void f(vec3 vec3f) {
+ vec3 b = vec3f;
+}
+
diff --git a/test/tint/shadowing/alias/builtin/param.wgsl.expected.msl b/test/tint/shadowing/alias/builtin/param.wgsl.expected.msl
new file mode 100644
index 0000000..252bf49
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/param.wgsl.expected.msl
@@ -0,0 +1,7 @@
+#include <metal_stdlib>
+
+using namespace metal;
+void f(float3 vec3f) {
+ float3 const b = vec3f;
+}
+
diff --git a/test/tint/shadowing/alias/builtin/param.wgsl.expected.spvasm b/test/tint/shadowing/alias/builtin/param.wgsl.expected.spvasm
new file mode 100644
index 0000000..bb64ce1
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/param.wgsl.expected.spvasm
@@ -0,0 +1,26 @@
+; SPIR-V
+; Version: 1.3
+; Generator: Google Tint Compiler; 0
+; Bound: 11
+; Schema: 0
+ OpCapability Shader
+ OpMemoryModel Logical GLSL450
+ OpEntryPoint GLCompute %unused_entry_point "unused_entry_point"
+ OpExecutionMode %unused_entry_point LocalSize 1 1 1
+ OpName %unused_entry_point "unused_entry_point"
+ OpName %f "f"
+ OpName %vec3f "vec3f"
+ %void = OpTypeVoid
+ %1 = OpTypeFunction %void
+ %float = OpTypeFloat 32
+ %v3float = OpTypeVector %float 3
+ %5 = OpTypeFunction %void %v3float
+%unused_entry_point = OpFunction %void None %1
+ %4 = OpLabel
+ OpReturn
+ OpFunctionEnd
+ %f = OpFunction %void None %5
+ %vec3f = OpFunctionParameter %v3float
+ %10 = OpLabel
+ OpReturn
+ OpFunctionEnd
diff --git a/test/tint/shadowing/alias/builtin/param.wgsl.expected.wgsl b/test/tint/shadowing/alias/builtin/param.wgsl.expected.wgsl
new file mode 100644
index 0000000..fd91034
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/param.wgsl.expected.wgsl
@@ -0,0 +1,3 @@
+fn f(vec3f : vec3f) {
+ let b = vec3f;
+}
diff --git a/test/tint/shadowing/alias/builtin/var.wgsl b/test/tint/shadowing/alias/builtin/var.wgsl
new file mode 100644
index 0000000..e33e30b
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/var.wgsl
@@ -0,0 +1,10 @@
+type a = vec3f;
+
+fn f() {
+ {
+ var vec3f = 1;
+ var b = vec3f;
+ }
+ var c = a();
+ var d = vec3f();
+}
diff --git a/test/tint/shadowing/alias/builtin/var.wgsl.expected.dxc.hlsl b/test/tint/shadowing/alias/builtin/var.wgsl.expected.dxc.hlsl
new file mode 100644
index 0000000..8a019ba
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/var.wgsl.expected.dxc.hlsl
@@ -0,0 +1,13 @@
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+ return;
+}
+
+void f() {
+ {
+ int vec3f = 1;
+ int b = vec3f;
+ }
+ float3 c = (0.0f).xxx;
+ float3 d = (0.0f).xxx;
+}
diff --git a/test/tint/shadowing/alias/builtin/var.wgsl.expected.fxc.hlsl b/test/tint/shadowing/alias/builtin/var.wgsl.expected.fxc.hlsl
new file mode 100644
index 0000000..8a019ba
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/var.wgsl.expected.fxc.hlsl
@@ -0,0 +1,13 @@
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+ return;
+}
+
+void f() {
+ {
+ int vec3f = 1;
+ int b = vec3f;
+ }
+ float3 c = (0.0f).xxx;
+ float3 d = (0.0f).xxx;
+}
diff --git a/test/tint/shadowing/alias/builtin/var.wgsl.expected.glsl b/test/tint/shadowing/alias/builtin/var.wgsl.expected.glsl
new file mode 100644
index 0000000..fc24838
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/var.wgsl.expected.glsl
@@ -0,0 +1,15 @@
+#version 310 es
+
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
+void unused_entry_point() {
+ return;
+}
+void f() {
+ {
+ int vec3f = 1;
+ int b = vec3f;
+ }
+ vec3 c = vec3(0.0f);
+ vec3 d = vec3(0.0f);
+}
+
diff --git a/test/tint/shadowing/alias/builtin/var.wgsl.expected.msl b/test/tint/shadowing/alias/builtin/var.wgsl.expected.msl
new file mode 100644
index 0000000..1446f18
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/var.wgsl.expected.msl
@@ -0,0 +1,12 @@
+#include <metal_stdlib>
+
+using namespace metal;
+void f() {
+ {
+ int vec3f = 1;
+ int b = vec3f;
+ }
+ float3 c = float3(0.0f);
+ float3 d = float3(0.0f);
+}
+
diff --git a/test/tint/shadowing/alias/builtin/var.wgsl.expected.spvasm b/test/tint/shadowing/alias/builtin/var.wgsl.expected.spvasm
new file mode 100644
index 0000000..52051a9
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/var.wgsl.expected.spvasm
@@ -0,0 +1,42 @@
+; SPIR-V
+; Version: 1.3
+; Generator: Google Tint Compiler; 0
+; Bound: 20
+; Schema: 0
+ OpCapability Shader
+ OpMemoryModel Logical GLSL450
+ OpEntryPoint GLCompute %unused_entry_point "unused_entry_point"
+ OpExecutionMode %unused_entry_point LocalSize 1 1 1
+ OpName %unused_entry_point "unused_entry_point"
+ OpName %f "f"
+ OpName %vec3f "vec3f"
+ OpName %b "b"
+ OpName %c "c"
+ OpName %d "d"
+ %void = OpTypeVoid
+ %1 = OpTypeFunction %void
+ %int = OpTypeInt 32 1
+ %int_1 = OpConstant %int 1
+%_ptr_Function_int = OpTypePointer Function %int
+ %11 = OpConstantNull %int
+ %float = OpTypeFloat 32
+ %v3float = OpTypeVector %float 3
+ %16 = OpConstantNull %v3float
+%_ptr_Function_v3float = OpTypePointer Function %v3float
+%unused_entry_point = OpFunction %void None %1
+ %4 = OpLabel
+ OpReturn
+ OpFunctionEnd
+ %f = OpFunction %void None %1
+ %6 = OpLabel
+ %vec3f = OpVariable %_ptr_Function_int Function %11
+ %b = OpVariable %_ptr_Function_int Function %11
+ %c = OpVariable %_ptr_Function_v3float Function %16
+ %d = OpVariable %_ptr_Function_v3float Function %16
+ OpStore %vec3f %int_1
+ %12 = OpLoad %int %vec3f
+ OpStore %b %12
+ OpStore %c %16
+ OpStore %d %16
+ OpReturn
+ OpFunctionEnd
diff --git a/test/tint/shadowing/alias/builtin/var.wgsl.expected.wgsl b/test/tint/shadowing/alias/builtin/var.wgsl.expected.wgsl
new file mode 100644
index 0000000..e33e30b
--- /dev/null
+++ b/test/tint/shadowing/alias/builtin/var.wgsl.expected.wgsl
@@ -0,0 +1,10 @@
+type a = vec3f;
+
+fn f() {
+ {
+ var vec3f = 1;
+ var b = vec3f;
+ }
+ var c = a();
+ var d = vec3f();
+}
diff --git a/test/tint/shadowing/alias/const.wgsl b/test/tint/shadowing/alias/user/const.wgsl
similarity index 100%
rename from test/tint/shadowing/alias/const.wgsl
rename to test/tint/shadowing/alias/user/const.wgsl
diff --git a/test/tint/shadowing/alias/const.wgsl.expected.dxc.hlsl b/test/tint/shadowing/alias/user/const.wgsl.expected.dxc.hlsl
similarity index 100%
rename from test/tint/shadowing/alias/const.wgsl.expected.dxc.hlsl
rename to test/tint/shadowing/alias/user/const.wgsl.expected.dxc.hlsl
diff --git a/test/tint/shadowing/alias/const.wgsl.expected.fxc.hlsl b/test/tint/shadowing/alias/user/const.wgsl.expected.fxc.hlsl
similarity index 100%
rename from test/tint/shadowing/alias/const.wgsl.expected.fxc.hlsl
rename to test/tint/shadowing/alias/user/const.wgsl.expected.fxc.hlsl
diff --git a/test/tint/shadowing/alias/const.wgsl.expected.glsl b/test/tint/shadowing/alias/user/const.wgsl.expected.glsl
similarity index 100%
rename from test/tint/shadowing/alias/const.wgsl.expected.glsl
rename to test/tint/shadowing/alias/user/const.wgsl.expected.glsl
diff --git a/test/tint/shadowing/alias/const.wgsl.expected.msl b/test/tint/shadowing/alias/user/const.wgsl.expected.msl
similarity index 100%
rename from test/tint/shadowing/alias/const.wgsl.expected.msl
rename to test/tint/shadowing/alias/user/const.wgsl.expected.msl
diff --git a/test/tint/shadowing/alias/const.wgsl.expected.spvasm b/test/tint/shadowing/alias/user/const.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/shadowing/alias/const.wgsl.expected.spvasm
rename to test/tint/shadowing/alias/user/const.wgsl.expected.spvasm
diff --git a/test/tint/shadowing/alias/const.wgsl.expected.wgsl b/test/tint/shadowing/alias/user/const.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/shadowing/alias/const.wgsl.expected.wgsl
rename to test/tint/shadowing/alias/user/const.wgsl.expected.wgsl
diff --git a/test/tint/shadowing/alias/let.wgsl b/test/tint/shadowing/alias/user/let.wgsl
similarity index 100%
rename from test/tint/shadowing/alias/let.wgsl
rename to test/tint/shadowing/alias/user/let.wgsl
diff --git a/test/tint/shadowing/alias/let.wgsl.expected.dxc.hlsl b/test/tint/shadowing/alias/user/let.wgsl.expected.dxc.hlsl
similarity index 100%
rename from test/tint/shadowing/alias/let.wgsl.expected.dxc.hlsl
rename to test/tint/shadowing/alias/user/let.wgsl.expected.dxc.hlsl
diff --git a/test/tint/shadowing/alias/let.wgsl.expected.fxc.hlsl b/test/tint/shadowing/alias/user/let.wgsl.expected.fxc.hlsl
similarity index 100%
rename from test/tint/shadowing/alias/let.wgsl.expected.fxc.hlsl
rename to test/tint/shadowing/alias/user/let.wgsl.expected.fxc.hlsl
diff --git a/test/tint/shadowing/alias/let.wgsl.expected.glsl b/test/tint/shadowing/alias/user/let.wgsl.expected.glsl
similarity index 100%
rename from test/tint/shadowing/alias/let.wgsl.expected.glsl
rename to test/tint/shadowing/alias/user/let.wgsl.expected.glsl
diff --git a/test/tint/shadowing/alias/let.wgsl.expected.msl b/test/tint/shadowing/alias/user/let.wgsl.expected.msl
similarity index 100%
rename from test/tint/shadowing/alias/let.wgsl.expected.msl
rename to test/tint/shadowing/alias/user/let.wgsl.expected.msl
diff --git a/test/tint/shadowing/alias/let.wgsl.expected.spvasm b/test/tint/shadowing/alias/user/let.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/shadowing/alias/let.wgsl.expected.spvasm
rename to test/tint/shadowing/alias/user/let.wgsl.expected.spvasm
diff --git a/test/tint/shadowing/alias/let.wgsl.expected.wgsl b/test/tint/shadowing/alias/user/let.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/shadowing/alias/let.wgsl.expected.wgsl
rename to test/tint/shadowing/alias/user/let.wgsl.expected.wgsl
diff --git a/test/tint/shadowing/alias/param.wgsl b/test/tint/shadowing/alias/user/param.wgsl
similarity index 100%
rename from test/tint/shadowing/alias/param.wgsl
rename to test/tint/shadowing/alias/user/param.wgsl
diff --git a/test/tint/shadowing/alias/param.wgsl.expected.dxc.hlsl b/test/tint/shadowing/alias/user/param.wgsl.expected.dxc.hlsl
similarity index 100%
rename from test/tint/shadowing/alias/param.wgsl.expected.dxc.hlsl
rename to test/tint/shadowing/alias/user/param.wgsl.expected.dxc.hlsl
diff --git a/test/tint/shadowing/alias/param.wgsl.expected.fxc.hlsl b/test/tint/shadowing/alias/user/param.wgsl.expected.fxc.hlsl
similarity index 100%
rename from test/tint/shadowing/alias/param.wgsl.expected.fxc.hlsl
rename to test/tint/shadowing/alias/user/param.wgsl.expected.fxc.hlsl
diff --git a/test/tint/shadowing/alias/param.wgsl.expected.glsl b/test/tint/shadowing/alias/user/param.wgsl.expected.glsl
similarity index 100%
rename from test/tint/shadowing/alias/param.wgsl.expected.glsl
rename to test/tint/shadowing/alias/user/param.wgsl.expected.glsl
diff --git a/test/tint/shadowing/alias/param.wgsl.expected.msl b/test/tint/shadowing/alias/user/param.wgsl.expected.msl
similarity index 100%
rename from test/tint/shadowing/alias/param.wgsl.expected.msl
rename to test/tint/shadowing/alias/user/param.wgsl.expected.msl
diff --git a/test/tint/shadowing/alias/param.wgsl.expected.spvasm b/test/tint/shadowing/alias/user/param.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/shadowing/alias/param.wgsl.expected.spvasm
rename to test/tint/shadowing/alias/user/param.wgsl.expected.spvasm
diff --git a/test/tint/shadowing/alias/param.wgsl.expected.wgsl b/test/tint/shadowing/alias/user/param.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/shadowing/alias/param.wgsl.expected.wgsl
rename to test/tint/shadowing/alias/user/param.wgsl.expected.wgsl
diff --git a/test/tint/shadowing/alias/var.wgsl b/test/tint/shadowing/alias/user/var.wgsl
similarity index 100%
rename from test/tint/shadowing/alias/var.wgsl
rename to test/tint/shadowing/alias/user/var.wgsl
diff --git a/test/tint/shadowing/alias/var.wgsl.expected.dxc.hlsl b/test/tint/shadowing/alias/user/var.wgsl.expected.dxc.hlsl
similarity index 100%
rename from test/tint/shadowing/alias/var.wgsl.expected.dxc.hlsl
rename to test/tint/shadowing/alias/user/var.wgsl.expected.dxc.hlsl
diff --git a/test/tint/shadowing/alias/var.wgsl.expected.fxc.hlsl b/test/tint/shadowing/alias/user/var.wgsl.expected.fxc.hlsl
similarity index 100%
rename from test/tint/shadowing/alias/var.wgsl.expected.fxc.hlsl
rename to test/tint/shadowing/alias/user/var.wgsl.expected.fxc.hlsl
diff --git a/test/tint/shadowing/alias/var.wgsl.expected.glsl b/test/tint/shadowing/alias/user/var.wgsl.expected.glsl
similarity index 100%
rename from test/tint/shadowing/alias/var.wgsl.expected.glsl
rename to test/tint/shadowing/alias/user/var.wgsl.expected.glsl
diff --git a/test/tint/shadowing/alias/var.wgsl.expected.msl b/test/tint/shadowing/alias/user/var.wgsl.expected.msl
similarity index 100%
rename from test/tint/shadowing/alias/var.wgsl.expected.msl
rename to test/tint/shadowing/alias/user/var.wgsl.expected.msl
diff --git a/test/tint/shadowing/alias/var.wgsl.expected.spvasm b/test/tint/shadowing/alias/user/var.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/shadowing/alias/var.wgsl.expected.spvasm
rename to test/tint/shadowing/alias/user/var.wgsl.expected.spvasm
diff --git a/test/tint/shadowing/alias/var.wgsl.expected.wgsl b/test/tint/shadowing/alias/user/var.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/shadowing/alias/var.wgsl.expected.wgsl
rename to test/tint/shadowing/alias/user/var.wgsl.expected.wgsl