mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-06 17:44:09 +00:00
Code Activity

Improved mem2reg handling in ast simplifier

Browse source
This commit is contained in:
Clifford Wolf 2013-03-24 09:27:01 +01:00
parent a0fa259d81
commit bb3357c027
2 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontends/ast/ast.h
View file

@ -165,7 +165,7 @@ namespace AST
void expand_genblock(std::string index_var, std::string prefix, std::map<std::string, std::string> &name_map); void expand_genblock(std::string index_var, std::string prefix, std::map<std::string, std::string> &name_map);
void replace_ids(std::map<std::string, std::string> &rules); void replace_ids(std::map<std::string, std::string> &rules);
void mem2reg_as_needed_pass1(std::set<AstNode*> &mem2reg_set, std::set<AstNode*> &mem2reg_candidates, bool sync_proc, bool async_proc); void mem2reg_as_needed_pass1(std::set<AstNode*> &mem2reg_set, std::set<AstNode*> &mem2reg_candidates, bool sync_proc, bool async_proc);
void mem2reg_as_needed_pass2(std::set<AstNode*> &mem2reg_set, AstNode *mod, AstNode *block); void mem2reg_as_needed_pass2(std::set<AstNode*> &mem2reg_set, AstNode *mod, AstNode *block, AstNode *top_block);
void meminfo(int &mem_width, int &mem_size, int &addr_bits); void meminfo(int &mem_width, int &mem_size, int &addr_bits);
// create a human-readable text representation of the AST (for debugging) // create a human-readable text representation of the AST (for debugging)

38
frontends/ast/simplify.cc
View file

@ -74,7 +74,7 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage)
} }
} }
mem2reg_as_needed_pass2(mem2reg_set, this, NULL); mem2reg_as_needed_pass2(mem2reg_set, this, NULL, NULL);
for (size_t i = 0; i < children.size(); i++) { for (size_t i = 0; i < children.size(); i++) {
if (mem2reg_set.count(children[i]) > 0) { if (mem2reg_set.count(children[i]) > 0) {
@ -937,6 +937,9 @@ void AstNode::mem2reg_as_needed_pass1(std::set<AstNode*> &mem2reg_set, std::set<
} }
mem2reg_candidates.insert(children[0]->id2ast); mem2reg_candidates.insert(children[0]->id2ast);
} }
if (type == AST_MEMORY && attributes.count("\\mem2reg") > 0)
mem2reg_set.insert(this);
if (type == AST_ALWAYS) { if (type == AST_ALWAYS) {
for (auto child : children) { for (auto child : children) {
@ -951,7 +954,7 @@ void AstNode::mem2reg_as_needed_pass1(std::set<AstNode*> &mem2reg_set, std::set<
} }
// actually replace memories with registers // actually replace memories with registers
void AstNode::mem2reg_as_needed_pass2(std::set<AstNode*> &mem2reg_set, AstNode *mod, AstNode *block) void AstNode::mem2reg_as_needed_pass2(std::set<AstNode*> &mem2reg_set, AstNode *mod, AstNode *block, AstNode *top_block)
{ {
if (type == AST_BLOCK) if (type == AST_BLOCK)
block = this; block = this;
@ -976,6 +979,18 @@ void AstNode::mem2reg_as_needed_pass2(std::set<AstNode*> &mem2reg_set, AstNode *
wire_data->is_reg = true; wire_data->is_reg = true;
mod->children.push_back(wire_data); mod->children.push_back(wire_data);
assert(top_block != NULL);
std::vector<RTLIL::State> x_bits;
x_bits.push_back(RTLIL::State::Sx);
AstNode *assign_addr_x = new AstNode(AST_ASSIGN_EQ, new AstNode(AST_IDENTIFIER), AstNode::mkconst_bits(x_bits, false));
assign_addr_x->children[0]->str = id_addr;
top_block->children.insert(top_block->children.begin(), assign_addr_x);
AstNode *assign_data_x = new AstNode(AST_ASSIGN_EQ, new AstNode(AST_IDENTIFIER), AstNode::mkconst_bits(x_bits, false));
assign_data_x->children[0]->str = id_data;
top_block->children.insert(top_block->children.begin(), assign_data_x);
assert(block != NULL); assert(block != NULL);
size_t assign_idx = 0; size_t assign_idx = 0;
while (assign_idx < block->children.size() && block->children[assign_idx] != this) while (assign_idx < block->children.size() && block->children[assign_idx] != this)
@ -1048,6 +1063,17 @@ void AstNode::mem2reg_as_needed_pass2(std::set<AstNode*> &mem2reg_set, AstNode *
cond_node->children[1]->children.push_back(assign_reg); cond_node->children[1]->children.push_back(assign_reg);
case_node->children.push_back(cond_node); case_node->children.push_back(cond_node);
if (top_block)
{
AstNode *assign_addr_x = new AstNode(AST_ASSIGN_EQ, new AstNode(AST_IDENTIFIER), AstNode::mkconst_bits(x_bits, false));
assign_addr_x->children[0]->str = id_addr;
top_block->children.insert(top_block->children.begin(), assign_addr_x);
AstNode *assign_data_x = new AstNode(AST_ASSIGN_EQ, new AstNode(AST_IDENTIFIER), AstNode::mkconst_bits(x_bits, false));
assign_data_x->children[0]->str = id_data;
top_block->children.insert(top_block->children.begin(), assign_data_x);
}
if (block) if (block)
{ {
size_t assign_idx = 0; size_t assign_idx = 0;
@ -1075,8 +1101,12 @@ void AstNode::mem2reg_as_needed_pass2(std::set<AstNode*> &mem2reg_set, AstNode *
assert(id2ast == NULL || mem2reg_set.count(id2ast) == 0); assert(id2ast == NULL || mem2reg_set.count(id2ast) == 0);
for (size_t i = 0; i < children.size(); i++) auto children_list = children;
children[i]->mem2reg_as_needed_pass2(mem2reg_set, mod, block); for (size_t i = 0; i < children_list.size(); i++) {
if (type == AST_ALWAYS && children_list[i]->type == AST_BLOCK)
top_block = children_list[i];
children_list[i]->mem2reg_as_needed_pass2(mem2reg_set, mod, block, top_block);
}
} }
// calulate memory dimensions // calulate memory dimensions