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

Bump gen_level to multiple of tens.

Browse Source 
Add new helper macros to check versions:
- IS_GENp() meant to match Gen X and above
- IS_GENx() meant to match Gen X exactly.

Patch mechanically generated. No stale "gen_level" usage.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
This commit is contained in:
Gwenole Beauchesne 2012-10-22 16:13:51 -04:00 committed by Damien Lespiau
parent ee32188422
commit a5e5d94ce3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
assembler/src/main.c
View File

@ -38,7 +38,7 @@ extern FILE *yyin;
extern int errors; extern int errors;
long int gen_level = 4; long int gen_level = 40;
int advanced_flag = 0; /* 0: in unit of byte, 1: in unit of data element size */ int advanced_flag = 0; /* 0: in unit of byte, 1: in unit of data element size */
int binary_like_output = 0; /* 0: default output style, 1: nice C-style output */ int binary_like_output = 0; /* 0: default output style, 1: nice C-style output */
int need_export = 0; int need_export = 0;
@ -84,7 +84,7 @@ static int jump_distance(int offset)
{ {
// Gen4- bspec: the jump distance is in number of sixteen-byte units // Gen4- bspec: the jump distance is in number of sixteen-byte units
// Gen5+ bspec: the jump distance is in number of eight-byte units // Gen5+ bspec: the jump distance is in number of eight-byte units
if(gen_level >= 5) if(IS_GENp(5))
offset *= 2; offset *= 2;
return offset; return offset;
} }
@ -288,9 +288,9 @@ int main(int argc, char **argv)
break; break;
case 'g': case 'g':
gen_level = strtol(optarg, NULL, 0); gen_level = strtol(optarg, NULL, 0) * 10;
if (gen_level < 4 || gen_level > 7) { if (gen_level < 40 || gen_level > 70) {
usage(); usage();
exit(1); exit(1);
} }
@ -393,7 +393,7 @@ int main(int argc, char **argv)
entry != NULL; entry = entry->next) { entry != NULL; entry = entry->next) {
if (entry->islabel) if (entry->islabel)
fprintf(export_file, "#define %s_IP %d\n", fprintf(export_file, "#define %s_IP %d\n",
entry->string, (gen_level == 5 ? 2 : 1)*(entry->inst_offset)); entry->string, (IS_GENx(5) ? 2 : 1)*(entry->inst_offset));
} }
fclose(export_file); fclose(export_file);
} }
@ -419,18 +419,18 @@ int main(int argc, char **argv)
offset --; offset --;
offset = jump_distance(offset); offset = jump_distance(offset);
if(gen_level <= 5) { if(!IS_GENp(6)) {
entry->instruction.bits3.JIP = offset; entry->instruction.bits3.JIP = offset;
if(entry->instruction.header.opcode == BRW_OPCODE_ELSE) if(entry->instruction.header.opcode == BRW_OPCODE_ELSE)
entry->instruction.bits3.branch_2_offset.UIP = 1; /* Set the istack pop count, which must always be 1. */ entry->instruction.bits3.branch_2_offset.UIP = 1; /* Set the istack pop count, which must always be 1. */
} else if(gen_level == 6) { } else if(IS_GENx(6)) {
/* TODO: endif JIP pos is not in Gen6 spec. may be bits1 */ /* TODO: endif JIP pos is not in Gen6 spec. may be bits1 */
int opcode = entry->instruction.header.opcode; int opcode = entry->instruction.header.opcode;
if(opcode == BRW_OPCODE_CALL || opcode == BRW_OPCODE_JMPI) if(opcode == BRW_OPCODE_CALL || opcode == BRW_OPCODE_JMPI)
entry->instruction.bits3.JIP = offset; // for CALL, JMPI entry->instruction.bits3.JIP = offset; // for CALL, JMPI
else else
entry->instruction.bits1.branch.JIP = offset; // for CASE,ELSE,FORK,IF,WHILE entry->instruction.bits1.branch.JIP = offset; // for CASE,ELSE,FORK,IF,WHILE
} else if(gen_level >= 7) { } else if(IS_GENp(7)) {
int opcode = entry->instruction.header.opcode; int opcode = entry->instruction.header.opcode;
/* Gen7 JMPI Restrictions in bspec: /* Gen7 JMPI Restrictions in bspec:
* The JIP data type must be Signed DWord * The JIP data type must be Signed DWord