riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #36 from hansiglaser/master 

Various changes merged
This commit is contained in:
Clifford Wolf 2014-05-29 10:26:55 +02:00
parent 68c059565a 278085fa01
commit 61883b30f3
4 changed files with 54 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
frontends/liberty/liberty.cc
View File

@ -459,6 +459,13 @@ struct LibertyFrontend : public Frontend {
log(" ignore re-definitions of modules. (the default behavior is to\n"); log(" ignore re-definitions of modules. (the default behavior is to\n");
log(" create an error message.)\n"); log(" create an error message.)\n");
log("\n"); log("\n");
log(" -ignore_miss_func\n");
log(" ignore cells with missing function specification of outputs\n");
log("\n");
log(" -ignore_miss_dir\n");
log(" ignore cells with a missing or invalid direction\n");
log(" specification on a pin\n");
log("\n");
log(" -setattr <attribute_name>\n"); log(" -setattr <attribute_name>\n");
log(" set the specified attribute (to the value 1) on all loaded modules\n"); log(" set the specified attribute (to the value 1) on all loaded modules\n");
log("\n"); log("\n");
@ -467,6 +474,8 @@ struct LibertyFrontend : public Frontend {
{ {
bool flag_lib = false; bool flag_lib = false;
bool flag_ignore_redef = false; bool flag_ignore_redef = false;
bool flag_ignore_miss_func = false;
bool flag_ignore_miss_dir = false;
std::vector<std::string> attributes; std::vector<std::string> attributes;
log_header("Executing Liberty frontend.\n"); log_header("Executing Liberty frontend.\n");
@ -482,6 +491,14 @@ struct LibertyFrontend : public Frontend {
flag_ignore_redef = true; flag_ignore_redef = true;
continue; continue;
} }
if (arg == "-ignore_miss_func") {
flag_ignore_miss_func = true;
continue;
}
if (arg == "-ignore_miss_dir") {
flag_ignore_miss_dir = true;
continue;
}
if (arg == "-setattr" && argidx+1 < args.size()) { if (arg == "-setattr" && argidx+1 < args.size()) {
attributes.push_back(RTLIL::escape_id(args[++argidx])); attributes.push_back(RTLIL::escape_id(args[++argidx]));
continue; continue;
@ -507,11 +524,9 @@ struct LibertyFrontend : public Frontend {
} }
// log("Processing cell type %s.\n", RTLIL::id2cstr(cell_name)); // log("Processing cell type %s.\n", RTLIL::id2cstr(cell_name));
cell_count++;
RTLIL::Module *module = new RTLIL::Module; RTLIL::Module *module = new RTLIL::Module;
module->name = cell_name; module->name = cell_name;
design->modules[module->name] = module;
for (auto &attr : attributes) for (auto &attr : attributes)
module->attributes[attr] = 1; module->attributes[attr] = 1;
@ -520,7 +535,16 @@ struct LibertyFrontend : public Frontend {
if (node->id == "pin" && node->args.size() == 1) { if (node->id == "pin" && node->args.size() == 1) {
LibertyAst *dir = node->find("direction"); LibertyAst *dir = node->find("direction");
if (!dir || (dir->value != "input" && dir->value != "output" && dir->value != "internal")) if (!dir || (dir->value != "input" && dir->value != "output" && dir->value != "internal"))
log_error("Missing or invalid dircetion for pin %s of cell %s.\n", node->args.at(0).c_str(), RTLIL::id2cstr(module->name)); {
if (!flag_ignore_miss_dir)
{
log_error("Missing or invalid dircetion for pin %s of cell %s.\n", node->args.at(0).c_str(), RTLIL::id2cstr(module->name));
} else {
log("Ignoring cell %s with missing or invalid dircetion for pin %s.\n", RTLIL::id2cstr(module->name), node->args.at(0).c_str());
delete module;
goto skip_cell;
}
}
if (!flag_lib || dir->value != "internal") if (!flag_lib || dir->value != "internal")
module->new_wire(1, RTLIL::escape_id(node->args.at(0))); module->new_wire(1, RTLIL::escape_id(node->args.at(0)));
} }
@ -556,7 +580,16 @@ struct LibertyFrontend : public Frontend {
LibertyAst *func = node->find("function"); LibertyAst *func = node->find("function");
if (func == NULL) if (func == NULL)
log_error("Missing function on output %s of cell %s.\n", RTLIL::id2cstr(wire->name), RTLIL::id2cstr(module->name)); {
if (!flag_ignore_miss_func)
{
log_error("Missing function on output %s of cell %s.\n", RTLIL::id2cstr(wire->name), RTLIL::id2cstr(module->name));
} else {
log("Ignoring cell %s with missing function on output %s.\n", RTLIL::id2cstr(module->name), RTLIL::id2cstr(wire->name));
delete module;
goto skip_cell;
}
}
RTLIL::SigSpec out_sig = parse_func_expr(module, func->value.c_str()); RTLIL::SigSpec out_sig = parse_func_expr(module, func->value.c_str());
module->connections.push_back(RTLIL::SigSig(wire, out_sig)); module->connections.push_back(RTLIL::SigSig(wire, out_sig));
@ -564,6 +597,9 @@ struct LibertyFrontend : public Frontend {
} }
module->fixup_ports(); module->fixup_ports();
design->modules[module->name] = module;
cell_count++;
skip_cell:;
} }
log("Imported %d cell types from liberty file.\n", cell_count); log("Imported %d cell types from liberty file.\n", cell_count);

8
passes/sat/expose.cc
View File

@ -259,6 +259,8 @@ struct ExposePass : public Pass {
bool flag_evert_dff = false; bool flag_evert_dff = false;
std::string sep = "."; std::string sep = ".";
log_header("Executing EXPOSE pass (exposing internal signals as outputs).\n");
size_t argidx; size_t argidx;
for (argidx = 1; argidx < args.size(); argidx++) for (argidx = 1; argidx < args.size(); argidx++)
{ {
@ -629,7 +631,7 @@ struct ExposePass : public Pass {
w->port_input = true; w->port_input = true;
add_new_wire(module, w); add_new_wire(module, w);
log("New module port: %s/%s\n", RTLIL::id2cstr(module->name), RTLIL::id2cstr(w->name)); log("New module port: %s/%s (%s)\n", RTLIL::id2cstr(module->name), RTLIL::id2cstr(w->name), RTLIL::id2cstr(cell->type));
RTLIL::SigSpec sig; RTLIL::SigSpec sig;
if (cell->connections.count(p->name) != 0) if (cell->connections.count(p->name) != 0)
@ -654,7 +656,7 @@ struct ExposePass : public Pass {
w->port_input = true; w->port_input = true;
add_new_wire(module, w); add_new_wire(module, w);
log("New module port: %s/%s\n", RTLIL::id2cstr(module->name), RTLIL::id2cstr(w->name)); log("New module port: %s/%s (%s)\n", RTLIL::id2cstr(module->name), RTLIL::id2cstr(w->name), RTLIL::id2cstr(cell->type));
if (w->port_input) if (w->port_input)
module->connections.push_back(RTLIL::SigSig(it.second, w)); module->connections.push_back(RTLIL::SigSig(it.second, w));
@ -667,7 +669,7 @@ struct ExposePass : public Pass {
} }
for (auto &it : delete_cells) { for (auto &it : delete_cells) {
log("Removing cell: %s/%s\n", RTLIL::id2cstr(module->name), RTLIL::id2cstr(it)); log("Removing cell: %s/%s (%s)\n", RTLIL::id2cstr(module->name), RTLIL::id2cstr(it), RTLIL::id2cstr(module->cells.at(it)->type));
delete module->cells.at(it); delete module->cells.at(it);
module->cells.erase(it); module->cells.erase(it);
} }

4
passes/sat/miter.cc
View File

@ -28,6 +28,8 @@ static void create_miter_equiv(struct Pass *that, std::vector<std::string> args,
bool flag_make_outcmp = false; bool flag_make_outcmp = false;
bool flag_make_assert = false; bool flag_make_assert = false;
log_header("Executing MITER pass (creating miter circuit).\n");
size_t argidx; size_t argidx;
for (argidx = 2; argidx < args.size(); argidx++) for (argidx = 2; argidx < args.size(); argidx++)
{ {
@ -102,6 +104,8 @@ static void create_miter_equiv(struct Pass *that, std::vector<std::string> args,
log_cmd_error("No matching port in gold module was found for %s!\n", it.second->name.c_str()); log_cmd_error("No matching port in gold module was found for %s!\n", it.second->name.c_str());
} }
log("Creating miter cell \"%s\" with gold cell \"%s\" and gate cell \"%s\".\n", RTLIL::id2cstr(miter_name), RTLIL::id2cstr(gold_name), RTLIL::id2cstr(gate_name));
RTLIL::Module *miter_module = new RTLIL::Module; RTLIL::Module *miter_module = new RTLIL::Module;
miter_module->name = miter_name; miter_module->name = miter_name;
design->modules[miter_name] = miter_module; design->modules[miter_name] = miter_module;

6
passes/techmap/techmap.cc
View File

@ -106,8 +106,12 @@ struct TechmapWorker
if (tpl->memories.size() != 0) if (tpl->memories.size() != 0)
log_error("Technology map yielded memories -> this is not supported.\n"); log_error("Technology map yielded memories -> this is not supported.\n");
if (tpl->processes.size() != 0) if (tpl->processes.size() != 0) {
log("Technology map yielded processes:\n");
for (auto &it : tpl->processes)
log(" %s",RTLIL::id2cstr(it.first));
log_error("Technology map yielded processes -> this is not supported.\n"); log_error("Technology map yielded processes -> this is not supported.\n");
}
// erase from namespace first for _TECHMAP_REPLACE_ to work // erase from namespace first for _TECHMAP_REPLACE_ to work
module->cells.erase(cell->name); module->cells.erase(cell->name);