Skip to content

2nd round of added support for Clearwater Forest (CWF) architecture in report tables #314

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
merged 1 commit into from
Apr 23, 2025
Merged

2nd round of added support for Clearwater Forest (CWF) architecture in report tables #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions cmd/metrics/metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,8 @@ func getNumGPCounters(uarch string) (numGPCounters int, err error) {
fallthrough
case "SRF":
fallthrough
case "CWF":
fallthrough
case "GNR":
numGPCounters = 8
case "Gen":
Expand Down
9 changes: 4 additions & 5 deletions internal/report/table_defs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,6 @@ var tableDefinitions = map[string]TableDefinition{
script.MaximumFrequencyScriptName,
script.SpecCoreFrequenciesScriptName,
script.PPINName,
script.PrefetchControlName,
script.PrefetchersName,
script.L3WaySizeName},
FieldsFunc: cpuTableValues,
InsightsFunc: cpuTableInsights},
Expand Down Expand Up @@ -1040,6 +1038,7 @@ func cpuTableInsights(outputs map[string]script.ScriptOutput, tableValues TableV
"SPR": 6,
"EMR": 7,
"SRF": 8,
"CWF": 8,
"GNR": 8,
}
uarch := tableValues.Fields[uarchIndex].Values[0]
Expand Down Expand Up @@ -1175,7 +1174,7 @@ func uncoreTableValues(outputs map[string]script.ScriptOutput) []Field {
slog.Error("failed to get uarch from script outputs")
return []Field{}
}
if strings.Contains(uarch, "SRF") || strings.Contains(uarch, "GNR") {
if strings.Contains(uarch, "SRF") || strings.Contains(uarch, "GNR") || strings.Contains(uarch, "CWF") {
return []Field{
{Name: "Min Frequency (Compute)", Values: []string{uncoreMinMaxDieFrequencyFromOutput(false, true, outputs)}},
{Name: "Min Frequency (I/O)", Values: []string{uncoreMinMaxDieFrequencyFromOutput(false, false, outputs)}},
Expand Down Expand Up @@ -1943,7 +1942,7 @@ func configurationTableValues(outputs map[string]script.ScriptOutput) []Field {
{Name: "Package Power / TDP", Values: []string{tdpFromOutput(outputs)}},
{Name: "All-Core Max Frequency", Values: []string{allCoreMaxFrequencyFromOutput(outputs)}},
}
if strings.Contains(uarch, "SRF") || strings.Contains(uarch, "GNR") {
if strings.Contains(uarch, "SRF") || strings.Contains(uarch, "GNR") || strings.Contains(uarch, "CWF") {
fields = append(fields, []Field{
{Name: "Uncore Min Frequency (Compute)", Values: []string{uncoreMinMaxDieFrequencyFromOutput(false, true, outputs)}},
{Name: "Uncore Min Frequency (I/O)", Values: []string{uncoreMinMaxDieFrequencyFromOutput(false, false, outputs)}},
Expand All @@ -1962,7 +1961,7 @@ func configurationTableValues(outputs map[string]script.ScriptOutput) []Field {
{Name: "Scaling Governor", Values: []string{strings.TrimSpace(outputs[script.ScalingGovernorScriptName].Stdout)}},
}...)
// add ELC (for SRF and GNR only)
if strings.Contains(uarch, "SRF") || strings.Contains(uarch, "GNR") {
if strings.Contains(uarch, "SRF") || strings.Contains(uarch, "GNR") || strings.Contains(uarch, "CWF") {
fields = append(fields, Field{Name: "Efficiency Latency Control", Values: []string{elcSummaryFromOutput(outputs)}})
}
// add prefetchers
Expand Down
8 changes: 7 additions & 1 deletion internal/report/table_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ func getSpecCoreFrequenciesFromOutput(outputs map[string]script.ScriptOutput) ([
var buckets []string
startRange := 1
var archMultiplier int
if strings.Contains(arch, "SRF") {
if strings.Contains(arch, "SRF") || strings.Contains(arch, "CWF") {
archMultiplier = 4
} else if strings.Contains(arch, "GNR_X3") {
archMultiplier = 3
Expand Down Expand Up @@ -1240,6 +1240,12 @@ func clusteringModeFromOutput(outputs map[string]script.ScriptOutput) string {
} else if nodesPerSocket == 2 {
return "SNC 2"
}
} else if uarch == "CWF" {
if nodesPerSocket == 1 {
return "UMA 6 (Hex)"
} else if nodesPerSocket == 3 {
return "SNC 3"
}
}
return ""
}
Expand Down