encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GLSL: fix barriers. 

Bug: tint:1416
Change-Id: I138932cc0d702289684c4db80b4640df43b41833
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/79420
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: David Neto <dneto@google.com>
Commit-Queue: Stephen White <senorblanco@chromium.org>
This commit is contained in:
Stephen White 2022-02-05 00:15:34 +00:00 committed by Tint LUCI CQ
parent b79f51ece3
commit deec53332f
45 changed files with 66 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/writer/glsl/generator_impl.cc
View File

@ -1165,9 +1165,9 @@ bool GeneratorImpl::EmitBarrierCall(std::ostream& out,
// TODO(crbug.com/tint/661): Combine sequential barriers to a single
// instruction.
if (builtin->Type() == sem::BuiltinType::kWorkgroupBarrier) {
out << "memoryBarrierShared()";
out << "barrier()";
} else if (builtin->Type() == sem::BuiltinType::kStorageBarrier) {
out << "memoryBarrierBuffer()";
out << "{ barrier(); memoryBarrierBuffer(); }";
} else {
TINT_UNREACHABLE(Writer, diagnostics_)
<< "unexpected barrier builtin type " << sem::str(builtin->Type());

18
src/writer/glsl/generator_impl_builtin_test.cc
View File

@ -645,6 +645,8 @@ TEST_F(GlslGeneratorImplTest_Builtin, Unpack2x16Float) {
HasSubstr("f16tof32(uint2(tint_tmp & 0xffff, tint_tmp >> 16))"));
}
#endif
TEST_F(GlslGeneratorImplTest_Builtin, StorageBarrier) {
Func("main", {}, ty.void_(),
{CallStmt(Call("storageBarrier"))},
@ -656,9 +658,12 @@ TEST_F(GlslGeneratorImplTest_Builtin, StorageBarrier) {
GeneratorImpl& gen = Build();
ASSERT_TRUE(gen.Generate()) << gen.error();
EXPECT_EQ(gen.result(), R"(layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
EXPECT_EQ(gen.result(), R"(#version 310 es
precision mediump float;
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
void main() {
DeviceMemoryBarrierWithGroupSync();
{ barrier(); memoryBarrierBuffer(); };
return;
}
)");
@ -675,16 +680,17 @@ TEST_F(GlslGeneratorImplTest_Builtin, WorkgroupBarrier) {
GeneratorImpl& gen = Build();
ASSERT_TRUE(gen.Generate()) << gen.error();
EXPECT_EQ(gen.result(), R"(layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
EXPECT_EQ(gen.result(), R"(#version 310 es
precision mediump float;
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
void main() {
GroupMemoryBarrierWithGroupSync();
barrier();
return;
}
)");
}
#endif
TEST_F(GlslGeneratorImplTest_Builtin, DotI32) {
Global("v", ty.vec3<i32>(), ast::StorageClass::kPrivate);
WrapInFunction(CallStmt(Call("dot", "v", "v")));

2
test/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.glsl
View File

@ -28,7 +28,7 @@ void f(uint local_invocation_index) {
s.data[i] = 0;
}
}
memoryBarrierShared();
barrier();
result.tint_symbol = s.data[ubo.dynamic_idx];
}

2
test/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.glsl
View File

@ -28,7 +28,7 @@ void f(uint local_invocation_index) {
s.data[i] = 0;
}
}
memoryBarrierShared();
barrier();
s.data[ubo.dynamic_idx] = 1;
result.tint_symbol = s.data[3];
}

6
test/bug/tint/914.wgsl.expected.glsl
View File

@ -71,7 +71,7 @@ void tint_symbol(uvec3 local_id, uvec3 global_id, uint local_invocation_index) {
mm_Bsub[i][i_1] = 0.0f;
}
}
memoryBarrierShared();
barrier();
uint tileRow = (local_id.y * RowPerThread);
uint tileCol = (local_id.x * ColPerThread);
uint globalRow = (global_id.y * RowPerThread);
@ -113,7 +113,7 @@ void tint_symbol(uvec3 local_id, uvec3 global_id, uint local_invocation_index) {
}
}
}
memoryBarrierShared();
barrier();
{
for(uint k = 0u; (k < TileInner); k = (k + 1u)) {
{
@ -134,7 +134,7 @@ void tint_symbol(uvec3 local_id, uvec3 global_id, uint local_invocation_index) {
}
}
}
memoryBarrierShared();
barrier();
}
}
{

4
test/bug/tint/942.wgsl.expected.glsl
View File

@ -32,7 +32,7 @@ void tint_symbol(uvec3 WorkGroupID, uvec3 LocalInvocationID, uint local_invocati
tile[i_1][i_2] = vec3(0.0f, 0.0f, 0.0f);
}
}
memoryBarrierShared();
barrier();
uint filterOffset = ((params.filterDim - 1u) / 2u);
ivec2 dims = textureSize(inputTex_1, 0);
ivec2 baseIndex = (ivec2(((WorkGroupID.xy * uvec2(params.blockDim, 4u)) + (LocalInvocationID.xy * uvec2(4u, 1u)))) - ivec2(int(filterOffset), 0));
@ -49,7 +49,7 @@ void tint_symbol(uvec3 WorkGroupID, uvec3 LocalInvocationID, uint local_invocati
}
}
}
memoryBarrierShared();
barrier();
{
for(uint r = 0u; (r < 4u); r = (r + 1u)) {
{

6
test/bug/tint/943.spvasm.expected.glsl
View File

@ -277,7 +277,7 @@ void mm_matMul_i1_i1_i1_(inout int dimAOuter, inout int dimInner, inout int dimB
}
}
}
memoryBarrierShared();
barrier();
k = 0;
{
for(; (k < 64); k = (k + 1)) {
@ -309,7 +309,7 @@ void mm_matMul_i1_i1_i1_(inout int dimAOuter, inout int dimInner, inout int dimB
}
}
}
memoryBarrierShared();
barrier();
}
}
innerRow_4 = 0;
@ -387,7 +387,7 @@ void tint_symbol_2(uvec3 tint_symbol_3, uvec3 tint_symbol_4, uint local_invocati
mm_Asub[i][i_1] = 0.0f;
}
}
memoryBarrierShared();
barrier();
tint_symbol = tint_symbol_3;
tint_symbol_1 = tint_symbol_4;
main_1();

