Skip to content

Commit 45b723d

Browse files
akashlevyakashlevy
authored
Merge branch 'YosysHQ:main' into master
2 parents 501b504 + 34d9a74 commit 45b723d

File tree

13 files changed

+69
-33
lines changed

13 files changed

+69
-33
lines changed

‎frontends/ast/genrtlil.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2224,7 +2224,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
22242224
else
22252225
input_error("FATAL.\n");
22262226
} else {
2227-
input_error("Unknown elabortoon system task '%s'.\n", str.c_str());
2227+
input_error("Unknown elaboration system task '%s'.\n", str.c_str());
22282228
}
22292229
} break;
22302230

‎kernel/driver.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ int main(int argc, char **argv)
356356
printf(" -V\n");
357357
printf(" print version information and exit\n");
358358
printf("\n");
359-
printf("The option -S is an shortcut for calling the \"synth\" command, a default\n");
359+
printf("The option -S is a shortcut for calling the \"synth\" command, a default\n");
360360
printf("script for transforming the Verilog input to a gate-level netlist. For example:\n");
361361
printf("\n");
362362
printf(" yosys -o output.blif -S input.v\n");

‎passes/hierarchy/hierarchy.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void generate(RTLIL::Design *design, const std::vector<std::string> &celltypes,
4747
{
4848
if (design->module(cell->type) != nullptr)
4949
continue;
50-
if (cell->type.begins_with("$__"))
50+
if (cell->type.begins_with("$") && !cell->type.begins_with("$__"))
5151
continue;
5252
for (auto &pattern : celltypes)
5353
if (patmatch(pattern.c_str(), RTLIL::unescape_id(cell->type).c_str()))

‎passes/pmgen/ice40_dsp.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ struct Ice40DspPass : public Pass {
289289
log("\n");
290290
log("Pack input registers (A, B, {C,D}; with optional hold), pipeline registers\n");
291291
log("({F,J,K,G}, H), output registers (O -- full 32-bits or lower 16-bits only; with\n");
292-
log("optional hold), and post-adder into into the SB_MAC16 resource.\n");
292+
log("optional hold), and post-adder into the SB_MAC16 resource.\n");
293293
log("\n");
294294
log("Multiply-accumulate operations using the post-adder with feedback on the {C,D}\n");
295295
log("input will be folded into the DSP. In this scenario only, resetting the\n");

‎techlibs/anlogic/synth_anlogic.cc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,14 @@ struct SynthAnlogicPass : public ScriptPass
169169
if (check_label("map_ram"))
170170
{
171171
std::string args = "";
172-
if (nobram)
173-
args += " -no-auto-block";
174-
if (nolutram)
175-
args += " -no-auto-distributed";
176172
if (help_mode)
177173
args += " [-no-auto-block] [-no-auto-distributed]";
174+
else {
175+
if (nobram)
176+
args += " -no-auto-block";
177+
if (nolutram)
178+
args += " -no-auto-distributed";
179+
}
178180
run("memory_libmap -lib +/anlogic/lutrams.txt -lib +/anlogic/brams.txt" + args, "(-no-auto-block if -nobram, -no-auto-distributed if -nolutram)");
179181
run("techmap -map +/anlogic/lutrams_map.v -map +/anlogic/brams_map.v");
180182
}

‎techlibs/ecp5/synth_ecp5.cc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,12 +308,14 @@ struct SynthEcp5Pass : public ScriptPass
308308
if (check_label("map_ram"))
309309
{
310310
std::string args = "";
311-
if (nobram)
312-
args += " -no-auto-block";
313-
if (nolutram)
314-
args += " -no-auto-distributed";
315311
if (help_mode)
316312
args += " [-no-auto-block] [-no-auto-distributed]";
313+
else {
314+
if (nobram)
315+
args += " -no-auto-block";
316+
if (nolutram)
317+
args += " -no-auto-distributed";
318+
}
317319
run("memory_libmap -lib +/ecp5/lutrams.txt -lib +/ecp5/brams.txt" + args, "(-no-auto-block if -nobram, -no-auto-distributed if -nolutram)");
318320
run("techmap -map +/ecp5/lutrams_map.v -map +/ecp5/brams_map.v");
319321
}

‎techlibs/efinix/synth_efinix.cc

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,13 @@ struct SynthEfinixPass : public ScriptPass
161161
if (check_label("map_ram"))
162162
{
163163
std::string args = "";
164-
if (nobram)
165-
args += " -no-auto-block";
166-
run("memory_libmap -lib +/efinix/brams.txt" + args);
164+
if (help_mode)
165+
args += " [-no-auto-block]";
166+
else {
167+
if (nobram)
168+
args += " -no-auto-block";
169+
}
170+
run("memory_libmap -lib +/efinix/brams.txt" + args, "(-no-auto-block if -nobram)");
167171
run("techmap -map +/efinix/brams_map.v");
168172
}
169173

‎techlibs/fabulous/synth_fabulous.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ struct SynthPass : public ScriptPass
320320
run("opt_clean");
321321
}
322322

323-
if (check_label("map_ram")) {
323+
if (check_label("map_ram", "(unless -noregfile)")) {
324324
// RegFile extraction
325325
if (!noregfile) {
326326
run("memory_libmap -lib +/fabulous/ram_regfile.txt");
@@ -342,7 +342,7 @@ struct SynthPass : public ScriptPass
342342
}
343343

344344
if (check_label("map_iopad", "(if -iopad)")) {
345-
if (iopad) {
345+
if (iopad || help_mode) {
346346
run("opt -full");
347347
run("iopadmap -bits -outpad $__FABULOUS_OBUF I:PAD -inpad $__FABULOUS_IBUF O:PAD "
348348
"-toutpad IO_1_bidirectional_frame_config_pass ~T:I:PAD "

‎techlibs/gowin/synth_gowin.cc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,14 @@ struct SynthGowinPass : public ScriptPass
230230
if (check_label("map_ram"))
231231
{
232232
std::string args = "";
233-
if (nobram)
234-
args += " -no-auto-block";
235-
if (nolutram)
236-
args += " -no-auto-distributed";
237233
if (help_mode)
238234
args += " [-no-auto-block] [-no-auto-distributed]";
235+
else {
236+
if (nobram)
237+
args += " -no-auto-block";
238+
if (nolutram)
239+
args += " -no-auto-distributed";
240+
}
239241
run("memory_libmap -lib +/gowin/lutrams.txt -lib +/gowin/brams.txt" + args, "(-no-auto-block if -nobram, -no-auto-distributed if -nolutram)");
240242
run("techmap -map +/gowin/lutrams_map.v -map +/gowin/brams_map.v");
241243
}

‎techlibs/ice40/synth_ice40.cc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -353,12 +353,14 @@ struct SynthIce40Pass : public ScriptPass
353353
if (check_label("map_ram"))
354354
{
355355
std::string args = "";
356-
if (!spram)
357-
args += " -no-auto-huge";
358-
if (nobram)
359-
args += " -no-auto-block";
360356
if (help_mode)
361357
args += " [-no-auto-huge] [-no-auto-block]";
358+
else {
359+
if (!spram)
360+
args += " -no-auto-huge";
361+
if (nobram)
362+
args += " -no-auto-block";
363+
}
362364
run("memory_libmap -lib +/ice40/brams.txt -lib +/ice40/spram.txt" + args, "(-no-auto-huge unless -spram, -no-auto-block if -nobram)");
363365
run("techmap -map +/ice40/brams_map.v -map +/ice40/spram_map.v");
364366
run("ice40_braminit");

0 commit comments

Comments
 (0)