ci: Fix cycle regression checker (#188)

* ci: Fix cycle regression checker * Test workflow * Prep for review
argumentcomputer · Sep 27, 2024 · 3df2a8a · 3df2a8a
1 parent f92e03a
commit 3df2a8a
Show file tree

Hide file tree

Showing 15 changed files with 82 additions and 53 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -222,7 +222,7 @@ jobs:
 
           for test_name in ${{ env.TESTS }}; do
             cargo nextest run --verbose --release --profile ci ${{ env.FEATURES }} --package ${{ matrix.package }}-lc --no-capture -E "test($test_name)" 2>&1 | tee out.txt
-            num_cycles=$(cat out.txt | grep -o 'finished execution clk = [0-9]\+' | awk -F'= ' '{ print $2 }')
+            num_cycles=$(cat out.txt | grep -o 'summary: cycles=[0-9]\+' | awk -F'=' '{ print $2 }')
             CYCLE_COUNTS=$(echo $CYCLE_COUNTS | jq -c ". += [{\"${test_name}\": \"$num_cycles\"}]")
           done
 
@@ -244,10 +244,9 @@ jobs:
           REGRESSION="false"
           set -o pipefail
 
-          # TODO: Remove hardcoded test names
           for test_name in ${{ env.TESTS }}; do
             cargo nextest run --verbose --release --profile ci ${{ env.FEATURES }} --package ${{ matrix.package }}-lc --no-capture -E "test($test_name)" 2>&1 | tee out.txt
-            num_cycles_base=$(cat out.txt | grep -o 'finished execution clk = [0-9]\+' | awk -F'= ' '{ print $2 }')
+            num_cycles_base=$(cat out.txt | grep -o 'summary: cycles=[0-9]\+' | awk -F'=' '{ print $2 }')
             num_cycles_pr=$(echo "$CYCLE_COUNTS" | jq ".[$counter] | to_entries | .[0].value")
             echo "$test_name summary"
             echo "Base = $num_cycles_base cycles, PR = ${num_cycles_pr:1:-1} cycles"

diff --git a/aptos/Cargo.lock b/aptos/Cargo.lock
diff --git a/aptos/aptos-programs/Cargo.toml b/aptos/aptos-programs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aptos-programs"
-version = "1.0.1"
+version = "1.1.0"
 edition = { workspace = true }
 repository = { workspace = true }
 license = { workspace = true }

diff --git a/aptos/aptos-programs/artifacts/benchmarks/signature-verification-program b/aptos/aptos-programs/artifacts/benchmarks/signature-verification-program
diff --git a/aptos/aptos-programs/artifacts/epoch-change-program b/aptos/aptos-programs/artifacts/epoch-change-program
diff --git a/aptos/aptos-programs/artifacts/inclusion-program b/aptos/aptos-programs/artifacts/inclusion-program
diff --git a/aptos/core/Cargo.toml b/aptos/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aptos-lc-core"
-version = "1.0.1"
+version = "1.1.0"
 edition = { workspace = true }
 repository = { workspace = true }
 license = { workspace = true }

diff --git a/aptos/core/src/crypto/sig.rs b/aptos/core/src/crypto/sig.rs
@@ -120,7 +120,7 @@ impl PublicKey {
     /// A `Vec<u8>` representing the public key.
     pub fn to_bytes(&self) -> Vec<u8> {
         let mut bytes = BytesMut::new();
-        let pub_key_bytes = self.compressed_pubkey.as_ref();
+        let pub_key_bytes: &[u8] = self.compressed_pubkey.as_ref();
 
         bytes.put_slice(&write_leb128(pub_key_bytes.len() as u64));
         bytes.put_slice(pub_key_bytes);

diff --git a/aptos/light-client/Cargo.toml b/aptos/light-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aptos-lc"
-version = "1.0.1"
+version = "1.1.0"
 edition = { workspace = true }
 repository = { workspace = true }
 license = { workspace = true }
@@ -20,7 +20,7 @@ anyhow = { workspace = true }
 getset = { workspace = true }
 serde = { workspace = true, features = ["derive", "rc"] }
 thiserror = { workspace = true }
-bcs = { workspace = true, optional = true  }
+bcs = { workspace = true, optional = true }
 
 [dev-dependencies]
 aptos-programs = { path = "../aptos-programs", features = ["bench"] }