Skip to content

assume events not supported on failure when loading metadata for metrics command #139

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 4 commits into from
Jan 6, 2025
Merged

assume events not supported on failure when loading metadata for metrics command #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2dd0e8
assume events not supported on failure
harp-intel Jan 4, 2025
134d6b0
revert
harp-intel Jan 4, 2025
2217ddc
revert
harp-intel Jan 4, 2025
77ccc3e
don't select event in group if value is NaN for metric
harp-intel Jan 6, 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
20 changes: 13 additions & 7 deletions cmd/metrics/metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func LoadMetadata(myTarget target.Target, noRoot bool, perfPath string, localTem
err = fmt.Errorf("failed to retrieve PMU driver version: %v", err)
return
}
// reduce startup time by running the three perf commands in their own threads
// reduce startup time by running the perf commands in their own threads
slowFuncChannel := make(chan error)
// perf list
go func() {
Expand All @@ -116,7 +116,8 @@ func LoadMetadata(myTarget target.Target, noRoot bool, perfPath string, localTem
var err error
var output string
if metadata.SupportsRefCycles, output, err = getSupportsRefCycles(myTarget, noRoot, perfPath, localTempDir); err != nil {
err = fmt.Errorf("failed to determine if ref_cycles is supported: %v", err)
slog.Warn("failed to determine if ref_cycles is supported, assuming not supported", slog.String("error", err.Error()))
err = nil
} else {
if !metadata.SupportsRefCycles {
slog.Warn("ref-cycles not supported", slog.String("output", output))
Expand All @@ -129,7 +130,8 @@ func LoadMetadata(myTarget target.Target, noRoot bool, perfPath string, localTem
var err error
var output string
if metadata.SupportsFixedTMA, output, err = getSupportsFixedTMA(myTarget, noRoot, perfPath, localTempDir); err != nil {
err = fmt.Errorf("failed to determine if fixed-counter TMA is supported: %v", err)
slog.Warn("failed to determine if fixed-counter TMA is supported, assuming not supported", slog.String("error", err.Error()))
err = nil
} else {
if !metadata.SupportsFixedTMA {
slog.Warn("Fixed-counter TMA events not supported", slog.String("output", output))
Expand All @@ -142,7 +144,8 @@ func LoadMetadata(myTarget target.Target, noRoot bool, perfPath string, localTem
var err error
var output string
if metadata.SupportsFixedCycles, output, err = getSupportsFixedEvent(myTarget, "cpu-cycles", cpu.MicroArchitecture, noRoot, perfPath, localTempDir); err != nil {
err = fmt.Errorf("failed to determine if fixed-counter 'cpu-cycles' is supported: %v", err)
slog.Warn("failed to determine if fixed-counter 'cpu-cycles' is supported, assuming not supported", slog.String("error", err.Error()))
err = nil
} else {
if !metadata.SupportsFixedCycles {
slog.Warn("Fixed-counter 'cpu-cycles' events not supported", slog.String("output", output))
Expand All @@ -155,7 +158,8 @@ func LoadMetadata(myTarget target.Target, noRoot bool, perfPath string, localTem
var err error
var output string
if metadata.SupportsFixedInstructions, output, err = getSupportsFixedEvent(myTarget, "instructions", cpu.MicroArchitecture, noRoot, perfPath, localTempDir); err != nil {
err = fmt.Errorf("failed to determine if fixed-counter 'instructions' is supported: %v", err)
slog.Warn("failed to determine if fixed-counter 'instructions' is supported, assuming not supported", slog.String("error", err.Error()))
err = nil
} else {
if !metadata.SupportsFixedInstructions {
slog.Warn("Fixed-counter 'instructions' events not supported", slog.String("output", output))
Expand All @@ -168,7 +172,8 @@ func LoadMetadata(myTarget target.Target, noRoot bool, perfPath string, localTem
var err error
var output string
if metadata.SupportsPEBS, output, err = getSupportsPEBS(myTarget, noRoot, perfPath, localTempDir); err != nil {
err = fmt.Errorf("failed to determine if 'PEBS' is supported: %v", err)
slog.Warn("failed to determine if 'PEBS' is supported, assuming not supported", slog.String("error", err.Error()))
err = nil
} else {
if !metadata.SupportsPEBS {
slog.Warn("'PEBS' events not supported", slog.String("output", output))
Expand All @@ -181,7 +186,8 @@ func LoadMetadata(myTarget target.Target, noRoot bool, perfPath string, localTem
var err error
var output string
if metadata.SupportsOCR, output, err = getSupportsOCR(myTarget, noRoot, perfPath, localTempDir); err != nil {
err = fmt.Errorf("failed to determine if 'OCR' is supported: %v", err)
slog.Warn("failed to determine if 'OCR' is supported, assuming not supported", slog.String("error", err.Error()))
err = nil
} else {
if !metadata.SupportsOCR {
slog.Warn("'OCR' events not supported", slog.String("output", output))
Expand Down
8 changes: 7 additions & 1 deletion cmd/metrics/metric.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,16 @@ func loadMetricBestGroups(metric MetricDefinition, frame EventFrame) (err error)
// find group with the greatest number of event names that match the remaining variable names
bestGroupIdx := -1
bestMatches := 0
var matchedNames mapset.Set[string] // := mapset.NewSet([]string{}...)
var matchedNames mapset.Set[string]
for groupIdx, group := range frame.EventGroups {
groupEventNames := mapset.NewSetFromMapKeys(group.EventValues)
intersection := remainingVariableNames.Intersect(groupEventNames)
// if an event value is NaN, remove it from the intersection map with hopes we'll find a better match
for _, name := range intersection.ToSlice() {
if math.IsNaN(group.EventValues[name]) {
intersection.Remove(name)
}
}
if intersection.Cardinality() > bestMatches {
bestGroupIdx = groupIdx
bestMatches = intersection.Cardinality()
Expand Down
Loading