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

perf: remove unneeded bitshift in validated addresses insertion #1208

Merged
merged 15 commits into from
Jul 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

* fix: CLI errors bad formatting and handling

* perf: replace insertion with bit-setting in validated addresses [#1208](https://github.com/lambdaclass/cairo-vm/pull/1208)

* fix: return error when a parsed hint's PC is invalid [#1340](https://github.com/lambdaclass/cairo-vm/pull/1340)

* chore(deps): bump _cairo-lang_ dependencies to v2.1.0-rc2 [#1345](https://github.com/lambdaclass/cairo-vm/pull/1345)
Expand Down
29 changes: 14 additions & 15 deletions vm/src/vm/vm_memory/memory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ impl AddressSet {
if offset >= self.0[segment].len() {
self.0[segment].resize(offset + 1, false);
}

self.0[segment].insert(offset, true);
self.0[segment].replace(offset, true);
}
}
}
Expand Down Expand Up @@ -319,10 +318,8 @@ impl Memory {
.and_then(|x| self.validation_rules.get(x))
{
if !self.validated_addresses.contains(&addr) {
{
self.validated_addresses
.extend(rule.0(self, addr)?.as_slice());
}
self.validated_addresses
.extend(rule.0(self, addr)?.as_slice());
}
}
Ok(())
Expand All @@ -331,15 +328,17 @@ impl Memory {
///Applies validation_rules to the current memory
pub fn validate_existing_memory(&mut self) -> Result<(), MemoryError> {
for (index, rule) in self.validation_rules.iter().enumerate() {
if let Some(rule) = rule {
if index < self.data.len() {
for offset in 0..self.data[index].len() {
let addr = Relocatable::from((index as isize, offset));
if !self.validated_addresses.contains(&addr) {
self.validated_addresses
.extend(rule.0(self, addr)?.as_slice());
}
}
if index >= self.data.len() {
continue;
}
let Some(rule) = rule else {
continue;
};
for offset in 0..self.data[index].len() {
let addr = Relocatable::from((index as isize, offset));
if !self.validated_addresses.contains(&addr) {
self.validated_addresses
.extend(rule.0(self, addr)?.as_slice());
}
}
}
Expand Down