From 4f6df9492b03a020775dfa6e788ecf914373fccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Stemmer?= Date: Sat, 5 Oct 2019 20:00:48 +0100 Subject: [PATCH] gtr, parser/gotest: Add test 130 --- pkg/gtr/event.go | 1 + pkg/parser/gotest/gotest.go | 13 +++++++------ pkg/parser/gotest/gotest_test.go | 11 ++++++++++- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/pkg/gtr/event.go b/pkg/gtr/event.go index afa15fb..6717ba8 100644 --- a/pkg/gtr/event.go +++ b/pkg/gtr/event.go @@ -47,6 +47,7 @@ type Event struct { // Benchmarks Iterations int64 NsPerOp float64 + MBPerSec float64 BytesPerOp int64 AllocsPerOp int64 } diff --git a/pkg/parser/gotest/gotest.go b/pkg/parser/gotest/gotest.go index e15af6d..b82bf91 100644 --- a/pkg/parser/gotest/gotest.go +++ b/pkg/parser/gotest/gotest.go @@ -14,8 +14,8 @@ import ( ) var ( - // regexBenchmark captures 3-5 groups: benchmark name, number of times ran, ns/op (with or without decimal), B/op (optional), and allocs/op (optional). - regexBenchmark = regexp.MustCompile(`^(Benchmark[^ -]+)(?:-\d+\s+|\s+)(\d+)\s+(\d+|\d+\.\d+)\sns\/op(?:\s+(\d+)\sB\/op)?(?:\s+(\d+)\sallocs/op)?`) + // regexBenchmark captures 3-5 groups: benchmark name, number of times ran, ns/op (with or without decimal), MB/sec (optional), B/op (optional), and allocs/op (optional). + regexBenchmark = regexp.MustCompile(`^(Benchmark[^ -]+)(?:-\d+\s+|\s+)(\d+)\s+(\d+|\d+\.\d+)\sns\/op(?:\s+(\d+|\d+\.\d+)\sMB\/s)?(?:\s+(\d+)\sB\/op)?(?:\s+(\d+)\sallocs/op)?`) regexCoverage = regexp.MustCompile(`^coverage:\s+(\d+|\d+\.\d+)%\s+of\s+statements(?:\sin\s(.+))?$`) regexEndTest = regexp.MustCompile(`((?: )*)--- (PASS|FAIL|SKIP): ([^ ]+) \((\d+\.\d+)(?: seconds|s)\)`) regexStatus = regexp.MustCompile(`^(PASS|FAIL|SKIP)$`) @@ -52,8 +52,8 @@ func (p *parser) parseLine(line string) { p.summary(matches[1], matches[2], matches[3], matches[4], matches[5], matches[6]) } else if matches := regexCoverage.FindStringSubmatch(line); len(matches) == 3 { p.coverage(matches[1], matches[2]) - } else if matches := regexBenchmark.FindStringSubmatch(line); len(matches) == 6 { - p.benchmark(matches[1], matches[2], matches[3], matches[4], matches[5]) + } else if matches := regexBenchmark.FindStringSubmatch(line); len(matches) == 7 { + p.benchmark(matches[1], matches[2], matches[3], matches[4], matches[5], matches[6]) } else { p.output(line) } @@ -113,12 +113,13 @@ func (p *parser) coverage(percent, packages string) { }) } -func (p *parser) benchmark(name, iterations, timePerOp, bytesPerOp, allocsPerOp string) { +func (p *parser) benchmark(name, iterations, nsPerOp, mbPerSec, bytesPerOp, allocsPerOp string) { p.add(gtr.Event{ Type: "benchmark", Name: name, Iterations: parseInt(iterations), - NsPerOp: parseFloat(timePerOp), + NsPerOp: parseFloat(nsPerOp), + MBPerSec: parseFloat(mbPerSec), BytesPerOp: parseInt(bytesPerOp), AllocsPerOp: parseInt(allocsPerOp), }) diff --git a/pkg/parser/gotest/gotest_test.go b/pkg/parser/gotest/gotest_test.go index 5576ecc..0e47296 100644 --- a/pkg/parser/gotest/gotest_test.go +++ b/pkg/parser/gotest/gotest_test.go @@ -559,7 +559,16 @@ var tests = []struct { {Type: "output", Data: "panic: panic"}, {Type: "summary", Result: "FAIL", Name: "github.com/jstemmer/test/failedsummary", Duration: 5 * time.Millisecond}, }}, - {"130-bench-mb", []gtr.Event{}}, + {"130-bench-mb", + []gtr.Event{ + {Type: "output", Data: "goos: linux"}, + {Type: "output", Data: "goarch: amd64"}, + {Type: "output", Data: "pkg: compress/flate"}, + {Type: "benchmark", Name: "BenchmarkDecode/Digits/Huffman/1e4", Iterations: 10000, NsPerOp: 104427, MBPerSec: 95.76, BytesPerOp: 40629, AllocsPerOp: 5}, + {Type: "benchmark", Name: "BenchmarkEncode/Digits/Huffman/1e4", Iterations: 50000, NsPerOp: 28334, MBPerSec: 352.93}, + {Type: "status", Result: "PASS"}, + {Type: "summary", Result: "ok", Name: "compress/flate", Duration: 83202 * time.Millisecond}, + }}, {"131-whitespace", []gtr.Event{ {Type: "run_test", Name: "TestFlat"},