flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-24 00:06:09 +00:00
Code Issues Releases Wiki Activity

assembler: Rename dp_gen7 to gen7_dp and sync it with Mesa's

Browse Source 
The purpose of this commit is to synchronize opcode definitions across
the gen4asm assembler and mesa.

I had to drop how mesa splits msg_control as the current assembly
language gives access the the whole msg_control field.

Recompiling the xorg and the intel driver of libva shaders doesn't show
any difference in the assembly created.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
This commit is contained in:
Damien Lespiau 2013-01-15 18:47:05 +00:00
parent 1f1ad59746
commit 8fa561d4bb
2 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
assembler/brw_structs.h
View File

@ -1536,17 +1536,26 @@ struct brw_instruction
GLuint end_of_thread:1; GLuint end_of_thread:1;
} gen6_dp; } gen6_dp;
struct { /**
GLuint binding_table_index:8; * Message for any of the Gen7 Data Port caches.
GLuint msg_control:6; *
GLuint msg_type:4; * Most fields are defined in BSpec volume 5c.2 Data Port / Messages /
GLuint category:1; * Data Port Messages / Message Descriptor. Once again, "Slot Group
GLuint header_present:1; * Select" and "Last Render Target" are part of the 6-bit message
GLuint response_length:5; * control for Render Target Writes.
GLuint msg_length:4; */
GLuint pad1:2; struct {
GLuint end_of_thread:1; GLuint binding_table_index:8;
} dp_gen7; GLuint msg_control:6;
GLuint msg_type:4;
GLuint category:1;
GLuint header_present:1;
GLuint response_length:5;
GLuint msg_length:4;
GLuint pad2:2;
GLuint end_of_thread:1;
} gen7_dp;
/** @} */
struct { struct {
GLuint opcode:1; GLuint opcode:1;

26
assembler/gram.y
View File

@ -1253,9 +1253,9 @@ msgtarget: NULL_TOKEN
$$.bits2.send_gen5.sfid = $$.bits2.send_gen5.sfid =
BRW_MESSAGE_TARGET_DP_SC; BRW_MESSAGE_TARGET_DP_SC;
$$.bits3.generic_gen5.header_present = 1; $$.bits3.generic_gen5.header_present = 1;
$$.bits3.dp_gen7.binding_table_index = $3; $$.bits3.gen7_dp.binding_table_index = $3;
$$.bits3.dp_gen7.msg_control = $7; $$.bits3.gen7_dp.msg_control = $7;
$$.bits3.dp_gen7.msg_type = $9; $$.bits3.gen7_dp.msg_type = $9;
} else if (IS_GENx(6)) { } else if (IS_GENx(6)) {
$$.bits2.send_gen5.sfid = $$.bits2.send_gen5.sfid =
BRW_MESSAGE_TARGET_DP_SC; BRW_MESSAGE_TARGET_DP_SC;
@ -1287,9 +1287,9 @@ msgtarget: NULL_TOKEN
$$.bits2.send_gen5.sfid = $$.bits2.send_gen5.sfid =
BRW_MESSAGE_TARGET_DP_RC; BRW_MESSAGE_TARGET_DP_RC;
$$.bits3.generic_gen5.header_present = 1; $$.bits3.generic_gen5.header_present = 1;
$$.bits3.dp_gen7.binding_table_index = $3; $$.bits3.gen7_dp.binding_table_index = $3;
$$.bits3.dp_gen7.msg_control = $5; $$.bits3.gen7_dp.msg_control = $5;
$$.bits3.dp_gen7.msg_type = $7; $$.bits3.gen7_dp.msg_type = $7;
} else if (IS_GENx(6)) { } else if (IS_GENx(6)) {
$$.bits2.send_gen5.sfid = $$.bits2.send_gen5.sfid =
BRW_MESSAGE_TARGET_DP_RC; BRW_MESSAGE_TARGET_DP_RC;
@ -1332,9 +1332,9 @@ msgtarget: NULL_TOKEN
$$.bits2.send_gen5.sfid = $$.bits2.send_gen5.sfid =
BRW_MESSAGE_TARGET_DP_RC; BRW_MESSAGE_TARGET_DP_RC;
$$.bits3.generic_gen5.header_present = ($11 != 0); $$.bits3.generic_gen5.header_present = ($11 != 0);
$$.bits3.dp_gen7.binding_table_index = $3; $$.bits3.gen7_dp.binding_table_index = $3;
$$.bits3.dp_gen7.msg_control = $5; $$.bits3.gen7_dp.msg_control = $5;
$$.bits3.dp_gen7.msg_type = $7; $$.bits3.gen7_dp.msg_type = $7;
} else if (IS_GENx(6)) { } else if (IS_GENx(6)) {
$$.bits2.send_gen5.sfid = $$.bits2.send_gen5.sfid =
BRW_MESSAGE_TARGET_DP_RC; BRW_MESSAGE_TARGET_DP_RC;
@ -1459,10 +1459,10 @@ msgtarget: NULL_TOKEN
YYERROR; YYERROR;
} }
$$.bits3.dp_gen7.category = $11; $$.bits3.gen7_dp.category = $11;
$$.bits3.dp_gen7.binding_table_index = $9; $$.bits3.gen7_dp.binding_table_index = $9;
$$.bits3.dp_gen7.msg_control = $7; $$.bits3.gen7_dp.msg_control = $7;
$$.bits3.dp_gen7.msg_type = $5; $$.bits3.gen7_dp.msg_type = $5;
} else if (IS_GENx(6)) { } else if (IS_GENx(6)) {
if ($3 != BRW_MESSAGE_TARGET_DP_SC && if ($3 != BRW_MESSAGE_TARGET_DP_SC &&
$3 != BRW_MESSAGE_TARGET_DP_RC && $3 != BRW_MESSAGE_TARGET_DP_RC &&