October 2022 - Wine-Commits

Alexandre Julliard : makedep: Add a helper function to build an arch-specific module name.
by Alexandre Julliard Oct. 26, 2022

Oct. 26, 2022

Module: wine Branch: master Commit: 6cfdd7e97c290eb121448fffbc75e35c40995dde URL: https://gitlab.winehq.org/wine/wine/-/commit/6cfdd7e97c290eb121448fffbc75e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 26 11:03:42 2022 +0200 makedep: Add a helper function to build an arch-specific module name. --- tools/makedep.c | 54 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 23035291df6..9f7a53fb2ce 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -608,6 +608,15 @@ static int is_multiarch( unsigned int arch ) } +/******************************************************************* + * arch_module_name + */ +static char *arch_module_name( const char *module, unsigned int arch ) +{ + return strmake( "%s%s", module, arch ? "" : dll_ext ); +} + + /******************************************************************* * arch_make_variable */ @@ -3038,7 +3047,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, arch ) ); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, arch ) ); - dll_name = strmake( "%s.dll%s", obj, arch ? "" : dll_ext ); + dll_name = arch_module_name( strmake( "%s.dll", obj ), arch ); obj_name = strmake( "%s%s", obj_dir_path( make, obj ), arch ? ".cross.o" : ".o" ); output_file = obj_dir_path( make, dll_name ); @@ -3150,10 +3159,10 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou strarray_add( &make->ok_files, ok_file ); output( "%s:\n", obj_dir_path( make, ok_file )); - output( "\t%s%s $(RUNTESTFLAGS) -T . -M %s -p %s%s %s && touch $@\n", + output( "\t%s%s $(RUNTESTFLAGS) -T . -M %s -p %s %s && touch $@\n", cmd_prefix( "TEST" ), root_src_dir_path( "tools/runtest" ), make->testdll, - obj_dir_path( make, test_exe ), arch ? "" : dll_ext, obj ); + obj_dir_path( make, arch_module_name( test_exe, arch )), obj ); } } @@ -3254,8 +3263,7 @@ static void output_module( struct makefile *make, unsigned int arch ) if (!make->data_only) { - if (*dll_ext && !arch && !make->data_only) - module_name = strmake( "%s%s", make->module, dll_ext ); + module_name = arch_module_name( make->module, arch ); if (!strarray_exists( &make->extradllflags, "-nodefaultlibs" )) default_imports = get_default_imports( make, imports ); @@ -3516,23 +3524,21 @@ static void output_shared_lib( struct makefile *make ) */ static void output_test_module( struct makefile *make, unsigned int arch ) { - char *testmodule = replace_extension( make->testdll, ".dll", "_test.exe" ); - char *stripped = replace_extension( make->testdll, ".dll", "_test-stripped.exe" ); - char *testres = replace_extension( make->testdll, ".dll", "_test.res" ); + char *basemodule = replace_extension( make->testdll, ".dll", "" ); + char *stripped = arch_module_name( strmake( "%s_test-stripped.exe", basemodule ), arch ); + char *testmodule = arch_module_name( strmake( "%s_test.exe", basemodule ), arch ); struct strarray default_imports = get_default_imports( make, make->imports ); - struct strarray dep_libs = empty_strarray, all_libs = empty_strarray; + struct strarray dep_libs = empty_strarray; + struct strarray all_libs = empty_strarray; struct makefile *parent = get_parent_makefile( make ); - const char *ext = arch ? "" : dll_ext; const char *debug_file; - char *output_file; strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->imports, IMPORT_TYPE_DIRECT, arch ) ); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, arch ) ); - strarray_add( &make->all_targets[arch], strmake( "%s%s", testmodule, ext )); - strarray_add( &make->clean_files, strmake( "%s%s", stripped, ext )); - output_file = strmake( "%s%s", obj_dir_path( make, testmodule ), ext ); - output( "%s:\n", output_file ); + strarray_add( &make->all_targets[arch], testmodule ); + strarray_add( &make->clean_files, stripped ); + output( "%s:\n", obj_dir_path( make, testmodule )); output_winegcc_command( make, arch ); output_filenames( make->extradllflags ); output_filenames_obj_dir( make, make->object_files[arch] ); @@ -3542,17 +3548,17 @@ static void output_test_module( struct makefile *make, unsigned int arch ) output_filenames( all_libs ); output_filename( arch_make_variable( "LDFLAGS", arch )); output( "\n" ); - output( "%s%s:\n", obj_dir_path( make, stripped ), ext ); + output( "%s:\n", obj_dir_path( make, stripped )); output_winegcc_command( make, arch ); output_filename( "-s" ); - output_filename( strmake( "-Wb,-F,%s", testmodule )); + output_filename( strmake( "-Wb,-F,%s_test.exe", basemodule )); output_filenames( make->extradllflags ); output_filenames_obj_dir( make, make->object_files[arch] ); output_filenames_obj_dir( make, make->res_files[arch] ); output_filenames( all_libs ); output_filename( arch_make_variable( "LDFLAGS", arch )); output( "\n" ); - output( "%s%s %s%s:", obj_dir_path( make, testmodule ), ext, obj_dir_path( make, stripped ), ext ); + output( "%s %s:", obj_dir_path( make, testmodule ), obj_dir_path( make, stripped )); output_filenames_obj_dir( make, make->object_files[arch] ); output_filenames_obj_dir( make, make->res_files[arch] ); output_filenames( dep_libs ); @@ -3560,16 +3566,16 @@ static void output_test_module( struct makefile *make, unsigned int arch ) output_filename( tools_path( make, "winegcc" )); output( "\n" ); - output( "programs/winetest/%s: %s%s\n", testres, obj_dir_path( make, stripped ), ext ); - output( "\t%secho \"%s TESTRES \\\"%s%s\\\"\" | %s -u -o $@\n", cmd_prefix( "WRC" ), - testmodule, obj_dir_path( make, stripped ), ext, tools_path( make, "wrc" )); + output( "programs/winetest/%s_test.res: %s\n", basemodule, obj_dir_path( make, stripped )); + output( "\t%secho \"%s_test.exe TESTRES \\\"%s\\\"\" | %s -u -o $@\n", cmd_prefix( "WRC" ), + basemodule, obj_dir_path( make, stripped ), tools_path( make, "wrc" )); output_filenames_obj_dir( make, make->ok_files ); - output( ": %s%s", obj_dir_path( make, testmodule ), ext ); + output( ": %s", obj_dir_path( make, testmodule )); if (parent) { - output_filename( parent->is_cross ? obj_dir_path( parent, make->testdll ) - : strmake( "%s%s", obj_dir_path( parent, make->testdll ), dll_ext )); + char *parent_module = arch_module_name( make->testdll, parent->use_msvcrt ? arch : 0 ); + output_filename( obj_dir_path( parent, parent_module )); if (parent->unixlib) output_filename( obj_dir_path( parent, parent->unixlib )); } output( "\n" );

