fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-23 05:20:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

panfrost: Merge pan_assemble.c into pan_shader.c

Browse source 
We now have a common place for the driver side of shader compilation. As a bonus
this gets rid of the old "assemble" name which hasn't been accurate since 2018
or so.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19363>
This commit is contained in:
Alyssa Rosenzweig 2022-10-14 15:20:46 -04:00 • committed by Marge Bot
parent 5ef46b4f72
commit 78f7128dad
4 changed files with 93 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/drivers/panfrost/meson.build
View file

@ -29,7 +29,6 @@ files_panfrost = files(
'pan_context.c',
'pan_blit.c',
'pan_job.c',
'pan_assemble.c',
'pan_shader.c',
'pan_mempool.c',
'pan_mempool.h',

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

@ -1,126 +0,0 @@
/*
* © Copyright 2018 Alyssa Rosenzweig
* Copyright (C) 2019-2020 Collabora, Ltd.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "pan_bo.h"
#include "pan_context.h"
#include "pan_shader.h"
#include "pan_util.h"
#include "compiler/nir/nir.h"
#include "util/u_dynarray.h"
#include "util/u_upload_mgr.h"
void
panfrost_shader_compile(struct pipe_screen *pscreen,
struct panfrost_pool *shader_pool,
struct panfrost_pool *desc_pool,
const nir_shader *ir,
struct util_debug_callback *dbg,
struct panfrost_shader_state *state,
unsigned req_local_mem)
{
struct panfrost_screen *screen = pan_screen(pscreen);
struct panfrost_device *dev = pan_device(pscreen);
nir_shader *s = nir_shader_clone(NULL, ir);
if (s->xfb_info && !s->info.internal) {
/* Create compute shader doing transform feedback */
nir_shader *xfb = nir_shader_clone(NULL, s);
xfb->info.name = ralloc_asprintf(xfb, "%s@xfb", xfb->info.name);
xfb->info.internal = true;
state->xfb = calloc(1, sizeof(struct panfrost_shader_state));
panfrost_shader_compile(pscreen, shader_pool, desc_pool, xfb, dbg, state->xfb, 0);
/* Main shader no longer uses XFB */
s->info.has_transform_feedback_varyings = false;
}
/* Lower this early so the backends don't have to worry about it */
if (s->info.stage == MESA_SHADER_FRAGMENT) {
NIR_PASS_V(s, nir_lower_fragcolor, state->key.fs.nr_cbufs);
if (state->key.fs.sprite_coord_enable) {
NIR_PASS_V(s, nir_lower_texcoord_replace,
state->key.fs.sprite_coord_enable,
true /* point coord is sysval */,
false /* Y-invert */);
}
if (state->key.fs.clip_plane_enable) {
NIR_PASS_V(s, nir_lower_clip_fs,
state->key.fs.clip_plane_enable,
false);
}
}
/* Call out to Midgard compiler given the above NIR */
struct panfrost_compile_inputs inputs = {
.debug = dbg,
.gpu_id = dev->gpu_id,
.fixed_sysval_ubo = -1,
.fixed_varying_mask = state->key.fixed_varying_mask
};
/* No IDVS for internal XFB shaders */
if (s->info.stage == MESA_SHADER_VERTEX && s->info.has_transform_feedback_varyings)
inputs.no_idvs = true;
memcpy(inputs.rt_formats, state->key.fs.rt_formats, sizeof(inputs.rt_formats));
struct util_dynarray binary;
util_dynarray_init(&binary, NULL);
screen->vtbl.compile_shader(s, &inputs, &binary, &state->info);
assert(req_local_mem >= state->info.wls_size);
state->info.wls_size = req_local_mem;
if (binary.size) {
state->bin = panfrost_pool_take_ref(shader_pool,
pan_pool_upload_aligned(&shader_pool->base,
binary.data, binary.size, 128));
}
/* Don't upload RSD for fragment shaders since they need draw-time
* merging for e.g. depth/stencil/alpha. RSDs are replaced by simpler
* shader program descriptors on Valhall, which can be preuploaded even
* for fragment shaders. */
bool upload = !(s->info.stage == MESA_SHADER_FRAGMENT && dev->arch <= 7);
screen->vtbl.prepare_shader(state, desc_pool, upload);
panfrost_analyze_sysvals(state);
util_dynarray_fini(&binary);
/* In both clone and tgsi_to_nir paths, the shader is ralloc'd against
* a NULL context */
ralloc_free(s);
}

8
src/gallium/drivers/panfrost/pan_context.h
View file

