OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lima: Fix unused var/function warnings in release build from assertions.

Browse Source 
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6462>
This commit is contained in:
Eric Anholt
2020-08-25 11:32:35 -07:00
committed by Marge Bot
parent 65f484198a
commit f6456d74ed
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gallium/drivers/lima/ir/gp/nir.c
View File

@@ -431,13 +431,13 @@ static void gpir_print_shader_db(struct nir_shader *nir, gpir_compiler *comp,
{
const struct shader_info *info = &nir->info;
char *shaderdb;
int ret = asprintf(&shaderdb,
"%s shader: %d inst, %d loops, %d:%d spills:fills\n",
gl_shader_stage_name(info->stage),
comp->num_instr,
comp->num_loops,
comp->num_spills,
comp->num_fills);
ASSERTED int ret = asprintf(&shaderdb,
"%s shader: %d inst, %d loops, %d:%d spills:fills\n",
gl_shader_stage_name(info->stage),
comp->num_instr,
comp->num_loops,
comp->num_spills,
comp->num_fills);
assert(ret >= 0);
if (lima_debug & LIMA_DEBUG_SHADERDB)

8
src/gallium/drivers/lima/ir/gp/scheduler.c
View File

@@ -394,7 +394,7 @@ static int gpir_get_slots_required(gpir_node *node)
return 1;
}
static void verify_ready_list(sched_ctx *ctx)
static void ASSERTED verify_ready_list(sched_ctx *ctx)
{
list_for_each_entry(gpir_node, node, &ctx->ready_list, list) {
if (!gpir_is_input_node(node)) {
@@ -1123,7 +1123,7 @@ static bool try_spill_nodes(sched_ctx *ctx, gpir_node *orig_node)
return ctx->total_spill_needed <= 0 && ctx->max_node_spill_needed <= 0;
}
static int gpir_get_curr_ready_list_slots(sched_ctx *ctx)
static int ASSERTED gpir_get_curr_ready_list_slots(sched_ctx *ctx)
{
int total = 0;
list_for_each_entry(gpir_node, node, &ctx->ready_list, list) {
@@ -1248,13 +1248,13 @@ static void sched_find_max_nodes(sched_ctx *ctx)
/* Verify the invariants described in gpir.h, as well as making sure the
* counts are correct.
*/
static void verify_max_nodes(sched_ctx *ctx)
static void ASSERTED verify_max_nodes(sched_ctx *ctx)
{
int alu_num_slot_needed_by_max = 0;
int alu_num_unscheduled_next_max = 0;
int alu_num_slot_needed_by_store = 0;
int alu_num_slot_needed_by_non_cplx_store = 0;
int alu_max_allowed_next_max = 5;
ASSERTED int alu_max_allowed_next_max = 5;
list_for_each_entry(gpir_node, node, &ctx->ready_list, list) {
if (!gpir_is_input_node(node))

14
src/gallium/drivers/lima/ir/pp/nir.c
View File

@@ -833,13 +833,13 @@ static void ppir_print_shader_db(struct nir_shader *nir, ppir_compiler *comp,
{
const struct shader_info *info = &nir->info;
char *shaderdb;
int ret = asprintf(&shaderdb,
"%s shader: %d inst, %d loops, %d:%d spills:fills\n",
gl_shader_stage_name(info->stage),
comp->cur_instr_index,
comp->num_loops,
comp->num_spills,
comp->num_fills);
ASSERTED int ret = asprintf(&shaderdb,
"%s shader: %d inst, %d loops, %d:%d spills:fills\n",
gl_shader_stage_name(info->stage),
comp->cur_instr_index,
comp->num_loops,
comp->num_spills,
comp->num_fills);
assert(ret >= 0);
if (lima_debug & LIMA_DEBUG_SHADERDB)