April 2024 - Wine-Commits - list.winehq.org

Alexandre Julliard : winhttp/tests: Fix some compiler warnings with non-PE build.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: wine Branch: master Commit: cc88d9175b9df619053facb017b19306175402dc URL: https://gitlab.winehq.org/wine/wine/-/commit/cc88d9175b9df619053facb017b193… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 13 15:50:24 2024 +0200 winhttp/tests: Fix some compiler warnings with non-PE build. --- dlls/winhttp/tests/winhttp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index ee01fd5ec72..5810a516c68 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -5944,7 +5944,7 @@ static void test_connection_cache(int port) req = WinHttpOpenRequest(con, L"GET", L"/cached", NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %lu\n", GetLastError()); - ret = WinHttpSendRequest(req, L"Connection: close", ~0ul, NULL, 0, 0, 0); + ret = WinHttpSendRequest(req, L"Connection: close", ~0u, NULL, 0, 0, 0); ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %lu\n", GetLastError()); @@ -5959,7 +5959,7 @@ static void test_connection_cache(int port) req = WinHttpOpenRequest(con, L"GET", L"/notcached", NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %lu\n", GetLastError()); - ret = WinHttpSendRequest(req, L"Connection: close", ~0ul, NULL, 0, 0, 0); + ret = WinHttpSendRequest(req, L"Connection: close", ~0u, NULL, 0, 0, 0); ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %lu\n", GetLastError());

1 0

Vijay Kiran Kamuju : mscms: Add stub for WcsGetDefaultColorProfile.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: wine Branch: master Commit: 48ba724640dcf4364f78058b2882866a297acc40 URL: https://gitlab.winehq.org/wine/wine/-/commit/48ba724640dcf4364f78058b288286… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Apr 14 12:10:34 2024 +0200 mscms: Add stub for WcsGetDefaultColorProfile. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56554 --- dlls/mscms/mscms.spec | 2 +- dlls/mscms/profile.c | 12 ++++++++++++ include/icm.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/mscms/mscms.spec b/dlls/mscms/mscms.spec index 800db891a4d..c15359c133f 100644 --- a/dlls/mscms/mscms.spec +++ b/dlls/mscms/mscms.spec @@ -91,7 +91,7 @@ @ stub WcsEnumColorProfiles @ stdcall WcsEnumColorProfilesSize(long ptr ptr) @ stub WcsGetCalibrationManagementState -@ stub WcsGetDefaultColorProfile +@ stdcall WcsGetDefaultColorProfile(long wstr long long long long wstr) @ stdcall WcsGetDefaultColorProfileSize(long wstr long long long ptr) @ stdcall WcsGetDefaultRenderingIntent(long ptr) @ stdcall WcsGetUsePerUserProfiles(wstr long ptr) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index aa30fc47b8d..395fe50dabf 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1457,6 +1457,18 @@ BOOL WINAPI WcsEnumColorProfilesSize( WCS_PROFILE_MANAGEMENT_SCOPE scope, ENUMTY return FALSE; } +/****************************************************************************** + * WcsGetDefaultColorProfile [MSCMS.@] + */ +BOOL WINAPI WcsGetDefaultColorProfile( WCS_PROFILE_MANAGEMENT_SCOPE scope, PCWSTR device_name, + COLORPROFILETYPE type, COLORPROFILESUBTYPE subtype, + DWORD profile_id, DWORD size, LPWSTR name ) +{ + FIXME( "%d, %s, %d, %d, %lu, %lu, %p\n", scope, debugstr_w(device_name), type, subtype, profile_id, size, name ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /****************************************************************************** * WcsGetDefaultColorProfileSize [MSCMS.@] */ diff --git a/include/icm.h b/include/icm.h index cd0e2c0c2ad..bcf79eb63bd 100644 --- a/include/icm.h +++ b/include/icm.h @@ -499,6 +499,7 @@ BOOL WINAPI UnregisterCMMA(PCSTR,DWORD); BOOL WINAPI UnregisterCMMW(PCWSTR,DWORD); #define UnregisterCMM WINELIB_NAME_AW(UnregisterCMM) BOOL WINAPI WcsEnumColorProfilesSize(WCS_PROFILE_MANAGEMENT_SCOPE,ENUMTYPEW*,DWORD*); +BOOL WINAPI WcsGetDefaultColorProfile(WCS_PROFILE_MANAGEMENT_SCOPE,const WCHAR*,COLORPROFILETYPE,COLORPROFILESUBTYPE,DWORD,DWORD,LPWSTR); BOOL WINAPI WcsGetDefaultColorProfileSize(WCS_PROFILE_MANAGEMENT_SCOPE,const WCHAR*,COLORPROFILETYPE,COLORPROFILESUBTYPE,DWORD,DWORD*); BOOL WINAPI WcsGetDefaultRenderingIntent(WCS_PROFILE_MANAGEMENT_SCOPE,DWORD*); BOOL WINAPI WcsGetUsePerUserProfiles(const WCHAR*,DWORD,BOOL*);

