logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-01-07 16:23:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove_ignored_values

Browse Source
This commit is contained in:
Daniel Lubarov 2022-08-01 08:47:07 -07:00
parent 94183f723c
commit 63c8568b17
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
evm/src/cpu/kernel/optimizer.rs
View File

@ -23,6 +23,7 @@ fn optimize_asm_once(code: &mut Vec<Item>) {
constant_propagation(code); constant_propagation(code);
no_op_jumps(code); no_op_jumps(code);
remove_swaps(code); remove_swaps(code);
remove_ignored_values(code);
} }
/// Constant propagation. /// Constant propagation.
@ -62,7 +63,7 @@ fn constant_propagation(code: &mut Vec<Item>) {
}); });
} }
/// Remove no-op jumps: `[PUSH label, JUMP, label:] -> [label:]` /// Remove no-op jumps: `[PUSH label, JUMP, label:] -> [label:]`.
fn no_op_jumps(code: &mut Vec<Item>) { fn no_op_jumps(code: &mut Vec<Item>) {
replace_windows(code, |window| { replace_windows(code, |window| {
if let [Push(Label(l)), StandardOp(jump), decl] = window if let [Push(Label(l)), StandardOp(jump), decl] = window
@ -76,7 +77,7 @@ fn no_op_jumps(code: &mut Vec<Item>) {
}); });
} }
/// Remove swaps: `[PUSH x, PUSH y, SWAP1] -> [PUSH y, PUSH x]` /// Remove swaps: `[PUSH x, PUSH y, SWAP1] -> [PUSH y, PUSH x]`.
fn remove_swaps(code: &mut Vec<Item>) { fn remove_swaps(code: &mut Vec<Item>) {
replace_windows(code, |window| { replace_windows(code, |window| {
if let [Push(x), Push(y), StandardOp(swap1)] = window if let [Push(x), Push(y), StandardOp(swap1)] = window
@ -88,6 +89,21 @@ fn remove_swaps(code: &mut Vec<Item>) {
}); });
} }
/// Remove push-pop type patterns, such as: `[DUP1, POP]`.
fn remove_ignored_values(code: &mut Vec<Item>) {
replace_windows(code, |[a, b]| {
if let StandardOp(pop) = b && &pop == "POP" {
match a {
Push(_) => Some(vec![]),
StandardOp(dup) if dup.starts_with("DUP") => Some(vec![]),
_ => None,
}
} else {
None
}
});
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
@ -178,4 +194,18 @@ mod tests {
vec![Push(Label("mylabel".into())), Push(Literal("42".into()))] vec![Push(Label("mylabel".into())), Push(Literal("42".into()))]
); );
} }
#[test]
fn test_remove_push_pop() {
let mut code = vec![Push(Literal("42".into())), StandardOp("POP".into())];
remove_ignored_values(&mut code);
assert_eq!(code, vec![]);
}
#[test]
fn test_remove_dup_pop() {
let mut code = vec![StandardOp("DUP5".into()), StandardOp("POP".into())];
remove_ignored_values(&mut code);
assert_eq!(code, vec![]);
}
} }