Module: Mesa
Branch: main
Commit: bf02bffe156214dad942f56ee68c380d1968704f
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf02bffe156214dad942f56ee68c380d1968704f

Author: Emma Anholt <[email protected]>
Date:   Wed Apr 13 20:25:59 2022 -0700

nouveau: Enable the NIR backend by default.

The glsl-to-tgsi code generation and GLSL IR linker is is going away
(!8044), so we need to make the call on whether to use nir-to-tgsi (See
!15932 and !15541), or switch over to the NIR code generator.  The NIR
backend should reduce the compile time regression while providing more
direct control over the IR we receive than going through NTT, while still
providing the optimization that NIR-to-TGSI was bringing us.

nv92 shader-db:
total local in shared programs: 2048 -> 1988 (-2.93%)
local in affected programs: 2048 -> 1988 (-2.93%)
total gpr in shared programs: 688468 -> 724705 (5.26%)
gpr in affected programs: 437159 -> 473396 (8.29%)
total instructions in shared programs: 6115978 -> 5874401 (-3.95%)
instructions in affected programs: 5038041 -> 4796464 (-4.80%)
total loops in shared programs: 1361 -> 835 (-38.65%)
loops in affected programs: 538 -> 12 (-97.77%)
total bytes in shared programs: 42389752 -> 40480416 (-4.50%)
bytes in affected programs: 36311616 -> 34402280 (-5.26%)
LOST:   0
GAINED: 1 (pixmark-piano)

nv120 shader-db:
total local in shared programs: 4416 -> 1988 (-54.98%)
local in affected programs: 4416 -> 1988 (-54.98%)
total gpr in shared programs: 870534 -> 893490 (2.64%)
gpr in affected programs: 564210 -> 587166 (4.07%)
total instructions in shared programs: 6379402 -> 6243210 (-2.13%)
instructions in affected programs: 5430790 -> 5294598 (-2.51%)
total bytes in shared programs: 68184224 -> 66729672 (-2.13%)
bytes in affected programs: 58013544 -> 56558992 (-2.51%)

Acked-by: Alyssa Rosenzweig <[email protected]>
Reviewed-by: Karol Herbst <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15949>

---

 .../drivers/nouveau/ci/nouveau-gm206-fails.txt     | 220 ++-------------------
 .../drivers/nouveau/ci/nouveau-nv92-fails.txt      |  51 ++---
 src/gallium/drivers/nouveau/nouveau_screen.c       |   5 +-
 3 files changed, 34 insertions(+), 242 deletions(-)

diff --git a/src/gallium/drivers/nouveau/ci/nouveau-gm206-fails.txt 
b/src/gallium/drivers/nouveau/ci/nouveau-gm206-fails.txt
index 9fb53c49d97..79bc66edeef 100644
--- a/src/gallium/drivers/nouveau/ci/nouveau-gm206-fails.txt
+++ b/src/gallium/drivers/nouveau/ci/nouveau-gm206-fails.txt
@@ -1,5 +1,4 @@
 dEQP-GLES2.functional.rasterization.limits.points,Fail
-dEQP-GLES3.functional.shaders.texture_functions.texturegradoffset.sampler2darrayshadow_vertex,Fail
 
 KHR-GLES3.copy_tex_image_conversions.forbidden.cubemap_negx_cubemap_negx,Fail
 KHR-GLES3.copy_tex_image_conversions.forbidden.cubemap_negx_cubemap_negy,Fail
@@ -87,15 +86,22 @@ KHR-GL43.shader_ballot_tests.ShaderBallotBitmasks,Fail
 KHR-GL43.shader_ballot_tests.ShaderBallotFunctionBallot,Fail
 KHR-GL43.shader_ballot_tests.ShaderBallotFunctionRead,Fail
 
