Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename synth_quicklogic to synth_quicklogic_f4pga to not conflict with yosys builtin #543

Closed
wants to merge 1 commit into from
Closed

Rename synth_quicklogic to synth_quicklogic_f4pga to not conflict with yosys builtin #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ The plugin adds the following command:

The plugin adds the following command:

* synth_quicklogic
* synth_quicklogic_f4pga
* ql_dsp

Detailed help on the supported command(s) can be obtained by running `help <command_name>` in Yosys.
Expand Down
2 changes: 1 addition & 1 deletion ql-qlf-plugin/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,6 @@ $(PMGEN_OUT_DIR)/ql-bram-asymmetric-wider-read.h: ql-bram-asymmetric-wider-read.
python3 $(PMGEN_PY) -o $@ -p ql_bram_asymmetric_wider_read ql-bram-asymmetric-wider-read.pmg

install_modules: $(VERILOG_MODULES)
$(foreach f,$^,install -D $(f) $(YOSYS_DATA_DIR)/quicklogic/$(f);)
$(foreach f,$^,install -D $(f) $(YOSYS_DATA_DIR)/quicklogic_f4pga/$(f);)

install: install_modules
46 changes: 23 additions & 23 deletions ql-qlf-plugin/synth_quicklogic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ PRIVATE_NAMESPACE_BEGIN
#define STR(val) XSTR(val)

#ifndef PASS_NAME
#define PASS_NAME synth_quicklogic
#define PASS_NAME synth_quicklogic_f4pga
#endif