1 0

Alex Henrie : win32u: Also reset the unnamed values in prepare_devices.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: wine Branch: master Commit: 50adbf9aead4e3701c9b0098ac49e2e0321f7bd8 URL: https://gitlab.winehq.org/wine/wine/-/commit/50adbf9aead4e3701c9b0098ac49e2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Apr 12 02:08:44 2024 -0600 win32u: Also reset the unnamed values in prepare_devices. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56551 --- dlls/win32u/sysparams.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 7415768d40d..b0b9a5cc907 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -763,6 +763,7 @@ static void prepare_devices(void) snprintf( buffer, sizeof(buffer), "Class\\%s", guid_devclass_monitorA ); hkey = reg_create_ascii_key( control_key, buffer, 0, NULL ); reg_empty_key( hkey, NULL ); + set_reg_ascii_value( hkey, "", "Monitors" ); set_reg_ascii_value( hkey, "Class", "Monitor" ); NtClose( hkey ); @@ -773,6 +774,7 @@ static void prepare_devices(void) snprintf( buffer, sizeof(buffer), "Class\\%s", guid_devclass_displayA ); hkey = reg_create_ascii_key( control_key, buffer, 0, NULL ); reg_empty_key( hkey, NULL ); + set_reg_ascii_value( hkey, "", "Display adapters" ); set_reg_ascii_value( hkey, "Class", "Display" ); NtClose( hkey );

1 0

Alexandre Julliard : widl: Pass 16-byte structures by value on ARM64.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: wine Branch: master Commit: 9cda4233df1e970251d0f5595f77b1bc95d6763f URL: https://gitlab.winehq.org/wine/wine/-/commit/9cda4233df1e970251d0f5595f77b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 15 12:04:56 2024 +0200 widl: Pass 16-byte structures by value on ARM64. --- tools/widl/typegen.c | 13 ++++++++++++- tools/widl/widl.c | 2 +- tools/widl/widl.h | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 917f4b40a21..52874b717fe 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -431,7 +431,18 @@ static unsigned int get_stack_size( const var_t *var, int *by_value ) case TGT_UNION: case TGT_USER_TYPE: stack_size = type_memsize( var->declspec.type ); - by_val = (pointer_size < 8 || stack_size <= pointer_size); /* FIXME: should be platform-specific */ + switch (target.cpu) + { + case CPU_x86_64: + by_val = (stack_size <= pointer_size); + break; + case CPU_ARM64: + by_val = (stack_size <= 2 * pointer_size); + break; + default: + by_val = 1; + break; + } break; default: by_val = 0; diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 6d7dd46c33e..30907eca69b 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -89,7 +89,7 @@ static const char usage[] = static const char version_string[] = "Wine IDL Compiler version " PACKAGE_VERSION "\n" "Copyright 2002 Ove Kaaven\n"; -static struct target target; +struct target target = { 0 }; int debuglevel = DEBUGLEVEL_NONE; int parser_debug, yy_flex_debug; diff --git a/tools/widl/widl.h b/tools/widl/widl.h index c5ccc140b36..31bb2c83694 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -71,6 +71,7 @@ extern const char *prefix_client; extern const char *prefix_server; extern unsigned int packing; extern unsigned int pointer_size; +extern struct target target; extern time_t now; extern int open_typelib( const char *name );

