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

brw: Add devinfo parameter to fs_inst::regs_read

Browse Source 
This isn't used now, but future commits will add uses. Doing this as a
separate commit removes a lot of "just typing" churn from commits that
have real changes to review.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29884>
This commit is contained in:
Ian Romanick
2024-06-19 10:50:51 -07:00
parent e129d242f6
commit ef3dc401da
19 changed files with 85 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/intel/compiler/brw_schedule_instructions.cpp
+7 -7
View File
@@ -800,7 +800,7 @@ instruction_scheduler::count_reads_remaining(const fs_inst *inst)
if (inst->src[i].nr >= hw_reg_count)
continue;
for (unsigned j = 0; j < regs_read(inst, i); j++)
for (unsigned j = 0; j < regs_read(s->devinfo, inst, i); j++)
hw_reads_remaining[inst->src[i].nr + j]++;
}
}
@@ -881,7 +881,7 @@ instruction_scheduler::update_register_pressure(const fs_inst *inst)
reads_remaining[inst->src[i].nr]--;
} else if (inst->src[i].file == FIXED_GRF &&
inst->src[i].nr < hw_reg_count) {
for (unsigned off = 0; off < regs_read(inst, i); off++)
for (unsigned off = 0; off < regs_read(s->devinfo, inst, i); off++)
hw_reads_remaining[inst->src[i].nr + off]--;
}
}
@@ -910,7 +910,7 @@ instruction_scheduler::get_register_pressure_benefit(const fs_inst *inst)
if (inst->src[i].file == FIXED_GRF &&
inst->src[i].nr < hw_reg_count) {
for (unsigned off = 0; off < regs_read(inst, i); off++) {
for (unsigned off = 0; off < regs_read(s->devinfo, inst, i); off++) {
int reg = inst->src[i].nr + off;
if (!BITSET_TEST(hw_liveout[block_idx], reg) &&
hw_reads_remaining[reg] == 1) {
@@ -1212,11 +1212,11 @@ instruction_scheduler::calculate_deps()
/* read-after-write deps. */
for (int i = 0; i < inst->sources; i++) {
if (inst->src[i].file == VGRF) {
for (unsigned r = 0; r < regs_read(inst, i); r++)
for (unsigned r = 0; r < regs_read(s->devinfo, inst, i); r++)
add_dep(last_grf_write[grf_index(inst->src[i]) + r], n);
} else if (inst->src[i].file == FIXED_GRF) {
if (post_reg_alloc) {
for (unsigned r = 0; r < regs_read(inst, i); r++)
for (unsigned r = 0; r < regs_read(s->devinfo, inst, i); r++)
add_dep(last_grf_write[inst->src[i].nr + r], n);
} else {
add_dep(last_fixed_grf_write, n);
@@ -1297,11 +1297,11 @@ instruction_scheduler::calculate_deps()
/* write-after-read deps. */
for (int i = 0; i < inst->sources; i++) {
if (inst->src[i].file == VGRF) {
for (unsigned r = 0; r < regs_read(inst, i); r++)
for (unsigned r = 0; r < regs_read(s->devinfo, inst, i); r++)
add_dep(n, last_grf_write[grf_index(inst->src[i]) + r], 0);
} else if (inst->src[i].file == FIXED_GRF) {
if (post_reg_alloc) {
for (unsigned r = 0; r < regs_read(inst, i); r++)
for (unsigned r = 0; r < regs_read(s->devinfo, inst, i); r++)
add_dep(n, last_grf_write[inst->src[i].nr + r], 0);
} else {
add_dep(n, last_fixed_grf_write, 0);