OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: lower 64-bit drcp/dsqrt/drsq for fixing precision issues

Browse Source 
The hardware precision of v_rcp_f64, v_sqrt_f64 and v_rsq_f64
is less than what Vulkan requires.

This lowers using the Goldschmidt's algorithm to improve precision.

Fixes dEQP-VK.glsl.builtin.precision_double.* on both compiler
backends.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5609>
This commit is contained in:
Samuel Pitoiset
2020-06-23 18:29:22 +02:00
committed by Marge Bot
parent 82b4666783
commit c84f11e7b6
8 changed files with 16 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
.gitlab-ci/deqp-radv-fiji-aco-fails.txt
View File

@@ -18,33 +18,6 @@ dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_8.d32_sfloat_
dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_8.d32_sfloat_s8_uint_separate_layouts.stencil_min dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_8.d32_sfloat_s8_uint_separate_layouts.stencil_min
dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_8.d32_sfloat_s8_uint_separate_layouts.stencil_zero dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_8.d32_sfloat_s8_uint_separate_layouts.stencil_zero
dEQP-VK.glsl.builtin.precision_double.distance.compute.scalar
dEQP-VK.glsl.builtin.precision_double.distance.compute.vec2
dEQP-VK.glsl.builtin.precision_double.distance.compute.vec3
dEQP-VK.glsl.builtin.precision_double.distance.compute.vec4
dEQP-VK.glsl.builtin.precision_double.inverse.compute.mat2
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.scalar
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.vec2
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.vec3
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.vec4
dEQP-VK.glsl.builtin.precision_double.length.compute.scalar
dEQP-VK.glsl.builtin.precision_double.length.compute.vec2
dEQP-VK.glsl.builtin.precision_double.length.compute.vec3
dEQP-VK.glsl.builtin.precision_double.length.compute.vec4
dEQP-VK.glsl.builtin.precision_double.normalize.compute.vec2
dEQP-VK.glsl.builtin.precision_double.normalize.compute.vec3
dEQP-VK.glsl.builtin.precision_double.refract.compute.scalar
dEQP-VK.glsl.builtin.precision_double.refract.compute.vec2
dEQP-VK.glsl.builtin.precision_double.refract.compute.vec3
dEQP-VK.glsl.builtin.precision_double.refract.compute.vec4
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.scalar
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.vec2
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.vec3
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.vec4
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.scalar
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.vec2
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.vec3
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.vec4
dEQP-VK.rasterization.flatshading.line_strip_wide dEQP-VK.rasterization.flatshading.line_strip_wide
dEQP-VK.rasterization.flatshading.non_strict_line_strip_wide dEQP-VK.rasterization.flatshading.non_strict_line_strip_wide
dEQP-VK.rasterization.flatshading.non_strict_lines_wide dEQP-VK.rasterization.flatshading.non_strict_lines_wide

27
.gitlab-ci/deqp-radv-navi10-aco-fails.txt
View File

