[Mesa-dev] [PATCH 3/3] i965/fs: Remove force uncompressed stack.

[Jason Ekstrand]

Yes, please!  I can't really comment on patch 1, but 2 and 3 are
Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>

On Fri, Oct 31, 2014 at 12:05 PM, Matt Turner <mattst88 at gmail.com> wrote:

> Last use was in shader_time.
> ---
>  src/mesa/drivers/dri/i965/brw_fs.cpp         | 17 -----------------
>  src/mesa/drivers/dri/i965/brw_fs.h           |  5 -----
>  src/mesa/drivers/dri/i965/brw_fs_visitor.cpp |  5 -----
>  3 files changed, 27 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp
> b/src/mesa/drivers/dri/i965/brw_fs.cpp
> index e6b284b..500484c 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
> @@ -742,7 +742,6 @@ fs_visitor::emit_shader_time_end()
>     test->conditional_mod = BRW_CONDITIONAL_Z;
>     emit(IF(BRW_PREDICATE_NORMAL));
>
> -   push_force_uncompressed();
>     fs_reg start = shader_start_time;
>     start.negate = true;
>     fs_reg diff = fs_reg(GRF, virtual_grf_alloc(1), BRW_REGISTER_TYPE_UD,
> 1);
> @@ -759,8 +758,6 @@ fs_visitor::emit_shader_time_end()
>     emit(BRW_OPCODE_ELSE);
>     emit_shader_time_write(reset_type, fs_reg(1u));
>     emit(BRW_OPCODE_ENDIF);
> -
> -   pop_force_uncompressed();
>  }
>
>  void
> @@ -882,19 +879,6 @@ fs_visitor::emit(enum opcode opcode, const fs_reg
> &dst,
>     return emit(new(mem_ctx) fs_inst(opcode, dst, src, sources));
>  }
>
> -void
> -fs_visitor::push_force_uncompressed()
> -{
> -   force_uncompressed_stack++;
> -}
> -
> -void
> -fs_visitor::pop_force_uncompressed()
> -{
> -   force_uncompressed_stack--;
> -   assert(force_uncompressed_stack >= 0);
> -}
> -
>  /**
>   * Returns true if the instruction has a flag that means it won't
>   * update an entire destination register.
> @@ -3637,7 +3621,6 @@ fs_visitor::run()
>           }
>        }
>     }
> -   assert(force_uncompressed_stack == 0);
>
>     /* This must come after all optimization and register allocation, since
>      * it inserts dead code that happens to have side effects, and it does
> diff --git a/src/mesa/drivers/dri/i965/brw_fs.h
> b/src/mesa/drivers/dri/i965/brw_fs.h
> index 67956bc..d9150c3 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs.h
> +++ b/src/mesa/drivers/dri/i965/brw_fs.h
> @@ -453,9 +453,6 @@ public:
>     void lower_uniform_pull_constant_loads();
>     bool lower_load_payload();
>
> -   void push_force_uncompressed();
> -   void pop_force_uncompressed();
> -
>     void emit_dummy_fs();
>     void emit_repclear_shader();
>     fs_reg *emit_fragcoord_interpolation(ir_variable *ir);
> @@ -680,8 +677,6 @@ public:
>     bool spilled_any_registers;
>
>     const unsigned dispatch_width; /**< 8 or 16 */
> -
> -   int force_uncompressed_stack;
>  };
>
>  /**
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
> b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
> index 3fc9e39..4e1badd 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
> @@ -2921,9 +2921,6 @@ fs_visitor::emit_untyped_surface_read(unsigned
> surf_index, fs_reg dst,
>  fs_inst *
>  fs_visitor::emit(fs_inst *inst)
>  {
> -   if (force_uncompressed_stack > 0)
> -      inst->exec_size = 8;
> -
>     if (dispatch_width == 16 && inst->exec_size == 8)
>        inst->force_uncompressed = true;
>
> @@ -3469,8 +3466,6 @@ fs_visitor::init()
>     this->pull_constant_loc = NULL;
>     this->push_constant_loc = NULL;
>
> -   this->force_uncompressed_stack = 0;
> -
>     this->spilled_any_registers = false;
>     this->do_dual_src = false;
>
> --
> 2.0.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20141031/bc992568/attachment.html>