fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 17:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

intel/brw: Delete legacy SFIDs

Browse source 
This involves a little rework in the assembler to treat "math" as an
opcode token rather than an SFID.

Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27872>
This commit is contained in:
Kenneth Graunke 2024-02-28 03:36:21 -08:00 • committed by Marge Bot
parent afae5e78ca
commit 288b966e3e
4 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/intel/compiler/brw_disasm.c
View file

@ -278,7 +278,6 @@ static const char *const end_of_thread[2] = {
static const char *const gfx6_sfid[16] = {
[BRW_SFID_NULL] = "null",
[BRW_SFID_MATH] = "math",
[BRW_SFID_SAMPLER] = "sampler",
[BRW_SFID_MESSAGE_GATEWAY] = "gateway",
[BRW_SFID_URB] = "urb",

3
src/intel/compiler/brw_eu_defines.h
View file

@ -1120,11 +1120,8 @@ enum tgl_sync_function {
*/
enum brw_message_target {
BRW_SFID_NULL = 0,
BRW_SFID_MATH = 1, /* Only valid on Gfx4-5 */
BRW_SFID_SAMPLER = 2,
BRW_SFID_MESSAGE_GATEWAY = 3,
BRW_SFID_DATAPORT_READ = 4,
BRW_SFID_DATAPORT_WRITE = 5,
BRW_SFID_URB = 6,
BRW_SFID_THREAD_SPAWNER = 7,
BRW_SFID_VME = 8,

9
src/intel/compiler/brw_gram.y
View file

@ -384,7 +384,7 @@ add_label(struct brw_codegen *p, const char* label_name, enum instr_label_type t
%token <integer> IF ILLEGAL
%token <integer> JMPI JOIN
%token <integer> LINE LRP LZD
%token <integer> MAC MACH MAD MADM MOV MOVI MUL MREST MSAVE
%token <integer> MAC MACH MAD MADM MATH MOV MOVI MUL MREST MSAVE
%token <integer> NENOP NOP NOT
%token <integer> OR
%token <integer> PLN POP PUSH
@ -404,8 +404,8 @@ add_label(struct brw_codegen *p, const char* label_name, enum instr_label_type t
%type <reg> sync_arg
/* shared functions for send */
%token CONST CRE DATA DP_DATA_1 GATEWAY MATH PIXEL_INTERP READ RENDER SAMPLER
%token THREAD_SPAWNER URB VME WRITE DP_SAMPLER RT_ACCEL SLM TGM UGM
%token CONST CRE DATA DP_DATA_1 GATEWAY PIXEL_INTERP RENDER SAMPLER
%token THREAD_SPAWNER URB VME DP_SAMPLER RT_ACCEL SLM TGM UGM
/* message details for send */
%token MSGDESC_BEGIN SRC1_LEN EX_BSO MSGDESC_END
@ -1044,10 +1044,7 @@ sendsopcode:
sharedfunction:
NULL_TOKEN { $$ = BRW_SFID_NULL; }
| MATH { $$ = BRW_SFID_MATH; }
| GATEWAY { $$ = BRW_SFID_MESSAGE_GATEWAY; }
| READ { $$ = BRW_SFID_DATAPORT_READ; }
| WRITE { $$ = BRW_SFID_DATAPORT_WRITE; }
| URB { $$ = BRW_SFID_URB; }
| THREAD_SPAWNER { $$ = BRW_SFID_THREAD_SPAWNER; }
| VME { $$ = BRW_SFID_VME; }

4
src/intel/compiler/brw_lex.l
View file

@ -129,6 +129,7 @@ wait { yylval.integer = BRW_OPCODE_WAIT; return WAIT; }
while { yylval.integer = BRW_OPCODE_WHILE; return WHILE; }
xor { yylval.integer = BRW_OPCODE_XOR; return XOR; }
sync { yylval.integer = BRW_OPCODE_SYNC; return SYNC; }
math { yylval.integer = BRW_OPCODE_MATH; return MATH; }
/* extended math functions */
cos { yylval.integer = BRW_MATH_FUNCTION_COS; return COS; }
@ -174,9 +175,6 @@ render { return RENDER; }
const { return CONST; }
data { return DATA; }
cre { return CRE; }
math { return MATH; }
read { return READ; }
write { return WRITE; }
vme { return VME; }
"pixel interp" { return PIXEL_INTERP; }
"dp data 1" { return DP_DATA_1; }