HLSL-IR: only swizzle ctor value if not the right type
Bug: b/42251045
Change-Id: Ic4b8e35a8675263c7ca91ce32cd6e2d3d847d04c
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/205914
Reviewed-by: James Price <jrprice@google.com>
diff --git a/src/tint/lang/hlsl/writer/printer/printer.cc b/src/tint/lang/hlsl/writer/printer/printer.cc
index 46170f1..8420226 100644
--- a/src/tint/lang/hlsl/writer/printer/printer.cc
+++ b/src/tint/lang/hlsl/writer/printer/printer.cc
@@ -794,15 +794,17 @@
EmitType(out, c->Result(0)->Type());
out << "("; // For the type constructor
- // We swizzle a single value, in order to do so, wrap it in it more brackets.
- if (c->Args().Length() == 1) {
+ // Swizzle single value if it's not already the right type
+ // (typically a single scalar value).
+ const bool swizzle_value =
+ (c->Args().Length() == 1) && (c->Args()[0]->Type() != c->Result(0)->Type());
+ if (swizzle_value) {
out << "(";
}
emit_args();
- // Swizzle a single value constructor
- if (c->Args().Length() == 1) {
+ if (swizzle_value) {
out << ")." << std::string(vec->Width(), 'x');
}
diff --git a/test/tint/bug/chromium/1434271.wgsl.expected.ir.dxc.hlsl b/test/tint/bug/chromium/1434271.wgsl.expected.ir.dxc.hlsl
index b345a60..b3918d3 100644
--- a/test/tint/bug/chromium/1434271.wgsl.expected.ir.dxc.hlsl
+++ b/test/tint/bug/chromium/1434271.wgsl.expected.ir.dxc.hlsl
@@ -127,7 +127,7 @@
void export_level_inner(uint3 coord) {
uint2 v_18 = (0u).xx;
tex_out.GetDimensions(v_18[0u], v_18[1u]);
- if (all((coord.xy < uint2((v_18).xx)))) {
+ if (all((coord.xy < uint2(v_18)))) {
uint dst_offset = (coord[0u] << ((coord[1u] * ubo[0u].x) & 31u));
uint src_offset = ((coord[0u] - 2u) + ((coord[1u] >> (2u & 31u)) * ubo[0u].x));
float a = asfloat(buf_in.Load((0u + (uint((src_offset << (0u & 31u))) * 4u))));
diff --git a/test/tint/bug/tint/913.wgsl.expected.ir.dxc.hlsl b/test/tint/bug/tint/913.wgsl.expected.ir.dxc.hlsl
index 4286878..abf3988 100644
--- a/test/tint/bug/tint/913.wgsl.expected.ir.dxc.hlsl
+++ b/test/tint/bug/tint/913.wgsl.expected.ir.dxc.hlsl
@@ -20,7 +20,7 @@
uint2 v_1 = (0u).xx;
tint_symbol.GetDimensions(v_1[0u], v_1[1u]);
uint2 dstSize = v_1;
- uint2 dstTexCoord = uint2((GlobalInvocationID.xy).xx);
+ uint2 dstTexCoord = uint2(GlobalInvocationID.xy);
float4 nonCoveredColor = float4(0.0f, 1.0f, 0.0f, 1.0f);
bool success = true;
bool v_2 = false;
diff --git a/test/tint/bug/tint/913.wgsl.expected.ir.fxc.hlsl b/test/tint/bug/tint/913.wgsl.expected.ir.fxc.hlsl
index 4286878..abf3988 100644
--- a/test/tint/bug/tint/913.wgsl.expected.ir.fxc.hlsl
+++ b/test/tint/bug/tint/913.wgsl.expected.ir.fxc.hlsl
@@ -20,7 +20,7 @@
uint2 v_1 = (0u).xx;
tint_symbol.GetDimensions(v_1[0u], v_1[1u]);
uint2 dstSize = v_1;
- uint2 dstTexCoord = uint2((GlobalInvocationID.xy).xx);
+ uint2 dstTexCoord = uint2(GlobalInvocationID.xy);
float4 nonCoveredColor = float4(0.0f, 1.0f, 0.0f, 1.0f);
bool success = true;
bool v_2 = false;
diff --git a/test/tint/expressions/type_ctor/vec2/single_value.wgsl b/test/tint/expressions/type_ctor/vec2/single_value.wgsl
new file mode 100644
index 0000000..9be8e91
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec2/single_value.wgsl
@@ -0,0 +1,10 @@
+fn v() -> vec2<f32> {
+ return vec2(0.0);
+}
+
+fn f() {
+ let a = vec2(1.0);
+ let b = vec2(a);
+ let c = vec2(v());
+ let d = vec2(a * 2);
+}
diff --git a/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.dxc.hlsl b/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.dxc.hlsl
new file mode 100644
index 0000000..cb4a1f3
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.dxc.hlsl
@@ -0,0 +1,16 @@
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+ return;
+}
+
+float2 v() {
+ return (0.0f).xx;
+}
+
+void f() {
+ float2 a = (1.0f).xx;
+ float2 b = float2(a);
+ float2 tint_symbol = v();
+ float2 c = float2(tint_symbol);
+ float2 d = float2((a * 2.0f));
+}
diff --git a/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.fxc.hlsl b/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.fxc.hlsl
new file mode 100644
index 0000000..cb4a1f3
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.fxc.hlsl
@@ -0,0 +1,16 @@
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+ return;
+}
+
+float2 v() {
+ return (0.0f).xx;
+}
+
+void f() {
+ float2 a = (1.0f).xx;
+ float2 b = float2(a);
+ float2 tint_symbol = v();
+ float2 c = float2(tint_symbol);
+ float2 d = float2((a * 2.0f));
+}
diff --git a/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.glsl b/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.glsl
new file mode 100644
index 0000000..8410fe1
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.glsl
@@ -0,0 +1,18 @@
+#version 310 es
+
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
+void unused_entry_point() {
+ return;
+}
+vec2 v() {
+ return vec2(0.0f);
+}
+
+void f() {
+ vec2 a = vec2(1.0f);
+ vec2 b = vec2(a);
+ vec2 tint_symbol = v();
+ vec2 c = vec2(tint_symbol);
+ vec2 d = vec2((a * 2.0f));
+}
+
diff --git a/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.ir.dxc.hlsl b/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.ir.dxc.hlsl
new file mode 100644
index 0000000..af8379a
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.ir.dxc.hlsl
@@ -0,0 +1,16 @@
+
+float2 v() {
+ return (0.0f).xx;
+}
+
+void f() {
+ float2 a = (1.0f).xx;
+ float2 b = float2(a);
+ float2 c = float2(v());
+ float2 d = float2((a * 2.0f));
+}
+
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+}
+
diff --git a/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.ir.fxc.hlsl b/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.ir.fxc.hlsl
new file mode 100644
index 0000000..af8379a
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.ir.fxc.hlsl
@@ -0,0 +1,16 @@
+
+float2 v() {
+ return (0.0f).xx;
+}
+
+void f() {
+ float2 a = (1.0f).xx;
+ float2 b = float2(a);
+ float2 c = float2(v());
+ float2 d = float2((a * 2.0f));
+}
+
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+}
+
diff --git a/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.ir.glsl b/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.ir.glsl
new file mode 100644
index 0000000..720edee
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.ir.glsl
@@ -0,0 +1,14 @@
+#version 310 es
+
+vec2 v() {
+ return vec2(0.0f);
+}
+void f() {
+ vec2 a = vec2(1.0f);
+ vec2 b = vec2(a);
+ vec2 c = vec2(v());
+ vec2 d = vec2((a * 2.0f));
+}
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
+void main() {
+}
diff --git a/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.ir.msl b/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.ir.msl
new file mode 100644
index 0000000..a3cc2d9
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.ir.msl
@@ -0,0 +1,13 @@
+#include <metal_stdlib>
+using namespace metal;
+
+float2 v() {
+ return float2(0.0f);
+}
+
+void f() {
+ float2 const a = float2(1.0f);
+ float2 const b = float2(a);
+ float2 const c = float2(v());
+ float2 const d = float2((a * 2.0f));
+}
diff --git a/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.msl b/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.msl
new file mode 100644
index 0000000..f587ee5
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.msl
@@ -0,0 +1,15 @@
+#include <metal_stdlib>
+
+using namespace metal;
+float2 v() {
+ return float2(0.0f);
+}
+
+void f() {
+ float2 const a = float2(1.0f);
+ float2 const b = float2(a);
+ float2 const tint_symbol = v();
+ float2 const c = float2(tint_symbol);
+ float2 const d = float2((a * 2.0f));
+}
+
diff --git a/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.spvasm
new file mode 100644
index 0000000..e6917fd
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.spvasm
@@ -0,0 +1,39 @@
+; SPIR-V
+; Version: 1.3
+; Generator: Google Tint Compiler; 1
+; Bound: 18
+; Schema: 0
+ OpCapability Shader
+ OpMemoryModel Logical GLSL450
+ OpEntryPoint GLCompute %unused_entry_point "unused_entry_point"
+ OpExecutionMode %unused_entry_point LocalSize 1 1 1
+ OpName %v "v"
+ OpName %f "f"
+ OpName %a "a"
+ OpName %a "b"
+ OpName %c "c"
+ OpName %d "d"
+ OpName %unused_entry_point "unused_entry_point"
+ %float = OpTypeFloat 32
+ %v2float = OpTypeVector %float 2
+ %4 = OpTypeFunction %v2float
+ %6 = OpConstantNull %v2float
+ %void = OpTypeVoid
+ %9 = OpTypeFunction %void
+ %float_1 = OpConstant %float 1
+ %a = OpConstantComposite %v2float %float_1 %float_1
+ %float_2 = OpConstant %float 2
+ %v = OpFunction %v2float None %4
+ %5 = OpLabel
+ OpReturnValue %6
+ OpFunctionEnd
+ %f = OpFunction %void None %9
+ %10 = OpLabel
+ %c = OpFunctionCall %v2float %v
+ %d = OpVectorTimesScalar %v2float %a %float_2
+ OpReturn
+ OpFunctionEnd
+%unused_entry_point = OpFunction %void None %9
+ %17 = OpLabel
+ OpReturn
+ OpFunctionEnd
diff --git a/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.wgsl b/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.wgsl
new file mode 100644
index 0000000..9f849f1
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec2/single_value.wgsl.expected.wgsl
@@ -0,0 +1,10 @@
+fn v() -> vec2<f32> {
+ return vec2(0.0);
+}
+
+fn f() {
+ let a = vec2(1.0);
+ let b = vec2(a);
+ let c = vec2(v());
+ let d = vec2((a * 2));
+}
diff --git a/test/tint/expressions/type_ctor/vec3/single_value.wgsl b/test/tint/expressions/type_ctor/vec3/single_value.wgsl
new file mode 100644
index 0000000..4d16d4d
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec3/single_value.wgsl
@@ -0,0 +1,10 @@
+fn v() -> vec3<f32> {
+ return vec3(0.0);
+}
+
+fn f() {
+ let a = vec3(1.0);
+ let b = vec3(a);
+ let c = vec3(v());
+ let d = vec3(a * 2);
+}
diff --git a/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.dxc.hlsl b/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.dxc.hlsl
new file mode 100644
index 0000000..37f0b34
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.dxc.hlsl
@@ -0,0 +1,16 @@
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+ return;
+}
+
+float3 v() {
+ return (0.0f).xxx;
+}
+
+void f() {
+ float3 a = (1.0f).xxx;
+ float3 b = float3(a);
+ float3 tint_symbol = v();
+ float3 c = float3(tint_symbol);
+ float3 d = float3((a * 2.0f));
+}
diff --git a/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.fxc.hlsl b/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.fxc.hlsl
new file mode 100644
index 0000000..37f0b34
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.fxc.hlsl
@@ -0,0 +1,16 @@
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+ return;
+}
+
+float3 v() {
+ return (0.0f).xxx;
+}
+
+void f() {
+ float3 a = (1.0f).xxx;
+ float3 b = float3(a);
+ float3 tint_symbol = v();
+ float3 c = float3(tint_symbol);
+ float3 d = float3((a * 2.0f));
+}
diff --git a/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.glsl b/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.glsl
new file mode 100644
index 0000000..db4bd4b
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.glsl
@@ -0,0 +1,18 @@
+#version 310 es
+
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
+void unused_entry_point() {
+ return;
+}
+vec3 v() {
+ return vec3(0.0f);
+}
+
+void f() {
+ vec3 a = vec3(1.0f);
+ vec3 b = vec3(a);
+ vec3 tint_symbol = v();
+ vec3 c = vec3(tint_symbol);
+ vec3 d = vec3((a * 2.0f));
+}
+
diff --git a/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.ir.dxc.hlsl b/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.ir.dxc.hlsl
new file mode 100644
index 0000000..247d408
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.ir.dxc.hlsl
@@ -0,0 +1,16 @@
+
+float3 v() {
+ return (0.0f).xxx;
+}
+
+void f() {
+ float3 a = (1.0f).xxx;
+ float3 b = float3(a);
+ float3 c = float3(v());
+ float3 d = float3((a * 2.0f));
+}
+
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+}
+
diff --git a/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.ir.fxc.hlsl b/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.ir.fxc.hlsl
new file mode 100644
index 0000000..247d408
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.ir.fxc.hlsl
@@ -0,0 +1,16 @@
+
+float3 v() {
+ return (0.0f).xxx;
+}
+
+void f() {
+ float3 a = (1.0f).xxx;
+ float3 b = float3(a);
+ float3 c = float3(v());
+ float3 d = float3((a * 2.0f));
+}
+
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+}
+
diff --git a/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.ir.glsl b/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.ir.glsl
new file mode 100644
index 0000000..e9f0559
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.ir.glsl
@@ -0,0 +1,14 @@
+#version 310 es
+
+vec3 v() {
+ return vec3(0.0f);
+}
+void f() {
+ vec3 a = vec3(1.0f);
+ vec3 b = vec3(a);
+ vec3 c = vec3(v());
+ vec3 d = vec3((a * 2.0f));
+}
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
+void main() {
+}
diff --git a/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.ir.msl b/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.ir.msl
new file mode 100644
index 0000000..6cfdfc6
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.ir.msl
@@ -0,0 +1,13 @@
+#include <metal_stdlib>
+using namespace metal;
+
+float3 v() {
+ return float3(0.0f);
+}
+
+void f() {
+ float3 const a = float3(1.0f);
+ float3 const b = float3(a);
+ float3 const c = float3(v());
+ float3 const d = float3((a * 2.0f));
+}
diff --git a/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.msl b/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.msl
new file mode 100644
index 0000000..829e6b6
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.msl
@@ -0,0 +1,15 @@
+#include <metal_stdlib>
+
+using namespace metal;
+float3 v() {
+ return float3(0.0f);
+}
+
+void f() {
+ float3 const a = float3(1.0f);
+ float3 const b = float3(a);
+ float3 const tint_symbol = v();
+ float3 const c = float3(tint_symbol);
+ float3 const d = float3((a * 2.0f));
+}
+
diff --git a/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.spvasm
new file mode 100644
index 0000000..3847c22
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.spvasm
@@ -0,0 +1,39 @@
+; SPIR-V
+; Version: 1.3
+; Generator: Google Tint Compiler; 1
+; Bound: 18
+; Schema: 0
+ OpCapability Shader
+ OpMemoryModel Logical GLSL450
+ OpEntryPoint GLCompute %unused_entry_point "unused_entry_point"
+ OpExecutionMode %unused_entry_point LocalSize 1 1 1
+ OpName %v "v"
+ OpName %f "f"
+ OpName %a "a"
+ OpName %a "b"
+ OpName %c "c"
+ OpName %d "d"
+ OpName %unused_entry_point "unused_entry_point"
+ %float = OpTypeFloat 32
+ %v3float = OpTypeVector %float 3
+ %4 = OpTypeFunction %v3float
+ %6 = OpConstantNull %v3float
+ %void = OpTypeVoid
+ %9 = OpTypeFunction %void
+ %float_1 = OpConstant %float 1
+ %a = OpConstantComposite %v3float %float_1 %float_1 %float_1
+ %float_2 = OpConstant %float 2
+ %v = OpFunction %v3float None %4
+ %5 = OpLabel
+ OpReturnValue %6
+ OpFunctionEnd
+ %f = OpFunction %void None %9
+ %10 = OpLabel
+ %c = OpFunctionCall %v3float %v
+ %d = OpVectorTimesScalar %v3float %a %float_2
+ OpReturn
+ OpFunctionEnd
+%unused_entry_point = OpFunction %void None %9
+ %17 = OpLabel
+ OpReturn
+ OpFunctionEnd
diff --git a/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.wgsl b/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.wgsl
new file mode 100644
index 0000000..7cd384f
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec3/single_value.wgsl.expected.wgsl
@@ -0,0 +1,10 @@
+fn v() -> vec3<f32> {
+ return vec3(0.0);
+}
+
+fn f() {
+ let a = vec3(1.0);
+ let b = vec3(a);
+ let c = vec3(v());
+ let d = vec3((a * 2));
+}
diff --git a/test/tint/expressions/type_ctor/vec4/single_value.wgsl b/test/tint/expressions/type_ctor/vec4/single_value.wgsl
new file mode 100644
index 0000000..0d90e7d
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec4/single_value.wgsl
@@ -0,0 +1,10 @@
+fn v() -> vec4<f32> {
+ return vec4(0.0);
+}
+
+fn f() {
+ let a = vec4(1.0);
+ let b = vec4(a);
+ let c = vec4(v());
+ let d = vec4(a * 2);
+}
diff --git a/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.dxc.hlsl b/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.dxc.hlsl
new file mode 100644
index 0000000..82e44a9
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.dxc.hlsl
@@ -0,0 +1,16 @@
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+ return;
+}
+
+float4 v() {
+ return (0.0f).xxxx;
+}
+
+void f() {
+ float4 a = (1.0f).xxxx;
+ float4 b = float4(a);
+ float4 tint_symbol = v();
+ float4 c = float4(tint_symbol);
+ float4 d = float4((a * 2.0f));
+}
diff --git a/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.fxc.hlsl b/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.fxc.hlsl
new file mode 100644
index 0000000..82e44a9
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.fxc.hlsl
@@ -0,0 +1,16 @@
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+ return;
+}
+
+float4 v() {
+ return (0.0f).xxxx;
+}
+
+void f() {
+ float4 a = (1.0f).xxxx;
+ float4 b = float4(a);
+ float4 tint_symbol = v();
+ float4 c = float4(tint_symbol);
+ float4 d = float4((a * 2.0f));
+}
diff --git a/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.glsl b/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.glsl
new file mode 100644
index 0000000..22303db
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.glsl
@@ -0,0 +1,18 @@
+#version 310 es
+
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
+void unused_entry_point() {
+ return;
+}
+vec4 v() {
+ return vec4(0.0f);
+}
+
+void f() {
+ vec4 a = vec4(1.0f);
+ vec4 b = vec4(a);
+ vec4 tint_symbol = v();
+ vec4 c = vec4(tint_symbol);
+ vec4 d = vec4((a * 2.0f));
+}
+
diff --git a/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.ir.dxc.hlsl b/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.ir.dxc.hlsl
new file mode 100644
index 0000000..b725a25
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.ir.dxc.hlsl
@@ -0,0 +1,16 @@
+
+float4 v() {
+ return (0.0f).xxxx;
+}
+
+void f() {
+ float4 a = (1.0f).xxxx;
+ float4 b = float4(a);
+ float4 c = float4(v());
+ float4 d = float4((a * 2.0f));
+}
+
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+}
+
diff --git a/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.ir.fxc.hlsl b/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.ir.fxc.hlsl
new file mode 100644
index 0000000..b725a25
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.ir.fxc.hlsl
@@ -0,0 +1,16 @@
+
+float4 v() {
+ return (0.0f).xxxx;
+}
+
+void f() {
+ float4 a = (1.0f).xxxx;
+ float4 b = float4(a);
+ float4 c = float4(v());
+ float4 d = float4((a * 2.0f));
+}
+
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+}
+
diff --git a/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.ir.glsl b/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.ir.glsl
new file mode 100644
index 0000000..1242006
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.ir.glsl
@@ -0,0 +1,14 @@
+#version 310 es
+
+vec4 v() {
+ return vec4(0.0f);
+}
+void f() {
+ vec4 a = vec4(1.0f);
+ vec4 b = vec4(a);
+ vec4 c = vec4(v());
+ vec4 d = vec4((a * 2.0f));
+}
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
+void main() {
+}
diff --git a/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.ir.msl b/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.ir.msl
new file mode 100644
index 0000000..7a9ce35
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.ir.msl
@@ -0,0 +1,13 @@
+#include <metal_stdlib>
+using namespace metal;
+
+float4 v() {
+ return float4(0.0f);
+}
+
+void f() {
+ float4 const a = float4(1.0f);
+ float4 const b = float4(a);
+ float4 const c = float4(v());
+ float4 const d = float4((a * 2.0f));
+}
diff --git a/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.msl b/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.msl
new file mode 100644
index 0000000..2f6bb55
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.msl
@@ -0,0 +1,15 @@
+#include <metal_stdlib>
+
+using namespace metal;
+float4 v() {
+ return float4(0.0f);
+}
+
+void f() {
+ float4 const a = float4(1.0f);
+ float4 const b = float4(a);
+ float4 const tint_symbol = v();
+ float4 const c = float4(tint_symbol);
+ float4 const d = float4((a * 2.0f));
+}
+
diff --git a/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.spvasm b/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.spvasm
new file mode 100644
index 0000000..88ec54a
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.spvasm
@@ -0,0 +1,39 @@
+; SPIR-V
+; Version: 1.3
+; Generator: Google Tint Compiler; 1
+; Bound: 18
+; Schema: 0
+ OpCapability Shader
+ OpMemoryModel Logical GLSL450
+ OpEntryPoint GLCompute %unused_entry_point "unused_entry_point"
+ OpExecutionMode %unused_entry_point LocalSize 1 1 1
+ OpName %v "v"
+ OpName %f "f"
+ OpName %a "a"
+ OpName %a "b"
+ OpName %c "c"
+ OpName %d "d"
+ OpName %unused_entry_point "unused_entry_point"
+ %float = OpTypeFloat 32
+ %v4float = OpTypeVector %float 4
+ %4 = OpTypeFunction %v4float
+ %6 = OpConstantNull %v4float
+ %void = OpTypeVoid
+ %9 = OpTypeFunction %void
+ %float_1 = OpConstant %float 1
+ %a = OpConstantComposite %v4float %float_1 %float_1 %float_1 %float_1
+ %float_2 = OpConstant %float 2
+ %v = OpFunction %v4float None %4
+ %5 = OpLabel
+ OpReturnValue %6
+ OpFunctionEnd
+ %f = OpFunction %void None %9
+ %10 = OpLabel
+ %c = OpFunctionCall %v4float %v
+ %d = OpVectorTimesScalar %v4float %a %float_2
+ OpReturn
+ OpFunctionEnd
+%unused_entry_point = OpFunction %void None %9
+ %17 = OpLabel
+ OpReturn
+ OpFunctionEnd
diff --git a/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.wgsl b/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.wgsl
new file mode 100644
index 0000000..eaf2163
--- /dev/null
+++ b/test/tint/expressions/type_ctor/vec4/single_value.wgsl.expected.wgsl
@@ -0,0 +1,10 @@
+fn v() -> vec4<f32> {
+ return vec4(0.0);
+}
+
+fn f() {
+ let a = vec4(1.0);
+ let b = vec4(a);
+ let c = vec4(v());
+ let d = vec4((a * 2));
+}
