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

Zebediah Figura : vkd3d-shader/hlsl: Consider any valid register reservation to invoke manual packing.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: vkd3d Branch: master Commit: 269cdad7b9cb91d234c2ee93b4e85713dbe5a792 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/269cdad7b9cb91d234c2ee93b4e85… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 26 16:59:34 2024 -0600 vkd3d-shader/hlsl: Consider any valid register reservation to invoke manual packing. Regardless of the type of the variable. --- libs/vkd3d-shader/hlsl_codegen.c | 4 +++- tests/hlsl/cbuffer.shader_test | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 3bb90c98..4acedb78 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -4776,7 +4776,9 @@ static void validate_buffer_offsets(struct hlsl_ctx *ctx) continue; if (var1->reg_reservation.offset_type - || (var1->data_type->class == HLSL_CLASS_OBJECT && var1->reg_reservation.reg_type)) + || var1->reg_reservation.reg_type == 's' + || var1->reg_reservation.reg_type == 't' + || var1->reg_reservation.reg_type == 'u') buffer->manually_packed_elements = true; else buffer->automatically_packed_elements = true; diff --git a/tests/hlsl/cbuffer.shader_test b/tests/hlsl/cbuffer.shader_test index 966346c5..1297b72b 100644 --- a/tests/hlsl/cbuffer.shader_test +++ b/tests/hlsl/cbuffer.shader_test @@ -805,7 +805,7 @@ float4 main() : sv_target return 0; } -[pixel shader todo fail(sm>=6)] +[pixel shader fail(sm>=6)] cbuffer buffer { float4 foo : packoffset(c0); @@ -821,7 +821,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 0.1 0.2 0.3 0.4 -todo draw quad +todo(glsl) draw quad probe all rgba (1.1, 2.2, 3.3, 4.4) @@ -832,7 +832,7 @@ shader model >= 5.0 size (2d, 1, 1) 0.0 0.0 0.0 0.5 -[pixel shader todo] +[pixel shader] struct apple { float2 a; @@ -858,5 +858,5 @@ uniform 4 float4 4.0 5.0 6.0 7.0 uniform 8 float4 8.0 9.0 10.0 11.0 uniform 12 float4 12.0 13.0 14.0 15.0 uniform 16 float4 16.0 17.0 18.0 19.0 -todo(sm<6) draw quad +todo(glsl) draw quad probe all rgba (124.0, 135.0, 146.0, 150.5)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Avoid using HLSL_CLASS_OBJECT without checking the base type.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: vkd3d Branch: master Commit: 0e3377a1be7c915d2ed8dd6e3c97ba085c8af867 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0e3377a1be7c915d2ed8dd6e3c97b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 26 17:29:54 2024 -0600 vkd3d-shader/hlsl: Avoid using HLSL_CLASS_OBJECT without checking the base type. As the diffstat shows, HLSL_CLASS_OBJECT does not really have much in common. Resource types (TEXTURE, SAMPLER, UAV) sometimes behave similarly to each other, but do not generally behave similarly to effect-specific types (string, shader, state, view). Most consumers of HLSL_CLASS_OBJECT subsequently check the base type anyway. Hence we want to replace HLSL_TYPE_* with individual classes for object types. As a first step, change the last few places that only check HLSL_CLASS_OBJECT. --- libs/vkd3d-shader/d3dbc.c | 12 ++---------- libs/vkd3d-shader/hlsl.c | 5 ++++- libs/vkd3d-shader/hlsl_codegen.c | 4 ++-- libs/vkd3d-shader/tpf.c | 12 +++--------- 4 files changed, 11 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 099729fb..97650942 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2572,19 +2572,11 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b { if (instr->data_type) { - if (instr->data_type->class == HLSL_CLASS_MATRIX) + if (instr->data_type->class != HLSL_CLASS_SCALAR && instr->data_type->class != HLSL_CLASS_VECTOR) { - /* These need to be lowered. */ - hlsl_fixme(ctx, &instr->loc, "SM1 matrix expression."); - continue; - } - else if (instr->data_type->class == HLSL_CLASS_OBJECT) - { - hlsl_fixme(ctx, &instr->loc, "Object copy."); + hlsl_fixme(ctx, &instr->loc, "Class %#x should have been lowered or removed.", instr->data_type->class); break; } - - assert(instr->data_type->class == HLSL_CLASS_SCALAR || instr->data_type->class == HLSL_CLASS_VECTOR); } switch (instr->type) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index a5248c89..da6f29f1 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1570,7 +1570,10 @@ bool hlsl_index_is_noncontiguous(struct hlsl_ir_index *index) bool hlsl_index_is_resource_access(struct hlsl_ir_index *index) { - return index->val.node->data_type->class == HLSL_CLASS_OBJECT; + const struct hlsl_type *type = index->val.node->data_type; + + return type->class == HLSL_CLASS_OBJECT + && (type->base_type == HLSL_TYPE_TEXTURE || type->base_type == HLSL_TYPE_UAV); } bool hlsl_index_chain_has_resource_access(struct hlsl_ir_index *index) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 4acedb78..15c60e50 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1565,7 +1565,7 @@ static bool copy_propagation_replace_with_single_instr(struct hlsl_ctx *ctx, var->name, start, start + count, debug_hlsl_swizzle(swizzle, instr_component_count), new_instr, debug_hlsl_swizzle(ret_swizzle, instr_component_count)); - if (instr->data_type->class != HLSL_CLASS_OBJECT) + if (new_instr->data_type->class == HLSL_CLASS_SCALAR || new_instr->data_type->class == HLSL_CLASS_VECTOR) { struct hlsl_ir_node *swizzle_node; @@ -1742,7 +1742,7 @@ static void copy_propagation_record_store(struct hlsl_ctx *ctx, struct hlsl_ir_s { unsigned int writemask = store->writemask; - if (store->rhs.node->data_type->class == HLSL_CLASS_OBJECT) + if (!hlsl_is_numeric_type(store->rhs.node->data_type)) writemask = VKD3DSP_WRITEMASK_0; copy_propagation_set_value(ctx, var_def, start, writemask, store->rhs.node, store->node.index); } diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index c4a298b6..d5019a5d 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -5707,18 +5707,12 @@ static void write_sm4_block(const struct tpf_writer *tpf, const struct hlsl_bloc { if (instr->data_type) { - if (instr->data_type->class == HLSL_CLASS_MATRIX) + if (instr->data_type->class != HLSL_CLASS_SCALAR && instr->data_type->class != HLSL_CLASS_VECTOR) { - hlsl_fixme(tpf->ctx, &instr->loc, "Matrix operations need to be lowered."); + hlsl_fixme(tpf->ctx, &instr->loc, "Class %#x should have been lowered or removed.", + instr->data_type->class); break; } - else if (instr->data_type->class == HLSL_CLASS_OBJECT) - { - hlsl_fixme(tpf->ctx, &instr->loc, "Object copy."); - break; - } - - assert(instr->data_type->class == HLSL_CLASS_SCALAR || instr->data_type->class == HLSL_CLASS_VECTOR); if (!instr->reg.allocated) {

1 0

Francisco Casas : vkd3d-shader/hlsl: Properly release string buffer on write_atan_or_atan2().
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: vkd3d Branch: master Commit: 5ab1ef1cade91db400bcc1db1acc09990f3696ca URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5ab1ef1cade91db400bcc1db1acc0… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Apr 4 18:22:41 2024 -0300 vkd3d-shader/hlsl: Properly release string buffer on write_atan_or_atan2(). vkd3d_string_buffer_cleanup() doesn't do the same as hlsl_release_string_buffer(). The former only frees the char array inside the string buffer and not the string buffer itself. --- libs/vkd3d-shader/hlsl.y | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 7655f69e..3959ff84 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2836,20 +2836,20 @@ static bool write_atan_or_atan2(struct hlsl_ctx *ctx, type->name, type->name, type->name); if (ret < 0) { - vkd3d_string_buffer_cleanup(buf); + hlsl_release_string_buffer(ctx, buf); return false; } ret = vkd3d_string_buffer_printf(buf, body_template, type->name); if (ret < 0) { - vkd3d_string_buffer_cleanup(buf); + hlsl_release_string_buffer(ctx, buf); return false; } func = hlsl_compile_internal_function(ctx, atan2_mode ? atan2_name : atan_name, buf->buffer); - vkd3d_string_buffer_cleanup(buf); + hlsl_release_string_buffer(ctx, buf); if (!func) return false;

1 0

Giovanni Mascellani : ci: Delimit building each commit with a collapsible section.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: vkd3d Branch: master Commit: ca2f54e7291844669955a6ae72f06ee31a6eb5a8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ca2f54e7291844669955a6ae72f06… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Apr 4 23:04:14 2024 +0200 ci: Delimit building each commit with a collapsible section. --- gitlab/build-crosstest | 7 ++++--- gitlab/build-linux | 7 ++++--- gitlab/build-mac | 7 ++++--- gitlab/build-mingw | 7 ++++--- tests/driver.c | 9 +++++++-- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/gitlab/build-crosstest b/gitlab/build-crosstest index 4e6c5b65..71ffede9 100755 --- a/gitlab/build-crosstest +++ b/gitlab/build-crosstest @@ -1,10 +1,9 @@ #!/bin/bash -echo "Building $(git log -1)" -echo "---" - COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)) +echo -e "\e[0Ksection_start:`date +%s`:commit_$COMMIT\r\e[0KBuilding commit $COMMIT" + set -Eeuxo pipefail # Building with -Wno-array-bounds because MinGW headers currently emit @@ -25,3 +24,5 @@ rsync -Rr config.log tests/*.txt tests/*.exe ../artifacts/$COMMIT || true cp tests/driver.cross64.exe ../artifacts git reset --hard + +echo -e "\e[0Ksection_end:`date +%s`:commit_$COMMIT\r\e[0K" diff --git a/gitlab/build-linux b/gitlab/build-linux index b149132c..2a2a40c2 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -1,10 +1,9 @@ #!/bin/bash -echo "Building $(git log -1)" -echo "---" - COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)) +echo -e "\e[0Ksection_start:`date +%s`:commit_$COMMIT\r\e[0KBuilding commit $COMMIT" + set -Eeuxo pipefail ./autogen.sh @@ -26,3 +25,5 @@ mkdir -p ../artifacts/$COMMIT rsync -Rr config.log doc/* test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT || true git reset --hard + +echo -e "\e[0Ksection_end:`date +%s`:commit_$COMMIT\r\e[0K" diff --git a/gitlab/build-mac b/gitlab/build-mac index a3119686..c0efbdf0 100755 --- a/gitlab/build-mac +++ b/gitlab/build-mac @@ -1,10 +1,9 @@ #!/bin/bash -echo "Building $(git log -1)" -echo "---" - COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)) +echo -e "\033[0Ksection_start:`date +%s`:commit_$COMMIT\r\033[0KBuilding commit $COMMIT" + set -Eeuxo pipefail ./autogen.sh @@ -25,3 +24,5 @@ mkdir -p ../artifacts/$COMMIT rsync -Rr config.log test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT || true git reset --hard + +echo -e "\033[0Ksection_end:`date +%s`:commit_$COMMIT\r\033[0K" diff --git a/gitlab/build-mingw b/gitlab/build-mingw index 6d4cf189..3937d224 100755 --- a/gitlab/build-mingw +++ b/gitlab/build-mingw @@ -1,10 +1,9 @@ #!/bin/bash -echo "Building $(git log -1)" -echo "---" - COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)) +echo -e "\e[0Ksection_start:`date +%s`:commit_$COMMIT\r\e[0KBuilding commit $COMMIT" + set -Eeuxo pipefail ./autogen.sh @@ -23,3 +22,5 @@ cp config.log ../artifacts/$COMMIT || true cp destdir/usr/local/bin/* ../artifacts/$COMMIT || true git reset --hard + +echo -e "\e[0Ksection_end:`date +%s`:commit_$COMMIT\r\e[0K" diff --git a/tests/driver.c b/tests/driver.c index 95f39adb..4054f1c2 100644 --- a/tests/driver.c +++ b/tests/driver.c @@ -19,6 +19,8 @@ #include <stdio.h> #include <stdbool.h> #include <stdlib.h> +#include <stdint.h> +#include <time.h> #include <windows.h> #include <shlobj.h> @@ -141,8 +143,8 @@ static bool run_tests_for_directory(const char *commit_dir) if (!test_arch) test_arch = "64"; - printf("Building %s\n", commit_dir); - printf("---\n"); + printf("\e[0Ksection_start:%I64d:commit_%s\r\e[0KBuilding commit %s\n", + (uint64_t)time(NULL), commit_dir, commit_dir); sprintf(list_filename, "artifacts/%s/tests/shader_tests.txt", commit_dir); list_file = fopen(list_filename, "r"); @@ -232,6 +234,9 @@ static bool run_tests_for_directory(const char *commit_dir) } } + printf("\e[0Ksection_end:%I64d:commit_%s\r\e[0K\n", + (uint64_t)time(NULL), commit_dir); + return ret; }

1 0

Henri Verbeet : tests/test-driver: Avoid "head" with negative line count.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: vkd3d Branch: master Commit: d1e16514d0cf2c28ce946b6102bdb22861cbda99 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d1e16514d0cf2c28ce946b6102bdb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 4 14:45:59 2024 +0200 tests/test-driver: Avoid "head" with negative line count. It's not supported on macOS, and not needed here. --- tests/test-driver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-driver.sh b/tests/test-driver.sh index 869cc4be..b7104a34 100755 --- a/tests/test-driver.sh +++ b/tests/test-driver.sh @@ -188,7 +188,7 @@ details=$(awk "$awk_program" "$log_file") # In case of SIGABRT or SIGSEGV, add tag and print second to last line, containing the # "(core dumped)" message. -nxt_to_last_line=$(tail -n2 "$log_file" | head -n -1) +nxt_to_last_line=$(tail -n2 "$log_file" | head -n1) if [ "$tweaked_estatus" -eq 134 ]; then details="$details# [SIGABRT] <fade>$nxt_to_last_line<reset>" elif [ "$tweaked_estatus" -eq 139 ]; then

1 0

Conor McCarthy : vkd3d-shader/ir: Materialise phis to temps in the incoming blocks.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: vkd3d Branch: master Commit: 7bfc7410f253ff5b3a3a8965755fd59772604806 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7bfc7410f253ff5b3a3a8965755fd… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Apr 3 10:35:45 2024 +1000 vkd3d-shader/ir: Materialise phis to temps in the incoming blocks. RADV converts temps to phi instructions, so converting phis to MOVC in VSIR just translates back to phis feeding into a MOVC. This commit eliminates the MOVC. --- libs/vkd3d-shader/ir.c | 190 +++++++++++++++---------------------------------- 1 file changed, 57 insertions(+), 133 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/spirv: Emit a uint result for RESINFO_UINT if the dst register is SSA.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: vkd3d Branch: master Commit: c8eb7e1c81049441fcf1b6365c900bf0fec5a8dc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c8eb7e1c81049441fcf1b6365c900… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 2 12:08:49 2024 +1000 vkd3d-shader/spirv: Emit a uint result for RESINFO_UINT if the dst register is SSA. --- libs/vkd3d-shader/spirv.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 46130244..b70bc30e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9334,6 +9334,7 @@ static void spirv_compiler_emit_resinfo(struct spirv_compiler *compiler, const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; uint32_t type_id, lod_id, val_id, miplevel_count_id; + enum vkd3d_shader_component_type component_type; uint32_t constituents[VKD3D_VEC4_SIZE]; unsigned int i, size_component_count; struct vkd3d_shader_image image; @@ -9370,10 +9371,16 @@ static void spirv_compiler_emit_resinfo(struct spirv_compiler *compiler, val_id = vkd3d_spirv_build_op_composite_construct(builder, type_id, constituents, i + 2); + component_type = VKD3D_SHADER_COMPONENT_FLOAT; + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE); if (instruction->flags == VKD3DSI_RESINFO_UINT) { - val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); + /* SSA registers must match the specified result type. */ + if (!register_is_ssa(&dst->reg)) + val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); + else + component_type = VKD3D_SHADER_COMPONENT_UINT; } else { @@ -9382,7 +9389,7 @@ static void spirv_compiler_emit_resinfo(struct spirv_compiler *compiler, val_id = vkd3d_spirv_build_op_convert_utof(builder, type_id, val_id); } val_id = spirv_compiler_emit_swizzle(compiler, val_id, VKD3DSP_WRITEMASK_ALL, - VKD3D_SHADER_COMPONENT_FLOAT, src[1].swizzle, dst->write_mask); + component_type, src[1].swizzle, dst->write_mask); spirv_compiler_emit_store_dst(compiler, dst, val_id); }

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle uint2 to double bitcast in spirv_compiler_emit_mov().
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: vkd3d Branch: master Commit: 1c61776c189fb2b8f5cd2f4547a61976b7288306 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1c61776c189fb2b8f5cd2f4547a61… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Apr 3 13:40:55 2024 +1000 vkd3d-shader/spirv: Handle uint2 to double bitcast in spirv_compiler_emit_mov(). Necessary for MakeDouble if the dst is SSA. --- libs/vkd3d-shader/spirv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index b70bc30e..78c95bde 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7283,8 +7283,12 @@ static void spirv_compiler_emit_mov(struct spirv_compiler *compiler, } general_implementation: - write_mask = (src->reg.type == VKD3DSPR_IMMCONST64 && !data_type_is_64_bit(dst->reg.data_type)) - ? vsir_write_mask_64_from_32(dst->write_mask) : dst->write_mask; + write_mask = dst->write_mask; + if (src->reg.type == VKD3DSPR_IMMCONST64 && !data_type_is_64_bit(dst->reg.data_type)) + write_mask = vsir_write_mask_64_from_32(write_mask); + else if (!data_type_is_64_bit(src->reg.data_type) && data_type_is_64_bit(dst->reg.data_type)) + write_mask = vsir_write_mask_32_from_64(write_mask); + val_id = spirv_compiler_emit_load_src(compiler, src, write_mask); if (dst->reg.data_type != src->reg.data_type) {

1 0

Conor McCarthy : vkd3d-shader/ir: Convert SSAs to temps only if the block of origin does not dominate all uses.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: vkd3d Branch: master Commit: cfcd57209b93f34db0bc8ffe119d00555bd9e91d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cfcd57209b93f34db0bc8ffe119d0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 2 12:55:05 2024 +1000 vkd3d-shader/ir: Convert SSAs to temps only if the block of origin does not dominate all uses. --- libs/vkd3d-shader/ir.c | 187 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 157 insertions(+), 30 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/ir: Materialise SSAs to temps before lowering switch instructions.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: vkd3d Branch: master Commit: 7d5e3713f9b01a3b26a86c375bf0c1ac109824bf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7d5e3713f9b01a3b26a86c375bf0c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Apr 3 12:20:09 2024 +1000 vkd3d-shader/ir: Materialise SSAs to temps before lowering switch instructions. --- libs/vkd3d-shader/ir.c | 96 ++------------------------------------------------ 1 file changed, 3 insertions(+), 93 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 11d21827..9d5b7904 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2578,97 +2578,6 @@ static enum vkd3d_result lower_switch_to_if_ladder(struct vsir_program *program) } } - /* Second subpass: creating new blocks might have broken - * references in PHI instructions, so we use the block map to fix - * them. */ - current_label = 0; - for (i = 0; i < ins_count; ++i) - { - struct vkd3d_shader_instruction *ins = &instructions[i]; - struct vkd3d_shader_src_param *new_src; - unsigned int j, l, new_src_count = 0; - - switch (ins->handler_idx) - { - case VKD3DSIH_LABEL: - current_label = label_from_src_param(&ins->src[0]); - continue; - - case VKD3DSIH_PHI: - break; - - default: - continue; - } - - /* First count how many source parameters we need. */ - for (j = 0; j < ins->src_count; j += 2) - { - unsigned int source_label = label_from_src_param(&ins->src[j + 1]); - size_t k, match_count = 0; - - for (k = 0; k < map_count; ++k) - { - struct lower_switch_to_if_ladder_block_mapping *mapping = &block_map[k]; - - if (mapping->switch_label == source_label && mapping->target_label == current_label) - match_count += 1; - } - - new_src_count += (match_count != 0) ? 2 * match_count : 2; - } - - assert(new_src_count >= ins->src_count); - - /* Allocate more source parameters if needed. */ - if (new_src_count == ins->src_count) - { - new_src = ins->src; - } - else - { - if (!(new_src = vsir_program_get_src_params(program, new_src_count))) - { - ERR("Failed to allocate %u source parameters.\n", new_src_count); - goto fail; - } - } - - /* Then do the copy. */ - for (j = 0, l = 0; j < ins->src_count; j += 2) - { - unsigned int source_label = label_from_src_param(&ins->src[j + 1]); - size_t k, match_count = 0; - - for (k = 0; k < map_count; ++k) - { - struct lower_switch_to_if_ladder_block_mapping *mapping = &block_map[k]; - - if (mapping->switch_label == source_label && mapping->target_label == current_label) - { - match_count += 1; - - new_src[l] = ins->src[j]; - new_src[l + 1] = ins->src[j + 1]; - new_src[l + 1].reg.idx[0].offset = mapping->if_label; - l += 2; - } - } - - if (match_count == 0) - { - new_src[l] = ins->src[j]; - new_src[l + 1] = ins->src[j + 1]; - l += 2; - } - } - - assert(l == new_src_count); - - ins->src_count = new_src_count; - ins->src = new_src; - } - vkd3d_free(program->instructions.elements); vkd3d_free(block_map); program->instructions.elements = instructions; @@ -2827,6 +2736,7 @@ static enum vkd3d_result vsir_program_materialise_phi_ssas_to_temps(struct vsir_ break; case VKD3DSIH_BRANCH: + case VKD3DSIH_SWITCH_MONOLITHIC: info = &block_info[current_label - 1]; for (j = 0; j < info->incoming_count; ++j) @@ -5506,10 +5416,10 @@ enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t { struct vsir_cfg cfg; - if ((result = lower_switch_to_if_ladder(program)) < 0) + if ((result = vsir_program_materialise_phi_ssas_to_temps(program)) < 0) return result; - if ((result = vsir_program_materialise_phi_ssas_to_temps(program)) < 0) + if ((result = lower_switch_to_if_ladder(program)) < 0) return result; if ((result = vsir_cfg_init(&cfg, program, message_context)) < 0)

1 0