Update samples/function to call the `main` function.
The `main` function was not called by the entry point `ep`. This means
it maybe stripped from the file if `SingleEntryPoint` was run. This Cl
calls `main` from `ep` to keep it from being stripped.
Bug: 364028284
Change-Id: I8cec2461d31055fdc234a6ff70542e7a983e1561
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/205254
Auto-Submit: dan sinclair <dsinclair@chromium.org>
Reviewed-by: James Price <jrprice@google.com>
Commit-Queue: James Price <jrprice@google.com>
diff --git a/test/tint/samples/function.wgsl b/test/tint/samples/function.wgsl
index 32af951..d88af0b 100644
--- a/test/tint/samples/function.wgsl
+++ b/test/tint/samples/function.wgsl
@@ -31,4 +31,5 @@
@compute @workgroup_size(2)
fn ep() {
+ let a = main();
}
diff --git a/test/tint/samples/function.wgsl.expected.dxc.hlsl b/test/tint/samples/function.wgsl.expected.dxc.hlsl
index f8dc23c..a8ada0c 100644
--- a/test/tint/samples/function.wgsl.expected.dxc.hlsl
+++ b/test/tint/samples/function.wgsl.expected.dxc.hlsl
@@ -4,5 +4,6 @@
[numthreads(2, 1, 1)]
void ep() {
+ float a = main();
return;
}
diff --git a/test/tint/samples/function.wgsl.expected.fxc.hlsl b/test/tint/samples/function.wgsl.expected.fxc.hlsl
index f8dc23c..a8ada0c 100644
--- a/test/tint/samples/function.wgsl.expected.fxc.hlsl
+++ b/test/tint/samples/function.wgsl.expected.fxc.hlsl
@@ -4,5 +4,6 @@
[numthreads(2, 1, 1)]
void ep() {
+ float a = main();
return;
}
diff --git a/test/tint/samples/function.wgsl.expected.glsl b/test/tint/samples/function.wgsl.expected.glsl
index c1b3bd4..7c4b061 100644
--- a/test/tint/samples/function.wgsl.expected.glsl
+++ b/test/tint/samples/function.wgsl.expected.glsl
@@ -1,6 +1,11 @@
#version 310 es
+float tint_symbol() {
+ return 0.40000000596046447754f;
+}
+
void ep() {
+ float a = tint_symbol();
}
layout(local_size_x = 2, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/samples/function.wgsl.expected.ir.dxc.hlsl b/test/tint/samples/function.wgsl.expected.ir.dxc.hlsl
index cbccf0f..0341c34 100644
--- a/test/tint/samples/function.wgsl.expected.ir.dxc.hlsl
+++ b/test/tint/samples/function.wgsl.expected.ir.dxc.hlsl
@@ -5,5 +5,6 @@
[numthreads(2, 1, 1)]
void ep() {
+ float a = main();
}
diff --git a/test/tint/samples/function.wgsl.expected.ir.fxc.hlsl b/test/tint/samples/function.wgsl.expected.ir.fxc.hlsl
index cbccf0f..0341c34 100644
--- a/test/tint/samples/function.wgsl.expected.ir.fxc.hlsl
+++ b/test/tint/samples/function.wgsl.expected.ir.fxc.hlsl
@@ -5,5 +5,6 @@
[numthreads(2, 1, 1)]
void ep() {
+ float a = main();
}
diff --git a/test/tint/samples/function.wgsl.expected.ir.glsl b/test/tint/samples/function.wgsl.expected.ir.glsl
index 1c35517..33c0cff 100644
--- a/test/tint/samples/function.wgsl.expected.ir.glsl
+++ b/test/tint/samples/function.wgsl.expected.ir.glsl
@@ -1,5 +1,9 @@
#version 310 es
+float tint_symbol() {
+ return 0.40000000596046447754f;
+}
layout(local_size_x = 2, local_size_y = 1, local_size_z = 1) in;
void main() {
+ float a = tint_symbol();
}
diff --git a/test/tint/samples/function.wgsl.expected.ir.msl b/test/tint/samples/function.wgsl.expected.ir.msl
index e0669f3..3871038 100644
--- a/test/tint/samples/function.wgsl.expected.ir.msl
+++ b/test/tint/samples/function.wgsl.expected.ir.msl
@@ -6,4 +6,5 @@
}
kernel void ep() {
+ float const a = tint_symbol();
}
diff --git a/test/tint/samples/function.wgsl.expected.msl b/test/tint/samples/function.wgsl.expected.msl
index 43d2a28..fc6f16f 100644
--- a/test/tint/samples/function.wgsl.expected.msl
+++ b/test/tint/samples/function.wgsl.expected.msl
@@ -6,6 +6,7 @@
}
kernel void ep() {
+ float const a = tint_symbol();
return;
}
diff --git a/test/tint/samples/function.wgsl.expected.spvasm b/test/tint/samples/function.wgsl.expected.spvasm
index ea62968..2d9c763 100644
--- a/test/tint/samples/function.wgsl.expected.spvasm
+++ b/test/tint/samples/function.wgsl.expected.spvasm
@@ -1,7 +1,7 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 1
-; Bound: 10
+; Bound: 11
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
@@ -9,6 +9,7 @@
OpExecutionMode %ep LocalSize 2 1 1
OpName %main "main"
OpName %ep "ep"
+ OpName %a "a"
%float = OpTypeFloat 32
%3 = OpTypeFunction %float
%float_0_400000006 = OpConstant %float 0.400000006
@@ -20,5 +21,6 @@
OpFunctionEnd
%ep = OpFunction %void None %8
%9 = OpLabel
+ %a = OpFunctionCall %float %main
OpReturn
OpFunctionEnd
diff --git a/test/tint/samples/function.wgsl.expected.wgsl b/test/tint/samples/function.wgsl.expected.wgsl
index 23b97bb..dacc7d1 100644
--- a/test/tint/samples/function.wgsl.expected.wgsl
+++ b/test/tint/samples/function.wgsl.expected.wgsl
@@ -4,4 +4,5 @@
@compute @workgroup_size(2)
fn ep() {
+ let a = main();
}
