-
Notifications
You must be signed in to change notification settings - Fork 47
Implement Libfunc Counter #1267
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
Open
FrancoGiachetta
wants to merge
26
commits into
main
Choose a base branch
from
libfunc_counter
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
7882929
fix ci
FrancoGiachetta b54592b
fix daily blocks ci
FrancoGiachetta 4478643
update starknet-replay and sequencer in staknet-blocks workflow
FrancoGiachetta 7bcb98d
implement libfunc_counter
FrancoGiachetta b93ae5b
implement with mlir array
FrancoGiachetta 09ec4d1
Merge branch 'main' into libfunc_counter
FrancoGiachetta 951ac4c
fix implementation with mlir
FrancoGiachetta 5f44530
add documentation
FrancoGiachetta f890e42
revert change
FrancoGiachetta 81511e1
clippy
FrancoGiachetta 06aef99
fix some docs
FrancoGiachetta f930c1f
update comment
FrancoGiachetta a3bb89b
format
FrancoGiachetta 2061d85
change to dynamic arrays (not working yet)
FrancoGiachetta f7b1aeb
format
FrancoGiachetta 71ad878
fix value increment
FrancoGiachetta caa1d07
implement array counter guards
FrancoGiachetta 3a35a0e
add support for multiple contract inner calls
FrancoGiachetta d5a557d
add support for multiple contract inner calls
FrancoGiachetta 99bbaa8
Merge branch 'main' into libfunc_counter
FrancoGiachetta 16e5b34
Merge branch 'main' into libfunc_counter
FrancoGiachetta f51a00e
update docs
FrancoGiachetta 14893de
Merge branch 'libfunc_counter' of github.com:lambdaclass/cairo_native…
FrancoGiachetta 5f31ef4
use malloc and free with trackers
FrancoGiachetta 3ef6949
fix typo
FrancoGiachetta ba640cd
Merge branch 'main' into libfunc_counter
FrancoGiachetta File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -60,6 +60,8 @@ use crate::{ | |
utils::{generate_function_name, walk_ir::walk_mlir_block, BlockExt}, | ||
}; | ||
use bumpalo::Bump; | ||
#[cfg(feature = "with-libfunc-counter")] | ||
use cairo_lang_sierra::ids::ConcreteLibfuncId; | ||
use cairo_lang_sierra::{ | ||
edit_state, | ||
extensions::{ | ||
|
@@ -151,6 +153,14 @@ pub fn compile( | |
let n_libfuncs = program.libfunc_declarations.len() + 1; | ||
let sierra_stmt_start_offset = num_types + n_libfuncs + 1; | ||
|
||
#[cfg(feature = "with-libfunc-counter")] | ||
let libfunc_indexes = program | ||
.libfunc_declarations | ||
.iter() | ||
.enumerate() | ||
.map(|(idx, libf)| (libf.id.clone(), idx)) | ||
.collect::<HashMap<ConcreteLibfuncId, usize>>(); | ||
|
||
Comment on lines
+156
to
+163
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this mapping necessary? The libfunc ID already seems to be autoincremental, so maybe we can use the libfunc ID directly. |
||
for function in &program.funcs { | ||
tracing::info!("Compiling function `{}`.", function.id); | ||
compile_func( | ||
|
@@ -159,6 +169,8 @@ pub fn compile( | |
registry, | ||
function, | ||
&program.statements, | ||
#[cfg(feature = "with-libfunc-counter")] | ||
&libfunc_indexes, | ||
metadata, | ||
di_compile_unit_id, | ||
sierra_stmt_start_offset, | ||
|
@@ -186,6 +198,7 @@ fn compile_func( | |
registry: &ProgramRegistry<CoreType, CoreLibfunc>, | ||
function: &Function, | ||
statements: &[Statement], | ||
#[cfg(feature = "with-libfunc-counter")] libfunc_indexes: &HashMap<ConcreteLibfuncId, usize>, | ||
metadata: &mut MetadataStorage, | ||
di_compile_unit_id: Attribute, | ||
sierra_stmt_start_offset: usize, | ||
|
@@ -640,6 +653,23 @@ fn compile_func( | |
}, | ||
}; | ||
|
||
#[cfg(feature = "with-libfunc-counter")] | ||
{ | ||
// Can't fail. If we had a key from the invocation statement that is not included in this hashmap, | ||
// that would mean that there's an error in the sierra program since we got to invoke a libfunc that has | ||
// not been declared. | ||
let libfunc_idx = libfunc_indexes.get(&invocation.libfunc_id).unwrap(); | ||
gabrielbosio marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
crate::metadata::libfunc_counter::libfunc_counter_runtime::count_libfunc( | ||
context, | ||
module, | ||
block, | ||
location, | ||
metadata, | ||
*libfunc_idx, | ||
)?; | ||
} | ||
|
||
libfunc.build( | ||
context, | ||
registry, | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this comment valid?