From 185b27b01c9183f7d33c79229672a53e7ed8bab5 Mon Sep 17 00:00:00 2001 From: Fabing Li Date: Thu, 23 Jan 2025 09:00:06 +0000 Subject: [PATCH] Unify benchmark job name conventions --- .github/workflows/benchmark_asterinas.yml | 2 +- .../smp1/bench_results/{p50_rps_smp1.json => p50_rps.json} | 0 .../{p99_request_latency_smp1.json => p99_request_latency.json} | 0 .../{p99_wakeup_latency_smp1.json => p99_wakeup_latency.json} | 0 .../smp8/bench_results/{p50_rps_smp8.json => p50_rps.json} | 0 .../{p99_request_latency_smp8.json => p99_request_latency.json} | 0 .../{p99_wakeup_latency_smp8.json => p99_wakeup_latency.json} | 0 .../{ext2_deletes_between.json => deletes_between.json} | 0 .../{ext2_deletes_individual.json => deletes_individual.json} | 0 .../{ext2_refill_replace.json => refill_replace.json} | 0 .../bench_results/{ext2_selects_ipk.json => selects_ipk.json} | 0 .../{ext2_selects_text_pk.json => selects_text_pk.json} | 0 .../bench_results/{ext2_total.json => total.json} | 0 .../{ext2_updates_between.json => updates_between.json} | 0 .../{ext2_updates_big_one.json => updates_big_one.json} | 0 .../{ext2_updates_individual.json => updates_individual.json} | 0 .../bench_results/{ext2_vacuum.json => vacuum.json} | 0 .../{ramfs_deletes_between.json => deletes_between.json} | 0 .../{ramfs_deletes_individual.json => deletes_individual.json} | 0 .../{ramfs_refill_replace.json => refill_replace.json} | 0 .../bench_results/{ramfs_selects_ipk.json => selects_ipk.json} | 0 .../{ramfs_selects_text_pk.json => selects_text_pk.json} | 0 .../bench_results/{ramfs_total.json => total.json} | 0 .../{ramfs_updates_between.json => updates_between.json} | 0 .../{ramfs_updates_big_one.json => updates_big_one.json} | 0 .../{ramfs_updates_individual.json => updates_individual.json} | 0 .../bench_results/{ramfs_vacuum.json => vacuum.json} | 0 27 files changed, 1 insertion(+), 1 deletion(-) rename test/benchmark/schbench/smp1/bench_results/{p50_rps_smp1.json => p50_rps.json} (100%) rename test/benchmark/schbench/smp1/bench_results/{p99_request_latency_smp1.json => p99_request_latency.json} (100%) rename test/benchmark/schbench/smp1/bench_results/{p99_wakeup_latency_smp1.json => p99_wakeup_latency.json} (100%) rename test/benchmark/schbench/smp8/bench_results/{p50_rps_smp8.json => p50_rps.json} (100%) rename test/benchmark/schbench/smp8/bench_results/{p99_request_latency_smp8.json => p99_request_latency.json} (100%) rename test/benchmark/schbench/smp8/bench_results/{p99_wakeup_latency_smp8.json => p99_wakeup_latency.json} (100%) rename test/benchmark/sqlite/ext2_benchmarks/bench_results/{ext2_deletes_between.json => deletes_between.json} (100%) rename test/benchmark/sqlite/ext2_benchmarks/bench_results/{ext2_deletes_individual.json => deletes_individual.json} (100%) rename test/benchmark/sqlite/ext2_benchmarks/bench_results/{ext2_refill_replace.json => refill_replace.json} (100%) rename test/benchmark/sqlite/ext2_benchmarks/bench_results/{ext2_selects_ipk.json => selects_ipk.json} (100%) rename test/benchmark/sqlite/ext2_benchmarks/bench_results/{ext2_selects_text_pk.json => selects_text_pk.json} (100%) rename test/benchmark/sqlite/ext2_benchmarks/bench_results/{ext2_total.json => total.json} (100%) rename test/benchmark/sqlite/ext2_benchmarks/bench_results/{ext2_updates_between.json => updates_between.json} (100%) rename test/benchmark/sqlite/ext2_benchmarks/bench_results/{ext2_updates_big_one.json => updates_big_one.json} (100%) rename test/benchmark/sqlite/ext2_benchmarks/bench_results/{ext2_updates_individual.json => updates_individual.json} (100%) rename test/benchmark/sqlite/ext2_benchmarks/bench_results/{ext2_vacuum.json => vacuum.json} (100%) rename test/benchmark/sqlite/ramfs_benchmarks/bench_results/{ramfs_deletes_between.json => deletes_between.json} (100%) rename test/benchmark/sqlite/ramfs_benchmarks/bench_results/{ramfs_deletes_individual.json => deletes_individual.json} (100%) rename test/benchmark/sqlite/ramfs_benchmarks/bench_results/{ramfs_refill_replace.json => refill_replace.json} (100%) rename test/benchmark/sqlite/ramfs_benchmarks/bench_results/{ramfs_selects_ipk.json => selects_ipk.json} (100%) rename test/benchmark/sqlite/ramfs_benchmarks/bench_results/{ramfs_selects_text_pk.json => selects_text_pk.json} (100%) rename test/benchmark/sqlite/ramfs_benchmarks/bench_results/{ramfs_total.json => total.json} (100%) rename test/benchmark/sqlite/ramfs_benchmarks/bench_results/{ramfs_updates_between.json => updates_between.json} (100%) rename test/benchmark/sqlite/ramfs_benchmarks/bench_results/{ramfs_updates_big_one.json => updates_big_one.json} (100%) rename test/benchmark/sqlite/ramfs_benchmarks/bench_results/{ramfs_updates_individual.json => updates_individual.json} (100%) rename test/benchmark/sqlite/ramfs_benchmarks/bench_results/{ramfs_vacuum.json => vacuum.json} (100%) diff --git a/.github/workflows/benchmark_asterinas.yml b/.github/workflows/benchmark_asterinas.yml index e79d8995..aca2555b 100644 --- a/.github/workflows/benchmark_asterinas.yml +++ b/.github/workflows/benchmark_asterinas.yml @@ -185,7 +185,7 @@ jobs: run: | BENCHMARK_DIR=$(echo ${{ matrix.benchmark }} | sed 's/-/\//g') BENCHMARK_SUITE=$(echo $BENCHMARK_DIR | awk -F'/' '{print $1}') - BENCHMARK_NAME=$(basename "$BENCHMARK_DIR") + BENCHMARK_NAME=$(echo "$BENCHMARK_DIR" | sed -E 's|^[^/]+/||; s|/bench_results||g; s|/|_|g') BENCH_RESULT="test/benchmark/${BENCHMARK_DIR}/bench_result.json" [ -f "$BENCH_RESULT" ] || BENCH_RESULT="test/benchmark/${BENCHMARK_DIR}.json" ALERT_THRESHOLD=$(jq -r '.alert.threshold // "130%"' "$BENCH_RESULT") diff --git a/test/benchmark/schbench/smp1/bench_results/p50_rps_smp1.json b/test/benchmark/schbench/smp1/bench_results/p50_rps.json similarity index 100% rename from test/benchmark/schbench/smp1/bench_results/p50_rps_smp1.json rename to test/benchmark/schbench/smp1/bench_results/p50_rps.json diff --git a/test/benchmark/schbench/smp1/bench_results/p99_request_latency_smp1.json b/test/benchmark/schbench/smp1/bench_results/p99_request_latency.json similarity index 100% rename from test/benchmark/schbench/smp1/bench_results/p99_request_latency_smp1.json rename to test/benchmark/schbench/smp1/bench_results/p99_request_latency.json diff --git a/test/benchmark/schbench/smp1/bench_results/p99_wakeup_latency_smp1.json b/test/benchmark/schbench/smp1/bench_results/p99_wakeup_latency.json similarity index 100% rename from test/benchmark/schbench/smp1/bench_results/p99_wakeup_latency_smp1.json rename to test/benchmark/schbench/smp1/bench_results/p99_wakeup_latency.json diff --git a/test/benchmark/schbench/smp8/bench_results/p50_rps_smp8.json b/test/benchmark/schbench/smp8/bench_results/p50_rps.json similarity index 100% rename from test/benchmark/schbench/smp8/bench_results/p50_rps_smp8.json rename to test/benchmark/schbench/smp8/bench_results/p50_rps.json diff --git a/test/benchmark/schbench/smp8/bench_results/p99_request_latency_smp8.json b/test/benchmark/schbench/smp8/bench_results/p99_request_latency.json similarity index 100% rename from test/benchmark/schbench/smp8/bench_results/p99_request_latency_smp8.json rename to test/benchmark/schbench/smp8/bench_results/p99_request_latency.json diff --git a/test/benchmark/schbench/smp8/bench_results/p99_wakeup_latency_smp8.json b/test/benchmark/schbench/smp8/bench_results/p99_wakeup_latency.json similarity index 100% rename from test/benchmark/schbench/smp8/bench_results/p99_wakeup_latency_smp8.json rename to test/benchmark/schbench/smp8/bench_results/p99_wakeup_latency.json diff --git a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_deletes_between.json b/test/benchmark/sqlite/ext2_benchmarks/bench_results/deletes_between.json similarity index 100% rename from test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_deletes_between.json rename to test/benchmark/sqlite/ext2_benchmarks/bench_results/deletes_between.json diff --git a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_deletes_individual.json b/test/benchmark/sqlite/ext2_benchmarks/bench_results/deletes_individual.json similarity index 100% rename from test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_deletes_individual.json rename to test/benchmark/sqlite/ext2_benchmarks/bench_results/deletes_individual.json diff --git a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_refill_replace.json b/test/benchmark/sqlite/ext2_benchmarks/bench_results/refill_replace.json similarity index 100% rename from test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_refill_replace.json rename to test/benchmark/sqlite/ext2_benchmarks/bench_results/refill_replace.json diff --git a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_selects_ipk.json b/test/benchmark/sqlite/ext2_benchmarks/bench_results/selects_ipk.json similarity index 100% rename from test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_selects_ipk.json rename to test/benchmark/sqlite/ext2_benchmarks/bench_results/selects_ipk.json diff --git a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_selects_text_pk.json b/test/benchmark/sqlite/ext2_benchmarks/bench_results/selects_text_pk.json similarity index 100% rename from test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_selects_text_pk.json rename to test/benchmark/sqlite/ext2_benchmarks/bench_results/selects_text_pk.json diff --git a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_total.json b/test/benchmark/sqlite/ext2_benchmarks/bench_results/total.json similarity index 100% rename from test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_total.json rename to test/benchmark/sqlite/ext2_benchmarks/bench_results/total.json diff --git a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_updates_between.json b/test/benchmark/sqlite/ext2_benchmarks/bench_results/updates_between.json similarity index 100% rename from test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_updates_between.json rename to test/benchmark/sqlite/ext2_benchmarks/bench_results/updates_between.json diff --git a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_updates_big_one.json b/test/benchmark/sqlite/ext2_benchmarks/bench_results/updates_big_one.json similarity index 100% rename from test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_updates_big_one.json rename to test/benchmark/sqlite/ext2_benchmarks/bench_results/updates_big_one.json diff --git a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_updates_individual.json b/test/benchmark/sqlite/ext2_benchmarks/bench_results/updates_individual.json similarity index 100% rename from test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_updates_individual.json rename to test/benchmark/sqlite/ext2_benchmarks/bench_results/updates_individual.json diff --git a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_vacuum.json b/test/benchmark/sqlite/ext2_benchmarks/bench_results/vacuum.json similarity index 100% rename from test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_vacuum.json rename to test/benchmark/sqlite/ext2_benchmarks/bench_results/vacuum.json diff --git a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_deletes_between.json b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/deletes_between.json similarity index 100% rename from test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_deletes_between.json rename to test/benchmark/sqlite/ramfs_benchmarks/bench_results/deletes_between.json diff --git a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_deletes_individual.json b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/deletes_individual.json similarity index 100% rename from test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_deletes_individual.json rename to test/benchmark/sqlite/ramfs_benchmarks/bench_results/deletes_individual.json diff --git a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_refill_replace.json b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/refill_replace.json similarity index 100% rename from test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_refill_replace.json rename to test/benchmark/sqlite/ramfs_benchmarks/bench_results/refill_replace.json diff --git a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_selects_ipk.json b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/selects_ipk.json similarity index 100% rename from test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_selects_ipk.json rename to test/benchmark/sqlite/ramfs_benchmarks/bench_results/selects_ipk.json diff --git a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_selects_text_pk.json b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/selects_text_pk.json similarity index 100% rename from test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_selects_text_pk.json rename to test/benchmark/sqlite/ramfs_benchmarks/bench_results/selects_text_pk.json diff --git a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_total.json b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/total.json similarity index 100% rename from test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_total.json rename to test/benchmark/sqlite/ramfs_benchmarks/bench_results/total.json diff --git a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_updates_between.json b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/updates_between.json similarity index 100% rename from test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_updates_between.json rename to test/benchmark/sqlite/ramfs_benchmarks/bench_results/updates_between.json diff --git a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_updates_big_one.json b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/updates_big_one.json similarity index 100% rename from test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_updates_big_one.json rename to test/benchmark/sqlite/ramfs_benchmarks/bench_results/updates_big_one.json diff --git a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_updates_individual.json b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/updates_individual.json similarity index 100% rename from test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_updates_individual.json rename to test/benchmark/sqlite/ramfs_benchmarks/bench_results/updates_individual.json diff --git a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_vacuum.json b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/vacuum.json similarity index 100% rename from test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_vacuum.json rename to test/benchmark/sqlite/ramfs_benchmarks/bench_results/vacuum.json