February 2024 - Wine-commits

Tag wine-9.3 : Alexandre Julliard : Release 9.3
by Alexandre Julliard 23 Feb '24

23 Feb '24

Module: wine Branch: refs/tags/wine-9.3 Tag: 17e60d639d0261596b736e1bf82b6f611b87fbf1 URL: https://gitlab.winehq.org/wine/wine/-/tags/17e60d639d0261596b736e1bf82b6f61… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 23 22:19:13 2024 +0100 Release 9.3

1 0

Paul Gofman : mscoree: Force debug info in critical sections.
by Alexandre Julliard 23 Feb '24

23 Feb '24

Module: wine Branch: master Commit: 7c2f6be10e3e8093f07f5b5dded74651a138f4ee URL: https://gitlab.winehq.org/wine/wine/-/commit/7c2f6be10e3e8093f07f5b5dded746… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 21 21:46:48 2024 -0600 mscoree: Force debug info in critical sections. --- dlls/mscoree/corruntimehost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index c8d384730c0..1a546f343e0 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1592,7 +1592,7 @@ HRESULT RuntimeHost_Construct(CLRRuntimeInfo *runtime_version, RuntimeHost** res This->ref = 1; This->version = runtime_version; - InitializeCriticalSection(&This->lock); + InitializeCriticalSectionEx(&This->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RuntimeHost.lock"); *result = This;

1 0

Paul Gofman : ntdll: Force debug info in critical sections.
by Alexandre Julliard 23 Feb '24

23 Feb '24

Module: wine Branch: master Commit: 27e70ba8ecf3eeb4d048fc01b3380a0dda0168d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/27e70ba8ecf3eeb4d048fc01b3380a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 21 21:52:54 2024 -0600 ntdll: Force debug info in critical sections. --- dlls/ntdll/heap.c | 2 +- dlls/ntdll/rtl.c | 2 +- dlls/ntdll/threadpool.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index ec4e376bd4b..7764b9f0e71 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1548,7 +1548,7 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, void *addr, SIZE_T total_size, SIZE_T } else { - RtlInitializeCriticalSection( &heap->cs ); + RtlInitializeCriticalSectionEx( &heap->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); heap->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": heap.cs"); } diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index a077108b8d0..3d482ec2f92 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -120,7 +120,7 @@ void WINAPI RtlInitializeResource(LPRTL_RWLOCK rwl) rwl->uSharedWaiters = 0; rwl->hOwningThreadId = 0; rwl->dwTimeoutBoost = 0; /* no info on this one, default value is 0 */ - RtlInitializeCriticalSection( &rwl->rtlCS ); + RtlInitializeCriticalSectionEx( &rwl->rtlCS, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); rwl->rtlCS.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RTL_RWLOCK.rtlCS"); NtCreateSemaphore( &rwl->hExclusiveReleaseSemaphore, SEMAPHORE_ALL_ACCESS, NULL, 0, 65535 ); NtCreateSemaphore( &rwl->hSharedReleaseSemaphore, SEMAPHORE_ALL_ACCESS, NULL, 0, 65535 ); diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 4f22114a55e..c6e40fc78f4 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1675,7 +1675,7 @@ static NTSTATUS tp_threadpool_alloc( struct threadpool **out ) pool->objcount = 0; pool->shutdown = FALSE; - RtlInitializeCriticalSection( &pool->cs ); + RtlInitializeCriticalSectionEx( &pool->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); pool->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": threadpool.cs"); for (i = 0; i < ARRAY_SIZE(pool->pools); ++i) @@ -1839,7 +1839,7 @@ static NTSTATUS tp_group_alloc( struct threadpool_group **out ) group->refcount = 1; group->shutdown = FALSE; - RtlInitializeCriticalSection( &group->cs ); + RtlInitializeCriticalSectionEx( &group->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); group->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": threadpool_group.cs"); list_init( &group->members );

1 0

Alexandre Julliard : configure: Require floating point support on ARM targets.
by Alexandre Julliard 23 Feb '24

23 Feb '24

