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.

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

End-to-end multiply smoketest #84

Merged
merged 93 commits into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
b423004
Add simple test
gussmith23 Jul 8, 2024
cab5059
Run integration tests
gussmith23 Jul 8, 2024
37669b2
more work
gussmith23 Jul 9, 2024
51430c6
Add functions for reading from verilog
gussmith23 Jul 9, 2024
ec6f711
more work
gussmith23 Jul 9, 2024
7ac4d26
clippy
gussmith23 Jul 9, 2024
ceaf8db
Add architecture arg
gussmith23 Jul 10, 2024
da4ccf6
Convert to primitive interface
gussmith23 Jul 10, 2024
f52b8f2
Fix test (i swear this was already fixed somewhere...)
gussmith23 Jul 10, 2024
3166cbf
Update egglog
gussmith23 Jul 11, 2024
3df54cf
Implement mul, add parens to things
gussmith23 Jul 12, 2024
49a87ff
More work
gussmith23 Jul 14, 2024
2fe64c7
Merge remote-tracking branch 'origin/main' into gussmith23-2024-07-09…
gussmith23 Jul 15, 2024
16918a9
remove duplicate mul
gussmith23 Jul 16, 2024
1f2b50b
Refactor function, add new function
gussmith23 Jul 16, 2024
53099b2
Compare eclass ids, not node ids
gussmith23 Jul 16, 2024
ccb7b0f
Fix malformed verilog
gussmith23 Jul 16, 2024
c5cc486
Add bitwidths
gussmith23 Jul 16, 2024
069a51a
Add a bunch of comments for meeting demo
gussmith23 Jul 16, 2024
8316f62
More work towards smoketest
gussmith23 Jul 16, 2024
55e8678
Add dsp48E2 test -- might not be fully correct at the moment
gussmith23 Jul 16, 2024
55345f8
Return commands from function
gussmith23 Jul 16, 2024
ef0cdeb
Clippy
gussmith23 Jul 16, 2024
c650b75
clippy
gussmith23 Jul 16, 2024
cbfdac4
Fmt
gussmith23 Jul 16, 2024
67526d3
potentially disable simcheck
gussmith23 Jul 16, 2024
e138c90
fmt
gussmith23 Jul 16, 2024
18a483e
attempt to run commands on egrpah
gussmith23 Jul 16, 2024
ebb93a7
Whoops, missed bit of simcheck code
gussmith23 Jul 16, 2024
59e7fa8
Import
gussmith23 Jul 16, 2024
60b9b30
Clippy and fmt
gussmith23 Jul 16, 2024
04da181
write_lakeroad->write_churchroad
gussmith23 Jul 23, 2024
5b500a3
Remove unused, add salt to constructor
gussmith23 Jul 23, 2024
47c12ff
Add salt
gussmith23 Jul 23, 2024
f72fe07
lakeroad->churchroad
gussmith23 Jul 23, 2024
e548350
Various renaming, help message, flag parsing
gussmith23 Jul 23, 2024
7b53a96
lakeroad->churchroad
gussmith23 Jul 23, 2024
7bc3f73
Add string constant
gussmith23 Jul 23, 2024
c9a1d5b
Handle Lakeroad error
gussmith23 Jul 23, 2024
6787338
Pass salt
gussmith23 Jul 23, 2024
0ef688d
Fmt
gussmith23 Jul 23, 2024
d595a6e
Add parameters, fixup to new churchroad syntax
gussmith23 Jul 23, 2024
2e1889c
Fmt
gussmith23 Jul 23, 2024
f8acc69
Generating let bindings for ports is optional
gussmith23 Jul 25, 2024
4c9da3d
Delete dead code
gussmith23 Jul 25, 2024
6fbfa0e
Fix filename arg parsing issue
gussmith23 Jul 25, 2024
7e0661c
Logging
gussmith23 Jul 25, 2024
a60e0c1
Don't always generate let bindings
gussmith23 Jul 25, 2024
86acd9c
Enable the ability to specify things to union with ports on Yosys plu…
gussmith23 Jul 28, 2024
7d03974
Use -portunion flag from Rust side to connect DSP up correctly
gussmith23 Jul 28, 2024
ebae29f
SVGs go to a directory
gussmith23 Jul 28, 2024
669c7bf
Fmt
gussmith23 Jul 28, 2024
7929323
Don't extract Wires in specs
gussmith23 Jul 28, 2024
75a9ec1
Compile strings
gussmith23 Jul 28, 2024
5642763
Error message
gussmith23 Jul 28, 2024
425e14b
Extract final Verilog
gussmith23 Jul 28, 2024
9bfdcd4
Fmt
gussmith23 Jul 28, 2024
0c59f9c
Don't actually delete Wire exprs
gussmith23 Jul 28, 2024
ff8fff2
Delete printlns
gussmith23 Jul 29, 2024
5103225
Use localparams for consts; add bitwidths
gussmith23 Jul 29, 2024
0b467db
clippy
gussmith23 Jul 29, 2024
01e6d03
Actually use `choices`
gussmith23 Jul 29, 2024
69884d5
Whoops, swap parameter and port instantiation order
gussmith23 Jul 29, 2024
894b09d
Finish smoketest
gussmith23 Jul 29, 2024
a2aea04
Whoops, get rid of extra command
gussmith23 Jul 29, 2024
e9dd873
Add more logging
gussmith23 Aug 4, 2024
6120f43
Wide multiply smoketest (#95)
gussmith23 Aug 28, 2024
4fdb8f8
Merge remote-tracking branch 'origin/gussmith23-2024-07-09-multiply-s…
gussmith23 Aug 28, 2024
932f1ae
Bunch of fixes
gussmith23 Aug 28, 2024
2fc9b4d
Add option for only extracting structural exprs
gussmith23 Aug 28, 2024
91e915c
Doctest fixes
gussmith23 Aug 28, 2024
ac7ae6a
Remove print
gussmith23 Aug 28, 2024
db88870
use extraction-produced choices for interpreter, sometimes
gussmith23 Aug 28, 2024
3299307
Whoops, committed debug change
gussmith23 Aug 28, 2024
9937459
fmt
gussmith23 Aug 30, 2024
2b99811
Reorganize Dockerfile for efficiency
gussmith23 Aug 30, 2024
01f3e24
clippy
gussmith23 Aug 30, 2024
b495ec5
clippy
gussmith23 Aug 30, 2024
b911042
test fixes
gussmith23 Aug 30, 2024
204849c
Delete commands
gussmith23 Aug 30, 2024
bc111b9
Shouldn't have committed these
gussmith23 Aug 30, 2024
609b39f
Add Lakeroad
gussmith23 Aug 31, 2024
b8cbc52
Don't hardcode; get submodules
gussmith23 Aug 31, 2024
0a400ff
Fix
gussmith23 Aug 31, 2024
97d444c
Use PAT
gussmith23 Aug 31, 2024
65f58bb
add meson
gussmith23 Sep 2, 2024
6a1449b
Move lines up
gussmith23 Sep 2, 2024
68254ed
Use python3 instead of python
gussmith23 Sep 2, 2024
47e2ac6
Point to mainline egglog
gussmith23 Sep 23, 2024
b7e9733
Reorganize Dockerfile
gussmith23 Sep 23, 2024
197dd3f
Update Lakeroad
gussmith23 Sep 23, 2024
bacb62d
Add some of Lakeroad pre solver compilation
gussmith23 Sep 23, 2024
fb95336
Fix to new input signal syntax
gussmith23 Sep 23, 2024
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
3 changes: 3 additions & 0 deletions .github/workflows/built-test-check-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
submodules: recursive
token: ${{ secrets.LAKEROAD_PRIVATE_PAT }}

- name: Log in to the Container registry
uses: docker/login-action@v3
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "lakeroad"]
path = lakeroad
url = [email protected]:uwsampl/lakeroad
118 changes: 107 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
egglog = { git = "https://github.com/egraphs-good/egglog", rev = "325814fd90767b5e43c72bc2eb65e14ff0b8746c" }
egglog = { git = "https://github.com/egraphs-good/egglog", rev = "757c52f6dcf8fe5b7b5eefb4bdc872ef70a5433a" }
log = "0.4.20"
egraph-serialize = "0.1"
rand = "0.8.4"
indexmap = "2.0.0"
clap = "4.5.8"
tempfile = "3.10.1"
env_logger = "0.11.5"
rpds = "1.1.0"
ordered-float = "3"
Loading