OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "intel/compiler: split is_partial_write() into two variants"

Browse Source 
This reverts commit 40b3abb4d1.

It is not clear that this commit was entirely correct, and unfortunately
it was pushed by error.

CC: Jason Ekstrand <jason@jlekstrand.net>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Juan A. Suarez Romero
2019-04-24 12:38:28 +02:00
parent b155f74d7b
commit b06ae53606
11 changed files with 30 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/intel/compiler/brw_fs.cpp
View File

@@ -734,33 +734,14 @@ fs_visitor::limit_dispatch_width(unsigned n, const char *msg)
* it.
*/
bool
fs_inst::is_partial_reg_write() const
fs_inst::is_partial_write() const
{
return ((this->predicate && this->opcode != BRW_OPCODE_SEL) ||
(this->exec_size * type_sz(this->dst.type)) < 32 ||
!this->dst.is_contiguous() ||
(this->exec_size * type_sz(this->dst.type)) < REG_SIZE ||
this->dst.offset % REG_SIZE != 0);
}
/**
* Returns true if the instruction has a flag that means it won't
* update an entire variable for the given dispatch width.
*
* This is only different from is_partial_reg_write() for SIMD8
* dispatches of 16-bit (or smaller) instructions.
*/
bool
fs_inst::is_partial_var_write(uint32_t dispatch_width) const
{
const uint32_t type_size = type_sz(this->dst.type);
uint32_t var_size = MIN2(REG_SIZE, dispatch_width * type_size);
return ((this->predicate && this->opcode != BRW_OPCODE_SEL) ||
!this->dst.is_contiguous() ||
(this->exec_size * type_sz(this->dst.type)) < var_size ||
this->dst.offset % var_size != 0);
}
unsigned
fs_inst::components_read(unsigned i) const
{
@@ -2943,7 +2924,7 @@ fs_visitor::opt_register_renaming()
if (depth == 0 &&
inst->dst.file == VGRF &&
alloc.sizes[inst->dst.nr] * REG_SIZE == inst->size_written &&
!inst->is_partial_reg_write()) {
!inst->is_partial_write()) {
if (remap[dst] == ~0u) {
remap[dst] = dst;
} else {
@@ -3147,7 +3128,7 @@ fs_visitor::compute_to_mrf()
next_ip++;
if (inst->opcode != BRW_OPCODE_MOV ||
inst->is_partial_reg_write() ||
inst->is_partial_write() ||
inst->dst.file != MRF || inst->src[0].file != VGRF ||
inst->dst.type != inst->src[0].type ||
inst->src[0].abs || inst->src[0].negate ||
@@ -3180,7 +3161,7 @@ fs_visitor::compute_to_mrf()
* that writes that reg, but it would require smarter
* tracking.
*/
if (scan_inst->is_partial_reg_write())
if (scan_inst->is_partial_write())
break;
/* Handling things not fully contained in the source of the copy
@@ -3498,7 +3479,7 @@ fs_visitor::remove_duplicate_mrf_writes()
if (inst->opcode == BRW_OPCODE_MOV &&
inst->dst.file == MRF &&
inst->src[0].file != ARF &&
!inst->is_partial_reg_write()) {
!inst->is_partial_write()) {
last_mrf_move[inst->dst.nr] = inst;
}
}

20
src/intel/compiler/brw_fs_cmod_propagation.cpp
View File

@@ -50,13 +50,13 @@
static bool
cmod_propagate_cmp_to_add(const gen_device_info *devinfo, bblock_t *block,
fs_inst *inst, unsigned dispatch_width)
fs_inst *inst)
{
bool read_flag = false;
foreach_inst_in_block_reverse_starting_from(fs_inst, scan_inst, inst) {
if (scan_inst->opcode == BRW_OPCODE_ADD &&
!scan_inst->is_partial_var_write(dispatch_width) &&
!scan_inst->is_partial_write() &&
scan_inst->exec_size == inst->exec_size) {
bool negate;
@@ -126,7 +126,7 @@ cmod_propagate_cmp_to_add(const gen_device_info *devinfo, bblock_t *block,
*/
static bool
cmod_propagate_not(const gen_device_info *devinfo, bblock_t *block,
fs_inst *inst, unsigned dispatch_width)
fs_inst *inst)
{
const enum brw_conditional_mod cond = brw_negate_cmod(inst->conditional_mod);
bool read_flag = false;
@@ -141,7 +141,7 @@ cmod_propagate_not(const gen_device_info *devinfo, bblock_t *block,
scan_inst->opcode != BRW_OPCODE_AND)
break;
if (scan_inst->is_partial_var_write(dispatch_width) ||
if (scan_inst->is_partial_write() ||
scan_inst->dst.offset != inst->src[0].offset ||
scan_inst->exec_size != inst->exec_size)
break;
@@ -166,9 +166,7 @@ cmod_propagate_not(const gen_device_info *devinfo, bblock_t *block,
}
static bool
opt_cmod_propagation_local(const gen_device_info *devinfo,
bblock_t *block,
unsigned dispatch_width)
opt_cmod_propagation_local(const gen_device_info *devinfo, bblock_t *block)
{
bool progress = false;
int ip = block->end_ip + 1;
@@ -221,14 +219,14 @@ opt_cmod_propagation_local(const gen_device_info *devinfo,
*/
if (inst->opcode == BRW_OPCODE_CMP && !inst->src[1].is_zero()) {
if (brw_reg_type_is_floating_point(inst->src[0].type) &&
cmod_propagate_cmp_to_add(devinfo, block, inst, dispatch_width))
cmod_propagate_cmp_to_add(devinfo, block, inst))
progress = true;
continue;
}
if (inst->opcode == BRW_OPCODE_NOT) {
progress = cmod_propagate_not(devinfo, block, inst, dispatch_width) || progress;
progress = cmod_propagate_not(devinfo, block, inst) || progress;
continue;
}
@@ -236,7 +234,7 @@ opt_cmod_propagation_local(const gen_device_info *devinfo,
foreach_inst_in_block_reverse_starting_from(fs_inst, scan_inst, inst) {
if (regions_overlap(scan_inst->dst, scan_inst->size_written,
inst->src[0], inst->size_read(0))) {
if (scan_inst->is_partial_var_write(dispatch_width) ||
if (scan_inst->is_partial_write() ||
scan_inst->dst.offset != inst->src[0].offset ||
scan_inst->exec_size != inst->exec_size)
break;
@@ -371,7 +369,7 @@ fs_visitor::opt_cmod_propagation()
bool progress = false;
foreach_block_reverse(block, cfg) {
progress = opt_cmod_propagation_local(devinfo, block, dispatch_width) || progress;
progress = opt_cmod_propagation_local(devinfo, block) || progress;
}
if (progress)

8
src/intel/compiler/brw_fs_copy_propagation.cpp
View File

@@ -515,7 +515,7 @@ fs_visitor::try_copy_propagate(fs_inst *inst, int arg, acp_entry *entry)
/* Compute the first component of the copy that the instruction is
* reading, and the base byte offset within that component.
*/
assert(entry->dst.stride == 1);
assert(entry->dst.offset % REG_SIZE == 0 && entry->dst.stride == 1);
const unsigned component = rel_offset / type_sz(entry->dst.type);
const unsigned suboffset = rel_offset % type_sz(entry->dst.type);
@@ -767,7 +767,7 @@ fs_visitor::try_constant_propagate(fs_inst *inst, acp_entry *entry)
}
static bool
can_propagate_from(fs_inst *inst, unsigned dispatch_width)
can_propagate_from(fs_inst *inst)
{
return (inst->opcode == BRW_OPCODE_MOV &&
inst->dst.file == VGRF &&
@@ -778,7 +778,7 @@ can_propagate_from(fs_inst *inst, unsigned dispatch_width)
inst->src[0].file == UNIFORM ||
inst->src[0].file == IMM) &&
inst->src[0].type == inst->dst.type &&
!inst->is_partial_var_write(dispatch_width));
!inst->is_partial_write());
}
/* Walks a basic block and does copy propagation on it using the acp
@@ -830,7 +830,7 @@ fs_visitor::opt_copy_propagation_local(void *copy_prop_ctx, bblock_t *block,
/* If this instruction's source could potentially be folded into the
* operand of another instruction, add it to the ACP.
*/
if (can_propagate_from(inst, dispatch_width)) {
if (can_propagate_from(inst)) {
acp_entry *entry = ralloc(copy_prop_ctx, acp_entry);
entry->dst = inst->dst;
entry->src = inst->src[0];

3
src/intel/compiler/brw_fs_cse.cpp
View File

@@ -252,8 +252,7 @@ fs_visitor::opt_cse_local(bblock_t *block)
int ip = block->start_ip;
foreach_inst_in_block(fs_inst, inst, block) {
/* Skip some cases. */
if (is_expression(this, inst) &&
!inst->is_partial_var_write(dispatch_width) &&
if (is_expression(this, inst) && !inst->is_partial_write() &&
((inst->dst.file != ARF && inst->dst.file != FIXED_GRF) ||
inst->dst.is_null()))
{

2
src/intel/compiler/brw_fs_dead_code_eliminate.cpp
View File

@@ -107,7 +107,7 @@ fs_visitor::dead_code_eliminate()
}
if (inst->dst.file == VGRF) {
if (!inst->is_partial_reg_write()) {
if (!inst->is_partial_write()) {
int var = live_intervals->var_from_reg(inst->dst);
for (unsigned i = 0; i < regs_written(inst); i++) {
BITSET_CLEAR(live, var + i);

2
src/intel/compiler/brw_fs_live_variables.cpp
View File

@@ -84,7 +84,7 @@ fs_live_variables::setup_one_write(struct block_data *bd, fs_inst *inst,
* screens off previous updates of that variable (VGRF channel).
*/
if (inst->dst.file == VGRF) {
if (!inst->is_partial_reg_write() && !BITSET_TEST(bd->use, var))
if (!inst->is_partial_write() && !BITSET_TEST(bd->use, var))
BITSET_SET(bd->def, var);
BITSET_SET(bd->defout, var);

2
src/intel/compiler/brw_fs_reg_allocate.cpp
View File

@@ -1066,7 +1066,7 @@ fs_visitor::spill_reg(unsigned spill_reg)
* write, there should be no need for the unspill since the
* instruction will be overwriting the whole destination in any case.
*/
if (inst->is_partial_reg_write() ||
if (inst->is_partial_write() ||
(!inst->force_writemask_all && !per_channel))
emit_unspill(ubld, spill_src, subset_spill_offset,
regs_written(inst));

2
src/intel/compiler/brw_fs_register_coalesce.cpp
View File

@@ -70,7 +70,7 @@ is_coalesce_candidate(const fs_visitor *v, const fs_inst *inst)
{
if ((inst->opcode != BRW_OPCODE_MOV &&
inst->opcode != SHADER_OPCODE_LOAD_PAYLOAD) ||
inst->is_partial_reg_write() ||
inst->is_partial_write() ||
inst->saturate ||
inst->src[0].file != VGRF ||
inst->src[0].negate ||

7
src/intel/compiler/brw_fs_saturate_propagation.cpp
View File

@@ -43,8 +43,7 @@
*/
static bool
opt_saturate_propagation_local(fs_visitor *v, bblock_t *block,
unsigned dispatch_width)
opt_saturate_propagation_local(fs_visitor *v, bblock_t *block)
{
bool progress = false;
int ip = block->end_ip + 1;
@@ -68,7 +67,7 @@ opt_saturate_propagation_local(fs_visitor *v, bblock_t *block,
if (scan_inst->exec_size == inst->exec_size &&
regions_overlap(scan_inst->dst, scan_inst->size_written,
inst->src[0], inst->size_read(0))) {
if (scan_inst->is_partial_var_write(dispatch_width) ||
if (scan_inst->is_partial_write() ||
(scan_inst->dst.type != inst->dst.type &&
!scan_inst->can_change_types()))
break;
@@ -155,7 +154,7 @@ fs_visitor::opt_saturate_propagation()
calculate_live_intervals();
foreach_block (block, cfg) {
progress = opt_saturate_propagation_local(this, block, dispatch_width) || progress;
progress = opt_saturate_propagation_local(this, block) || progress;
}
/* Live intervals are still valid. */

4
src/intel/compiler/brw_fs_sel_peephole.cpp
View File

@@ -167,8 +167,8 @@ fs_visitor::opt_peephole_sel()
then_mov[i]->exec_size != else_mov[i]->exec_size ||
then_mov[i]->group != else_mov[i]->group ||
then_mov[i]->force_writemask_all != else_mov[i]->force_writemask_all ||
then_mov[i]->is_partial_var_write(dispatch_width) ||
else_mov[i]->is_partial_var_write(dispatch_width) ||
then_mov[i]->is_partial_write() ||
else_mov[i]->is_partial_write() ||
then_mov[i]->conditional_mod != BRW_CONDITIONAL_NONE ||
else_mov[i]->conditional_mod != BRW_CONDITIONAL_NONE) {
movs = i;

3
src/intel/compiler/brw_ir_fs.h
View File

@@ -348,8 +348,7 @@ public:
void resize_sources(uint8_t num_sources);
bool is_send_from_grf() const;
bool is_partial_reg_write() const;
bool is_partial_var_write(unsigned dispatch_width) const;
bool is_partial_write() const;
bool is_copy_payload(const brw::simple_allocator &grf_alloc) const;
unsigned components_read(unsigned i) const;
unsigned size_read(int arg) const;