+# "../src/compiler/glsl/glsl_to_nir.cpp:2539: virtual void 
{anonymous}::nir_visitor::visit(ir_texture*): Assertion `val <= 31 && val >= 
-32' failed."
+shaders@glsl-bug-110796,Crash
+
 shaders@glsl-uniform-interstage-limits@subdivide 5- statechanges,Fail
 shaders@point-vertex-id gl_vertexid,Fail
 shaders@point-vertex-id gl_vertexid divisor,Fail
 shaders@point-vertex-id gl_vertexid gl_instanceid,Fail
 shaders@point-vertex-id gl_vertexid gl_instanceid divisor,Fail
+
 spec@!opengl [email protected],Fail
-spec@!opengl 1.0@rasterpos,Fail
+
+# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10641
+spec@!opengl 1.0@rasterpos,Crash
 spec@!opengl 1.0@rasterpos@glsl_vs_gs_linked,Fail
 spec@!opengl 1.0@rasterpos@glsl_vs_tes_linked,Fail
+
 spec@!opengl 1.1@depthstencil-default_fb-blit samples=2,Fail
 spec@!opengl 1.1@depthstencil-default_fb-blit samples=4,Fail
 spec@!opengl 1.1@depthstencil-default_fb-blit samples=6,Fail
@@ -138,135 +144,17 @@ spec@!opengl es 
[email protected],Fail
 spec@amd_performance_monitor@measure,Fail
 spec@amd_performance_monitor@measure@basic measurement,Fail
 spec@amd_performance_monitor@measure@change counters while active,Fail
-spec@arb_bindless_texture@execution@samplers@basic-ubo-binding-texture2d,Fail
-spec@arb_bindless_texture@execution@samplers@basic-ubo-texture2d,Fail
-spec@arb_bindless_texture@execution@samplers@ubo-binding-samplers-conflict,Fail
 spec@arb_direct_state_access@gettextureimage-formats,Fail
 spec@arb_direct_state_access@gettextureimage-targets,Fail
 spec@arb_framebuffer_srgb@blit renderbuffer linear_to_srgb upsample enabled 
render,Fail
 spec@arb_framebuffer_srgb@blit texture linear_to_srgb upsample enabled 
render,Fail
-spec@arb_gpu_shader5@execution@samplemaskin-out-of-bounds,Crash
-spec@arb_gpu_shader5@execution@sampler_array_indexing@array-of-sampler-2d-array-out-of-bounds-access,Crash
-spec@arb_gpu_shader5@execution@sampler_array_indexing@array-of-sampler-2d-out-of-bounds-access,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-dmat2x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-dmat3x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-dmat4x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-double-float-double@2-float@3-dmat2x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-double-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-double@3-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-double@3@2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-double@4-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-dvec2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-dvec2@3-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-dvec2@4-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float-dmat2x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float-dmat3x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float-double-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float-double@3@2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float-dvec2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float-float-float-double-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float-float-float-dvec2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float@1-dmat2x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float@1-dmat3x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float@2-dmat2x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float@2-dmat3x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float@2-double-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float@2-dvec2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float@3-dmat2x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float@3-dmat3x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float@3-double-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float@3-dvec2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float@4-dmat2x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float@4-dmat3x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float@4-double-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float@4-dvec2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float@5-dmat2x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float@5-dmat3x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float@6-dmat2x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-float@6-dmat3x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-s2-double-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-s2-dvec2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-s2@2-float-dmat2x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-s2@2-s3@2-float-double-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-s2@2-s3@2-vec3-double-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-s2@2-vec2-dmat2x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-s2@2-vec3-dmat2x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-s2@2@2-float-double-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-s2@2@2-vec2-double-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-s2@2@2-vec3-double-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-vec2-dmat2x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-vec2-dmat3x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-vec2-double-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-vec2-double@3@2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-vec2-dvec2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-vec3-dmat2x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-vec3-dmat3x2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-vec3-double-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-vec3-double@3@2-location-0,Crash
-spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1-vec3-dvec2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float-float-float-i64vec2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float-float-float-int64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float-float-float-u64vec2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float-float-float-uint64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float-i64vec2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float-int64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float-int64_t@3@2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float-u64vec2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float-uint64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float-uint64_t@3@2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float@2-i64vec2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float@2-int64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float@2-u64vec2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float@2-uint64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float@3-i64vec2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float@3-int64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float@3-u64vec2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float@3-uint64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float@4-i64vec2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float@4-int64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float@4-u64vec2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-float@4-uint64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-i64vec2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-i64vec2@3-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-i64vec2@4-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-int64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-int64_t@3-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-int64_t@3@2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-int64_t@4-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-s2-i64vec2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-s2-int64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-s2-u64vec2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-s2-uint64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-s2@2-s3@2-float-int64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-s2@2-s3@2-float-uint64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-s2@2-s3@2-vec3-int64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-s2@2-s3@2-vec3-uint64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-s2@2@2-float-int64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-s2@2@2-float-uint64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-s2@2@2-vec2-int64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-s2@2@2-vec2-uint64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-s2@2@2-vec3-int64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-s2@2@2-vec3-uint64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-u64vec2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-u64vec2@3-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-u64vec2@4-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-uint64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-uint64_t@3-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-uint64_t@3@2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-uint64_t@4-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-vec2-i64vec2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-vec2-int64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-vec2-int64_t@3@2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-vec2-u64vec2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-vec2-uint64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-vec2-uint64_t@3@2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-vec3-i64vec2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-vec3-int64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-vec3-int64_t@3@2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-vec3-u64vec2-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-vec3-uint64_t-location-0,Crash
-spec@arb_gpu_shader_int64@execution@inout@vs-out-fs-in-s1-vec3-uint64_t@3@2-location-0,Crash
-spec@arb_gpu_shader_int64@fs-shl-of-shr-int64,Fail
+spec@arb_gl_spirv@execution@ssbo@unsized-array,Fail
+spec@arb_gpu_shader_fp64@execution@built-in-functions@fs-frexp-dvec4-variable-index,Fail
+spec@arb_gpu_shader_fp64@execution@explicit-location-gs-fs-vs,Fail
+spec@arb_gpu_shader_fp64@uniform_buffers@fs-array-copy,Fail
+spec@arb_gpu_shader_fp64@uniform_buffers@gs-array-copy,Fail
+spec@arb_gpu_shader_fp64@uniform_buffers@vs-array-copy,Fail
+spec@arb_gpu_shader_int64@execution@indirect-array-two-accesses,Fail
 spec@arb_multi_draw_indirect@arb_draw_elements_base_vertex-multidrawelements 
-indirect,Crash
 spec@[email protected] -indirect,Crash
 spec@arb_occlusion_query@occlusion_query_meta_no_fragments,Fail
@@ -571,14 +459,6 @@ spec@arb_sample_shading@samplemask [email protected] 
mask_in_one,Fail
 spec@arb_sample_shading@samplemask [email protected] mask_in_one,Fail
 spec@arb_sample_shading@samplemask 8@noms mask_in_one,Fail
 
-# "[63577.769413] nouveau 0000:01:00.0: arb_shader_imag[162522]: failed to 
idle channel 2 [arb_shader_imag[162522]]"
-spec@arb_shader_image_load_store@atomicity,Crash
-spec@arb_shader_image_load_store@atomicity@imageAtomicMax,Fail
-spec@arb_shader_image_load_store@atomicity@imageAtomicMin,Fail
-
-spec@arb_shader_image_load_store@execution@image-array-out-of-bounds-access-load,Crash
-spec@arb_shader_image_load_store@execution@image-array-out-of-bounds-access-store,Crash
-
 spec@arb_shader_image_load_store@indexing,Fail
 spec@arb_shader_image_load_store@indexing@Compute shader/dynamically uniform 
indexing test,Fail
 spec@arb_shader_image_load_store@max-size,Fail
@@ -645,90 +525,20 @@ spec@ext_framebuffer_multisample@upsample 8 depth,Fail
 spec@ext_framebuffer_multisample@upsample 8 stencil,Fail
 
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-export,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_ayuv,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_nv12,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p010,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p012,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p016,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_uyvy,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_xyuv,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y210,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y212,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y216,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y410,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y412,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y416,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuv420,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuyv,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yvu420,Fail
 
-spec@ext_shader_image_load_store@image_functions,Fail
-spec@ext_shader_image_load_store@image_functions@imageAtomicIncWrap 
uimage1D,Fail
-spec@ext_shader_image_load_store@image_functions@imageAtomicIncWrap 
uimageBuffer,Fail
-
 spec@ext_texture_integer@multisample-formats 6 gl_ext_texture_integer,Fail
 spec@ext_timer_query@time-elapsed,Fail
 spec@ext_transform_feedback@generatemipmap prims_generated,Fail
 
 [email protected]@execution@samplers@glsl-fs-lots-of-tex,Fail
[email protected]@execution@glsl-rotate-left,Fail
[email protected]@execution@glsl-rotate-right,Fail
[email protected]@execution@inout@vs-out-fs-in-s1-dmat2x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-dmat3x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-dmat4x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-double-float-double@2-float@3-dmat2x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-double-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-double@3-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-double@3@2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-double@4-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-dvec2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-dvec2@3-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-dvec2@4-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float-dmat2x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float-dmat3x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float-double-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float-double@3@2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float-dvec2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float-float-float-double-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float-float-float-dvec2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float@1-dmat2x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float@1-dmat3x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float@2-dmat2x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float@2-dmat3x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float@2-double-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float@2-dvec2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float@3-dmat2x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float@3-dmat3x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float@3-double-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float@3-dvec2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float@4-dmat2x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float@4-dmat3x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float@4-double-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float@4-dvec2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float@5-dmat2x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float@5-dmat3x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float@6-dmat2x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-float@6-dmat3x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-s2-double-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-s2-dvec2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-s2@2-float-dmat2x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-s2@2-s3@2-float-double-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-s2@2-s3@2-vec3-double-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-s2@2-vec2-dmat2x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-s2@2-vec3-dmat2x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-s2@2@2-float-double-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-s2@2@2-vec2-double-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-s2@2@2-vec3-double-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-vec2-dmat2x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-vec2-dmat3x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-vec2-double-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-vec2-double@3@2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-vec2-dvec2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-vec3-dmat2x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-vec3-dmat3x2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-vec3-double-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-vec3-double@3@2-location-0,Crash
[email protected]@execution@inout@vs-out-fs-in-s1-vec3-dvec2-location-0,Crash
 
 spec@khr_texture_compression_astc@miptree-gl srgb-fp,Fail
 spec@khr_texture_compression_astc@miptree-gl srgb-fp@sRGB decode full 
precision,Fail
diff --git a/src/gallium/drivers/nouveau/ci/nouveau-nv92-fails.txt 
b/src/gallium/drivers/nouveau/ci/nouveau-nv92-fails.txt
index 66a88153dd3..7412f5e2385 100644
--- a/src/gallium/drivers/nouveau/ci/nouveau-nv92-fails.txt
+++ b/src/gallium/drivers/nouveau/ci/nouveau-nv92-fails.txt
@@ -85,14 +85,6 @@ KHR-GLES3.packed_pixels.varied_rectangle.rgba4,Fail
 KHR-GLES3.packed_pixels.varied_rectangle.rgba8,Fail
 dEQP-GLES2.functional.rasterization.limits.points,Fail
 
-# "../src/mesa/state_tracker/st_glsl_to_tgsi.cpp:1648: void 
glsl_to_tgsi_visitor::visit_expression(ir_expression*, st_src_reg*): Assertion 
`ir->operands[2]->type->vector_elements == 1' failed."
-dEQP-GLES2.functional.shaders.algorithm.hsl_to_rgb_fragment,Crash
-dEQP-GLES2.functional.shaders.algorithm.hsl_to_rgb_vertex,Crash
-
-# "../src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp:1437: void 
nv50_ir::GCRA::checkInterference(const nv50_ir::GCRA::RIG_Node*, 
nv50_ir::Graph::EdgeIterator&): Assertion `vB->compound' failed."
-dEQP-GLES2.functional.shaders.random.all_features.fragment.93,Crash
-dEQP-GLES3.functional.shaders.random.all_features.fragment.93,Crash
-
 dEQP-GLES2.functional.shaders.texture_functions.vertex.texturecubelod,Fail
 dEQP-GLES2.functional.texture.mipmap.cube.basic.linear_linear,Fail
 dEQP-GLES2.functional.texture.mipmap.cube.basic.linear_nearest,Fail
@@ -111,6 +103,7 @@ 
dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_clamp,Fail
 dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_mirror,Fail
 dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_repeat,Fail
 dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_stencil,Fail
+
 
dEQP-GLES3.functional.shaders.texture_functions.texturelod.samplercube_fixed_fragment,Fail
 
dEQP-GLES3.functional.shaders.texture_functions.texturelod.samplercube_fixed_vertex,Fail
 
dEQP-GLES3.functional.texture.filtering.cube.combinations.linear_linear_clamp_clamp,Fail
@@ -431,7 +424,7 @@ 
dEQP-GLES3.functional.texture.vertex.cube.wrap.mirror_repeat,Fail
 
 shaders@glsl-bug-110796,Fail
 shaders@glsl-max-varyings >max_varying_components,Crash
-shaders@glsl-predication-on-large-array,Fail
+
 shaders@point-vertex-id divisor,Fail
 shaders@point-vertex-id gl_instanceid,Fail
 shaders@point-vertex-id gl_instanceid divisor,Fail
@@ -505,6 +498,7 @@ spec@arb_color_buffer_float@gl_rgba8_snorm-render-fog,Fail
 spec@arb_color_buffer_float@gl_rgba8_snorm-render-sanity,Fail
 spec@arb_color_buffer_float@gl_rgba8_snorm-render-sanity-fog,Fail
 
+spec@arb_enhanced_layouts@execution@component-layout@vs-fs-array-interleave-range,Fail
 spec@arb_enhanced_layouts@linker@component-layout@intrastage-vs,Fail
 spec@arb_enhanced_layouts@linker@component-layout@vs-to-fs,Fail
 
@@ -617,19 +611,11 @@ 
spec@ext_framebuffer_object@fbo-blending-formats@GL_RGBA16,Fail
 spec@ext_framebuffer_object@fbo-blending-snorm,Fail
 
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-export,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_ayuv,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_nv12,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p010,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p012,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p016,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_uyvy,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_xyuv,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y210,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y212,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y216,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y410,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y412,Fail
-spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y416,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuv420,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuyv,Fail
 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yvu420,Fail
@@ -751,9 +737,6 @@ 
[email protected]@execution@interpolation@interpolation-none-gl_frontsecondarycolor
 
 [email protected]@execution@samplers@glsl-fs-lots-of-tex,Fail
 
-# "void nv50_ir::GCRA::checkInterference(const nv50_ir::GCRA::RIG_Node*, 
nv50_ir::Graph::EdgeIterator&): Assertion `vB->compound' failed."
[email protected]@execution@fs-function-inout-array-of-structs,Crash
-
 [email protected]@built-in constants,Fail
 [email protected]@built-in constants@gl_MaxVaryingComponents,Fail
 [email protected]@built-in constants@gl_MaxVaryingFloats,Fail
