Add an iterscale flag

This commit is contained in:
Nigel Tao committed 2018-05-04 17:17:59 +10:00
1 parent bd71c2d9fd
commit ba98b04307
10 files changed
+97 -47

No files matched your search

+5
View File
@@ -32,6 +32,11 @@ const (
FocusDefault = ""
FocusUsage = `comma-separated list of tests or benchmarks (name prefixes) to focus on, e.g. "wuffs_gif_decode"`
IterscaleDefault = 100
IterscaleMin = 0
IterscaleMax = 1000000
IterscaleUsage = `a scaling factor for the number of iterations per benchmark`
MimicDefault = false
MimicUsage = `whether to compare Wuffs' output with other libraries' output`
+16 -4
View File
@@ -34,6 +34,7 @@ func doBenchTest(args []string, bench bool) error {
flags := flag.FlagSet{}
ccompilersFlag := flags.String("ccompilers", cf.CcompilersDefault, cf.CcompilersUsage)
focusFlag := flags.String("focus", cf.FocusDefault, cf.FocusUsage)
iterscaleFlag := flags.Int("iterscale", cf.RepsDefault, cf.RepsUsage)
mimicFlag := flags.Bool("mimic", cf.MimicDefault, cf.MimicUsage)
repsFlag := flags.Int("reps", cf.RepsDefault, cf.RepsUsage)
@@ -47,15 +48,21 @@ func doBenchTest(args []string, bench bool) error {
if !cf.IsAlphaNumericIsh(*focusFlag) {
return fmt.Errorf("bad -focus flag value %q", *focusFlag)
}
if *iterscaleFlag < cf.IterscaleMin || cf.IterscaleMax < *iterscaleFlag {
return fmt.Errorf("bad -iterscale flag value %d, outside the range [%d..%d]",
*iterscaleFlag, cf.IterscaleMin, cf.IterscaleMax)
}
if *repsFlag < cf.RepsMin || cf.RepsMax < *repsFlag {
return fmt.Errorf("bad -reps flag value %d, outside the range [%d..%d]", *repsFlag, cf.RepsMin, cf.RepsMax)
return fmt.Errorf("bad -reps flag value %d, outside the range [%d..%d]",
*repsFlag, cf.RepsMin, cf.RepsMax)
}
args = flags.Args()
failed := false
for _, arg := range args {
f, err := doBenchTest1(arg, bench, *ccompilersFlag, *focusFlag, *mimicFlag, *repsFlag)
f, err := doBenchTest1(arg, bench,
*ccompilersFlag, *focusFlag, *iterscaleFlag, *mimicFlag, *repsFlag)
if err != nil {
return err
}
@@ -71,7 +78,9 @@ func doBenchTest(args []string, bench bool) error {
return nil
}
func doBenchTest1(filename string, bench bool, ccompilers string, focus string, mimic bool, reps int) (failed bool, err error) {
func doBenchTest1(filename string, bench bool, ccompilers string, focus string,
iterscale int, mimic bool, reps int) (failed bool, err error) {
workDir, err := ioutil.TempDir("", "wuffs-c")
if err != nil {
return false, err
@@ -112,7 +121,10 @@ func doBenchTest1(filename string, bench bool, ccompilers string, focus string,
outArgs := []string(nil)
if bench {
outArgs = append(outArgs, "-bench", fmt.Sprintf("-reps=%d", reps))
outArgs = append(outArgs, "-bench",
fmt.Sprintf("-iterscale=%d", iterscale),
fmt.Sprintf("-reps=%d", reps),
)
}
if focus != "" {
outArgs = append(outArgs, fmt.Sprintf("-focus=%s", focus))
+11 -2
View File
@@ -33,6 +33,7 @@ func doBenchTest(wuffsRoot string, args []string, bench bool) error {
ccompilersFlag := flags.String("ccompilers", cf.CcompilersDefault, cf.CcompilersUsage)
cformatterFlag := flags.String("cformatter", cf.CformatterDefault, cf.CformatterUsage)
focusFlag := flags.String("focus", cf.FocusDefault, cf.FocusUsage)
iterscaleFlag := flags.Int("iterscale", cf.RepsDefault, cf.RepsUsage)
langsFlag := flags.String("langs", langsDefault, langsUsage)
mimicFlag := flags.Bool("mimic", cf.MimicDefault, cf.MimicUsage)
repsFlag := flags.Int("reps", cf.RepsDefault, cf.RepsUsage)
@@ -56,8 +57,13 @@ func doBenchTest(wuffsRoot string, args []string, bench bool) error {
if !cf.IsAlphaNumericIsh(*focusFlag) {
return fmt.Errorf("bad -focus flag value %q", *focusFlag)
}
if *iterscaleFlag < cf.IterscaleMin || cf.IterscaleMax < *iterscaleFlag {
return fmt.Errorf("bad -iterscale flag value %d, outside the range [%d..%d]",
*iterscaleFlag, cf.IterscaleMin, cf.IterscaleMax)
}
if *repsFlag < cf.RepsMin || cf.RepsMax < *repsFlag {
return fmt.Errorf("bad -reps flag value %d, outside the range [%d..%d]", *repsFlag, cf.RepsMin, cf.RepsMax)
return fmt.Errorf("bad -reps flag value %d, outside the range [%d..%d]",
*repsFlag, cf.RepsMin, cf.RepsMax)
}
args = flags.Args()
@@ -67,7 +73,10 @@ func doBenchTest(wuffsRoot string, args []string, bench bool) error {
cmdArgs := []string(nil)
if bench {
cmdArgs = append(cmdArgs, "bench", fmt.Sprintf("-reps=%d", *repsFlag))
cmdArgs = append(cmdArgs, "bench",
fmt.Sprintf("-iterscale=%d", *iterscaleFlag),
fmt.Sprintf("-reps=%d", *repsFlag),
)
} else {
cmdArgs = append(cmdArgs, "test")
}