@ -399,14 +399,6 @@ panfrost_render_condition_check(struct panfrost_context *ctx);
void
panfrost_update_shader_variant(struct panfrost_context *ctx,
enum pipe_shader_type type);
void
panfrost_shader_compile(struct pipe_screen *pscreen,
struct panfrost_pool *shader_pool,
struct panfrost_pool *desc_pool,
const nir_shader *ir,
struct util_debug_callback *dbg,
struct panfrost_shader_state *state,
unsigned req_local_mem);
void
panfrost_analyze_sysvals(struct panfrost_shader_state *ss);

94
src/gallium/drivers/panfrost/pan_shader.c
View file

@ -1,6 +1,8 @@
/*
* Copyright (C) 2019 Collabora, Ltd.
* Copyright (c) 2022 Amazon.com, Inc. or its affiliates.
* Copyright (C) 2019-2022 Collabora, Ltd.
* Copyright (C) 2019 Red Hat Inc.
* Copyright (C) 2018 Alyssa Rosenzweig
* Copyright © 2017 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
@ -34,6 +36,96 @@
#include "nir/tgsi_to_nir.h"
#include "nir_serialize.h"
static void
panfrost_shader_compile(struct pipe_screen *pscreen,
struct panfrost_pool *shader_pool,
struct panfrost_pool *desc_pool,
const nir_shader *ir,
struct util_debug_callback *dbg,
struct panfrost_shader_state *state,
unsigned req_local_mem)
{
struct panfrost_screen *screen = pan_screen(pscreen);
struct panfrost_device *dev = pan_device(pscreen);
nir_shader *s = nir_shader_clone(NULL, ir);
if (s->xfb_info && !s->info.internal) {
/* Create compute shader doing transform feedback */
nir_shader *xfb = nir_shader_clone(NULL, s);
xfb->info.name = ralloc_asprintf(xfb, "%s@xfb", xfb->info.name);
xfb->info.internal = true;
state->xfb = calloc(1, sizeof(struct panfrost_shader_state));
panfrost_shader_compile(pscreen, shader_pool, desc_pool, xfb, dbg, state->xfb, 0);
/* Main shader no longer uses XFB */
s->info.has_transform_feedback_varyings = false;
}
/* Lower this early so the backends don't have to worry about it */
if (s->info.stage == MESA_SHADER_FRAGMENT) {
NIR_PASS_V(s, nir_lower_fragcolor, state->key.fs.nr_cbufs);
if (state->key.fs.sprite_coord_enable) {
NIR_PASS_V(s, nir_lower_texcoord_replace,
state->key.fs.sprite_coord_enable,
true /* point coord is sysval */,
false /* Y-invert */);
}
if (state->key.fs.clip_plane_enable) {
NIR_PASS_V(s, nir_lower_clip_fs,
state->key.fs.clip_plane_enable,
false);
}
}
/* Call out to Midgard compiler given the above NIR */
struct panfrost_compile_inputs inputs = {
.debug = dbg,
.gpu_id = dev->gpu_id,
.fixed_sysval_ubo = -1,
.fixed_varying_mask = state->key.fixed_varying_mask
};
/* No IDVS for internal XFB shaders */
if (s->info.stage == MESA_SHADER_VERTEX && s->info.has_transform_feedback_varyings)
inputs.no_idvs = true;
memcpy(inputs.rt_formats, state->key.fs.rt_formats, sizeof(inputs.rt_formats));
struct util_dynarray binary;
util_dynarray_init(&binary, NULL);
screen->vtbl.compile_shader(s, &inputs, &binary, &state->info);
assert(req_local_mem >= state->info.wls_size);
state->info.wls_size = req_local_mem;
if (binary.size) {
state->bin = panfrost_pool_take_ref(shader_pool,
pan_pool_upload_aligned(&shader_pool->base,
binary.data, binary.size, 128));
}
/* Don't upload RSD for fragment shaders since they need draw-time
* merging for e.g. depth/stencil/alpha. RSDs are replaced by simpler
* shader program descriptors on Valhall, which can be preuploaded even
* for fragment shaders. */
bool upload = !(s->info.stage == MESA_SHADER_FRAGMENT && dev->arch <= 7);
screen->vtbl.prepare_shader(state, desc_pool, upload);
panfrost_analyze_sysvals(state);
util_dynarray_fini(&binary);
/* In both clone and tgsi_to_nir paths, the shader is ralloc'd against
* a NULL context */
ralloc_free(s);
}
static void
panfrost_build_key(struct panfrost_context *ctx,
struct panfrost_shader_key *key,