1 0

Petrichor Park : vkd3d-shader/hlsl: Implement tanh.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: vkd3d Branch: master Commit: 1fb9e7526b2874d7094b4f6ce7c4180655add7c8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1fb9e7526b2874d7094b4f6ce7c41… Author: Petrichor Park <ppark(a)codeweavers.com> Date: Sat Feb 24 14:35:50 2024 -0600 vkd3d-shader/hlsl: Implement tanh. --- libs/vkd3d-shader/hlsl.y | 34 ++++++++++++++++++++++++++++++++++ tests/hlsl/trigonometry.shader_test | 6 +++--- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d59d937e..8f715567 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3991,6 +3991,39 @@ static bool intrinsic_tan(struct hlsl_ctx *ctx, return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_DIV, sin, cos, loc); } +static bool intrinsic_tanh(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_function_decl *func; + struct hlsl_ir_node *arg; + struct hlsl_type *type; + char *body; + + static const char template[] = + "%s tanh(%s x)\n" + "{\n" + " %s exp_pos, exp_neg;\n" + " exp_pos = exp(x);\n" + " exp_neg = exp(-x);\n" + " return (exp_pos - exp_neg) / (exp_pos + exp_neg);\n" + "}\n"; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + type = arg->data_type; + + if (!(body = hlsl_sprintf_alloc(ctx, template, + type->name, type->name, type->name))) + return false; + + func = hlsl_compile_internal_function(ctx, "tanh", body); + vkd3d_free(body); + if (!func) + return false; + + return add_user_call(ctx, func, params, loc); +} + static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc, const char *name, enum hlsl_sampler_dim dim) { @@ -4366,6 +4399,7 @@ intrinsic_functions[] = {"sqrt", 1, true, intrinsic_sqrt}, {"step", 2, true, intrinsic_step}, {"tan", 1, true, intrinsic_tan}, + {"tanh", 1, true, intrinsic_tanh}, {"tex1D", -1, false, intrinsic_tex1D}, {"tex2D", -1, false, intrinsic_tex2D}, {"tex2Dlod", 2, false, intrinsic_tex2Dlod}, diff --git a/tests/hlsl/trigonometry.shader_test b/tests/hlsl/trigonometry.shader_test index d2cfc067..cf616587 100644 --- a/tests/hlsl/trigonometry.shader_test +++ b/tests/hlsl/trigonometry.shader_test @@ -111,7 +111,7 @@ todo(glsl) draw quad probe all rgba (1.0, 1.0, 1.0e39, 1.0e39) 1 -[pixel shader todo] +[pixel shader] uniform float4 a; float4 main() : sv_target @@ -121,8 +121,8 @@ float4 main() : sv_target [test] uniform 0 float4 -1.57079633 -0.54930614 0.54930614 1.57079633 -todo(sm<6) draw quad +todo(glsl) draw quad probe all rgba (-0.91715234, -0.5, 0.5, 0.91715234) 2 uniform 0 float4 -10.0 -0.0 0.0 10.0 -todo(sm<6) draw quad +todo(glsl) draw quad probe all rgba (-1.0, 0.0, 0.0, 1.0) 1

1 0

Petrichor Park : vkd3d-shader/hlsl: Implement hyperbolic sin and cos.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: vkd3d Branch: master Commit: c4182cc272fbe379fc08d3a9c8887ab4c623cf4b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c4182cc272fbe379fc08d3a9c8887… Author: Petrichor Park <ppark(a)codeweavers.com> Date: Mon Feb 19 11:25:53 2024 -0600 vkd3d-shader/hlsl: Implement hyperbolic sin and cos. --- libs/vkd3d-shader/hlsl.y | 48 +++++++++++++++++++++++++++++++++++++ tests/hlsl/trigonometry.shader_test | 12 +++++----- 2 files changed, 54 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 7fc35d4e..d59d937e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3028,6 +3028,46 @@ static bool intrinsic_cos(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_COS, arg, loc); } +static bool write_cosh_or_sinh(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc, bool sinh_mode) +{ + struct hlsl_ir_function_decl *func; + struct hlsl_ir_node *arg; + const char *fn_name, *type_name; + char *body; + + static const char template[] = + "%s %s(%s x)\n" + "{\n" + " return (exp(x) %s exp(-x)) / 2;\n" + "}\n"; + static const char fn_name_sinh[] = "sinh"; + static const char fn_name_cosh[] = "cosh"; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + type_name = arg->data_type->name; + fn_name = sinh_mode ? fn_name_sinh : fn_name_cosh; + + if (!(body = hlsl_sprintf_alloc(ctx, template, + type_name, fn_name, type_name, sinh_mode ? "-" : "+"))) + return false; + + func = hlsl_compile_internal_function(ctx, fn_name, body); + vkd3d_free(body); + if (!func) + return false; + + return add_user_call(ctx, func, params, loc); +} + +static bool intrinsic_cosh(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + return write_cosh_or_sinh(ctx, params, loc, false); +} + static bool intrinsic_cross(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3873,6 +3913,12 @@ static bool intrinsic_sin(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_SIN, arg, loc); } +static bool intrinsic_sinh(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + return write_cosh_or_sinh(ctx, params, loc, true); +} + /* smoothstep(a, b, x) = p^2 (3 - 2p), where p = saturate((x - a)/(b - a)) */ static bool intrinsic_smoothstep(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) @@ -4277,6 +4323,7 @@ intrinsic_functions[] = {"clamp", 3, true, intrinsic_clamp}, {"clip", 1, true, intrinsic_clip}, {"cos", 1, true, intrinsic_cos}, + {"cosh", 1, true, intrinsic_cosh}, {"cross", 2, true, intrinsic_cross}, {"ddx", 1, true, intrinsic_ddx}, {"ddx_coarse", 1, true, intrinsic_ddx_coarse}, @@ -4314,6 +4361,7 @@ intrinsic_functions[] = {"saturate", 1, true, intrinsic_saturate}, {"sign", 1, true, intrinsic_sign}, {"sin", 1, true, intrinsic_sin}, + {"sinh", 1, true, intrinsic_sinh}, {"smoothstep", 3, true, intrinsic_smoothstep}, {"sqrt", 1, true, intrinsic_sqrt}, {"step", 2, true, intrinsic_step}, diff --git a/tests/hlsl/trigonometry.shader_test b/tests/hlsl/trigonometry.shader_test index 3f7f1168..d2cfc067 100644 --- a/tests/hlsl/trigonometry.shader_test +++ b/tests/hlsl/trigonometry.shader_test @@ -76,7 +76,7 @@ todo(sm<4 | glsl) draw quad probe all rgba (0, 1000, -1000.0, 0) -[pixel shader todo] +[pixel shader] uniform float4 a; float4 main() : sv_target @@ -86,15 +86,15 @@ float4 main() : sv_target [test] uniform 0 float4 -6.28318531 -0.88137359 0.88137359 6.28318531 -todo(sm<6) draw quad +todo(glsl) draw quad probe all rgba (-267.744894, -1.0, 1.0, 267.744894) 2 uniform 0 float4 -0.0 0.0 -90.0 90.0 -todo(sm<6) draw quad +todo(glsl) draw quad % mingw does not support "inf" for scanf(), but numbers beyond FLOAT_MAX consistently result in inf. probe all rgba (0.0, 0.0, -1.0e39, 1.0e39) 1 -[pixel shader todo] +[pixel shader] uniform float4 a; float4 main() : sv_target @@ -104,10 +104,10 @@ float4 main() : sv_target [test] uniform 0 float4 -1.76274717 -1.3169579 1.3169579 1.76274717 -todo(sm<6) draw quad +todo(glsl) draw quad probe all rgba (3.0, 2.0, 2.0, 3.0) 2 uniform 0 float4 -0.0 0.0 -90.0 90.0 -todo(sm<6) draw quad +todo(glsl) draw quad probe all rgba (1.0, 1.0, 1.0e39, 1.0e39) 1

