ttn: Add new allow_disk_cache parameter

For now this parameter doesn't do anything.
It means the implementation is allowed to use
a cache on disk.

Signed-off-by: Axel Davy <davyaxel0@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4993>

diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c
index 2865697482eb2e1312cd6ed66fef03e639c6e5de..69c1d5bfc58516256394898edbe2148af0ca3f3c 100644 (file)
--- a/src/gallium/auxiliary/nir/tgsi_to_nir.c
+++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c
@@ -2582,11 +2582,14 @@ ttn_finalize_nir(struct ttn_compile *c, struct pipe_screen *screen)
 
 struct nir_shader *
 tgsi_to_nir(const void *tgsi_tokens,
-            struct pipe_screen *screen)
+            struct pipe_screen *screen,
+            bool allow_disk_cache)
 {
    struct ttn_compile *c;
    struct nir_shader *s;
 
+   (void)allow_disk_cache;
+
    c = ttn_compile_init(tgsi_tokens, NULL, screen);
    s = c->build.shader;
    ttn_finalize_nir(c, screen);

diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.h b/src/gallium/auxiliary/nir/tgsi_to_nir.h
index 666fdf5b1ea1ed4710895c0b0679af6f1a7f64e6..88e128d6f87a9f2be61883135ac70a8effd4229b 100644 (file)
--- a/src/gallium/auxiliary/nir/tgsi_to_nir.h
+++ b/src/gallium/auxiliary/nir/tgsi_to_nir.h
@@ -29,7 +29,8 @@
 
 struct nir_shader *
 tgsi_to_nir(const void *tgsi_tokens,
-            struct pipe_screen *screen);
+            struct pipe_screen *screen,
+            bool allow_disk_cache);
 
 struct nir_shader *
 tgsi_to_nir_noscreen(const void *tgsi_tokens,

diff --git a/src/gallium/drivers/etnaviv/etnaviv_shader.c b/src/gallium/drivers/etnaviv/etnaviv_shader.c
index 3ac619ac9d743d5c762e9ad66ab17012bdde27ff..173a4681cb217b631c7db1e1f3335744016addd7 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_shader.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_shader.c
@@ -406,7 +406,7 @@ etna_create_shader_state(struct pipe_context *pctx,
 
    if (DBG_ENABLED(ETNA_DBG_NIR))
       shader->nir = (pss->type == PIPE_SHADER_IR_NIR) ? pss->ir.nir :
-                     tgsi_to_nir(pss->tokens, pctx->screen);
+                     tgsi_to_nir(pss->tokens, pctx->screen, false);
    else
       shader->tokens = tgsi_dup_tokens(pss->tokens);
 

diff --git a/src/gallium/drivers/freedreno/a2xx/fd2_program.c b/src/gallium/drivers/freedreno/a2xx/fd2_program.c
index b735535e7f77698db177c75365dcdef4d7213fa2..958b1f784b2a4c6ccdfcac5ded4e34a64ac1ef9b 100644 (file)
--- a/src/gallium/drivers/freedreno/a2xx/fd2_program.c
+++ b/src/gallium/drivers/freedreno/a2xx/fd2_program.c
@@ -98,7 +98,7 @@ fd2_fp_state_create(struct pipe_context *pctx,
                return NULL;
 
        so->nir = (cso->type == PIPE_SHADER_IR_NIR) ? cso->ir.nir :
-               tgsi_to_nir(cso->tokens, pctx->screen);
+               tgsi_to_nir(cso->tokens, pctx->screen, false);
 
        NIR_PASS_V(so->nir, nir_lower_io, nir_var_all, ir2_glsl_type_size,
                           (nir_lower_io_options)0);
@@ -135,7 +135,7 @@ fd2_vp_state_create(struct pipe_context *pctx,
                return NULL;
 
        so->nir = (cso->type == PIPE_SHADER_IR_NIR) ? cso->ir.nir :
-               tgsi_to_nir(cso->tokens, pctx->screen);
+               tgsi_to_nir(cso->tokens, pctx->screen, false);
 
        NIR_PASS_V(so->nir, nir_lower_io, nir_var_all, ir2_glsl_type_size,
                           (nir_lower_io_options)0);

diff --git a/src/gallium/drivers/freedreno/ir3/ir3_gallium.c b/src/gallium/drivers/freedreno/ir3/ir3_gallium.c
index 3507be9bc2ebfe15264e4a2cc4dcf93a6f736c5e..720c87a72b8a9c786409b19ccf1509da4dc89ff1 100644 (file)
--- a/src/gallium/drivers/freedreno/ir3/ir3_gallium.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_gallium.c
@@ -139,7 +139,7 @@ ir3_shader_create(struct ir3_compiler *compiler,
                if (ir3_shader_debug & IR3_DBG_DISASM) {
                        tgsi_dump(cso->tokens, 0);
                }
-               nir = tgsi_to_nir(cso->tokens, screen);
+               nir = tgsi_to_nir(cso->tokens, screen, false);
        }
 
        struct ir3_stream_output_info stream_output;
@@ -208,7 +208,7 @@ ir3_shader_create_compute(struct ir3_compiler *compiler,
                if (ir3_shader_debug & IR3_DBG_DISASM) {
                        tgsi_dump(cso->prog, 0);
                }
-               nir = tgsi_to_nir(cso->prog, screen);
+               nir = tgsi_to_nir(cso->prog, screen, false);
        }
 
        struct ir3_shader *shader = ir3_shader_from_nir(compiler, nir, NULL);

diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c
index b9131b872dafbf29711a497ccbffb0c37c75ee08..5f8c6fcb8d00ca7743865b7b4a9d8633be6e1f96 100644 (file)
--- a/src/gallium/drivers/iris/iris_program.c
+++ b/src/gallium/drivers/iris/iris_program.c
@@ -2217,7 +2217,7 @@ iris_create_shader_state(struct pipe_context *ctx,
    struct nir_shader *nir;
 
    if (state->type == PIPE_SHADER_IR_TGSI)
-      nir = tgsi_to_nir(state->tokens, ctx->screen);
+      nir = tgsi_to_nir(state->tokens, ctx->screen, false);
    else
       nir = state->ir.nir;
 

diff --git a/src/gallium/drivers/lima/lima_program.c b/src/gallium/drivers/lima/lima_program.c
index 75e74e23bc36c986aa147df8dfa8530e6c3d9cc8..2537e770ef966d3b56ebd6c4401f32ccf61e2a90 100644 (file)
--- a/src/gallium/drivers/lima/lima_program.c
+++ b/src/gallium/drivers/lima/lima_program.c
@@ -298,7 +298,7 @@ lima_create_fs_state(struct pipe_context *pctx,
    else {
       assert(cso->type == PIPE_SHADER_IR_TGSI);
 
-      nir = tgsi_to_nir(cso->tokens, pctx->screen);
+      nir = tgsi_to_nir(cso->tokens, pctx->screen, false);
    }
 
    so->base.type = PIPE_SHADER_IR_NIR;
@@ -454,7 +454,7 @@ lima_create_vs_state(struct pipe_context *pctx,
    else {
       assert(cso->type == PIPE_SHADER_IR_TGSI);
 
-      nir = tgsi_to_nir(cso->tokens, pctx->screen);
+      nir = tgsi_to_nir(cso->tokens, pctx->screen, false);
    }
 
    lima_program_optimize_vs_nir(nir);

diff --git a/src/gallium/drivers/panfrost/pan_assemble.c b/src/gallium/drivers/panfrost/pan_assemble.c
index efd3bf35df7a8e07d8c526a10fed9257564d9fcd..53bf9caaafca9876be0d921a286cfe10f19175ce 100644 (file)
--- a/src/gallium/drivers/panfrost/pan_assemble.c
+++ b/src/gallium/drivers/panfrost/pan_assemble.c
@@ -132,7 +132,7 @@ panfrost_shader_compile(struct panfrost_context *ctx,
                 s = nir_shader_clone(NULL, ir);
         } else {
                 assert (ir_type == PIPE_SHADER_IR_TGSI);
-                s = tgsi_to_nir(ir, ctx->base.screen);
+                s = tgsi_to_nir(ir, ctx->base.screen, false);
         }
 
         s->info.stage = stage;

diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index f34c0612598d46a103315ae8ab7a50a9675fa2c6..504e518111e276d226bd48816fc00d52180448b6 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -217,7 +217,7 @@ static void *si_create_compute_state(struct pipe_context *ctx, const struct pipe
    if (cso->ir_type != PIPE_SHADER_IR_NATIVE) {
       if (cso->ir_type == PIPE_SHADER_IR_TGSI) {
          program->ir_type = PIPE_SHADER_IR_NIR;
-         sel->nir = tgsi_to_nir(cso->prog, ctx->screen);
+         sel->nir = tgsi_to_nir(cso->prog, ctx->screen, false);
       } else {
          assert(cso->ir_type == PIPE_SHADER_IR_NIR);
          sel->nir = (struct nir_shader *)cso->prog;

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 45dcfa679b5ee31e2f80ac3d47c31c085bf6d262..b98d866d0587d9ee194338de0881486ab27080ed 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -2593,7 +2593,7 @@ static void *si_create_shader_selector(struct pipe_context *ctx,
    sel->so = state->stream_output;
 
    if (state->type == PIPE_SHADER_IR_TGSI) {
-      sel->nir = tgsi_to_nir(state->tokens, ctx->screen);
+      sel->nir = tgsi_to_nir(state->tokens, ctx->screen, false);
    } else {
       assert(state->type == PIPE_SHADER_IR_NIR);
       sel->nir = state->ir.nir;

diff --git a/src/gallium/drivers/v3d/v3d_program.c b/src/gallium/drivers/v3d/v3d_program.c
index 81c14d349c90ae1e4dc821910f1908e5f013afad..ad6a796866a3e4cadd43b453e00e96d80312eaba 100644 (file)
--- a/src/gallium/drivers/v3d/v3d_program.c
+++ b/src/gallium/drivers/v3d/v3d_program.c
@@ -303,7 +303,7 @@ v3d_uncompiled_shader_create(struct pipe_context *pctx,
                         tgsi_dump(ir, 0);
                         fprintf(stderr, "\n");
                 }
-                s = tgsi_to_nir(ir, pctx->screen);
+                s = tgsi_to_nir(ir, pctx->screen, false);
         }
 
         nir_variable_mode lower_mode = nir_var_all & ~nir_var_uniform;

diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c
index 0a6c43f0462618f8bbef7ffec03a9b7a13ef038b..66a095e12161c15c9ed3fd954b417b92d0d2c2e3 100644 (file)
--- a/src/gallium/drivers/vc4/vc4_program.c
+++ b/src/gallium/drivers/vc4/vc4_program.c
@@ -2466,7 +2466,7 @@ vc4_shader_state_create(struct pipe_context *pctx,
                         tgsi_dump(cso->tokens, 0);
                         fprintf(stderr, "\n");
                 }
-                s = tgsi_to_nir(cso->tokens, pctx->screen);
+                s = tgsi_to_nir(cso->tokens, pctx->screen, false);
         }
 
         if (s->info.stage == MESA_SHADER_VERTEX)

diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c
index 6583040d5c75e0f51c7f6cad6f51c02394dbbd64..1d9d21df3fee6a477845c69c8aa0587de532a8dc 100644 (file)
--- a/src/gallium/drivers/zink/zink_compiler.c
+++ b/src/gallium/drivers/zink/zink_compiler.c
@@ -108,7 +108,7 @@ zink_tgsi_to_nir(struct pipe_screen *screen, const struct tgsi_token *tokens)
       fprintf(stderr, "---8<---\n\n");
    }
 
-   return tgsi_to_nir(tokens, screen);
+   return tgsi_to_nir(tokens, screen, false);
 }
 
 static void

diff --git a/src/gallium/frontends/nine/nine_shader.c b/src/gallium/frontends/nine/nine_shader.c
index 195a1fe5f59b659aceb3d4b9ccc821f1380d7046..d6da68f7ec933417fac39b037fbbbafc2db72c87 100644 (file)
--- a/src/gallium/frontends/nine/nine_shader.c
+++ b/src/gallium/frontends/nine/nine_shader.c
@@ -3836,7 +3836,7 @@ static void
 nine_pipe_nir_shader_state_from_tgsi(struct pipe_shader_state *state, const struct tgsi_token *tgsi_tokens,
                                      struct pipe_screen *screen)
 {
-    struct nir_shader *nir = tgsi_to_nir(tgsi_tokens, screen);
+    struct nir_shader *nir = tgsi_to_nir(tgsi_tokens, screen, false);
 
     if (unlikely(nine_shader_get_debug_flag(NINE_SHADER_DEBUG_OPTION_DUMP_NIR))) {
         nir_print_shader(nir, stdout);