1 0

Alexandre Julliard : makedep: Add a helper function to build a source file for one architecture.
by Alexandre Julliard Oct. 26, 2022

Oct. 26, 2022

Module: wine Branch: master Commit: 7d4ce928ef5195d0bc1cae45d120d1ae4bd4352c URL: https://gitlab.winehq.org/wine/wine/-/commit/7d4ce928ef5195d0bc1cae45d120d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 26 11:03:20 2022 +0200 makedep: Add a helper function to build a source file for one architecture. --- tools/makedep.c | 158 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 91 insertions(+), 67 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 68bba96d5df..cb36e43b398 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2337,7 +2337,7 @@ static struct strarray get_source_defines( struct makefile *make, struct incl_fi } strarray_addall( &ret, make->define_args ); strarray_addall( &ret, get_expanded_file_local_var( make, obj, "EXTRADEFS" )); - if ((source->file->flags & FLAG_C_UNIX) && *dll_ext) strarray_add( &ret, "-DWINE_UNIX_LIB" ); + if (source->file->flags & FLAG_C_UNIX) strarray_add( &ret, "-DWINE_UNIX_LIB" ); return ret; } @@ -3064,43 +3064,47 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, /******************************************************************* - * output_source_default + * output_source_one_arch */ -static void output_source_default( struct makefile *make, struct incl_file *source, const char *obj ) +static void output_source_one_arch( struct makefile *make, struct incl_file *source, const char *obj, + struct strarray defines, struct strarray *targets, + unsigned int arch, int is_dll_src ) { - struct strarray defines = get_source_defines( make, source, obj ); - unsigned int arch = make->is_cross ? 1 : 0; - int is_dll_src = (make->testdll && - strendswith( source->name, ".c" ) && - find_src_file( make, replace_extension( source->name, ".c", ".spec" ))); - int need_cross = (archs.count > 1 && - !(source->file->flags & FLAG_C_UNIX) && - (arch || make->staticlib || - (source->file->flags & FLAG_C_IMPLIB))); - int need_obj = ((*dll_ext || !(source->file->flags & FLAG_C_UNIX)) && - (!need_cross || - (source->file->flags & FLAG_C_IMPLIB) || - (make->staticlib && !make->extlib))); - - if ((source->file->flags & FLAG_GENERATED) && - (!make->testdll || !strendswith( source->filename, "testlist.c" ))) - strarray_add( &make->clean_files, source->basename ); - - if (need_obj) - { - if ((source->file->flags & FLAG_C_UNIX) && *dll_ext) - strarray_add( &make->unixobj_files, strmake( "%s.o", obj )); - else if (source->file->flags & FLAG_C_IMPLIB) - strarray_add( &make->implib_files[0], strmake( "%s.o", obj )); - else if (!is_dll_src) - strarray_add( &make->object_files[0], strmake( "%s.o", obj )); - else - strarray_add( &make->clean_files, strmake( "%s.o", obj )); - output( "%s.o: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t%s$(CC) -c -o $@ %s", cmd_prefix( "CC" ), source->filename ); - output_filenames( defines ); - if (!source->use_msvcrt) output_filenames( make->unix_cflags ); - output_filenames( make->extlib ? extra_cflags_extlib[0] : extra_cflags[0] ); + const char *obj_name; + + if (arch) + { + if (source->file->flags & FLAG_C_UNIX) return; + if (!make->use_msvcrt && !make->staticlib && !(source->file->flags & FLAG_C_IMPLIB)) return; + } + else if (source->file->flags & FLAG_C_UNIX) + { + if (!*dll_ext) return; + } + else if (archs.count > 1 && make->use_msvcrt && + !(source->file->flags & FLAG_C_IMPLIB) && + (!make->staticlib || make->extlib)) return; + + obj_name = strmake( "%s%s.o", obj, arch ? ".cross" : "" ); + strarray_add( targets, obj_name ); + + if (source->file->flags & FLAG_C_UNIX) + strarray_add( &make->unixobj_files, obj_name ); + else if (source->file->flags & FLAG_C_IMPLIB) + strarray_add( &make->implib_files[arch], obj_name ); + else if (!is_dll_src) + strarray_add( &make->object_files[arch], obj_name ); + else + strarray_add( &make->clean_files, obj_name ); + + output( "%s: %s\n", obj_dir_path( make, obj_name ), source->filename ); + output( "\t%s%s -c -o $@ %s", cmd_prefix( "CC" ), arch ? "$(CROSSCC)" : "$(CC)", source->filename ); + output_filenames( defines ); + if (!source->use_msvcrt) output_filenames( make->unix_cflags ); + output_filenames( make->extlib ? extra_cflags_extlib[arch] : extra_cflags[arch] ); + + if (!arch) + { if (make->sharedlib || (source->file->flags & FLAG_C_UNIX)) { output_filenames( unix_dllflags ); @@ -3112,47 +3116,67 @@ static void output_source_default( struct makefile *make, struct incl_file *sour if (!*dll_ext && make->module && is_crt_module( make->module )) output_filename( "-fno-builtin" ); } - output_filenames( cpp_flags ); - output_filename( "$(CFLAGS)" ); - output( "\n" ); } - if (need_cross) + else { - if (source->file->flags & FLAG_C_IMPLIB) - strarray_add( &make->implib_files[arch], strmake( "%s.cross.o", obj )); - else if (!is_dll_src) - strarray_add( &make->object_files[arch], strmake( "%s.cross.o", obj )); - else - strarray_add( &make->clean_files, strmake( "%s.cross.o", obj )); - output( "%s.cross.o: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t%s$(CROSSCC) -c -o $@ %s", cmd_prefix( "CC" ), source->filename ); - output_filenames( defines ); - output_filenames( make->extlib ? extra_cflags_extlib[arch] : extra_cflags[arch] ); - if (make->module && is_crt_module( make->module )) - output_filename( "-fno-builtin" ); - /* force -Wformat when using 'long' types, until all modules have been converted - * and we can remove -Wno-format */ - if (!make->extlib && strarray_exists( &extra_cflags[arch], "-Wno-format" ) && - !strarray_exists( &defines, "-DWINE_NO_LONG_TYPES" )) - output_filename( "-Wformat" ); - output_filenames( cpp_flags ); - output_filename( "$(CROSSCFLAGS)" ); - output( "\n" ); + if (make->module && is_crt_module( make->module )) output_filename( "-fno-builtin" ); } + + /* force -Wformat when using 'long' types, until all modules have been converted + * and we can remove -Wno-format */ + if (!make->extlib && strarray_exists( &extra_cflags[arch], "-Wno-format" ) && + !strarray_exists( &defines, "-DWINE_NO_LONG_TYPES" )) + output_filename( "-Wformat" ); + + output_filenames( cpp_flags ); + output_filename( arch ? "$(CROSSCFLAGS)" : "$(CFLAGS)" ); + output( "\n" ); + if (make->testdll && !is_dll_src && strendswith( source->name, ".c" ) && !(source->file->flags & FLAG_GENERATED)) { - strarray_add( &make->test_files, obj ); - strarray_add( &make->ok_files, strmake( "%s.ok", obj )); - output( "%s.ok:\n", obj_dir_path( make, obj )); + const char *ok_file, *test_exe; + + ok_file = strmake( "%s.ok", obj ); + test_exe = replace_extension( make->testdll, ".dll", "_test.exe" ); + + strarray_add( &make->ok_files, ok_file ); + output( "%s:\n", obj_dir_path( make, ok_file )); output( "\t%s%s $(RUNTESTFLAGS) -T . -M %s -p %s%s %s && touch $@\n", cmd_prefix( "TEST" ), root_src_dir_path( "tools/runtest" ), make->testdll, - obj_dir_path( make, replace_extension( make->testdll, ".dll", "_test.exe" )), - arch ? "" : dll_ext, obj ); + obj_dir_path( make, test_exe ), arch ? "" : dll_ext, obj ); + } +} + + +/******************************************************************* + * output_source_default + */ +static void output_source_default( struct makefile *make, struct incl_file *source, const char *obj ) +{ + struct strarray defines = get_source_defines( make, source, obj ); + struct strarray targets = empty_strarray; + int is_dll_src = (make->testdll && strendswith( source->name, ".c" ) && + find_src_file( make, replace_extension( source->name, ".c", ".spec" ))); + unsigned int arch; + + for (arch = 0; arch < archs.count; arch++) + if (!source->arch || source->arch == arch) + output_source_one_arch( make, source, obj, defines, &targets, arch, is_dll_src ); + + if (source->file->flags & FLAG_GENERATED) + { + if (!make->testdll || !strendswith( source->filename, "testlist.c" )) + strarray_add( &make->clean_files, source->basename ); + } + else + { + if (make->testdll && !is_dll_src && strendswith( source->name, ".c" )) + strarray_add( &make->test_files, obj ); } - if (need_obj) output_filename( strmake( "%s.o", obj_dir_path( make, obj ))); - if (need_cross) output_filename( strmake( "%s.cross.o", obj_dir_path( make, obj ))); + + output_filenames_obj_dir( make, targets ); output( ":" ); output_filenames( source->dependencies ); output( "\n" );

