alex/vello
1
0
Fork 0
mirror of https://github.com/italicsjenga/vello.git synced 2024-10-17 15:01:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #128 from linebender/prefix_war

Browse source 
Fix write-after-read in prefix test
This commit is contained in:
Raph Levien 2021-11-16 08:10:20 -08:00 committed by GitHub
parent 80b6150bd7 8015eb25a1
commit 95d356c08f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
piet-gpu/shader/elements.comp
View file

@ -248,9 +248,10 @@ void main() {
// The flag load is done only in the last thread. However, because the
// translation of memoryBarrierBuffer to Metal requires uniform control
// flow, we broadcast it to all threads.
barrier();
memoryBarrierBuffer();
barrier();
uint flag = sh_flag;
barrier();
if (flag == FLAG_PREFIX_READY) {
if (gl_LocalInvocationID.x == WG_SIZE - 1) {
@ -293,6 +294,7 @@ void main() {
}
barrier();
flag = sh_flag;
barrier();
if (flag == FLAG_PREFIX_READY) {
break;
}

BIN
piet-gpu/shader/elements.spv
View file

Binary file not shown.

BIN
piet-gpu/shader/kernel4.spv
View file

Binary file not shown.

BIN
tests/shader/gen/prefix.dxil
View file

Binary file not shown.

2
tests/shader/gen/prefix.hlsl
View file

@ -109,6 +109,7 @@ void comp_main()
GroupMemoryBarrierWithGroupSync();
DeviceMemoryBarrier();
uint flag_1 = sh_flag;
GroupMemoryBarrierWithGroupSync();
if (flag_1 == 2u)
{
if (gl_LocalInvocationID.x == 511u)
@ -174,6 +175,7 @@ void comp_main()
}
GroupMemoryBarrierWithGroupSync();
flag_1 = sh_flag;
GroupMemoryBarrierWithGroupSync();
if (flag_1 == 2u)
{
break;

2
tests/shader/gen/prefix.msl
View file

@ -160,6 +160,7 @@ kernel void main0(const device InBuf& _67 [[buffer(0)]], device OutBuf& _372 [[b
threadgroup_barrier(mem_flags::mem_threadgroup);
threadgroup_barrier(mem_flags::mem_device);
uint flag_1 = sh_flag;
threadgroup_barrier(mem_flags::mem_threadgroup);
if (flag_1 == 2u)
{
if (gl_LocalInvocationID.x == 511u)
@ -219,6 +220,7 @@ kernel void main0(const device InBuf& _67 [[buffer(0)]], device OutBuf& _372 [[b
}
threadgroup_barrier(mem_flags::mem_threadgroup);
flag_1 = sh_flag;
threadgroup_barrier(mem_flags::mem_threadgroup);
if (flag_1 == 2u)
{
break;

BIN
tests/shader/gen/prefix.spv
View file

Binary file not shown.

BIN
tests/shader/gen/prefix_atomic.dxil
View file

Binary file not shown.

2
tests/shader/gen/prefix_atomic.hlsl
View file

@ -112,6 +112,7 @@ void comp_main()
GroupMemoryBarrierWithGroupSync();
DeviceMemoryBarrier();
uint flag_1 = sh_flag;
GroupMemoryBarrierWithGroupSync();
if (flag_1 == 2u)
{
if (gl_LocalInvocationID.x == 511u)
@ -177,6 +178,7 @@ void comp_main()
}
GroupMemoryBarrierWithGroupSync();
flag_1 = sh_flag;
GroupMemoryBarrierWithGroupSync();
if (flag_1 == 2u)
{
break;

2
tests/shader/gen/prefix_atomic.msl
View file

@ -161,6 +161,7 @@ kernel void main0(const device InBuf& _67 [[buffer(0)]], device OutBuf& _372 [[b
threadgroup_barrier(mem_flags::mem_threadgroup);
threadgroup_barrier(mem_flags::mem_device);
uint flag_1 = sh_flag;
threadgroup_barrier(mem_flags::mem_threadgroup);
if (flag_1 == 2u)
{
if (gl_LocalInvocationID.x == 511u)
@ -220,6 +221,7 @@ kernel void main0(const device InBuf& _67 [[buffer(0)]], device OutBuf& _372 [[b
}
threadgroup_barrier(mem_flags::mem_threadgroup);
flag_1 = sh_flag;
threadgroup_barrier(mem_flags::mem_threadgroup);
if (flag_1 == 2u)
{
break;

BIN
tests/shader/gen/prefix_atomic.spv
View file

Binary file not shown.

BIN
tests/shader/gen/prefix_vkmm.spv
View file

Binary file not shown.

2
tests/shader/prefix.comp
View file

@ -144,6 +144,7 @@ void main() {
memoryBarrierBuffer();
#endif
uint flag = sh_flag;
barrier();
if (flag == FLAG_PREFIX_READY) {
if (gl_LocalInvocationID.x == WG_SIZE - 1) {
@ -185,6 +186,7 @@ void main() {
}
barrier();
flag = sh_flag;
barrier();
if (flag == FLAG_PREFIX_READY) {
break;
}