KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i965/vec4: Delete the system value infastructure 

The only thing still using it is INVOCATION_ID for geometry shaders.
That's easily enough inlined into the nir_intrinsic_load_invocation_id
handling code.

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand 2017-05-05 14:31:41 -07:00
parent 2e9916ea04
commit 037ce253b1
11 changed files with 5 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/intel/compiler/brw_vec4.h
View File

@ -332,8 +332,6 @@ public:
virtual void emit_nir_code();
virtual void nir_setup_uniforms();
virtual void nir_setup_system_value_intrinsic(nir_intrinsic_instr *instr);
virtual void nir_setup_system_values();
virtual void nir_emit_impl(nir_function_impl *impl);
virtual void nir_emit_cf_list(exec_list *list);
virtual void nir_emit_if(nir_if *if_stmt);
@ -359,11 +357,8 @@ public:
unsigned num_components = 4);
src_reg get_indirect_offset(nir_intrinsic_instr *instr);
virtual dst_reg *make_reg_for_system_value(int location) = 0;
dst_reg *nir_locals;
dst_reg *nir_ssa_values;
dst_reg *nir_system_values;
protected:
void emit_vertex();

32
src/intel/compiler/brw_vec4_gs_nir.cpp
View File

@ -30,28 +30,6 @@ vec4_gs_visitor::nir_setup_inputs()
{
}
void
vec4_gs_visitor::nir_setup_system_value_intrinsic(nir_intrinsic_instr *instr)
{
dst_reg *reg;
switch (instr->intrinsic) {
case nir_intrinsic_load_primitive_id:
/* We'll just read g1 directly; don't create a temporary. */
break;
case nir_intrinsic_load_invocation_id:
reg = &this->nir_system_values[SYSTEM_VALUE_INVOCATION_ID];
if (reg->file == BAD_FILE)
*reg = *this->make_reg_for_system_value(SYSTEM_VALUE_INVOCATION_ID);
break;
default:
vec4_visitor::nir_setup_system_value_intrinsic(instr);
}
}
void
vec4_gs_visitor::nir_emit_intrinsic(nir_intrinsic_instr *instr)
{
@ -128,11 +106,11 @@ vec4_gs_visitor::nir_emit_intrinsic(nir_intrinsic_instr *instr)
break;
case nir_intrinsic_load_invocation_id: {
src_reg invocation_id =
src_reg(nir_system_values[SYSTEM_VALUE_INVOCATION_ID]);
assert(invocation_id.file != BAD_FILE);
dest = get_nir_dest(instr->dest, invocation_id.type);
emit(MOV(dest, invocation_id));
dest = get_nir_dest(instr->dest, BRW_REGISTER_TYPE_D);
if (gs_prog_data->invocations > 1)
emit(GS_OPCODE_GET_INSTANCE_ID, dest);
else
emit(MOV(dest, brw_imm_ud(0)));
break;
}

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

@ -53,26 +53,6 @@ vec4_gs_visitor::vec4_gs_visitor(const struct brw_compiler *compiler,
}
dst_reg *
vec4_gs_visitor::make_reg_for_system_value(int location)
{
dst_reg *reg = new(mem_ctx) dst_reg(this, glsl_type::int_type);
switch (location) {
case SYSTEM_VALUE_INVOCATION_ID:
this->current_annotation = "initialize gl_InvocationID";
if (gs_prog_data->invocations > 1)
emit(GS_OPCODE_GET_INSTANCE_ID, *reg);
else
emit(MOV(*reg, brw_imm_ud(0)));
break;
default:
unreachable("not reached");
}
return reg;
}
static inline struct brw_reg
attribute_to_hw_reg(int attr, brw_reg_type type, bool interleaved)
{

2
src/intel/compiler/brw_vec4_gs_visitor.h
View File

@ -50,10 +50,8 @@ public:
int shader_time_index);
virtual void nir_setup_inputs();
virtual void nir_setup_system_value_intrinsic(nir_intrinsic_instr *instr);
protected:
virtual dst_reg *make_reg_for_system_value(int location);
virtual void setup_payload();
virtual void emit_prolog();
virtual void emit_thread_end();

38
src/intel/compiler/brw_vec4_nir.cpp
View File

@ -37,8 +37,6 @@ vec4_visitor::emit_nir_code()
if (nir->num_uniforms > 0)
nir_setup_uniforms();
nir_setup_system_values();
/* get the main function and emit it */
nir_foreach_function(function, nir) {
assert(strcmp(function->name, "main") == 0);
@ -47,42 +45,6 @@ vec4_visitor::emit_nir_code()
}
}
void
vec4_visitor::nir_setup_system_value_intrinsic(nir_intrinsic_instr *instr)
{
}
static bool
setup_system_values_block(nir_block *block, vec4_visitor *v)
{
nir_foreach_instr(instr, block) {
if (instr->type != nir_instr_type_intrinsic)
continue;
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
v->nir_setup_system_value_intrinsic(intrin);
}
return true;
}
void
vec4_visitor::nir_setup_system_values()
{
nir_system_values = ralloc_array(mem_ctx, dst_reg, SYSTEM_VALUE_MAX);
for (unsigned i = 0; i < SYSTEM_VALUE_MAX; i++) {
nir_system_values[i] = dst_reg();
}
nir_foreach_function(function, nir) {
assert(strcmp(function->name, "main") == 0);
assert(function->impl);
nir_foreach_block(block, function->impl) {
setup_system_values_block(block, this);
}
}
}
void
vec4_visitor::nir_setup_uniforms()
{

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

@ -49,18 +49,6 @@ vec4_tcs_visitor::vec4_tcs_visitor(const struct brw_compiler *compiler,
}
void
vec4_tcs_visitor::nir_setup_system_value_intrinsic(nir_intrinsic_instr *instr)
{
}
dst_reg *
vec4_tcs_visitor::make_reg_for_system_value(int location)
{
return NULL;
}
void
vec4_tcs_visitor::setup_payload()
{

2
src/intel/compiler/brw_vec4_tcs.h
View File

@ -49,8 +49,6 @@ public:
const struct brw_vue_map *input_vue_map);
protected:
virtual dst_reg *make_reg_for_system_value(int location);
virtual void nir_setup_system_value_intrinsic(nir_intrinsic_instr *instr);
virtual void setup_payload();
virtual void emit_prolog();
virtual void emit_thread_end();

20
src/intel/compiler/brw_vec4_tes.cpp
View File

@ -45,26 +45,6 @@ vec4_tes_visitor::vec4_tes_visitor(const struct brw_compiler *compiler,
{
}
dst_reg *
vec4_tes_visitor::make_reg_for_system_value(int location)
{
return NULL;
}
void
vec4_tes_visitor::nir_setup_system_value_intrinsic(nir_intrinsic_instr *instr)
{
switch (instr->intrinsic) {
case nir_intrinsic_load_tess_level_outer:
case nir_intrinsic_load_tess_level_inner:
break;
default:
vec4_visitor::nir_setup_system_value_intrinsic(instr);
}
}
void
vec4_tes_visitor::setup_payload()
{

2
src/intel/compiler/brw_vec4_tes.h
View File

@ -47,8 +47,6 @@ public:
int shader_time_index);
protected:
virtual dst_reg *make_reg_for_system_value(int location);
virtual void nir_setup_system_value_intrinsic(nir_intrinsic_instr *instr);
virtual void nir_emit_intrinsic(nir_intrinsic_instr *instr);
virtual void setup_payload();

1
src/intel/compiler/brw_vec4_vs.h
View File

@ -42,7 +42,6 @@ public:
bool use_legacy_snorm_formula);
protected:
virtual dst_reg *make_reg_for_system_value(int location);
virtual void setup_payload();
virtual void emit_prolog();
virtual void emit_thread_end();

8
src/intel/compiler/brw_vec4_vs_visitor.cpp
View File

@ -33,14 +33,6 @@ vec4_vs_visitor::emit_prolog()
}
dst_reg *
vec4_vs_visitor::make_reg_for_system_value(int location)
{
unreachable("not reached");
return NULL;
}
void
vec4_vs_visitor::emit_urb_write_header(int mrf)
{