1 0

Liam Middlebrook : krnl386.exe: Start DOSVM timer on GET_SYSTEM_TIME.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: wine Branch: master Commit: 4d58ee6a75f2db18ef5e67fcb9f718df7a269c1c URL: https://gitlab.winehq.org/wine/wine/-/commit/4d58ee6a75f2db18ef5e67fcb9f718… Author: Liam Middlebrook <liammiddlebrook(a)gmail.com> Date: Sat Apr 13 11:10:21 2024 -0700 krnl386.exe: Start DOSVM timer on GET_SYSTEM_TIME. Start the DOSVM tick timer when the GET_SYSTEM_TIME interrupt (int 1a ah 00) is fired. This fixes a bug when running Sid Meier's CIVILIZATION for Windows 3.1 where the game would appear to hang at the launch screen (although sound would play as expected). This was due to the BIOSDATA.Ticks field never being updated. Signed-off-by: Liam Middlebrook <liammiddlebrook(a)gmail.com> --- dlls/krnl386.exe16/interrupts.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/krnl386.exe16/interrupts.c b/dlls/krnl386.exe16/interrupts.c index e062b497853..5087d1b7a03 100644 --- a/dlls/krnl386.exe16/interrupts.c +++ b/dlls/krnl386.exe16/interrupts.c @@ -549,6 +549,8 @@ static void WINAPI DOSVM_Int1aHandler( CONTEXT *context ) case 0x00: /* GET SYSTEM TIME */ { BIOSDATA *data = DOSVM_BiosData(); + + DOSVM_start_bios_timer(); SET_CX( context, HIWORD(data->Ticks) ); SET_DX( context, LOWORD(data->Ticks) ); SET_AL( context, 0 ); /* FIXME: midnight flag is unsupported */

