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

Merge pull request #467 from sched-ext/htejun/lavd-misc

Browse Source 
scx_lavd: Make FlatTopology::new() a bit prettier
This commit is contained in:
Changwoo Min 2024-08-05 10:43:48 +09:00 committed by GitHub
commit 38efa974a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,8 +28,8 @@ use libbpf_rs::skel::OpenSkel;
use libbpf_rs::skel::Skel;
use libbpf_rs::skel::SkelBuilder;
use log::debug;
use log::warn;
use log::info;
use log::warn;
use scx_utils::build_id;
use scx_utils::scx_ops_attach;
use scx_utils::scx_ops_load;
@ -148,30 +148,24 @@ impl FlatTopology {
// Build a vector of cpu flat ids.
let mut base_freq = 0;
for (node_id, node) in topo.nodes().iter().enumerate() {
let mut llc_pos = 0;
for (_llc_id, llc) in node.llcs().iter() {
let mut core_pos = 0;
for (_core_id, core) in llc.cores().iter() {
let mut cpu_pos = 0;
for (_cpu_id, cpu) in core.cpus().iter() {
for (llc_pos, (_llc_id, llc)) in node.llcs().iter().enumerate() {
for (core_pos, (_core_id, core)) in llc.cores().iter().enumerate() {
for (cpu_pos, (cpu_id, cpu)) in core.cpus().iter().enumerate() {
let cpu_fid = CpuFlatId {
node_id,
llc_pos,
max_freq: cpu.max_freq(),
core_pos,
cpu_pos,
cpu_id: cpu.id(),
cpu_id: *cpu_id,
cpu_cap: 0,
};
cpu_fids.push(cpu_fid);
cpu_pos += 1;
if base_freq < cpu.max_freq() {
base_freq = cpu.max_freq();
}
}
core_pos += 1;
}
llc_pos += 1;
}
}
@ -193,36 +187,22 @@ impl FlatTopology {
if prefer_smt_core {
// Sort the cpu_fids by node, llc, max_freq, core, and cpu order
cpu_fids.sort_by(|a, b| {
if a.node_id == b.node_id {
if a.llc_pos == b.llc_pos {
if a.max_freq == b.max_freq {
if a.core_pos == b.core_pos {
return a.cpu_pos.cmp(&b.cpu_pos);
}
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.node_id.cmp(&b.node_id);
a.node_id
.cmp(&b.node_id)
.then_with(|| a.llc_pos.cmp(&b.llc_pos))
.then_with(|| a.max_freq.cmp(&b.max_freq))
.then_with(|| a.core_pos.cmp(&b.core_pos))
.then_with(|| a.cpu_pos.cmp(&b.cpu_pos))
});
} 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);
a.cpu_pos
.cmp(&b.cpu_pos)
.then_with(|| a.node_id.cmp(&b.node_id))
.then_with(|| a.llc_pos.cmp(&b.llc_pos))
.then_with(|| a.max_freq.cmp(&b.max_freq))
.then_with(|| a.core_pos.cmp(&b.core_pos))
});
}