assembler: Add support for the SENDC instruction.

Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
This commit is contained in:
Matt Turner 2013-04-29 10:58:26 -07:00
parent 7fcd94b286
commit 160feafa2d
2 changed files with 13 additions and 8 deletions

View File

@ -440,7 +440,7 @@ static void resolve_subnr(struct brw_reg *reg)
%token <integer> MUL MAC MACH LINE SAD2 SADA2 DP4 DPH DP3 DP2 %token <integer> MUL MAC MACH LINE SAD2 SADA2 DP4 DPH DP3 DP2
%token <integer> AVG ADD SEL AND OR XOR SHR SHL ASR CMP CMPN PLN %token <integer> AVG ADD SEL AND OR XOR SHR SHL ASR CMP CMPN PLN
%token <integer> ADDC BFI1 BFREV CBIT F16TO32 F32TO16 FBH FBL %token <integer> ADDC BFI1 BFREV CBIT F16TO32 F32TO16 FBH FBL
%token <integer> SEND NOP JMPI IF IFF WHILE ELSE BREAK CONT HALT MSAVE %token <integer> SEND SENDC NOP JMPI IF IFF WHILE ELSE BREAK CONT HALT MSAVE
%token <integer> PUSH MREST POP WAIT DO ENDIF ILLEGAL %token <integer> PUSH MREST POP WAIT DO ENDIF ILLEGAL
%token <integer> MATH_INST %token <integer> MATH_INST
%token <integer> MAD LRP BFE BFI2 SUBB %token <integer> MAD LRP BFE BFI2 SUBB
@ -494,6 +494,7 @@ static void resolve_subnr(struct brw_reg *reg)
%type <integer> instoption %type <integer> instoption
%type <integer> unaryop binaryop binaryaccop breakop %type <integer> unaryop binaryop binaryaccop breakop
%type <integer> trinaryop %type <integer> trinaryop
%type <integer> sendop
%type <condition> conditionalmodifier %type <condition> conditionalmodifier
%type <predicate> predicate %type <predicate> predicate
%type <options> instoptions instoption_list %type <options> instoptions instoption_list
@ -1099,7 +1100,10 @@ trinaryinstruction:
} }
; ;
sendinstruction: predicate SEND execsize exp post_dst payload msgtarget sendop: SEND | SENDC
;
sendinstruction: predicate sendop execsize exp post_dst payload msgtarget
MSGLEN exp RETURNLEN exp instoptions MSGLEN exp RETURNLEN exp instoptions
{ {
/* Send instructions are messy. The first argument is the /* Send instructions are messy. The first argument is the
@ -1163,7 +1167,7 @@ sendinstruction: predicate SEND execsize exp post_dst payload msgtarget
GEN(&$$)->bits3.generic.end_of_thread = $12.end_of_thread; GEN(&$$)->bits3.generic.end_of_thread = $12.end_of_thread;
} }
} }
| predicate SEND execsize dst sendleadreg payload directsrcoperand instoptions | predicate sendop execsize dst sendleadreg payload directsrcoperand instoptions
{ {
memset(&$$, 0, sizeof($$)); memset(&$$, 0, sizeof($$));
set_instruction_opcode(&$$, $2); set_instruction_opcode(&$$, $2);
@ -1181,7 +1185,7 @@ sendinstruction: predicate SEND execsize exp post_dst payload msgtarget
YYERROR; YYERROR;
} }
| predicate SEND execsize dst sendleadreg payload imm32reg instoptions | predicate sendop execsize dst sendleadreg payload imm32reg instoptions
{ {
if ($7.reg.type != BRW_REGISTER_TYPE_UD && if ($7.reg.type != BRW_REGISTER_TYPE_UD &&
$7.reg.type != BRW_REGISTER_TYPE_D && $7.reg.type != BRW_REGISTER_TYPE_D &&
@ -1202,7 +1206,7 @@ sendinstruction: predicate SEND execsize exp post_dst payload msgtarget
if (set_instruction_src1(&$$, &$7, &@7) != 0) if (set_instruction_src1(&$$, &$7, &@7) != 0)
YYERROR; YYERROR;
} }
| predicate SEND execsize dst sendleadreg sndopr imm32reg instoptions | predicate sendop execsize dst sendleadreg sndopr imm32reg instoptions
{ {
struct src_operand src0; struct src_operand src0;
@ -1243,7 +1247,7 @@ sendinstruction: predicate SEND execsize exp post_dst payload msgtarget
GEN(&$$)->bits3.generic_gen5.end_of_thread = !!($6 & EX_DESC_EOT_MASK); GEN(&$$)->bits3.generic_gen5.end_of_thread = !!($6 & EX_DESC_EOT_MASK);
} }
| predicate SEND execsize dst sendleadreg sndopr directsrcoperand instoptions | predicate sendop execsize dst sendleadreg sndopr directsrcoperand instoptions
{ {
struct src_operand src0; struct src_operand src0;
@ -1284,7 +1288,7 @@ sendinstruction: predicate SEND execsize exp post_dst payload msgtarget
set_instruction_src1(&$$, &$7, &@7); set_instruction_src1(&$$, &$7, &@7);
GEN(&$$)->bits3.generic_gen5.end_of_thread = !!($6 & EX_DESC_EOT_MASK); GEN(&$$)->bits3.generic_gen5.end_of_thread = !!($6 & EX_DESC_EOT_MASK);
} }
| predicate SEND execsize dst sendleadreg payload sndopr imm32reg instoptions | predicate sendop execsize dst sendleadreg payload sndopr imm32reg instoptions
{ {
if ($8.reg.type != BRW_REGISTER_TYPE_UD && if ($8.reg.type != BRW_REGISTER_TYPE_UD &&
$8.reg.type != BRW_REGISTER_TYPE_D && $8.reg.type != BRW_REGISTER_TYPE_D &&
@ -1310,7 +1314,7 @@ sendinstruction: predicate SEND execsize exp post_dst payload msgtarget
GEN(&$$)->bits3.generic_gen5.end_of_thread = !!($7 & EX_DESC_EOT_MASK); GEN(&$$)->bits3.generic_gen5.end_of_thread = !!($7 & EX_DESC_EOT_MASK);
} }
} }
| predicate SEND execsize dst sendleadreg payload exp directsrcoperand instoptions | predicate sendop execsize dst sendleadreg payload exp directsrcoperand instoptions
{ {
memset(&$$, 0, sizeof($$)); memset(&$$, 0, sizeof($$));
set_instruction_opcode(&$$, $2); set_instruction_opcode(&$$, $2);

View File

@ -129,6 +129,7 @@ yylval.integer = BRW_CHANNEL_W;
"subb" { yylval.integer = BRW_OPCODE_SUBB; return SUBB; } "subb" { yylval.integer = BRW_OPCODE_SUBB; return SUBB; }
"send" { yylval.integer = BRW_OPCODE_SEND; return SEND; } "send" { yylval.integer = BRW_OPCODE_SEND; return SEND; }
"sendc" { yylval.integer = BRW_OPCODE_SENDC; return SENDC; }
"nop" { yylval.integer = BRW_OPCODE_NOP; return NOP; } "nop" { yylval.integer = BRW_OPCODE_NOP; return NOP; }
"jmpi" { yylval.integer = BRW_OPCODE_JMPI; return JMPI; } "jmpi" { yylval.integer = BRW_OPCODE_JMPI; return JMPI; }
"if" { yylval.integer = BRW_OPCODE_IF; return IF; } "if" { yylval.integer = BRW_OPCODE_IF; return IF; }