JakeHillion/scx
1
0
Fork 0
mirror of https://github.com/JakeHillion/scx.git synced 2024-11-29 20:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

scx_lavd: add --prefer-smt-core option

Browse Source 
With the --prefer-smt-core option is on, the core compaction prefers to
 utilizae hyper-twin first before utilizing the other physical CPUs. By
 default, the option is off.

Signed-off-by: Changwoo Min <changwoo@igalia.com>
This commit is contained in:
Changwoo Min 2024-07-26 11:39:23 +09:00
parent 19e337cd9b
commit e7b6ed1838
1 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
scheds/rust/scx_lavd/src/main.rs
View File

@ -55,6 +55,10 @@ struct Opts {
#[clap(long = "no-core-compaction", action = clap::ArgAction::SetTrue)] #[clap(long = "no-core-compaction", action = clap::ArgAction::SetTrue)]
no_core_compaction: bool, no_core_compaction: bool,
/// Use SMT logical cores before using other physcial cores in core compaction
#[clap(long = "prefer-smt-core", action = clap::ArgAction::SetTrue)]
prefer_smt_core: bool,
/// Disable frequency scaling by scx_lavd /// Disable frequency scaling by scx_lavd
#[clap(long = "no-freq-scaling", action = clap::ArgAction::SetTrue)] #[clap(long = "no-freq-scaling", action = clap::ArgAction::SetTrue)]
no_freq_scaling: bool, no_freq_scaling: bool,
@ -121,6 +125,7 @@ struct CpuFlatId {
struct FlatTopology { struct FlatTopology {
cpu_fids: Vec<CpuFlatId>, cpu_fids: Vec<CpuFlatId>,
nr_cpus_online: usize, nr_cpus_online: usize,
prefer_smt_core: bool,
} }
impl fmt::Display for FlatTopology { impl fmt::Display for FlatTopology {
@ -134,7 +139,7 @@ impl fmt::Display for FlatTopology {
impl FlatTopology { impl FlatTopology {
/// Build a flat-structured topology /// Build a flat-structured topology
pub fn new() -> Result<FlatTopology> { pub fn new(prefer_smt_core: bool) -> Result<FlatTopology> {
let topo = Topology::new().expect("Failed to build host topology"); let topo = Topology::new().expect("Failed to build host topology");
let mut cpu_fids = Vec::new(); let mut cpu_fids = Vec::new();
@ -163,26 +168,47 @@ impl FlatTopology {
} }
} }
// Sort the cpu_fids by node, llc, max_freq, core, and cpu order if prefer_smt_core {
cpu_fids.sort_by(|a, b| { // Sort the cpu_fids by node, llc, max_freq, core, and cpu order
if a.node_id == b.node_id { cpu_fids.sort_by(|a, b| {
if a.llc_pos == b.llc_pos { if a.node_id == b.node_id {
if a.max_freq == b.max_freq { if a.llc_pos == b.llc_pos {
if a.core_pos == b.core_pos { if a.max_freq == b.max_freq {
return a.cpu_pos.cmp(&b.cpu_pos); if a.core_pos == b.core_pos {
return a.cpu_pos.cmp(&b.cpu_pos);
}
return a.core_pos.cmp(&b.core_pos);
} }
return a.core_pos.cmp(&b.core_pos); return b.max_freq.cmp(&a.max_freq);
} }
return b.max_freq.cmp(&a.max_freq); return a.llc_pos.cmp(&b.llc_pos);
} }
return a.llc_pos.cmp(&b.llc_pos); return a.node_id.cmp(&b.node_id);
} });
return a.node_id.cmp(&b.node_id); }
}); else {
// Sort the cpu_fids by cpu, node, llc, max_freq, and core order
cpu_fids.sort_by(|a, b| {
if a.cpu_pos == b.cpu_pos {
if a.node_id == b.node_id {
if a.llc_pos == b.llc_pos {
if a.max_freq == b.max_freq {
return a.core_pos.cmp(&b.core_pos);
}
return b.max_freq.cmp(&a.max_freq);
}
return a.llc_pos.cmp(&b.llc_pos);
}
return a.cpu_pos.cmp(&b.cpu_pos);
}
return a.cpu_pos.cmp(&b.cpu_pos);
});
}
Ok(FlatTopology { Ok(FlatTopology {
cpu_fids, cpu_fids,
nr_cpus_online: topo.nr_cpus_online(), nr_cpus_online: topo.nr_cpus_online(),
prefer_smt_core,
}) })
} }
@ -216,7 +242,8 @@ impl<'a> Scheduler<'a> {
let mut skel = scx_ops_open!(skel_builder, lavd_ops)?; let mut skel = scx_ops_open!(skel_builder, lavd_ops)?;
// Initialize CPU order topologically sorted by a cpu, node, llc, max_freq, and core order // Initialize CPU order topologically sorted by a cpu, node, llc, max_freq, and core order
let topo = FlatTopology::new().expect("Failed to build host topology"); let topo = FlatTopology::new(opts.prefer_smt_core).expect(
"Failed to build host topology");
for (pos, cpu) in topo.cpu_fids().iter().enumerate() { for (pos, cpu) in topo.cpu_fids().iter().enumerate() {
skel.rodata_mut().cpu_order[pos] = cpu.cpu_id as u16; skel.rodata_mut().cpu_order[pos] = cpu.cpu_id as u16;
} }