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

fix aot contract executor not passing builtinstats #849

Merged
merged 9 commits into from
Oct 15, 2024
Merged

fix aot contract executor not passing builtinstats #849

merged 9 commits into from
Oct 15, 2024

Conversation

edg-l
Copy link
Member

@edg-l edg-l commented Oct 14, 2024

Found it executing some transactiosn after updating starknet-replay to latest

Checklist

  • Linked to Github Issue
  • Unit tests added
  • Integration tests added.
  • This change requires new documentation.
    • Documentation has been added/updated.

@codecov-commenter
Copy link

codecov-commenter commented Oct 14, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 65.21739% with 8 lines in your changes missing coverage. Please review.

Project coverage is 82.43%. Comparing base (8175154) to head (2a6bb0a).

Files with missing lines Patch % Lines
src/executor/contract.rs 65.21% 8 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main     #849      +/-   ##
==========================================
- Coverage   82.43%   82.43%   -0.01%     
==========================================
  Files         120      120              
  Lines       34856    34869      +13     
==========================================
+ Hits        28733    28743      +10     
- Misses       6123     6126       +3

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@edg-l edg-l changed the title fix aot contract executor not passing builtinstats fix ci and aot contract executor not passing builtinstats Oct 14, 2024
@edg-l edg-l added the review-ready A PR that is ready for review label Oct 14, 2024
@edg-l edg-l changed the title fix ci and aot contract executor not passing builtinstats fix aot contract executor not passing builtinstats Oct 14, 2024
Base automatically changed from fix-felt252-deserialization to main October 14, 2024 13:36
@github-actions GitHub Actions
Copy link

Benchmarking results

Benchmark for program factorial_2M