1 0

Francisco Casas : tests: Add additional tests for explicit casts with matrices.
by Alexandre Julliard Oct. 26, 2022

Oct. 26, 2022

Module: vkd3d Branch: master Commit: fcef2693474d427caf75d16b3a4ed07bb02f6205 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fcef2693474d427caf75d16b3a4ed… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Oct 18 14:46:00 2022 -0300 tests: Add additional tests for explicit casts with matrices. --- tests/cast-componentwise-compatible.shader_test | 141 ++++++++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/tests/cast-componentwise-compatible.shader_test b/tests/cast-componentwise-compatible.shader_test index f8b990d0..95378d66 100644 --- a/tests/cast-componentwise-compatible.shader_test +++ b/tests/cast-componentwise-compatible.shader_test @@ -238,3 +238,144 @@ float4 main() : sv_target [test] draw quad probe all rgba (31.0, 32.0, 33.0, 33.0) + + +[pixel shader] +struct apple +{ + int2 aa; + float2 bb; +}; + +float4 main() : sv_target +{ + struct apple a = {41, 42, 43, 44}; + float2x2 mat; + + mat = (float2x2) a; + return float4(mat); +} + + +[test] +draw quad +probe all rgba (41.0, 42.0, 43.0, 44.0) + + +[pixel shader fail] +struct apple +{ + float2 aa; + float3 bb; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2, 3, 4, 5}; + float2x2 mat; + + mat = (float2x2) a; + return float4(mat); +} + + +[pixel shader] +struct apple +{ + float3 aa; + int bb; +}; + +float4 main() : sv_target +{ + float2x2 mat = {55, 56, 57, 58}; + struct apple a; + + a = (struct apple) mat; + return float4(a.aa, a.bb); +} + + +[test] +draw quad +probe all rgba (55.0, 56.0, 57.0, 58.0) + + +[pixel shader fail] +struct apple +{ + float2 aa; + float2 bb; +}; + +float4 main() : sv_target +{ + float3x2 mat = {1, 2, 3, 4, 5, 6}; + struct apple a; + + a = (struct apple) mat; + return float4(a.aa, a.bb); +} + + +[pixel shader] +float4 main() : sv_target +{ + float arr[4] = {61, 62, 63, 64}; + int2x2 mat; + + mat = (int2x2) arr; + return float4(mat); +} + +[test] +draw quad +probe all rgba (61.0, 62.0, 63.0, 64.0) + + +[pixel shader fail] +float4 main() : sv_target +{ + float arr[5] = {1, 2, 3, 4, 5}; + float2x2 mat; + + mat = (float2x2) arr; + return float4(mat); +} + + +[pixel shader] +float4 main() : sv_target +{ + float2x2 mat = {71, 72, 73, 74}; + int arr[4]; + + arr = (int[4]) mat; + return float4(arr); +} + +[test] +draw quad +probe all rgba (71.0, 72.0, 73.0, 74.0) + + +[pixel shader fail] +float4 main() : sv_target +{ + float2x2 mat = {1, 2, 3, 4}; + int arr[3]; + + arr = (int[3]) mat; + return 0; +} + + +[pixel shader fail] +float4 main() : sv_target +{ + float2x2 mat = {1, 2, 3, 4}; + float3 vec; + + vec = (float3) mat; + return 0; +}

