Skip to content

Add target to runtime benchmarks #2285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 21, 2025
Merged

Add target to runtime benchmarks #2285

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
23db0cf
Add target to runtime benchmarks
Kobzol Oct 14, 2025
79a6fa3
Show target in runtime benchmark comparison page
Kobzol Oct 14, 2025
6719f3f
Add target to runtime compare page filters
Kobzol Oct 14, 2025
019bf0e
Capitalize modified queries
Kobzol Oct 19, 2025
7e2abce
Add target column to `sqlite-to-postgres`
Kobzol Oct 19, 2025
a2367af
Add target column to `postgres-to-sqlite`
Kobzol Oct 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions collector/src/bin/collector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,21 @@ struct RuntimeBenchmarkConfig {
runtime_suite: BenchmarkSuite,
filter: RuntimeBenchmarkFilter,
iterations: u32,
target: Target,
}

impl RuntimeBenchmarkConfig {
fn new(suite: BenchmarkSuite, filter: RuntimeBenchmarkFilter, iterations: u32) -> Self {
fn new(
suite: BenchmarkSuite,
filter: RuntimeBenchmarkFilter,
iterations: u32,
target: Target,
) -> Self {
Self {
runtime_suite: suite.filter(&filter),
filter,
iterations,
target,
}
}
}
Expand Down Expand Up @@ -860,8 +867,9 @@ fn main_result() -> anyhow::Result<i32> {
purge,
} => {
log_db(&db);
let toolchain =
get_local_toolchain_for_runtime_benchmarks(&local, &require_host_target_tuple())?;

let host_tuple = require_host_target_tuple();
let toolchain = get_local_toolchain_for_runtime_benchmarks(&local, &host_tuple)?;
let pool = Pool::open(&db.db);

let isolation_mode = if no_isolate {
Expand Down Expand Up @@ -899,6 +907,7 @@ fn main_result() -> anyhow::Result<i32> {
runtime_suite,
RuntimeBenchmarkFilter::new(local.exclude, local.include),
iterations,
Target::from_str(&host_tuple).expect("Found unexpected host target"),
);
rt.block_on(run_benchmarks(conn.as_mut(), shared, None, Some(config)))?;
Ok(0)
Expand Down Expand Up @@ -1189,6 +1198,7 @@ fn main_result() -> anyhow::Result<i32> {
runtime_suite,
filter: RuntimeBenchmarkFilter::keep_all(),
iterations: DEFAULT_RUNTIME_ITERATIONS,
target: Target::default(),
};
let shared = SharedBenchmarkConfig {
artifact_id,
Expand Down Expand Up @@ -1806,6 +1816,7 @@ async fn create_benchmark_configs(
runtime_suite,
filter: RuntimeBenchmarkFilter::keep_all(),
iterations: DEFAULT_RUNTIME_ITERATIONS,
target: job.target().into(),
})
} else {
None
Expand Down Expand Up @@ -2232,6 +2243,7 @@ async fn run_benchmarks(
&collector,
runtime.filter,
runtime.iterations,
runtime.target,
)
.await
.context("Runtime benchmarks failed")
Expand Down Expand Up @@ -2306,6 +2318,7 @@ async fn bench_published_artifact(
runtime_suite,
RuntimeBenchmarkFilter::keep_all(),
DEFAULT_RUNTIME_ITERATIONS,
Target::default(),
)),
)
.await
Expand Down
11 changes: 11 additions & 0 deletions collector/src/runtime/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use crate::{command_output, CollectorCtx};
mod benchmark;
mod profile;

use crate::compile::benchmark::target::Target;
pub use benchmark::RuntimeCompilationOpts;
pub use profile::{profile_runtime, RuntimeProfiler};

Expand All @@ -35,6 +36,7 @@ pub async fn bench_runtime(
collector: &CollectorCtx,
filter: RuntimeBenchmarkFilter,
iterations: u32,
target: Target,
) -> anyhow::Result<()> {
let filtered = suite.filtered_benchmark_count(&filter);
println!("Executing {filtered} benchmarks\n");
Expand Down Expand Up @@ -74,6 +76,7 @@ pub async fn bench_runtime(
tx.conn(),
collector.artifact_row_id,
&rustc_perf_version,
target,
result,
)
.await;
Expand Down Expand Up @@ -126,13 +129,15 @@ async fn record_stats(
conn: &dyn Connection,
artifact_id: ArtifactIdNumber,
rustc_perf_version: &str,
target: Target,
result: BenchmarkResult,
) {
async fn record<'a>(
conn: &'a dyn Connection,
artifact_id: ArtifactIdNumber,
collection_id: CollectionId,
result: &'a BenchmarkResult,
target: Target,
value: Option<u64>,
metric: &'a str,
) {
Expand All @@ -142,6 +147,7 @@ async fn record_stats(
artifact_id,
&result.name,
metric,
target.into(),
value as f64,
)
.await;
Expand All @@ -156,6 +162,7 @@ async fn record_stats(
artifact_id,
collection_id,
&result,
target,
stat.instructions,
"instructions:u",
)
Expand All @@ -165,6 +172,7 @@ async fn record_stats(
artifact_id,
collection_id,
&result,
target,
stat.cycles,
"cycles:u",
)
Expand All @@ -174,6 +182,7 @@ async fn record_stats(
artifact_id,
collection_id,
&result,
target,
stat.branch_misses,
"branch-misses",
)
Expand All @@ -183,6 +192,7 @@ async fn record_stats(
artifact_id,
collection_id,
&result,
target,
stat.cache_misses,
"cache-misses",
)
Expand All @@ -192,6 +202,7 @@ async fn record_stats(
artifact_id,
collection_id,
&result,
target,
Some(stat.wall_time.as_nanos() as u64),
"wall-time",
)
Expand Down
11 changes: 9 additions & 2 deletions database/src/bin/import-sqlite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ async fn main() {
}
}

for (&(benchmark, metric), id) in sqlite_idx.runtime_statistic_descriptions() {
for (&(benchmark, target, metric), id) in sqlite_idx.runtime_statistic_descriptions() {
let stat = sqlite_conn
.get_runtime_pstats(&[id], &[Some(sqlite_aid)])
.await
Expand All @@ -92,7 +92,14 @@ async fn main() {
.unwrap();
if let Some(stat) = stat {
postgres_conn
.record_runtime_statistic(cid, postgres_aid, &benchmark, metric.as_str(), stat)
.record_runtime_statistic(
cid,
postgres_aid,
&benchmark,
metric.as_str(),
target,
stat,
)
.await;
}
}
Expand Down
6 changes: 3 additions & 3 deletions database/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ pub struct Index {
/// For legacy reasons called `pstat_series` in the database, and so the name is kept here.
pstat_series: Indexed<(Benchmark, Profile, Scenario, CodegenBackend, Target, Metric)>,
/// Id lookup of runtime stat description ids
runtime_pstat_series: Indexed<(Benchmark, Metric)>,
runtime_pstat_series: Indexed<(Benchmark, Target, Metric)>,
}

/// An index lookup
Expand Down Expand Up @@ -725,7 +725,7 @@ impl Index {
self.runtime_pstat_series
.map
.keys()
.map(|(_, metric)| metric)
.map(|(_, _, metric)| metric)
.collect::<std::collections::HashSet<_>>()
.into_iter()
.map(|s| s.to_string())
Expand All @@ -752,7 +752,7 @@ impl Index {

pub fn runtime_statistic_descriptions(
&self,
) -> impl Iterator<Item = (&(Benchmark, Metric), StatisticalDescriptionId)> + '_ {
) -> impl Iterator<Item = (&(Benchmark, Target, Metric), StatisticalDescriptionId)> + '_ {
self.runtime_pstat_series
.map
.iter()
Expand Down
1 change: 1 addition & 0 deletions database/src/pool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ pub trait Connection: Send + Sync {
artifact: ArtifactIdNumber,
benchmark: &str,
metric: &str,
target: Target,
value: f64,
);
/// Records a self-profile artifact in S3.
Expand Down
25 changes: 17 additions & 8 deletions database/src/pool/postgres.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,12 @@ static MIGRATIONS: &[&str] = &[
benchmark_set
);
"#,
// Add target to runtime_pstat_series
r#"
ALTER TABLE runtime_pstat_series ADD target TEXT NOT NULL DEFAULT 'x86_64-unknown-linux-gnu';
ALTER TABLE runtime_pstat_series DROP CONSTRAINT runtime_pstat_series_benchmark_metric_key;
ALTER TABLE runtime_pstat_series ADD CONSTRAINT runtime_test_case UNIQUE(benchmark, target, metric);
"#,
];

#[async_trait::async_trait]
Expand Down Expand Up @@ -660,8 +666,8 @@ impl PostgresConnection {
select name, category
from benchmark
").await.unwrap(),
insert_runtime_pstat_series: conn.prepare("insert into runtime_pstat_series (benchmark, metric) VALUES ($1, $2) ON CONFLICT DO NOTHING RETURNING id").await.unwrap(),
select_runtime_pstat_series: conn.prepare("select id from runtime_pstat_series where benchmark = $1 and metric = $2").await.unwrap(),
insert_runtime_pstat_series: conn.prepare("insert into runtime_pstat_series (benchmark, target, metric) VALUES ($1, $2, $3) ON CONFLICT DO NOTHING RETURNING id").await.unwrap(),
select_runtime_pstat_series: conn.prepare("select id from runtime_pstat_series where benchmark = $1 and target = $2 and metric = $3").await.unwrap(),
insert_runtime_pstat: conn
.prepare("insert into runtime_pstat (series, aid, cid, value) VALUES ($1, $2, $3, $4)")
.await
Expand Down Expand Up @@ -883,7 +889,7 @@ where
runtime_pstat_series: self
.conn()
.query(
"select id, benchmark, metric from runtime_pstat_series;",
"select id, benchmark, target, metric from runtime_pstat_series;",
&[],
)
.await
Expand All @@ -893,8 +899,9 @@ where
(
row.get::<_, i32>(0) as u32,
(
row.get::<_, String>(1).as_str().into(),
row.get::<_, String>(2).as_str().into(),
row.get::<_, &str>(1).into(),
Target::from_str(row.get::<_, &str>(2)).unwrap(),
row.get::<_, &str>(3).into(),
),
)
})
Expand Down Expand Up @@ -1123,13 +1130,15 @@ where
artifact: ArtifactIdNumber,
benchmark: &str,
metric: &str,
target: Target,
value: f64,
) {
let target = target.to_string();
let sid = self
.conn()
.query_opt(
&self.statements().select_runtime_pstat_series,
&[&benchmark, &metric],
&[&benchmark, &target, &metric],
)
.await
.unwrap();
Expand All @@ -1139,14 +1148,14 @@ where
self.conn()
.query_opt(
&self.statements().insert_runtime_pstat_series,
&[&benchmark, &metric],
&[&benchmark, &target, &metric],
)
.await
.unwrap();
self.conn()
.query_one(
&self.statements().select_runtime_pstat_series,
&[&benchmark, &metric],
&[&benchmark, &target, &metric],
)
.await
.unwrap()
Expand Down
30 changes: 24 additions & 6 deletions database/src/pool/sqlite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,21 @@ static MIGRATIONS: &[Migration] = &[
CREATE INDEX error_artifact_idx ON error(aid);
"#,
),
// Add runtime target as a unique constraint, defaulting to 'x86_64-unknown-linux-gnu'
Migration::without_foreign_key_constraints(
r#"
create table runtime_pstat_series_with_target(
id integer primary key not null,
benchmark text not null,
target text not null default 'x86_64-unknown-linux-gnu',
metric text not null,
UNIQUE(benchmark, target, metric)
);
insert into runtime_pstat_series_with_target select id, benchmark, 'x86_64-unknown-linux-gnu', metric from runtime_pstat_series;
drop table runtime_pstat_series;
alter table runtime_pstat_series_with_target rename to runtime_pstat_series;
"#,
),
];

#[async_trait::async_trait]
Expand Down Expand Up @@ -579,14 +594,15 @@ impl Connection for SqliteConnection {
.collect();
let runtime_pstat_series = self
.raw()
.prepare("select id, benchmark, metric from runtime_pstat_series;")
.prepare("select id, benchmark, target, metric from runtime_pstat_series;")
.unwrap()
.query_map(params![], |row| {
Ok((
row.get::<_, i32>(0)? as u32,
(
row.get::<_, String>(1)?.as_str().into(),
row.get::<_, String>(2)?.as_str().into(),
Target::from_str(row.get::<_, String>(2)?.as_str()).unwrap(),
row.get::<_, String>(3)?.as_str().into(),
),
))
})
Expand Down Expand Up @@ -750,19 +766,21 @@ impl Connection for SqliteConnection {
artifact: ArtifactIdNumber,
benchmark: &str,
metric: &str,
target: Target,
value: f64,
) {
let target = target.to_string();
self.raw_ref()
.execute(
"insert or ignore into runtime_pstat_series (benchmark, metric) VALUES (?, ?)",
params![&benchmark, &metric,],
"insert or ignore into runtime_pstat_series (benchmark, target, metric) VALUES (?, ?, ?)",
params![&benchmark, &target, &metric],
)
.unwrap();
let sid: i32 = self
.raw_ref()
.query_row(
"select id from runtime_pstat_series where benchmark = ? and metric = ?",
params![&benchmark, &metric,],
"select id from runtime_pstat_series where benchmark = ? and target = ? and metric = ?",
params![&benchmark, &target, &metric],
|r| r.get(0),
)
.unwrap();
Expand Down
Loading
Loading