freedreno/a6xx: Enable gl46

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23301>

diff --git a/src/freedreno/ci/deqp-freedreno-a618.toml b/src/freedreno/ci/deqp-freedreno-a618.toml
index 3e16a60..c6595fb 100644 (file)
--- a/src/freedreno/ci/deqp-freedreno-a618.toml
+++ b/src/freedreno/ci/deqp-freedreno-a618.toml
@@ -40,7 +40,7 @@ caselists = [
     "/deqp/mustpass/gles2-khr-master.txt",
     "/deqp/mustpass/gles3-khr-master.txt",
     "/deqp/mustpass/gles31-khr-master.txt",
-    "/deqp/mustpass/gl45-master.txt",
+    "/deqp/mustpass/gl46-master.txt",
 ]
 skips = ["install/freedreno-a618-premerge-skips.txt"]
 deqp_args = [

diff --git a/src/freedreno/ci/deqp-freedreno-a630.toml b/src/freedreno/ci/deqp-freedreno-a630.toml
index 6e95da8..790cad9 100644 (file)
--- a/src/freedreno/ci/deqp-freedreno-a630.toml
+++ b/src/freedreno/ci/deqp-freedreno-a630.toml
@@ -40,7 +40,7 @@ caselists = [
     "/deqp/mustpass/gles2-khr-master.txt",
     "/deqp/mustpass/gles3-khr-master.txt",
     "/deqp/mustpass/gles31-khr-master.txt",
-    "/deqp/mustpass/gl45-master.txt",
+    "/deqp/mustpass/gl46-master.txt",
 ]
 skips = ["install/freedreno-a630-premerge-skips.txt"]
 deqp_args = [

diff --git a/src/freedreno/ci/deqp-freedreno-a660.toml b/src/freedreno/ci/deqp-freedreno-a660.toml
index a62b973..e46c1cf 100644 (file)
--- a/src/freedreno/ci/deqp-freedreno-a660.toml
+++ b/src/freedreno/ci/deqp-freedreno-a660.toml
@@ -40,7 +40,7 @@ caselists = [
     "/deqp/mustpass/gles2-khr-master.txt",
     "/deqp/mustpass/gles3-khr-master.txt",
     "/deqp/mustpass/gles31-khr-master.txt",
-    "/deqp/mustpass/gl45-master.txt",
+    "/deqp/mustpass/gl46-master.txt",
 ]
 skips = ["install/freedreno-a660-skips.txt"]
 deqp_args = [

diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt
index 47566e9..f3028c8 100644 (file)
--- a/src/freedreno/ci/freedreno-a618-fails.txt
+++ b/src/freedreno/ci/freedreno-a618-fails.txt
@@ -1,8 +1,8 @@
-KHR-GL45.gpu_shader_fp64.fp64.max_uniform_components,Fail
-KHR-GL45.shader_subroutine.control_flow_and_returned_subroutine_values_used_as_subroutine_input,Fail
-KHR-GL45.shader_image_load_store.basic-allFormats-store,Fail
-KHR-GL45.shader_image_load_store.basic-allTargets-store,Fail
-KHR-GL45.shading_language_420pack.binding_images,Fail
+KHR-GL46.gpu_shader_fp64.fp64.max_uniform_components,Fail
+KHR-GL46.shader_subroutine.control_flow_and_returned_subroutine_values_used_as_subroutine_input,Fail
+KHR-GL46.shader_image_load_store.basic-allFormats-store,Fail
+KHR-GL46.shader_image_load_store.basic-allTargets-store,Fail
+KHR-GL46.shading_language_420pack.binding_images,Fail
 
 # "Invalid value returned: expected:[1, 1, 1, 1] retrieved: [0, 0, 0, 0
 #  Invalid rendering result at esextcTessellationShaderBarrier.cpp:504"
@@ -10,16 +10,16 @@ KHR-GLES31.core.tessellation_shader.tessellation_shader_tc_barriers.barrier_guar
 
 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/5582
 KHR-GLES31.core.texture_cube_map_array.color_depth_attachments,Fail
-KHR-GL45.texture_cube_map_array.color_depth_attachments,Fail
+KHR-GL46.texture_cube_map_array.color_depth_attachments,Fail
 
 #
 # new fails with gl45:
 #
 
 # MESA: warning: sample averaging on fallback z24s8 blit when we shouldn't.
-KHR-GL45.direct_state_access.renderbuffers_storage_multisample,Fail
+KHR-GL46.direct_state_access.renderbuffers_storage_multisample,Fail
 
-KHR-GL45.multi_bind.dispatch_bind_image_textures,Fail
+KHR-GL46.multi_bind.dispatch_bind_image_textures,Fail
 
 # Fails when TU_DEBUG=forcebin is set
 gmem-dEQP-VK.spirv_assembly.instruction.graphics.variable_pointers.graphics.writes_two_buffers_vert,Fail
@@ -362,8 +362,8 @@ wayland-dEQP-EGL.functional.wide_color.window_fp16_default_colorspace,Fail
 SRGBReadWritePixels,Fail
 
 # New CTS failures in 1.3.5.0
-KHR-GL45.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
-KHR-GL45.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
+KHR-GL46.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
+KHR-GL46.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
 dEQP-VK.binding_model.descriptor_buffer.multiple.compute_comp_buffers1_sets1,Crash
 dEQP-VK.binding_model.descriptor_buffer.multiple.compute_comp_buffers1_sets3,Crash
 dEQP-VK.binding_model.descriptor_buffer.multiple.compute_comp_buffers1_sets3_imm_samplers,Crash

diff --git a/src/freedreno/ci/freedreno-a618-flakes.txt b/src/freedreno/ci/freedreno-a618-flakes.txt
index 8f15985..56e1894 100644 (file)
--- a/src/freedreno/ci/freedreno-a618-flakes.txt
+++ b/src/freedreno/ci/freedreno-a618-flakes.txt
@@ -81,7 +81,7 @@ KHR-.*.core.geometry_shader.layered_framebuffer.depth_support
 KHR-.*.core.tessellation_shader.tessellation_shader_tc_barriers.barrier_guarded_read_calls
 
 # Typically fails, but occasionally passes.
-KHR-GL45.shader_image_load_store.basic-allTargets-store
+KHR-GL46.shader_image_load_store.basic-allTargets-store
 
 # edfff331b3241d1c18d5c589fcdf75728089c886 mostly fixed this, but apparently it still flakes.
 dEQP-GLES3.functional.fbo.blit.depth_stencil.depth32f_stencil8_basic
@@ -193,14 +193,14 @@ spec@ext_timer_query@time-elapsed
 spec@ext_texture_lod_bias@lodbias
 
 # recent flakes, first occurence 03-02-2023
-KHR-GL45.buffer_storage.map_persistent_dispatch
+KHR-GL46.buffer_storage.map_persistent_dispatch
 # recent flakes, first occurence 09-02-2023
-KHR-GL45.buffer_storage.map_persistent_flush
+KHR-GL46.buffer_storage.map_persistent_flush
 
 # very rare flake (once two weeks), first occurence 21-02-2023 (8i.samples_4.mask_3)
-KHR-GL45.sample_variables.mask.rgba8ui.samples_0.mask_2
-KHR-GL45.sample_variables.mask.rgba8i.samples_4.mask_3
-KHR-GL45.sample_variables.mask.rgba32f.samples_4.mask_3
+KHR-GL46.sample_variables.mask.rgba8ui.samples_0.mask_2
+KHR-GL46.sample_variables.mask.rgba8i.samples_4.mask_3
+KHR-GL46.sample_variables.mask.rgba32f.samples_4.mask_3
 
 # these flake basically everywhere
 glx@glx-make-current

diff --git a/src/freedreno/ci/freedreno-a618-premerge-skips.txt b/src/freedreno/ci/freedreno-a618-premerge-skips.txt
index fb00244..de66a6a 100644 (file)
--- a/src/freedreno/ci/freedreno-a618-premerge-skips.txt
+++ b/src/freedreno/ci/freedreno-a618-premerge-skips.txt
@@ -3,6 +3,6 @@
 # delete lines from the test list.  Be careful.
 
 # Timeouts, passes otherwise
-KHR-GL45.texture_swizzle.smoke
-KHR-GL45.gpu_shader_fp64.builtin.inverse_dmat4
-KHR-GL45.gpu_shader_fp64.fp64.varyings
+KHR-GL46.texture_swizzle.smoke
+KHR-GL46.gpu_shader_fp64.builtin.inverse_dmat4
+KHR-GL46.gpu_shader_fp64.fp64.varyings

diff --git a/src/freedreno/ci/freedreno-a618-skips.txt b/src/freedreno/ci/freedreno-a618-skips.txt
index e7ca5b2..aac9572 100644 (file)
--- a/src/freedreno/ci/freedreno-a618-skips.txt
+++ b/src/freedreno/ci/freedreno-a618-skips.txt
@@ -19,7 +19,7 @@ spill-dEQP-VK.graphicsfuzz.cov-nested-loop-undefined-smoothstep-never-executed
 
 # 60s timeout
 KHR-GLES31.core.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize
-KHR-GL45.copy_image.functional
+KHR-GL46.copy_image.functional
 
 # These take most of a minute to run
 spec@!opengl 3.0@clearbuffer-depth-cs-probe

diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt
index b6479d0..4fbb565 100644 (file)
--- a/src/freedreno/ci/freedreno-a630-fails.txt
+++ b/src/freedreno/ci/freedreno-a630-fails.txt
@@ -1,11 +1,11 @@
-KHR-GL45.gpu_shader_fp64.fp64.max_uniform_components,Fail
+KHR-GL46.gpu_shader_fp64.fp64.max_uniform_components,Fail
 
-KHR-GL45.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
-KHR-GL45.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
+KHR-GL46.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
+KHR-GL46.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
 
-KHR-GL45.shader_subroutine.control_flow_and_returned_subroutine_values_used_as_subroutine_input,Fail
-KHR-GL45.shader_image_load_store.basic-allFormats-store,Fail
-KHR-GL45.shading_language_420pack.binding_images,Fail
+KHR-GL46.shader_subroutine.control_flow_and_returned_subroutine_values_used_as_subroutine_input,Fail
+KHR-GL46.shader_image_load_store.basic-allFormats-store,Fail
+KHR-GL46.shading_language_420pack.binding_images,Fail
 
 # "Invalid value returned: expected:[1, 1, 1, 1] retrieved: [0, 0, 0, 0
 #  Invalid rendering result at esextcTessellationShaderBarrier.cpp:504"
@@ -13,16 +13,16 @@ KHR-GLES31.core.tessellation_shader.tessellation_shader_tc_barriers.barrier_guar
 
 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/5582
 KHR-GLES31.core.texture_cube_map_array.color_depth_attachments,Fail
-KHR-GL45.texture_cube_map_array.color_depth_attachments,Fail
+KHR-GL46.texture_cube_map_array.color_depth_attachments,Fail
 
 #
 # new fails with gl45:
 #
 
 # MESA: warning: sample averaging on fallback z24s8 blit when we shouldn't.
-KHR-GL45.direct_state_access.renderbuffers_storage_multisample,Fail
+KHR-GL46.direct_state_access.renderbuffers_storage_multisample,Fail
 
-KHR-GL45.multi_bind.dispatch_bind_image_textures,Fail
+KHR-GL46.multi_bind.dispatch_bind_image_textures,Fail
 
 # Fails when TU_DEBUG=forcebin is set
 gmem-dEQP-VK.spirv_assembly.instruction.graphics.variable_pointers.graphics.writes_two_buffers_geom,Fail

diff --git a/src/freedreno/ci/freedreno-a630-flakes.txt b/src/freedreno/ci/freedreno-a630-flakes.txt
index d6e9d71..c895804 100644 (file)
--- a/src/freedreno/ci/freedreno-a630-flakes.txt
+++ b/src/freedreno/ci/freedreno-a630-flakes.txt
@@ -71,11 +71,11 @@ dEQP-GLES3.functional.fbo.blit.conversion.rg8i_to_r16i
 dEQP-GLES3.functional.fbo.blit.conversion.rg8_to_r16f
 
 # First noticed Jun 1 2020 on an innocent branch.
-KHR-GL45.packed_depth_stencil.verify_copy_tex_image.depth32f_stencil8
+KHR-GL46.packed_depth_stencil.verify_copy_tex_image.depth32f_stencil8
 
-KHR-GL45.shader_image_size.basic-nonMS-fs-float
-KHR-GL45.shader_image_size.advanced-nonMS-fs-float
-KHR-GL45.shader_image_size.advanced-nonMS-fs-uint
+KHR-GL46.shader_image_size.basic-nonMS-fs-float
+KHR-GL46.shader_image_size.advanced-nonMS-fs-float
+KHR-GL46.shader_image_size.advanced-nonMS-fs-uint
 
 # Flaky with introduction of testing
 KHR-GLES31.core.arrays_of_arrays.InteractionFunctionCalls2
@@ -176,7 +176,7 @@ spec@glsl-1.30@execution@texelfetch fs sampler2d 1x71-501x71
 
 # Started around 2022-06-26, first time was on an unlikely MR.
 KHR-GLES31.core.shader_image_size.advanced-nonMS-fs-int
-KHR-GL45.shader_image_size.advanced-nonMS-fs-int
+KHR-GL46.shader_image_size.advanced-nonMS-fs-int
 KHR-GLES31.core.shader_image_size.basic-nonMS-fs-float
 KHR-GLES31.core.shader_image_size.basic-nonMS-fs-int
 KHR-GLES31.core.shader_image_size.basic-nonMS-fs-uint
@@ -190,15 +190,15 @@ spec@ext_texture_lod_bias@lodbias
 
 # Started around 2022-11-16, first appeared in https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19588
 # Tracking issue: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7713
-KHR-GL45.shader_storage_buffer_object.advanced-unsizedArrayLength-fs-std430-matC-pad
+KHR-GL46.shader_storage_buffer_object.advanced-unsizedArrayLength-fs-std430-matC-pad
 
 # sometimes passes.
-KHR-GL45.shader_image_load_store.basic-allTargets-store
+KHR-GL46.shader_image_load_store.basic-allTargets-store
 
 # First appeared 2022-09-28, innocent branch
 KHR-GLES31.core.shader_image_load_store.basic-allTargets-atomicFS
 
-KHR-GL45.shader_image_load_store.basic-allTargets-atomic
+KHR-GL46.shader_image_load_store.basic-allTargets-atomic
 
 # intermittently crashing with a sig11, maybe starting around 2023-01-18.
 # One log had the kernel complaining about allocating memory.

diff --git a/src/freedreno/ci/freedreno-a630-premerge-skips.txt b/src/freedreno/ci/freedreno-a630-premerge-skips.txt
index fb00244..de66a6a 100644 (file)
--- a/src/freedreno/ci/freedreno-a630-premerge-skips.txt
+++ b/src/freedreno/ci/freedreno-a630-premerge-skips.txt
@@ -3,6 +3,6 @@
 # delete lines from the test list.  Be careful.
 
 # Timeouts, passes otherwise
-KHR-GL45.texture_swizzle.smoke
-KHR-GL45.gpu_shader_fp64.builtin.inverse_dmat4
-KHR-GL45.gpu_shader_fp64.fp64.varyings
+KHR-GL46.texture_swizzle.smoke
+KHR-GL46.gpu_shader_fp64.builtin.inverse_dmat4
+KHR-GL46.gpu_shader_fp64.fp64.varyings

diff --git a/src/freedreno/ci/freedreno-a630-skips.txt b/src/freedreno/ci/freedreno-a630-skips.txt
index 870ca6b..ee21180 100644 (file)
--- a/src/freedreno/ci/freedreno-a630-skips.txt
+++ b/src/freedreno/ci/freedreno-a630-skips.txt
@@ -32,7 +32,7 @@ KHR-GLES31.core.shader_image_load_store.basic-allFormats-store-fs
 
 # 60s timeout
 KHR-GLES31.core.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize
-KHR-GL45.copy_image.functional
+KHR-GL46.copy_image.functional
 
 # These take most of a minute to run
 spec@!opengl 3.0@clearbuffer-depth-cs-probe

diff --git a/src/freedreno/ci/freedreno-a660-fails.txt b/src/freedreno/ci/freedreno-a660-fails.txt
index c106153..a08e196 100644 (file)
--- a/src/freedreno/ci/freedreno-a660-fails.txt
+++ b/src/freedreno/ci/freedreno-a660-fails.txt
@@ -1,11 +1,11 @@
-KHR-GL45.direct_state_access.renderbuffers_storage_multisample,Fail
-KHR-GL45.gpu_shader_fp64.fp64.max_uniform_components,Fail
-KHR-GL45.multi_bind.dispatch_bind_image_textures,Fail
-KHR-GL45.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
-KHR-GL45.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
-KHR-GL45.shader_image_load_store.basic-allTargets-store,Fail
-KHR-GL45.shader_subroutine.control_flow_and_returned_subroutine_values_used_as_subroutine_input,Fail
-KHR-GL45.tessellation_shader.single.max_patch_vertices,Fail
+KHR-GL46.direct_state_access.renderbuffers_storage_multisample,Fail
+KHR-GL46.gpu_shader_fp64.fp64.max_uniform_components,Fail
+KHR-GL46.multi_bind.dispatch_bind_image_textures,Fail
+KHR-GL46.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
+KHR-GL46.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
+KHR-GL46.shader_image_load_store.basic-allTargets-store,Fail
+KHR-GL46.shader_subroutine.control_flow_and_returned_subroutine_values_used_as_subroutine_input,Fail
+KHR-GL46.tessellation_shader.single.max_patch_vertices,Fail
 
 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8886
 dEQP-GLES31.functional.synchronization.inter_invocation.image_atomic_read_write,Crash

diff --git a/src/freedreno/ci/freedreno-a660-flakes.txt b/src/freedreno/ci/freedreno-a660-flakes.txt
index 4c78848..f954786 100644 (file)
--- a/src/freedreno/ci/freedreno-a660-flakes.txt
+++ b/src/freedreno/ci/freedreno-a660-flakes.txt
@@ -1,3 +1,3 @@
-KHR-GL45.buffer_storage.map_persistent_dispatch
-KHR-GL45.buffer_storage.map_persistent_flush
-KHR-GL45.shader_subroutine.control_flow_and_returned_subroutine_values_used_as_subroutine_input
+KHR-GL46.buffer_storage.map_persistent_dispatch
+KHR-GL46.buffer_storage.map_persistent_flush
+KHR-GL46.shader_subroutine.control_flow_and_returned_subroutine_values_used_as_subroutine_input

diff --git a/src/freedreno/ci/freedreno-a660-skips.txt b/src/freedreno/ci/freedreno-a660-skips.txt
index 3d30778..87cdd56 100644 (file)
--- a/src/freedreno/ci/freedreno-a660-skips.txt
+++ b/src/freedreno/ci/freedreno-a660-skips.txt
@@ -1,7 +1,7 @@
 # 60s timeout
-KHR-GL45.copy_image.functional
-KHR-GL45.gpu_shader_fp64.fp64.varyings
-KHR-GL45.texture_swizzle.smoke
+KHR-GL46.copy_image.functional
+KHR-GL46.gpu_shader_fp64.fp64.varyings
+KHR-GL46.texture_swizzle.smoke
 
 # 60s timeout (flake)
-KHR-GL45.gpu_shader_fp64.builtin.inverse_dmat4
+KHR-GL46.gpu_shader_fp64.builtin.inverse_dmat4

diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c
index 316bc95..d78b340 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_screen.c
+++ b/src/gallium/drivers/freedreno/freedreno_screen.c
@@ -341,7 +341,7 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
    case PIPE_CAP_GLSL_FEATURE_LEVEL:
    case PIPE_CAP_GLSL_FEATURE_LEVEL_COMPATIBILITY:
       if (is_a6xx(screen))
-         return 450;
+         return 460;
       else if (is_ir3(screen))
          return 140;
       else