1 0

Francisco Casas : tests: Add additional tests for explicit casts with flat matrices and vectors.
by Alexandre Julliard Oct. 26, 2022

Oct. 26, 2022

Module: vkd3d Branch: master Commit: b711b2d66b5fe851ff61a08b52eef504317fac5a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b711b2d66b5fe851ff61a08b52eef… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Oct 18 16:45:17 2022 -0300 tests: Add additional tests for explicit casts with flat matrices and vectors. --- tests/cast-componentwise-compatible.shader_test | 203 ++++++++++++++++++++++++ 1 file changed, 203 insertions(+) diff --git a/tests/cast-componentwise-compatible.shader_test b/tests/cast-componentwise-compatible.shader_test index 95378d66..da55628b 100644 --- a/tests/cast-componentwise-compatible.shader_test +++ b/tests/cast-componentwise-compatible.shader_test @@ -379,3 +379,206 @@ float4 main() : sv_target vec = (float3) mat; return 0; } + + +[pixel shader fail] +float4 main() : sv_target +{ + float arr[5] = {1, 2, 3, 4, 5}; + float4x1 mat; + + mat = (float4x1) arr; + return 0; +} + + +[pixel shader] +float4 main() : sv_target +{ + float arr[5] = {81, 82, 83, 84, 85}; + int1x4 mat; + + mat = (int1x4) arr; + return float4(mat); +} + + +[test] +draw quad +probe all rgba (81.0, 82.0, 83.0, 84.0) + + +[pixel shader] +float4 main() : sv_target +{ + float4x1 mat = {91, 92, 93, 94}; + int arr[3]; + + arr = (int[3]) mat; + return float4(arr, 0); +} + + +[test] +draw quad +probe all rgba (91.0, 92.0, 93.0, 0.0) + + +[pixel shader] +float4 main() : sv_target +{ + float1x4 mat = {11, 12, 13, 14}; + int arr[3]; + + arr = (int[3]) mat; + return float4(arr, 0); +} + + +[test] +draw quad +probe all rgba (11.0, 12.0, 13.0, 0.0) + + +[pixel shader fail] +struct apple +{ + float3 aa; + float2 bb; +}; + + +float4 main() : sv_target +{ + struct apple a = {1, 2, 3, 4, 5}; + float4x1 mat; + + mat = (float4x1) a; + return 0; +} + + +[pixel shader] +struct apple +{ + float3 aa; + float2 bb; +}; + + +float4 main() : sv_target +{ + struct apple a = {21, 22, 23, 24, 25}; + float1x4 mat; + + mat = (float1x4) a; + return float4(mat); +} + + +[test] +draw quad +probe all rgba (21.0, 22.0, 23.0, 24.0) + + +[pixel shader] +struct apple +{ + int aa; + float2 bb; +}; + +float4 main() : sv_target +{ + float4x1 mat = {31, 32, 33, 34}; + struct apple a; + + a = (struct apple) mat; + return float4(a.aa, a.bb, 0); +} + + +[test] +draw quad +probe all rgba (31.0, 32.0, 33.0, 0.0) + + +[pixel shader] +struct apple +{ + int aa; + float2 bb; +}; + +float4 main() : sv_target +{ + float1x4 mat = {41, 42, 43, 44}; + struct apple a; + + a = (struct apple) mat; + return float4(a.aa, a.bb, 0); +} + + +[test] +draw quad +probe all rgba (41.0, 42.0, 43.0, 0.0) + + +[pixel shader] +float4 main() : sv_target +{ + float4 vec = {51, 52, 53, 54}; + int1x3 mat; + + mat = (int1x3) vec; + return float4(mat, 0); +} + + +[test] +draw quad +probe all rgba (51.0, 52.0, 53.0, 0.0) + + +[pixel shader fail] +float4 main() : sv_target +{ + float4 vec = {1, 2, 3, 4}; + float3x1 mat; + + mat = (float3x1) vec; + return 0; +} + + +[pixel shader] +float4 main() : sv_target +{ + float1x4 mat = {61, 62, 63, 64}; + int3 vec; + + vec = (int1x3) mat; + return float4(vec, 0); +} + + +[test] +draw quad +probe all rgba (61.0, 62.0, 63.0, 0.0) + + +[pixel shader] +float4 main() : sv_target +{ + float4x1 mat = {71, 72, 73, 74}; + int3 vec; + + vec = (int3) mat; + return float4(vec, 0); +} + + +[test] +draw quad +probe all rgba (71.0, 72.0, 73.0, 0.0)