Module: wine Branch: master Commit: 71a2e64aee90c9cae76e100497f1a09b5f373415 URL: https://gitlab.winehq.org/wine/wine/-/commit/71a2e64aee90c9cae76e100497f1a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 23 11:41:40 2024 +0100 configure: Require floating point support on ARM targets. PE code requires hardware floating point. --- configure | 35 +++-------------------------------- configure.ac | 27 +++------------------------ 2 files changed, 6 insertions(+), 56 deletions(-) diff --git a/configure b/configure index 026966a800d..59fa33ee6e7 100755 --- a/configure +++ b/configure @@ -929,7 +929,6 @@ with_capi with_coreaudio with_cups with_dbus -with_float_abi with_fontconfig with_freetype with_gettext @@ -2489,7 +2488,6 @@ Optional Packages: --without-coreaudio do not use the CoreAudio sound support --without-cups do not use CUPS --without-dbus do not use DBus (dynamic device support) - --with-float-abi=abi specify the ABI (soft|softfp|hard) for ARM platforms --without-fontconfig do not use fontconfig --without-freetype do not use the FreeType library --without-gettext do not use gettext @@ -4273,13 +4271,6 @@ then : fi -# Check whether --with-float-abi was given. -if test ${with_float_abi+y} -then : - withval=$with_float_abi; -fi - - # Check whether --with-fontconfig was given. if test ${with_fontconfig+y} then : @@ -6367,19 +6358,8 @@ printf "%s\n" "$wine_cv_thumb2" >&6; } else CFLAGS="$CFLAGS -marm" fi - case $with_float_abi in - soft|softfp|hard) - float_abi=$with_float_abi ;; - *) - case $host_os in - *eabihf) - float_abi=hard ;; - *) - float_abi=softfp - saved_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -mfloat-abi=$float_abi" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -mfloat-abi=$float_abi" >&5 -printf %s "checking whether $CC supports -mfloat-abi=$float_abi... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports floating point instructions" >&5 +printf %s "checking whether $CC supports floating point instructions... " >&6; } if test ${wine_cv_float_abi+y} then : printf %s "(cached) " >&6 @@ -6406,16 +6386,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wine_cv_float_abi" >&5 printf "%s\n" "$wine_cv_float_abi" >&6; } - if test $wine_cv_float_abi = no - then - float_abi=soft - as_fn_append wine_warnings "|Floating point is not supported for this target. The resulting build won't be compatible with Windows ARM binaries." - fi - CFLAGS=$saved_CFLAGS - esac - ;; - esac - CFLAGS="$CFLAGS -mfloat-abi=$float_abi" + test $wine_cv_float_abi != no || as_fn_error $? "The ARM target needs to support floating point instructions." "$LINENO" 5 ;; esac diff --git a/configure.ac b/configure.ac index 2909bea2460..1c59651ba1e 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,6 @@ AC_ARG_WITH(capi, AS_HELP_STRING([--without-capi],[do not use CAPI (ISDN su AC_ARG_WITH(coreaudio, AS_HELP_STRING([--without-coreaudio],[do not use the CoreAudio sound support])) AC_ARG_WITH(cups, AS_HELP_STRING([--without-cups],[do not use CUPS])) AC_ARG_WITH(dbus, AS_HELP_STRING([--without-dbus],[do not use DBus (dynamic device support)])) -AC_ARG_WITH(float-abi, AS_HELP_STRING([--with-float-abi=abi],[specify the ABI (soft|softfp|hard) for ARM platforms])) AC_ARG_WITH(fontconfig,AS_HELP_STRING([--without-fontconfig],[do not use fontconfig])) AC_ARG_WITH(freetype, AS_HELP_STRING([--without-freetype],[do not use the FreeType library])) AC_ARG_WITH(gettext, AS_HELP_STRING([--without-gettext],[do not use gettext])) @@ -149,29 +148,9 @@ case $host in else CFLAGS="$CFLAGS -marm" fi - case $with_float_abi in - soft|softfp|hard) - float_abi=$with_float_abi ;; - *) - case $host_os in - *eabihf) - float_abi=hard ;; - *) - float_abi=softfp - saved_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -mfloat-abi=$float_abi" - AC_CACHE_CHECK([whether $CC supports -mfloat-abi=$float_abi],wine_cv_float_abi, - [WINE_TRY_ASM_LINK(["vmrs r2,fpscr"],,,[wine_cv_float_abi=yes],[wine_cv_float_abi=no])]) - if test $wine_cv_float_abi = no - then - float_abi=soft - WINE_WARNING([Floating point is not supported for this target. The resulting build won't be compatible with Windows ARM binaries.]) - fi - CFLAGS=$saved_CFLAGS - esac - ;; - esac - CFLAGS="$CFLAGS -mfloat-abi=$float_abi" + AC_CACHE_CHECK([whether $CC supports floating point instructions],wine_cv_float_abi, + [WINE_TRY_ASM_LINK(["vmrs r2,fpscr"],,,[wine_cv_float_abi=yes],[wine_cv_float_abi=no])]) + test $wine_cv_float_abi != no || AC_MSG_ERROR([The ARM target needs to support floating point instructions.]) ;; esac

