shifathosn
/
sharpemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SpirvTranslator] Synchronize shared memory phases in multi block shaders 

Co-authored-by: TarkusR <90155059+TarkusR@users.noreply.github.com>
This commit is contained in:
ParantezTech 2026-10-01 16:40:37 +03:00
parent e20b894e1e
commit 216f13af52
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/SharpEmu.ShaderCompiler.Vulkan/Gen5SpirvTranslator.cs
View File

@ -1361,8 +1361,7 @@ public static partial class Gen5SpirvTranslator
error = string.Empty;
var block = blocks[blockIndex];
// One guest wave can span two host subgroups. Keep its shared-memory phases ordered.
// Restrict added barriers to a single block, where all invocations follow the same path.
var synchronizeSharedMemory = _emulateWave64 && blocks.Count == 1;
var synchronizeSharedMemory = _emulateWave64;
var sharedMemoryPhase = SharedMemoryPhase.None;
for (var index = block.StartIndex; index < block.EndIndex; index++)
{

14
tests/SharpEmu.ShaderCompiler.Tests/Gen5SharedMemoryBarrierTests.cs
View File

@ -11,12 +11,14 @@ namespace SharpEmu.ShaderCompiler.Tests;
public sealed class Gen5SharedMemoryBarrierTests
{
[Theory]
[InlineData(64u, 64u, false, 2)]
[InlineData(64u, 64u, true, 2)]
[InlineData(32u, 64u, false, 0)]
[InlineData(64u, 128u, false, 0)]
[InlineData(64u, 64u, false, false, 2)]
[InlineData(64u, 64u, true, false, 2)]
[InlineData(32u, 64u, false, false, 0)]
[InlineData(64u, 128u, false, false, 0)]
[InlineData(64u, 64u, false, true, 2)]
[InlineData(32u, 64u, false, true, 0)]
public void SharedMemoryPhases_SynchronizeOnlySingleWaveGroups(
uint waveSize, uint threadCount, bool explicitBarrier, int expectedBarriers)
uint waveSize, uint threadCount, bool explicitBarrier, bool splitBlocks, int expectedBarriers)
{
var instructions = new List<Gen5ShaderInstruction>
{
@ -25,6 +27,8 @@ public sealed class Gen5SharedMemoryBarrierTests
};
if (explicitBarrier)
instructions.Add(new(8, Gen5ShaderEncoding.Sopp, "SBarrier", [0u], [], [], null));
if (splitBlocks)
instructions.Add(new(8, Gen5ShaderEncoding.Sopp, "SBranch", [0u], [], [], null));
instructions.Add(new(12, Gen5ShaderEncoding.Ds, "DsReadB32", [0u, 0u],
[Gen5Operand.Vector(0)], [Gen5Operand.Vector(2)], new Gen5DataShareControl(0, 0, false)));
instructions.Add(new(20, Gen5ShaderEncoding.Sopp, "SEndpgm", [0u], [], [], null));