@@ -811,6 +794,10 @@ 
[email protected]@execution@interpolation@interpolation-smooth-gl_frontsecondarycol
 
[email protected]@execution@interpolation@interpolation-smooth-gl_frontsecondarycolor-flat-none,Fail
 
[email protected]@execution@interpolation@interpolation-smooth-gl_frontsecondarycolor-flat-vertex,Fail
 
[email protected]@execution@isinf-and-isnan fs_fbo,Fail
[email protected]@execution@isinf-and-isnan vs_fbo,Fail
[email protected]@execution@isinf-and-isnan vs_xfb,Fail
+
 [email protected]@execution@tex-miplevel-selection texture(bias) cubeshadow,Fail
 [email protected]@execution@tex-miplevel-selection texturegrad cube,Fail
 [email protected]@execution@tex-miplevel-selection texturegrad cubeshadow,Fail
@@ -819,10 +806,6 @@ [email protected]@built-in constants,Fail
 [email protected]@built-in constants@gl_MaxVaryingComponents,Fail
 [email protected]@built-in constants@gl_MaxVaryingFloats,Fail
 
-# "st_glsl_to_tgsi.cpp:1648: void 
glsl_to_tgsi_visitor::visit_expression(ir_expression*, st_src_reg*): Assertion 
`ir->operands[2]->type->vector_elements == 1' failed."
[email protected]@uniform_buffer@fs-struct-copy-complicated,Crash
[email protected]@uniform_buffer@vs-struct-copy-complicated,Crash
-
 [email protected]@built-in constants,Fail
 [email protected]@built-in constants@gl_MaxFragmentInputComponents,Fail
 [email protected]@built-in constants@gl_MaxGeometryInputComponents,Fail
@@ -834,12 +817,6 @@ 
[email protected]@execution@variable-indexing@gs-output-array-vec2-index-wr,Fail
 [email protected]@execution@variable-indexing@gs-output-array-vec3-index-wr,Fail
 [email protected]@execution@variable-indexing@gs-output-array-vec4-index-wr,Fail
 
-# "../src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp:407: void 
nv50_ir::CodeEmitterNV50::setSrcFileBits(const nv50_ir::Instruction*, int): 
Assertion `reg < 3' failed."
[email protected]@execution@vs-gs-arrays-within-blocks-pass,Crash
-
-# "st_glsl_to_tgsi.cpp:1648: void 
glsl_to_tgsi_visitor::visit_expression(ir_expression*, st_src_reg*): Assertion 
`ir->operands[2]->type->vector_elements == 1' failed."
[email protected]@uniform_buffer@gs-struct-copy-complicated,Crash
-
 [email protected]@built-in constants,Fail
 [email protected]@built-in constants@gl_MaxFragmentInputComponents,Fail
 [email protected]@built-in constants@gl_MaxGeometryInputComponents,Fail
@@ -870,6 +847,8 @@ 
dEQP-GLES31.functional.image_load_store.2d.format_reinterpret.r32f_rgba8_snorm,F
 
dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.r32f_rgba8_snorm,Fail
 
dEQP-GLES31.functional.image_load_store.3d.format_reinterpret.r32f_rgba8_snorm,Fail
 
dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.r32f_rgba8_snorm,Fail
+# Fails run with other tests, passes on its own.
+dEQP-GLES31.functional.image_load_store.cube.qualifiers.coherent_r32f,Fail
 
 
dEQP-GLES31.functional.shaders.builtin_functions.texture_size.samples_1_texture_2d_array,Fail
 
dEQP-GLES31.functional.shaders.builtin_functions.texture_size.samples_1_texture_int_2d_array,Fail
@@ -880,8 +859,17 @@ 
dEQP-GLES31.functional.shaders.builtin_functions.texture_size.samples_4_texture_
 
 dEQP-GLES31.functional.separate_shader.random.38,Fail
 
+# " ERROR: mismatch in Block.s[0].b[0], top-level ndx 0, bottom-level ndx 2: 
expected mat3(9.0, -3.0, -6.0, 6.0, -7.0, 4.0, 2.0, -7.0, -2.0) got mat3(9.0, 
-3.0, -6.0, 6.0, -7.0, 4.0, -7.0, 6.0, -2.0)
+#   ERROR: mismatch in Block.s[0].b[0], top-level ndx 0, bottom-level ndx 2: 
expected mat3(5.0, -5.0, 0.0, 1.0, 6.0, 4.0, -6.0, -7.0, -4.0) got mat3(5.0, 
-5.0, 0.0, 1.0, 6.0, 4.0, -7.0, -3.0, -4.0)
+#   ERROR: mismatch in Block.s[0].b[0], top-level ndx 0, bottom-level ndx 2: 
expected mat3(-3.0, -5.0, 6.0, -5.0, -8.0, -1.0, 9.0, -4.0, 6.0) got mat3(-3.0, 
-5.0, 6.0, -5.0, -8.0, -1.0, -4.0, 4.0, 6.0)"
+dEQP-GLES31.functional.ssbo.layout.single_struct_array.per_block_buffer.packed_instance_array,Fail
+dEQP-GLES31.functional.ssbo.layout.single_struct_array.per_block_buffer.shared_instance_array,Fail
 
dEQP-GLES31.functional.ssbo.layout.single_struct_array.per_block_buffer.std140_instance_array,Fail
 
dEQP-GLES31.functional.ssbo.layout.single_struct_array.per_block_buffer.std430_instance_array,Fail
+dEQP-GLES31.functional.ssbo.layout.single_struct_array.single_buffer.packed_instance_array,Fail
+dEQP-GLES31.functional.ssbo.layout.single_struct_array.single_buffer.shared_instance_array,Fail
+dEQP-GLES31.functional.ssbo.layout.single_struct_array.single_buffer.std140_instance_array,Fail
+dEQP-GLES31.functional.ssbo.layout.single_struct_array.single_buffer.std430_instance_array,Fail
 
 
dEQP-GLES31.functional.state_query.integer.draw_indirect_buffer_binding_getboolean,Fail
 
dEQP-GLES31.functional.state_query.integer.draw_indirect_buffer_binding_getfloat,Fail
@@ -1023,6 +1011,3 @@ 
dEQP-GLES31.functional.texture.border_clamp.unused_channels.depth24_stencil8_sam
 
dEQP-GLES31.functional.texture.border_clamp.unused_channels.depth32f_stencil8_sample_stencil,Fail
 dEQP-GLES31.functional.texture.border_clamp.unused_channels.r16i,Fail
 dEQP-GLES31.functional.texture.border_clamp.unused_channels.stencil_index8,Fail
-
-dEQP-GLES31.functional.ubo.random.all_per_block_buffers.13,Fail
-dEQP-GLES31.functional.ubo.random.all_per_block_buffers.20,Fail
diff --git a/src/gallium/drivers/nouveau/nouveau_screen.c 
b/src/gallium/drivers/nouveau/nouveau_screen.c
index 6c9781063fe..f66ccc2ac1b 100644
--- a/src/gallium/drivers/nouveau/nouveau_screen.c
+++ b/src/gallium/drivers/nouveau/nouveau_screen.c
@@ -202,10 +202,7 @@ nouveau_screen_init(struct nouveau_screen *screen, struct 
nouveau_device *dev)
    if (nv_dbg)
       nouveau_mesa_debug = atoi(nv_dbg);
 
-   if (dev->chipset < 0x140)
-      screen->prefer_nir = debug_get_bool_option("NV50_PROG_USE_NIR", false);
-   else
-      screen->prefer_nir = true;
+   screen->prefer_nir = !debug_get_bool_option("NV50_PROG_USE_TGSI", false);
 
    screen->force_enable_cl = debug_get_bool_option("NOUVEAU_ENABLE_CL", false);
    if (screen->force_enable_cl)

Reply via email to