diff --git a/cmd/config/config.go b/cmd/config/config.go index ec5edd76..75989937 100644 --- a/cmd/config/config.go +++ b/cmd/config/config.go @@ -854,7 +854,7 @@ func setUncoreDieFrequency(maxFreq bool, computeDie bool, uncoreFrequency float6 slog.Error("failed to get target model", slog.String("error", err.Error())) return } - if targetFamily != "6" || (targetFamily == "6" && targetModel != "173" && targetModel != "175") { + if targetFamily != "6" || (targetFamily == "6" && targetModel != "173" && targetModel != "175" && targetModel != "221") { err := fmt.Errorf("uncore frequency setting not supported on %s due to family/model mismatch", myTarget.GetName()) slog.Error(err.Error()) fmt.Fprintf(os.Stderr, "Error: failed to set uncore frequency: %v\n", err) @@ -947,7 +947,7 @@ func setUncoreFrequency(maxFreq bool, uncoreFrequency float64, myTarget target.T slog.Error("failed to get target model", slog.String("error", err.Error())) return } - if targetFamily != "6" || (targetFamily == "6" && (targetModel == "173" || targetModel == "175")) { // SRF, GNR + if targetFamily != "6" || (targetFamily == "6" && (targetModel == "173" || targetModel == "175" || targetModel == "221")) { // not Intel || not GNR, SRF, CWF err := fmt.Errorf("uncore frequency setting not supported on %s due to family/model mismatch", myTarget.GetName()) slog.Error(err.Error()) fmt.Fprintf(os.Stderr, "Error: failed to set uncore frequency: %v\n", err) @@ -1200,7 +1200,7 @@ func setElc(elc string, myTarget target.Target, localTempDir string) { ScriptTemplate: fmt.Sprintf("bhs-power-mode.sh --%s", mode), Superuser: true, Vendors: []string{"GenuineIntel"}, - Models: []string{"173", "175"}, // GNR and SRF only + Models: []string{"173", "175", "221"}, // GNR, SRF, CWF Depends: []string{"bhs-power-mode.sh"}, } _, err := runScript(myTarget, setScript, localTempDir) diff --git a/internal/cpudb/cpu_defs.go b/internal/cpudb/cpu_defs.go index 5a988237..b1a8f41e 100644 --- a/internal/cpudb/cpu_defs.go +++ b/internal/cpudb/cpu_defs.go @@ -49,7 +49,8 @@ var cpus = CPUDB{ {MicroArchitecture: "GNR_X1", Family: "6", Model: "173", Stepping: "", Architecture: "x86_64", MemoryChannelCount: 8, LogicalThreadCount: 2, CacheWayCount: 16}, // Granite Rapids - SP (MCC/LCC) {MicroArchitecture: "GNR_X2", Family: "6", Model: "173", Stepping: "", Architecture: "x86_64", MemoryChannelCount: 8, LogicalThreadCount: 2, CacheWayCount: 16}, // Granite Rapids - SP (XCC) {MicroArchitecture: "GNR_X3", Family: "6", Model: "173", Stepping: "", Architecture: "x86_64", MemoryChannelCount: 12, LogicalThreadCount: 2, CacheWayCount: 16}, // Granite Rapids - AP (UCC) - {MicroArchitecture: "GNR_D", Family: "6", Model: "174", Stepping: "", Architecture: "x86_64", MemoryChannelCount: 0, LogicalThreadCount: 2, CacheWayCount: 16}, // Granite Rapids - D (generic) + {MicroArchitecture: "GNR_D", Family: "6", Model: "174", Stepping: "", Architecture: "x86_64", MemoryChannelCount: 0, LogicalThreadCount: 2, CacheWayCount: 16}, // Granite Rapids - D + {MicroArchitecture: "CWF", Family: "6", Model: "221", Stepping: "", Architecture: "x86_64", MemoryChannelCount: 12, LogicalThreadCount: 1, CacheWayCount: 0}, // Clearwater Forest - generic // AMD CPUs {MicroArchitecture: "Naples", Family: "23", Model: "1", Stepping: "", Architecture: "x86_64", MemoryChannelCount: 8, LogicalThreadCount: 2, CacheWayCount: 0}, // Naples {MicroArchitecture: "Rome", Family: "23", Model: "49", Stepping: "", Architecture: "x86_64", MemoryChannelCount: 8, LogicalThreadCount: 2, CacheWayCount: 0}, // Rome diff --git a/internal/report/table_defs.go b/internal/report/table_defs.go index 1a61b863..818a6307 100644 --- a/internal/report/table_defs.go +++ b/internal/report/table_defs.go @@ -340,8 +340,8 @@ var tableDefinitions = map[string]TableDefinition{ FieldsFunc: uncoreTableValues}, ElcTableName: { Name: ElcTableName, - Families: []string{"6"}, // Intel CPUs only - Models: []string{"173", "175"}, // Granite Rapids, Sierra Forest + Families: []string{"6"}, // Intel CPUs only + Models: []string{"173", "175", "221"}, // Granite Rapids, Sierra Forest, Clearwater Forest HasRows: true, ScriptNames: []string{ script.ElcScriptName, @@ -350,8 +350,8 @@ var tableDefinitions = map[string]TableDefinition{ InsightsFunc: elcTableInsights}, SSTTFHPTableName: { Name: SSTTFHPTableName, - Families: []string{"6"}, // Intel CPUs only - Models: []string{"173", "175"}, // Granite Rapids, Sierra Forest + Families: []string{"6"}, // Intel CPUs only + Models: []string{"173", "175", "221"}, // Granite Rapids, Sierra Forest, Clearwater Forest HasRows: true, ScriptNames: []string{ script.SstTfHighPriorityCoreFrequenciesScriptName, @@ -359,8 +359,8 @@ var tableDefinitions = map[string]TableDefinition{ FieldsFunc: sstTFHPTableValues}, SSTTFLPTableName: { Name: SSTTFLPTableName, - Families: []string{"6"}, // Intel CPUs only - Models: []string{"173", "175"}, // Granite Rapids, Sierra Forest + Families: []string{"6"}, // Intel CPUs only + Models: []string{"173", "175", "221"}, // Granite Rapids, Sierra Forest, Clearwater Forest HasRows: true, ScriptNames: []string{ script.SstTfLowPriorityCoreFrequenciesScriptName, diff --git a/internal/script/script_defs.go b/internal/script/script_defs.go index 82e94d9e..f8277ee3 100644 --- a/internal/script/script_defs.go +++ b/internal/script/script_defs.go @@ -474,8 +474,8 @@ echo "$epb"`, Name: UncoreMaxFromTPMIScriptName, ScriptTemplate: "pcm-tpmi 2 0x18 -d -b 8:14", Architectures: []string{x86_64}, - Families: []string{"6"}, // Intel - Models: []string{"173", "175"}, // GNR, SRF + Families: []string{"6"}, // Intel + Models: []string{"173", "175", "221"}, // GNR, SRF, CWF Depends: []string{"pcm-tpmi"}, Superuser: true, }, @@ -483,8 +483,8 @@ echo "$epb"`, Name: UncoreMinFromTPMIScriptName, ScriptTemplate: "pcm-tpmi 2 0x18 -d -b 15:21", Architectures: []string{x86_64}, - Families: []string{"6"}, // Intel - Models: []string{"173", "175"}, // GNR, SRF + Families: []string{"6"}, // Intel + Models: []string{"173", "175", "221"}, // GNR, SRF, CWF Depends: []string{"pcm-tpmi"}, Superuser: true, }, @@ -492,8 +492,8 @@ echo "$epb"`, Name: UncoreDieTypesFromTPMIScriptName, ScriptTemplate: "pcm-tpmi 2 0x10 -d -b 26:26", Architectures: []string{x86_64}, - Families: []string{"6"}, // Intel - Models: []string{"173", "175"}, // GNR, SRF + Families: []string{"6"}, // Intel + Models: []string{"173", "175", "221"}, // GNR, SRF, CWF Depends: []string{"pcm-tpmi"}, Superuser: true, }, @@ -565,8 +565,8 @@ for die in "${!die_types[@]}"; do done `, Architectures: []string{x86_64}, - Families: []string{"6"}, // Intel - Models: []string{"173", "175"}, // GNR, SRF + Families: []string{"6"}, // Intel + Models: []string{"173", "175", "221"}, // GNR, SRF, CWF Depends: []string{"pcm-tpmi"}, Superuser: true, },