October 2023 - Wine-commits

Nikolay Sivov : tests: Add some tests for the 'switch' statements.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: vkd3d Branch: master Commit: ebb5aacabfb82353377a126b07f2881eb32b0510 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ebb5aacabfb82353377a126b07f28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 20 11:53:36 2023 +0200 tests: Add some tests for the 'switch' statements. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makefile.am | 1 + tests/hlsl/switch.shader_test | 552 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 553 insertions(+) diff --git a/Makefile.am b/Makefile.am index def1db6f..a0c3158e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -166,6 +166,7 @@ vkd3d_shader_tests = \ tests/hlsl/struct-array.shader_test \ tests/hlsl/struct-assignment.shader_test \ tests/hlsl/struct-semantics.shader_test \ + tests/hlsl/switch.shader_test \ tests/hlsl/swizzle-constant-prop.shader_test \ tests/hlsl/swizzle-matrix.shader_test \ tests/hlsl/swizzles.shader_test \ diff --git a/tests/hlsl/switch.shader_test b/tests/hlsl/switch.shader_test new file mode 100644 index 00000000..aab12485 --- /dev/null +++ b/tests/hlsl/switch.shader_test @@ -0,0 +1,552 @@ +[require] +shader model >= 4.0 + +[pixel shader todo] +uint4 v; + +float4 main() : sv_target +{ + switch (v.x) + { + case 0: + return 3.0; + case 1: + return 4.0; + default: + return 5.0; + } +} + +[test] +uniform 0 uint4 3 0 0 0 +todo draw quad +probe all rgba (5.0, 5.0, 5.0, 5.0) +uniform 0 uint4 1 0 0 0 +todo draw quad +probe all rgba (4.0, 4.0, 4.0, 4.0) +uniform 0 uint4 0 0 0 0 +todo draw quad +probe all rgba (3.0, 3.0, 3.0, 3.0) + +% falling through is only supported for empty case statements +[pixel shader todo] +uint4 v; + +float4 main() : sv_target +{ + float4 c = {1.0, 2.0, 3.0, 4.0}; + + switch (v.x) + { + case 0: + case 1: + c.x += 0.1f; + break; + } + + return c; +} + +[test] +uniform 0 uint4 2 0 0 0 +todo draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) +uniform 0 uint4 1 0 0 0 +todo draw quad +probe all rgba (1.1, 2.0, 3.0, 4.0) +uniform 0 uint4 0 0 0 0 +todo draw quad +probe all rgba (1.1, 2.0, 3.0, 4.0) + +% case value evaluation +[pixel shader todo] +uint4 v; + +float4 main() : sv_target +{ + float4 c = {1.0, 2.0, 3.0, 4.0}; + + switch (v.x) + { + case 1+1: + c += 0.1f; + break; + case 0: + c += 0.2f; + break; + } + + return c; +} + +[test] +uniform 0 uint4 2 0 0 0 +todo draw quad +probe all rgba (1.1, 2.1, 3.1, 4.1) +uniform 0 uint4 1 0 0 0 +todo draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + +% floats are accepted +[pixel shader todo fail(sm>=6)] +uint4 v; + +float4 main() : sv_target +{ + float4 c = {1.0, 2.0, 3.0, 4.0}; + + switch (v.x) + { + case 2.1f: + c += 0.1f; + break; + case 0.9f: + c += 0.2f; + break; + } + + return c; +} + +[test] +uniform 0 uint4 2 0 0 0 +todo draw quad +probe all rgba (1.1, 2.1, 3.1, 4.1) +uniform 0 uint4 1 0 0 0 +todo draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + +[pixel shader todo fail(sm>=6)] +float4 v; + +float4 main() : sv_target +{ + float4 c = {1.0, 2.0, 3.0, 4.0}; + + switch (v.x) + { + case 2.1f: + c += 0.1f; + break; + case 0.9f: + c += 0.2f; + break; + } + + return c; +} + +[test] +uniform 0 float4 2.0 0.0 0.0 0.0 +todo 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 draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + +[pixel shader fail] +uint4 v; + +float4 main() : sv_target +{ + float4 c = {1.0, 2.0, 3.0, 4.0}; + uint a = 1; + + switch (v.x) + { + case 1+a: + c += 0.1f; + break; + case 0: + c += 0.2f; + break; + } + + return c; +} + +% duplicate cases +[pixel shader fail] +uint4 v; + +float4 main() : sv_target +{ + float4 c = {1.0, 2.0, 3.0, 4.0}; + + switch (v.x) + { + case 2: + c += 0.1f; + break; + case 1+1: + c += 0.2f; + break; + } + + return c; +} + +% multiple default cases +[pixel shader fail] +uint4 v; + +float4 main() : sv_target +{ + float4 c = {1.0, 2.0, 3.0, 4.0}; + + switch (v.x) + { + default: + case 2: + c += 0.1f; + break; + case 1: + c += 0.2f; + break; + default: + break; + } + + return c; +} + +% unterminated cases +[pixel shader fail(sm<6)] +uint4 v; + +float4 main() : sv_target +{ + float4 c = {1.0, 2.0, 3.0, 4.0}; + + switch (v.x) + { + case 0: + c += 0.1f; + case 1: + c += 0.2f; + break; + } + + return c; +} + +[pixel shader fail] +uint4 v; + +float4 main() : sv_target +{ + switch (v.x) + { + case 0: + return 3.0; + case 1: + return 4.0; + case 2: + } + return 0.0; +} + +[pixel shader fail] +uint4 v; + +float4 main() : sv_target +{ + switch (v.x) + { + case 0: + return 3.0; + case 1: + return 4.0; + default: + } + return 0.0; +} + +[pixel shader fail(sm<6)] +uint4 v; + +float4 main() : sv_target +{ + switch (v.x) + { + case 0: + return 3.0; + case 1: + return 4.0; + default: + discard; + } + return 0.0; +} + +[pixel shader fail(sm<6)] +uint4 v; + +float4 main() : sv_target +{ + switch (v.x) + { + case 0: + return 3.0; + case 1: + return 4.0; + case 2: + discard; + } + return 0.0; +} + +[pixel shader fail(sm<6)] +uint4 v; + +float4 main() : sv_target +{ + switch (v.x) + { + case 0: + discard; + case 1: + return 4.0; + } + return 0.0; +} + +% more complicated breaks +[pixel shader todo] +uint4 v; + +float4 main() : sv_target +{ + float4 c = {1.0, 2.0, 3.0, 4.0}; + + switch (v.x) + { + case 2: + c += 0.1f; + if (true) break; + c = 9.0f; + case 1: + if (false) break; + c += 0.2f; + break; + default: + case 0: + break; + } + + return c; +} + +[test] +uniform 0 uint4 2 0 0 0 +todo draw quad +probe all rgba (1.1, 2.1, 3.1, 4.1) +uniform 0 uint4 1 0 0 0 +todo draw quad +probe all rgba (1.2, 2.2, 3.2, 4.2) +uniform 0 uint4 0 0 0 0 +todo draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + +% switch breaks within a loop +[pixel shader todo] +uint4 v; + +float4 main() : sv_target +{ + float4 c = {1.0f, 2.0f, 3.0f, 4.0f}; + + for (int i = 0; i < 4; ++i) + { + switch (v.x) + { + case 2: + c += 1.0f; + break; + case 1: + c -= 1.0f; + break; + default: + case 0: + break; + } + } + + return c; +} + +[test] +uniform 0 uint4 2 0 0 0 +todo draw quad +probe all rgba (5.0, 6.0, 7.0, 8.0) + +% default case placement +[pixel shader todo] +uint4 v; + +float4 main() : sv_target +{ + float4 c = {1.0f, 2.0f, 3.0f, 4.0f}; + + switch (v.x) + { + case 2: + c += 1.0f; + break; + case 1: + c -= 1.0f; + break; + case 3: + default: + case 0: + c += 3.0f; + break; + } + + return c; +} + +[test] +uniform 0 uint4 0 0 0 0 +todo draw quad +probe all rgba (4.0, 5.0, 6.0, 7.0) +uniform 0 uint4 2 0 0 0 +todo draw quad +probe all rgba (2.0, 3.0, 4.0, 5.0) +uniform 0 uint4 3 0 0 0 +todo draw quad +probe all rgba (4.0, 5.0, 6.0, 7.0) + +[pixel shader todo] +uint4 v; + +float4 main() : sv_target +{ + float4 c = {1.0f, 2.0f, 3.0f, 4.0f}; + + switch (v.x) + { + case 2: + c += 1.0f; + break; + case 1: + c -= 1.0f; + break; + case 3: + default: + break; + case 0: + c += 3.0f; + break; + } + + return c; +} + +[test] +uniform 0 uint4 3 0 0 0 +todo draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) +uniform 0 uint4 0 0 0 0 +todo draw quad +probe all rgba (4.0, 5.0, 6.0, 7.0) +uniform 0 uint4 5 0 0 0 +todo draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + +% 'continue' is not supported in switches +[pixel shader fail(sm<6)] +uint4 v; + +float4 main() : sv_target +{ + float4 c = {1.0, 2.0, 3.0, 4.0}; + uint i, j; + + for (i = 0; i < v.z; i++) + { + switch (v.x) + { + case 0: + c += 0.1f; + continue; + break; + case 1: + c += 0.2f; + break; + } + } + + return c; +} + +[pixel shader todo] +uint4 v; + +float4 main() : sv_target +{ + float4 c = {1.0, 2.0, 3.0, 4.0}; + uint i, j; + + for (i = 0; i < v.z; i++) + { + switch (v.x) + { + case 0: + for (j = 0; j < v.z; j++) + { + c += 1.0f; + if (v.w) + continue; + } + break; + case 1: + c += 2.0f; + break; + } + } + + return c; +} + +[test] +uniform 0 uint4 0 0 3 1 +todo draw quad +probe all rgba (10.0, 11.0, 12.0, 13.0) +uniform 0 uint4 1 0 3 1 +todo draw quad +probe all rgba (7.0, 8.0, 9.0, 10.0) + +% return from a switch nested in a loop +[pixel shader todo] +uint4 v; + +float4 main() : sv_target +{ + float4 c = {1.0, 2.0, 3.0, 4.0}; + uint i, j; + + for (i = 0; i < v.z; i++) + { + switch (v.x) + { + case 0: + c += 1.0f; + break; + case 1: + c += 2.0f; + return c; + } + c += 100.0f; + } + + return c; +} + +[test] +uniform 0 uint4 0 0 3 1 +todo draw quad +probe all rgba (304.0, 305.0, 306.0, 307.0) +uniform 0 uint4 1 0 3 1 +todo draw quad +probe all rgba (3.0, 4.0, 5.0, 6.0)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add initial support for parsing 'switch' statements.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: vkd3d Branch: master Commit: ec8dfa467f57351207010713d33b4e4e846f12a4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ec8dfa467f57351207010713d33b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 11 13:51:51 2023 +0200 vkd3d-shader/hlsl: Add initial support for parsing 'switch' statements. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 132 +++++++++++++++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl.h | 30 +++++++++ libs/vkd3d-shader/hlsl.l | 4 +- libs/vkd3d-shader/hlsl.y | 117 ++++++++++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl_codegen.c | 81 ++++++++++++++++++++++++ tests/hlsl/switch.shader_test | 12 ++-- 6 files changed, 369 insertions(+), 7 deletions(-)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Check for duplicate case statements.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: vkd3d Branch: master Commit: 9a6e4a0c58de4e3e9042a8f5b7044042d0ecd98d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9a6e4a0c58de4e3e9042a8f5b7044… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 11 13:55:32 2023 +0200 vkd3d-shader/hlsl: Check for duplicate case statements. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 34 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 35 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 3d194a0c..20802eb2 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4648,6 +4648,39 @@ static struct hlsl_scope *get_loop_scope(struct hlsl_scope *scope) return scope->upper ? get_loop_scope(scope->upper) : NULL; } +static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hlsl_ir_switch_case *check, struct list *cases) +{ + struct hlsl_ir_switch_case *c; + bool found_duplicate = false; + + LIST_FOR_EACH_ENTRY(c, cases, struct hlsl_ir_switch_case, entry) + { + if (check->is_default) + { + if ((found_duplicate = c->is_default)) + { + hlsl_error(ctx, &check->loc, VKD3D_SHADER_ERROR_HLSL_DUPLICATE_SWITCH_CASE, + "Found multiple 'default' statements."); + hlsl_note(ctx, &c->loc, VKD3D_SHADER_LOG_ERROR, "The 'default' statement was previously found here."); + } + } + else + { + if (c->is_default) continue; + if ((found_duplicate = (c->value == check->value))) + { + hlsl_error(ctx, &check->loc, VKD3D_SHADER_ERROR_HLSL_DUPLICATE_SWITCH_CASE, + "Found duplicate 'case' statement."); + hlsl_note(ctx, &c->loc, VKD3D_SHADER_LOG_ERROR, "The same 'case %d' statement was previously found here.", + c->value); + } + } + + if (found_duplicate) + break; + } +} + } %locations @@ -6447,6 +6480,7 @@ switch_cases: | switch_cases switch_case { $$ = $1; + check_duplicated_switch_cases(ctx, $2, $$); list_add_tail($$, &$2->entry); } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index c9d2dec8..93154c0f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -142,6 +142,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_RECURSIVE_CALL = 5025, VKD3D_SHADER_ERROR_HLSL_INCONSISTENT_SAMPLER = 5026, VKD3D_SHADER_ERROR_HLSL_NON_FINITE_RESULT = 5027, + VKD3D_SHADER_ERROR_HLSL_DUPLICATE_SWITCH_CASE = 5028, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO = 5301,

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Validate break/continue context.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: vkd3d Branch: master Commit: 72623031a2604249dbd9ae14b883bfd0484e33ef URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/72623031a2604249dbd9ae14b883b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 24 21:05:42 2023 +0200 vkd3d-shader/hlsl: Validate break/continue context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl.y | 42 +++++++++++++++++++++++++++++------------- tests/hlsl/switch.shader_test | 4 ++-- 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 6200d6b9..bd09e869 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -727,6 +727,8 @@ struct hlsl_scope struct hlsl_scope *upper; /* The scope was created for the loop statement. */ bool loop; + /* The scope was created for the switch statement. */ + bool _switch; }; struct hlsl_profile_info diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 20802eb2..5fd140fb 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4640,12 +4640,31 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type } } -static struct hlsl_scope *get_loop_scope(struct hlsl_scope *scope) +static bool check_continue(struct hlsl_ctx *ctx, const struct hlsl_scope *scope, const struct vkd3d_shader_location *loc) { + if (scope->_switch) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, + "The 'continue' statement is not allowed in 'switch' statements."); + return false; + } + if (scope->loop) - return scope; + return true; - return scope->upper ? get_loop_scope(scope->upper) : NULL; + if (scope->upper) + return check_continue(ctx, scope->upper, loc); + + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "The 'continue' statement is only allowed in loops."); + return false; +} + +static bool is_break_allowed(const struct hlsl_scope *scope) +{ + if (scope->loop || scope->_switch) + return true; + + return scope->upper ? is_break_allowed(scope->upper) : false; } static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hlsl_ir_switch_case *check, struct list *cases) @@ -5407,6 +5426,8 @@ loop_scope_start: switch_scope_start: %empty { + hlsl_push_scope(ctx); + ctx->cur_scope->_switch = true; } var_identifier: @@ -6244,12 +6265,10 @@ jump_statement: { struct hlsl_ir_node *jump; - /* TODO: allow 'break' in the 'switch' statements. */ - - if (!get_loop_scope(ctx->cur_scope)) + if (!is_break_allowed(ctx->cur_scope)) { hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, - "The 'break' statement must be used inside of a loop."); + "The 'break' statement must be used inside of a loop or a switch."); } if (!($$ = make_empty_block(ctx))) @@ -6261,13 +6280,8 @@ jump_statement: | KW_CONTINUE ';' { struct hlsl_ir_node *jump; - struct hlsl_scope *scope; - if (!(scope = get_loop_scope(ctx->cur_scope))) - { - hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, - "The 'continue' statement must be used inside of a loop."); - } + check_continue(ctx, ctx->cur_scope, &@1); if (!($$ = make_empty_block(ctx))) YYABORT; @@ -6411,6 +6425,8 @@ switch_statement: $$ = $5; hlsl_block_add_instr($$, s); + + hlsl_pop_scope(ctx); } switch_case: diff --git a/tests/hlsl/switch.shader_test b/tests/hlsl/switch.shader_test index e41834d7..720672a7 100644 --- a/tests/hlsl/switch.shader_test +++ b/tests/hlsl/switch.shader_test @@ -211,7 +211,7 @@ float4 main() : sv_target } % unterminated cases -[pixel shader fail(sm<6)] +[pixel shader fail(sm<6) todo] uint4 v; float4 main() : sv_target @@ -455,7 +455,7 @@ todo draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) % 'continue' is not supported in switches -[pixel shader fail(sm<6) todo] +[pixel shader fail(sm<6)] uint4 v; float4 main() : sv_target

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add copy propagation logic for switches.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: vkd3d Branch: master Commit: a4fa323e6c5b8f5f4a3a3e350f4a155bd8f8ddb9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a4fa323e6c5b8f5f4a3a3e350f4a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 11 14:08:59 2023 +0200 vkd3d-shader/hlsl: Add copy propagation logic for switches. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index d1853067..cf7bbc8f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1675,6 +1675,19 @@ static void copy_propagation_invalidate_from_block(struct hlsl_ctx *ctx, struct break; } + case HLSL_IR_SWITCH: + { + struct hlsl_ir_switch *s = hlsl_ir_switch(instr); + struct hlsl_ir_switch_case *c; + + LIST_FOR_EACH_ENTRY(c, &s->cases, struct hlsl_ir_switch_case, entry) + { + copy_propagation_invalidate_from_block(ctx, state, &c->body); + } + + break; + } + default: break; } @@ -1723,6 +1736,28 @@ static bool copy_propagation_process_loop(struct hlsl_ctx *ctx, struct hlsl_ir_l return progress; } +static bool copy_propagation_process_switch(struct hlsl_ctx *ctx, struct hlsl_ir_switch *s, + struct copy_propagation_state *state) +{ + struct copy_propagation_state inner_state; + struct hlsl_ir_switch_case *c; + bool progress = false; + + LIST_FOR_EACH_ENTRY(c, &s->cases, struct hlsl_ir_switch_case, entry) + { + copy_propagation_state_init(ctx, &inner_state, state); + progress |= copy_propagation_transform_block(ctx, &c->body, &inner_state); + copy_propagation_state_destroy(&inner_state); + } + + LIST_FOR_EACH_ENTRY(c, &s->cases, struct hlsl_ir_switch_case, entry) + { + copy_propagation_invalidate_from_block(ctx, state, &c->body); + } + + return progress; +} + static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_block *block, struct copy_propagation_state *state) { @@ -1761,6 +1796,10 @@ static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_b progress |= copy_propagation_process_loop(ctx, hlsl_ir_loop(instr), state); break; + case HLSL_IR_SWITCH: + progress |= copy_propagation_process_switch(ctx, hlsl_ir_switch(instr), state); + break; + default: break; }

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add a pass to remove unreachable code.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: vkd3d Branch: master Commit: c84d4e3571b00dbc895b6c98526d3d8fb3791512 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c84d4e3571b00dbc895b6c98526d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 11 14:29:25 2023 +0200 vkd3d-shader/hlsl: Add a pass to remove unreachable code. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 57 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index cf7bbc8f..013667e2 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -4455,6 +4455,62 @@ static bool type_has_object_components(struct hlsl_type *type) return false; } +static void remove_unreachable_code(struct hlsl_ctx *ctx, struct hlsl_block *body) +{ + struct hlsl_ir_node *instr, *next; + struct hlsl_block block; + struct list *start; + + LIST_FOR_EACH_ENTRY_SAFE(instr, next, &body->instrs, struct hlsl_ir_node, entry) + { + if (instr->type == HLSL_IR_IF) + { + struct hlsl_ir_if *iff = hlsl_ir_if(instr); + + remove_unreachable_code(ctx, &iff->then_block); + remove_unreachable_code(ctx, &iff->else_block); + } + else if (instr->type == HLSL_IR_LOOP) + { + struct hlsl_ir_loop *loop = hlsl_ir_loop(instr); + + remove_unreachable_code(ctx, &loop->body); + } + else if (instr->type == HLSL_IR_SWITCH) + { + struct hlsl_ir_switch *s = hlsl_ir_switch(instr); + struct hlsl_ir_switch_case *c; + + LIST_FOR_EACH_ENTRY(c, &s->cases, struct hlsl_ir_switch_case, entry) + { + remove_unreachable_code(ctx, &c->body); + } + } + } + + /* Remove instructions past unconditional jumps. */ + LIST_FOR_EACH_ENTRY(instr, &body->instrs, struct hlsl_ir_node, entry) + { + struct hlsl_ir_jump *jump; + + if (instr->type != HLSL_IR_JUMP) + continue; + + jump = hlsl_ir_jump(instr); + if (jump->type != HLSL_IR_JUMP_BREAK && jump->type != HLSL_IR_JUMP_CONTINUE) + continue; + + if (!(start = list_next(&body->instrs, &instr->entry))) + break; + + hlsl_block_init(&block); + list_move_slice_tail(&block.instrs, start, list_tail(&body->instrs)); + hlsl_block_cleanup(&block); + + break; + } +} + int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out) { @@ -4572,6 +4628,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry progress |= hlsl_transform_ir(ctx, remove_trivial_conditional_branches, body, NULL); } while (progress); + remove_unreachable_code(ctx, body); lower_ir(ctx, lower_nonconstant_vector_derefs, body); lower_ir(ctx, lower_casts_to_bool, body);