1 0

Alexandre Julliard : winegcc: Stop passing ARM code generation options to winebuild.
by Alexandre Julliard 23 Feb '24

23 Feb '24

Module: wine Branch: master Commit: 0c0d18155130b1946e0bf8b801ef77cc8584ddd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c0d18155130b1946e0bf8b801ef77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 23 12:01:38 2024 +0100 winegcc: Stop passing ARM code generation options to winebuild. They are not needed for PE builds. --- tools/winegcc/winegcc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 56fe179c92b..533fb3c519b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1700,12 +1700,10 @@ int main(int argc, char **argv) else if (!strcmp("-marm", opts.args.str[i] ) || !strcmp("-mthumb", opts.args.str[i] )) { raw_linker_arg = 1; - raw_winebuild_arg = 1; } else if (!strncmp("-mcpu=", opts.args.str[i], 6) || !strncmp("-mfpu=", opts.args.str[i], 6) || - !strncmp("-march=", opts.args.str[i], 7) || - !strncmp("-mfloat-abi=", opts.args.str[i], 12)) + !strncmp("-march=", opts.args.str[i], 7)) raw_winebuild_arg = 1; break; case 'n':

1 0

Alexandre Julliard : winebuild: Remove ARM code generation option.
by Alexandre Julliard 23 Feb '24

23 Feb '24

Module: wine Branch: master Commit: af64a8bb5c8c62890ef74374f48b9134af73869d URL: https://gitlab.winehq.org/wine/wine/-/commit/af64a8bb5c8c62890ef74374f48b91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 23 12:02:17 2024 +0100 winebuild: Remove ARM code generation option. They are not needed for PE builds. --- tools/winebuild/build.h | 2 -- tools/winebuild/main.c | 15 --------------- tools/winebuild/winebuild.man.in | 2 +- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 50559e7c98c..af7861275a3 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -392,8 +392,6 @@ extern struct strarray nm_command; extern char *cpu_option; extern char *fpu_option; extern char *arch_option; -extern const char *float_abi_option; -extern int thumb_mode; extern int needs_get_pc_thunk; #endif /* __WINE_BUILD_H */ diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index e9cbf58d84f..71e61522578 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -69,17 +69,6 @@ struct strarray nm_command = { 0 }; char *cpu_option = NULL; char *fpu_option = NULL; char *arch_option = NULL; -#ifdef __SOFTFP__ -const char *float_abi_option = "soft"; -#else -const char *float_abi_option = "softfp"; -#endif - -#ifdef __thumb__ -int thumb_mode = 1; -#else -int thumb_mode = 0; -#endif static struct strarray res_files; @@ -164,7 +153,6 @@ static void set_target( const char *name ) target_alias = xstrdup( name ); if (!parse_target( name, &target )) fatal_error( "Unrecognized target '%s'\n", name ); - thumb_mode = target.cpu == CPU_ARM && is_pe(); if (is_pe()) unwind_tables = 1; } @@ -396,14 +384,11 @@ static void option_callback( int optc, char *optarg ) if (!strcmp( optarg, "16" )) main_spec->type = SPEC_WIN16; else if (!strcmp( optarg, "32" )) force_pointer_size = 4; else if (!strcmp( optarg, "64" )) force_pointer_size = 8; - else if (!strcmp( optarg, "arm" )) thumb_mode = 0; - else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; else if (!strcmp( optarg, "no-cygwin" )) use_msvcrt = 1; else if (!strcmp( optarg, "unicode" )) main_spec->unicode_app = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 ); - else if (!strncmp( optarg, "float-abi=", 10 )) float_abi_option = xstrdup( optarg + 10 ); else fatal_error( "Unknown -m option '%s'\n", optarg ); break; case 'M': diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 23ef3495744..ac8900187f4 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -179,7 +179,7 @@ option. .B \-m16, -m32, -m64 Generate respectively 16-bit, 32-bit or 64-bit code. .TP -.BI \-marm,\ \-mthumb,\ \-march= option ,\ \-mcpu= option ,\ \-mfpu= option ,\ \-mfloat-abi= option +.BI \-march= option ,\ \-mcpu= option ,\ \-mfpu= option Set code generation options for the assembler. .TP .B \-mno-cygwin

1 0

