Skip to content

Update CPU model support to include Clearwater Forest (model 221) in … #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
harp-intel merged 3 commits into from
Apr 22, 2025
Merged

Update CPU model support to include Clearwater Forest (model 221) in … #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0824883
Update CPU model support to include Clearwater Forest (model 221) in …
harp-intel Apr 22, 2025
176f5bc
Update CPU model support to include Clearwater Forest (model 221) in …
harp-intel Apr 22, 2025
c6757cc
merge
harp-intel Apr 22, 2025
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
6 changes: 3 additions & 3 deletions cmd/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion internal/cpudb/cpu_defs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions internal/report/table_defs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -350,17 +350,17 @@ 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,
},
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,
Expand Down
16 changes: 8 additions & 8 deletions internal/script/script_defs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,26 +474,26 @@ 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,
},
UncoreMinFromTPMIScriptName: {
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,
},
UncoreDieTypesFromTPMIScriptName: {
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,
},
Expand Down Expand Up @@ -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,
},
Expand Down