Add a -focus flag.

This commit is contained in:
Nigel Tao committed 2017-11-03 17:54:29 +11:00
1 parent e3643574d7
commit 1487da7af8
7 files changed
+184 -94

No files matched your search

+11
View File
@@ -50,4 +50,15 @@ func main1() error {
const (
ccompilersDefault = "clang,gcc"
ccompilersUsage = `comma-separated list of C compilers, e.g. "clang,gcc"`
focusDefault = ""
focusUsage = `comma-separated list of tests or benchmarks to focus on, e.g. "bench_puffs_gif_decode_10k"`
mimicDefault = false
mimicUsage = `whether to compare Puffs' output with other libraries' output`
repsDefault = 5
repsMin = 0
repsMax = 1000000
repsUsage = `the number of repetitions per benchmark`
)
+26 -13
View File
@@ -25,36 +25,46 @@ import (
"strings"
)
func isStringList(s string) bool {
for i := 0; i < len(s); i++ {
c := s[i]
if c == ',' || c == '-' || c == '.' || ('0' <= c && c <= '9') || c == '_' || ('a' <= c && c <= 'z') {
continue
}
return false
}
return true
}
func doBench(args []string) error { return doBenchTest(args, true) }
func doTest(args []string) error { return doBenchTest(args, false) }
func doBenchTest(args []string, bench bool) error {
const (
mimicDefault = false
mimicUsage = `whether to compare Puffs' output with other libraries' output`
repsDefault = 5
repsMin = 0
repsMax = 1000000
repsUsage = `the number of repetitions per benchmark`
)
flags := flag.FlagSet{}
ccompilersFlag := flags.String("ccompilers", ccompilersDefault, ccompilersUsage)
focusFlag := flags.String("focus", focusDefault, focusUsage)
mimicFlag := flags.Bool("mimic", mimicDefault, mimicUsage)
repsFlag := flags.Int("reps", repsDefault, repsUsage)
if err := flags.Parse(args); err != nil {
return err
}
args = flags.Args()
if !isStringList(*ccompilersFlag) {
return fmt.Errorf("bad -ccompilers flag value %q", *ccompilersFlag)
}
if !isStringList(*focusFlag) {
return fmt.Errorf("bad -focus flag value %q", *focusFlag)
}
if *repsFlag < repsMin || repsMax < *repsFlag {
return fmt.Errorf("bad -reps flag value %d, outside the range [%d..%d]", *repsFlag, repsMin, repsMax)
}
args = flags.Args()
failed := false
for _, arg := range args {
f, err := doBenchTest1(arg, bench, *ccompilersFlag, *mimicFlag, *repsFlag)
f, err := doBenchTest1(arg, bench, *ccompilersFlag, *focusFlag, *mimicFlag, *repsFlag)
if err != nil {
return err
}
@@ -70,7 +80,7 @@ func doBenchTest(args []string, bench bool) error {
return nil
}
func doBenchTest1(filename string, bench bool, ccompilers string, mimic bool, reps int) (failed bool, err error) {
func doBenchTest1(filename string, bench bool, ccompilers string, focus string, mimic bool, reps int) (failed bool, err error) {
workDir, err := ioutil.TempDir("", "puffs-c")
if err != nil {
return false, err
@@ -113,6 +123,9 @@ func doBenchTest1(filename string, bench bool, ccompilers string, mimic bool, re
if bench {
outArgs = append(outArgs, "-bench", fmt.Sprintf("-reps=%d", reps))
}
if focus != "" {
outArgs = append(outArgs, fmt.Sprintf("-focus=%s", focus))
}
outCmd := exec.Command(out, outArgs...)
outCmd.Stdout = os.Stdout
outCmd.Stderr = os.Stderr
+3
View File
@@ -121,6 +121,9 @@ const (
ccompilersDefault = "clang,gcc"
ccompilersUsage = `comma-separated list of C compilers, e.g. "clang,gcc"`
focusDefault = ""
focusUsage = `comma-separated list of tests or benchmarks to focus on, e.g. "bench_puffs_gif_decode_10k"`
langsDefault = "c"
langsUsage = `comma-separated list of target languages (file extensions), e.g. "c,go,rs"`
+25 -1
View File
@@ -23,26 +23,47 @@ import (
"strings"
)
func isStringList(s string) bool {
for i := 0; i < len(s); i++ {
c := s[i]
if c == ',' || c == '-' || c == '.' || ('0' <= c && c <= '9') || c == '_' || ('a' <= c && c <= 'z') {
continue
}
return false
}
return true
}
func doBench(puffsRoot string, args []string) error { return doBenchTest(puffsRoot, args, true) }
func doTest(puffsRoot string, args []string) error { return doBenchTest(puffsRoot, args, false) }
func doBenchTest(puffsRoot string, args []string, bench bool) error {
flags := flag.NewFlagSet("test", flag.ExitOnError)
ccompilersFlag := flags.String("ccompilers", ccompilersDefault, ccompilersUsage)
focusFlag := flags.String("focus", focusDefault, focusUsage)
langsFlag := flags.String("langs", langsDefault, langsUsage)
mimicFlag := flags.Bool("mimic", mimicDefault, mimicUsage)
repsFlag := flags.Int("reps", repsDefault, repsUsage)
skipgenFlag := flags.Bool("skipgen", skipgenDefault, skipgenUsage)
if err := flags.Parse(args); err != nil {
return err
}
langs, err := parseLangs(*langsFlag)
if err != nil {
return err
}
if !isStringList(*ccompilersFlag) {
return fmt.Errorf("bad -ccompilers flag value %q", *ccompilersFlag)
}
if !isStringList(*focusFlag) {
return fmt.Errorf("bad -focus flag value %q", *focusFlag)
}
if *repsFlag < repsMin || repsMax < *repsFlag {
return fmt.Errorf("bad -reps flag value %d, outside the range [%d..%d]", *repsFlag, repsMin, repsMax)
}
args = flags.Args()
if len(args) == 0 {
args = []string{"std/..."}
@@ -54,6 +75,9 @@ func doBenchTest(puffsRoot string, args []string, bench bool) error {
} else {
cmdArgs = append(cmdArgs, "test")
}
if *focusFlag != "" {
cmdArgs = append(cmdArgs, fmt.Sprintf("-focus=%s", *focusFlag))
}
if *mimicFlag {
cmdArgs = append(cmdArgs, "-mimic")
}
@@ -137,7 +161,7 @@ func (b *btHelper) benchTestDir(dirname string) (failed bool, err error) {
args := []string(nil)
args = append(args, b.cmdArgs...)
if lang == "c" {
args = append(args, "-ccompilers", b.ccompilers)
args = append(args, fmt.Sprintf("-ccompilers=%s", b.ccompilers))
}
args = append(args, filepath.Join(b.puffsRoot, "test", lang, filepath.FromSlash(dirname)))
cmd := exec.Command(command, args...)