repeat.v: implement a --series option

.github/workflows/ci.yml

@@ -39,9 +39,9 @@ jobs:
     - name: Build the repeat tool
       run: ./v cmd/tools/repeat.v
     - name: Repeat -o v.c cmd/v
-      run: cmd/tools/repeat --count 10 --warmup 3 --fail_percent 10 './v -show-timings -o v.c cmd/v' './vmaster/v -show-timings -o v.c cmd/v'
+      run: cmd/tools/repeat --series 2 --count 10 --warmup 3 --fail_percent 10 './v -show-timings -o v.c cmd/v' './vmaster/v -show-timings -o v.c cmd/v'
     - name: Repeat -o hw.c examples/hello_world.v
-      run: cmd/tools/repeat --count 10 --warmup 3 --fail_percent 10 './v -show-timings -o hw.c examples/hello_world.v' './vmaster/v -show-timings -o hw.c examples/hello_world.v'
+      run: cmd/tools/repeat --series 2 --count 10 --warmup 3 --fail_percent 10 './v -show-timings -o hw.c examples/hello_world.v' './vmaster/v -show-timings -o hw.c examples/hello_world.v'
 
   ubuntu-tcc:
     runs-on: ubuntu-18.04

cmd/tools/repeat.v

@@ -22,6 +22,7 @@ mut:
 struct Context {
 mut:
 	count int
+	series int
 	warmup int
 	show_help bool
 	show_result bool
@@ -84,12 +85,13 @@ fn (mut context Context) parse_options() {
 	mut fp := flag.new_flag_parser(os.args)
 	fp.application(os.file_name(os.executable()))
 	fp.version('0.0.1')
-	fp.description('Repeat command(s) and collect statistics. NB: you have to quote each command.')
+	fp.description('Repeat command(s) and collect statistics. NB: you have to quote each command, if it contains spaces.')
 	fp.arguments_description('CMD1 CMD2 ...')
 	fp.skip_executable()
 	fp.limit_free_args_to_at_least(1)
-	context.count = fp.int('count', `c`, 10, 'Repetition count')
+	context.count = fp.int('count', `c`, 10, 'Repetition count.')
-	context.warmup = fp.int('warmup', `w`, 2, 'Warmup runs')
+	context.series = fp.int('series', `s`, 2, 'Series count. `-s 2 -c 4 a b` => aaaabbbbaaaabbbb, while `-s 3 -c 2 a b` => aabbaabbaabb.')
+	context.warmup = fp.int('warmup', `w`, 2, 'Warmup runs. These are done *only at the start*, and are ignored.')
 	context.show_help = fp.bool('help', `h`, false, 'Show this help screen.')
 	context.verbose = fp.bool('verbose', `v`, false, 'Be more verbose.')
 	context.fail_on_regress_percent = fp.int('fail_percent', `f`, max_fail_percent, 'Fail with 1 exit code, when first cmd is X% slower than the rest (regression).')
@@ -113,19 +115,22 @@ fn (mut context Context) clear_line() {
 }
 
 fn (mut context Context) run() {
+	mut run_warmups := 0
+	for si in 1..context.series+1 {
 		for icmd, cmd in context.commands {
 			mut runs := 0
 			mut duration := 0
 			mut sum := 0
 			mut oldres := ''
-		println('Command: $cmd')
+			println('Series: ${si:4}/${context.series:-4}, command: $cmd')
-		if context.warmup > 0 {
+			if context.warmup > 0 && run_warmups < context.commands.len {
 				for i in 1..context.warmup+1 {
 					print('\r warming up run: ${i:4}/${context.warmup:-4} for ${cmd:-50s} took ${duration:6} ms ...')
 					mut sw := time.new_stopwatch({})
 					os.exec(cmd) or { continue }
 					duration = int(sw.elapsed().milliseconds())
 				}
+				run_warmups++
 			}
 			context.clear_line()
 			for i in 1..(context.count+1) {
@@ -176,6 +181,7 @@ fn (mut context Context) run() {
 			context.results[icmd].summary = summary
 			//println('')
 		}
+	}
 }
 fn (mut context Context) show_diff_summary() {
 	context.results.sort_with_compare(fn (a, b &CmdResult) int {
@@ -187,7 +193,7 @@ fn (mut context Context) show_diff_summary() {
 		}
 		return 0
 	})
-	println('Summary (commands are ordered by ascending mean time), after $context.count repeats:')
+	println('Summary (commands are ordered by ascending mean time), after $context.series series of $context.count repetitions:')
 	base := context.results[0].atiming.average
 	mut first_cmd_percentage := f64(100.0)
 	for i, r in context.results {