1 0

Francisco Casas : tests: Add additional tests for explicit casts with vectors.
by Alexandre Julliard Oct. 26, 2022

Oct. 26, 2022

Module: vkd3d Branch: master Commit: 588645a79a8fbd87b329ee516ac054d83b31322a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/588645a79a8fbd87b329ee516ac05… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Oct 14 13:08:30 2022 -0300 tests: Add additional tests for explicit casts with vectors. --- tests/cast-componentwise-compatible.shader_test | 55 +++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/tests/cast-componentwise-compatible.shader_test b/tests/cast-componentwise-compatible.shader_test index 4b342efb..f8b990d0 100644 --- a/tests/cast-componentwise-compatible.shader_test +++ b/tests/cast-componentwise-compatible.shader_test @@ -183,3 +183,58 @@ float4 main() : sv_target [test] draw quad probe all rgba (10.0, 10.0, 11.4, 12.4) + + +[pixel shader] +float4 main() : sv_target +{ + float f[5] = {11, 12, 13, 14, 15}; + int4 i; + + i = (int4) f; + return i; +} + + +[test] +draw quad +probe all rgba (11.0, 12.0, 13.0, 14.0) + + +[pixel shader] +struct apple +{ + int2 aa; + float bb[2]; + float cc; +}; + +float4 main() : sv_target +{ + struct apple a = {21, 22, 23.4, 24.4, 25.0}; + int4 i; + + i = (int4) a; + return i; +} + + +[test] +draw quad +probe all rgba (21.0, 22.0, 23.0, 24.0) + + +[pixel shader] +float4 main() : sv_target +{ + float4 f = {31.4, 32.4, 33.4, 34.4}; + int3 i; + + i = (int3) f; + return float4(i.x, i.y, i.z, i.z); +} + + +[test] +draw quad +probe all rgba (31.0, 32.0, 33.0, 33.0)

1 0

Francois Gouget : testbot/LogUtils: Remove the unused $LogInfo->{Failures} field.
by Alexandre Julliard Oct. 26, 2022

Oct. 26, 2022

Module: tools Branch: master Commit: 34b71eecf88d54d4cf86d56dc6c53a780b259a15 URL: https://gitlab.winehq.org/winehq/tools/-/commit/34b71eecf88d54d4cf86d56dc6c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 25 15:04:24 2022 +0200 testbot/LogUtils: Remove the unused $LogInfo->{Failures} field. It was essentially redundant with the ErrCount field anyway, except that the latter includes the flaky failures. Also this field name could cause confusion with the per-MsgGroup Failures field used to track known failures. --- testbot/lib/WineTestBot/LogUtils.pm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index a9c893a3..05af274c 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -382,7 +382,6 @@ sub _AddExtra($$;$) $Error = "$Cur->{Dll}:$Cur->{Unit} $Error" if (defined $Cur); push @{$LogInfo->{Extra}}, $Error; - $LogInfo->{Failures}++; } sub _CheckUnit($$$$) @@ -472,8 +471,6 @@ sub _CloseTestUnit($$$) } } } - - $LogInfo->{Failures} += $Cur->{LineFailures}; } sub _AddReportError($$$$) @@ -516,9 +513,6 @@ The number of test units. =item TimeoutCount The number of test units that timed out. -=item Failures -The number of failed tests. - =item ErrCount, ErrGroupNames, ErrGroups, BadLog See ParseTaskLog() for details. @@ -539,7 +533,6 @@ sub ParseWineTestReport($$$) TestUnitCount => 0, TimeoutCount => 0, - Failures => undef, ErrGroupNames => [], ErrGroups => {}, @@ -750,7 +743,6 @@ sub ParseWineTestReport($$$) { # The done line will already be shown as a timeout (see JobDetails) # so record the failure but don't add an error message. - $LogInfo->{Failures}++; $Cur->{IsBroken} = 1; $LogInfo->{TimeoutCount}++; _AddReportError($LogInfo, $Cur, $LineNo, $&);

