fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 19:58:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

freedreno/ir3/ra: make use()/def() functions instead of macros

Browse source 
Originally these were nested functions, which worked nicely, giving us
the function of a local macro that was actual 'c' syntax (ie. not token
pasted macro).  But these were converted to macros because clang doesn't
let us have nice gcc extensions.

Extract these back out into functions, before adding more things and
making the macros even more cumbersome.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3569>
This commit is contained in:
Rob Clark 2019-10-22 16:05:41 -07:00 • committed by Marge Bot
parent a5f24f966a
commit 9a9f78f1f9
1 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/freedreno/ir3/ir3_ra.c
View file

@ -669,27 +669,36 @@ ra_destroy(struct ir3_ra_ctx *ctx)
ralloc_free(ctx->g);
}
static void
__def(struct ir3_ra_ctx *ctx, struct ir3_ra_block_data *bd, unsigned name,
struct ir3_instruction *instr)
{
debug_assert(name < ctx->alloc_count);
/* defined on first write: */
if (!ctx->def[name])
ctx->def[name] = instr->ip;
ctx->use[name] = instr->ip;
BITSET_SET(bd->def, name);
}
static void
__use(struct ir3_ra_ctx *ctx, struct ir3_ra_block_data *bd, unsigned name,
struct ir3_instruction *instr)
{
debug_assert(name < ctx->alloc_count);
ctx->use[name] = MAX2(ctx->use[name], instr->ip);
if (!BITSET_TEST(bd->def, name))
BITSET_SET(bd->use, name);
}
static void
ra_block_compute_live_ranges(struct ir3_ra_ctx *ctx, struct ir3_block *block)
{
struct ir3_ra_block_data *bd;
unsigned bitset_words = BITSET_WORDS(ctx->alloc_count);
#define def(name, instr) \
do { \
/* defined on first write: */ \
if (!ctx->def[name]) \
ctx->def[name] = instr->ip; \
ctx->use[name] = instr->ip; \
BITSET_SET(bd->def, name); \
} while(0);
#define use(name, instr) \
do { \
ctx->use[name] = MAX2(ctx->use[name], instr->ip); \
if (!BITSET_TEST(bd->def, name)) \
BITSET_SET(bd->use, name); \
} while(0);
#define def(name, instr) __def(ctx, bd, name, instr)
#define use(name, instr) __use(ctx, bd, name, instr)
bd = rzalloc(ctx->g, struct ir3_ra_block_data);