Open benchmarks
Command Mean [s] Min [s] Max [s] Relative
Cairo-vm (Rust, Cairo 1) 10.992 ± 0.314 10.548 11.335 23.14 ± 0.81
cairo-native (embedded AOT) 3.197 ± 0.010 3.181 3.216 6.73 ± 0.14
cairo-native (embedded JIT using LLVM's ORC Engine) 3.245 ± 0.037 3.204 3.314 6.83 ± 0.16
cairo-native (standalone AOT) 0.680 ± 0.004 0.678 0.691 1.43 ± 0.03
cairo-native (standalone AOT with -march=native) 0.475 ± 0.009 0.471 0.502 1.00

Benchmark for program fib_2M

Open benchmarks
Command Mean [s] Min [s] Max [s] Relative
Cairo-vm (Rust, Cairo 1) 10.932 ± 0.299 10.496 11.224 1400.13 ± 39.12
cairo-native (embedded AOT) 2.732 ± 0.014 2.704 2.750 349.92 ± 2.72
cairo-native (embedded JIT using LLVM's ORC Engine) 2.754 ± 0.026 2.723 2.803 352.72 ± 3.90
cairo-native (standalone AOT) 0.009 ± 0.000 0.009 0.010 1.11 ± 0.02
cairo-native (standalone AOT with -march=native) 0.008 ± 0.000 0.008 0.008 1.00

Benchmark for program logistic_map

Open benchmarks
Command Mean [s] Min [s] Max [s] Relative
Cairo-vm (Rust, Cairo 1) 4.273 ± 0.021 4.237 4.305 59.06 ± 0.32
cairo-native (embedded AOT) 3.039 ± 0.016 3.015 3.063 42.01 ± 0.24
cairo-native (embedded JIT using LLVM's ORC Engine) 3.216 ± 0.026 3.185 3.262 44.45 ± 0.38
cairo-native (standalone AOT) 0.113 ± 0.000 0.113 0.114 1.57 ± 0.00
cairo-native (standalone AOT with -march=native) 0.072 ± 0.000 0.072 0.073 1.00

@github-actions GitHub Actions
Copy link

Benchmark results Main vs HEAD.

Command Mean [s] Min [s] Max [s] Relative
head factorial_2M.cairo (JIT) 3.235 ± 0.018 3.201 3.260 1.01 ± 0.01
base factorial_2M.cairo (JIT) 3.276 ± 0.036 3.214 3.341 1.02 ± 0.01
head factorial_2M.cairo (AOT) 3.205 ± 0.012 3.184 3.229 1.00
base factorial_2M.cairo (AOT) 3.217 ± 0.028 3.183 3.270 1.00 ± 0.01
Command Mean [s] Min [s] Max [s] Relative
head fib_2M.cairo (JIT) 2.756 ± 0.014 2.730 2.779 1.02 ± 0.01
base fib_2M.cairo (JIT) 2.770 ± 0.012 2.752 2.793 1.02 ± 0.01
head fib_2M.cairo (AOT) 2.715 ± 0.018 2.699 2.760 1.00
base fib_2M.cairo (AOT) 2.730 ± 0.021 2.701 2.765 1.01 ± 0.01
Command Mean [s] Min [s] Max [s] Relative
head logistic_map.cairo (JIT) 3.228 ± 0.021 3.204 3.266 1.06 ± 0.01
base logistic_map.cairo (JIT) 3.255 ± 0.015 3.238 3.282 1.07 ± 0.01
head logistic_map.cairo (AOT) 3.048 ± 0.023 3.021 3.099 1.00
base logistic_map.cairo (AOT) 3.052 ± 0.017 3.027 3.079 1.00 ± 0.01

azteca1998
azteca1998 approved these changes Oct 15, 2024
View reviewed changes
src/executor.rs Show resolved Hide resolved
@edg-l edg-l added this pull request to the merge queue Oct 15, 2024
Merged via the queue into main with commit aff451c Oct 15, 2024
15 checks passed
@edg-l edg-l deleted the fix_contract_executor branch October 15, 2024 11:31
JulianGCalderon pushed a commit that referenced this pull request Oct 15, 2024
@edg-l @azteca1998 @JulianGCalderon
fix aot contract executor not passing builtinstats (#849)
c9fee98 
* Fix felt252 and enum deserialization bugs.

* Fix formatting.

* Also fix the runtime.

* Fix errors.

* try to fix ci

* remove unused deps

* fix aot contract executor not passing builtinstats

---------

Co-authored-by: Esteve Soler Arderiu <[email protected]>
Co-authored-by: Esteve Soler Arderiu <[email protected]>
pefontana pushed a commit that referenced this pull request Oct 18, 2024
Revert "fix aot contract executor not passing builtinstats (#849)"
e2f895c 
This reverts commit aff451c.
edg-l added a commit that referenced this pull request Oct 21, 2024
@JulianGCalderon @FrancoGiachetta
@edg-l @azteca1998 @rodrigo-pino @varex83
Add trace dump contracts 2 (#838)
c989b31 
* Add logs

* Implement Felt252Dict trace dump

* Implement nullabel for trace dump

* Print type id

* Remove print

* add convertion for Sints

* fix mispelled types

* forgot to add feature

* change Sints value to correspond to sierra-emu

* Readd feature

* Add is_infinity field to secp256 point struct (#828)

* add is_infinity to secp point

* clean

* fix

* use same deps as blockifier

* fix

* fix layout

* fix test

* remove some brittle asserts due to random initial data when adding and muling points at infinity

* fix

* remove unused dep

* fixes, missed the value entry/output

* Reset src

* Fix warnings

* Make library public

* Use debug runtime for trace dump

* fix storage's values truncations (#839)

* fix storage's values truncations

* change implementation for i8 i16 i32 i64 too

* format

* Add ptr check to felt dict entry

* Add malloc tracing and fix more memory leaks. (#833)

* Add memory tracing.

* Partial memory fixes.

* Fix arrays.

* Simplify dictionaries. Fix false positive memory leak in dictionary drops.

* Fix zero-sized allocation. Fix warnings. More mem tracing checks.

* Fix mem tracing.

* Fix memory leak in `print` libfunc.

* Fix array slice libfunc.

* Fix starknet memory leaks.

* Fix keccak syscall.

* Fix dict get double free bug.

* Lots of memory fixes.

* More fixes.

* Fix CI.

* Remove old TODOs.

* Fix CI (again).

* Remove TODOs.

* Fix test.

* Maybe fix

* Maybe fix

* Maybe fix

* Dont panic when building circuit partial outputs

* trace dump for Sha256StateHandler

* Builtin costs rework (#837)

* Update to 2.8.4, release docs, alpha

This PR updates cairo to 2.8.4, adds some release docs and updates the
version to alpha.3 to prepare for another release.

* try fix

* cleanup ci, remove panic in link

* rename from jit to from ptr, etc

* crates.io badge

* progress

* progress

* fmt2

* progress

* progress

* fix

* fix bench

* use struct

* Fix felt252 and enum deserialization bugs. (#844)

* Fix felt252 and enum deserialization bugs.

* Fix formatting.

* Also fix the runtime.

* Fix errors.

* try to fix ci

* remove unused deps

---------

Co-authored-by: Edgar Luque <[email protected]>

* Fix trace dump type conv

* fix aot contract executor not passing builtinstats (#849)

* Fix felt252 and enum deserialization bugs.

* Fix formatting.

* Also fix the runtime.

* Fix errors.

* try to fix ci

* remove unused deps

* fix aot contract executor not passing builtinstats

---------

Co-authored-by: Esteve Soler Arderiu <[email protected]>
Co-authored-by: Esteve Soler Arderiu <[email protected]>

* Fix bug (#851)

* Also fix felt bits in starknet syscall wrappers (#853)

* Also fix felt bits in starknet syscall wrappers

* style

* missed

* fix aot contract executor not passing builtinstats (#849)

* Fix felt252 and enum deserialization bugs.

* Fix formatting.

* Also fix the runtime.

* Fix errors.

* try to fix ci

* remove unused deps

* fix aot contract executor not passing builtinstats

---------

Co-authored-by: Esteve Soler Arderiu <[email protected]>
Co-authored-by: Esteve Soler Arderiu <[email protected]>

* Fix bug (#851)

* Also fix felt bits in starknet syscall wrappers (#853)

* Also fix felt bits in starknet syscall wrappers

* style

* missed

* update version to alpha 4 (#854)

* bytes31

* Better function attributes and re-enable >O1 opt (#843)

* Fix felt252 and enum deserialization bugs.

* Fix formatting.

* Also fix the runtime.

* Fix errors.

* try to fix ci

* remove unused deps

* proper function attributes

* add proper function attrs to optimize better, add some passes, run tests with atleast some opts

* dont use remi

* oops

* maybe with opt level 3 now it works

* test

* works

* readd deleted bench

* remove dbg

* Update bench-hyperfine.sh

* fixci

* comment

* Update src/ffi.rs

Co-authored-by: MrAzteca <[email protected]>

---------

Co-authored-by: Esteve Soler Arderiu <[email protected]>
Co-authored-by: Esteve Soler Arderiu <[email protected]>
Co-authored-by: MrAzteca <[email protected]>

* Resolve `CAIRO_NATIVE_RUNTIME_LIBRARY` relative path (#841)

* feat(ffi): resolve runtime relative path using current dir

* chore: remove mentions to old runtime variable

* fix: typo

---------

Co-authored-by: Bohdan Ohorodnii <[email protected]>

* Implement secp

* Fix bytes31

* try to fix ci (#858)

* update implementing libfuncs doc (#856)

* Fix bytes31 bug

* Remove unused dep

---------

Co-authored-by: FrancoGiachetta <[email protected]>
Co-authored-by: Edgar <[email protected]>
Co-authored-by: MrAzteca <[email protected]>
Co-authored-by: Esteve Soler Arderiu <[email protected]>
Co-authored-by: Esteve Soler Arderiu <[email protected]>
Co-authored-by: Rodrigo <[email protected]>
Co-authored-by: Bohdan Ohorodnii <[email protected]>
@pefontana pefontana mentioned this pull request Oct 21, 2024
Merged
5 tasks
github-merge-queue bot pushed a commit that referenced this pull request Oct 21, 2024
@pefontana
Revert builtin cost rework (#874)
355c250 
* Revert "fix aot contract executor not passing builtinstats (#849)"

This reverts commit aff451c.

* Revert "Builtin costs rework (#837)"

This reverts commit f862ec3.

---------

Co-authored-by: pefontana <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@azteca1998 azteca1998 azteca1998 approved these changes

@JulianGCalderon JulianGCalderon JulianGCalderon approved these changes

@igaray igaray Awaiting requested review from igaray igaray is a code owner

@jrchatruc jrchatruc Awaiting requested review from jrchatruc jrchatruc is a code owner

@entropidelic entropidelic Awaiting requested review from entropidelic entropidelic is a code owner

@fmoletta fmoletta Awaiting requested review from fmoletta fmoletta is a code owner

@Oppen Oppen Awaiting requested review from Oppen Oppen is a code owner

@pefontana pefontana Awaiting requested review from pefontana pefontana is a code owner

Assignees
No one assigned
Labels
review-ready A PR that is ready for review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@edg-l @codecov-commenter @azteca1998 @JulianGCalderon