1 0

Francois Gouget : testbot: Allow tracking multiple message types, not just errors.
by Alexandre Julliard Oct. 26, 2022

Oct. 26, 2022

Module: tools Branch: master Commit: 41584035d6e400aa2cadce6ac8b1fd48d2061302 URL: https://gitlab.winehq.org/winehq/tools/-/commit/41584035d6e400aa2cadce6ac8b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 7 01:36:22 2020 +0200 testbot: Allow tracking multiple message types, not just errors. This can be used to track flaky failures and warnings separately from regular failures, while still distinguishing which are old / new. --- testbot/bin/WineRunBuild.pl | 4 +- testbot/bin/WineRunReconfig.pl | 4 +- testbot/bin/WineRunTask.pl | 6 +- testbot/bin/WineRunWineTest.pl | 12 +- testbot/bin/WineSendLog.pl | 37 ++--- testbot/lib/WineTestBot/LogUtils.pm | 300 ++++++++++++++++++++++-------------- testbot/tests/TestWTBS | 46 +++--- testbot/web/JobDetails.pl | 44 +++--- 8 files changed, 259 insertions(+), 194 deletions(-)

1 0

Francois Gouget : testbot: Add a message type for flaky failures.
by Alexandre Julliard Oct. 26, 2022

Oct. 26, 2022

