fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 11:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

ir3/parser: Add fullnop and fullsync sections for debugging

Browse source 
@fullnopstart
some assembly instructions
@fullnopend

Similar to fullnop and fullsync IR3 dbg options, but useful for
bisecting the assembly via shader override to find the problematic
place.

Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32256>
This commit is contained in:
Danylo Piliaiev 2024-11-20 16:41:39 +01:00 • committed by Marge Bot
parent 2ab8eff511
commit e1efe655a7
2 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/freedreno/ir3/ir3_lexer.l
View file

@ -145,6 +145,10 @@ static int parse_reg(const char *str)
"@pvtmem" return TOKEN(T_A_PVTMEM); "@pvtmem" return TOKEN(T_A_PVTMEM);
"@localmem" return TOKEN(T_A_LOCALMEM); "@localmem" return TOKEN(T_A_LOCALMEM);
"@earlypreamble" return TOKEN(T_A_EARLYPREAMBLE); "@earlypreamble" return TOKEN(T_A_EARLYPREAMBLE);
"@fullnopstart" return TOKEN(T_A_FULLNOPSTART);
"@fullnopend" return TOKEN(T_A_FULLNOPEND);
"@fullsyncstart" return TOKEN(T_A_FULLSYNCSTART);
"@fullsyncend" return TOKEN(T_A_FULLSYNCEND);
"(sy)" return TOKEN(T_SY); "(sy)" return TOKEN(T_SY);
"(ss)" return TOKEN(T_SS); "(ss)" return TOKEN(T_SS);
"(absneg)" return TOKEN(T_ABSNEG); "(absneg)" return TOKEN(T_ABSNEG);

35
src/freedreno/ir3/ir3_parser.y
View file

@ -70,6 +70,9 @@ static struct ir3_instruction *instr; /* current instruction */
static unsigned ip; /* current instruction pointer */ static unsigned ip; /* current instruction pointer */
static struct hash_table *labels; static struct hash_table *labels;
static bool is_in_fullnop_section;
static bool is_in_fullsync_section;
void *ir3_parser_dead_ctx; void *ir3_parser_dead_ctx;
char* current_line; char* current_line;
@ -110,6 +113,21 @@ static struct ir3_instruction * new_instr(opc_t opc)
instr->nop = iflags.nop; instr->nop = iflags.nop;
instr->line = ir3_yyget_lineno(); instr->line = ir3_yyget_lineno();
iflags.flags = iflags.repeat = iflags.nop = 0; iflags.flags = iflags.repeat = iflags.nop = 0;
if (is_in_fullnop_section) {
struct ir3_instruction *nop =
ir3_instr_create_at(ir3_before_instr(instr), OPC_NOP, 0, 0);
nop->repeat = 5;
ip++;
}
if (is_in_fullsync_section) {
struct ir3_instruction *nop =
ir3_instr_create_at(ir3_before_instr(instr), OPC_NOP, 0, 0);
nop->flags = IR3_INSTR_SS | IR3_INSTR_SY;
ip++;
}
ip++; ip++;
return instr; return instr;
} }
@ -312,6 +330,10 @@ struct ir3 * ir3_parse(struct ir3_shader_variant *v,
#endif #endif
info = k; info = k;
variant = v; variant = v;
is_in_fullnop_section = false;
is_in_fullsync_section = false;
if (yyparse() || !resolve_labels()) { if (yyparse() || !resolve_labels()) {
ir3_destroy(variant->ir); ir3_destroy(variant->ir);
variant->ir = NULL; variant->ir = NULL;
@ -369,6 +391,10 @@ static void print_token(FILE *file, int type, YYSTYPE value)
%token <tok> T_A_PVTMEM %token <tok> T_A_PVTMEM
%token <tok> T_A_LOCALMEM %token <tok> T_A_LOCALMEM
%token <tok> T_A_EARLYPREAMBLE %token <tok> T_A_EARLYPREAMBLE
%token <tok> T_A_FULLNOPSTART
%token <tok> T_A_FULLNOPEND
%token <tok> T_A_FULLSYNCSTART
%token <tok> T_A_FULLSYNCEND
/* todo, re-add @sampler/@uniform/@varying if needed someday */ /* todo, re-add @sampler/@uniform/@varying if needed someday */
/* src register flags */ /* src register flags */
@ -856,6 +882,11 @@ tex_header: T_A_TEX '(' T_REGISTER ')'
T_IDENTIFIER '=' integer ',' /* wrmask */ T_IDENTIFIER '=' integer ',' /* wrmask */
T_IDENTIFIER '=' integer /* cmd */ { } T_IDENTIFIER '=' integer /* cmd */ { }
fullnop_start_section: T_A_FULLNOPSTART { is_in_fullnop_section = true; }
fullnop_end_section: T_A_FULLNOPEND { is_in_fullnop_section = false; }
fullsync_start_section: T_A_FULLSYNCSTART { is_in_fullsync_section = true; }
fullsync_end_section: T_A_FULLSYNCEND { is_in_fullsync_section = false; }
iflag: T_SY { iflags.flags |= IR3_INSTR_SY; } iflag: T_SY { iflags.flags |= IR3_INSTR_SY; }
| T_SS { iflags.flags |= IR3_INSTR_SS; } | T_SS { iflags.flags |= IR3_INSTR_SS; }
| T_JP { iflags.flags |= IR3_INSTR_JP; } | T_JP { iflags.flags |= IR3_INSTR_JP; }
@ -882,6 +913,10 @@ instr: iflags cat0_instr
| raw_instr | raw_instr
| meta_print | meta_print
| label | label
| fullnop_start_section
| fullnop_end_section
| fullsync_start_section
| fullsync_end_section
label: T_IDENTIFIER ':' { new_label($1); } label: T_IDENTIFIER ':' { new_label($1); }