From bfbc012ab1a3a5389a77bee691a0cf77b999b2fc Mon Sep 17 00:00:00 2001
From: insipx <aplaza@liquidthink.net>
Date: Mon, 16 Jan 2023 15:01:18 -0500
Subject: [PATCH 1/2] add BenchmarkError::Weightless

---
 benchmarking/src/lib.rs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/benchmarking/src/lib.rs b/benchmarking/src/lib.rs
index 4a4d8ec98..0d6e88b0f 100644
--- a/benchmarking/src/lib.rs
+++ b/benchmarking/src/lib.rs
@@ -1180,6 +1180,14 @@ macro_rules! impl_benchmark_test_suite {
 											$crate::str::from_utf8(benchmark_name)
 												.expect("benchmark name is always a valid string!"),
 										);
+									},
+									$crate::BenchmarkError::Weightless => {
+										// This is considered a success condition.
+										$crate::log::error!(
+											"WARNING: benchmark error weightless skipped - {}",
+											$crate::str::from_utf8(benchmark_name)
+												.expect("benchmark name is always a valid string!"),
+										);
 									}
 								}
 							},
@@ -1314,6 +1322,14 @@ macro_rules! add_benchmark {
 							.expect("benchmark name is always a valid string!")
 					);
 					None
+				},
+				Err($crate::BenchmarkError::Weightless) => {
+					$crate::log::error!(
+						"WARNING: benchmark weightless skipped - {}",
+						$crate::str::from_utf8(benchmark)
+							.expect("benchmark name is always a valid string!")
+					);
+					None
 				}
 			};
 

From eeaf2edfec312a7ec8a1d6802cd20fcdc003a623 Mon Sep 17 00:00:00 2001
From: Andrew Plaza <aplaza@liquidthink.net>
Date: Mon, 16 Jan 2023 16:02:34 -0500
Subject: [PATCH 2/2] Update benchmarking/src/lib.rs

Co-authored-by: zjb0807 <zjb0807@qq.com>
---
 benchmarking/src/lib.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/benchmarking/src/lib.rs b/benchmarking/src/lib.rs
index 0d6e88b0f..f165cb682 100644
--- a/benchmarking/src/lib.rs
+++ b/benchmarking/src/lib.rs
@@ -1329,7 +1329,10 @@ macro_rules! add_benchmark {
 						$crate::str::from_utf8(benchmark)
 							.expect("benchmark name is always a valid string!")
 					);
-					None
+					Some(vec![$crate::BenchmarkResult {
+						components: selected_components.clone(),
+						.. Default::default()
+					}])
 				}
 			};