Module: tools Branch: master Commit: 617f337d8616a94db3a7b37b829a538bab87a564 URL: https://gitlab.winehq.org/winehq/tools/-/commit/617f337d8616a94db3a7b37b829… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 7 16:19:19 2022 +0200 testbot: Add a message type for flaky failures. In the .errors files flaky failures are identified as 'k' messages (instead of 'e' for regular failures). Flaky failures are also identified as old or new based on their presence in the reference reports and shown accordingly on the JobDetails page (the corresponding CSS class names now systematically contain the message type and prefix it with "new" for new messages). Before this patch new flaky failures were flagged as regular new failures which caused some false positives. Now WineSendLog can identify flaky failures and not count them as new failures, thus fixing the false positives. --- testbot/bin/WineRunTask.pl | 4 ++-- testbot/bin/WineRunWineTest.pl | 4 ++-- testbot/bin/WineSendLog.pl | 7 +++++-- testbot/lib/WineTestBot/LogUtils.pm | 24 ++++++++++++------------ testbot/web/JobDetails.pl | 16 +++++++++------- testbot/web/WineTestBot.css | 4 +++- 6 files changed, 33 insertions(+), 26 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 85ba5df5..2eec9c73 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -562,8 +562,8 @@ if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) my $ErrMessages = SnapshotLatestReport($Task, $RptFileName); LogTaskError("$_\n") for (@$ErrMessages); - # $LogInfo->{eCount} can legitimately be undefined in case of a timeout - $TaskFailures += $LogInfo->{eCount} || 0; + # The message counters can legitimately be undefined in case of a timeout + $TaskFailures += ($LogInfo->{eCount} || 0) + ($LogInfo->{kCount} || 0); my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 6b49677c..985fdc2a 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -578,8 +578,8 @@ foreach my $RptFileName (@$ReportNames) my $ErrMessages = SnapshotLatestReport($Task, $RptFileName); LogTaskError("$_\n") for (@$ErrMessages); - # $LogInfo->{eCount} can legitimately be undefined in case of a timeout - $TaskFailures += $LogInfo->{eCount} || 0; + # The message counters can legitimately be undefined in case of a timeout + $TaskFailures += ($LogInfo->{eCount} || 0) + ($LogInfo->{kCount} || 0); my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); } diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 0246f89e..ab7b90c0 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -233,7 +233,8 @@ sub SendLog($) } $TaskInfo->{OldCount}++; } - elsif ($Group->{IsNew}->[$MsgIndex]) + elsif ($Group->{Types}->[$MsgIndex] eq "e" and + $Group->{IsNew}->[$MsgIndex]) { if (!$HasLogHeader) { @@ -248,7 +249,8 @@ sub SendLog($) push @New, "$Group->{Messages}->[$MsgIndex]\n"; $TaskInfo->{NewCount}++; } - else + elsif ($Group->{Types}->[$MsgIndex] eq "e" or + $Group->{Types}->[$MsgIndex] eq "k") # flaky => old failure { $TaskInfo->{OldCount}++; } @@ -403,6 +405,7 @@ EOF my $LineNo = $Group->{LineNos}->[$MsgIndex]; my $Bugs = $LogInfo->{Bugs}->{$LineNo}; my $Prefix = $Bugs ? join(" ", sort { $a <=> $b } @$Bugs) : + $Group->{Types}->[$MsgIndex] eq "k" ? "flk" : $Group->{IsNew}->[$MsgIndex] ? "new" : "old"; print $Sendmail "[$Prefix] $Group->{Messages}->[$MsgIndex]\n"; diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e7f147be..06751e78 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -497,9 +497,9 @@ sub _CloseTestUnit($$$) } } -sub _AddReportMsg($$$$) +sub _AddReportMsg($$$$$) { - my ($LogInfo, $Cur, $LineNo, $Line) = @_; + my ($LogInfo, $Cur, $LineNo, $Line, $Type) = @_; # Make the timeout messages more user-friendly my $ErrLine = $Line; @@ -513,7 +513,7 @@ sub _AddReportMsg($$$$) { $Cur->{Group} = _AddLogGroup($LogInfo, $Cur->{Dll}, $Cur->{GroupLineNo} || $LineNo); } - _AddLogMsg($LogInfo, $Cur->{Group}, $ErrLine, $LineNo, "e"); + _AddLogMsg($LogInfo, $Cur->{Group}, $ErrLine, $LineNo, $Type); } =pod @@ -589,7 +589,7 @@ sub ParseWineTestReport($$$) elsif ($InDlls == 1 and $Line =~ /^\s+\S+=(?:dll is native|load error \d+)$/) { - _AddReportMsg($LogInfo, $Cur, $LineNo, $Line); + _AddReportMsg($LogInfo, $Cur, $LineNo, $Line, "e"); $Cur->{LineFailures}++; } elsif ($Line =~ /^Test output:$/) @@ -626,7 +626,7 @@ sub ParseWineTestReport($$$) $Line =~ /^([_a-z0-9]+)\.c:\d+:[0-9.]* Test (?:failed|succeeded inside todo block): /) { _CheckUnit($LogInfo, $Cur, $1, "failure"); - _AddReportMsg($LogInfo, $Cur, $LineNo, "$&$'"); + _AddReportMsg($LogInfo, $Cur, $LineNo, "$&$'", "e"); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -634,7 +634,7 @@ sub ParseWineTestReport($$$) $Line =~ /^([_a-z0-9]+)\.c:\d+:[0-9.]* Test (?:marked flaky|succeeded inside flaky todo block): /) { _CheckUnit($LogInfo, $Cur, $1, "flaky"); - _AddReportMsg($LogInfo, $Cur, $LineNo, "$&$'"); + _AddReportMsg($LogInfo, $Cur, $LineNo, "$&$'", "k"); $Cur->{LineFlaky}++; } elsif (($Cur->{Unit} ne "" and @@ -663,7 +663,7 @@ sub ParseWineTestReport($$$) $Cur->{SummaryFailures}++; $LogInfo->{IsWineTest} = 1; - _AddReportMsg($LogInfo, $Cur, $LineNo, $Line); + _AddReportMsg($LogInfo, $Cur, $LineNo, $Line, "e"); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -686,7 +686,7 @@ sub ParseWineTestReport($$$) $Cur->{Pids}->{$Pid || 0} = 1; $Cur->{SummaryFailures}++; } - _AddReportMsg($LogInfo, $Cur, $LineNo, "$&$'"); + _AddReportMsg($LogInfo, $Cur, $LineNo, "$&$'", "e"); $Cur->{LineFailures}++; } } @@ -697,7 +697,7 @@ sub ParseWineTestReport($$$) # This also replaces a test summary line. The pid is unknown so use 0. $Cur->{Pids}->{0} = 1; $Cur->{SummaryFailures}++; - _AddReportMsg($LogInfo, $Cur, $LineNo, "$&$'"); + _AddReportMsg($LogInfo, $Cur, $LineNo, "$&$'", "e"); $Cur->{LineFailures}++; } } @@ -715,7 +715,7 @@ sub ParseWineTestReport($$$) $Cur->{Pids}->{$Pid || 0} = 1; $Cur->{SummaryFailures}++; } - _AddReportMsg($LogInfo, $Cur, $LineNo, $&); + _AddReportMsg($LogInfo, $Cur, $LineNo, $&, "e"); $Cur->{LineFailures}++; } } @@ -769,7 +769,7 @@ sub ParseWineTestReport($$$) # so record the failure but don't add an error message. $Cur->{IsBroken} = 1; $LogInfo->{TimeoutCount}++; - _AddReportMsg($LogInfo, $Cur, $LineNo, $&); + _AddReportMsg($LogInfo, $Cur, $LineNo, $&, "e"); } elsif ((!$Pid and !%{$Cur->{Pids}}) or ($Pid and !$Cur->{Pids}->{$Pid} and !$Cur->{Pids}->{0})) @@ -1014,7 +1014,7 @@ sub LoadLogErrorsFromFh($$) $LogInfo->{BadLog} = "$LogInfo->{LineNo}: Got a $Type line with no group"; return $Line; } - elsif ($Type eq "e" or $Type eq "E") + elsif ($Type eq "e" or $Type eq "E" or $Type eq "k" or $Type eq "K") { _AddLogMsg($LogInfo, $LogInfo->{CurGroup}, $Value, $Property, $Type); } diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index ce51ca74..eed9eb30 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -425,7 +425,9 @@ sub GenerateFullLog($$$$$) my $LineNo = $Group->{LineNos}->[$MsgIndex]; if ($LineNo) { - $ErrCategory{$LineNo} = $Group->{IsNew}->[$MsgIndex] ? "new" : "error"; + $ErrCategory{$LineNo} = ($Group->{IsNew}->[$MsgIndex] ? "new" : ""). + ($Group->{Types}->[$MsgIndex] eq "k" ? "flaky" : + "error"); $ErrFailures{$LineNo} = $Group->{Failures}->{$MsgIndex}; if ($ErrFailures{$LineNo}) @@ -438,7 +440,7 @@ sub GenerateFullLog($$$$$) } } $LogBugs{-2} ||= [$LineNo, "First failure"]; - if ($ErrCategory{$LineNo} eq "new" and !$ErrFailures{$LineNo}) + if ($ErrCategory{$LineNo} eq "newerror" and !$ErrFailures{$LineNo}) { $LogBugs{-1} ||= [$LineNo, "First untracked new failure"]; $LogBugs{10000000} = [$LineNo, "Last untracked new failure"]; @@ -522,7 +524,7 @@ sub GenerateFullLog($$$$$) } my $Line = $Group->{Messages}->[$MsgIndex]; - my $Category = $Group->{IsNew}->[$MsgIndex] ? "new" : "error"; + my $Category = $Group->{IsNew}->[$MsgIndex] ? "newerror" : "error"; my $Html = $self->escapeHTML($Line); if ($Group->{Failures}->{$MsgIndex}) { @@ -695,10 +697,10 @@ EOF foreach my $Line (@{$Group->{Messages}}) { my $Html = $self->escapeHTML($Line); - if ($Group->{IsNew}->[$MsgIndex]) - { - $Html = "<span class='log-new'>$Html</span>"; - } + my $Category = ($Group->{IsNew}->[$MsgIndex] ? "new" : ""). + ($Group->{Types}->[$MsgIndex] eq "k" ? "flaky" : + "error"); + $Html = "<span class='log-$Category'>$Html</span>"; my $FailureIds = $Group->{Failures}->{$MsgIndex}; if ($FailureIds) { diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index c40b8546..e686e6f5 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -402,10 +402,12 @@ pre .log-info { background-color: #d9ffcc; } .log-skip { color: blue; } .log-todo { color: #d08000; } +.log-flaky { color: magenta; } +.log-newflaky { color: magenta; font-weight: bold; } .log-error { color: red; } +.log-newerror { color: red; font-weight: bold; } .log-boterror { color: #cc0052; } .log-diag { color: #e56300; } -.log-new { color: red; font-weight: bold; } .bug-missing { color: red; font-weight: bold; } .bug-closed { color: red; }

