mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-01-20 04:30:22 +01:00
410609c968
Currently only one ir assignment is removed for each var in a single dead code optimisation pass. This means if a var has more than one assignment, then it requires all the glsl optimisations to be run again for each additional assignment to be removed. Another pass is also required to remove the variable itself. With this change all assignments and the variable are removed in a single pass. Some of the arrays of arrays conformance tests that were looping through 8 dimensions ended up with a var with hundreds of assignments. This change helps ES31-CTS.arrays_of_arrays.InteractionFunctionCalls1 go from around 3 min 20 sec -> 2 min ES31-CTS.arrays_of_arrays.InteractionFunctionCalls2 went from around 9 min 20 sec to 7 min 30 sec I had difficulty getting the public shader-db to give a consistent result with or without this change but the results seemed unchanged at between 15-20 seconds. Thomas Helland measured change with shader-db on his machine from approx 117 secs to 112 secs. V3: Simplify freeing of list as suggested by Ian, and spelling fixes. V2: Add assert to be sure references are counted before assignments. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Tested-By: Thomas Helland <thomashelland90@gmail.com> Tested-by: Ian Romanick <ian.d.romanick@intel.com>
80 lines
2.6 KiB
C++
80 lines
2.6 KiB
C++
/*
|
|
* Copyright © 2010 Intel Corporation
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
/**
|
|
* \file ir_variable_refcount.h
|
|
*
|
|
* Provides a visitor which produces a list of variables referenced,
|
|
* how many times they were referenced and assigned, and whether they
|
|
* were defined in the scope.
|
|
*/
|
|
|
|
#include "ir.h"
|
|
#include "ir_visitor.h"
|
|
#include "glsl_types.h"
|
|
|
|
struct assignment_entry {
|
|
exec_node link;
|
|
ir_assignment *assign;
|
|
};
|
|
|
|
class ir_variable_refcount_entry
|
|
{
|
|
public:
|
|
ir_variable_refcount_entry(ir_variable *var);
|
|
|
|
ir_variable *var; /* The key: the variable's pointer. */
|
|
|
|
/**
|
|
* List of assignments to the variable, if any.
|
|
* This is intended to be used for dead code optimisation and may
|
|
* not be a complete list.
|
|
*/
|
|
exec_list assign_list;
|
|
|
|
/** Number of times the variable is referenced, including assignments. */
|
|
unsigned referenced_count;
|
|
|
|
/** Number of times the variable is assigned. */
|
|
unsigned assigned_count;
|
|
|
|
bool declaration; /* If the variable had a decl in the instruction stream */
|
|
};
|
|
|
|
class ir_variable_refcount_visitor : public ir_hierarchical_visitor {
|
|
public:
|
|
ir_variable_refcount_visitor(void);
|
|
~ir_variable_refcount_visitor(void);
|
|
|
|
virtual ir_visitor_status visit(ir_variable *);
|
|
virtual ir_visitor_status visit(ir_dereference_variable *);
|
|
|
|
virtual ir_visitor_status visit_enter(ir_function_signature *);
|
|
virtual ir_visitor_status visit_leave(ir_assignment *);
|
|
|
|
ir_variable_refcount_entry *get_variable_entry(ir_variable *var);
|
|
|
|
struct hash_table *ht;
|
|
|
|
void *mem_ctx;
|
|
};
|