Skip to content

Commit 9c1ec25

Browse files
committed
rename synth_quicklogic to synth_quicklogic_f4pga to not conflict with yosys internal
1 parent 566eba4 commit 9c1ec25

File tree

45 files changed

+259
-260
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+259
-260
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
- name: Install Mac Dependencies
7171
run: |
7272
brew update
73-
brew install make cmake graphviz bison flex boost nlohmann-json yosys icarus-verilog
73+
brew install make cmake graphviz bison flex boost nlohmann-json icarus-verilog
7474
sudo ln -s /usr/local/bin/gmake /usr/local/bin/make
7575
if: ${{ runner.os == 'macOS'}}
7676

@@ -92,7 +92,6 @@ jobs:
9292
git clone --branch yosys-0.17 https://github.com/YosysHQ/yosys.git
9393
pushd yosys
9494
make -j`nproc` && sudo make install
95-
if: ${{ runner.os != 'macOS'}}
9695
9796
- name: Install Googletest
9897
run: |

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ The plugin adds the following command:
8282

8383
The plugin adds the following command:
8484

85-
* synth_quicklogic
85+
* synth_quicklogic_f4pga
8686
* ql_dsp
8787

8888
Detailed help on the supported command(s) can be obtained by running `help <command_name>` in Yosys.

ql-qlf-plugin/qlf_k6n10/ffs_map.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ module \$_DLATCHSR_PPP_ (input E, S, R, D, output Q);
9797
endmodule
9898

9999
// The following techmap operation are not performed right now
100-
// as Negative edge FF are not legalized in synth_quicklogic for qlf_k6n10
100+
// as Negative edge FF are not legalized in synth_quicklogic_f4pga for qlf_k6n10
101101
// but in case we implement clock inversion in the future, the support is ready for it.
102102

103103
module \$_DFF_N_ (D, C, Q);

ql-qlf-plugin/synth_quicklogic.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ PRIVATE_NAMESPACE_BEGIN
2828
#define STR(val) XSTR(val)
2929

3030
#ifndef PASS_NAME
31-
#define PASS_NAME synth_quicklogic
31+
#define PASS_NAME synth_quicklogic_f4pga
3232
#endif
3333

3434
struct SynthQuickLogicPass : public ScriptPass {
@@ -230,7 +230,7 @@ struct SynthQuickLogicPass : public ScriptPass {
230230
design->scratchpad_set_int("abc9.D", 41667); // 12MHz = 83.33.. ns; divided by two to allow for interconnect delay.
231231
}
232232

233-
log_header(design, "Executing SYNTH_QUICKLOGIC pass.\n");
233+
log_header(design, "Executing synth_quicklogic_f4pga pass.\n");
234234
log_push();
235235

236236
run_script(design, run_from, run_to);

ql-qlf-plugin/tests/consts/consts.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ yosys -import ;# ingest plugin commands
44

55
read_verilog $::env(DESIGN_TOP).v
66

7-
synth_quicklogic -top my_top -family pp3
7+
synth_quicklogic_f4pga -top my_top -family pp3
88
stat
99
yosys cd my_top
1010
select -assert-count 1 t:my_lut

0 commit comments

Comments
 (0)