IntenseWebs/LACT
3
0
Fork 0
mirror of https://github.com/ilya-zlobintsev/LACT.git synced 2026-08-17 16:34:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: clippy fixes

Browse Source
This commit is contained in:
Ilya Zlobintsev
2026-08-02 12:02:50 +03:00
parent 4675ddaa97
commit bc6acedbec
2 changed files with 97 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lact-daemon/src/server/gpu_controller/amd.rs
+96 -95
View File
@@ -52,7 +52,6 @@ const AMDGPU_FAMILY_GC_11_0_0: u32 = 145;
const FAN_CONTROL_RETRIES: u32 = 10;
const MAX_PSTATE_READ_ATTEMPTS: u32 = 5;
const REQUIRE_MANUAL_DEVICE_IDS: [&str; 3] = ["163F", "1435", "15BF"];
const UHBR_RATE_THRESHOLD: u32 = 1000;
const AMDGPU_IDS_FLAGS_FUSION: u64 = 0x1;
const HSA_CACHE_TYPE_DATA: u32 = 0x0000_0001;
const HSA_CACHE_TYPE_INSTRUCTION: u32 = 0x0000_0002;
@@ -751,100 +750,6 @@ impl AmdGpuController {
}
}
#[cfg(test)]
mod tests {
use super::*;
use amdgpu_sysfs::gpu_handle::PowerLevel;
#[test]
fn normalize_power_level_indexes_keeps_zero_based_indexes_after_sleep_state() {
let levels = normalize_indexes(
vec![
PowerLevelId::Sleep,
PowerLevelId::Index(0),
PowerLevelId::Index(1),
PowerLevelId::Index(2),
],
Some(PowerLevelId::Index(1)),
);
assert_eq!(
level_ids(&levels),
[
PowerLevelId::Sleep,
PowerLevelId::Index(0),
PowerLevelId::Index(1),
PowerLevelId::Index(2)
]
);
assert_eq!(levels.active, Some(PowerLevelId::Index(1)));
}
#[test]
fn normalize_power_level_indexes_keeps_zero_based_indexes_without_sleep_state() {
let levels = normalize_indexes(
vec![
PowerLevelId::Index(0),
PowerLevelId::Index(1),
PowerLevelId::Index(2),
],
Some(PowerLevelId::Index(2)),
);
assert_eq!(
level_ids(&levels),
[
PowerLevelId::Index(0),
PowerLevelId::Index(1),
PowerLevelId::Index(2)
]
);
assert_eq!(levels.active, Some(PowerLevelId::Index(2)));
}
#[test]
fn normalize_power_level_indexes_shifts_one_based_indexes_after_sleep_state() {
let levels = normalize_indexes(
vec![
PowerLevelId::Sleep,
PowerLevelId::Index(1),
PowerLevelId::Index(2),
PowerLevelId::Index(3),
],
Some(PowerLevelId::Index(2)),
);
assert_eq!(
level_ids(&levels),
[
PowerLevelId::Sleep,
PowerLevelId::Index(0),
PowerLevelId::Index(1),
PowerLevelId::Index(2)
]
);
assert_eq!(levels.active, Some(PowerLevelId::Index(1)));
}
fn normalize_indexes(ids: Vec<PowerLevelId>, active: Option<PowerLevelId>) -> PowerLevels<u64> {
AmdGpuController::normalize_power_level_indexes(PowerLevels {
levels: ids
.into_iter()
.enumerate()
.map(|(value, id)| PowerLevel {
id,
value: value as u64,
})
.collect(),
active,
})
}
fn level_ids<T>(levels: &PowerLevels<T>) -> Vec<PowerLevelId> {
levels.levels.iter().map(|level| level.id).collect()
}
}
impl GpuController for AmdGpuController {
fn controller_info(&self) -> &CommonControllerInfo {
&self.common
@@ -1583,6 +1488,8 @@ impl GpuController for AmdGpuController {
#[cfg(feature = "display-info")]
fn populate_displays_info(&self, info: &mut DisplaysInfo) -> anyhow::Result<()> {
const UHBR_RATE_THRESHOLD: u32 = 1000;
let debugfs = self.debugfs_path().context("Could not get debugfs")?;
for (connector, info) in &mut info.displays {
@@ -1875,3 +1782,97 @@ fn read_cache_info_from_kfd(node_path: &Path) -> anyhow::Result<CacheInfo> {
Ok(CacheInfo::Amd(items))
}
#[cfg(test)]
mod tests {
use super::*;
use amdgpu_sysfs::gpu_handle::PowerLevel;
#[test]
fn normalize_power_level_indexes_keeps_zero_based_indexes_after_sleep_state() {
let levels = normalize_indexes(
vec![
PowerLevelId::Sleep,
PowerLevelId::Index(0),
PowerLevelId::Index(1),
PowerLevelId::Index(2),
],
Some(PowerLevelId::Index(1)),
);
assert_eq!(
level_ids(&levels),
[
PowerLevelId::Sleep,
PowerLevelId::Index(0),
PowerLevelId::Index(1),
PowerLevelId::Index(2)
]
);
assert_eq!(levels.active, Some(PowerLevelId::Index(1)));
}
#[test]
fn normalize_power_level_indexes_keeps_zero_based_indexes_without_sleep_state() {
let levels = normalize_indexes(
vec![
PowerLevelId::Index(0),
PowerLevelId::Index(1),
PowerLevelId::Index(2),
],
Some(PowerLevelId::Index(2)),
);
assert_eq!(
level_ids(&levels),
[
PowerLevelId::Index(0),
PowerLevelId::Index(1),
PowerLevelId::Index(2)
]
);
assert_eq!(levels.active, Some(PowerLevelId::Index(2)));
}
#[test]
fn normalize_power_level_indexes_shifts_one_based_indexes_after_sleep_state() {
let levels = normalize_indexes(
vec![
PowerLevelId::Sleep,
PowerLevelId::Index(1),
PowerLevelId::Index(2),
PowerLevelId::Index(3),
],
Some(PowerLevelId::Index(2)),
);
assert_eq!(
level_ids(&levels),
[
PowerLevelId::Sleep,
PowerLevelId::Index(0),
PowerLevelId::Index(1),
PowerLevelId::Index(2)
]
);
assert_eq!(levels.active, Some(PowerLevelId::Index(1)));
}
fn normalize_indexes(ids: Vec<PowerLevelId>, active: Option<PowerLevelId>) -> PowerLevels<u64> {
AmdGpuController::normalize_power_level_indexes(PowerLevels {
levels: ids
.into_iter()
.enumerate()
.map(|(value, id)| PowerLevel {
id,
value: value as u64,
})
.collect(),
active,
})
}
fn level_ids<T>(levels: &PowerLevels<T>) -> Vec<PowerLevelId> {
levels.levels.iter().map(|level| level.id).collect()
}
}
lact-daemon/src/server/handler.rs
+1
View File
@@ -507,6 +507,7 @@ impl<'a> Handler {
}
#[cfg(not(feature = "display-info"))]
#[expect(clippy::unused_async)]
pub async fn get_displays_info(&'a self, _id: &str) -> anyhow::Result<DisplaysInfo> {
Err(anyhow!("Daemon is compiled without display info support"))
}