On Friday, April 29, 2016 1:29:26 PM PDT Samuel Iglesias Gonsálvez wrote:
> From: Connor Abbott <cwabbo...@gmail.com>
>
> ---
> src/mesa/drivers/dri/i965/Makefile.sources | 1 +
> src/mesa/drivers/dri/i965/brw_fs.cpp | 5 +++
> src/mesa/drivers/dri/i965/brw_fs.h | 1 +
> src/mesa/drivers/dri/i965/brw_fs_lower_pack.cpp | 59 ++++++++++++++++++++++
+++
> 4 files changed, 66 insertions(+)
> create mode 100644 src/mesa/drivers/dri/i965/brw_fs_lower_pack.cpp
>
> diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/
dri/i965/Makefile.sources
> index 441d727..2b2a51d 100644
> --- a/src/mesa/drivers/dri/i965/Makefile.sources
> +++ b/src/mesa/drivers/dri/i965/Makefile.sources
> @@ -26,6 +26,7 @@ i965_compiler_FILES = \
> brw_fs.h \
> brw_fs_live_variables.cpp \
> brw_fs_live_variables.h \
> + brw_fs_lower_pack.cpp \
> brw_fs_nir.cpp \
> brw_fs_reg_allocate.cpp \
> brw_fs_register_coalesce.cpp \
> diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/
i965/brw_fs.cpp
> index 3d6ee44..e9fd251 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
> @@ -5341,6 +5341,11 @@ fs_visitor::optimize()
> OPT(dead_code_eliminate);
> }
>
> + if (OPT(lower_pack)) {
> + OPT(register_coalesce);
> + OPT(dead_code_eliminate);
> + }
> +
> OPT(opt_combine_constants);
> OPT(lower_integer_multiplication);
>
> diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/
brw_fs.h
> index a5c3297..08f27e4 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs.h
> +++ b/src/mesa/drivers/dri/i965/brw_fs.h
> @@ -174,6 +174,7 @@ public:
> void no16(const char *msg);
> void lower_uniform_pull_constant_loads();
> bool lower_load_payload();
> + bool lower_pack();
> bool lower_logical_sends();
> bool lower_integer_multiplication();
> bool lower_minmax();
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_lower_pack.cpp b/src/mesa/
drivers/dri/i965/brw_fs_lower_pack.cpp
> new file mode 100644
> index 0000000..39ed401
> --- /dev/null
> +++ b/src/mesa/drivers/dri/i965/brw_fs_lower_pack.cpp
> @@ -0,0 +1,59 @@
> +/*
> + * Copyright © 2015 Connor Abbott
> + *
> + * 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 "brw_fs.h"
> +#include "brw_cfg.h"
> +#include "brw_fs_builder.h"
> +
> +using namespace brw;
> +
> +bool
> +fs_visitor::lower_pack()
> +{
> + bool progress = false;
> +
> + foreach_block_and_inst_safe(block, fs_inst, inst, cfg) {
> + if (inst->opcode != FS_OPCODE_PACK)
> + continue;
> +
> + assert(inst->dst.file == VGRF);
> + assert(inst->saturate == false);
> + fs_reg dst = inst->dst;
> +
> + const fs_builder ibld(this, block, inst);
> +
> + for (unsigned i = 0; i < inst->sources; i++) {
> + ibld.MOV(stride(horiz_offset(retype(dst, inst->src[i].type), i),
> + inst->sources),
Will this work properly for UNIFORMs? I'm not sure horiz_offset does
what you want. It says:
case UNIFORM:
case IMM:
/* These only have a single component that is implicitly splatted. A
* horizontal offset should be a harmless no-op.
*/
break;
But it looks here like you're trying to use horiz_offset to access the
first and second 32-bit components of a 64-bit double float.
I have the same concern on the next patch.
Also, are immediates allowed? If not, maybe add an assert?
> + inst->src[i]);
> + }
> +
> + inst->remove(block);
> + progress = true;
> + }
> +
> + if (progress)
> + invalidate_live_intervals();
> +
> + return progress;
> +}
>
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
