fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-20 18:30:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel/compiler: Sort lists of succs and preds in CFG dump output

Browse source 
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25216>
This commit is contained in:
Caio Oliveira 2023-11-04 00:44:49 -07:00 • committed by Marge Bot
parent 47c5656f0e
commit 0b072c5351
1 changed files with 53 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/intel/compiler/brw_cfg.cpp
View file

@ -26,6 +26,7 @@
*/
#include "brw_cfg.h"
#include "util/u_dynarray.h"
#include "brw_shader.h"
/** @file brw_cfg.cpp
@ -577,11 +578,53 @@ cfg_t::make_block_array()
assert(i == num_blocks);
}
namespace {
struct link_desc {
char kind;
int num;
};
int
compare_link_desc(const void *a, const void *b)
{
const link_desc *la = (const link_desc *)a;
const link_desc *lb = (const link_desc *)b;
return la->num < lb->num ? -1 :
la->num > lb->num ? +1 :
la->kind < lb->kind ? -1 :
la->kind > lb->kind ? +1 :
0;
}
void
sort_links(util_dynarray *scratch, exec_list *list)
{
util_dynarray_clear(scratch);
foreach_list_typed(bblock_link, link, link, list) {
link_desc l;
l.kind = link->kind == bblock_link_logical ? '-' : '~';
l.num = link->block->num;
util_dynarray_append(scratch, link_desc, l);
}
qsort(scratch->data, util_dynarray_num_elements(scratch, link_desc),
sizeof(link_desc), compare_link_desc);
}
} /* namespace */
void
cfg_t::dump(FILE *file)
{
const idom_tree *idom = (s ? &s->idom_analysis.require() : NULL);
/* Temporary storage to sort the lists of blocks. This normalizes the
* output, making it possible to use it for certain tests.
*/
util_dynarray scratch;
util_dynarray_init(&scratch, NULL);
foreach_block (block, this) {
if (idom && idom->parent(block))
fprintf(file, "START B%d IDOM(B%d)", block->num,
@ -589,22 +632,22 @@ cfg_t::dump(FILE *file)
else
fprintf(file, "START B%d IDOM(none)", block->num);
foreach_list_typed(bblock_link, link, link, &block->parents) {
fprintf(file, " <%cB%d",
link->kind == bblock_link_logical ? '-' : '~',
link->block->num);
}
sort_links(&scratch, &block->parents);
util_dynarray_foreach(&scratch, link_desc, l)
fprintf(file, " <%cB%d", l->kind, l->num);
fprintf(file, "\n");
if (s != NULL)
block->dump(file);
fprintf(file, "END B%d", block->num);
foreach_list_typed(bblock_link, link, link, &block->children) {
fprintf(file, " %c>B%d",
link->kind == bblock_link_logical ? '-' : '~',
link->block->num);
}
sort_links(&scratch, &block->children);
util_dynarray_foreach(&scratch, link_desc, l)
fprintf(file, " %c>B%d", l->kind, l->num);
fprintf(file, "\n");
}
util_dynarray_fini(&scratch);
}
/* Calculates the immediate dominator of each block, according to "A Simple,