assembler: Fix assert when setting 3src sources
PATCH 1/3 assembler: Fix assert when setting 3src sources
We need to map the type to the 3src encoding before comparing to insn->bits1.da3src.src_reg_type, which is 3src encoded.
--- assembler/brw_eu_emit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
assembler/brw_eu_emit.c +2 -2
@@ -874,7 +874,7 @@ brw_set_3src_src1(struct brw_compile *p,assert (src1.file ==BRW_GENERAL_REGISTER_FILE );assert (src1.address_mode ==BRW_ADDRESS_DIRECT );assert (src1.nr <128 ); -assert (src1.type == insn->bits1.da3src.src_reg_type); +assert (get_3src_type (src1.type) == insn->bits1.da3src.src_reg_type); insn->bits2.da3src.src1_swizzle = src1.dw1.bits.swizzle; insn->bits2.da3src.src1_subreg_nr_low =get_3src_subreg_nr (src1) &0x3 ; insn->bits3.da3src.src1_subreg_nr_high =get_3src_subreg_nr (src1) >>2 ;
@@ -892,7 +892,7 @@ brw_set_3src_src2(struct brw_compile *p,assert (src2.file ==BRW_GENERAL_REGISTER_FILE );assert (src2.address_mode ==BRW_ADDRESS_DIRECT );assert (src2.nr <128 ); -assert (src2.type == insn->bits1.da3src.src_reg_type); +assert (get_3src_type (src2.type) == insn->bits1.da3src.src_reg_type); insn->bits3.da3src.src2_swizzle = src2.dw1.bits.swizzle; insn->bits3.da3src.src2_subreg_nr =get_3src_subreg_nr (src2); insn->bits3.da3src.src2_rep_ctrl = src2.vstride ==BRW_VERTICAL_STRIDE_0 ;
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/3 assembler: Set 3src options before sources
Setting the 3src sources will assert align16, but that doesn't get set until we call set_instruction_options(). Call that before setting sources.
--- assembler/gram.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
assembler/gram.y +1 -1
@@ -1133,6 +1133,7 @@ trinaryinstruction: set_instruction_opcode(&$$, $2); set_instruction_saturate(&$$, $4); + set_instruction_options(&$$, $10); $6.width = $5; if (set_instruction_dest_three_src(&$$, &$6))
@@ -1143,7 +1144,6 @@ trinaryinstruction: YYERROR; if (set_instruction_src2_three_src(&$$, &$9)) YYERROR; - set_instruction_options(&$$, $10); } ;
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 assembler: RSQ is a math function
In reply to Kristian H. Kristensen--- assembler/gram.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
assembler/gram.y +1 -1
@@ -1985,7 +1985,7 @@ sampler_datatype: ; math_function: INV | LOG | EXP | SQRT | POW | SIN | COS | SINCOS | INTDIV - | INTMOD | INTDIVMOD + | INTMOD | INTDIVMOD | RSQ ; math_signed: %empty /* empty */ { $$ = 0; }
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi,
This series is
Thanks!
Quoted 22 lines · Kristian H. Kristensen
We need to map the type to the 3src encoding before comparing to
insn->bits1.da3src.src_reg_type, which is 3src encoded.Signed-off-by Kristian H. Kristensen <[email protected]>--- assembler/brw_eu_emit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)assembler/brw_eu_emit.c +1
-1@@ -874,7 +874,7 @@ brw_set_3src_src1(struct brw_compile *p,assert (src1.file ==BRW_GENERAL_REGISTER_FILE );assert (src1.address_mode ==BRW_ADDRESS_DIRECT );assert (src1.nr <128 ); -assert (src1.type == insn->bits1.da3src.src_reg_type); +assert (get_3src_type (src1.type) == insn->bits1.da3src.src_reg_type); insn->bits2.da3src.src1_swizzle = src1.dw1.bits.swizzle; insn->bits2.da3src.src1_subreg_nr_low =get_3src_subreg_nr (src1) &0x3 ; insn->bits3.da3src.src1_subreg_nr_high =get_3src_subreg_nr (src1) >>2 ;
assembler/brw_eu_emit.c brw_set_3src_src2(struct brw_compile *p, · line 898
Quoted 8 lines
assembler/brw_eu_emit.c +1
-1@@ -892,7 +892,7 @@ brw_set_3src_src2(struct brw_compile *p,assert (src2.file ==BRW_GENERAL_REGISTER_FILE );assert (src2.address_mode ==BRW_ADDRESS_DIRECT );assert (src2.nr <128 ); -assert (src2.type == insn->bits1.da3src.src_reg_type); +assert (get_3src_type (src2.type) == insn->bits1.da3src.src_reg_type); insn->bits3.da3src.src2_swizzle = src2.dw1.bits.swizzle; insn->bits3.da3src.src2_subreg_nr =get_3src_subreg_nr (src2); insn->bits3.da3src.src2_rep_ctrl = src2.vstride ==BRW_VERTICAL_STRIDE_0 ;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx