diff options
| author | Christoph Bumiller <[email protected]> | 2011-02-13 00:17:43 +0100 |
|---|---|---|
| committer | Christoph Bumiller <[email protected]> | 2011-02-16 15:45:30 +0100 |
| commit | a24e9bd497d54a373b021370f90144596a37945b (patch) | |
| tree | f011cde7b0f148e9b79d55a2458397b46cba815c /src | |
| parent | 80a7ae3cc5735b7615c049425b306a53662740a9 (diff) | |
nvc0: clone memory values with multiple refs before modifying them
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/nvc0/nvc0_pc_optimize.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gallium/drivers/nvc0/nvc0_pc_optimize.c b/src/gallium/drivers/nvc0/nvc0_pc_optimize.c index 9a7094e5d3c..53010f8bd50 100644 --- a/src/gallium/drivers/nvc0/nvc0_pc_optimize.c +++ b/src/gallium/drivers/nvc0/nvc0_pc_optimize.c @@ -732,7 +732,8 @@ struct pass_reld_elim { * The two loads may not overlap but reference adjacent memory locations. */ static void -combine_load(struct mem_record *rec, struct nv_instruction *ld) +combine_load(struct nv_pc *pc, struct mem_record *rec, + struct nv_instruction *ld) { struct nv_instruction *fv = rec->insn; struct nv_value *mem = ld->src[0]->value; @@ -760,6 +761,8 @@ combine_load(struct mem_record *rec, struct nv_instruction *ld) fv->def[d++]->insn = fv; } + if (fv->src[0]->value->refc > 1) + nv_reference(pc, fv, 0, new_value_like(pc, fv->src[0]->value)); fv->src[0]->value->reg.address = rec->ofst; fv->src[0]->value->reg.size = rec->size = size; @@ -841,7 +844,7 @@ nv_pass_mem_opt(struct pass_reld_elim *ctx, struct nv_basic_block *b) switch (ld->opcode) { case NV_OP_EXPORT: combine_export(it, ld); break; default: - combine_load(it, ld); + combine_load(ctx->pc, it, ld); break; } } else |