1 0

Giovanni Mascellani : vkd3d-shader/ir: Count how many jumps target each loop.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: 105ccc4769b966f019d9e04b16cf75cf6f1a1e81 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/105ccc4769b966f019d9e04b16cf7… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Mar 13 13:39:24 2024 +0100 vkd3d-shader/ir: Count how many jumps target each loop. --- libs/vkd3d-shader/ir.c | 67 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 60 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 450f753c..52e1a9c2 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -3056,6 +3056,9 @@ struct vsir_cfg * block), but we still try to keep `begin' as forward as * possible, to keep the loop scope as small as possible. */ bool synthetic; + /* The number of jump instructions (both conditional and + * unconditional) that target this loop. */ + unsigned int target_count; } *loop_intervals; size_t loop_interval_count, loop_interval_capacity; @@ -3104,6 +3107,7 @@ static enum vkd3d_result vsir_cfg_add_loop_interval(struct vsir_cfg *cfg, unsign interval->begin = begin; interval->end = end; interval->synthetic = synthetic; + interval->target_count = 0; return VKD3D_OK; } @@ -4106,13 +4110,18 @@ fail: return VKD3D_ERROR_OUT_OF_MEMORY; } -static void vsir_cfg_remove_trailing_continue(struct vsir_cfg_structure_list *list, unsigned int target) +static void vsir_cfg_remove_trailing_continue(struct vsir_cfg *cfg, + struct vsir_cfg_structure_list *list, unsigned int target) { struct vsir_cfg_structure *last = &list->structures[list->count - 1]; if (last->type == STRUCTURE_TYPE_JUMP && last->u.jump.type == JUMP_CONTINUE && !last->u.jump.condition && last->u.jump.target == target) + { --list->count; + assert(cfg->loop_intervals[target].target_count > 0); + --cfg->loop_intervals[target].target_count; + } } static struct vsir_cfg_structure *vsir_cfg_get_trailing_break(struct vsir_cfg_structure_list *list) @@ -4143,7 +4152,8 @@ static struct vsir_cfg_structure *vsir_cfg_get_trailing_break(struct vsir_cfg_st * instructions are continue and continue, or continue and break. But * in practice I don't think those situations can happen given the * previous passes we do on the program, so we don't care. */ -static enum vkd3d_result vsir_cfg_move_breaks_out_of_selections(struct vsir_cfg_structure_list *list) +static enum vkd3d_result vsir_cfg_move_breaks_out_of_selections(struct vsir_cfg *cfg, + struct vsir_cfg_structure_list *list) { struct vsir_cfg_structure *selection, *if_break, *else_break, *new_break; unsigned int if_target, else_target, max_target; @@ -4166,6 +4176,7 @@ static enum vkd3d_result vsir_cfg_move_breaks_out_of_selections(struct vsir_cfg_ return VKD3D_ERROR_OUT_OF_MEMORY; new_break->u.jump.type = JUMP_BREAK; new_break->u.jump.target = max_target; + ++cfg->loop_intervals[max_target].target_count; /* Pointer `selection' could have been invalidated by the append * operation. */ @@ -4173,14 +4184,24 @@ static enum vkd3d_result vsir_cfg_move_breaks_out_of_selections(struct vsir_cfg_ assert(selection->type == STRUCTURE_TYPE_SELECTION); if (if_target == max_target) + { --selection->u.selection.if_body.count; + assert(cfg->loop_intervals[if_target].target_count > 0); + --cfg->loop_intervals[if_target].target_count; + } + if (else_target == max_target) + { --selection->u.selection.else_body.count; + assert(cfg->loop_intervals[else_target].target_count > 0); + --cfg->loop_intervals[else_target].target_count; + } return VKD3D_OK; } -static enum vkd3d_result vsir_cfg_synthesize_selections(struct vsir_cfg_structure_list *list) +static enum vkd3d_result vsir_cfg_synthesize_selections(struct vsir_cfg *cfg, + struct vsir_cfg_structure_list *list) { enum vkd3d_result ret; size_t i; @@ -4217,10 +4238,10 @@ static enum vkd3d_result vsir_cfg_synthesize_selections(struct vsir_cfg_structur *structure = new_selection; list->count = i + 1; - if ((ret = vsir_cfg_synthesize_selections(&structure->u.selection.else_body)) < 0) + if ((ret = vsir_cfg_synthesize_selections(cfg, &structure->u.selection.else_body)) < 0) return ret; - if ((ret = vsir_cfg_move_breaks_out_of_selections(list)) < 0) + if ((ret = vsir_cfg_move_breaks_out_of_selections(cfg, list)) < 0) return ret; break; @@ -4247,22 +4268,54 @@ static enum vkd3d_result vsir_cfg_optimize_recurse(struct vsir_cfg *cfg, struct if (loop_body->count == 0) continue; - vsir_cfg_remove_trailing_continue(loop_body, loop->u.loop.idx); + vsir_cfg_remove_trailing_continue(cfg, loop_body, loop->u.loop.idx); if ((ret = vsir_cfg_optimize_recurse(cfg, loop_body)) < 0) return ret; - if ((ret = vsir_cfg_synthesize_selections(loop_body)) < 0) + if ((ret = vsir_cfg_synthesize_selections(cfg, loop_body)) < 0) return ret; } return VKD3D_OK; } +static void vsir_cfg_count_targets(struct vsir_cfg *cfg, struct vsir_cfg_structure_list *list) +{ + size_t i; + + for (i = 0; i < list->count; ++i) + { + struct vsir_cfg_structure *structure = &list->structures[i]; + + switch (structure->type) + { + case STRUCTURE_TYPE_BLOCK: + break; + + case STRUCTURE_TYPE_LOOP: + vsir_cfg_count_targets(cfg, &structure->u.loop.body); + break; + + case STRUCTURE_TYPE_SELECTION: + vsir_cfg_count_targets(cfg, &structure->u.selection.if_body); + vsir_cfg_count_targets(cfg, &structure->u.selection.else_body); + break; + + case STRUCTURE_TYPE_JUMP: + if (structure->u.jump.type == JUMP_BREAK || structure->u.jump.type == JUMP_CONTINUE) + ++cfg->loop_intervals[structure->u.jump.target].target_count; + break; + } + } +} + static enum vkd3d_result vsir_cfg_optimize(struct vsir_cfg *cfg) { enum vkd3d_result ret; + vsir_cfg_count_targets(cfg, &cfg->structured_program); + ret = vsir_cfg_optimize_recurse(cfg, &cfg->structured_program); if (TRACE_ON())

