fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-31 01:10:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Add and use foreach_inst_in_block macros.

Browse source 
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Matt Turner 2014-06-24 12:42:00 -07:00
parent e8e5f0a342
commit bc2fbbafd2
7 changed files with 17 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mesa/drivers/dri/i965/brw_cfg.h
View file

@ -105,4 +105,14 @@ public:
};
#endif
#define foreach_inst_in_block(__type, __inst, __block) \
for (__type *__inst = (__type *)__block->start; \
__inst != __block->end->next; \
__inst = (__type *)__inst->next)
#define foreach_inst_in_block_reverse(__type, __inst, __block) \
for (__type *__inst = (__type *)__block->end; \
__inst != __block->start->prev; \
__inst = (__type *)__inst->prev)
#endif /* BRW_CFG_H */

9
src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
View file

@ -157,9 +157,7 @@ fs_copy_prop_dataflow::setup_initial_values()
for (int b = 0; b < cfg->num_blocks; b++) {
bblock_t *block = cfg->blocks[b];
for (fs_inst *inst = (fs_inst *)block->start;
inst != block->end->next;
inst = (fs_inst *)inst->next) {
foreach_inst_in_block(fs_inst, inst, block) {
if (inst->dst.file != GRF)
continue;
@ -532,10 +530,7 @@ fs_visitor::opt_copy_propagate_local(void *copy_prop_ctx, bblock_t *block,
{
bool progress = false;
for (fs_inst *inst = (fs_inst *)block->start;
inst != block->end->next;
inst = (fs_inst *)inst->next) {
foreach_inst_in_block(fs_inst, inst, block) {
/* Try propagating into this instruction. */
for (int i = 0; i < inst->sources; i++) {
if (inst->src[i].file != GRF)

5
src/mesa/drivers/dri/i965/brw_fs_cse.cpp
View file

@ -173,10 +173,7 @@ fs_visitor::opt_cse_local(bblock_t *block, exec_list *aeb)
void *cse_ctx = ralloc_context(NULL);
int ip = block->start_ip;
for (fs_inst *inst = (fs_inst *)block->start;
inst != block->end->next;
inst = (fs_inst *) inst->next) {
foreach_inst_in_block(fs_inst, inst, block) {
/* Skip some cases. */
if (is_expression(inst) && !inst->is_partial_write() &&
(inst->dst.file != HW_REG || inst->dst.is_null()))

4
src/mesa/drivers/dri/i965/brw_fs_dead_code_eliminate.cpp
View file

@ -51,9 +51,7 @@ fs_visitor::dead_code_eliminate()
memcpy(live, live_intervals->bd[b].liveout,
sizeof(BITSET_WORD) * BITSET_WORDS(num_vars));
for (fs_inst *inst = (fs_inst *)block->end;
inst != block->start->prev;
inst = (fs_inst *)inst->prev) {
foreach_inst_in_block_reverse(fs_inst, inst, block) {
if (inst->dst.file == GRF &&
!inst->has_side_effects() &&
!inst->writes_flag()) {

5
src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp
View file

@ -144,10 +144,7 @@ fs_live_variables::setup_def_use()
if (b > 0)
assert(cfg->blocks[b - 1]->end_ip == ip - 1);
for (fs_inst *inst = (fs_inst *)block->start;
inst != block->end->next;
inst = (fs_inst *)inst->next) {
foreach_inst_in_block(fs_inst, inst, block) {
/* Set use[] for this instruction */
for (unsigned int i = 0; i < inst->sources; i++) {
fs_reg reg = inst->src[i];

4
src/mesa/drivers/dri/i965/brw_fs_saturate_propagation.cpp
View file

@ -34,9 +34,7 @@ opt_saturate_propagation_local(fs_visitor *v, bblock_t *block)
bool progress = false;
int ip = block->start_ip - 1;
for (fs_inst *inst = (fs_inst *)block->start;
inst != block->end->next;
inst = (fs_inst *) inst->next) {
foreach_inst_in_block(fs_inst, inst, block) {
ip++;
if (inst->opcode != BRW_OPCODE_MOV ||

5
src/mesa/drivers/dri/i965/brw_vec4_live_variables.cpp
View file

@ -72,10 +72,7 @@ vec4_live_variables::setup_def_use()
if (b > 0)
assert(cfg->blocks[b - 1]->end_ip == ip - 1);
for (vec4_instruction *inst = (vec4_instruction *)block->start;
inst != block->end->next;
inst = (vec4_instruction *)inst->next) {
foreach_inst_in_block(vec4_instruction, inst, block) {
/* Set use[] for this instruction */
for (unsigned int i = 0; i < 3; i++) {
if (inst->src[i].file == GRF) {