1 0

Alexandre Julliard : ntdll: Also update code ranges for pure ARM64EC binaries.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: 8f507ff9a77cc369fc7020a9c0ef0d48c0e0b547 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f507ff9a77cc369fc7020a9c0ef0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 31 13:07:07 2023 +0100 ntdll: Also update code ranges for pure ARM64EC binaries. --- dlls/ntdll/unix/virtual.c | 90 ++++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 44 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 2c2000751e5..464f343a575 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2461,6 +2461,34 @@ static void alloc_arm64ec_map(void) } +/*********************************************************************** + * update_arm64ec_ranges + */ +static void update_arm64ec_ranges( struct file_view *view, IMAGE_NT_HEADERS *nt, + const IMAGE_DATA_DIRECTORY *dir ) +{ + const IMAGE_ARM64EC_METADATA *metadata; + const IMAGE_CHPE_RANGE_ENTRY *map; + char *base = view->base; + const IMAGE_LOAD_CONFIG_DIRECTORY *cfg = (void *)(base + dir->VirtualAddress); + ULONG i, size = min( dir->Size, cfg->Size ); + + if (size <= offsetof( IMAGE_LOAD_CONFIG_DIRECTORY, CHPEMetadataPointer )) return; + if (!cfg->CHPEMetadataPointer) return; + if (!arm64ec_view) alloc_arm64ec_map(); + commit_arm64ec_map( view ); + metadata = (void *)(base + (cfg->CHPEMetadataPointer - nt->OptionalHeader.ImageBase)); + if (!metadata->CodeMap) return; + map = (void *)(base + metadata->CodeMap); + + for (i = 0; i < metadata->CodeMapCount; i++) + { + if ((map[i].StartOffset & 0x3) != 1 /* arm64ec */) continue; + set_arm64ec_range( base + (map[i].StartOffset & ~3), map[i].Length ); + } +} + + /*********************************************************************** * apply_arm64x_relocations */ @@ -2506,44 +2534,13 @@ static void apply_arm64x_relocations( char *base, const IMAGE_BASE_RELOCATION *r * update_arm64x_mapping */ static void update_arm64x_mapping( struct file_view *view, IMAGE_NT_HEADERS *nt, - IMAGE_SECTION_HEADER *sections ) + const IMAGE_DATA_DIRECTORY *dir, IMAGE_SECTION_HEADER *sections ) { - ULONG i, size, sec, offset; - const IMAGE_DATA_DIRECTORY *dir; - const IMAGE_LOAD_CONFIG_DIRECTORY *cfg; - const IMAGE_ARM64EC_METADATA *metadata; const IMAGE_DYNAMIC_RELOCATION_TABLE *table; const char *ptr, *end; char *base = view->base; - - /* retrieve config directory */ - - if (nt->FileHeader.Machine != IMAGE_FILE_MACHINE_ARM64) return; - if (nt->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR64_MAGIC) return; - dir = nt->OptionalHeader.DataDirectory + IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG; - if (!dir->VirtualAddress || !dir->Size) return; - cfg = (void *)(base + dir->VirtualAddress); - size = min( dir->Size, cfg->Size ); - - /* update code ranges */ - - if (size <= offsetof( IMAGE_LOAD_CONFIG_DIRECTORY, CHPEMetadataPointer )) return; - if (!cfg->CHPEMetadataPointer) return; - if (!arm64ec_view) alloc_arm64ec_map(); - commit_arm64ec_map( view ); - metadata = (void *)(base + (cfg->CHPEMetadataPointer - nt->OptionalHeader.ImageBase)); - if (metadata->CodeMap) - { - const IMAGE_CHPE_RANGE_ENTRY *map = (void *)(base + metadata->CodeMap); - - for (i = 0; i < metadata->CodeMapCount; i++) - { - if ((map[i].StartOffset & 0x3) != 1 /* arm64ec */) continue; - set_arm64ec_range( base + (map[i].StartOffset & ~3), map[i].Length ); - } - } - - /* apply dynamic relocations */ + const IMAGE_LOAD_CONFIG_DIRECTORY *cfg = (void *)(base + dir->VirtualAddress); + ULONG sec, offset, size = min( dir->Size, cfg->Size ); if (size <= offsetof( IMAGE_LOAD_CONFIG_DIRECTORY, DynamicValueRelocTableSection )) return; offset = cfg->DynamicValueRelocTableOffset; @@ -2687,7 +2684,7 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena IMAGE_NT_HEADERS *nt; IMAGE_SECTION_HEADER sections[96]; IMAGE_SECTION_HEADER *sec; - IMAGE_DATA_DIRECTORY *imports, *relocs; + IMAGE_DATA_DIRECTORY *imports, *dir; NTSTATUS status = STATUS_CONFLICTING_ADDRESSES; int i; off_t pos; @@ -2838,13 +2835,18 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena } #ifdef __aarch64__ - if (machine == IMAGE_FILE_MACHINE_AMD64 || - (!machine && main_image_info.Machine == IMAGE_FILE_MACHINE_AMD64)) + if ((dir = get_data_dir( nt, total_size, IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG ))) { - update_arm64x_mapping( view, nt, sections ); - /* reload changed data from NT header */ - image_info->machine = nt->FileHeader.Machine; - image_info->entry_point = nt->OptionalHeader.AddressOfEntryPoint; + if (image_info->machine == IMAGE_FILE_MACHINE_ARM64 && + (machine == IMAGE_FILE_MACHINE_AMD64 || + (!machine && main_image_info.Machine == IMAGE_FILE_MACHINE_AMD64))) + { + update_arm64x_mapping( view, nt, dir, sections ); + /* reload changed data from NT header */ + image_info->machine = nt->FileHeader.Machine; + image_info->entry_point = nt->OptionalHeader.AddressOfEntryPoint; + } + if (image_info->machine == IMAGE_FILE_MACHINE_AMD64) update_arm64ec_ranges( view, nt, dir ); } #endif if (machine && machine != nt->FileHeader.Machine) return STATUS_NOT_SUPPORTED; @@ -2861,10 +2863,10 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena else ((IMAGE_NT_HEADERS32 *)nt)->OptionalHeader.ImageBase = image_info->map_addr; - if ((relocs = get_data_dir( nt, total_size, IMAGE_DIRECTORY_ENTRY_BASERELOC ))) + if ((dir = get_data_dir( nt, total_size, IMAGE_DIRECTORY_ENTRY_BASERELOC ))) { - IMAGE_BASE_RELOCATION *rel = (IMAGE_BASE_RELOCATION *)(ptr + relocs->VirtualAddress); - IMAGE_BASE_RELOCATION *end = (IMAGE_BASE_RELOCATION *)((char *)rel + relocs->Size); + IMAGE_BASE_RELOCATION *rel = (IMAGE_BASE_RELOCATION *)(ptr + dir->VirtualAddress); + IMAGE_BASE_RELOCATION *end = (IMAGE_BASE_RELOCATION *)((char *)rel + dir->Size); while (rel && rel < end - 1 && rel->SizeOfBlock && rel->VirtualAddress < total_size) rel = process_relocation_block( ptr + rel->VirtualAddress, rel, delta );

