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

glsl: use the linear allocator in opt_constant_propagation

Browse Source 
Tested-by: Edmondo Tommasina <edmondo.tommasina@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák
2016-10-07 20:57:04 +02:00
parent 565b2c4c4b
commit 21e11b5282
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/compiler/glsl/opt_constant_propagation.cpp
View File

@@ -47,6 +47,9 @@ namespace {
class acp_entry : public exec_node class acp_entry : public exec_node
{ {
public: public:
/* override operator new from exec_node */
DECLARE_LINEAR_ZALLOC_CXX_OPERATORS(acp_entry)
acp_entry(ir_variable *var, unsigned write_mask, ir_constant *constant) acp_entry(ir_variable *var, unsigned write_mask, ir_constant *constant)
{ {
assert(var); assert(var);
@@ -77,6 +80,9 @@ public:
class kill_entry : public exec_node class kill_entry : public exec_node
{ {
public: public:
/* override operator new from exec_node */
DECLARE_LINEAR_ZALLOC_CXX_OPERATORS(kill_entry)
kill_entry(ir_variable *var, unsigned write_mask) kill_entry(ir_variable *var, unsigned write_mask)
{ {
assert(var); assert(var);
@@ -95,6 +101,7 @@ public:
progress = false; progress = false;
killed_all = false; killed_all = false;
mem_ctx = ralloc_context(0); mem_ctx = ralloc_context(0);
this->lin_ctx = linear_alloc_parent(this->mem_ctx, 0);
this->acp = new(mem_ctx) exec_list; this->acp = new(mem_ctx) exec_list;
this->kills = _mesa_hash_table_create(mem_ctx, _mesa_hash_pointer, this->kills = _mesa_hash_table_create(mem_ctx, _mesa_hash_pointer,
_mesa_key_pointer_equal); _mesa_key_pointer_equal);
@@ -132,6 +139,7 @@ public:
bool killed_all; bool killed_all;
void *mem_ctx; void *mem_ctx;
void *lin_ctx;
}; };
@@ -354,7 +362,7 @@ ir_constant_propagation_visitor::handle_if_block(exec_list *instructions)
/* Populate the initial acp with a constant of the original */ /* Populate the initial acp with a constant of the original */
foreach_in_list(acp_entry, a, orig_acp) { foreach_in_list(acp_entry, a, orig_acp) {
this->acp->push_tail(new(this->mem_ctx) acp_entry(a)); this->acp->push_tail(new(this->lin_ctx) acp_entry(a));
} }
visit_list_elements(this, instructions); visit_list_elements(this, instructions);
@@ -454,7 +462,7 @@ ir_constant_propagation_visitor::kill(ir_variable *var, unsigned write_mask)
} }
/* Not already in the hash table. Make new entry. */ /* Not already in the hash table. Make new entry. */
_mesa_hash_table_insert(this->kills, var, _mesa_hash_table_insert(this->kills, var,
new(this->mem_ctx) kill_entry(var, write_mask)); new(this->lin_ctx) kill_entry(var, write_mask));
} }
/** /**
@@ -493,7 +501,7 @@ ir_constant_propagation_visitor::add_constant(ir_assignment *ir)
deref->var->data.mode == ir_var_shader_shared) deref->var->data.mode == ir_var_shader_shared)
return; return;
entry = new(this->mem_ctx) acp_entry(deref->var, ir->write_mask, constant); entry = new(this->lin_ctx) acp_entry(deref->var, ir->write_mask, constant);
this->acp->push_tail(entry); this->acp->push_tail(entry);
} }