summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2015-03-24 15:06:24 -0700
committerJason Ekstrand <jason.ekstrand@intel.com>2015-05-06 10:29:29 -0700
commita9ccb14d141de57487933d9535479acd3612aa9e (patch)
tree4b7129c7c02908b2bf0c9cfdc874ca282a5e73a4 /src/mesa
parentcf4607e85339c3cfd6ab5fd4a28985c9fafb0b86 (diff)
downloadexternal_mesa3d-a9ccb14d141de57487933d9535479acd3612aa9e.zip
external_mesa3d-a9ccb14d141de57487933d9535479acd3612aa9e.tar.gz
external_mesa3d-a9ccb14d141de57487933d9535479acd3612aa9e.tar.bz2
i965/fs_cse: Factor out code to create copy instructions
v2: Get rid of the block parameter and make src a const reference Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_cse.cpp75
1 files changed, 38 insertions, 37 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_cse.cpp b/src/mesa/drivers/dri/i965/brw_fs_cse.cpp
index 43370cb..9c4ed0b 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_cse.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_cse.cpp
@@ -185,6 +185,29 @@ instructions_match(fs_inst *a, fs_inst *b, bool *negate)
operands_match(a, b, negate);
}
+static fs_inst *
+create_copy_instr(fs_visitor *v, fs_inst *inst, fs_reg src, bool negate)
+{
+ int written = inst->regs_written;
+ int dst_width = inst->dst.width / 8;
+ fs_reg dst = inst->dst;
+ fs_inst *copy;
+
+ if (written > dst_width) {
+ fs_reg *sources = ralloc_array(v->mem_ctx, fs_reg, written / dst_width);
+ for (int i = 0; i < written / dst_width; i++)
+ sources[i] = offset(src, i);
+ copy = v->LOAD_PAYLOAD(dst, sources, written / dst_width);
+ } else {
+ copy = v->MOV(dst, src);
+ copy->force_writemask_all = inst->force_writemask_all;
+ copy->src[0].negate = negate;
+ }
+ assert(copy->regs_written == written);
+
+ return copy;
+}
+
bool
fs_visitor::opt_cse_local(bblock_t *block)
{
@@ -230,49 +253,27 @@ fs_visitor::opt_cse_local(bblock_t *block)
bool no_existing_temp = entry->tmp.file == BAD_FILE;
if (no_existing_temp && !entry->generator->dst.is_null()) {
int written = entry->generator->regs_written;
- int dst_width = entry->generator->dst.width / 8;
- assert(written % dst_width == 0);
-
- fs_reg orig_dst = entry->generator->dst;
- fs_reg tmp = fs_reg(GRF, alloc.allocate(written),
- orig_dst.type, orig_dst.width);
- entry->tmp = tmp;
- entry->generator->dst = tmp;
-
- fs_inst *copy;
- if (written > dst_width) {
- fs_reg *sources = ralloc_array(mem_ctx, fs_reg, written / dst_width);
- for (int i = 0; i < written / dst_width; i++)
- sources[i] = offset(tmp, i);
- copy = LOAD_PAYLOAD(orig_dst, sources, written / dst_width);
- } else {
- copy = MOV(orig_dst, tmp);
- copy->force_writemask_all =
- entry->generator->force_writemask_all;
- }
+ assert((written * 8) % entry->generator->dst.width == 0);
+
+ entry->tmp = fs_reg(GRF, alloc.allocate(written),
+ entry->generator->dst.type,
+ entry->generator->dst.width);
+
+ fs_inst *copy = create_copy_instr(this, entry->generator,
+ entry->tmp, false);
entry->generator->insert_after(block, copy);
+
+ entry->generator->dst = entry->tmp;
}
/* dest <- temp */
if (!inst->dst.is_null()) {
- int written = inst->regs_written;
- int dst_width = inst->dst.width / 8;
- assert(written == entry->generator->regs_written);
- assert(dst_width == entry->generator->dst.width / 8);
+ assert(inst->regs_written == entry->generator->regs_written);
+ assert(inst->dst.width == entry->generator->dst.width);
assert(inst->dst.type == entry->tmp.type);
- fs_reg dst = inst->dst;
- fs_reg tmp = entry->tmp;
- fs_inst *copy;
- if (written > dst_width) {
- fs_reg *sources = ralloc_array(mem_ctx, fs_reg, written / dst_width);
- for (int i = 0; i < written / dst_width; i++)
- sources[i] = offset(tmp, i);
- copy = LOAD_PAYLOAD(dst, sources, written / dst_width);
- } else {
- copy = MOV(dst, tmp);
- copy->force_writemask_all = inst->force_writemask_all;
- copy->src[0].negate = negate;
- }
+
+ fs_inst *copy = create_copy_instr(this, inst,
+ entry->tmp, negate);
inst->insert_before(block, copy);
}