@@ -2,33 +2,6 @@
dEQP-VK.transform_feedback.simple.multistreams_1 dEQP-VK.transform_feedback.simple.multistreams_1
dEQP-VK.transform_feedback.simple.multistreams_3 dEQP-VK.transform_feedback.simple.multistreams_3
dEQP-VK.glsl.builtin.precision_double.distance.compute.scalar
dEQP-VK.glsl.builtin.precision_double.distance.compute.vec2
dEQP-VK.glsl.builtin.precision_double.distance.compute.vec3
dEQP-VK.glsl.builtin.precision_double.distance.compute.vec4
dEQP-VK.glsl.builtin.precision_double.inverse.compute.mat2
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.scalar
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.vec2
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.vec3
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.vec4
dEQP-VK.glsl.builtin.precision_double.length.compute.scalar
dEQP-VK.glsl.builtin.precision_double.length.compute.vec2
dEQP-VK.glsl.builtin.precision_double.length.compute.vec3
dEQP-VK.glsl.builtin.precision_double.length.compute.vec4
dEQP-VK.glsl.builtin.precision_double.normalize.compute.vec2
dEQP-VK.glsl.builtin.precision_double.normalize.compute.vec3
dEQP-VK.glsl.builtin.precision_double.refract.compute.scalar
dEQP-VK.glsl.builtin.precision_double.refract.compute.vec2
dEQP-VK.glsl.builtin.precision_double.refract.compute.vec3
dEQP-VK.glsl.builtin.precision_double.refract.compute.vec4
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.scalar
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.vec2
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.vec3
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.vec4
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.scalar
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.vec2
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.vec3
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.vec4
dEQP-VK.memory_model.message_passing.core11.u32.coherent.fence_fence.atomicwrite.device.payload_local.image.guard_nonlocal.workgroup.comp dEQP-VK.memory_model.message_passing.core11.u32.coherent.fence_fence.atomicwrite.device.payload_local.image.guard_nonlocal.workgroup.comp
dEQP-VK.memory_model.message_passing.core11.u32.coherent.fence_fence.atomicwrite.device.payload_nonlocal.image.guard_nonlocal.workgroup.comp dEQP-VK.memory_model.message_passing.core11.u32.coherent.fence_fence.atomicwrite.device.payload_nonlocal.image.guard_nonlocal.workgroup.comp
dEQP-VK.rasterization.flatshading.line_strip_wide dEQP-VK.rasterization.flatshading.line_strip_wide

27
.gitlab-ci/deqp-radv-pitcairn-aco-fails.txt
View File

@@ -1,34 +1,7 @@
dEQP-VK.glsl.builtin.precision_double.distance.compute.scalar
dEQP-VK.glsl.builtin.precision_double.distance.compute.vec2
dEQP-VK.glsl.builtin.precision_double.distance.compute.vec3
dEQP-VK.glsl.builtin.precision_double.distance.compute.vec4
dEQP-VK.glsl.builtin.precision_double.floor.compute.scalar dEQP-VK.glsl.builtin.precision_double.floor.compute.scalar
dEQP-VK.glsl.builtin.precision_double.floor.compute.vec2 dEQP-VK.glsl.builtin.precision_double.floor.compute.vec2
dEQP-VK.glsl.builtin.precision_double.floor.compute.vec3 dEQP-VK.glsl.builtin.precision_double.floor.compute.vec3
dEQP-VK.glsl.builtin.precision_double.floor.compute.vec4 dEQP-VK.glsl.builtin.precision_double.floor.compute.vec4
dEQP-VK.glsl.builtin.precision_double.inverse.compute.mat2
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.scalar
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.vec2
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.vec3
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.vec4
dEQP-VK.glsl.builtin.precision_double.length.compute.scalar
dEQP-VK.glsl.builtin.precision_double.length.compute.vec2
dEQP-VK.glsl.builtin.precision_double.length.compute.vec3
dEQP-VK.glsl.builtin.precision_double.length.compute.vec4
dEQP-VK.glsl.builtin.precision_double.normalize.compute.vec2
dEQP-VK.glsl.builtin.precision_double.normalize.compute.vec3
dEQP-VK.glsl.builtin.precision_double.refract.compute.scalar
dEQP-VK.glsl.builtin.precision_double.refract.compute.vec2
dEQP-VK.glsl.builtin.precision_double.refract.compute.vec3
dEQP-VK.glsl.builtin.precision_double.refract.compute.vec4
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.scalar
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.vec2
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.vec3
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.vec4
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.scalar
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.vec2
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.vec3
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.vec4
dEQP-VK.memory_model.message_passing.core11.u32.coherent.fence_fence.atomicwrite.device.payload_local.image.guard_nonlocal.workgroup.comp dEQP-VK.memory_model.message_passing.core11.u32.coherent.fence_fence.atomicwrite.device.payload_local.image.guard_nonlocal.workgroup.comp
dEQP-VK.memory_model.message_passing.core11.u32.coherent.fence_fence.atomicwrite.device.payload_nonlocal.image.guard_nonlocal.workgroup.comp dEQP-VK.memory_model.message_passing.core11.u32.coherent.fence_fence.atomicwrite.device.payload_nonlocal.image.guard_nonlocal.workgroup.comp
dEQP-VK.pipeline.depth.format.d16_unorm.compare_ops.never_zerodepthbounds_depthdisabled_stencilenabled dEQP-VK.pipeline.depth.format.d16_unorm.compare_ops.never_zerodepthbounds_depthdisabled_stencilenabled

