Implement CairoPie::read_zip_file
#1729
Merged
Conversation
This file contains 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
|
|
Benchmark Results for unmodified programs 🚀
|
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #1729 +/- ##
==========================================
+ Coverage 94.78% 94.89% +0.10%
==========================================
Files 100 100
Lines 38322 38425 +103
==========================================
+ Hits 36325 36464 +139
+ Misses 1997 1961 -36 ☔ View full report in Codecov by Sentry. |
fmoletta
requested review from
igaray,
Oppen,
juanbono and
pefontana
as code owners
Oppen
reviewed
Apr 23, 2024
vm/src/vm/runners/cairo_pie.rs
Outdated
Comment on lines
137
to
181
| #[cfg(feature = "std")] | ||
| pub fn read_zip_file(file_path: &Path) -> Result<CairoPie, std::io::Error> { | ||
| use std::io::Read; | ||
| use zip::ZipArchive; | ||
|
|
||
| let file = File::open(file_path)?; | ||
| let mut zip_reader = ZipArchive::new(file)?; | ||
|
|
||
| let mut version = vec![]; | ||
| zip_reader | ||
| .by_name("version.json")? | ||
| .read_to_end(&mut version)?; | ||
| let version: CairoPieVersion = serde_json::from_slice(&version)?; | ||
|
|
||
| let mut metadata = vec![]; | ||
| zip_reader | ||
| .by_name("metadata.json")? | ||
| .read_to_end(&mut metadata)?; | ||
| let metadata: CairoPieMetadata = serde_json::from_slice(&metadata)?; | ||
|
|
||
| let mut memory = vec![]; | ||
| zip_reader.by_name("memory.bin")?.read_to_end(&mut memory)?; | ||
| let memory = CairoPieMemory::from_bytes(&memory) | ||
| .ok_or_else(|| std::io::Error::from(std::io::ErrorKind::InvalidData))?; | ||
|
|
||
| let mut execution_resources = vec![]; | ||
| zip_reader | ||
| .by_name("execution_resources.json")? | ||
| .read_to_end(&mut execution_resources)?; | ||
| let execution_resources: ExecutionResources = serde_json::from_slice(&execution_resources)?; | ||
|
|
||
| let mut additional_data = vec![]; | ||
| zip_reader | ||
| .by_name("additional_data.json")? | ||
| .read_to_end(&mut additional_data)?; | ||
| let additional_data: CairoPieAdditionalData = serde_json::from_slice(&additional_data)?; | ||
|
|
||
| Ok(CairoPie { | ||
| metadata, | ||
| memory, | ||
| execution_resources, | ||
| additional_data, | ||
| version, | ||
| }) | ||
| } |
There was a problem hiding this comment.
This could have a big memory peak from all the read_to_end calls. Consider deserializing from the readers directly, maybe with a BufReader.
There was a problem hiding this comment.
Alternatively, use and clear a single buffer so at least we don't have all the data in temporaries at the same time.
Oppen
reviewed
Apr 23, 2024
|
There seems to be a significant performance regression. |
Oppen
reviewed
Apr 23, 2024
Co-authored-by: Mario Rugiero <mario.rugiero@lambdaclass.com>
This is quite strange, the benchmarks don't produce or consume Cairo PIEs so they shouldn't be affected by this PR |
Whatever it was it seems to have been reversed by new commits. Maybe it was throttling in the worker. |
juanbono
approved these changes
Apr 24, 2024
Oppen
approved these changes
Apr 24, 2024
Oppen
reviewed
Apr 24, 2024
Comment on lines
+152
to
+155
| let mut memory = vec![]; | ||
| zip_reader.by_name("memory.bin")?.read_to_end(&mut memory)?; | ||
| let memory = CairoPieMemory::from_bytes(&memory) | ||
| .ok_or_else(|| std::io::Error::from(std::io::ErrorKind::InvalidData))?; |
There was a problem hiding this comment.
Suggested change
| let mut memory = vec![]; | |
| zip_reader.by_name("memory.bin")?.read_to_end(&mut memory)?; | |
| let memory = CairoPieMemory::from_bytes(&memory) | |
| .ok_or_else(|| std::io::Error::from(std::io::ErrorKind::InvalidData))?; | |
| let reader = std::io::BufReader::new(zip_reader.by_name("memory.bin")?); | |
| let memory = CairoPieMemory::from_reader(reader) | |
| .ok_or_else(|| std::io::Error::from(std::io::ErrorKind::InvalidData))?; |
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Implements custom deserialization for structs using custom serialization.
Implement method to deserialize a CairoPie from a zip file
Move custom serialization functions into sub-modules along with their added deserialization counterparts to make use of the
serde(with)attribute and make code cleaner