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

assembler: Cleanup visibility of a few global variables/functions

Browse Source 
Not everything has to be exported out the compilation unit. Do a small
cleanup pass.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
This commit is contained in:
Damien Lespiau 2013-01-27 11:05:50 +00:00
parent 6d3d369535
commit 1d53e1813e
3 changed files with 56 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assembler/gen4asm.h
View File

@ -42,6 +42,8 @@ typedef int GLint;
typedef float GLfloat; typedef float GLfloat;
extern long int gen_level; extern long int gen_level;
extern int advanced_flag;
extern int errors;
#define WARN_ALWAYS (1 << 0) #define WARN_ALWAYS (1 << 0)
#define WARN_ALL (1 << 31) #define WARN_ALL (1 << 31)

102
assembler/gram.y
View File

@ -49,9 +49,6 @@ typedef struct YYLTYPE
int last_column; int last_column;
} YYLTYPE; } YYLTYPE;
extern long int gen_level;
extern int advanced_flag;
extern int yylineno;
extern int need_export; extern int need_export;
static struct src_operand src_null_reg = static struct src_operand src_null_reg =
{ {
@ -83,30 +80,30 @@ static struct src_operand ip_src =
}; };
static int get_type_size(GLuint type); static int get_type_size(GLuint type);
int set_instruction_dest(struct brw_instruction *instr, static int set_instruction_dest(struct brw_instruction *instr,
struct brw_reg *dest); struct brw_reg *dest);
int set_instruction_src0(struct brw_instruction *instr, static int set_instruction_src0(struct brw_instruction *instr,
struct src_operand *src, struct src_operand *src,
YYLTYPE *location); YYLTYPE *location);
int set_instruction_src1(struct brw_instruction *instr, static int set_instruction_src1(struct brw_instruction *instr,
struct src_operand *src, struct src_operand *src,
YYLTYPE *location); YYLTYPE *location);
int set_instruction_dest_three_src(struct brw_instruction *instr, static int set_instruction_dest_three_src(struct brw_instruction *instr,
struct brw_reg *dest); struct brw_reg *dest);
int set_instruction_src0_three_src(struct brw_instruction *instr, static int set_instruction_src0_three_src(struct brw_instruction *instr,
struct src_operand *src); struct src_operand *src);
int set_instruction_src1_three_src(struct brw_instruction *instr, static int set_instruction_src1_three_src(struct brw_instruction *instr,
struct src_operand *src); struct src_operand *src);
int set_instruction_src2_three_src(struct brw_instruction *instr, static int set_instruction_src2_three_src(struct brw_instruction *instr,
struct src_operand *src); struct src_operand *src);
void set_instruction_options(struct brw_instruction *instr, static void set_instruction_options(struct brw_instruction *instr,
struct brw_instruction *options); struct brw_instruction *options);
void set_instruction_predicate(struct brw_instruction *instr, static void set_instruction_predicate(struct brw_instruction *instr,
struct brw_instruction *predicate); struct brw_instruction *predicate);
void set_direct_dst_operand(struct brw_reg *dst, struct brw_reg *reg, static void set_direct_dst_operand(struct brw_reg *dst, struct brw_reg *reg,
int type); int type);
void set_direct_src_operand(struct src_operand *src, struct brw_reg *reg, static void set_direct_src_operand(struct src_operand *src, struct brw_reg *reg,
int type); int type);
enum message_level { enum message_level {
WARN, WARN,
@ -2826,9 +2823,6 @@ instoption: ALIGN1 { $$ = ALIGN1; }
%% %%
extern int yylineno; extern int yylineno;
extern char *input_filename;
int errors;
void yyerror (char *msg) void yyerror (char *msg)
{ {
@ -2939,8 +2933,8 @@ static void reset_instruction_src_region(struct brw_instruction *instr,
/** /**
* Fills in the destination register information in instr from the bits in dst. * Fills in the destination register information in instr from the bits in dst.
*/ */
int set_instruction_dest(struct brw_instruction *instr, static int set_instruction_dest(struct brw_instruction *instr,
struct brw_reg *dest) struct brw_reg *dest)
{ {
if (!validate_dst_reg(instr, dest)) if (!validate_dst_reg(instr, dest))
return 1; return 1;
@ -2955,9 +2949,9 @@ int set_instruction_dest(struct brw_instruction *instr,
} }
/* Sets the first source operand for the instruction. Returns 0 on success. */ /* Sets the first source operand for the instruction. Returns 0 on success. */
int set_instruction_src0(struct brw_instruction *instr, static int set_instruction_src0(struct brw_instruction *instr,
struct src_operand *src, struct src_operand *src,
YYLTYPE *location) YYLTYPE *location)
{ {
if (advanced_flag) if (advanced_flag)
@ -2977,9 +2971,9 @@ int set_instruction_src0(struct brw_instruction *instr,
/* Sets the second source operand for the instruction. Returns 0 on success. /* Sets the second source operand for the instruction. Returns 0 on success.
*/ */
int set_instruction_src1(struct brw_instruction *instr, static int set_instruction_src1(struct brw_instruction *instr,
struct src_operand *src, struct src_operand *src,
YYLTYPE *location) YYLTYPE *location)
{ {
if (advanced_flag) if (advanced_flag)
reset_instruction_src_region(instr, src); reset_instruction_src_region(instr, src);
@ -3060,8 +3054,8 @@ static int reg_type_2_to_3(int reg_type)
return r; return r;
} }
int set_instruction_dest_three_src(struct brw_instruction *instr, static int set_instruction_dest_three_src(struct brw_instruction *instr,
struct brw_reg *dest) struct brw_reg *dest)
{ {
instr->bits1.da3src.dest_reg_file = dest->file; instr->bits1.da3src.dest_reg_file = dest->file;
instr->bits1.da3src.dest_reg_nr = dest->nr; instr->bits1.da3src.dest_reg_nr = dest->nr;
@ -3071,8 +3065,8 @@ int set_instruction_dest_three_src(struct brw_instruction *instr,
return 0; return 0;
} }
int set_instruction_src0_three_src(struct brw_instruction *instr, static int set_instruction_src0_three_src(struct brw_instruction *instr,
struct src_operand *src) struct src_operand *src)
{ {
if (advanced_flag) { if (advanced_flag) {
reset_instruction_src_region(instr, src); reset_instruction_src_region(instr, src);
@ -3084,8 +3078,8 @@ int set_instruction_src0_three_src(struct brw_instruction *instr,
return 0; return 0;
} }
int set_instruction_src1_three_src(struct brw_instruction *instr, static int set_instruction_src1_three_src(struct brw_instruction *instr,
struct src_operand *src) struct src_operand *src)
{ {
if (advanced_flag) { if (advanced_flag) {
reset_instruction_src_region(instr, src); reset_instruction_src_region(instr, src);
@ -3098,8 +3092,8 @@ int set_instruction_src1_three_src(struct brw_instruction *instr,
return 0; return 0;
} }
int set_instruction_src2_three_src(struct brw_instruction *instr, static int set_instruction_src2_three_src(struct brw_instruction *instr,
struct src_operand *src) struct src_operand *src)
{ {
if (advanced_flag) { if (advanced_flag) {
reset_instruction_src_region(instr, src); reset_instruction_src_region(instr, src);
@ -3110,8 +3104,8 @@ int set_instruction_src2_three_src(struct brw_instruction *instr,
return 0; return 0;
} }
void set_instruction_options(struct brw_instruction *instr, static void set_instruction_options(struct brw_instruction *instr,
struct brw_instruction *options) struct brw_instruction *options)
{ {
/* XXX: more instr options */ /* XXX: more instr options */
instr->header.access_mode = options->header.access_mode; instr->header.access_mode = options->header.access_mode;
@ -3121,8 +3115,8 @@ void set_instruction_options(struct brw_instruction *instr,
options->header.compression_control; options->header.compression_control;
} }
void set_instruction_predicate(struct brw_instruction *instr, static void set_instruction_predicate(struct brw_instruction *instr,
struct brw_instruction *predicate) struct brw_instruction *predicate)
{ {
instr->header.predicate_control = predicate->header.predicate_control; instr->header.predicate_control = predicate->header.predicate_control;
instr->header.predicate_inverse = predicate->header.predicate_inverse; instr->header.predicate_inverse = predicate->header.predicate_inverse;
@ -3130,8 +3124,8 @@ void set_instruction_predicate(struct brw_instruction *instr,
instr->bits2.da1.flag_subreg_nr = predicate->bits2.da1.flag_subreg_nr; instr->bits2.da1.flag_subreg_nr = predicate->bits2.da1.flag_subreg_nr;
} }
void set_direct_dst_operand(struct brw_reg *dst, struct brw_reg *reg, static void set_direct_dst_operand(struct brw_reg *dst, struct brw_reg *reg,
int type) int type)
{ {
*dst = *reg; *dst = *reg;
dst->address_mode = BRW_ADDRESS_DIRECT; dst->address_mode = BRW_ADDRESS_DIRECT;
@ -3140,8 +3134,8 @@ void set_direct_dst_operand(struct brw_reg *dst, struct brw_reg *reg,
dst->dw1.bits.writemask = BRW_WRITEMASK_XYZW; dst->dw1.bits.writemask = BRW_WRITEMASK_XYZW;
} }
void set_direct_src_operand(struct src_operand *src, struct brw_reg *reg, static void set_direct_src_operand(struct src_operand *src, struct brw_reg *reg,
int type) int type)
{ {
memset(src, 0, sizeof(*src)); memset(src, 0, sizeof(*src));
src->reg.address_mode = BRW_ADDRESS_DIRECT; src->reg.address_mode = BRW_ADDRESS_DIRECT;

12
assembler/main.c
View File

@ -39,17 +39,12 @@
extern FILE *yyin; extern FILE *yyin;
extern int errors;
long int gen_level = 40; 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 */
unsigned int warning_flags = WARN_ALWAYS; unsigned int warning_flags = WARN_ALWAYS;
int binary_like_output = 0; /* 0: default output style, 1: nice C-style output */
int need_export = 0; int need_export = 0;
char *input_filename = "<stdin>"; char *input_filename = "<stdin>";
char *export_filename = NULL; int errors;
const char const *binary_prepend = "static const char gen_eu_bytes[] = {\n";
struct brw_context genasm_brw_context; struct brw_context genasm_brw_context;
struct brw_compile genasm_compile; struct brw_compile genasm_compile;
@ -57,6 +52,11 @@ struct brw_compile genasm_compile;
struct brw_program compiled_program; struct brw_program compiled_program;
struct program_defaults program_defaults = {.register_type = BRW_REGISTER_TYPE_F}; struct program_defaults program_defaults = {.register_type = BRW_REGISTER_TYPE_F};
/* 0: default output style, 1: nice C-style output */
static int binary_like_output = 0;
static char *export_filename = NULL;
static const char binary_prepend[] = "static const char gen_eu_bytes[] = {\n";
#define HASH_SIZE 37 #define HASH_SIZE 37
struct hash_item { struct hash_item {