From 376c5d0ad56796e9b877e9e50b870f0abab1253c Mon Sep 17 00:00:00 2001 From: "Harper, Jason M" Date: Mon, 15 Dec 2025 13:18:51 -0800 Subject: [PATCH] Single source for maximum frequency Signed-off-by: Harper, Jason M --- cmd/report/report_tables.go | 1 - internal/common/frequency.go | 17 ++--------------- internal/common/table_defs.go | 1 - internal/script/script_defs.go | 5 ----- 4 files changed, 2 insertions(+), 22 deletions(-) diff --git a/cmd/report/report_tables.go b/cmd/report/report_tables.go index fc3dceaa..5c243cb6 100644 --- a/cmd/report/report_tables.go +++ b/cmd/report/report_tables.go @@ -143,7 +143,6 @@ var tableDefinitions = map[string]table.TableDefinition{ script.LspciDevicesScriptName, script.CpuidScriptName, script.BaseFrequencyScriptName, - script.MaximumFrequencyScriptName, script.SpecCoreFrequenciesScriptName, script.PPINName, script.L3CacheWayEnabledName, diff --git a/internal/common/frequency.go b/internal/common/frequency.go index 54bd9ac5..848368fd 100644 --- a/internal/common/frequency.go +++ b/internal/common/frequency.go @@ -271,21 +271,8 @@ func ExpandTurboFrequencies(specFrequencyBuckets [][]string, isa string) ([]stri return freqs, nil } -// MaxFrequencyFromOutput gets max core frequency -// -// 1st option) /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq -// 2nd option) from MSR/tpmi -// 3rd option) from dmidecode "Max Speed" +// MaxFrequencyFromOutput gets max core frequency from MSR/TPMI func MaxFrequencyFromOutput(outputs map[string]script.ScriptOutput) string { - cmdout := strings.TrimSpace(outputs[script.MaximumFrequencyScriptName].Stdout) - if cmdout != "" { - freqf, err := strconv.ParseFloat(cmdout, 64) - if err == nil { - freqf = freqf / 1000000 - return fmt.Sprintf("%.1fGHz", freqf) - } - } - // get the max frequency from the MSR/tpmi specCoreFrequencies, err := GetSpecFrequencyBuckets(outputs) if err == nil { sseFreqs := GetSSEFreqsFromBuckets(specCoreFrequencies) @@ -294,7 +281,7 @@ func MaxFrequencyFromOutput(outputs map[string]script.ScriptOutput) string { return sseFreqs[0] + "GHz" } } - return ValFromDmiDecodeRegexSubmatch(outputs[script.DmidecodeScriptName].Stdout, "4", `Max Speed:\s(.*)`) + return "" } func GetSSEFreqsFromBuckets(buckets [][]string) []string { diff --git a/internal/common/table_defs.go b/internal/common/table_defs.go index fdeee4ec..fd84fbce 100644 --- a/internal/common/table_defs.go +++ b/internal/common/table_defs.go @@ -23,7 +23,6 @@ var TableDefinitions = map[string]table.TableDefinition{ script.LscpuCacheScriptName, script.LspciBitsScriptName, script.LspciDevicesScriptName, - script.MaximumFrequencyScriptName, script.SpecCoreFrequenciesScriptName, script.MeminfoScriptName, script.NicInfoScriptName, diff --git a/internal/script/script_defs.go b/internal/script/script_defs.go index aabb9fb1..8687f0ee 100644 --- a/internal/script/script_defs.go +++ b/internal/script/script_defs.go @@ -49,7 +49,6 @@ const ( OpensslVersionScriptName = "openssl version" CpuidScriptName = "cpuid" BaseFrequencyScriptName = "base frequency" - MaximumFrequencyScriptName = "maximum frequency" ScalingDriverScriptName = "scaling driver" ScalingGovernorScriptName = "scaling governor" CstatesScriptName = "c-states" @@ -257,10 +256,6 @@ var scriptDefinitions = map[string]ScriptDefinition{ Name: BaseFrequencyScriptName, ScriptTemplate: "cat /sys/devices/system/cpu/cpu0/cpufreq/base_frequency", }, - MaximumFrequencyScriptName: { - Name: MaximumFrequencyScriptName, - ScriptTemplate: "cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq", - }, ScalingDriverScriptName: { Name: ScalingDriverScriptName, ScriptTemplate: "cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_driver",