27
.gitlab-ci/deqp-radv-polaris10-aco-fails.txt
View File

@@ -1,30 +1,3 @@
dEQP-VK.glsl.builtin.precision_double.distance.compute.scalar
dEQP-VK.glsl.builtin.precision_double.distance.compute.vec2
dEQP-VK.glsl.builtin.precision_double.distance.compute.vec3
dEQP-VK.glsl.builtin.precision_double.distance.compute.vec4
dEQP-VK.glsl.builtin.precision_double.inverse.compute.mat2
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.scalar
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.vec2
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.vec3
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.vec4
dEQP-VK.glsl.builtin.precision_double.length.compute.scalar
dEQP-VK.glsl.builtin.precision_double.length.compute.vec2
dEQP-VK.glsl.builtin.precision_double.length.compute.vec3
dEQP-VK.glsl.builtin.precision_double.length.compute.vec4
dEQP-VK.glsl.builtin.precision_double.normalize.compute.vec2
dEQP-VK.glsl.builtin.precision_double.normalize.compute.vec3
dEQP-VK.glsl.builtin.precision_double.refract.compute.scalar
dEQP-VK.glsl.builtin.precision_double.refract.compute.vec2
dEQP-VK.glsl.builtin.precision_double.refract.compute.vec3
dEQP-VK.glsl.builtin.precision_double.refract.compute.vec4
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.scalar
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.vec2
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.vec3
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.vec4
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.scalar
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.vec2
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.vec3
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.vec4
dEQP-VK.rasterization.flatshading.line_strip_wide dEQP-VK.rasterization.flatshading.line_strip_wide
dEQP-VK.rasterization.flatshading.non_strict_line_strip_wide dEQP-VK.rasterization.flatshading.non_strict_line_strip_wide
dEQP-VK.rasterization.flatshading.non_strict_lines_wide dEQP-VK.rasterization.flatshading.non_strict_lines_wide

27
.gitlab-ci/deqp-radv-raven-aco-fails.txt
View File

@@ -2,33 +2,6 @@
dEQP-VK.transform_feedback.simple.multistreams_1 dEQP-VK.transform_feedback.simple.multistreams_1
dEQP-VK.transform_feedback.simple.multistreams_3 dEQP-VK.transform_feedback.simple.multistreams_3
dEQP-VK.glsl.builtin.precision_double.distance.compute.scalar
dEQP-VK.glsl.builtin.precision_double.distance.compute.vec2
dEQP-VK.glsl.builtin.precision_double.distance.compute.vec3
dEQP-VK.glsl.builtin.precision_double.distance.compute.vec4
dEQP-VK.glsl.builtin.precision_double.inverse.compute.mat2
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.scalar
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.vec2
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.vec3
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.vec4
dEQP-VK.glsl.builtin.precision_double.length.compute.scalar
dEQP-VK.glsl.builtin.precision_double.length.compute.vec2
dEQP-VK.glsl.builtin.precision_double.length.compute.vec3
dEQP-VK.glsl.builtin.precision_double.length.compute.vec4
dEQP-VK.glsl.builtin.precision_double.normalize.compute.vec2
dEQP-VK.glsl.builtin.precision_double.normalize.compute.vec3
dEQP-VK.glsl.builtin.precision_double.refract.compute.scalar
dEQP-VK.glsl.builtin.precision_double.refract.compute.vec2
dEQP-VK.glsl.builtin.precision_double.refract.compute.vec3
dEQP-VK.glsl.builtin.precision_double.refract.compute.vec4
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.scalar
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.vec2
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.vec3
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.vec4
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.scalar
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.vec2
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.vec3
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.vec4
dEQP-VK.memory_model.message_passing.core11.u32.coherent.fence_fence.atomicwrite.device.payload_local.image.guard_nonlocal.workgroup.comp dEQP-VK.memory_model.message_passing.core11.u32.coherent.fence_fence.atomicwrite.device.payload_local.image.guard_nonlocal.workgroup.comp
dEQP-VK.memory_model.message_passing.core11.u32.coherent.fence_fence.atomicwrite.device.payload_nonlocal.image.guard_nonlocal.workgroup.comp dEQP-VK.memory_model.message_passing.core11.u32.coherent.fence_fence.atomicwrite.device.payload_nonlocal.image.guard_nonlocal.workgroup.comp
dEQP-VK.rasterization.flatshading.line_strip_wide dEQP-VK.rasterization.flatshading.line_strip_wide

