[build] Enhancement: Makefile can now run rust benchmarks

benchmarks/c/main.c

@@ -23,9 +23,9 @@
  *====================================================================================================================*/
 
 /**
- * @brief Microbenchmark for demi_wait_any().
+ * @brief Benchmark for demi_wait_any().
  */
-static void microbench_wait_any(const unsigned NUM_ITERS, const unsigned NUM_QTS)
+static void wait_any_bench(const unsigned NUM_ITERS, const unsigned NUM_QTS)
 {
     demi_qtoken_t *qts = NULL;
 
@@ -81,7 +81,7 @@ int main(int argc, char *const argv[])
     };
     assert(demi_init(&args) == 0);
 
-    microbench_wait_any(100000, 1048576);
+    wait_any_bench(100000, 1048576);
 
     return (EXIT_SUCCESS);
 }

dpdk_bindings/inlined.c

@@ -106,9 +106,9 @@ char *rte_pktmbuf_prepend_(struct rte_mbuf *m, uint16_t len)
 struct rte_mbuf *rte_mbuf_from_indirect_(struct rte_mbuf *mi)
 {
     return rte_mbuf_from_indirect(mi);
-} 	
+}
 
 void rte_pktmbuf_detach_(struct rte_mbuf *m)
 {
     rte_pktmbuf_detach(m);
-}
+}

linux.mk

@@ -168,6 +168,9 @@ clean-examples-rust:
 # Benchmarks
 #=======================================================================================================================
 
+bench:
+	$(CARGO) bench $(CARGO_FEATURES) $(CARGO_FLAGS) -- --nocapture
+
 all-benchmarks-c: all-libs
 	$(MAKE) -C benchmarks all
 

src/rust/runtime/mod.rs

@@ -586,14 +586,14 @@ mod tests {
     }
 
     #[bench]
