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

pan/midgard: Add predicate->exclude

Browse Source 
A bit of a kludge but allows setting an implicit dependency of synthetic
conditional moves on the actual condition, fixing code generated like:

   vmul.feq r0, ..
   sadd.imov r31, .., r0
   vadd.fcsel [...]

The imov runs simultaneous with feq so it gets garbage results, but it's
too late to add an actual dependency practically speaking, since the new
synthetic imov doesn't have a node associated.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
This commit is contained in:
Alyssa Rosenzweig
2019-09-27 15:43:18 -04:00
parent 6284f3ec25
commit 5a9a48b81a
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/panfrost/midgard/midgard_schedule.c
View File

@@ -827,6 +827,9 @@ struct midgard_predicate {
uint8_t *constants; uint8_t *constants;
unsigned constant_count; unsigned constant_count;
bool blend_constant; bool blend_constant;
/* Exclude this destination (if not ~0) */
unsigned exclude;
}; };
/* For an instruction that can fit, adjust it to fit and update the constants /* For an instruction that can fit, adjust it to fit and update the constants
@@ -893,6 +896,9 @@ mir_choose_instruction(
if (tag != ~0 && instructions[i]->type != tag) if (tag != ~0 && instructions[i]->type != tag)
continue; continue;
if (predicate->exclude != ~0 && instructions[i]->dest == predicate->exclude)
continue;
/* Simulate in-order scheduling */ /* Simulate in-order scheduling */
if ((signed) i < best_index) if ((signed) i < best_index)
continue; continue;
@@ -930,7 +936,8 @@ mir_choose_bundle(
struct midgard_predicate predicate = { struct midgard_predicate predicate = {
.tag = ~0, .tag = ~0,
.destructive = false .destructive = false,
.exclude = ~0
}; };
midgard_instruction *chosen = mir_choose_instruction(instructions, worklist, count, &predicate); midgard_instruction *chosen = mir_choose_instruction(instructions, worklist, count, &predicate);
@@ -950,7 +957,8 @@ mir_schedule_texture(
{ {
struct midgard_predicate predicate = { struct midgard_predicate predicate = {
.tag = TAG_TEXTURE_4, .tag = TAG_TEXTURE_4,
.destructive = true .destructive = true,
.exclude = ~0
}; };
midgard_instruction *ins = midgard_instruction *ins =
@@ -974,7 +982,8 @@ mir_schedule_ldst(
{ {
struct midgard_predicate predicate = { struct midgard_predicate predicate = {
.tag = TAG_LOAD_STORE_4, .tag = TAG_LOAD_STORE_4,
.destructive = true .destructive = true,
.exclude = ~0
}; };
midgard_instruction *ins = midgard_instruction *ins =
@@ -1003,7 +1012,8 @@ mir_schedule_alu(
struct midgard_predicate predicate = { struct midgard_predicate predicate = {
.tag = TAG_ALU_4, .tag = TAG_ALU_4,
.destructive = true .destructive = true,
.exclude = ~0
}; };
midgard_instruction *ins = midgard_instruction *ins =