mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-13 04:28:18 +00:00
Code Activity

review fixes

Browse source
This commit is contained in:
Marcin Kościelnicki 2019-08-13 00:35:54 +00:00
parent f4c62f33ac
commit c6d5b97b98
4 changed files with 34 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG
View file

@ -19,6 +19,9 @@ Yosys 0.9 .. Yosys 0.9-dev
- Added automatic gzip compression (based on filename extension) for backends - Added automatic gzip compression (based on filename extension) for backends
- Improve attribute and parameter encoding in JSON to avoid ambiguities between - Improve attribute and parameter encoding in JSON to avoid ambiguities between
bit vectors and strings containing [01xz]* bit vectors and strings containing [01xz]*
- Added "clkbufmap" pass
- Added "synth_xilinx -ise" for Spartan 6 (experimental)
- "synth_xilinx" now automatically inserts clock buffers
Yosys 0.8 .. Yosys 0.8-dev Yosys 0.8 .. Yosys 0.8-dev
-------------------------- --------------------------

18
passes/techmap/clkbufmap.cc
View file

@ -2,6 +2,7 @@
* yosys -- Yosys Open SYnthesis Suite * yosys -- Yosys Open SYnthesis Suite
* *
* Copyright (C) 2012 Clifford Wolf <clifford@clifford.at> * Copyright (C) 2012 Clifford Wolf <clifford@clifford.at>
* Copyright (C) 2019 Marcin Kościelnicki <mwk@0x04.net>
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -32,19 +33,6 @@ void split_portname_pair(std::string &port1, std::string &port2)
} }
} }
std::vector<std::string> split(std::string text, const char *delim)
{
std::vector<std::string> list;
char *p = strdup(text.c_str());
char *t = strtok(p, delim);
while (t != NULL) {
list.push_back(t);
t = strtok(NULL, delim);
}
free(p);
return list;
}
struct ClkbufmapPass : public Pass { struct ClkbufmapPass : public Pass {
ClkbufmapPass() : Pass("clkbufmap", "insert global buffers on clock networks") { } ClkbufmapPass() : Pass("clkbufmap", "insert global buffers on clock networks") { }
void help() YS_OVERRIDE void help() YS_OVERRIDE
@ -127,7 +115,7 @@ struct ClkbufmapPass : public Pass {
auto it = module->attributes.find("\\clkbuf_driver"); auto it = module->attributes.find("\\clkbuf_driver");
if (it != module->attributes.end()) { if (it != module->attributes.end()) {
auto value = it->second.decode_string(); auto value = it->second.decode_string();
for (auto name : split(value, ",")) { for (auto name : split_tokens(value, ",")) {
auto wire = module->wire(RTLIL::escape_id(name)); auto wire = module->wire(RTLIL::escape_id(name));
if (!wire) if (!wire)
log_error("Module %s does not have port %s.\n", log_id(module), log_id(name)); log_error("Module %s does not have port %s.\n", log_id(module), log_id(name));
@ -138,7 +126,7 @@ struct ClkbufmapPass : public Pass {
it = module->attributes.find("\\clkbuf_sink"); it = module->attributes.find("\\clkbuf_sink");
if (it != module->attributes.end()) { if (it != module->attributes.end()) {
auto value = it->second.decode_string(); auto value = it->second.decode_string();
for (auto name : split(value, ",")) { for (auto name : split_tokens(value, ",")) {
auto wire = module->wire(RTLIL::escape_id(name)); auto wire = module->wire(RTLIL::escape_id(name));
if (!wire) if (!wire)
log_error("Module %s does not have port %s.\n", log_id(module), log_id(name)); log_error("Module %s does not have port %s.\n", log_id(module), log_id(name));

15
passes/techmap/iopadmap.cc
View file

@ -32,19 +32,6 @@ void split_portname_pair(std::string &port1, std::string &port2)
} }
} }
std::vector<std::string> split(std::string text, const char *delim)
{
std::vector<std::string> list;
char *p = strdup(text.c_str());
char *t = strtok(p, delim);
while (t != NULL) {
list.push_back(t);
t = strtok(NULL, delim);
}
free(p);
return list;
}
struct IopadmapPass : public Pass { struct IopadmapPass : public Pass {
IopadmapPass() : Pass("iopadmap", "technology mapping of i/o pads (or buffers)") { } IopadmapPass() : Pass("iopadmap", "technology mapping of i/o pads (or buffers)") { }
void help() YS_OVERRIDE void help() YS_OVERRIDE
@ -190,7 +177,7 @@ struct IopadmapPass : public Pass {
auto it = module->attributes.find("\\iopad_external_pin"); auto it = module->attributes.find("\\iopad_external_pin");
if (it != module->attributes.end()) { if (it != module->attributes.end()) {
auto value = it->second.decode_string(); auto value = it->second.decode_string();
for (auto name : split(value, ",")) { for (auto name : split_tokens(value, ",")) {
ignore.insert(make_pair(module->name, RTLIL::escape_id(name))); ignore.insert(make_pair(module->name, RTLIL::escape_id(name)));
} }
} }

45
techlibs/xilinx/synth_xilinx.cc
View file

@ -81,12 +81,15 @@ struct SynthXilinxPass : public ScriptPass
log(" -nowidelut\n"); log(" -nowidelut\n");
log(" do not use MUXF[78] resources to implement LUTs larger than LUT6s\n"); log(" do not use MUXF[78] resources to implement LUTs larger than LUT6s\n");
log("\n"); log("\n");
log(" -iopads\n"); log(" -iopad\n");
log(" perform I/O buffer insertion (selected automatically by -ise)\n"); log(" enable I/O buffer insertion (selected automatically by -ise)\n");
log("\n"); log("\n");
log(" -noiopads\n"); log(" -noiopad\n");
log(" disable I/O buffer insertion (only useful with -ise)\n"); log(" disable I/O buffer insertion (only useful with -ise)\n");
log("\n"); log("\n");
log(" -noclkbuf\n");
log(" disable automatic clock buffer insertion\n");
log("\n");
log(" -widemux <int>\n"); log(" -widemux <int>\n");
log(" enable inference of hard multiplexer resources (MUXF[78]) for muxes at or\n"); log(" enable inference of hard multiplexer resources (MUXF[78]) for muxes at or\n");
log(" above this number of inputs (minimum value 2, recommended value >= 5).\n"); log(" above this number of inputs (minimum value 2, recommended value >= 5).\n");
@ -113,7 +116,7 @@ struct SynthXilinxPass : public ScriptPass
} }
std::string top_opt, edif_file, blif_file, family; std::string top_opt, edif_file, blif_file, family;
bool flatten, retime, vpr, ise, iopads, noiopads, nobram, nodram, nosrl, nocarry, nowidelut, abc9; bool flatten, retime, vpr, ise, iopad, noiopad, noclkbuf, nobram, nodram, nosrl, nocarry, nowidelut, abc9;
int widemux; int widemux;
void clear_flags() YS_OVERRIDE void clear_flags() YS_OVERRIDE
@ -126,8 +129,9 @@ struct SynthXilinxPass : public ScriptPass
retime = false; retime = false;
vpr = false; vpr = false;
ise = false; ise = false;
iopads = false; iopad = false;
noiopads = false; noiopad = false;
noclkbuf = false;
nocarry = false; nocarry = false;
nobram = false; nobram = false;
nodram = false; nodram = false;
@ -194,12 +198,16 @@ struct SynthXilinxPass : public ScriptPass
ise = true; ise = true;
continue; continue;
} }
if (args[argidx] == "-iopads") { if (args[argidx] == "-iopad") {
iopads = true; iopad = true;
continue; continue;
} }
if (args[argidx] == "-noiopads") { if (args[argidx] == "-noiopad") {
noiopads = true; noiopad = true;
continue;
}
if (args[argidx] == "-noclkbuf") {
noclkbuf = true;
continue; continue;
} }
if (args[argidx] == "-nocarry") { if (args[argidx] == "-nocarry") {
@ -435,14 +443,15 @@ struct SynthXilinxPass : public ScriptPass
} }
if (check_label("finalize")) { if (check_label("finalize")) {
bool do_iopads = iopads || (ise && !noiopads); bool do_iopad = iopad || (ise && !noiopad);
if (help_mode || do_iopads) if (help_mode || !noclkbuf) {
run("clkbufmap -buf BUFG O:I -inpad IBUFG O:I", "(-inpad passed if '-iopads' or '-ise' and not '-noiopads')"); if (help_mode || do_iopad)
else run("clkbufmap -buf BUFG O:I -inpad IBUFG O:I", "(skip if '-noclkbuf', '-inpad' passed if '-iopad' or '-ise' and not '-noiopad')");
run("clkbufmap -buf BUFG O:I"); else
run("clkbufmap -buf BUFG O:I");
if (do_iopads) }
run("iopadmap -bits -outpad OBUF I:O -inpad IBUF O:I A:top", "(only if '-iopads' or '-ise' and not '-noiopads')"); if (do_iopad)
run("iopadmap -bits -outpad OBUF I:O -inpad IBUF O:I A:top", "(only if '-iopad' or '-ise' and not '-noiopad')");
} }
if (check_label("check")) { if (check_label("check")) {