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

Jump to bottom

re-write trace macro as a proc macro #37

Merged
merged 15 commits into from
Sep 9, 2024
Merged

re-write trace macro as a proc macro #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
37d93bf
macros crate skeleton
sam0x17 Sep 5, 2024
7a0dcbe
almost
sam0x17 Sep 5, 2024
fe8a9e5
test_simple_struct() passing!
sam0x17 Sep 6, 2024
16b64cb
both passing! :tada:
sam0x17 Sep 6, 2024
b74b090
add another test case
sam0x17 Sep 6, 2024
20fa0c3
checkpoint
sam0x17 Sep 6, 2024
c0cf9c8
add parsing tests
sam0x17 Sep 6, 2024
5f593bb
fix generics issue
sam0x17 Sep 6, 2024
6cb767f
tests passing, still some subtle downstream compile-time issues
sam0x17 Sep 6, 2024
eee4fc2
downstream tests passing!
sam0x17 Sep 6, 2024
a985f85
closer
sam0x17 Sep 6, 2024
7a09e03
passing!
sam0x17 Sep 6, 2024
6bb4a4c
add tests, one example failing
sam0x17 Sep 6, 2024
5a26260
All macros tests passing
RogerTaule Sep 9, 2024
c776f0c
Modifying pil_helpers_trace to work with new macro
RogerTaule Sep 9, 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
22 changes: 16 additions & 6 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ members = [
"hints",
"pilout",
"proofman",
"macros",
"provers/stark",
"provers/starks-lib-c",
"transcript",
Expand All @@ -23,3 +24,4 @@ log = { version = "0.4", default-features = false }
env_logger = "0.11"
p3-goldilocks = { git = "https://github.com/Plonky3/Plonky3.git", rev = "c3d754ef77b9fce585b46b972af751fe6e7a9803" }
p3-field = { git = "https://github.com/Plonky3/Plonky3.git", rev = "c3d754ef77b9fce585b46b972af751fe6e7a9803" }
proofman-macros = { path = "macros", version = "0.1.0" }
3 changes: 2 additions & 1 deletion cli/assets/templates/pil_helpers_trace.rs.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// WARNING: This file has been autogenerated from the PILOUT file.
// Manual modifications are not recommended and may be overwritten.
use proofman_common::trace;
pub use proofman_macros::trace;
use proofman_common as common;

{{ for air_group in air_groups }}
{{ for air in air_group.airs }}
Expand Down
5 changes: 3 additions & 2 deletions common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ serde = { version = "1.0.130", features = ["derive"] }
serde_json = "1.0.68"
serde_derive = "1.0.196"
pilout = { path = "../pilout" }
log = { workspace = true }
log.workspace = true
transcript = { path = "../transcript" }
p3-field = { workspace = true }
p3-field.workspace = true
proofman-macros.workspace = true
proofman-util = { path = "../util" }
proofman-starks-lib-c = { path = "../provers/starks-lib-c" }
Loading
Loading