2
test/builtins/gen/atomicAdd/794055.wgsl.expected.glsl
View File

@ -10,7 +10,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0);
}
memoryBarrierShared();
barrier();
atomicAdd_794055();
}

2
test/builtins/gen/atomicAdd/d5db1d.wgsl.expected.glsl
View File

@ -10,7 +10,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0u);
}
memoryBarrierShared();
barrier();
atomicAdd_d5db1d();
}

2
test/builtins/gen/atomicAnd/34edd3.wgsl.expected.glsl
View File

@ -10,7 +10,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0u);
}
memoryBarrierShared();
barrier();
atomicAnd_34edd3();
}

2
test/builtins/gen/atomicAnd/45a819.wgsl.expected.glsl
View File

@ -10,7 +10,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0);
}
memoryBarrierShared();
barrier();
atomicAnd_45a819();
}

2
test/builtins/gen/atomicCompareExchangeWeak/89ea3b.wgsl.expected.glsl
View File

@ -18,7 +18,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0);
}
memoryBarrierShared();
barrier();
atomicCompareExchangeWeak_89ea3b();
}

2
test/builtins/gen/atomicCompareExchangeWeak/b2ab2c.wgsl.expected.glsl
View File

@ -18,7 +18,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0u);
}
memoryBarrierShared();
barrier();
atomicCompareExchangeWeak_b2ab2c();
}

2
test/builtins/gen/atomicExchange/0a5dca.wgsl.expected.glsl
View File

@ -10,7 +10,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0u);
}
memoryBarrierShared();
barrier();
atomicExchange_0a5dca();
}

2
test/builtins/gen/atomicExchange/e114ba.wgsl.expected.glsl
View File

@ -10,7 +10,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0);
}
memoryBarrierShared();
barrier();
atomicExchange_e114ba();
}

2
test/builtins/gen/atomicLoad/361bf1.wgsl.expected.glsl
View File