1 0

Francois Gouget : testbot: Fix the tasks failure count.
by Alexandre Julliard Oct. 26, 2022

Oct. 26, 2022

Module: tools Branch: master Commit: 818aebb2e41bbcec3cacd0723b59a9e867320732 URL: https://gitlab.winehq.org/winehq/tools/-/commit/818aebb2e41bbcec3cacd0723b5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 24 19:00:59 2022 +0200 testbot: Fix the tasks failure count. TestFailures is supposed to count all failures, including the preexisting (aka old) and flaky ones. Checking whether any of these failures is new must be done by analyzing the content of the task's .errors files. --- testbot/bin/WineRunTask.pl | 4 ++-- testbot/bin/WineRunWineTest.pl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 0641bb54..67ba3288 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -562,8 +562,8 @@ if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) my $ErrMessages = SnapshotLatestReport($Task, $RptFileName); LogTaskError("$_\n") for (@$ErrMessages); - # $LogInfo->{Failures} can legitimately be undefined in case of a timeout - $TaskFailures += $LogInfo->{Failures} || 0; + # $LogInfo->{ErrCount} can legitimately be undefined in case of a timeout + $TaskFailures += $LogInfo->{ErrCount} || 0; my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 62a7fc5b..d0e30d1c 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -578,8 +578,8 @@ foreach my $RptFileName (@$ReportNames) my $ErrMessages = SnapshotLatestReport($Task, $RptFileName); LogTaskError("$_\n") for (@$ErrMessages); - # $LogInfo->{Failures} can legitimately be undefined in case of a timeout - $TaskFailures += $LogInfo->{Failures} || 0; + # $LogInfo->{ErrCount} can legitimately be undefined in case of a timeout + $TaskFailures += $LogInfo->{ErrCount} || 0; my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); }

1 0

Francois Gouget : testbot/web: Always use the same color for new failures.
by Alexandre Julliard Oct. 26, 2022

Oct. 26, 2022

Module: tools Branch: master Commit: b60f6293ee66e74a6cf744aa4d9d3a33dd87a17c URL: https://gitlab.winehq.org/winehq/tools/-/commit/b60f6293ee66e74a6cf744aa4d9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 18 16:08:48 2022 +0200 testbot/web: Always use the same color for new failures. --- testbot/web/JobDetails.pl | 4 ++-- testbot/web/WineTestBot.css | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 321d025e..ff0943e0 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -425,7 +425,7 @@ sub GenerateFullLog($$$$$) my $LineNo = $Group->{LineNos}->[$ErrIndex]; if ($LineNo) { - $ErrCategory{$LineNo} = $Group->{IsNew}->[$ErrIndex] ? "fullnew" : "error"; + $ErrCategory{$LineNo} = $Group->{IsNew}->[$ErrIndex] ? "new" : "error"; $ErrFailures{$LineNo} = $Group->{Failures}->{$ErrIndex}; if ($ErrFailures{$LineNo}) @@ -438,7 +438,7 @@ sub GenerateFullLog($$$$$) } } $LogBugs{-2} ||= [$LineNo, "First failure"]; - if ($ErrCategory{$LineNo} eq "fullnew" and !$ErrFailures{$LineNo}) + if ($ErrCategory{$LineNo} eq "new" and !$ErrFailures{$LineNo}) { $LogBugs{-1} ||= [$LineNo, "First untracked new failure"]; $LogBugs{10000000} = [$LineNo, "Last untracked new failure"]; diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index fd6acac8..c40b8546 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -405,8 +405,7 @@ pre .log-error { color: red; } .log-boterror { color: #cc0052; } .log-diag { color: #e56300; } -.log-new { color: #e56e00; font-weight: bold; } -.log-fullnew { color: red; font-weight: bold; } +.log-new { color: red; font-weight: bold; } .bug-missing { color: red; font-weight: bold; } .bug-closed { color: red; }

1 0