Alexandre Julliard : ntdll/tests: Fix a test failure when exception information is missing.
by Alexandre Julliard 23 Feb '24

23 Feb '24

Module: wine Branch: master Commit: 2e6651cb363c844ce4eb8feee41329b527127e8b URL: https://gitlab.winehq.org/wine/wine/-/commit/2e6651cb363c844ce4eb8feee41329… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 23 17:00:28 2024 +0100 ntdll/tests: Fix a test failure when exception information is missing. --- dlls/ntdll/tests/unwind.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/unwind.c b/dlls/ntdll/tests/unwind.c index a68bda6c748..dcfd854142d 100644 --- a/dlls/ntdll/tests/unwind.c +++ b/dlls/ntdll/tests/unwind.c @@ -1583,6 +1583,9 @@ static void call_virtual_unwind_arm64( void *code_mem, int testnum, const struct for (i = 0; i < test->nb_results; i++) { +#ifdef __x86_64__ + if (test->results[i].handler == -2) continue; /* skip invalid leaf function test */ +#endif winetest_push_context( "%u/%u", testnum, i ); memset( &ctx_ptr, 0x55, sizeof(ctx_ptr) ); memset( &context, 0x55, sizeof(context) ); @@ -1602,11 +1605,7 @@ static void call_virtual_unwind_arm64( void *code_mem, int testnum, const struct data = (void *)0xdeadbeef; frame = 0xdeadbeef; -#ifdef __x86_64__ - if (test->results[i].handler == -2) continue; /* skip invalid leaf function test */ -#else if (test->results[i].handler == -2) orig_pc = context.Lr; -#endif handler = RtlVirtualUnwind( UNW_FLAG_EHANDLER, (ULONG64)code_mem, orig_pc, test->unwind_info ? (RUNTIME_FUNCTION *)&runtime_func : NULL, (CONTEXT *)&context, &data, &frame, &ctx_ptr ); @@ -3226,12 +3225,13 @@ static void test_dynamic_unwind(void) ok( base == 0xdeadbeef, "RtlLookupFunctionTable wrong base, got: %Ix\n", base ); base = 0xdeadbeef; + len = 0xdeadbeef; func = pRtlLookupFunctionTable( (ULONG_PTR)pRtlLookupFunctionEntry, &base, &len ); ok( base == (ULONG_PTR)GetModuleHandleA("ntdll.dll"), "RtlLookupFunctionTable wrong base, got: %Ix / %p\n", base, GetModuleHandleA("ntdll.dll") ); ptr = RtlImageDirectoryEntryToData( (void *)base, TRUE, IMAGE_DIRECTORY_ENTRY_EXCEPTION, &len2 ); ok( func == ptr, "RtlLookupFunctionTable wrong table, got: %p / %p\n", func, ptr ); - ok( len == len2, "RtlLookupFunctionTable wrong len, got: %lu / %lu\n", len, len2 ); + ok( len == len2 || !ptr, "RtlLookupFunctionTable wrong len, got: %lu / %lu\n", len, len2 ); pRtlDeleteGrowableFunctionTable( growable_table );

1 0

Alexandre Julliard : configure: Stop passing ARM code generation options to winebuild.
by Alexandre Julliard 23 Feb '24

23 Feb '24

Module: wine Branch: master Commit: 23218818acd33467c04b13397f029e0195a7c56a URL: https://gitlab.winehq.org/wine/wine/-/commit/23218818acd33467c04b13397f029e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 23 11:34:31 2024 +0100 configure: Stop passing ARM code generation options to winebuild. They are not needed for PE builds. --- configure | 3 --- configure.ac | 3 --- 2 files changed, 6 deletions(-) diff --git a/configure b/configure index 5407d32205f..026966a800d 100755 --- a/configure +++ b/configure @@ -6364,10 +6364,8 @@ printf "%s\n" "$wine_cv_thumb2" >&6; } if test x"$wine_cv_thumb2" = xyes then CFLAGS="$CFLAGS -mthumb" - TARGETFLAGS="$TARGETFLAGS -mthumb" else CFLAGS="$CFLAGS -marm" - TARGETFLAGS="$TARGETFLAGS -marm" fi case $with_float_abi in soft|softfp|hard) @@ -6418,7 +6416,6 @@ printf "%s\n" "$wine_cv_float_abi" >&6; } ;; esac CFLAGS="$CFLAGS -mfloat-abi=$float_abi" - TARGETFLAGS="$TARGETFLAGS -mfloat-abi=$float_abi" ;; esac diff --git a/configure.ac b/configure.ac index ad5e43d2d7e..2909bea2460 100644 --- a/configure.ac +++ b/configure.ac @@ -146,10 +146,8 @@ case $host in if test x"$wine_cv_thumb2" = xyes then CFLAGS="$CFLAGS -mthumb" - TARGETFLAGS="$TARGETFLAGS -mthumb" else CFLAGS="$CFLAGS -marm" - TARGETFLAGS="$TARGETFLAGS -marm" fi case $with_float_abi in soft|softfp|hard) @@ -174,7 +172,6 @@ case $host in ;; esac CFLAGS="$CFLAGS -mfloat-abi=$float_abi" - TARGETFLAGS="$TARGETFLAGS -mfloat-abi=$float_abi" ;; esac