@ -10,7 +10,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0u);
}
memoryBarrierShared();
barrier();
atomicLoad_361bf1();
}

2
test/builtins/gen/atomicLoad/afcc03.wgsl.expected.glsl
View File

@ -10,7 +10,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0);
}
memoryBarrierShared();
barrier();
atomicLoad_afcc03();
}

2
test/builtins/gen/atomicMax/a89cc3.wgsl.expected.glsl
View File

@ -10,7 +10,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0);
}
memoryBarrierShared();
barrier();
atomicMax_a89cc3();
}

2
test/builtins/gen/atomicMax/beccfc.wgsl.expected.glsl
View File

@ -10,7 +10,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0u);
}
memoryBarrierShared();
barrier();
atomicMax_beccfc();
}

2
test/builtins/gen/atomicMin/278235.wgsl.expected.glsl
View File

@ -10,7 +10,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0);
}
memoryBarrierShared();
barrier();
atomicMin_278235();
}

2
test/builtins/gen/atomicMin/69d383.wgsl.expected.glsl
View File

@ -10,7 +10,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0u);
}
memoryBarrierShared();
barrier();
atomicMin_69d383();
}

2
test/builtins/gen/atomicOr/5e3d61.wgsl.expected.glsl
View File

@ -10,7 +10,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0u);
}
memoryBarrierShared();
barrier();
atomicOr_5e3d61();
}

2
test/builtins/gen/atomicOr/d09248.wgsl.expected.glsl
View File

@ -10,7 +10,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0);
}
memoryBarrierShared();
barrier();
atomicOr_d09248();
}

2
test/builtins/gen/atomicStore/726882.wgsl.expected.glsl
View File

@ -10,7 +10,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0u);
}
memoryBarrierShared();
barrier();
atomicStore_726882();
}

2
test/builtins/gen/atomicStore/8bea94.wgsl.expected.glsl
View File

@ -10,7 +10,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0);
}
memoryBarrierShared();
barrier();
atomicStore_8bea94();
}

2
test/builtins/gen/atomicSub/0d26c2.wgsl.expected.glsl
View File

@ -10,7 +10,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0u);
}
memoryBarrierShared();
barrier();
atomicSub_0d26c2();
}

2
test/builtins/gen/atomicSub/77883a.wgsl.expected.glsl
View File

@ -10,7 +10,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0);
}
memoryBarrierShared();
barrier();
atomicSub_77883a();
}

2
test/builtins/gen/atomicXor/75dc95.wgsl.expected.glsl
View File

@ -10,7 +10,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0);
}
memoryBarrierShared();
barrier();
atomicXor_75dc95();
}

2
test/builtins/gen/atomicXor/c8e6be.wgsl.expected.glsl
View File

@ -10,7 +10,7 @@ void compute_main(uint local_invocation_index) {
{
atomicExchange(arg_0, 0u);
}
memoryBarrierShared();
barrier();
atomicXor_c8e6be();
}

2
test/builtins/gen/storageBarrier/d87211.wgsl.expected.glsl
View File

