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

Conor McCarthy : vkd3d: Initialise wave ops feature options.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: fd590c2593bda2e511ba688c8881fbdb2d564774 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fd590c2593bda2e511ba688c8881f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jun 20 15:16:52 2023 +1000 vkd3d: Initialise wave ops feature options. Based in part on a vkd3d-proton patch by Philip Rebohle. --- libs/vkd3d/device.c | 36 ++++++++++++++++++++++++++++++++---- libs/vkd3d/state.c | 2 ++ tests/hlsl/wave-ops-uint.shader_test | 2 +- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index cb2b6ad0..3f3332dd 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -788,6 +788,11 @@ VkInstance vkd3d_instance_get_vk_instance(struct vkd3d_instance *instance) return instance->vk_instance; } +static bool d3d12_device_environment_is_vulkan_min_1_1(struct d3d12_device *device) +{ + return device->environment == VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_1; +} + struct vkd3d_physical_device_info { /* properties */ @@ -796,6 +801,7 @@ struct vkd3d_physical_device_info VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT texel_buffer_alignment_properties; VkPhysicalDeviceTransformFeedbackPropertiesEXT xfb_properties; VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT vertex_divisor_properties; + VkPhysicalDeviceSubgroupProperties subgroup_properties; VkPhysicalDeviceProperties2KHR properties2; @@ -838,6 +844,7 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i VkPhysicalDevice4444FormatsFeaturesEXT *formats4444_features; VkPhysicalDeviceTransformFeedbackFeaturesEXT *xfb_features; struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; + VkPhysicalDeviceSubgroupProperties *subgroup_properties; memset(info, 0, sizeof(*info)); conditional_rendering_features = &info->conditional_rendering_features; @@ -857,6 +864,7 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i formats4444_features = &info->formats4444_features; xfb_features = &info->xfb_features; xfb_properties = &info->xfb_properties; + subgroup_properties = &info->subgroup_properties; info->features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; @@ -902,6 +910,9 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i vk_prepend_struct(&info->properties2, xfb_properties); vertex_divisor_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT; vk_prepend_struct(&info->properties2, vertex_divisor_properties); + subgroup_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES; + if (d3d12_device_environment_is_vulkan_min_1_1(device)) + vk_prepend_struct(&info->properties2, subgroup_properties); if (vulkan_info->KHR_get_physical_device_properties2) VK_CALL(vkGetPhysicalDeviceProperties2KHR(physical_device, &info->properties2)); @@ -1509,6 +1520,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, struct vkd3d_physical_device_info *physical_device_info, uint32_t *device_extension_count, bool **user_extension_supported) { + const VkPhysicalDeviceSubgroupProperties *subgroup_properties = &physical_device_info->subgroup_properties; const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT *fragment_shader_interlock; const struct vkd3d_optional_device_extensions_info *optional_extensions; @@ -1520,6 +1532,16 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, uint32_t count; VkResult vr; + /* SHUFFLE is required to implement WaveReadLaneAt with dynamically uniform index before SPIR-V 1.5 / Vulkan 1.2. */ + static const VkSubgroupFeatureFlags required_subgroup_features = VK_SUBGROUP_FEATURE_ARITHMETIC_BIT + | VK_SUBGROUP_FEATURE_BASIC_BIT + | VK_SUBGROUP_FEATURE_BALLOT_BIT + | VK_SUBGROUP_FEATURE_SHUFFLE_BIT + | VK_SUBGROUP_FEATURE_QUAD_BIT + | VK_SUBGROUP_FEATURE_VOTE_BIT; + + static const VkSubgroupFeatureFlags required_stages = VK_SHADER_STAGE_COMPUTE_BIT | VK_SHADER_STAGE_FRAGMENT_BIT; + *device_extension_count = 0; vkd3d_trace_physical_device(physical_device, physical_device_info, vk_procs); @@ -1583,10 +1605,12 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, device->feature_options.ResourceHeapTier = D3D12_RESOURCE_HEAP_TIER_2; /* Shader Model 6 support. */ - device->feature_options1.WaveOps = FALSE; - device->feature_options1.WaveLaneCountMin = 0; - device->feature_options1.WaveLaneCountMax = 0; - device->feature_options1.TotalLaneCount = 0; + device->feature_options1.WaveOps = subgroup_properties->subgroupSize >= 4 + && (subgroup_properties->supportedOperations & required_subgroup_features) == required_subgroup_features + && (subgroup_properties->supportedStages & required_stages) == required_stages; + device->feature_options1.WaveLaneCountMin = subgroup_properties->subgroupSize; + device->feature_options1.WaveLaneCountMax = subgroup_properties->subgroupSize; + device->feature_options1.TotalLaneCount = 32 * subgroup_properties->subgroupSize; /* approx. */ device->feature_options1.ExpandedComputeResourceStates = TRUE; device->feature_options1.Int64ShaderOps = features->shaderInt64; @@ -3434,7 +3458,11 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device9 TRACE("Request shader model %#x.\n", data->HighestShaderModel); +#ifdef VKD3D_SHADER_UNSUPPORTED_DXIL + data->HighestShaderModel = D3D_SHADER_MODEL_6_0; +#else data->HighestShaderModel = D3D_SHADER_MODEL_5_1; +#endif TRACE("Shader model %#x.\n", data->HighestShaderModel); return S_OK; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 6ba29c18..199d8043 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2159,6 +2159,8 @@ static unsigned int feature_flags_compile_option(const struct d3d12_device *devi flags |= VKD3D_SHADER_COMPILE_OPTION_FEATURE_INT64; if (device->feature_options.DoublePrecisionFloatShaderOps) flags |= VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLOAT64; + if (device->feature_options1.WaveOps) + flags |= VKD3D_SHADER_COMPILE_OPTION_FEATURE_WAVE_OPS; return flags; } diff --git a/tests/hlsl/wave-ops-uint.shader_test b/tests/hlsl/wave-ops-uint.shader_test index c04b3951..033ac45b 100644 --- a/tests/hlsl/wave-ops-uint.shader_test +++ b/tests/hlsl/wave-ops-uint.shader_test @@ -81,7 +81,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rui (1) probe uav 1 (1) rui (1) probe uav 1 (2) rui (1)

1 0

Conor McCarthy : tests/shader-runner: Add a 'require' directive for wave ops.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: 29786d7efb712cbc3aa8c97d6ba2a8e6e09fdf42 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/29786d7efb712cbc3aa8c97d6ba2a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Apr 24 11:29:17 2024 +1000 tests/shader-runner: Add a 'require' directive for wave ops. --- tests/hlsl/wave-ops-float.shader_test | 1 + tests/hlsl/wave-ops-int.shader_test | 1 + tests/hlsl/wave-ops-uint.shader_test | 1 + tests/shader_runner.c | 7 +++++++ tests/shader_runner.h | 2 ++ tests/shader_runner_d3d12.c | 1 + 6 files changed, 13 insertions(+) diff --git a/tests/hlsl/wave-ops-float.shader_test b/tests/hlsl/wave-ops-float.shader_test index b8589484..74254179 100644 --- a/tests/hlsl/wave-ops-float.shader_test +++ b/tests/hlsl/wave-ops-float.shader_test @@ -1,5 +1,6 @@ [require] shader model >= 6.0 +wave ops [uav 0] format r32g32b32a32 float diff --git a/tests/hlsl/wave-ops-int.shader_test b/tests/hlsl/wave-ops-int.shader_test index e3a44621..5c9a365f 100644 --- a/tests/hlsl/wave-ops-int.shader_test +++ b/tests/hlsl/wave-ops-int.shader_test @@ -1,5 +1,6 @@ [require] shader model >= 6.0 +wave ops [uav 0] format r32g32b32a32 sint diff --git a/tests/hlsl/wave-ops-uint.shader_test b/tests/hlsl/wave-ops-uint.shader_test index 033ac45b..de65e47d 100644 --- a/tests/hlsl/wave-ops-uint.shader_test +++ b/tests/hlsl/wave-ops-uint.shader_test @@ -1,5 +1,6 @@ [require] shader model >= 6.0 +wave ops [uav 0] format r32 uint diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 68a7a9c5..e9db04b1 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -339,6 +339,10 @@ static void parse_require_directive(struct shader_runner *runner, const char *li { runner->require_rov = true; } + else if (match_string(line, "wave ops", &line)) + { + runner->require_wave_ops = true; + } else { fatal_error("Unknown require directive '%s'.\n", line); @@ -1545,6 +1549,8 @@ static bool check_requirements(const struct shader_runner *runner, const struct return false; if (runner->require_rov && !caps->rov) return false; + if (runner->require_wave_ops && !caps->wave_ops) + return false; return true; } @@ -1838,6 +1844,7 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_c runner->require_float64 = false; runner->require_int64 = false; runner->require_rov = false; + runner->require_wave_ops = false; runner->compile_options = 0; skip_tests = false; } diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 0457db96..4d7e7b67 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -137,6 +137,7 @@ struct shader_runner_caps bool float64; bool int64; bool rov; + bool wave_ops; }; static inline unsigned int shader_runner_caps_get_feature_flags(const struct shader_runner_caps *caps) @@ -169,6 +170,7 @@ struct shader_runner bool require_float64; bool require_int64; bool require_rov; + bool require_wave_ops; bool last_render_failed; diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index be1e10ed..d566261f 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -751,6 +751,7 @@ static void d3d12_runner_init_caps(struct d3d12_shader_runner *runner) runner->caps.float64 = options.DoublePrecisionFloatShaderOps; runner->caps.int64 = options1.Int64ShaderOps; runner->caps.rov = options.ROVsSupported; + runner->caps.wave_ops = options1.WaveOps; } static bool device_supports_shader_model_6_0(ID3D12Device *device)

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle the WAVELANECOUNT register.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: a130c970a693ef95f8bbcbb8dcb5380c111ad025 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a130c970a693ef95f8bbcbb8dcb53… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 18 10:58:15 2024 +1000 vkd3d-shader/spirv: Handle the WAVELANECOUNT register. --- libs/vkd3d-shader/spirv.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index cb1f5ded..e76aa894 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2631,6 +2631,11 @@ static bool spirv_compiler_is_opengl_target(const struct spirv_compiler *compile return spirv_compiler_get_target_environment(compiler) == VKD3D_SHADER_SPIRV_ENVIRONMENT_OPENGL_4_5; } +static bool spirv_compiler_is_spirv_min_1_3_target(const struct spirv_compiler *compiler) +{ + return spirv_compiler_get_target_environment(compiler) == VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_1; +} + static bool spirv_compiler_is_target_extension_supported(const struct spirv_compiler *compiler, enum vkd3d_shader_spirv_extension extension) { @@ -3149,6 +3154,9 @@ static bool spirv_compiler_get_register_name(char *buffer, unsigned int buffer_s case VKD3DSPR_OUTSTENCILREF: snprintf(buffer, buffer_size, "oStencilRef"); break; + case VKD3DSPR_WAVELANECOUNT: + snprintf(buffer, buffer_size, "vWaveLaneCount"); + break; default: FIXME("Unhandled register %#x.\n", reg->type); snprintf(buffer, buffer_size, "unrecognized_%#x", reg->type); @@ -4534,6 +4542,9 @@ static void spirv_compiler_decorate_builtin(struct spirv_compiler *compiler, case SpvBuiltInCullDistance: vkd3d_spirv_enable_capability(builder, SpvCapabilityCullDistance); break; + case SpvBuiltInSubgroupSize: + vkd3d_spirv_enable_capability(builder, SpvCapabilityGroupNonUniform); + break; default: break; } @@ -4723,6 +4734,8 @@ vkd3d_register_builtins[] = {VKD3DSPR_DEPTHOUTLE, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInFragDepth}}, {VKD3DSPR_OUTSTENCILREF, {VKD3D_SHADER_COMPONENT_UINT, 1, SpvBuiltInFragStencilRefEXT}}, + + {VKD3DSPR_WAVELANECOUNT, {VKD3D_SHADER_COMPONENT_UINT, 1, SpvBuiltInSubgroupSize}}, }; static void spirv_compiler_emit_register_execution_mode(struct spirv_compiler *compiler, @@ -5771,6 +5784,23 @@ static void spirv_compiler_emit_dcl_global_flags(struct spirv_compiler *compiler flags &= ~VKD3DSGF_ENABLE_INT64; } + if (flags & VKD3DSGF_ENABLE_WAVE_INTRINSICS) + { + if (!(compiler->features & VKD3D_SHADER_COMPILE_OPTION_FEATURE_WAVE_OPS)) + { + WARN("Unsupported wave ops.\n"); + spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_UNSUPPORTED_FEATURE, + "The target environment does not support wave ops."); + } + else if (!spirv_compiler_is_spirv_min_1_3_target(compiler)) + { + WARN("Wave ops enabled but environment does not support SPIR-V 1.3 or greater.\n"); + spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_UNSUPPORTED_FEATURE, + "The target environment uses wave ops but does not support SPIR-V 1.3 or greater."); + } + flags &= ~VKD3DSGF_ENABLE_WAVE_INTRINSICS; + } + if (flags & ~(VKD3DSGF_REFACTORING_ALLOWED | VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS)) FIXME("Unhandled global flags %#"PRIx64".\n", (uint64_t)flags); else

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsics WaveGetLaneCount and WaveGetLaneIndex.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: 6a56b4e5d81594648054e151adb60f22a51bb5fd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6a56b4e5d81594648054e151adb60… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 18 10:35:07 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsics WaveGetLaneCount and WaveGetLaneIndex. --- libs/vkd3d-shader/d3d_asm.c | 8 ++++++++ libs/vkd3d-shader/dxil.c | 24 ++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 3 files changed, 34 insertions(+) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index cd8ba0a7..7a8bbfc1 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -1161,6 +1161,14 @@ static void shader_print_register(struct vkd3d_d3d_asm_compiler *compiler, const vkd3d_string_buffer_printf(buffer, "sr"); break; + case VKD3DSPR_WAVELANECOUNT: + vkd3d_string_buffer_printf(buffer, "vWaveLaneCount"); + break; + + case VKD3DSPR_WAVELANEINDEX: + vkd3d_string_buffer_printf(buffer, "vWaveLaneIndex"); + break; + default: vkd3d_string_buffer_printf(buffer, "%s<unhandled register type %#x>%s", compiler->colours.error, reg->type, compiler->colours.reset); diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index ccba66af..f68e3274 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -427,6 +427,8 @@ enum dx_intrinsic_opcode DX_STORE_PATCH_CONSTANT = 106, DX_OUTPUT_CONTROL_POINT_ID = 107, DX_PRIMITIVE_ID = 108, + DX_WAVE_GET_LANE_INDEX = 111, + DX_WAVE_GET_LANE_COUNT = 112, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, DX_RAW_BUFFER_LOAD = 139, @@ -5899,6 +5901,26 @@ static void sm6_parser_emit_dx_texture_store(struct sm6_parser *sm6, enum dx_int dst_param_init_with_mask(dst_param, write_mask); } +static void sm6_parser_emit_dx_wave_builtin(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + enum vkd3d_shader_register_type type; + + switch (op) + { + case DX_WAVE_GET_LANE_COUNT: + type = VKD3DSPR_WAVELANECOUNT; + break; + case DX_WAVE_GET_LANE_INDEX: + type = VKD3DSPR_WAVELANEINDEX; + break; + default: + vkd3d_unreachable(); + } + + sm6_parser_emit_dx_input_register_mov(sm6, state->ins, type, VKD3D_DATA_UINT); +} + struct sm6_dx_opcode_info { const char *ret_type; @@ -6018,6 +6040,8 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_UMAD ] = {"m", "RRR", sm6_parser_emit_dx_ma}, [DX_UMAX ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_UMIN ] = {"m", "RR", sm6_parser_emit_dx_binary}, + [DX_WAVE_GET_LANE_COUNT ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, + [DX_WAVE_GET_LANE_INDEX ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, }; static bool sm6_parser_validate_operand_type(struct sm6_parser *sm6, const struct sm6_value *value, char info_type, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 165126b5..d0285fdc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -590,6 +590,8 @@ enum vkd3d_shader_register_type VKD3DSPR_OUTSTENCILREF, VKD3DSPR_UNDEF, VKD3DSPR_SSA, + VKD3DSPR_WAVELANECOUNT, + VKD3DSPR_WAVELANEINDEX, VKD3DSPR_COUNT,

1 0

Alexandre Julliard : vcomp: Move the fork wrapper to a separate file.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: a1e553aa807809b01ae19d05a20376cd47b42fbd URL: https://gitlab.winehq.org/wine/wine/-/commit/a1e553aa807809b01ae19d05a20376… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:25:01 2024 +0200 vcomp: Move the fork wrapper to a separate file. And build it as x86-64 code on ARM64EC. --- dlls/vcomp/Makefile.in | 1 + dlls/vcomp/fork.c | 173 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/main.c | 158 +----------------------------------------- dlls/vcomp100/Makefile.in | 1 + dlls/vcomp110/Makefile.in | 1 + dlls/vcomp120/Makefile.in | 1 + dlls/vcomp140/Makefile.in | 1 + 7 files changed, 180 insertions(+), 156 deletions(-)

1 0

Alexandre Julliard : vcomp: Fix stack alignment in the fork wrapper on ARM.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: 8331003f7ef7b98f32e283370a941ddce25ed945 URL: https://gitlab.winehq.org/wine/wine/-/commit/8331003f7ef7b98f32e283370a941d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:25:11 2024 +0200 vcomp: Fix stack alignment in the fork wrapper on ARM. --- dlls/vcomp/fork.c | 53 ++++++++++++++++++++++++----------------------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/dlls/vcomp/fork.c b/dlls/vcomp/fork.c index 7ec9f394c14..c754a301d07 100644 --- a/dlls/vcomp/fork.c +++ b/dlls/vcomp/fork.c @@ -107,37 +107,32 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, #elif defined __arm__ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, - "push {r4, r5, LR}\n\t" - "mov r4, r0\n\t" - "mov r5, SP\n\t" + "push {fp, lr}\n\t" + ".seh_save_regs_w {fp, lr}\n\t" + "mov fp, sp\n\t" + ".seh_save_sp fp\n\t" + ".seh_endprologue\n\t" "lsl r3, r1, #2\n\t" - "cmp r3, #0\n\t" - "beq 5f\n\t" - "sub SP, SP, r3\n\t" "tst r1, #1\n\t" - "it eq\n\t" - "subeq SP, SP, #4\n\t" - "1:\tsub r3, r3, #4\n\t" - "ldr r0, [r2, r3]\n\t" - "str r0, [SP, r3]\n\t" - "cmp r3, #0\n\t" - "bgt 1b\n\t" - "cmp r1, #1\n\t" - "bgt 2f\n\t" - "pop {r0}\n\t" - "b 5f\n\t" - "2:\tcmp r1, #2\n\t" - "bgt 3f\n\t" - "pop {r0-r1}\n\t" - "b 5f\n\t" - "3:\tcmp r1, #3\n\t" - "bgt 4f\n\t" - "pop {r0-r2}\n\t" - "b 5f\n\t" - "4:\tpop {r0-r3}\n\t" - "5:\tblx r4\n\t" - "mov SP, r5\n\t" - "pop {r4, r5, PC}" ) + "it ne\n\t" + "addne r3, r3, #4\n\t" + "cmp r3, #16\n\t" + "it lt\n\t" + "movlt r3, #16\n\t" + "sub sp, sp, r3\n\t" + "mov ip, r0\n\t" + "mov r3, #0\n\t" + "cmp r1, #0\n\t" + "beq 2f\n" + "1:\tldr r0, [r2, r3]\n\t" + "str r0, [sp, r3]\n\t" + "add r3, r3, #4\n\t" + "subs r1, r1, #1\n\t" + "bne 1b\n" + "2:\tpop {r0-r3}\n\t" + "blx ip\n\t" + "mov sp, fp\n\t" + "pop {fp, pc}" ) #elif defined __aarch64__

1 0

Alexandre Julliard : ntdll: Generate stub entry points as x86-64 code on ARM64EC.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: 4e0e623859aefee9d28a383dffe155fd1cfb3f38 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e0e623859aefee9d28a383dffe155… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:28:29 2024 +0200 ntdll: Generate stub entry points as x86-64 code on ARM64EC. Partial revert of 220a70bee268415925d1ae747611f48e51665e64. --- dlls/ntdll/loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c5d82e8c68c..6e3f67ef593 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -436,7 +436,7 @@ struct stub const char *name; const void* entry; }; -#elif defined(__aarch64__) || defined(__arm64ec__) +#elif defined(__aarch64__) struct stub { DWORD ldr_x0; /* ldr x0, $dll */ @@ -500,7 +500,7 @@ static ULONG_PTR allocate_stub( const char *dll, const char *name ) stub->dll = dll; stub->name = name; stub->entry = stub_entry_point; -#elif defined(__aarch64__) || defined(__arm64ec__) +#elif defined(__aarch64__) stub->ldr_x0 = 0x580000a0; /* ldr x0, #20 ($dll) */ stub->ldr_x1 = 0x580000c1; /* ldr x1, #24 ($name) */ stub->mov_x2_lr = 0xaa1e03e2; /* mov x2, lr */

1 0

Alexandre Julliard : ntdll: Build __chkstk as x86-64 code on ARM64EC.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: 6d931c271a9c9df332c0a9fe084f667919f7081a URL: https://gitlab.winehq.org/wine/wine/-/commit/6d931c271a9c9df332c0a9fe084f66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:28:00 2024 +0200 ntdll: Build __chkstk as x86-64 code on ARM64EC. Based on a patch by Jacek Caban. --- dlls/ntdll/signal_arm64ec.c | 11 ----------- dlls/ntdll/signal_x86_64.c | 26 +++++++++++++++++--------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index e9e9b2a6bb3..8caf4218ab9 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -2323,17 +2323,6 @@ static void __attribute__((naked)) arm64x_check_call(void) } -/************************************************************************** - * __chkstk (NTDLL.@) - * - * Supposed to touch all the stack pages, but we shouldn't need that. - */ -void __attribute__((naked)) __chkstk(void) -{ - asm( "ret" ); -} - - /************************************************************************** * __chkstk_arm64ec (NTDLL.@) * diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 78afadbe387..d6218dc61b7 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -18,7 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#if defined(__x86_64__) && !defined(__arm64ec__) +#if 0 +#pragma makedep arm64ec_x64 +#endif + +#ifdef __x86_64__ #include <stdlib.h> #include <stdarg.h> @@ -34,6 +38,17 @@ #include "wine/debug.h" #include "ntsyscalls.h" + +/************************************************************************** + * __chkstk (NTDLL.@) + * + * Supposed to touch all the stack pages, but we shouldn't need that. + */ +__ASM_GLOBAL_FUNC( __chkstk, "ret" ); + + +#ifndef __arm64ec_x64__ + WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); @@ -81,14 +96,6 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX } -/************************************************************************** - * __chkstk (NTDLL.@) - * - * Supposed to touch all the stack pages, but we shouldn't need that. - */ -__ASM_GLOBAL_FUNC( __chkstk, "ret" ); - - /*********************************************************************** * RtlCaptureContext (NTDLL.@) */ @@ -1043,4 +1050,5 @@ __ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret" "\n\tnop; nop; nop; nop; nop; nop; nop; nop" "\n\tnop; nop; nop; nop; nop; nop" ); +#endif /* __arm64ec_x64__ */ #endif /* __x86_64__ */

1 0

Alexandre Julliard : oleaut32: Move the call_method thunk to a separate file.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: 6af17eec91f37149c34cee7eef2f24bcd47209cb URL: https://gitlab.winehq.org/wine/wine/-/commit/6af17eec91f37149c34cee7eef2f24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:24:48 2024 +0200 oleaut32: Move the call_method thunk to a separate file. And build it as x86-64 code on ARM64EC. --- dlls/oleaut32/Makefile.in | 1 + dlls/oleaut32/thunks.c | 187 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 145 ----------------------------------- 3 files changed, 188 insertions(+), 145 deletions(-)

1 0

Alexandre Julliard : widl: Default to fully interpreted stubs mode.
by Alexandre Julliard May 2, 2024

May 2, 2024

1 0