1 0

Giovanni Mascellani : vkd3d-shader/ir: Remove loops that terminate with a `break'.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: aad040af05139ab0335b90a0112871ac818747c5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/aad040af05139ab0335b90a011287… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Mar 13 22:43:50 2024 +0100 vkd3d-shader/ir: Remove loops that terminate with a `break'. --- libs/vkd3d-shader/ir.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 52e1a9c2..e0928ff7 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -4250,8 +4250,64 @@ static enum vkd3d_result vsir_cfg_synthesize_selections(struct vsir_cfg *cfg, return VKD3D_OK; } +static enum vkd3d_result vsir_cfg_append_loop(struct vsir_cfg *cfg, + struct vsir_cfg_structure_list *new_list, struct vsir_cfg_structure *loop) +{ + struct vsir_cfg_structure_list *loop_body = &loop->u.loop.body; + unsigned int target, loop_idx = loop->u.loop.idx; + struct vsir_cfg_structure *trailing_break; + enum vkd3d_result ret; + + trailing_break = vsir_cfg_get_trailing_break(loop_body); + + /* If the loop's last instruction is not a break, we cannot remove + * the loop itself. */ + if (!trailing_break) + { + if ((ret = vsir_cfg_structure_list_append_from_region(new_list, loop, 1)) < 0) + return ret; + memset(loop, 0, sizeof(*loop)); + return VKD3D_OK; + } + + target = trailing_break->u.jump.target; + assert(cfg->loop_intervals[target].target_count > 0); + + /* If the loop is not targeted by any jump, we can remove it. The + * trailing `break' then targets another loop, so we have to keep + * it. */ + if (cfg->loop_intervals[loop_idx].target_count == 0) + { + if ((ret = vsir_cfg_structure_list_append_from_region(new_list, + &loop_body->structures[0], loop_body->count)) < 0) + return ret; + loop_body->count = 0; + return VKD3D_OK; + } + + /* If the loop is targeted only by its own trailing `break' + * instruction, then we can remove it together with the `break' + * itself. */ + if (target == loop_idx && cfg->loop_intervals[loop_idx].target_count == 1) + { + --cfg->loop_intervals[loop_idx].target_count; + if ((ret = vsir_cfg_structure_list_append_from_region(new_list, + &loop_body->structures[0], loop_body->count - 1)) < 0) + return ret; + loop_body->count = 0; + return VKD3D_OK; + } + + if ((ret = vsir_cfg_structure_list_append_from_region(new_list, loop, 1)) < 0) + return ret; + memset(loop, 0, sizeof(*loop)); + + return VKD3D_OK; +} + static enum vkd3d_result vsir_cfg_optimize_recurse(struct vsir_cfg *cfg, struct vsir_cfg_structure_list *list) { + struct vsir_cfg_structure_list new_list = {0}; enum vkd3d_result ret; size_t i; @@ -4261,23 +4317,44 @@ static enum vkd3d_result vsir_cfg_optimize_recurse(struct vsir_cfg *cfg, struct struct vsir_cfg_structure_list *loop_body; if (loop->type != STRUCTURE_TYPE_LOOP) + { + if ((ret = vsir_cfg_structure_list_append_from_region(&new_list, loop, 1)) < 0) + goto fail; + memset(loop, 0, sizeof(*loop)); continue; + } loop_body = &loop->u.loop.body; if (loop_body->count == 0) + { + if ((ret = vsir_cfg_structure_list_append_from_region(&new_list, loop, 1)) < 0) + goto fail; + memset(loop, 0, sizeof(*loop)); continue; + } vsir_cfg_remove_trailing_continue(cfg, loop_body, loop->u.loop.idx); if ((ret = vsir_cfg_optimize_recurse(cfg, loop_body)) < 0) - return ret; + goto fail; if ((ret = vsir_cfg_synthesize_selections(cfg, loop_body)) < 0) - return ret; + goto fail; + + if ((ret = vsir_cfg_append_loop(cfg, &new_list, loop)) < 0) + goto fail; } + vsir_cfg_structure_list_cleanup(list); + *list = new_list; + return VKD3D_OK; + +fail: + vsir_cfg_structure_list_cleanup(list); + + return ret; } static void vsir_cfg_count_targets(struct vsir_cfg *cfg, struct vsir_cfg_structure_list *list)

