OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/compiler: Remove final_program_size from brw_compile_*

Browse Source 
The caller can now use brw_stage_prog_data::program_size which is set
by the brw_compile_* functions.

Cc: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Jordan Justen
2017-10-21 20:55:45 -07:00
parent 540636045f
commit 3dcbc5cdaa
17 changed files with 55 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/intel/compiler/brw_compiler.h
View File

@@ -1100,7 +1100,6 @@ brw_compile_vs(const struct brw_compiler *compiler, void *log_data,
const struct nir_shader *shader,
bool use_legacy_snorm_formula,
int shader_time_index,
unsigned *final_assembly_size,
char **error_str);
/**
@@ -1116,7 +1115,6 @@ brw_compile_tcs(const struct brw_compiler *compiler,
struct brw_tcs_prog_data *prog_data,
const struct nir_shader *nir,
int shader_time_index,
unsigned *final_assembly_size,
char **error_str);
/**
@@ -1133,7 +1131,6 @@ brw_compile_tes(const struct brw_compiler *compiler, void *log_data,
const struct nir_shader *shader,
struct gl_program *prog,
int shader_time_index,
unsigned *final_assembly_size,
char **error_str);
/**
@@ -1149,7 +1146,6 @@ brw_compile_gs(const struct brw_compiler *compiler, void *log_data,
const struct nir_shader *shader,
struct gl_program *prog,
int shader_time_index,
unsigned *final_assembly_size,
char **error_str);
/**
@@ -1200,7 +1196,6 @@ brw_compile_fs(const struct brw_compiler *compiler, void *log_data,
int shader_time_index16,
bool allow_spilling,
bool use_rep_send, struct brw_vue_map *vue_map,
unsigned *final_assembly_size,
char **error_str);
/**
@@ -1215,7 +1210,6 @@ brw_compile_cs(const struct brw_compiler *compiler, void *log_data,
struct brw_cs_prog_data *prog_data,
const struct nir_shader *shader,
int shader_time_index,
unsigned *final_assembly_size,
char **error_str);
static inline uint32_t

10
src/intel/compiler/brw_fs.cpp
View File

@@ -6542,7 +6542,6 @@ brw_compile_fs(const struct brw_compiler *compiler, void *log_data,
int shader_time_index8, int shader_time_index16,
bool allow_spilling,
bool use_rep_send, struct brw_vue_map *vue_map,
unsigned *final_assembly_size,
char **error_str)
{
const struct gen_device_info *devinfo = compiler->devinfo;
@@ -6691,9 +6690,7 @@ brw_compile_fs(const struct brw_compiler *compiler, void *log_data,
prog_data->reg_blocks_0 = brw_register_blocks(simd16_grf_used);
}
const unsigned *assembly = g.get_assembly(final_assembly_size);
prog_data->base.program_size = *final_assembly_size;
return assembly;
return g.get_assembly(&prog_data->base.program_size);
}
fs_reg *
@@ -6780,7 +6777,6 @@ brw_compile_cs(const struct brw_compiler *compiler, void *log_data,
struct brw_cs_prog_data *prog_data,
const nir_shader *src_shader,
int shader_time_index,
unsigned *final_assembly_size,
char **error_str)
{
nir_shader *shader = nir_shader_clone(mem_ctx, src_shader);
@@ -6892,9 +6888,7 @@ brw_compile_cs(const struct brw_compiler *compiler, void *log_data,
g.generate_code(cfg, prog_data->simd_size);
const unsigned *assembly = g.get_assembly(final_assembly_size);
prog_data->base.program_size = *final_assembly_size;
return assembly;
return g.get_assembly(&prog_data->base.program_size);
}
/**

6
src/intel/compiler/brw_shader.cpp
View File

@@ -1157,7 +1157,6 @@ brw_compile_tes(const struct brw_compiler *compiler,
const nir_shader *src_shader,
struct gl_program *prog,
int shader_time_index,
unsigned *final_assembly_size,
char **error_str)
{
const struct gen_device_info *devinfo = compiler->devinfo;
@@ -1271,7 +1270,7 @@ brw_compile_tes(const struct brw_compiler *compiler,
g.generate_code(v.cfg, 8);
assembly = g.get_assembly(final_assembly_size);
assembly = g.get_assembly(&prog_data->base.base.program_size);
} else {
brw::vec4_tes_visitor v(compiler, log_data, key, prog_data,
nir, mem_ctx, shader_time_index);
@@ -1286,9 +1285,8 @@ brw_compile_tes(const struct brw_compiler *compiler,
assembly = brw_vec4_generate_assembly(compiler, log_data, mem_ctx, nir,
&prog_data->base, v.cfg,
final_assembly_size);
&prog_data->base.base.program_size);
}
prog_data->base.base.program_size = *final_assembly_size;
return assembly;
}

6
src/intel/compiler/brw_vec4.cpp
View File

@@ -2741,7 +2741,6 @@ brw_compile_vs(const struct brw_compiler *compiler, void *log_data,
const nir_shader *src_shader,
bool use_legacy_snorm_formula,
int shader_time_index,
unsigned *final_assembly_size,
char **error_str)
{
const bool is_scalar = compiler->scalar_stage[MESA_SHADER_VERTEX];
@@ -2880,7 +2879,7 @@ brw_compile_vs(const struct brw_compiler *compiler, void *log_data,
g.enable_debug(debug_name);
}
g.generate_code(v.cfg, 8);
assembly = g.get_assembly(final_assembly_size);
assembly = g.get_assembly(&prog_data->base.base.program_size);
}
if (!assembly) {
@@ -2898,10 +2897,9 @@ brw_compile_vs(const struct brw_compiler *compiler, void *log_data,
assembly = brw_vec4_generate_assembly(compiler, log_data, mem_ctx,
shader, &prog_data->base, v.cfg,
final_assembly_size);
&prog_data->base.base.program_size);
}
prog_data->base.base.program_size = *final_assembly_size;
return assembly;
}

18
src/intel/compiler/brw_vec4_gs_visitor.cpp
View File

@@ -618,7 +618,6 @@ brw_compile_gs(const struct brw_compiler *compiler, void *log_data,
const nir_shader *src_shader,
struct gl_program *prog,
int shader_time_index,
unsigned *final_assembly_size,
char **error_str)
{
struct brw_gs_compile c;
@@ -868,9 +867,7 @@ brw_compile_gs(const struct brw_compiler *compiler, void *log_data,
g.enable_debug(name);
}
g.generate_code(v.cfg, 8);
const unsigned *ret = g.get_assembly(final_assembly_size);
prog_data->base.base.program_size = *final_assembly_size;
return ret;
return g.get_assembly(&prog_data->base.base.program_size);
}
}
@@ -899,12 +896,10 @@ brw_compile_gs(const struct brw_compiler *compiler, void *log_data,
if (v.run()) {
/* Success! Backup is not needed */
ralloc_free(param);
const unsigned *ret =
brw_vec4_generate_assembly(compiler, log_data, mem_ctx, shader,
&prog_data->base, v.cfg,
final_assembly_size);
prog_data->base.base.program_size = *final_assembly_size;
return ret;
return brw_vec4_generate_assembly(compiler, log_data, mem_ctx,
shader, &prog_data->base, v.cfg,
&prog_data->base.base.
program_size);
} else {
/* These variables could be modified by the execution of the GS
* visitor if it packed the uniforms in the push constant buffer.
@@ -968,11 +963,10 @@ brw_compile_gs(const struct brw_compiler *compiler, void *log_data,
} else {
ret = brw_vec4_generate_assembly(compiler, log_data, mem_ctx, shader,
&prog_data->base, gs->cfg,
final_assembly_size);
&prog_data->base.base.program_size);
}
delete gs;
prog_data->base.base.program_size = *final_assembly_size;
return ret;
}

6
src/intel/compiler/brw_vec4_tcs.cpp
View File

@@ -382,7 +382,6 @@ brw_compile_tcs(const struct brw_compiler *compiler,
struct brw_tcs_prog_data *prog_data,
const nir_shader *src_shader,
int shader_time_index,
unsigned *final_assembly_size,
char **error_str)
{
const struct gen_device_info *devinfo = compiler->devinfo;
@@ -488,7 +487,7 @@ brw_compile_tcs(const struct brw_compiler *compiler,
g.generate_code(v.cfg, 8);
assembly = g.get_assembly(final_assembly_size);
assembly = g.get_assembly(&prog_data->base.base.program_size);
} else {
vec4_tcs_visitor v(compiler, log_data, key, prog_data,
nir, mem_ctx, shader_time_index, &input_vue_map);
@@ -504,10 +503,9 @@ brw_compile_tcs(const struct brw_compiler *compiler,
assembly = brw_vec4_generate_assembly(compiler, log_data, mem_ctx, nir,
&prog_data->base, v.cfg,
final_assembly_size);
&prog_data->base.base.program_size);
}
prog_data->base.base.program_size = *final_assembly_size;
return assembly;
}