27
.gitlab-ci/deqp-radv-vega10-aco-fails.txt
View File

@@ -2,33 +2,6 @@
dEQP-VK.transform_feedback.simple.multistreams_1 dEQP-VK.transform_feedback.simple.multistreams_1
dEQP-VK.transform_feedback.simple.multistreams_3 dEQP-VK.transform_feedback.simple.multistreams_3
dEQP-VK.glsl.builtin.precision_double.distance.compute.scalar
dEQP-VK.glsl.builtin.precision_double.distance.compute.vec2
dEQP-VK.glsl.builtin.precision_double.distance.compute.vec3
dEQP-VK.glsl.builtin.precision_double.distance.compute.vec4
dEQP-VK.glsl.builtin.precision_double.inverse.compute.mat2
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.scalar
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.vec2
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.vec3
dEQP-VK.glsl.builtin.precision_double.inversesqrt.compute.vec4
dEQP-VK.glsl.builtin.precision_double.length.compute.scalar
dEQP-VK.glsl.builtin.precision_double.length.compute.vec2
dEQP-VK.glsl.builtin.precision_double.length.compute.vec3
dEQP-VK.glsl.builtin.precision_double.length.compute.vec4
dEQP-VK.glsl.builtin.precision_double.normalize.compute.vec2
dEQP-VK.glsl.builtin.precision_double.normalize.compute.vec3
dEQP-VK.glsl.builtin.precision_double.refract.compute.scalar
dEQP-VK.glsl.builtin.precision_double.refract.compute.vec2
dEQP-VK.glsl.builtin.precision_double.refract.compute.vec3
dEQP-VK.glsl.builtin.precision_double.refract.compute.vec4
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.scalar
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.vec2
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.vec3
dEQP-VK.glsl.builtin.precision_double.smoothstep.compute.vec4
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.scalar
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.vec2
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.vec3
dEQP-VK.glsl.builtin.precision_double.sqrt.compute.vec4
dEQP-VK.rasterization.flatshading.line_strip_wide dEQP-VK.rasterization.flatshading.line_strip_wide
dEQP-VK.rasterization.flatshading.non_strict_line_strip_wide dEQP-VK.rasterization.flatshading.non_strict_line_strip_wide
dEQP-VK.rasterization.flatshading.non_strict_lines_wide dEQP-VK.rasterization.flatshading.non_strict_lines_wide

3
src/amd/compiler/aco_instruction_selection.cpp
View File

