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

agx: move spill/fills accounting to shaderdb

Browse source 
don't bother the compiler proper about it. this now counts NIR scratch access as
spills/fills, which I think is probably the right call

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28483>
This commit is contained in:
Alyssa Rosenzweig 2024-02-28 14:47:42 -04:00 • committed by Marge Bot
parent 43e804b0e4
commit e80d451e55
4 changed files with 20 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/asahi/compiler/agx_compile.c
View file

@ -2295,12 +2295,18 @@ agx_set_st_vary_final(agx_context *ctx)
static int
agx_dump_stats(agx_context *ctx, unsigned size, char **out)
{
unsigned nr_ins = 0;
unsigned nr_ins = 0, spills = 0, fills = 0;
/* Count instructions */
agx_foreach_instr_global(ctx, I)
agx_foreach_instr_global(ctx, I) {
nr_ins++;
if (I->op == AGX_OPCODE_STACK_STORE)
spills++;
else if (I->op == AGX_OPCODE_STACK_LOAD)
fills++;
}
unsigned nr_threads =
agx_occupancy_for_register_count(ctx->max_reg).max_threads;
@ -2308,7 +2314,7 @@ agx_dump_stats(agx_context *ctx, unsigned size, char **out)
"%s shader: %u inst, %u bytes, %u halfregs, %u threads, "
"%u loops, %u:%u spills:fills",
gl_shader_stage_name(ctx->stage), nr_ins, size, ctx->max_reg,
nr_threads, ctx->loop_count, ctx->spills, ctx->fills);
nr_threads, ctx->loop_count, spills, fills);
}
static bool

2
src/asahi/compiler/agx_compiler.h
View file

@ -494,8 +494,6 @@ typedef struct {
/* Stats for shader-db */
unsigned loop_count;
unsigned spills;
unsigned fills;
unsigned max_reg;
} agx_context;

2
src/asahi/compiler/agx_lower_spill.c
View file

@ -44,10 +44,8 @@ spill_fill(agx_builder *b, agx_instr *I, enum agx_size size, unsigned channels,
/* Emit the spill/fill */
if (I->dest[0].memory) {
agx_stack_store(b, reg, agx_immediate(stack_offs_B), format, mask);
b->shader->spills++;
} else {
agx_stack_load_to(b, reg, agx_immediate(stack_offs_B), format, mask);
b->shader->fills++;
}
}

28
src/asahi/compiler/test/test-lower-spill.cpp
View file

@ -11,7 +11,7 @@
#include "util/macros.h"
#include <gtest/gtest.h>
#define CASE(expected_spills, expected_fills, instr, expected) \
#define CASE(instr, expected) \
do { \
agx_builder *A = agx_test_builder(mem_ctx); \
agx_builder *B = agx_test_builder(mem_ctx); \
@ -25,8 +25,6 @@
} \
agx_lower_spill(A->shader); \
ASSERT_SHADER_EQUAL(A->shader, B->shader); \
ASSERT_EQ(A->shader->spills, expected_spills); \
ASSERT_EQ(A->shader->fills, expected_fills); \
} while (0)
class LowerSpill : public testing::Test {
@ -68,44 +66,43 @@ class LowerSpill : public testing::Test {
TEST_F(LowerSpill, ScalarSpills)
{
CASE(1, 0, agx_mov_to(b, agx_memory_register(11, AGX_SIZE_16), hy),
CASE(agx_mov_to(b, agx_memory_register(11, AGX_SIZE_16), hy),
agx_stack_store(b, hy, agx_immediate(22), i16, scalar));
CASE(1, 0, agx_mov_to(b, agx_memory_register(18, AGX_SIZE_32), wx),
CASE(agx_mov_to(b, agx_memory_register(18, AGX_SIZE_32), wx),
agx_stack_store(b, wx, agx_immediate(36), i32, scalar));
}
TEST_F(LowerSpill, ScalarFills)
{
CASE(0, 1, agx_mov_to(b, hy, agx_memory_register(11, AGX_SIZE_16)),
CASE(agx_mov_to(b, hy, agx_memory_register(11, AGX_SIZE_16)),
agx_stack_load_to(b, hy, agx_immediate(22), i16, scalar));
CASE(0, 1, agx_mov_to(b, wx, agx_memory_register(18, AGX_SIZE_32)),
CASE(agx_mov_to(b, wx, agx_memory_register(18, AGX_SIZE_32)),
agx_stack_load_to(b, wx, agx_immediate(36), i32, scalar));
}
TEST_F(LowerSpill, VectorSpills)
{
CASE(1, 0, agx_mov_to(b, mh4, hy4),
CASE(agx_mov_to(b, mh4, hy4),
agx_stack_store(b, hy4, agx_immediate(0), i16, vec4));
CASE(1, 0, agx_mov_to(b, mw4, wx4),
CASE(agx_mov_to(b, mw4, wx4),
agx_stack_store(b, wx4, agx_immediate(0), i32, vec4));
}
TEST_F(LowerSpill, VectorFills)
{
CASE(0, 1, agx_mov_to(b, hy4, mh4),
CASE(agx_mov_to(b, hy4, mh4),
agx_stack_load_to(b, hy4, agx_immediate(0), i16, vec4));
CASE(0, 1, agx_mov_to(b, wx4, mw4),
CASE(agx_mov_to(b, wx4, mw4),
agx_stack_load_to(b, wx4, agx_immediate(0), i32, vec4));
}
TEST_F(LowerSpill, ScalarSpill64)
{
CASE(1, 0,
agx_mov_to(b, agx_memory_register(16, AGX_SIZE_64),
CASE(agx_mov_to(b, agx_memory_register(16, AGX_SIZE_64),
agx_register(8, AGX_SIZE_64)),
agx_stack_store(b, agx_register(8, AGX_SIZE_64), agx_immediate(32), i32,
BITFIELD_MASK(2)));
@ -113,8 +110,7 @@ TEST_F(LowerSpill, ScalarSpill64)
TEST_F(LowerSpill, ScalarFill64)
{
CASE(0, 1,
agx_mov_to(b, agx_register(16, AGX_SIZE_64),
CASE(agx_mov_to(b, agx_register(16, AGX_SIZE_64),
agx_memory_register(8, AGX_SIZE_64)),
agx_stack_load_to(b, agx_register(16, AGX_SIZE_64), agx_immediate(16),
i32, BITFIELD_MASK(2)));
@ -123,7 +119,6 @@ TEST_F(LowerSpill, ScalarFill64)
TEST_F(LowerSpill, Vec6Spill)
{
CASE(
2, 0,
{
agx_index mvec6 = agx_memory_register(16, AGX_SIZE_32);
agx_index vec6 = agx_register(8, AGX_SIZE_32);
@ -147,7 +142,6 @@ TEST_F(LowerSpill, Vec6Spill)
TEST_F(LowerSpill, Vec6Fill)
{
CASE(
0, 2,
{
agx_index mvec6 = agx_memory_register(16, AGX_SIZE_32);
agx_index vec6 = agx_register(8, AGX_SIZE_32);