From 0d4b7474a7fc6060297826ee779c29486d3e387b Mon Sep 17 00:00:00 2001
From: Sadhan Sood <106645797+sadhansood@users.noreply.github.com>
Date: Thu, 29 Sep 2022 17:19:57 -0700
Subject: [PATCH] Fix github bench workflow to use stress binary (#4879)

---
 .github/workflows/bench.yml             | 19 ++++++++++++-------
 crates/sui-benchmark/src/drivers/mod.rs |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
index 55b5b970ebbae..0033fb5643f1e 100644
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@@ -57,7 +57,8 @@ jobs:
     - name: prepare artifact directory
       run: |
         mkdir -p artifacts
-        echo '# Bench results' > artifacts/bench_results.txt
+        echo '# Bench results' > artifacts/owned.txt
+        echo '# Bench results' > artifacts/shared.txt
     - name: compile benchmark
       uses: actions-rs/cargo@v1
       with:
@@ -66,16 +67,20 @@ jobs:
     - name: run benchmark
       run: |
         set -o pipefail
-        cargo run --release --bin bench microbench throughput 2>&1 | huniq | tee -a artifacts/bench_results.txt
+        cargo run --package sui-benchmark --bin stress -- --log-path /tmp/stress.log --num-client-threads 10 --num-server-threads 24 --num-transfer-accounts 2 bench --target-qps 100 --num-workers 10  --transfer-object 100 --run-duration 60s 2>&1 | huniq | tee -a artifacts/owned.txt
+        cargo run --package sui-benchmark --bin stress -- --log-path /tmp/stress.log --num-client-threads 10 --num-server-threads 24 --num-transfer-accounts 2 bench --target-qps 100 --num-workers 10  --shared-counter 100 --run-duration 60s 2>&1 | huniq | tee -a artifacts/shared.txt
     - name: retrieve benchmark results
       id: get-comment-body
       run: |
-        body=$(cat artifacts/bench_results.txt)
-        body="${body//$'\n'/'%0A'}"
-        body="${body//$'\r'/'%0D'}"
-        echo ::set-output name=body::$body
+        owned="Owned $(cat artifacts/owned.txt | grep -e '|' -e '-' -e 'Bench' -e '+')"
+        shared="Shared $(cat artifacts/shared.txt | grep -e '|' -e '-' -e 'Bench' -e '+')"
+        echo ::set-output name=owned::$owned
+        echo ::set-output name=shared::$shared
     - name: Create commit comment
       uses: peter-evans/commit-comment@v2
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
-        body: ${{ steps.get-comment-body.outputs.body }}
+        body: |
+          Benchmark Reports:
+          - ${{ steps.get-comment-body.outputs.owned }}
+          - ${{ steps.get-comment-body.outputs.shared }}
diff --git a/crates/sui-benchmark/src/drivers/mod.rs b/crates/sui-benchmark/src/drivers/mod.rs
index 625e0c1fa2ae2..5028fd4d35805 100644
--- a/crates/sui-benchmark/src/drivers/mod.rs
+++ b/crates/sui-benchmark/src/drivers/mod.rs
@@ -104,7 +104,7 @@ impl BenchmarkStats {
         row.add_cell(Cell::new(self.duration.as_secs()));
         row.add_cell(Cell::new(self.num_success / self.duration.as_secs()));
         row.add_cell(Cell::new(
-            self.num_error / (self.num_error + self.num_success),
+            (100 * self.num_error) as f32 / (self.num_error + self.num_success) as f32,
         ));
         row.add_cell(Cell::new(self.latency_ms.histogram.min()));
         row.add_cell(Cell::new(self.latency_ms.histogram.value_at_quantile(0.25)));