fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 21:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pan/mdg: Infer whether to disassemble shaders from info.internal

Browse source 
Blit shaders are now marked as internal, so remove the silent argument
from midgard_compile_shader_nir and instead use nir->info.internal to
suppress disassembling shaders.

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6870>
This commit is contained in:
Icecream95 2020-09-26 12:19:14 +12:00 • committed by Marge Bot
parent 90eaaada0d
commit 756441b297
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/panfrost/pan_assemble.c
View file

@ -248,7 +248,7 @@ panfrost_shader_compile(struct panfrost_context *ctx,
bifrost_compile_shader_nir(s, &program, dev->gpu_id);
} else {
midgard_compile_shader_nir(s, &program, false, 0, dev->gpu_id,
dev->debug & PAN_DBG_PRECOMPILE, false);
dev->debug & PAN_DBG_PRECOMPILE);
}
/* Prepare the compiled binary for upload */

2
src/gallium/drivers/panfrost/pan_blend_shaders.c
View file

@ -217,7 +217,7 @@ panfrost_compile_blend_shader(
.rt_formats = {format}
};
midgard_compile_shader_nir(shader, &program, true, rt, dev->gpu_id, false, false);
midgard_compile_shader_nir(shader, &program, true, rt, dev->gpu_id, false);
/* Allow us to patch later */
res.patch_index = program.blend_patch_offset;

2
src/panfrost/lib/pan_blit.c
View file

@ -98,7 +98,7 @@ panfrost_build_blit_shader(panfrost_program *program, unsigned gpu_id, gl_frag_r
else
nir_store_var(b, c_out, nir_channel(b, &tex->dest.ssa, 0), 0xFF);
midgard_compile_shader_nir(shader, program, false, 0, gpu_id, false, true);
midgard_compile_shader_nir(shader, program, false, 0, gpu_id, false);
ralloc_free(shader);
}

8
src/panfrost/midgard/midgard_compile.c
View file

@ -2946,7 +2946,7 @@ mir_add_writeout_loops(compiler_context *ctx)
}
int
midgard_compile_shader_nir(nir_shader *nir, panfrost_program *program, bool is_blend, unsigned blend_rt, unsigned gpu_id, bool shaderdb, bool silent)
midgard_compile_shader_nir(nir_shader *nir, panfrost_program *program, bool is_blend, unsigned blend_rt, unsigned gpu_id, bool shaderdb)
{
struct util_dynarray *compiled = &program->compiled;
@ -3006,7 +3006,7 @@ midgard_compile_shader_nir(nir_shader *nir, panfrost_program *program, bool is_b
NIR_PASS_V(nir, midgard_nir_reorder_writeout);
if ((midgard_debug & MIDGARD_DBG_SHADERS) && !silent) {
if ((midgard_debug & MIDGARD_DBG_SHADERS) && !nir->info.internal) {
nir_print_shader(nir, stdout);
}
@ -3140,10 +3140,10 @@ midgard_compile_shader_nir(nir_shader *nir, panfrost_program *program, bool is_b
program->blend_patch_offset = ctx->blend_constant_offset;
program->tls_size = ctx->tls_size;
if ((midgard_debug & MIDGARD_DBG_SHADERS) && !silent)
if ((midgard_debug & MIDGARD_DBG_SHADERS) && !nir->info.internal)
disassemble_midgard(stdout, program->compiled.data, program->compiled.size, gpu_id, ctx->stage);
if ((midgard_debug & MIDGARD_DBG_SHADERDB || shaderdb) && !silent) {
if ((midgard_debug & MIDGARD_DBG_SHADERDB || shaderdb) && !nir->info.internal) {
unsigned nr_bundles = 0, nr_ins = 0;
/* Count instructions and bundles */

2
src/panfrost/midgard/midgard_compile.h
View file

@ -29,7 +29,7 @@
#include "panfrost/util/pan_ir.h"
int
midgard_compile_shader_nir(nir_shader *nir, panfrost_program *program, bool is_blend, unsigned blend_rt, unsigned gpu_id, bool shaderdb, bool silent);
midgard_compile_shader_nir(nir_shader *nir, panfrost_program *program, bool is_blend, unsigned blend_rt, unsigned gpu_id, bool shaderdb);
/* NIR options are shared between the standalone compiler and the online
* compiler. Defining it here is the simplest, though maybe not the Right