[PATCH 0/2] MR76: vkd3d-shader/hlsl: Support rsqrt() and distance() intrinsics.
From: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 12 ++++++++++++ tests/sqrt.shader_test | 13 +++++++++++++ 2 files changed, 25 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a4de0edd..71eedfa5 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2778,6 +2778,17 @@ static bool intrinsic_round(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ROUND, arg, loc); } +static bool intrinsic_rsqrt(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_RSQ, arg, loc); +} + static bool intrinsic_saturate(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2976,6 +2987,7 @@ intrinsic_functions[] = {"normalize", 1, true, intrinsic_normalize}, {"pow", 2, true, intrinsic_pow}, {"round", 1, true, intrinsic_round}, + {"rsqrt", 1, true, intrinsic_rsqrt}, {"saturate", 1, true, intrinsic_saturate}, {"sin", 1, true, intrinsic_sin}, {"smoothstep", 3, true, intrinsic_smoothstep}, diff --git a/tests/sqrt.shader_test b/tests/sqrt.shader_test index 5d048b4f..78d89d38 100644 --- a/tests/sqrt.shader_test +++ b/tests/sqrt.shader_test @@ -10,3 +10,16 @@ float4 main() : sv_target uniform 0 float4 1.0 9.0 32.3 46.5 draw quad probe all rgba (1.0, 3.0, 5.683309, 6.819091) 1 + +[pixel shader] +uniform float4 f; + +float4 main() : sv_target +{ + return rsqrt(f); +} + +[test] +uniform 0 float4 1.0 9.0 4.0 16.0 +draw quad +probe all rgba (1.0, 0.33333333, 0.5, 0.25) 1 -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/76
From: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 71eedfa5..213322dc 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2485,6 +2485,26 @@ static bool intrinsic_cross(struct hlsl_ctx *ctx, return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, mul2, mul1_neg, loc); } +static bool intrinsic_distance(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *neg, *add, *dot; + + if (!elementwise_intrinsic_float_convert_args(ctx, params, loc)) + return false; + + if (!(neg = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_NEG, params->args[1], loc))) + return false; + + if (!(add = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, params->args[0], neg, loc))) + return false; + + if (!(dot = add_binary_dot_expr(ctx, params->instrs, add, add, loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_SQRT, dot, loc); +} + static bool intrinsic_dot(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2973,6 +2993,7 @@ intrinsic_functions[] = {"clamp", 3, true, intrinsic_clamp}, {"cos", 1, true, intrinsic_cos}, {"cross", 2, true, intrinsic_cross}, + {"distance", 2, true, intrinsic_distance}, {"dot", 2, true, intrinsic_dot}, {"exp", 1, true, intrinsic_exp}, {"exp2", 1, true, intrinsic_exp2}, -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/76
Giovanni Mascellani (@giomasce) commented about tests/sqrt.shader_test:
uniform 0 float4 1.0 9.0 32.3 46.5 draw quad probe all rgba (1.0, 3.0, 5.683309, 6.819091) 1 + +[pixel shader] +uniform float4 f; + +float4 main() : sv_target +{ + return rsqrt(f); +} + +[test] +uniform 0 float4 1.0 9.0 4.0 16.0 +draw quad +probe all rgba (1.0, 0.33333333, 0.5, 0.25) 1 It wouldn't be bad to test on negative numbers as well. That would mostly be a test for shader execution, rather than shader compilation, but it's still useful. Also, eventually we'll add constant folding to square root too, and it would be useful to know what is supposed to happen.
BTW, that applies to `sqrt()` as well. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/76#note_22295
Also, please add some tests for `distance()` too. Ideally every intrinsic should have at least a basic smoke test. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/76#note_22296
On Mon Jan 30 10:46:43 2023 +0000, Giovanni Mascellani wrote:
It wouldn't be bad to test on negative numbers as well. That would mostly be a test for shader execution, rather than shader compilation, but it's still useful. Also, eventually we'll add constant folding to square root too, and it would be useful to know what is supposed to happen. BTW, that applies to `sqrt()` as well. As I understand, the only reason we test by execution is because matching compiler output exactly is not really required, or needs a lot of work and time, that's better spent elsewhere. For constants that applies to all other tests as well.
-- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/76#note_22298
Also, please add some tests for `distance()` too. Ideally every intrinsic should have at least a basic smoke test.
Sure, I'll add something. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/76#note_22299
On Mon Jan 30 11:50:42 2023 +0000, Nikolay Sivov wrote:
As I understand, the only reason we test by execution is because matching compiler output exactly is not really required, or needs a lot of work and time, that's better spent elsewhere. For constants that applies to all other tests as well. Those `.shader_test` files are meant to test both the compiler and the executor. So it's useful to have something that tests what happen to `sqrt(-1)`, in order to ensure that to conversion to SPIR-V and then the execution through a Vulkan driver does what the shader expects.
-- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/76#note_22300
participants (3)
-
Giovanni Mascellani (＠giomasce) -
Nikolay Sivov
-
Nikolay Sivov (＠nsivov)