Rename BenchmarkFilter to RuntimeBenchmarkFilter

Author: Kobzol

collector/src/bin/collector.rs

@@ -45,8 +45,8 @@ use collector::compile::execute::bencher::BenchProcessor;
 use collector::compile::execute::profiler::{ProfileProcessor, Profiler};
 use collector::runtime::{
     bench_runtime, get_runtime_benchmark_groups, prepare_runtime_benchmark_suite,
-    runtime_benchmark_dir, BenchmarkFilter, BenchmarkSuite, BenchmarkSuiteCompilation,
-    CargoIsolationMode, RuntimeProfiler, DEFAULT_RUNTIME_ITERATIONS,
+    runtime_benchmark_dir, BenchmarkSuite, BenchmarkSuiteCompilation, CargoIsolationMode,
+    RuntimeBenchmarkFilter, RuntimeProfiler, DEFAULT_RUNTIME_ITERATIONS,
 };
 use collector::runtime::{profile_runtime, RuntimeCompilationOpts};
 use collector::toolchain::{
@@ -105,12 +105,12 @@ struct CompileBenchmarkConfig {
 
 struct RuntimeBenchmarkConfig {
     runtime_suite: BenchmarkSuite,
-    filter: BenchmarkFilter,
+    filter: RuntimeBenchmarkFilter,
     iterations: u32,
 }
 
 impl RuntimeBenchmarkConfig {
-    fn new(suite: BenchmarkSuite, filter: BenchmarkFilter, iterations: u32) -> Self {
+    fn new(suite: BenchmarkSuite, filter: RuntimeBenchmarkFilter, iterations: u32) -> Self {
         Self {
             runtime_suite: suite.filter(&filter),
             filter,
@@ -761,7 +761,7 @@ fn main_result() -> anyhow::Result<i32> {
             };
             let config = RuntimeBenchmarkConfig::new(
                 runtime_suite,
-                BenchmarkFilter::new(local.exclude, local.include),
+                RuntimeBenchmarkFilter::new(local.exclude, local.include),
                 iterations,
             );
             run_benchmarks(&mut rt, conn, shared, None, Some(config))?;
@@ -1042,7 +1042,7 @@ fn main_result() -> anyhow::Result<i32> {
 
                         let runtime_config = RuntimeBenchmarkConfig {
                             runtime_suite,
-                            filter: BenchmarkFilter::keep_all(),
+                            filter: RuntimeBenchmarkFilter::keep_all(),
                             iterations: DEFAULT_RUNTIME_ITERATIONS,
                         };
                         let shared = SharedBenchmarkConfig {
@@ -1745,7 +1745,7 @@ fn bench_published_artifact(
         }),
         Some(RuntimeBenchmarkConfig::new(
             runtime_suite,
-            BenchmarkFilter::keep_all(),
+            RuntimeBenchmarkFilter::keep_all(),
             DEFAULT_RUNTIME_ITERATIONS,
         )),
     )

collector/src/runtime/benchmark.rs

@@ -42,7 +42,7 @@ pub struct BenchmarkSuite {
 impl BenchmarkSuite {
     /// Returns a new suite containing only groups that contains at least a single benchmark
     /// that matches the filter.
-    pub fn filter(self, filter: &BenchmarkFilter) -> Self {
+    pub fn filter(self, filter: &RuntimeBenchmarkFilter) -> Self {
         let BenchmarkSuite {
             toolchain,
             groups,
@@ -64,7 +64,7 @@ impl BenchmarkSuite {
         }
     }
 
-    pub fn filtered_benchmark_count(&self, filter: &BenchmarkFilter) -> u64 {
+    pub fn filtered_benchmark_count(&self, filter: &RuntimeBenchmarkFilter) -> u64 {
         self.benchmark_names()
             .filter(|benchmark| passes_filter(benchmark, &filter.exclude, &filter.include))
             .count() as u64
@@ -86,12 +86,12 @@ impl BenchmarkSuite {
     }
 }
 
-pub struct BenchmarkFilter {
+pub struct RuntimeBenchmarkFilter {
     pub exclude: Vec<String>,
     pub include: Vec<String>,
 }
 
-impl BenchmarkFilter {
+impl RuntimeBenchmarkFilter {
     pub fn keep_all() -> Self {
         Self {
             exclude: vec![],

collector/src/runtime/mod.rs

@@ -9,8 +9,8 @@ use thousands::Separable;
 use benchlib::comm::messages::{BenchmarkMessage, BenchmarkResult, BenchmarkStats};
 pub use benchmark::{
     get_runtime_benchmark_groups, prepare_runtime_benchmark_suite, runtime_benchmark_dir,
-    BenchmarkFilter, BenchmarkGroup, BenchmarkGroupCrate, BenchmarkSuite,
-    BenchmarkSuiteCompilation, CargoIsolationMode,
+    BenchmarkGroup, BenchmarkGroupCrate, BenchmarkSuite, BenchmarkSuiteCompilation,
+    CargoIsolationMode, RuntimeBenchmarkFilter,
 };
 use database::{ArtifactIdNumber, CollectionId, Connection};
 
@@ -33,7 +33,7 @@ pub async fn bench_runtime(
     conn: &mut dyn Connection,
     suite: BenchmarkSuite,
     collector: &CollectorCtx,
-    filter: BenchmarkFilter,
+    filter: RuntimeBenchmarkFilter,
     iterations: u32,
 ) -> anyhow::Result<()> {
     let filtered = suite.filtered_benchmark_count(&filter);
@@ -203,7 +203,7 @@ async fn record_stats(
 /// a set of runtime benchmarks and print `BenchmarkMessage`s encoded as JSON, one per line.
 fn execute_runtime_benchmark_binary(
     binary: &Path,
-    filter: &BenchmarkFilter,
+    filter: &RuntimeBenchmarkFilter,
     iterations: u32,
 ) -> anyhow::Result<impl Iterator<Item = anyhow::Result<BenchmarkMessage>>> {
     let mut command = prepare_command(binary);