1 0

Giovanni Mascellani : vkd3d-shader/ir: Build a representation of the control flow graph.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: vkd3d Branch: master Commit: da037b61ba498270cdcece03baf4e5bec9c73ee5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/da037b61ba498270cdcece03baf4e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jan 29 16:41:31 2024 +0100 vkd3d-shader/ir: Build a representation of the control flow graph. --- libs/vkd3d-shader/ir.c | 198 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 198 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 88634487..4da8c0cb 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -3009,6 +3009,194 @@ fail: return VKD3D_ERROR_OUT_OF_MEMORY; } +struct vsir_block_list +{ + struct vsir_block **blocks; + size_t count, capacity; +}; + +static void vsir_block_list_init(struct vsir_block_list *list) +{ + memset(list, 0, sizeof(*list)); +} + +static void vsir_block_list_cleanup(struct vsir_block_list *list) +{ + vkd3d_free(list->blocks); +} + +static enum vkd3d_result vsir_block_list_add(struct vsir_block_list *list, struct vsir_block *block) +{ + size_t i; + + for (i = 0; i < list->count; ++i) + if (block == list->blocks[i]) + return VKD3D_OK; + + if (!vkd3d_array_reserve((void **)&list->blocks, &list->capacity, list->count + 1, sizeof(*list->blocks))) + { + ERR("Cannot extend block list.\n"); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + + list->blocks[list->count++] = block; + + return VKD3D_OK; +} + +struct vsir_block +{ + unsigned int label; + /* `begin' points to the instruction immediately following the + * LABEL that introduces the block. `end' points to the terminator + * instruction (either BRANCH or RET). They can coincide, meaning + * that the block is empty. */ + struct vkd3d_shader_instruction *begin, *end; + struct vsir_block_list predecessors, successors; +}; + +static void vsir_block_init(struct vsir_block *block, unsigned int label) +{ + assert(label); + memset(block, 0, sizeof(*block)); + block->label = label; + vsir_block_list_init(&block->predecessors); + vsir_block_list_init(&block->successors); +} + +static void vsir_block_cleanup(struct vsir_block *block) +{ + vsir_block_list_cleanup(&block->predecessors); + vsir_block_list_cleanup(&block->successors); +} + +struct vsir_cfg +{ + struct vsir_program *program; + struct vsir_block *blocks; + struct vsir_block *entry; + size_t block_count; +}; + +static void vsir_cfg_cleanup(struct vsir_cfg *cfg) +{ + size_t i; + + for (i = 0; i < cfg->block_count; ++i) + vsir_block_cleanup(&cfg->blocks[i]); + + vkd3d_free(cfg->blocks); +} + +static enum vkd3d_result vsir_cfg_add_edge(struct vsir_cfg *cfg, struct vsir_block *block, + struct vkd3d_shader_src_param *successor_param) +{ + unsigned int target = label_from_src_param(successor_param); + struct vsir_block *successor = &cfg->blocks[target - 1]; + enum vkd3d_result ret; + + assert(successor->label != 0); + + if ((ret = vsir_block_list_add(&block->successors, successor)) < 0) + return ret; + + if ((ret = vsir_block_list_add(&successor->predecessors, block)) < 0) + return ret; + + return VKD3D_OK; +} + +static enum vkd3d_result vsir_cfg_init(struct vsir_cfg *cfg, struct vsir_program *program) +{ + struct vsir_block *current_block = NULL; + enum vkd3d_result ret; + size_t i; + + memset(cfg, 0, sizeof(*cfg)); + cfg->program = program; + cfg->block_count = program->block_count; + + if (!(cfg->blocks = vkd3d_calloc(cfg->block_count, sizeof(*cfg->blocks)))) + return VKD3D_ERROR_OUT_OF_MEMORY; + + for (i = 0; i < program->instructions.count; ++i) + { + struct vkd3d_shader_instruction *instruction = &program->instructions.elements[i]; + + switch (instruction->handler_idx) + { + case VKD3DSIH_PHI: + case VKD3DSIH_SWITCH_MONOLITHIC: + vkd3d_unreachable(); + + case VKD3DSIH_LABEL: + { + unsigned int label = label_from_src_param(&instruction->src[0]); + + assert(!current_block); + assert(label > 0); + assert(label <= cfg->block_count); + current_block = &cfg->blocks[label - 1]; + vsir_block_init(current_block, label); + current_block->begin = &program->instructions.elements[i + 1]; + if (!cfg->entry) + cfg->entry = current_block; + break; + } + + case VKD3DSIH_BRANCH: + case VKD3DSIH_RET: + assert(current_block); + current_block->end = instruction; + current_block = NULL; + break; + + default: + break; + } + } + + for (i = 0; i < cfg->block_count; ++i) + { + struct vsir_block *block = &cfg->blocks[i]; + + if (block->label == 0) + continue; + + switch (block->end->handler_idx) + { + case VKD3DSIH_RET: + break; + + case VKD3DSIH_BRANCH: + if (vsir_register_is_label(&block->end->src[0].reg)) + { + if ((ret = vsir_cfg_add_edge(cfg, block, &block->end->src[0])) < 0) + goto fail; + } + else + { + if ((ret = vsir_cfg_add_edge(cfg, block, &block->end->src[1])) < 0) + goto fail; + + if ((ret = vsir_cfg_add_edge(cfg, block, &block->end->src[2])) < 0) + goto fail; + } + break; + + default: + vkd3d_unreachable(); + } + } + + return VKD3D_OK; + +fail: + vsir_cfg_cleanup(cfg); + + return ret; +} + enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, const struct vkd3d_shader_compile_info *compile_info) { @@ -3022,14 +3210,24 @@ enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, if (parser->shader_desc.is_dxil) { + struct vsir_cfg cfg; + if ((result = lower_switch_to_if_ladder(&parser->program)) < 0) return result; if ((result = materialize_ssas_to_temps(parser)) < 0) return result; + if ((result = vsir_cfg_init(&cfg, &parser->program)) < 0) + return result; + if ((result = simple_structurizer_run(parser)) < 0) + { + vsir_cfg_cleanup(&cfg); return result; + } + + vsir_cfg_cleanup(&cfg); } else {

1 0

Giovanni Mascellani : vkd3d-shader/ir: Dump the control flow graph in the GraphViz format.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: vkd3d Branch: master Commit: 2573d86ccf2027e946372040e1b57d867e5ab848 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2573d86ccf2027e946372040e1b57… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jan 30 14:59:52 2024 +0100 vkd3d-shader/ir: Dump the control flow graph in the GraphViz format. --- libs/vkd3d-shader/ir.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 4da8c0cb..646a71a2 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -3106,6 +3106,43 @@ static enum vkd3d_result vsir_cfg_add_edge(struct vsir_cfg *cfg, struct vsir_blo return VKD3D_OK; } +static void vsir_cfg_dump_dot(struct vsir_cfg *cfg) +{ + size_t i, j; + + TRACE("digraph cfg {\n"); + + for (i = 0; i < cfg->block_count; ++i) + { + struct vsir_block *block = &cfg->blocks[i]; + const char *shape; + + if (block->label == 0) + continue; + + switch (block->end->handler_idx) + { + case VKD3DSIH_RET: + shape = "trapezium"; + break; + + case VKD3DSIH_BRANCH: + shape = vsir_register_is_label(&block->end->src[0].reg) ? "ellipse" : "box"; + break; + + default: + vkd3d_unreachable(); + } + + TRACE(" n%u [label=\"%u\", shape=\"%s\"];\n", block->label, block->label, shape); + + for (j = 0; j < block->successors.count; ++j) + TRACE(" n%u -> n%u;\n", block->label, block->successors.blocks[j]->label); + } + + TRACE("}\n"); +} + static enum vkd3d_result vsir_cfg_init(struct vsir_cfg *cfg, struct vsir_program *program) { struct vsir_block *current_block = NULL; @@ -3189,6 +3226,9 @@ static enum vkd3d_result vsir_cfg_init(struct vsir_cfg *cfg, struct vsir_program } } + if (TRACE_ON()) + vsir_cfg_dump_dot(cfg); + return VKD3D_OK; fail:

1 0