struct SynthQuickLogicPass : public ScriptPass {
Expand Down Expand Up @@ -241,7 +241,7 @@ struct SynthQuickLogicPass : public ScriptPass {
void script() override
{
if (check_label("begin")) {
std::string family_path = " +/quicklogic/" + family;
std::string family_path = " +/quicklogic_f4pga/" + family;
std::string readVelArgs;

// Read simulation library
Expand All @@ -254,7 +254,7 @@ struct SynthQuickLogicPass : public ScriptPass {
// Use -nomem2reg here to prevent Yosys from complaining about
// some block ram cell models. After all the only part of the cells
// library required here is cell port definitions plus specify blocks.
run("read_verilog -lib -specify -nomem2reg +/quicklogic/common/cells_sim.v" + readVelArgs);
run("read_verilog -lib -specify -nomem2reg +/quicklogic_f4pga/common/cells_sim.v" + readVelArgs);
run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
}

Expand Down Expand Up @@ -291,7 +291,7 @@ struct SynthQuickLogicPass : public ScriptPass {
if (help_mode || !nodsp) {
run("memory_dff");
run("wreduce t:$mul");
run("techmap -map +/mul2dsp.v -map +/quicklogic/" + family +
run("techmap -map +/mul2dsp.v -map +/quicklogic_f4pga/" + family +
"/dsp_map.v -D DSP_A_MAXWIDTH=16 -D DSP_B_MAXWIDTH=16 "
"-D DSP_A_MINWIDTH=2 -D DSP_B_MINWIDTH=2 -D DSP_Y_MINWIDTH=11 "
"-D DSP_NAME=$__MUL16X16",
Expand Down Expand Up @@ -324,13 +324,13 @@ struct SynthQuickLogicPass : public ScriptPass {
run("ql_dsp_macc" + use_dsp_cfg_params, "(for qlf_k6n10f if not -no_dsp)");
run("techmap -map +/mul2dsp.v [...]", " (for qlf_k6n10f if not -no_dsp)");
run("chtype -set $mul t:$__soft_mul", " (for qlf_k6n10f if not -no_dsp)");
run("techmap -map +/quicklogic/" + family + "/dsp_map.v", "(for qlf_k6n10f if not -no_dsp)");
run("techmap -map +/quicklogic_f4pga/" + family + "/dsp_map.v", "(for qlf_k6n10f if not -no_dsp)");
if (use_dsp_cfg_params.empty())
run("techmap -map +/quicklogic/" + family + "/dsp_map.v -D USE_DSP_CFG_PARAMS=0", "(for qlf_k6n10f if not -no_dsp)");
run("techmap -map +/quicklogic_f4pga/" + family + "/dsp_map.v -D USE_DSP_CFG_PARAMS=0", "(for qlf_k6n10f if not -no_dsp)");
else
run("techmap -map +/quicklogic/" + family + "/dsp_map.v -D USE_DSP_CFG_PARAMS=1", "(for qlf_k6n10f if not -no_dsp)");
run("techmap -map +/quicklogic_f4pga/" + family + "/dsp_map.v -D USE_DSP_CFG_PARAMS=1", "(for qlf_k6n10f if not -no_dsp)");
run("ql_dsp_simd ", "(for qlf_k6n10f if not -no_dsp)");
run("techmap -map +/quicklogic/" + family + "/dsp_final_map.v", "(for qlf_k6n10f if not -no_dsp)");
run("techmap -map +/quicklogic_f4pga/" + family + "/dsp_final_map.v", "(for qlf_k6n10f if not -no_dsp)");
run("ql_dsp_io_regs");
} else if (!nodsp) {

Expand All @@ -346,11 +346,11 @@ struct SynthQuickLogicPass : public ScriptPass {
run("chtype -set $mul t:$__soft_mul");
}
if (use_dsp_cfg_params.empty())
run("techmap -map +/quicklogic/" + family + "/dsp_map.v -D USE_DSP_CFG_PARAMS=0");
run("techmap -map +/quicklogic_f4pga/" + family + "/dsp_map.v -D USE_DSP_CFG_PARAMS=0");
else
run("techmap -map +/quicklogic/" + family + "/dsp_map.v -D USE_DSP_CFG_PARAMS=1");
run("techmap -map +/quicklogic_f4pga/" + family + "/dsp_map.v -D USE_DSP_CFG_PARAMS=1");
run("ql_dsp_simd");
run("techmap -map +/quicklogic/" + family + "/dsp_final_map.v");
run("techmap -map +/quicklogic_f4pga/" + family + "/dsp_final_map.v");
run("ql_dsp_io_regs");
}
}
Expand All @@ -370,14 +370,14 @@ struct SynthQuickLogicPass : public ScriptPass {
}

if (check_label("map_bram", "(skip if -no_bram)") && (family == "qlf_k6n10" || family == "qlf_k6n10f" || family == "pp3") && inferBram) {
run("memory_bram -rules +/quicklogic/" + family + "/brams.txt");
run("memory_bram -rules +/quicklogic_f4pga/" + family + "/brams.txt");
if (family == "pp3") {
run("pp3_braminit");
}
run("ql_bram_split ", "(for qlf_k6n10f if not -no_bram)");
run("techmap -autoproc -map +/quicklogic/" + family + "/brams_map.v");
run("techmap -autoproc -map +/quicklogic_f4pga/" + family + "/brams_map.v");
if (family == "qlf_k6n10f") {
run("techmap -map +/quicklogic/" + family + "/brams_final_map.v");
run("techmap -map +/quicklogic_f4pga/" + family + "/brams_final_map.v");
}

// Data width to specialized cell type width map
Expand Down Expand Up @@ -439,7 +439,7 @@ struct SynthQuickLogicPass : public ScriptPass {

if (check_label("map_gates")) {
if (inferAdder && (family == "qlf_k4n8" || family == "qlf_k6n10" || family == "qlf_k6n10f")) {
run("techmap -map +/techmap.v -map +/quicklogic/" + family + "/arith_map.v");
run("techmap -map +/techmap.v -map +/quicklogic_f4pga/" + family + "/arith_map.v");
} else {
run("techmap");
}
Expand Down Expand Up @@ -476,9 +476,9 @@ struct SynthQuickLogicPass : public ScriptPass {
run("dfflegalize" + legalizeArgs);
} else if (family == "pp3") {
run("dfflegalize -cell $_DFFSRE_PPPP_ 0 -cell $_DLATCH_?_ x");
run("techmap -map +/quicklogic/" + family + "/cells_map.v");
run("techmap -map +/quicklogic_f4pga/" + family + "/cells_map.v");
}
std::string techMapArgs = " -map +/techmap.v -map +/quicklogic/" + family + "/ffs_map.v";
std::string techMapArgs = " -map +/techmap.v -map +/quicklogic_f4pga/" + family + "/ffs_map.v";
if (!noffmap) {
run("techmap " + techMapArgs);
}
Expand All @@ -497,14 +497,14 @@ struct SynthQuickLogicPass : public ScriptPass {
} else if (family == "qlf_k4n8") {
run("abc -lut 4 ");
} else if (family == "pp3") {
run("techmap -map +/quicklogic/" + family + "/latches_map.v");
run("techmap -map +/quicklogic_f4pga/" + family + "/latches_map.v");
if (abc9) {
run("read_verilog -lib -specify -icells +/quicklogic/" + family + "/abc9_model.v");
run("techmap -map +/quicklogic/" + family + "/abc9_map.v");
run("read_verilog -lib -specify -icells +/quicklogic_f4pga/" + family + "/abc9_model.v");
run("techmap -map +/quicklogic_f4pga/" + family + "/abc9_map.v");
run("abc9 -maxlut 4 -dff");
run("techmap -map +/quicklogic/" + family + "/abc9_unmap.v");
run("techmap -map +/quicklogic_f4pga/" + family + "/abc9_unmap.v");
} else {
std::string lutDefs = "+/quicklogic/" + family + "/lutdefs.txt";
std::string lutDefs = "+/quicklogic_f4pga/" + family + "/lutdefs.txt";
rewrite_filename(lutDefs);

std::string abcArgs = "+read_lut," + lutDefs +
Expand All @@ -523,7 +523,7 @@ struct SynthQuickLogicPass : public ScriptPass {

if (check_label("map_cells") && (family == "qlf_k6n10" || family == "pp3")) {
std::string techMapArgs;
techMapArgs = "-map +/quicklogic/" + family + "/lut_map.v";
techMapArgs = "-map +/quicklogic_f4pga/" + family + "/lut_map.v";
run("techmap " + techMapArgs);
run("clean");
}
Expand Down
2 changes: 1 addition & 1 deletion ql-qlf-plugin/tests/consts/consts.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ yosys -import ;# ingest plugin commands

read_verilog $::env(DESIGN_TOP).v

synth_quicklogic -top my_top -family pp3
synth_quicklogic_f4pga -top my_top -family pp3
stat
yosys cd my_top
select -assert-count 1 t:my_lut
Expand Down
Loading
Loading