Mesa (master): freedreno/computerator: rename prefix asm->ir3
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Feb 24 21:50:11 UTC 2020
Module: Mesa
Branch: master
Commit: f87d412f08265ca6e5c47a5591c0ebbdefdbaf4c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f87d412f08265ca6e5c47a5591c0ebbdefdbaf4c
Author: Rob Clark <robdclark at chromium.org>
Date: Sun Feb 23 11:51:17 2020 -0800
freedreno/computerator: rename prefix asm->ir3
Signed-off-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3926>
---
src/freedreno/computerator/ir3_lexer.l | 39 ++++++++++++++++-----------------
src/freedreno/computerator/ir3_parser.y | 25 ++++++++++-----------
2 files changed, 31 insertions(+), 33 deletions(-)
diff --git a/src/freedreno/computerator/ir3_lexer.l b/src/freedreno/computerator/ir3_lexer.l
index d825da36e46..991c52e950c 100644
--- a/src/freedreno/computerator/ir3_lexer.l
+++ b/src/freedreno/computerator/ir3_lexer.l
@@ -23,12 +23,11 @@
%{
#include <stdlib.h>
-#include "instr-a3xx.h"
-#include "parser.h"
-#include "util.h"
+#include "ir3/ir3.h"
+#include "ir3_parser.h"
-#define TOKEN(t) (asm_yylval.tok = t)
-extern YYSTYPE asm_yylval;
+#define TOKEN(t) (ir3_yylval.tok = t)
+extern YYSTYPE ir3_yylval;
static int parse_wrmask(const char *src)
{
@@ -63,15 +62,15 @@ static int parse_reg(const char *str)
%}
%option noyywrap
-%option prefix="asm_yy"
+%option prefix="ir3_yy"
%%
"\n" yylineno++;
[ \t] ; /* ignore whitespace */
";"[^\n]*"\n" yylineno++; /* ignore comments */
-[0-9]+"."[0-9]+ asm_yylval.flt = strtod(yytext, NULL); return T_FLOAT;
-[0-9]* asm_yylval.num = strtoul(yytext, NULL, 0); return T_INT;
-"0x"[0-9a-fA-F]* asm_yylval.num = strtoul(yytext, NULL, 0); return T_HEX;
+[0-9]+"."[0-9]+ ir3_yylval.flt = strtod(yytext, NULL); return T_FLOAT;
+[0-9]* ir3_yylval.num = strtoul(yytext, NULL, 0); return T_INT;
+"0x"[0-9a-fA-F]* ir3_yylval.num = strtoul(yytext, NULL, 0); return T_HEX;
"@localsize" return TOKEN(T_A_LOCALSIZE);
"@const" return TOKEN(T_A_CONST);
"@buf" return TOKEN(T_A_BUF);
@@ -86,15 +85,15 @@ static int parse_reg(const char *str)
"(pos_infinity)" return TOKEN(T_POS_INFINITY);
"(ei)" return TOKEN(T_EI);
"(jp)" return TOKEN(T_JP);
-"(rpt"[0-7]")" asm_yylval.num = strtol(yytext+4, NULL, 10); return T_RPT;
-"("[x]?[y]?[z]?[w]?")" asm_yylval.num = parse_wrmask(yytext); return T_WRMASK;
+"(rpt"[0-7]")" ir3_yylval.num = strtol(yytext+4, NULL, 10); return T_RPT;
+"("[x]?[y]?[z]?[w]?")" ir3_yylval.num = parse_wrmask(yytext); return T_WRMASK;
-[h]?"r"[0-9]+"."[xyzw] asm_yylval.num = parse_reg(yytext); return T_REGISTER;
-[h]?"c"[0-9]+"."[xyzw] asm_yylval.num = parse_reg(yytext); return T_CONSTANT;
-"a0."[xyzw] asm_yylval.num = parse_reg(yytext); return T_A0;
-"p0."[xyzw] asm_yylval.num = parse_reg(yytext); return T_P0;
-"s#"[0-9]+ asm_yylval.num = strtol(yytext+2, NULL, 10); return T_SAMP;
-"t#"[0-9]+ asm_yylval.num = strtol(yytext+2, NULL, 10); return T_TEX;
+[h]?"r"[0-9]+"."[xyzw] ir3_yylval.num = parse_reg(yytext); return T_REGISTER;
+[h]?"c"[0-9]+"."[xyzw] ir3_yylval.num = parse_reg(yytext); return T_CONSTANT;
+"a0."[xyzw] ir3_yylval.num = parse_reg(yytext); return T_A0;
+"p0."[xyzw] ir3_yylval.num = parse_reg(yytext); return T_P0;
+"s#"[0-9]+ ir3_yylval.num = strtol(yytext+2, NULL, 10); return T_SAMP;
+"t#"[0-9]+ ir3_yylval.num = strtol(yytext+2, NULL, 10); return T_TEX;
/* category 0: */
"nop" return TOKEN(T_OP_NOP);
@@ -115,7 +114,7 @@ static int parse_reg(const char *str)
"mov" return TOKEN(T_OP_MOV);
"cov" return TOKEN(T_OP_COV);
-("f16"|"f32"|"u16"|"u32"|"s16"|"s32"|"u8"|"s8"){2} asm_yylval.str = yytext; return T_CAT1_TYPE_TYPE;
+("f16"|"f32"|"u16"|"u32"|"s16"|"s32"|"u8"|"s8"){2} ir3_yylval.str = yytext; return T_CAT1_TYPE_TYPE;
/* category 2: */
"add.f" return TOKEN(T_OP_ADD_F);
@@ -306,6 +305,6 @@ static int parse_reg(const char *str)
"nan" return TOKEN(T_NAN);
"inf" return TOKEN(T_INF);
-[a-zA-Z_][a-zA-Z_0-9]* asm_yylval.str = yytext; return T_IDENTIFIER;
-. fprintf(stderr, "error at line %d: Unknown token: %s\n", asm_yyget_lineno(), yytext); yyterminate();
+[a-zA-Z_][a-zA-Z_0-9]* ir3_yylval.str = yytext; return T_IDENTIFIER;
+. fprintf(stderr, "error at line %d: Unknown token: %s\n", ir3_yyget_lineno(), yytext); yyterminate();
%%
diff --git a/src/freedreno/computerator/ir3_parser.y b/src/freedreno/computerator/ir3_parser.y
index 3198dcb5362..6608956e7de 100644
--- a/src/freedreno/computerator/ir3_parser.y
+++ b/src/freedreno/computerator/ir3_parser.y
@@ -66,14 +66,14 @@ static struct {
unsigned wrmask;
} rflags;
-int asm_yyget_lineno(void);
+int ir3_yyget_lineno(void);
static struct ir3_instruction * new_instr(opc_t opc)
{
instr = ir3_instr_create(block, opc);
instr->flags = iflags.flags;
instr->repeat = iflags.repeat;
- instr->line = asm_yyget_lineno();
+ instr->line = ir3_yyget_lineno();
iflags.flags = iflags.repeat = 0;
return instr;
}
@@ -165,29 +165,28 @@ int yydebug;
#endif
extern int yylex(void);
-typedef void *YY_BUFFER_STATE;
-extern YY_BUFFER_STATE asm_yy_scan_string(const char *);
-extern void asm_yy_delete_buffer(YY_BUFFER_STATE);
+extern FILE *ir3_yyin;
int yyparse(void);
-void yyerror(const char *error)
+static void yyerror(const char *error)
{
- fprintf(stderr, "error at line %d: %s\n", asm_yyget_lineno(), error);
+ fprintf(stderr, "error at line %d: %s\n", ir3_yyget_lineno(), error);
}
-struct ir3_shader * fd_asm_parse(const char *src)
+struct ir3 * ir3_parse(struct ir3_kernel *k, FILE *f)
{
- YY_BUFFER_STATE buffer = asm_yy_scan_string(src);
+ ir3_yyin = f;
#ifdef YYDEBUG
yydebug = 1;
#endif
+ kernel = k;
+ variant = k->v;
if (yyparse()) {
- ir3_shader_destroy(shader);
- shader = NULL;
+ ir3_destroy(variant->ir);
+ variant->ir = NULL;
}
- asm_yy_delete_buffer(buffer);
- return shader;
+ return variant->ir;
}
%}
More information about the mesa-commit
mailing list