fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-27 02:20:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

r600: Store nir shaders serialized to save memory

Browse source 
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7247

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20061>
This commit is contained in:
Gert Wollny 2022-11-29 15:53:41 +01:00 • committed by Marge Bot
parent 22be0d09a0
commit 5b205ef413
3 changed files with 37 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/r600/r600_pipe.h
View file

@ -344,7 +344,11 @@ struct r600_pipe_shader_selector {
struct r600_pipe_shader *current;
struct tgsi_token *tokens;
struct nir_shader *nir;
struct nir_shader *nir;
size_t nir_blob_size;
void *nir_blob;
struct pipe_stream_output_info so;
struct tgsi_shader_info info;

37
src/gallium/drivers/r600/r600_shader.c
View file

@ -20,6 +20,8 @@
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "nir_serialize.h"
#include "pipe/p_defines.h"
#include "r600_sq.h"
#include "r600_formats.h"
#include "r600_opcodes.h"
@ -174,6 +176,18 @@ int r600_pipe_shader_create(struct pipe_context *ctx,
int r;
struct r600_screen *rscreen = (struct r600_screen *)ctx->screen;
const nir_shader_compiler_options *nir_options =
(const nir_shader_compiler_options *)
ctx->screen->get_compiler_options(ctx->screen,
PIPE_SHADER_IR_NIR,
shader->shader.processor_type);
if (!sel->nir && !(sel->ir_type == PIPE_SHADER_IR_TGSI)) {
assert(sel->nir_blob);
struct blob_reader blob_reader;
blob_reader_init(&blob_reader, sel->nir_blob, sel->nir_blob_size);
sel->nir = nir_deserialize(NULL, nir_options, &blob_reader);
}
int processor = sel->ir_type == PIPE_SHADER_IR_TGSI ?
tgsi_get_processor_type(sel->tokens):
pipe_shader_type_from_mesa(sel->nir->info.stage);
@ -196,17 +210,15 @@ int r600_pipe_shader_create(struct pipe_context *ctx,
}
} else {
glsl_type_singleton_init_or_ref();
if (sel->ir_type == PIPE_SHADER_IR_TGSI) {
if (sel->nir)
ralloc_free(sel->nir);
if (sel->nir_blob) {
free(sel->nir_blob);
sel->nir_blob = NULL;
}
sel->nir = tgsi_to_nir(sel->tokens, ctx->screen, true);
const nir_shader_compiler_options *nir_options =
(const nir_shader_compiler_options *)
ctx->screen->get_compiler_options(ctx->screen,
PIPE_SHADER_IR_NIR,
shader->shader.processor_type);
/* Lower int64 ops because we have some r600 build-in shaders that use it */
/* Lower int64 ops because we have some r600 build-in shaders that use it */
if (nir_options->lower_int64_options) {
NIR_PASS_V(sel->nir, nir_lower_regs_to_ssa);
NIR_PASS_V(sel->nir, nir_lower_alu_to_scalar, r600_lower_to_scalar_instr_filter, NULL);
@ -383,6 +395,17 @@ int r600_pipe_shader_create(struct pipe_context *ctx,
shader->shader.bc.ncf,
shader->shader.bc.nstack);
if (!sel->nir_blob && sel->nir) {
struct blob blob;
blob_init(&blob);
nir_serialize(&blob, sel->nir, false);
sel->nir_blob = malloc(blob.size);
memcpy(sel->nir_blob, blob.data, blob.size);
sel->nir_blob_size = blob.size;
}
ralloc_free(sel->nir);
sel->nir = NULL;
return 0;
error:

2
src/gallium/drivers/r600/r600_state_common.c
View file

@ -1191,6 +1191,8 @@ void r600_delete_shader_selector(struct pipe_context *ctx,
}
else if (sel->ir_type == PIPE_SHADER_IR_NIR)
ralloc_free(sel->nir);
if (sel->nir_blob)
free(sel->nir_blob);
free(sel);
}