Skip to content

Commit ff5b26d

Browse files
donndonn
authored
feat!: fork, near-complete rewrite
- update yosys to v0.56, stop patching and USE_FILTERLIB instead - rewrite wrapper to use pybind instead of swig - rewrite nix flake - include missing files in source distributions
1 parent cec8b6d commit ff5b26d

File tree

125 files changed

+5249
-494
lines changed

Some content is hidden

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

125 files changed

+5249
-494
lines changed

‎.clang-format‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
# Default Linux style
22
BasedOnStyle: LLVM
3-
IndentWidth: 4
4-
UseTab: Never
3+
IndentWidth: 8
4+
UseTab: Always
55
BreakBeforeBraces: Linux
66
AllowShortIfStatementsOnASingleLine: false
77
IndentCaseLabels: false
8+
9+
# From guidelines/CodingStyle
10+
TabWidth: 8
11+
ContinuationIndentWidth: 2
812
ColumnLimit: 150
9-
AccessModifierOffset: -4
13+
# BreakBeforeBraces: Linux

‎.github/workflows/ci.yml‎

Lines changed: 80 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
1-
name: CI
1+
# Copyright (C) 2025 Mohamed Gaber
2+
#
3+
# Adapted from Yosys wheels
4+
#
5+
# Copyright (C) 2024 Efabless Corporation
6+
#
7+
# Permission to use, copy, modify, and/or distribute this software for any
8+
# purpose with or without fee is hereby granted, provided that the above
9+
# copyright notice and this permission notice appear in all copies.
10+
#
11+
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
12+
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
13+
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
14+
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
15+
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
16+
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
17+
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18+
name: Build Wheels for PyPI
219

320
# Events that trigger workflow
421
on:
@@ -9,79 +26,83 @@ on:
926

