Skip to content

Commit 49d5ae3

Browse files
authored
Merge pull request #246 from mithro/yosys-0.36
Upgrade to Yosys version 0.36.0
2 parents 7a510f1 + 195b830 commit 49d5ae3

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

dependency_support/at_clifford_yosys/at_clifford_yosys.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ def at_clifford_yosys():
2222
http_archive,
2323
name = "at_clifford_yosys",
2424
urls = [
25-
"https://github.com/YosysHQ/yosys/archive/35a05686c4e9987441ac298f5d631f1785e272fd.zip",
25+
"https://github.com/YosysHQ/yosys/archive/8f07a0d8404f63349d8d3111217b73c9eafbd667.zip",
2626
],
27-
sha256 = "766da0b9f7e0aeb61ea6ab3d504e2a5328fc21d60f936d0e74f0af7c97120ba4",
28-
strip_prefix = "yosys-35a05686c4e9987441ac298f5d631f1785e272fd",
27+
sha256 = "46a9a4d969770fa20a2fd12c8e83307a597126609645c9655c370c0c365da344",
28+
strip_prefix = "yosys-8f07a0d8404f63349d8d3111217b73c9eafbd667",
2929
build_file = Label("@rules_hdl//dependency_support:at_clifford_yosys/bundled.BUILD.bazel"),
3030
patches = [
3131
Label("@rules_hdl//dependency_support:at_clifford_yosys/yosys.patch"),

dependency_support/at_clifford_yosys/bundled.BUILD.bazel

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ GENERATED_HEADERS = [
123123
"passes/pmgen/xilinx_dsp_pm.h",
124124
"passes/pmgen/xilinx_dsp48a_pm.h",
125125
"passes/pmgen/xilinx_srl_pm.h",
126+
"techlibs/quicklogic/ql_dsp_macc_pm.h",
126127
]
127128

128129
YOSYS_COPTS = [
@@ -151,6 +152,7 @@ cc_library(
151152
],
152153
exclude = [
153154
"kernel/driver.cc",
155+
"backends/cxxrtl/runtime/**/*.cc",
154156
"backends/protobuf/*.cc",
155157
"frontends/verific/*.cc",
156158
"passes/techmap/filterlib.cc",
@@ -175,6 +177,7 @@ cc_library(
175177
],
176178
exclude = [
177179
"backends/protobuf/*.h",
180+
"backends/cxxrtl/runtime/**/*.h",
178181
],
179182
) + GENERATED_HEADERS,
180183
copts = YOSYS_COPTS,
@@ -196,6 +199,7 @@ cc_library(
196199
"frontends/rtlil",
197200
"passes/techmap",
198201
"techlibs/common",
202+
"techlibs/quicklogic",
199203
],
200204
deps = [
201205
":bigint",
@@ -467,7 +471,9 @@ genrule(
467471
"passes/pmgen/ice40_dsp.pmg",
468472
"passes/pmgen/ice40_wrapcarry.pmg",
469473
"passes/pmgen/peepopt_muldiv.pmg",
470-
"passes/pmgen/peepopt_shiftmul.pmg",
474+
"passes/pmgen/peepopt_shiftadd.pmg",
475+
"passes/pmgen/peepopt_shiftmul_right.pmg",
476+
"passes/pmgen/peepopt_shiftmul_left.pmg",
471477
"passes/pmgen/xilinx_dsp48a.pmg",
472478
"passes/pmgen/xilinx_dsp_cascade.pmg",
473479
"passes/pmgen/xilinx_dsp_CREG.pmg",
@@ -481,6 +487,18 @@ genrule(
481487
],
482488
)
483489

490+
genrule(
491+
name = "ql_dsp_mac_pm_h",
492+
srcs = [
493+
"techlibs/quicklogic/ql_dsp_macc.pmg",
494+
],
495+
outs = ["techlibs/quicklogic/ql_dsp_macc_pm.h"],
496+
cmd = "$(location :pmgen) -o $(OUTS) -p ql_dsp_macc $(SRCS)",
497+
tools = [
498+
":pmgen",
499+
],
500+
)
501+
484502
[genrule(
485503
name = "%s_pm_h" % pm,
486504
srcs = [

0 commit comments

Comments
 (0)