@ -2,7 +2,7 @@
precision mediump float;
void storageBarrier_d87211() {
memoryBarrierBuffer();
{ barrier(); memoryBarrierBuffer(); };
}
void compute_main() {

2
test/builtins/gen/workgroupBarrier/a17f7f.wgsl.expected.glsl
View File

@ -2,7 +2,7 @@
precision mediump float;
void workgroupBarrier_a17f7f() {
memoryBarrierShared();
barrier();
}
void compute_main() {

2
test/ptr_ref/load/local/ptr_workgroup.wgsl.expected.glsl
View File

@ -6,7 +6,7 @@ void tint_symbol(uint local_invocation_index) {
{
i = 0;
}
memoryBarrierShared();
barrier();
i = 123;
int use = (i + 1);
}

2
test/var/initialization/workgroup/array.wgsl.expected.glsl
View File

@ -9,7 +9,7 @@ void tint_symbol(uint local_invocation_index) {
v[i] = 0;
}
}
memoryBarrierShared();
barrier();
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;

2
test/var/initialization/workgroup/matrix.wgsl.expected.glsl
View File

@ -6,7 +6,7 @@ void tint_symbol(uint local_invocation_index) {
{
v = mat2x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
}
memoryBarrierShared();
barrier();
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;

2
test/var/initialization/workgroup/scalar.wgsl.expected.glsl
View File

@ -6,7 +6,7 @@ void tint_symbol(uint local_invocation_index) {
{
v = 0;
}
memoryBarrierShared();
barrier();
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;

2
test/var/initialization/workgroup/struct.wgsl.expected.glsl
View File

@ -12,7 +12,7 @@ void tint_symbol(uint local_invocation_index) {
S tint_symbol_1 = S(0, 0.0f);
v = tint_symbol_1;
}
memoryBarrierShared();
barrier();
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;

2
test/var/initialization/workgroup/vector.wgsl.expected.glsl
View File

@ -6,7 +6,7 @@ void tint_symbol(uint local_invocation_index) {
{
v = ivec3(0, 0, 0);
}
memoryBarrierShared();
barrier();
}
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;

2
test/var/uses/many_workgroup_vars.wgsl.expected.glsl
View File

@ -204,7 +204,7 @@ void tint_symbol(uint idx) {
m98 = mat2(0.0f, 0.0f, 0.0f, 0.0f);
m99 = mat2(0.0f, 0.0f, 0.0f, 0.0f);
}
memoryBarrierShared();
barrier();
m00[0][0] = 1.0f;
m01[0][0] = 1.0f;
m02[0][0] = 1.0f;

6
test/var/uses/workgroup.wgsl.expected.glsl
View File

@ -10,7 +10,7 @@ void main1(uint local_invocation_index) {
{
a = 0;
}
memoryBarrierShared();
barrier();
a = 42;
uses_a();
}
@ -32,7 +32,7 @@ void main2(uint local_invocation_index_1) {
{
b = 0;
}
memoryBarrierShared();
barrier();
b = 7;
uses_b();
}
@ -75,7 +75,7 @@ void main3(uint local_invocation_index_2) {
a = 0;
b = 0;
}
memoryBarrierShared();
barrier();
outer();
no_uses();
}

2
test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.spvasm.expected.glsl
View File

@ -40,7 +40,7 @@ void main_1() {
break;
}
}
memoryBarrierShared();
barrier();
}
}
if ((lid == 0)) {

2
test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl.expected.glsl
View File

@ -44,7 +44,7 @@ void main_1() {
break;
}
}
memoryBarrierShared();
barrier();
}
}
if ((lid == 0)) {

4
test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.spvasm.expected.glsl
View File

@ -37,7 +37,7 @@ void main_1() {
float x_13 = GLF_live2gl_FragCoord.x;
if ((int(x_13) < 120)) {
} else {
memoryBarrierShared();
barrier();
}
}
}
@ -62,7 +62,7 @@ void main_1() {
}
float x_16 = GLF_live2gl_FragCoord.x;
GLF_dead3x = x_16;
memoryBarrierShared();
barrier();
}
}
x_12.x_compute_data[0] = 42u;

4
test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl.expected.glsl
View File

@ -41,7 +41,7 @@ void main_1() {
float x_13 = GLF_live2gl_FragCoord.x;
if ((int(x_13) < 120)) {
} else {
memoryBarrierShared();
barrier();
}
}
}
@ -66,7 +66,7 @@ void main_1() {
}
float x_16 = GLF_live2gl_FragCoord.x;
GLF_dead3x = x_16;
memoryBarrierShared();
barrier();
}
}
x_12.x_compute_data[0] = 42u;

2
test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.spvasm.expected.glsl
View File

@ -70,7 +70,7 @@ void main_1() {
float x_118 = x_10.injectionSwitch.x;
float x_120 = x_10.injectionSwitch.y;
if ((x_118 > x_120)) {
memoryBarrierShared();
barrier();
}
}
}

2
test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl.expected.glsl
View File

@ -74,7 +74,7 @@ void main_1() {
float x_118 = x_10.injectionSwitch.x;
float x_120 = x_10.injectionSwitch.y;
if ((x_118 > x_120)) {
memoryBarrierShared();
barrier();
}
}
}