-    fn benchmark_insert_io_coroutine(b: &mut Bencher) {
+    fn insert_io_coroutine_bench(b: &mut Bencher) {
         let mut runtime: SharedDemiRuntime = SharedDemiRuntime::default();
 
         b.iter(|| runtime.insert_nonpolling_coroutine("dummy coroutine", Box::pin(dummy_coroutine(10).fuse())));
     }
 
     #[bench]
-    fn benchmark_insert_background_coroutine(b: &mut Bencher) {
+    fn insert_background_coroutine_bench(b: &mut Bencher) {
         let mut runtime: SharedDemiRuntime = SharedDemiRuntime::default();
 
         b.iter(|| {
@@ -605,7 +605,7 @@ mod tests {
     }
 
     #[bench]
-    fn benchmark_run_any_fine(b: &mut Bencher) {
+    fn wait_any_nonpolling_coroutine_bench(b: &mut Bencher) {
         const NUM_TASKS: usize = 1024;
         let mut qts: [QToken; NUM_TASKS] = [QToken::from(0); NUM_TASKS];
         let mut runtime: SharedDemiRuntime = SharedDemiRuntime::default();
@@ -621,7 +621,7 @@ mod tests {
     }
 
     #[bench]
-    fn benchmark_run_any_background_long(b: &mut Bencher) {
+    fn wait_any_io_polling_coroutine_bench(b: &mut Bencher) {
         const NUM_TASKS: usize = 1024;
         let mut qts: [QToken; NUM_TASKS] = [QToken::from(0); NUM_TASKS];
         let mut runtime: SharedDemiRuntime = SharedDemiRuntime::default();

src/rust/runtime/queue/mod.rs

@@ -267,7 +267,7 @@ mod tests {
     }
 
     #[bench]
-    fn bench_alloc_free(b: &mut Bencher) {
+    fn alloc_free_bench(b: &mut Bencher) {
         let mut ioqueue_table: IoQueueTable = IoQueueTable::default();
 
         b.iter(|| {

src/rust/runtime/scheduler/page/page.rs

@@ -128,7 +128,7 @@ mod tests {
     }
 
     #[bench]
-    fn bench_notify(b: &mut Bencher) {
+    fn notify_bench(b: &mut Bencher) {
         let pg: WakerPage = WakerPage::default();
         let x: usize = rand::thread_rng().gen_range(0..WAKER_BIT_LENGTH);
 
@@ -139,7 +139,7 @@ mod tests {
     }
 
     #[bench]
-    fn bench_take_notified(b: &mut Bencher) {
+    fn take_notified_bench(b: &mut Bencher) {
         let pg: WakerPage = WakerPage::default();
 
         // Initialize 8 random bits.

src/rust/runtime/scheduler/page/waker_ref.rs

@@ -247,7 +247,7 @@ mod tests {
     }
 
     #[bench]
-    fn bench_wake(b: &mut Bencher) {
+    fn wake_bench(b: &mut Bencher) {
         let p: WakerPageRef = WakerPageRef::default();
         let ix: usize = rand::thread_rng().gen_range(0..WAKER_BIT_LENGTH);
 
@@ -259,7 +259,7 @@ mod tests {
     }
 
     #[bench]
-    fn bench_wake_by_ref(b: &mut Bencher) {
+    fn wake_by_ref_bench(b: &mut Bencher) {
         let p: WakerPageRef = WakerPageRef::default();
         let ix: usize = rand::thread_rng().gen_range(0..WAKER_BIT_LENGTH);
 

src/rust/runtime/scheduler/scheduler.rs

@@ -367,7 +367,7 @@ mod tests {
     }
 
     #[bench]
-    fn benchmark_insert(b: &mut Bencher) {
+    fn insert_bench(b: &mut Bencher) {
         let mut scheduler: Scheduler = Scheduler::default();
         let group_id: TaskId = scheduler.create_group();
 
@@ -382,7 +382,7 @@ mod tests {
     }
 
     #[bench]
-    fn benchmark_poll_one_task(b: &mut Bencher) {
+    fn poll_one_task_bench(b: &mut Bencher) {
         let mut scheduler: Scheduler = Scheduler::default();
         let group_id: TaskId = scheduler.create_group();
 
@@ -403,7 +403,7 @@ mod tests {
     }
 
     #[bench]
-    fn benchmark_poll_many_tasks_until_done(b: &mut Bencher) {
+    fn poll_many_tasks_until_done_bench(b: &mut Bencher) {
         let mut scheduler: Scheduler = Scheduler::default();
         let group_id: TaskId = scheduler.create_group();
 

src/rust/runtime/scheduler/waker64.rs

@@ -100,7 +100,7 @@ mod tests {
     use ::test::{black_box, Bencher};
 
     #[bench]
-    fn bench_fetch_and(b: &mut Bencher) {
+    fn fetch_and_bench(b: &mut Bencher) {
         let x: u64 = rand::thread_rng().gen_range(0..64);
         let w64: Waker64 = Waker64::new(0);
 
@@ -111,7 +111,7 @@ mod tests {
     }
 
     #[bench]
-    fn bench_fetch_or(b: &mut Bencher) {
+    fn fetch_or_bench(b: &mut Bencher) {
         let x: u64 = rand::thread_rng().gen_range(0..64);
         let w64: Waker64 = Waker64::new(0);
 
@@ -122,7 +122,7 @@ mod tests {
     }
 
     #[bench]
-    fn bench_fetch_add(b: &mut Bencher) {
+    fn fetch_add_bench(b: &mut Bencher) {
         let x: u64 = rand::thread_rng().gen_range(0..64);
         let w64: Waker64 = Waker64::new(0);
 
@@ -133,7 +133,7 @@ mod tests {
     }
 
     #[bench]
-    fn bench_fetch_sub(b: &mut Bencher) {
+    fn fetch_sub_bench(b: &mut Bencher) {
         let x: u64 = rand::thread_rng().gen_range(0..64);
 
         b.iter(|| {
@@ -144,7 +144,7 @@ mod tests {
     }
 
     #[bench]
-    fn bench_load(b: &mut Bencher) {
+    fn load_bench(b: &mut Bencher) {
         let x: u64 = rand::thread_rng().gen_range(0..64);
         let w64: Waker64 = Waker64::new(x);
 
@@ -155,7 +155,7 @@ mod tests {
     }
 
     #[bench]
-    fn bench_swap(b: &mut Bencher) {
+    fn swap_bench(b: &mut Bencher) {
         let x: u64 = rand::thread_rng().gen_range(0..64);
         let w64: Waker64 = Waker64::new(0);
 

windows.mk

@@ -207,6 +207,13 @@ clean-examples-rust:
 	set BINDIR=$(BINDIR)
 	$(MAKE) /C /F examples/rust/windows.mk clean
 
+#=======================================================================================================================
+# Benchmarks
+#=======================================================================================================================
+
+bench:
+	$(CARGO) bench $(CARGO_FEATURES) $(CARGO_FLAGS) -- --nocapture
+
 #=======================================================================================================================
 # Code formatting
 #=======================================================================================================================