From c4afe3175218d0459bba8ec967a264a3a2b4d678 Mon Sep 17 00:00:00 2001 From: "Harper, Jason M" Date: Sun, 29 Jun 2025 11:16:51 -0700 Subject: [PATCH] remove turbo enable/disable from report due to inaccuracy Signed-off-by: Harper, Jason M --- internal/report/table_defs.go | 2 -- internal/report/table_helpers.go | 38 ++++---------------------------- 2 files changed, 4 insertions(+), 36 deletions(-) diff --git a/internal/report/table_defs.go b/internal/report/table_defs.go index 061689da..61a3cb12 100644 --- a/internal/report/table_defs.go +++ b/internal/report/table_defs.go @@ -972,7 +972,6 @@ func cpuTableValues(outputs map[string]script.ScriptOutput) []Field { {Name: "L3 Cache", Values: []string{l3FromOutput(outputs)}}, {Name: "L3 per Core", Values: []string{l3PerCoreFromOutput(outputs)}}, {Name: "Memory Channels", Values: []string{channelsFromOutput(outputs)}}, - {Name: "Intel Turbo Boost", Values: []string{turboEnabledFromOutput(outputs)}}, {Name: "Virtualization", Values: []string{valFromRegexSubmatch(outputs[script.LscpuScriptName].Stdout, `^Virtualization:\s*(.+)$`)}}, {Name: "PPINs", Values: []string{ppinsFromOutput(outputs)}}, } @@ -1884,7 +1883,6 @@ func systemSummaryTableValues(outputs map[string]script.ScriptOutput) []Field { {Name: "Sockets", Values: []string{valFromRegexSubmatch(outputs[script.LscpuScriptName].Stdout, `^Socket\(s\):\s*(.+)$`)}}, {Name: "Hyperthreading", Values: []string{hyperthreadingFromOutput(outputs)}}, {Name: "CPUs", Values: []string{valFromRegexSubmatch(outputs[script.LscpuScriptName].Stdout, `^CPU\(s\):\s*(.+)$`)}}, - {Name: "Intel Turbo Boost", Values: []string{turboEnabledFromOutput(outputs)}}, {Name: "Base Frequency", Values: []string{baseFrequencyFromOutput(outputs)}}, {Name: "All-core Maximum Frequency", Values: []string{allCoreMaxFrequencyFromOutput(outputs)}}, {Name: "Maximum Frequency", Values: []string{maxFrequencyFromOutput(outputs)}}, diff --git a/internal/report/table_helpers.go b/internal/report/table_helpers.go index f7da7056..fca116be 100644 --- a/internal/report/table_helpers.go +++ b/internal/report/table_helpers.go @@ -522,27 +522,6 @@ func channelsFromOutput(outputs map[string]script.ScriptOutput) string { return fmt.Sprintf("%d", cpu.MemoryChannelCount) } -func turboEnabledFromOutput(outputs map[string]script.ScriptOutput) string { - vendor := valFromRegexSubmatch(outputs[script.LscpuScriptName].Stdout, `^Vendor ID:\s*(.+)$`) - switch vendor { - case "GenuineIntel": - val := valFromRegexSubmatch(outputs[script.CpuidScriptName].Stdout, `^Intel Turbo Boost Technology\s*= (.+?)$`) - if val == "true" { - return "Enabled" - } - if val == "false" { - return "Disabled" - } - return "" // unknown value - case "AuthenticAMD": - val := valFromRegexSubmatch(outputs[script.LscpuScriptName].Stdout, `^Frequency boost.*:\s*(.+?)$`) - if val != "" { - return val + " (AMD Frequency Boost)" - } - } - return "" -} - func isPrefetcherEnabled(msrValue string, bit int) (bool, error) { if msrValue == "" { return false, fmt.Errorf("msrValue is empty") @@ -1834,9 +1813,9 @@ func cveSummaryFromOutput(outputs map[string]script.ScriptOutput) string { } func systemSummaryFromOutput(outputs map[string]script.ScriptOutput) string { - // BASELINE: 1-node, 2x Intel® Xeon® , xx cores, 100W TDP, HT On/Off?, Turbo On/Off?, Total Memory xxx GB (xx slots/ xx GB/ xxxx MHz [run @ xxxx MHz] ), , , , . Test by Intel as of . - template := "1-node, %sx %s, %s cores, %s TDP, HT %s, Turbo %s, Total Memory %s, BIOS %s, microcode %s, %s, %s, %s, %s. Test by Intel as of %s." - var socketCount, cpuModel, coreCount, tdp, htOnOff, turboOnOff, installedMem, biosVersion, uCodeVersion, nics, disks, operatingSystem, kernelVersion, date string + // BASELINE: 1-node, 2x Intel® Xeon® , xx cores, 100W TDP, HT On/Off?, Total Memory xxx GB (xx slots/ xx GB/ xxxx MHz [run @ xxxx MHz] ), , , , . Test by Intel as of . + template := "1-node, %sx %s, %s cores, %s TDP, HT %s, Total Memory %s, BIOS %s, microcode %s, %s, %s, %s, %s. Test by Intel as of %s." + var socketCount, cpuModel, coreCount, tdp, htOnOff, installedMem, biosVersion, uCodeVersion, nics, disks, operatingSystem, kernelVersion, date string // socket count socketCount = valFromRegexSubmatch(outputs[script.LscpuScriptName].Stdout, `^Socket\(s\):\s*(\d+)$`) @@ -1861,15 +1840,6 @@ func systemSummaryFromOutput(outputs map[string]script.ScriptOutput) string { default: htOnOff = "?" } - // turbo - turboOnOff = turboEnabledFromOutput(outputs) - if strings.Contains(strings.ToLower(turboOnOff), "enabled") { - turboOnOff = "On" - } else if strings.Contains(strings.ToLower(turboOnOff), "disabled") { - turboOnOff = "Off" - } else { - turboOnOff = "?" - } // memory installedMem = installedMemoryFromOutput(outputs) // BIOS @@ -1887,7 +1857,7 @@ func systemSummaryFromOutput(outputs map[string]script.ScriptOutput) string { // date date = strings.TrimSpace(outputs[script.DateScriptName].Stdout) // put it all together - return fmt.Sprintf(template, socketCount, cpuModel, coreCount, tdp, htOnOff, turboOnOff, installedMem, biosVersion, uCodeVersion, nics, disks, operatingSystem, kernelVersion, date) + return fmt.Sprintf(template, socketCount, cpuModel, coreCount, tdp, htOnOff, installedMem, biosVersion, uCodeVersion, nics, disks, operatingSystem, kernelVersion, date) } // getSectionsFromOutput parses output into sections, where the section name