mirrors/coreutils
1
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2025-12-23 08:47:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: consolidate SIMD feature handling in wc command

Browse source 
Refactor SIMD feature detection and reporting in the wc utility by introducing a WcSimdFeatures struct to group enabled, disabled, and runtime-disabled features. This replaces multiple separate functions with a single function, improving code organization and efficiency by reducing redundant iterations over feature lists. Also rename helper functions for clarity and update debug output logic accordingly.
This commit is contained in:
mattsu 2025-12-22 21:13:49 +09:00
parent a640e0dbe5
commit 62673fcd9c
1 changed files with 49 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

85
src/uu/wc/src/wc.rs
View file

@ -828,14 +828,14 @@ fn hardware_feature_label(feature: HardwareFeature) -> &'static str {
}
}
fn is_wc_simd_runtime_feature(feature: &HardwareFeature) -> bool {
fn is_simd_runtime_feature(feature: &HardwareFeature) -> bool {
matches!(
feature,
HardwareFeature::Avx2 | HardwareFeature::Sse2 | HardwareFeature::Asimd
)
}
fn is_wc_simd_debug_feature(feature: &HardwareFeature) -> bool {
fn is_simd_debug_feature(feature: &HardwareFeature) -> bool {
matches!(
feature,
HardwareFeature::Avx512
@ -845,36 +845,44 @@ fn is_wc_simd_debug_feature(feature: &HardwareFeature) -> bool {
)
}
fn wc_simd_enabled_features(policy: &SimdPolicy) -> Vec<HardwareFeature> {
policy
struct WcSimdFeatures {
enabled: Vec<HardwareFeature>,
disabled: Vec<HardwareFeature>,
disabled_runtime: Vec<HardwareFeature>,
}
fn wc_simd_features(policy: &SimdPolicy) -> WcSimdFeatures {
let enabled = policy
.iter_features()
.filter(is_wc_simd_runtime_feature)
.collect()
}
.filter(is_simd_runtime_feature)
.collect();
fn wc_simd_disabled_features(policy: &SimdPolicy) -> Vec<HardwareFeature> {
policy
.disabled_features()
.into_iter()
.filter(is_wc_simd_debug_feature)
.collect()
}
let mut disabled = Vec::new();
let mut disabled_runtime = Vec::new();
for feature in policy.disabled_features() {
if is_simd_debug_feature(&feature) {
disabled.push(feature);
}
if is_simd_runtime_feature(&feature) {
disabled_runtime.push(feature);
}
}
fn wc_simd_disabled_runtime_features(policy: &SimdPolicy) -> Vec<HardwareFeature> {
policy
.disabled_features()
.into_iter()
.filter(is_wc_simd_runtime_feature)
.collect()
WcSimdFeatures {
enabled,
disabled,
disabled_runtime,
}
}
pub(crate) fn wc_simd_allowed(policy: &SimdPolicy) -> bool {
if !wc_simd_disabled_runtime_features(policy).is_empty() {
let disabled_features = policy.disabled_features();
if disabled_features.iter().any(is_simd_runtime_feature) {
return false;
}
policy
.iter_features()
.any(|feature| is_wc_simd_runtime_feature(&feature))
.any(|feature| is_simd_runtime_feature(&feature))
}
fn wc(inputs: &Inputs, settings: &Settings) -> UResult<()> {
@ -888,41 +896,46 @@ fn wc(inputs: &Inputs, settings: &Settings) -> UResult<()> {
if settings.debug {
let policy = SimdPolicy::detect();
let enabled_features = wc_simd_enabled_features(policy);
let disabled_features = wc_simd_disabled_features(policy);
let disabled_runtime_features = wc_simd_disabled_runtime_features(policy);
let features = wc_simd_features(policy);
let enabled: Vec<&'static str> = enabled_features
let enabled: Vec<&'static str> = features
.enabled
.iter()
.copied()
.map(hardware_feature_label)
.collect();
let disabled: Vec<&'static str> = disabled_features
let disabled: Vec<&'static str> = features
.disabled
.iter()
.copied()
.map(hardware_feature_label)
.collect();
let runtime_disabled = !disabled_runtime_features.is_empty();
let enabled_empty = enabled.is_empty();
let disabled_empty = disabled.is_empty();
let runtime_disabled = !features.disabled_runtime.is_empty();
match (enabled.is_empty(), runtime_disabled, disabled.is_empty()) {
(true, false, _) => eprintln!("{}", translate!("wc-debug-hw-unavailable")),
(_, true, _) => eprintln!(
if enabled_empty && !runtime_disabled {
eprintln!("{}", translate!("wc-debug-hw-unavailable"));
} else if runtime_disabled {
eprintln!(
"{}",
translate!("wc-debug-hw-disabled-glibc", "features" => disabled.join(", "))
),
(false, false, true) => eprintln!(
);
} else if !enabled_empty && disabled_empty {
eprintln!(
"{}",
translate!("wc-debug-hw-using", "features" => enabled.join(", "))
),
(false, false, false) => eprintln!(
);
} else {
eprintln!(
"{}",
translate!(
"wc-debug-hw-limited-glibc",
"disabled" => disabled.join(", "),
"enabled" => enabled.join(", ")
)
),
);
}
}