1 0

Alexandre Julliard : ntdll: Remove an unused global variable.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: 123b86fe4a551a767b6f6e743295ffb333b6b6e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/123b86fe4a551a767b6f6e743295ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 31 13:13:06 2023 +0100 ntdll: Remove an unused global variable. --- dlls/ntdll/unix/loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0b83d11d373..c442f7f6be2 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -389,7 +389,6 @@ const char **dll_paths = NULL; const char **system_dll_paths = NULL; const char *user_name = NULL; SECTION_IMAGE_INFORMATION main_image_info = { NULL }; -static const IMAGE_EXPORT_DIRECTORY *ntdll_exports; /* adjust an array of pointers to make them into RVAs */ static inline void fixup_rva_ptrs( void *array, BYTE *base, unsigned int count ) @@ -1759,12 +1758,13 @@ static void load_ntdll_functions( HMODULE module ) { void **p__wine_unix_call_dispatcher; unixlib_handle_t *p__wine_unixlib_handle; + const IMAGE_EXPORT_DIRECTORY *exports; - ntdll_exports = get_module_data_dir( module, IMAGE_FILE_EXPORT_DIRECTORY, NULL ); - assert( ntdll_exports ); + exports = get_module_data_dir( module, IMAGE_DIRECTORY_ENTRY_EXPORT, NULL ); + assert( exports ); #define GET_FUNC(name) \ - if (!(p##name = (void *)find_named_export( module, ntdll_exports, #name ))) \ + if (!(p##name = (void *)find_named_export( module, exports, #name ))) \ ERR( "%s not found\n", #name ) GET_FUNC( DbgUiRemoteBreakin );

1 0

Alexandre Julliard : ntdll: Only check Wow64 system directories for 32-bit platforms.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: 3d66e96b7f1e9e95d89eddbd956fb3d1e8f7bc22 URL: https://gitlab.winehq.org/wine/wine/-/commit/3d66e96b7f1e9e95d89eddbd956fb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 31 13:19:56 2023 +0100 ntdll: Only check Wow64 system directories for 32-bit platforms. --- dlls/ntdll/unix/loader.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c442f7f6be2..bfa161e25c9 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1568,8 +1568,6 @@ static const WCHAR *get_machine_wow64_dir( WORD machine ) static const WCHAR system32[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2','\\',0}; static const WCHAR syswow64[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','w','o','w','6','4','\\',0}; static const WCHAR sysarm32[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','a','r','m','3','2','\\',0}; - static const WCHAR sysx8664[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','x','8','6','6','4','\\',0}; - static const WCHAR sysarm64[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','a','r','m','6','4','\\',0}; if (machine == native_machine) machine = IMAGE_FILE_MACHINE_TARGET_HOST; @@ -1578,8 +1576,6 @@ static const WCHAR *get_machine_wow64_dir( WORD machine ) case IMAGE_FILE_MACHINE_TARGET_HOST: return system32; case IMAGE_FILE_MACHINE_I386: return syswow64; case IMAGE_FILE_MACHINE_ARMNT: return sysarm32; - case IMAGE_FILE_MACHINE_AMD64: return sysx8664; - case IMAGE_FILE_MACHINE_ARM64: return sysarm64; default: return NULL; } } @@ -1602,6 +1598,7 @@ BOOL is_builtin_path( const UNICODE_STRING *path, WORD *machine ) for (i = 0; i < supported_machines_count; i++) { sysdir = get_machine_wow64_dir( supported_machines[i] ); + if (!sysdir) continue; dirlen = wcslen( sysdir ); if (len <= dirlen) continue; if (wcsnicmp( p, sysdir, dirlen )) continue; @@ -1941,9 +1938,14 @@ static void load_wow64_ntdll( USHORT machine ) void *module; unsigned int status; SIZE_T size; - WCHAR *path = malloc( sizeof("\\??\\C:\\windows\\system32\\ntdll.dll") * sizeof(WCHAR) ); + const WCHAR *wow64_dir; + WCHAR *path; - wcscpy( path, get_machine_wow64_dir( machine )); + if (machine == current_machine) return; + if (!(wow64_dir = get_machine_wow64_dir( machine ))) return; + + path = malloc( sizeof("\\??\\C:\\windows\\system32\\ntdll.dll") * sizeof(WCHAR) ); + wcscpy( path, wow64_dir ); wcscat( path, ntdllW ); init_unicode_string( &nt_name, path ); status = find_builtin_dll( &nt_name, &module, &size, &info, 0, 0, machine, 0, FALSE ); @@ -2004,7 +2006,7 @@ static void start_main_thread(void) init_thread_stack( teb, 0, 0, 0 ); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); load_ntdll(); - if (main_image_info.Machine != current_machine) load_wow64_ntdll( main_image_info.Machine ); + load_wow64_ntdll( main_image_info.Machine ); load_apiset_dll(); ntdll_init_syscalls( &syscall_table, p__wine_syscall_dispatcher ); server_init_process_done();

1 0

Alexandre Julliard : kernelbase: Only support Wow64 system directories for 32-bit platforms.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: 0d3fd1474782dd98cbc99d9dd6e259baf740d4bd URL: https://gitlab.winehq.org/wine/wine/-/commit/0d3fd1474782dd98cbc99d9dd6e259… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 31 14:06:34 2023 +0100 kernelbase: Only support Wow64 system directories for 32-bit platforms. --- dlls/kernelbase/file.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index aaa549bfd85..42c47707582 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -85,8 +85,6 @@ static const WCHAR *get_machine_wow64_dir( WORD machine ) case IMAGE_FILE_MACHINE_TARGET_HOST: return system_dir; case IMAGE_FILE_MACHINE_I386: return L"C:\\windows\\syswow64"; case IMAGE_FILE_MACHINE_ARMNT: return L"C:\\windows\\sysarm32"; - case IMAGE_FILE_MACHINE_AMD64: return L"C:\\windows\\sysx8664"; - case IMAGE_FILE_MACHINE_ARM64: return L"C:\\windows\\sysarm64"; default: return NULL; } }

1 0