Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cmd/report/report_tables.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ var tableDefinitions = map[string]table.TableDefinition{
script.LspciDevicesScriptName,
script.CpuidScriptName,
script.BaseFrequencyScriptName,
script.MaximumFrequencyScriptName,
script.SpecCoreFrequenciesScriptName,
script.PPINName,
script.L3CacheWayEnabledName,
Expand Down
17 changes: 2 additions & 15 deletions internal/common/frequency.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion internal/common/table_defs.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ var TableDefinitions = map[string]table.TableDefinition{
script.LscpuCacheScriptName,
script.LspciBitsScriptName,
script.LspciDevicesScriptName,
script.MaximumFrequencyScriptName,
script.SpecCoreFrequenciesScriptName,
script.MeminfoScriptName,
script.NicInfoScriptName,
Expand Down
5 changes: 0 additions & 5 deletions internal/script/script_defs.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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",
Expand Down