[Mesa-dev] [PATCH] i965: Give the FS and VEC4 visitors more descriptive names.
Jordan Justen
jordan.l.justen at intel.com
Wed Apr 1 09:01:03 PDT 2015
On 2015-04-01 02:43:38, Francisco Jerez wrote:
> It has always struck me as odd that these objects are both called
> visitors even though visiting only makes for a tiny fraction of their
> job. Other no less important tasks seem misrepresented, like
> optimizing, analyzing, emitting and pretty-printing the IR,
> translating NIR and ARB assembly programs, applying all sorts of
> hardware workarounds, calculating the binding table, URB, push and
> pull constant layout, etc.
>
> The new names should better depict the extraordinary power of these
> objects, and have the additional advantage of being up to 40% shorter
> than the old ones, reducing the number of keystrokes required to refer
> to these frequently used objects and hopefully increasing everyone's
> productivity.
> ---
> src/mesa/drivers/dri/i965/Makefile.sources | 14 +-
> src/mesa/drivers/dri/i965/brw_cfg.cpp | 4 +-
> src/mesa/drivers/dri/i965/brw_cfg.h | 4 +-
> .../drivers/dri/i965/brw_dead_control_flow.cpp | 2 +-
> src/mesa/drivers/dri/i965/brw_dead_control_flow.h | 2 +-
> src/mesa/drivers/dri/i965/brw_fs.cpp | 164 +-
> src/mesa/drivers/dri/i965/brw_fs.h | 10 +-
> .../drivers/dri/i965/brw_fs_cmod_propagation.cpp | 4 +-
> .../drivers/dri/i965/brw_fs_combine_constants.cpp | 2 +-
> .../drivers/dri/i965/brw_fs_copy_propagation.cpp | 8 +-
> src/mesa/drivers/dri/i965/brw_fs_cse.cpp | 4 +-
> .../dri/i965/brw_fs_dead_code_eliminate.cpp | 2 +-
> src/mesa/drivers/dri/i965/brw_fs_fp.cpp | 20 +-
> src/mesa/drivers/dri/i965/brw_fs_god.cpp | 4157 ++++++++++++++++++++
> .../drivers/dri/i965/brw_fs_live_variables.cpp | 8 +-
> src/mesa/drivers/dri/i965/brw_fs_live_variables.h | 4 +-
> src/mesa/drivers/dri/i965/brw_fs_nir.cpp | 46 +-
> .../dri/i965/brw_fs_peephole_predicated_break.cpp | 2 +-
> src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp | 18 +-
> .../drivers/dri/i965/brw_fs_register_coalesce.cpp | 6 +-
> .../dri/i965/brw_fs_saturate_propagation.cpp | 4 +-
> src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp | 2 +-
> src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 4157 --------------------
> src/mesa/drivers/dri/i965/brw_gs.c | 2 +-
> src/mesa/drivers/dri/i965/brw_ir_vec4.h | 6 +-
> .../drivers/dri/i965/brw_schedule_instructions.cpp | 20 +-
> src/mesa/drivers/dri/i965/brw_shader.cpp | 12 +-
> src/mesa/drivers/dri/i965/brw_shader.h | 4 +-
> src/mesa/drivers/dri/i965/brw_vec4.cpp | 54 +-
> src/mesa/drivers/dri/i965/brw_vec4.h | 6 +-
> .../drivers/dri/i965/brw_vec4_copy_propagation.cpp | 2 +-
> src/mesa/drivers/dri/i965/brw_vec4_cse.cpp | 4 +-
> .../dri/i965/brw_vec4_dead_code_eliminate.cpp | 2 +-
> src/mesa/drivers/dri/i965/brw_vec4_god.cpp | 3658 +++++++++++++++++
> src/mesa/drivers/dri/i965/brw_vec4_gs_god.cpp | 706 ++++
> src/mesa/drivers/dri/i965/brw_vec4_gs_god.h | 103 +
> src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp | 706 ----
> src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h | 103 -
> .../drivers/dri/i965/brw_vec4_live_variables.cpp | 10 +-
> .../drivers/dri/i965/brw_vec4_reg_allocate.cpp | 12 +-
> src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 3658 -----------------
> src/mesa/drivers/dri/i965/brw_vec4_vp.cpp | 10 +-
> src/mesa/drivers/dri/i965/brw_vec4_vs_god.cpp | 231 ++
> src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp | 231 --
> src/mesa/drivers/dri/i965/brw_vs.c | 2 +-
> src/mesa/drivers/dri/i965/brw_vs.h | 4 +-
> src/mesa/drivers/dri/i965/brw_wm_iz.cpp | 2 +-
> src/mesa/drivers/dri/i965/gen6_gs_god.cpp | 776 ++++
> src/mesa/drivers/dri/i965/gen6_gs_god.h | 82 +
> src/mesa/drivers/dri/i965/gen6_gs_visitor.cpp | 776 ----
> src/mesa/drivers/dri/i965/gen6_gs_visitor.h | 82 -
> .../drivers/dri/i965/test_fs_cmod_propagation.cpp | 12 +-
> .../dri/i965/test_fs_saturate_propagation.cpp | 12 +-
> .../dri/i965/test_vec4_copy_propagation.cpp | 12 +-
> .../dri/i965/test_vec4_register_coalesce.cpp | 12 +-
> 55 files changed, 9978 insertions(+), 9978 deletions(-)
> create mode 100644 src/mesa/drivers/dri/i965/brw_fs_god.cpp
> delete mode 100644 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
> create mode 100644 src/mesa/drivers/dri/i965/brw_vec4_god.cpp
> create mode 100644 src/mesa/drivers/dri/i965/brw_vec4_gs_god.cpp
> create mode 100644 src/mesa/drivers/dri/i965/brw_vec4_gs_god.h
> delete mode 100644 src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp
> delete mode 100644 src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h
> delete mode 100644 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
> create mode 100644 src/mesa/drivers/dri/i965/brw_vec4_vs_god.cpp
> delete mode 100644 src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp
> create mode 100644 src/mesa/drivers/dri/i965/gen6_gs_god.cpp
> create mode 100644 src/mesa/drivers/dri/i965/gen6_gs_god.h
> delete mode 100644 src/mesa/drivers/dri/i965/gen6_gs_visitor.cpp
> delete mode 100644 src/mesa/drivers/dri/i965/gen6_gs_visitor.h
>
> diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
> index 498d5a7..82477c0 100644
> --- a/src/mesa/drivers/dri/i965/Makefile.sources
> +++ b/src/mesa/drivers/dri/i965/Makefile.sources
> @@ -57,7 +57,7 @@ i965_FILES = \
> brw_fs_saturate_propagation.cpp \
> brw_fs_sel_peephole.cpp \
> brw_fs_vector_splitting.cpp \
> - brw_fs_visitor.cpp \
> + brw_fs_god.cpp \
> brw_gs.c \
> brw_gs.h \
> brw_gs_state.c \
> @@ -112,15 +112,15 @@ i965_FILES = \
> brw_vec4_cse.cpp \
> brw_vec4_dead_code_eliminate.cpp \
> brw_vec4_generator.cpp \
> - brw_vec4_gs_visitor.cpp \
> - brw_vec4_gs_visitor.h \
> + brw_vec4_gs_god.cpp \
> + brw_vec4_gs_god.h \
> brw_vec4.h \
> brw_vec4_live_variables.cpp \
> brw_vec4_live_variables.h \
> brw_vec4_reg_allocate.cpp \
> - brw_vec4_visitor.cpp \
> + brw_vec4_god.cpp \
> brw_vec4_vp.cpp \
> - brw_vec4_vs_visitor.cpp \
> + brw_vec4_vs_god.cpp \
> brw_vs.c \
> brw_vs.h \
> brw_vs_state.c \
> @@ -137,8 +137,8 @@ i965_FILES = \
> gen6_depth_state.c \
> gen6_depthstencil.c \
> gen6_gs_state.c \
> - gen6_gs_visitor.cpp \
> - gen6_gs_visitor.h \
> + gen6_gs_god.cpp \
> + gen6_gs_god.h \
> gen6_multisample_state.c \
> gen6_queryobj.c \
> gen6_sampler_state.c \
> diff --git a/src/mesa/drivers/dri/i965/brw_cfg.cpp b/src/mesa/drivers/dri/i965/brw_cfg.cpp
> index 7e7770e..8eaf276 100644
> --- a/src/mesa/drivers/dri/i965/brw_cfg.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_cfg.cpp
> @@ -141,7 +141,7 @@ bblock_t::combine_with(bblock_t *that)
> }
>
> void
> -bblock_t::dump(backend_visitor *v) const
> +bblock_t::dump(backend_god *v) const
> {
> int ip = this->start_ip;
> foreach_inst_in_block(backend_instruction, inst, this) {
> @@ -411,7 +411,7 @@ cfg_t::make_block_array()
> }
>
> void
> -cfg_t::dump(backend_visitor *v)
> +cfg_t::dump(backend_god *v)
> {
> if (idom_dirty)
> calculate_idom();
> diff --git a/src/mesa/drivers/dri/i965/brw_cfg.h b/src/mesa/drivers/dri/i965/brw_cfg.h
> index 56d7d07..961876f 100644
> --- a/src/mesa/drivers/dri/i965/brw_cfg.h
> +++ b/src/mesa/drivers/dri/i965/brw_cfg.h
> @@ -60,7 +60,7 @@ struct bblock_t {
> bool is_successor_of(const bblock_t *block) const;
> bool can_combine_with(const bblock_t *that) const;
> void combine_with(bblock_t *that);
> - void dump(backend_visitor *v) const;
> + void dump(backend_god *v) const;
>
> backend_instruction *start();
> const backend_instruction *start() const;
> @@ -273,7 +273,7 @@ struct cfg_t {
> void calculate_idom();
> static bblock_t *intersect(bblock_t *b1, bblock_t *b2);
>
> - void dump(backend_visitor *v);
> + void dump(backend_god *v);
> void dump_cfg();
> void dump_domtree();
> #endif
> diff --git a/src/mesa/drivers/dri/i965/brw_dead_control_flow.cpp b/src/mesa/drivers/dri/i965/brw_dead_control_flow.cpp
> index 03f838d..256dee6 100644
> --- a/src/mesa/drivers/dri/i965/brw_dead_control_flow.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_dead_control_flow.cpp
> @@ -36,7 +36,7 @@
> * - if/else/endif
> */
> bool
> -dead_control_flow_eliminate(backend_visitor *v)
> +dead_control_flow_eliminate(backend_god *v)
This reminds me that we are still not handling the undead case. Oh
well, I guess that's a separate change.
UnReviewed-by: Jordan Justen <jordan.l.justen at intel.com>
More information about the mesa-dev
mailing list