AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: Use local pointer to block_data in live intervals.

Browse Source 
The next patch will be simplified because of this, and makes reading the
code a lot easier.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Matt Turner
2014-10-29 13:35:16 -07:00
parent a50915984f
commit 13f6601585
5 changed files with 61 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i965/brw_fs_dead_code_eliminate.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ fs_visitor::dead_code_eliminate()
BITSET_WORD *live = ralloc_array(NULL, BITSET_WORD, BITSET_WORDS(num_vars));
foreach_block (block, cfg) {
memcpy(live, live_intervals->bd[block->num].liveout,
memcpy(live, live_intervals->block_data[block->num].liveout,
sizeof(BITSET_WORD) * BITSET_WORDS(num_vars));
foreach_inst_in_block_reverse(fs_inst, inst, block) {
src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp
+30 -24
View File
@@ -53,7 +53,7 @@ using namespace brw;
*/
void
fs_live_variables::setup_one_read(bblock_t *block, fs_inst *inst,
fs_live_variables::setup_one_read(struct block_data *bd, fs_inst *inst,
int ip, fs_reg reg)
{
int var = var_from_reg(&reg);
@@ -100,12 +100,12 @@ fs_live_variables::setup_one_read(bblock_t *block, fs_inst *inst,
* channel) without having completely defined that variable within the
* block.
*/
if (!BITSET_TEST(bd[block->num].def, var))
BITSET_SET(bd[block->num].use, var);
if (!BITSET_TEST(bd->def, var))
BITSET_SET(bd->use, var);
}
void
fs_live_variables::setup_one_write(bblock_t *block, fs_inst *inst,
fs_live_variables::setup_one_write(struct block_data *bd, fs_inst *inst,
int ip, fs_reg reg)
{
int var = var_from_reg(&reg);
@@ -118,8 +118,8 @@ fs_live_variables::setup_one_write(bblock_t *block, fs_inst *inst,
* screens off previous updates of that variable (VGRF channel).
*/
if (inst->dst.file == GRF && !inst->is_partial_write()) {
if (!BITSET_TEST(bd[block->num].use, var))
BITSET_SET(bd[block->num].def, var);
if (!BITSET_TEST(bd->use, var))
BITSET_SET(bd->def, var);
}
}
@@ -142,6 +142,8 @@ fs_live_variables::setup_def_use()
if (block->num > 0)
assert(cfg->blocks[block->num - 1]->end_ip == ip - 1);
struct block_data *bd = &block_data[block->num];
foreach_inst_in_block(fs_inst, inst, block) {
/* Set use[] for this instruction */
for (unsigned int i = 0; i < inst->sources; i++) {
@@ -151,7 +153,7 @@ fs_live_variables::setup_def_use()
continue;
for (int j = 0; j < inst->regs_read(v, i); j++) {
setup_one_read(block, inst, ip, reg);
setup_one_read(bd, inst, ip, reg);
reg.reg_offset++;
}
}
@@ -160,7 +162,7 @@ fs_live_variables::setup_def_use()
if (inst->dst.file == GRF) {
fs_reg reg = inst->dst;
for (int j = 0; j < inst->regs_written; j++) {
setup_one_write(block, inst, ip, reg);
setup_one_write(bd, inst, ip, reg);
reg.reg_offset++;
}
}
@@ -185,26 +187,28 @@ fs_live_variables::compute_live_variables()
cont = false;
foreach_block (block, cfg) {
struct block_data *bd = &block_data[block->num];
/* Update livein */
for (int i = 0; i < bitset_words; i++) {
BITSET_WORD new_livein = (bd[block->num].use[i] |
(bd[block->num].liveout[i] &
~bd[block->num].def[i]));
if (new_livein & ~bd[block->num].livein[i]) {
bd[block->num].livein[i] |= new_livein;
BITSET_WORD new_livein = (bd->use[i] |
(bd->liveout[i] &
~bd->def[i]));
if (new_livein & ~bd->livein[i]) {
bd->livein[i] |= new_livein;
cont = true;
}
}
/* Update liveout */
foreach_list_typed(bblock_link, child_link, link, &block->children) {
bblock_t *child = child_link->block;
struct block_data *child_bd = &block_data[child_link->block->num];
for (int i = 0; i < bitset_words; i++) {
BITSET_WORD new_liveout = (bd[child->num].livein[i] &
~bd[block->num].liveout[i]);
BITSET_WORD new_liveout = (child_bd->livein[i] &
~bd->liveout[i]);
if (new_liveout) {
bd[block->num].liveout[i] |= new_liveout;
bd->liveout[i] |= new_liveout;
cont = true;
}
}
@@ -221,13 +225,15 @@ void
fs_live_variables::compute_start_end()
{
foreach_block (block, cfg) {
struct block_data *bd = &block_data[block->num];
for (int i = 0; i < num_vars; i++) {
if (BITSET_TEST(bd[block->num].livein, i)) {
if (BITSET_TEST(bd->livein, i)) {
start[i] = MIN2(start[i], block->start_ip);
end[i] = MAX2(end[i], block->start_ip);
}
if (BITSET_TEST(bd[block->num].liveout, i)) {
if (BITSET_TEST(bd->liveout, i)) {
start[i] = MIN2(start[i], block->end_ip);
end[i] = MAX2(end[i], block->end_ip);
}
@@ -269,14 +275,14 @@ fs_live_variables::fs_live_variables(fs_visitor *v, const cfg_t *cfg)
end[i] = -1;
}
bd = rzalloc_array(mem_ctx, struct block_data, cfg->num_blocks);
block_data= rzalloc_array(mem_ctx, struct block_data, cfg->num_blocks);
bitset_words = BITSET_WORDS(num_vars);
for (int i = 0; i < cfg->num_blocks; i++) {
bd[i].def = rzalloc_array(mem_ctx, BITSET_WORD, bitset_words);
bd[i].use = rzalloc_array(mem_ctx, BITSET_WORD, bitset_words);
bd[i].livein = rzalloc_array(mem_ctx, BITSET_WORD, bitset_words);
bd[i].liveout = rzalloc_array(mem_ctx, BITSET_WORD, bitset_words);
block_data[i].def = rzalloc_array(mem_ctx, BITSET_WORD, bitset_words);
block_data[i].use = rzalloc_array(mem_ctx, BITSET_WORD, bitset_words);
block_data[i].livein = rzalloc_array(mem_ctx, BITSET_WORD, bitset_words);
block_data[i].liveout = rzalloc_array(mem_ctx, BITSET_WORD, bitset_words);
}
setup_def_use();
src/mesa/drivers/dri/i965/brw_fs_live_variables.h
+3 -3
View File
@@ -87,12 +87,12 @@ public:
/** @} */
/** Per-basic-block information on live variables */
struct block_data *bd;
struct block_data *block_data;
protected:
void setup_def_use();
void setup_one_read(bblock_t *block, fs_inst *inst, int ip, fs_reg reg);
void setup_one_write(bblock_t *block, fs_inst *inst, int ip, fs_reg reg);
void setup_one_read(struct block_data *bd, fs_inst *inst, int ip, fs_reg reg);
void setup_one_write(struct block_data *bd, fs_inst *inst, int ip, fs_reg reg);
void compute_live_variables();
void compute_start_end();
src/mesa/drivers/dri/i965/brw_vec4_live_variables.cpp
+26 -20
View File
@@ -71,6 +71,8 @@ vec4_live_variables::setup_def_use()
assert(cfg->blocks[block->num - 1]->end_ip == ip - 1);
foreach_inst_in_block(vec4_instruction, inst, block) {
struct block_data *bd = &block_data[block->num];
/* Set use[] for this instruction */
for (unsigned int i = 0; i < 3; i++) {
if (inst->src[i].file == GRF) {
@@ -78,8 +80,8 @@ vec4_live_variables::setup_def_use()
for (int j = 0; j < 4; j++) {
int c = BRW_GET_SWZ(inst->src[i].swizzle, j);
if (!BITSET_TEST(bd[block->num].def, reg * 4 + c))
BITSET_SET(bd[block->num].use, reg * 4 + c);
if (!BITSET_TEST(bd->def, reg * 4 + c))
BITSET_SET(bd->use, reg * 4 + c);
}
}
}
@@ -94,8 +96,8 @@ vec4_live_variables::setup_def_use()
for (int c = 0; c < 4; c++) {
if (inst->dst.writemask & (1 << c)) {
int reg = inst->dst.reg;
if (!BITSET_TEST(bd[block->num].use, reg * 4 + c))
BITSET_SET(bd[block->num].def, reg * 4 + c);
if (!BITSET_TEST(bd->use, reg * 4 + c))
BITSET_SET(bd->def, reg * 4 + c);
}
}
}
@@ -120,26 +122,28 @@ vec4_live_variables::compute_live_variables()
cont = false;
foreach_block (block, cfg) {
struct block_data *bd = &block_data[block->num];
/* Update livein */
for (int i = 0; i < bitset_words; i++) {
BITSET_WORD new_livein = (bd[block->num].use[i] |
(bd[block->num].liveout[i] &
~bd[block->num].def[i]));
if (new_livein & ~bd[block->num].livein[i]) {
bd[block->num].livein[i] |= new_livein;
BITSET_WORD new_livein = (bd->use[i] |
(bd->liveout[i] &
~bd->def[i]));
if (new_livein & ~bd->livein[i]) {
bd->livein[i] |= new_livein;
cont = true;
}
}
/* Update liveout */
foreach_list_typed(bblock_link, child_link, link, &block->children) {
bblock_t *child = child_link->block;
struct block_data *child_bd = &block_data[child_link->block->num];
for (int i = 0; i < bitset_words; i++) {
BITSET_WORD new_liveout = (bd[child->num].livein[i] &
~bd[block->num].liveout[i]);
BITSET_WORD new_liveout = (child_bd->livein[i] &
~bd->liveout[i]);
if (new_liveout) {
bd[block->num].liveout[i] |= new_liveout;
bd->liveout[i] |= new_liveout;
cont = true;
}
}
@@ -154,14 +158,14 @@ vec4_live_variables::vec4_live_variables(vec4_visitor *v, cfg_t *cfg)
mem_ctx = ralloc_context(NULL);
num_vars = v->virtual_grf_count * 4;
bd = rzalloc_array(mem_ctx, struct block_data, cfg->num_blocks);
block_data = rzalloc_array(mem_ctx, struct block_data, cfg->num_blocks);
bitset_words = BITSET_WORDS(num_vars);
for (int i = 0; i < cfg->num_blocks; i++) {
bd[i].def = rzalloc_array(mem_ctx, BITSET_WORD, bitset_words);
bd[i].use = rzalloc_array(mem_ctx, BITSET_WORD, bitset_words);
bd[i].livein = rzalloc_array(mem_ctx, BITSET_WORD, bitset_words);
bd[i].liveout = rzalloc_array(mem_ctx, BITSET_WORD, bitset_words);
block_data[i].def = rzalloc_array(mem_ctx, BITSET_WORD, bitset_words);
block_data[i].use = rzalloc_array(mem_ctx, BITSET_WORD, bitset_words);
block_data[i].livein = rzalloc_array(mem_ctx, BITSET_WORD, bitset_words);
block_data[i].liveout = rzalloc_array(mem_ctx, BITSET_WORD, bitset_words);
}
setup_def_use();
@@ -250,13 +254,15 @@ vec4_visitor::calculate_live_intervals()
this->live_intervals = new(mem_ctx) vec4_live_variables(this, cfg);
foreach_block (block, cfg) {
struct block_data *bd = &live_intervals->block_data[block->num];
for (int i = 0; i < live_intervals->num_vars; i++) {
if (BITSET_TEST(live_intervals->bd[block->num].livein, i)) {
if (BITSET_TEST(bd->livein, i)) {
start[i] = MIN2(start[i], block->start_ip);
end[i] = MAX2(end[i], block->start_ip);
}
if (BITSET_TEST(live_intervals->bd[block->num].liveout, i)) {
if (BITSET_TEST(bd->liveout, i)) {
start[i] = MIN2(start[i], block->end_ip);
end[i] = MAX2(end[i], block->end_ip);
}
src/mesa/drivers/dri/i965/brw_vec4_live_variables.h
+1 -1
View File
@@ -62,7 +62,7 @@ public:
int bitset_words;
/** Per-basic-block information on live variables */
struct block_data *bd;
struct block_data *block_data;
protected:
void setup_def_use();