wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/ir: Introduce a simple control flow graph structurizer.

Browse Source 
The structurizer is implemented along the lines of what is usually called
the "structured program theorem": the control flow is completely
virtualized by mean of an additional TEMP register which stores the
block index which is currently running. The whole program is then
converted to a huge switch construction enclosed in a loop, executing
at each iteration the appropriate block and updating the register
depending on block jump instruction.

The algorithm's generality is also its major weakness: it accepts any
input program, even if its CFG is not reducible, but the output
program lacks any useful convergence information. It satisfies the
letter of the SPIR-V requirements, but it is expected that it will
be very inefficient to run on a GPU (unless a downstream compiler is
able to devirtualize the control flow and do a proper convergence
analysis pass). The algorithm is however very simple, and good enough
to at least pass tests, enabling further development. A better
alternative is expected to be upstreamed incrementally.

Side note: the structured program theorem is often called the
Böhm-Jacopini theorem; Böhm and Jacopini did indeed prove a variation
of it, but their algorithm is different from what is commontly attributed
to them and implemented here, so I opted for not using their name.
This commit is contained in:
Giovanni Mascellani
2024-01-16 23:56:43 +01:00
committed by Alexandre Julliard
parent 19aef21369
commit 51f13391e6
Notes: Alexandre Julliard 2024-02-06 23:42:19 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Conor McCarthy (@cmccarthy)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/607
8 changed files with 209 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tests/hlsl/switch.shader_test
View File

@@ -116,10 +116,10 @@ float4 main() : sv_target
[test]
uniform 0 uint4 2 0 0 0
todo(sm>=6) draw quad
draw quad
probe all rgba (1.1, 2.1, 3.1, 4.1)
uniform 0 uint4 1 0 0 0
todo(sm>=6) draw quad
draw quad
probe all rgba (1.0, 2.0, 3.0, 4.0)
% floats are accepted
@@ -145,10 +145,10 @@ float4 main() : sv_target
[test]
uniform 0 uint4 2 0 0 0
todo(sm>=6) draw quad
draw quad
probe all rgba (1.1, 2.1, 3.1, 4.1)
uniform 0 uint4 1 0 0 0
todo(sm>=6) draw quad
draw quad
probe all rgba (1.0, 2.0, 3.0, 4.0)
[pixel shader fail(sm>=6)]
@@ -173,10 +173,10 @@ float4 main() : sv_target
[test]
uniform 0 float4 2.0 0.0 0.0 0.0
todo(sm>=6) draw quad
draw quad
probe all rgba (1.1, 2.1, 3.1, 4.1)
uniform 0 float4 1.0 0.0 0.0 0.0
todo(sm>=6) draw quad
draw quad
probe all rgba (1.0, 2.0, 3.0, 4.0)
[pixel shader fail]
@@ -374,13 +374,13 @@ float4 main() : sv_target
[test]
uniform 0 uint4 2 0 0 0
todo(sm>=6) draw quad
draw quad
probe all rgba (1.1, 2.1, 3.1, 4.1)
uniform 0 uint4 1 0 0 0
todo(sm>=6) draw quad
draw quad
probe all rgba (1.2, 2.2, 3.2, 4.2)
uniform 0 uint4 0 0 0 0
todo(sm>=6) draw quad
draw quad
probe all rgba (1.0, 2.0, 3.0, 4.0)
% switch breaks within a loop
@@ -412,7 +412,7 @@ float4 main() : sv_target
[test]
uniform 0 uint4 2 0 0 0
todo(sm>=6) draw quad
draw quad
probe all rgba (5.0, 6.0, 7.0, 8.0)
% default case placement
@@ -443,13 +443,13 @@ float4 main() : sv_target
[test]
uniform 0 uint4 0 0 0 0
todo(sm>=6) draw quad
draw quad
probe all rgba (4.0, 5.0, 6.0, 7.0)
uniform 0 uint4 2 0 0 0
todo(sm>=6) draw quad
draw quad
probe all rgba (2.0, 3.0, 4.0, 5.0)
uniform 0 uint4 3 0 0 0
todo(sm>=6) draw quad
draw quad
probe all rgba (4.0, 5.0, 6.0, 7.0)
[pixel shader]
@@ -480,13 +480,13 @@ float4 main() : sv_target
[test]
uniform 0 uint4 3 0 0 0
todo(sm>=6) draw quad
draw quad
probe all rgba (1.0, 2.0, 3.0, 4.0)
uniform 0 uint4 0 0 0 0
todo(sm>=6) draw quad
draw quad
probe all rgba (4.0, 5.0, 6.0, 7.0)
uniform 0 uint4 5 0 0 0
todo(sm>=6) draw quad
draw quad
probe all rgba (1.0, 2.0, 3.0, 4.0)
% 'continue' is not supported in switches
@@ -546,10 +546,10 @@ float4 main() : sv_target
[test]
uniform 0 uint4 0 0 3 1
todo(sm>=6) draw quad
draw quad
probe all rgba (10.0, 11.0, 12.0, 13.0)
uniform 0 uint4 1 0 3 1
todo(sm>=6) draw quad
draw quad
probe all rgba (7.0, 8.0, 9.0, 10.0)
% return from a switch nested in a loop
@@ -580,8 +580,8 @@ float4 main() : sv_target
[test]
uniform 0 uint4 0 0 3 1
todo(sm>=6) draw quad
draw quad
probe all rgba (304.0, 305.0, 306.0, 307.0)
uniform 0 uint4 1 0 3 1
todo(sm>=6) draw quad
draw quad
probe all rgba (3.0, 4.0, 5.0, 6.0)