@@ -1907,6 +1907,7 @@ void visit_alu_instr(isel_context *ctx, nir_alu_instr *instr)
} else if (dst.regClass() == v1) { } else if (dst.regClass() == v1) {
emit_rsq(ctx, bld, Definition(dst), src); emit_rsq(ctx, bld, Definition(dst), src);
} else if (dst.regClass() == v2) { } else if (dst.regClass() == v2) {
/* Lowered at NIR level for precision reasons. */
emit_vop1_instruction(ctx, instr, aco_opcode::v_rsq_f64, dst); emit_vop1_instruction(ctx, instr, aco_opcode::v_rsq_f64, dst);
} else { } else {
fprintf(stderr, "Unimplemented NIR instr bit size: "); fprintf(stderr, "Unimplemented NIR instr bit size: ");
@@ -1998,6 +1999,7 @@ void visit_alu_instr(isel_context *ctx, nir_alu_instr *instr)
} else if (dst.regClass() == v1) { } else if (dst.regClass() == v1) {
emit_rcp(ctx, bld, Definition(dst), src); emit_rcp(ctx, bld, Definition(dst), src);
} else if (dst.regClass() == v2) { } else if (dst.regClass() == v2) {
/* Lowered at NIR level for precision reasons. */
emit_vop1_instruction(ctx, instr, aco_opcode::v_rcp_f64, dst); emit_vop1_instruction(ctx, instr, aco_opcode::v_rcp_f64, dst);
} else { } else {
fprintf(stderr, "Unimplemented NIR instr bit size: "); fprintf(stderr, "Unimplemented NIR instr bit size: ");
@@ -2025,6 +2027,7 @@ void visit_alu_instr(isel_context *ctx, nir_alu_instr *instr)
} else if (dst.regClass() == v1) { } else if (dst.regClass() == v1) {
emit_sqrt(ctx, bld, Definition(dst), src); emit_sqrt(ctx, bld, Definition(dst), src);
} else if (dst.regClass() == v2) { } else if (dst.regClass() == v2) {
/* Lowered at NIR level for precision reasons. */
emit_vop1_instruction(ctx, instr, aco_opcode::v_sqrt_f64, dst); emit_vop1_instruction(ctx, instr, aco_opcode::v_sqrt_f64, dst);
} else { } else {
fprintf(stderr, "Unimplemented NIR instr bit size: "); fprintf(stderr, "Unimplemented NIR instr bit size: ");

13
src/amd/vulkan/radv_shader.c
View File

@@ -86,6 +86,10 @@ static const struct nir_shader_compiler_options nir_options_llvm = {
nir_lower_divmod64 | nir_lower_divmod64 |
nir_lower_minmax64 | nir_lower_minmax64 |
nir_lower_iabs64, nir_lower_iabs64,
.lower_doubles_options = nir_lower_drcp |
nir_lower_dsqrt |
nir_lower_drsq |
nir_lower_ddiv,
}; };
static const struct nir_shader_compiler_options nir_options_aco = { static const struct nir_shader_compiler_options nir_options_aco = {
@@ -122,6 +126,10 @@ static const struct nir_shader_compiler_options nir_options_aco = {
nir_lower_divmod64 | nir_lower_divmod64 |
nir_lower_minmax64 | nir_lower_minmax64 |
nir_lower_iabs64, nir_lower_iabs64,
.lower_doubles_options = nir_lower_drcp |
nir_lower_dsqrt |
nir_lower_drsq |
nir_lower_ddiv,
}; };
bool bool
@@ -466,6 +474,11 @@ radv_shader_compile_to_nir(struct radv_device *device,
NIR_PASS_V(nir, radv_nir_lower_ycbcr_textures, layout); NIR_PASS_V(nir, radv_nir_lower_ycbcr_textures, layout);
if (device->instance->debug_flags & RADV_DEBUG_DISCARD_TO_DEMOTE) if (device->instance->debug_flags & RADV_DEBUG_DISCARD_TO_DEMOTE)
NIR_PASS_V(nir, nir_lower_discard_to_demote); NIR_PASS_V(nir, nir_lower_discard_to_demote);
nir_lower_doubles_options lower_doubles =
nir->options->lower_doubles_options;
NIR_PASS_V(nir, nir_lower_doubles, NULL, lower_doubles);
} }
/* Vulkan uses the separate-shader linking model */ /* Vulkan uses the separate-shader linking model */