Skip to content

leftover: 174 and 177 #178

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
fior512 merged 1 commit into from
Oct 13, 2026
Merged

leftover: 174 and 177 #178

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
79 changes: 7 additions & 72 deletions cmd/goset-bench/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"bytes"
"flag"
"fmt"
"math"
"os"
"os/exec"
"path/filepath"
Expand Down Expand Up @@ -255,7 +254,7 @@ func selectMetrics(all []sample, match string, topk int) ([]string, error) {
v, _ := s.metric(name)
heads = append(heads, v)
}
if len(heads) > 0 && minOf(heads) != maxOf(heads) {
if len(heads) > 0 && generic.MinOf(heads) != generic.MaxOf(heads) {
r.varies = true
r.constant = false
}
Expand Down Expand Up @@ -899,14 +898,14 @@ func printStat(label string, width int, values []float64) {
fmt.Printf(" %-*s no data\n", width, label)
return
}
mean := avg(values)
mean := generic.Avg(values)
cv := 0.0
if mean != 0 {
cv = stddev(values) / mean * 100
cv = generic.StdDev(values) / mean * 100
}
f := cellFormatter(label)
fmt.Printf(" %-*s n=%-4d avg=%-12s med=%-12s sd=%-12s cv=%5.1f%% min=%-12s max=%s\n",
width, label, len(values), f(mean), f(median(values)), f(stddev(values)), cv, f(minOf(values)), f(maxOf(values)))
width, label, len(values), f(mean), f(generic.Median(values)), f(generic.StdDev(values)), cv, f(generic.MinOf(values)), f(generic.MaxOf(values)))
}

// isTimeLabel marks the two series carried as raw time: the jitter
Expand Down Expand Up @@ -952,9 +951,9 @@ func printTail(label string, width int, values []float64) {
if len(values) == 0 {
return
}
p50 := percentile(values, 0.50)
p99 := percentile(values, 0.99)
p999 := percentile(values, 0.999)
p50 := generic.Percentile(values, 0.50)
p99 := generic.Percentile(values, 0.99)
p999 := generic.Percentile(values, 0.999)
ratio := 0.0
if p50 != 0 {
ratio = p999 / p50
Expand All @@ -964,74 +963,10 @@ func printTail(label string, width int, values []float64) {
width, label, len(values), f(p50), f(p99), f(p999), ratio)
}

func percentile(values []float64, p float64) float64 {
sorted := append([]float64(nil), values...)
sort.Float64s(sorted)
idx := int(p * float64(len(sorted)-1))
return sorted[idx]
}

func getKey(samples []sample, get func(sample) float64) []float64 {
values := make([]float64, len(samples))
for i, s := range samples {
values[i] = get(s)
}
return values
}

func minOf(values []float64) float64 {
m := values[0]
for _, v := range values[1:] {
if v < m {
m = v
}
}
return m
}

func maxOf(values []float64) float64 {
m := values[0]
for _, v := range values[1:] {
if v > m {
m = v
}
}
return m
}

func avg(values []float64) float64 {
if len(values) == 0 {
return 0
}
var total float64
for _, v := range values {
total += v
}
return total / float64(len(values))
}

func median(values []float64) float64 {
if len(values) == 0 {
return 0
}
sorted := append([]float64(nil), values...)
sort.Float64s(sorted)
mid := len(sorted) / 2
if len(sorted)%2 == 0 {
return (sorted[mid-1] + sorted[mid]) / 2
}
return sorted[mid]
}

func stddev(values []float64) float64 {
if len(values) == 0 {
return 0
}
mean := avg(values)
var acc float64
for _, v := range values {
diff := v - mean
acc += diff * diff
}
return math.Sqrt(acc / float64(len(values)))
}
22 changes: 11 additions & 11 deletions test/selection_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,21 +320,21 @@ func TestNumaOffReportsAnyNode(t *testing.T) {
}
}

func assertFenceMatchesTaskCore(t *testing.T, topo *cpu.Topology, selected *generic.Selection) {
func assertFenceMatchesTaskCore(t *testing.T, topo *cpu.Topology, selection *generic.Selection) {
t.Helper()
task := selected.Task.NextSet(0)
for sibling := range selected.Fence.All() {
task := selection.Task.NextSet(0)
for sibling := range selection.Fence.All() {
if topo.Core[sibling] != topo.Core[task] {
t.Errorf("fenced cpu %d is on core %d, task cpu %d is on core %d", sibling, topo.Core[sibling], task, topo.Core[task])
}
if sibling == task || sibling == selected.HouseKeeper {
if sibling == task || sibling == selection.HouseKeeper {
t.Errorf("fence holds cpu %d, the task or housekeeper cpu", sibling)
}
}
for cpuID := range topo.Online.All() {
onCore := topo.Core[cpuID] == topo.Core[task] && cpuID != task && cpuID != selected.HouseKeeper
if onCore != selected.Fence.GetBit(cpuID) {
t.Errorf("cpu %d: on task core (not housekeeper) = %v, in fence = %v", cpuID, onCore, selected.Fence.GetBit(cpuID))
onCore := topo.Core[cpuID] == topo.Core[task] && cpuID != task && cpuID != selection.HouseKeeper
if onCore != selection.Fence.GetBit(cpuID) {
t.Errorf("cpu %d: on task core (not housekeeper) = %v, in fence = %v", cpuID, onCore, selection.Fence.GetBit(cpuID))
}
}
}
Expand All @@ -355,11 +355,11 @@ func TestSelectionFenceBooksTaskSiblings(t *testing.T) {
if err != nil {
t.Fatalf("cpu.GetTopology: %v", err)
}
selected, err := cpu.Selection(topo, &cli.Config{NThreads: 1, Numa: -2, Fence: true})
selection, err := cpu.Selection(topo, &cli.Config{NThreads: 1, Numa: -2, Fence: true})
if err != nil {
t.Fatalf("Selection: %v", err)
}
assertFenceMatchesTaskCore(t, topo, selected)
assertFenceMatchesTaskCore(t, topo, selection)
assertFenceOff(t, topo)
}

Expand Down Expand Up @@ -389,12 +389,12 @@ func TestSelectionFenceFillsCores(t *testing.T) {
}
}

selected, err := cpu.Selection(topo, &cli.Config{NThreads: 2, Numa: -2, Fence: true})
selection, err := cpu.Selection(topo, &cli.Config{NThreads: 2, Numa: -2, Fence: true})
if err != nil {
t.Fatalf("Selection: %v", err)
}
cores := map[int]bool{}
for cpuID := range selected.Task.All() {
for cpuID := range selection.Task.All() {
cores[topo.Core[cpuID]] = true
}
want := (2 + coreSize - 1) / coreSize
Expand Down
Loading