1027
jobs:
1128
build_wheels:
12-
name: Build Wheels (${{matrix.os.name}})
13-
runs-on: ${{ matrix.os.runner }}
1429
strategy:
30+
fail-fast: false
1531
matrix:
16-
os:
17-
[
32+
os: [
33+
{
34+
name: "Ubuntu 22.04",
35+
family: "linux",
36+
runner: "ubuntu-22.04",
37+
archs: "x86_64",
38+
},
1839
{
19-
name: "Ubuntu 20.04",
20-
runner: "ubuntu-20.04",
21-
archs: "x86_64,aarch64",
40+
name: "Ubuntu 22.04",
41+
family: "linux",
42+
runner: "ubuntu-22.04-arm",
43+
archs: "aarch64",
2244
},
23-
{ name: "macOS 11", runner: "macos-11", archs: "x86_64,arm64" },
2445
{
25-
name: "Windows Server 2019",
26-
runner: "windows-2019",
27-
archs: "AMD64,ARM64",
46+
name: "macOS 14",
47+
family: "macos",
48+
runner: "macos-14",
49+
archs: "x86_64,arm64",
2850
},
51+
# {
52+
# name: "Windows Server 2022",
53+
# runner: "windows-2022",
54+
# archs: "AMD64,ARM64",
55+
# },
2956
]
57+
name: Build Wheels | ${{ matrix.os.name }} | ${{ matrix.os.archs }}
58+
runs-on: ${{ matrix.os.runner }}
3059
steps:
31-
- uses: actions/checkout@v3
60+
- uses: actions/checkout@v4
3261
with:
3362
fetch-depth: 0
3463
submodules: true
35-
- if: ${{ matrix.os.runner == 'ubuntu-20.04' }}
36-
name: Set up QEMU
37-
uses: docker/setup-qemu-action@v2
38-
- uses: actions/setup-python@v3
39-
- name: Install cibuildwheel
40-
run: python -m pip install cibuildwheel==2.15.0
64+
persist-credentials: false
65+
- run: |
66+
perl -i -pe 'print "__attribute__((weak)) " if /LibertyParser::error/' yosys/passes/techmap/libparse.cc
67+
- uses: actions/setup-python@v5
68+
- if: ${{ matrix.os.family == 'macos' && matrix.os.archs == 'arm64' }}
69+
name: "[macOS/arm64] Install Python 3.8 (see: https://cibuildwheel.pypa.io/en/stable/faq/#macos-building-cpython-38-wheels-on-arm64)"
70+
uses: actions/setup-python@v5
71+
with:
72+
python-version: 3.8
4173
- name: Build wheels
42-
run: python -m cibuildwheel --archs ${{ matrix.os.archs }} --output-dir dist
43-
- uses: actions/upload-artifact@v3
74+
uses: pypa/cibuildwheel@v2.21.1
75+
env:
76+
# * APIs not supported by PyPy
77+
CIBW_SKIP: >
78+
pp*
79+
CIBW_ARCHS: ${{ matrix.os.archs }}
80+
CIBW_BUILD_VERBOSITY: "1"
81+
CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
82+
CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28
83+
- uses: actions/upload-artifact@v4
4484
with:
45-
path: ./dist/*.whl
46-
push_to_pypi:
47-
name: Build (and publish, if applicable)
48-
runs-on: ubuntu-20.04
85+
name: python-wheels-${{ matrix.os.runner }}
86+
path: ./wheelhouse/*.whl
87+
upload_wheels:
88+
name: Upload Wheels
89+
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
90+
runs-on: ubuntu-latest
91+
# Specifying a GitHub environment is optional, but strongly encouraged
92+
environment: pypi
93+
permissions:
94+
# IMPORTANT: this permission is mandatory for Trusted Publishing
95+
id-token: write
4996
needs: build_wheels
5097
steps:
51-
- name: Check out Git repository
52-
uses: actions/checkout@v3
98+
- uses: actions/download-artifact@v4
5399
with:
54-
fetch-depth: 0
55-
submodules: true
56-
- name: Export Repo URL
57-
run: echo "REPO_URL=https://github.com/${{ github.repository }}" >> $GITHUB_ENV
58-
- name: Export Branch Name
59-
run: echo "BRANCH_NAME=${GITHUB_REF##*/}" >> $GITHUB_ENV
60-
- name: Set Up Python
61-
uses: actions/setup-python@v4
62-
with:
63-
python-version: "3.6"
64-
- name: Build Distribution
65-
run: |
66-
python3 ./setup.py sdist
67-
- uses: actions/download-artifact@v3
68-
with:
69-
path: .
70-
- run: mv ./artifact/* ./dist
71-
- name: Set default for env.NEW_TAG
72-
run: echo "NEW_TAG=NO_NEW_TAG" >> $GITHUB_ENV
73-
- name: Check for new version
74-
if: ${{ env.BRANCH_NAME == 'main' }}
75-
run: |
76-
cd ${GITHUB_WORKSPACE}/ && python3 .github/scripts/generate_tag.py
77-
- name: Tag Commit
78-
if: ${{ env.NEW_TAG != 'NO_NEW_TAG' }}
79-
uses: tvdias/github-tagger@v0.0.1
80-
with:
81-
tag: "${{ env.NEW_TAG }}"
82-
repo-token: "${{ secrets.MY_TOKEN }}"
100+
path: "."
101+
pattern: python-wheels-*
102+
merge-multiple: true
103+
- run: |
104+
ls
105+
mkdir -p ./dist
106+
mv *.whl ./dist
83107
- name: Publish
84-
if: ${{ env.NEW_TAG != 'NO_NEW_TAG' }}
85108
uses: pypa/gh-action-pypi-publish@release/v1
86-
with:
87-
password: ${{ secrets.PYPI_API_TOKEN }}

‎License‎

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

‎MANIFEST.in‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
include Readme.md
1+
include Readme.md
2+
include libparse/stdio_filebuf.h
3+
include yosys/kernel/*.h
4+
include yosys/kernel/constids.inc
5+
include yosys/passes/techmap/libparse.*

0 commit comments

Comments
 (0)