From 58fdd449b5b1dcd15ab39cf4b9ad77082adfaf6f Mon Sep 17 00:00:00 2001 From: Gerd Zellweger Date: Tue, 27 Sep 2022 22:14:54 -0700 Subject: [PATCH 1/4] Enable unmap latency benchmark. --- scripts/ci.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci.bash b/scripts/ci.bash index 8f688f8b9..9967a307b 100644 --- a/scripts/ci.bash +++ b/scripts/ci.bash @@ -15,6 +15,7 @@ rm -f leveldb_benchmark.csv # For vmops: --features prealloc can improve performance further (at the expense of test duration) RUST_TEST_THREADS=1 cargo test --test integration-test -- s06_vmops_benchmark --nocapture RUST_TEST_THREADS=1 cargo test --test integration-test -- s06_vmops_latency_benchmark --nocapture +RUST_TEST_THREADS=1 cargo test --test integration-test -- s06_vmops_unmaplat_latency_benchmark --nocapture RUST_TEST_THREADS=1 cargo test --test integration-test -- s06_redis_benchmark_ --nocapture #RUST_TEST_THREADS=1 cargo test --test integration-test -- s06_memcached_benchmark --nocapture RUST_TEST_THREADS=1 cargo test --test integration-test -- s06_leveldb_benchmark --nocapture From 15db3ae15a3a455b8edf919bbe6bf8b94fdf1919 Mon Sep 17 00:00:00 2001 From: Gerd Zellweger Date: Thu, 29 Sep 2022 10:03:24 -0700 Subject: [PATCH 2/4] Increase queue size for unmaplat benchmark. --- kernel/src/memory/detmem.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/src/memory/detmem.rs b/kernel/src/memory/detmem.rs index da09f76f1..e538d40cf 100644 --- a/kernel/src/memory/detmem.rs +++ b/kernel/src/memory/detmem.rs @@ -60,7 +60,7 @@ impl DeterministicAlloc { // Need to figure out this capacity; it is hard to determine, // something like: (#allocations of write op in NR with most // allocations)*(max log entries till GC) - const ALLOC_CAP: usize = 32_000; + const ALLOC_CAP: usize = 64_000; let mut qs = ArrayVec::new(); for _i in 0..nodes { From e7a01c8e5d5859d06f5e3104abdabe0219d150e3 Mon Sep 17 00:00:00 2001 From: Gerd Zellweger Date: Thu, 29 Sep 2022 10:06:34 -0700 Subject: [PATCH 3/4] Disable some tests for faster execution. --- kernel/tests/integration-test.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/tests/integration-test.rs b/kernel/tests/integration-test.rs index a77e87fdb..884d1f3b3 100644 --- a/kernel/tests/integration-test.rs +++ b/kernel/tests/integration-test.rs @@ -1220,6 +1220,7 @@ fn s01_timer() { } /// Test that we can initialize the ACPI subsystem and figure out the machine topology. +/* #[cfg(not(feature = "baremetal"))] #[test] fn s02_acpi_topology() { @@ -2206,6 +2207,7 @@ fn s02_vspace_debug() { check_for_successful_exit(&cmdline, qemu_run(), output); plot_vspace(&graphviz_output).expect("Can't plot vspace"); } +*/ /// Tests that user-space application redis is functional /// by spawing it and connecting to it from the network. From 286cdb766ba542ec856ac63c4370cce9e1e2795e Mon Sep 17 00:00:00 2001 From: Gerd Zellweger Date: Thu, 29 Sep 2022 12:51:25 -0700 Subject: [PATCH 4/4] Also upload unmaplat results. --- scripts/ci.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/ci.bash b/scripts/ci.bash index 9967a307b..64b2b026b 100644 --- a/scripts/ci.bash +++ b/scripts/ci.bash @@ -64,8 +64,10 @@ mkdir -p ${DEPLOY_DIR} cp gh-pages/vmops/index.markdown ${DEPLOY_DIR} mv vmops_benchmark.csv ${DEPLOY_DIR} mv vmops_benchmark_latency.csv ${DEPLOY_DIR} +mv vmops_unmaplat_benchmark_latency.csv ${DEPLOY_DIR} gzip ${DEPLOY_DIR}/vmops_benchmark.csv gzip ${DEPLOY_DIR}/vmops_benchmark_latency.csv +gzip ${DEPLOY_DIR}/vmops_unmaplat_benchmark_latency.csv # Copy memfs results DEPLOY_DIR="gh-pages/memfs/${CI_MACHINE_TYPE}/${GIT_REV_CURRENT}/"