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

Piezo, PIFOTree: static option! #1783

Merged
merged 17 commits into from
Nov 20, 2023
Merged

Piezo, PIFOTree: static option! #1783

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7c9c3ac
Attempt at static incr groups
anshumanmohan Nov 19, 2023
b4e98fe
Better generation of static incr
anshumanmohan Nov 19, 2023
aa73c89
Cleaner incr generation
anshumanmohan Nov 19, 2023
61655ed
Static par
anshumanmohan Nov 19, 2023
9221a53
Better generation of static incr
anshumanmohan Nov 19, 2023
7c3d46e
Support for non-static choice
anshumanmohan Nov 19, 2023
019625e
Close?
anshumanmohan Nov 19, 2023
9d89587
Pushing the generated file that's causing the error
anshumanmohan Nov 19, 2023
4fb471b
Merge branch 'master' into static-pifotree.py
anshumanmohan Nov 19, 2023
9ff43e9
No more static as cmd line flag
anshumanmohan Nov 20, 2023
a951943
Some renaming
anshumanmohan Nov 20, 2023
016c00f
More renaming
anshumanmohan Nov 20, 2023
6eb91bb
Add static to runt
anshumanmohan Nov 20, 2023
7198553
Remove yx file
anshumanmohan Nov 20, 2023
7be44bf
Neater incr
anshumanmohan Nov 20, 2023
27ada34
Tidying in SDN code
anshumanmohan Nov 20, 2023
3e36475
Nit
anshumanmohan Nov 20, 2023
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
Prev Previous commit
Next Next commit
Support for non-static choice
  • Loading branch information
@anshumanmohan
anshumanmohan committed Nov 19, 2023
commit 7c3d46e07395fc4ceba098222b7661a9851b33c2
17 changes: 12 additions & 5 deletions calyx-py/test/correctness/piezo_pifotree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ def insert_stats(prog, name, static=False):
count_1_sto = stats.reg("count_1_sto", 32)

# Wiring to increment the appropriate register.
count_0_incr = stats.incr_static(count_0_sto)
count_1_incr = stats.incr_static(count_1_sto)
count_0_incr = stats.incr_static(count_0_sto) if static else stats.incr(count_0_sto)
count_1_incr = stats.incr_static(count_1_sto) if static else stats.incr(count_1_sto)

# Equality checks.
flow_eq_0 = stats.eq_use(flow, 0)
Expand All @@ -48,9 +48,16 @@ def insert_stats(prog, name, static=False):
stats.this().count_1 = count_1_sto.out

# The main logic.
stats.control += cb.static_par(
cb.if_with(flow_eq_0, count_0_incr),
cb.if_with(flow_eq_1, count_1_incr),
stats.control += (
cb.static_par(
cb.if_with(flow_eq_0, count_0_incr),
cb.if_with(flow_eq_1, count_1_incr),
)
if static
else cb.par(
cb.if_with(flow_eq_0, count_0_incr),
cb.if_with(flow_eq_1, count_1_incr),
)
)

return stats
Expand Down