1 0

Giovanni Mascellani : vkd3d-shader/ir: Move `break's out of selection constructs when possible.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: f5d1b5d263cda3c4db0195075733bb5eac30eb9d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f5d1b5d263cda3c4db0195075733b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Mar 13 13:09:51 2024 +0100 vkd3d-shader/ir: Move `break's out of selection constructs when possible. --- libs/vkd3d-shader/ir.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 9d5b7904..450f753c 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -4115,6 +4115,71 @@ static void vsir_cfg_remove_trailing_continue(struct vsir_cfg_structure_list *li --list->count; } +static struct vsir_cfg_structure *vsir_cfg_get_trailing_break(struct vsir_cfg_structure_list *list) +{ + struct vsir_cfg_structure *structure; + size_t count = list->count; + + if (count == 0) + return NULL; + + structure = &list->structures[count - 1]; + + if (structure->type != STRUCTURE_TYPE_JUMP || structure->u.jump.type != JUMP_BREAK + || structure->u.jump.condition) + return NULL; + + return structure; +} + +/* When the last instruction in both branches of a selection construct + * is an unconditional break, any of them can be moved after the + * selection construct. If they break the same loop both of them can + * be moved out, otherwise we can choose which one: we choose the one + * that breaks the innermost loop, because we hope to eventually + * remove the loop itself. + * + * In principle a similar movement could be done when the last + * instructions are continue and continue, or continue and break. But + * in practice I don't think those situations can happen given the + * previous passes we do on the program, so we don't care. */ +static enum vkd3d_result vsir_cfg_move_breaks_out_of_selections(struct vsir_cfg_structure_list *list) +{ + struct vsir_cfg_structure *selection, *if_break, *else_break, *new_break; + unsigned int if_target, else_target, max_target; + size_t pos = list->count - 1; + + selection = &list->structures[pos]; + assert(selection->type == STRUCTURE_TYPE_SELECTION); + + if_break = vsir_cfg_get_trailing_break(&selection->u.selection.if_body); + else_break = vsir_cfg_get_trailing_break(&selection->u.selection.else_body); + + if (!if_break || !else_break) + return VKD3D_OK; + + if_target = if_break->u.jump.target; + else_target = else_break->u.jump.target; + max_target = max(if_target, else_target); + + if (!(new_break = vsir_cfg_structure_list_append(list, STRUCTURE_TYPE_JUMP))) + return VKD3D_ERROR_OUT_OF_MEMORY; + new_break->u.jump.type = JUMP_BREAK; + new_break->u.jump.target = max_target; + + /* Pointer `selection' could have been invalidated by the append + * operation. */ + selection = &list->structures[pos]; + assert(selection->type == STRUCTURE_TYPE_SELECTION); + + if (if_target == max_target) + --selection->u.selection.if_body.count; + if (else_target == max_target) + --selection->u.selection.else_body.count; + + return VKD3D_OK; +} + static enum vkd3d_result vsir_cfg_synthesize_selections(struct vsir_cfg_structure_list *list) { enum vkd3d_result ret; @@ -4155,6 +4220,9 @@ static enum vkd3d_result vsir_cfg_synthesize_selections(struct vsir_cfg_structur if ((ret = vsir_cfg_synthesize_selections(&structure->u.selection.else_body)) < 0) return ret; + if ((ret = vsir_cfg_move_breaks_out_of_selections(list)) < 0) + return ret; + break; }

1 0