averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[benchmark] B_D iterations => independent-samples

Browse Source 
Renamed Benchmark_Driver’s `iterations` argument to `independent-samples` to clarify its true meaning and  disambiguate it from the concept of `num-iters` used in Benchmark_O. The short form of the argument — `-i` — remains unchanged.
This commit is contained in:
Pavol Vaskovic
2018-10-10 19:05:32 +02:00
parent 67b489dcb1
commit 0438c45e2d
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake
View File

@@ -701,11 +701,11 @@ function(swift_benchmark_compile)
COMMAND "${swift-bin-dir}/Benchmark_Driver" "run" COMMAND "${swift-bin-dir}/Benchmark_Driver" "run"
"-o" "O" "--output-dir" "${CMAKE_CURRENT_BINARY_DIR}/logs" "-o" "O" "--output-dir" "${CMAKE_CURRENT_BINARY_DIR}/logs"
"--swift-repo" "${SWIFT_SOURCE_DIR}" "--swift-repo" "${SWIFT_SOURCE_DIR}"
"--iterations" "${SWIFT_BENCHMARK_NUM_O_ITERATIONS}" "--independent-samples" "${SWIFT_BENCHMARK_NUM_O_ITERATIONS}"
COMMAND "${swift-bin-dir}/Benchmark_Driver" "run" COMMAND "${swift-bin-dir}/Benchmark_Driver" "run"
"-o" "Onone" "--output-dir" "${CMAKE_CURRENT_BINARY_DIR}/logs" "-o" "Onone" "--output-dir" "${CMAKE_CURRENT_BINARY_DIR}/logs"
"--swift-repo" "${SWIFT_SOURCE_DIR}" "--swift-repo" "${SWIFT_SOURCE_DIR}"
"--iterations" "${SWIFT_BENCHMARK_NUM_ONONE_ITERATIONS}" "--independent-samples" "${SWIFT_BENCHMARK_NUM_ONONE_ITERATIONS}"
COMMAND "${swift-bin-dir}/Benchmark_Driver" "compare" COMMAND "${swift-bin-dir}/Benchmark_Driver" "compare"
"--log-dir" "${CMAKE_CURRENT_BINARY_DIR}/logs" "--log-dir" "${CMAKE_CURRENT_BINARY_DIR}/logs"
"--swift-repo" "${SWIFT_SOURCE_DIR}" "--swift-repo" "${SWIFT_SOURCE_DIR}"

4
benchmark/scripts/Benchmark_Driver
View File

@@ -167,7 +167,7 @@ class BenchmarkDriver(object):
return reduce(merge_results, return reduce(merge_results,
[self.run(test, measure_memory=True) [self.run(test, measure_memory=True)
for _ in range(self.args.iterations)]) for _ in range(self.args.independent_samples)])
def log_results(self, output, log_file=None): def log_results(self, output, log_file=None):
"""Log output to `log_file`. """Log output to `log_file`.
@@ -603,7 +603,7 @@ def parse_args(args):
help='Run benchmarks and output results to stdout', help='Run benchmarks and output results to stdout',
parents=[shared_benchmarks_parser]) parents=[shared_benchmarks_parser])
run_parser.add_argument( run_parser.add_argument(
'-i', '--iterations', '-i', '--independent-samples',
help='number of times to run each test (default: 1)', help='number of times to run each test (default: 1)',
type=positive_int, default=1) type=positive_int, default=1)
run_parser.add_argument( run_parser.add_argument(

13
benchmark/scripts/test_Benchmark_Driver.py
View File

@@ -96,15 +96,16 @@ class Test_parse_args(unittest.TestCase):
"(choose from 'O', 'Onone', 'Osize')"], "(choose from 'O', 'Onone', 'Osize')"],
err.getvalue()) err.getvalue())
def test_iterations(self): def test_independent_samples(self):
self.assertEquals(parse_args(['run']).iterations, 1) self.assertEquals(parse_args(['run']).independent_samples, 1)
self.assertEquals(parse_args(['run', '-i', '3']).iterations, 3) self.assertEquals(parse_args(['run', '-i', '3']).independent_samples,
3)
with captured_output() as (out, err): with captured_output() as (out, err):
self.assertRaises(SystemExit, self.assertRaises(SystemExit,
parse_args, ['run', '-i', '-3']) parse_args, ['run', '-i', '-3'])
self.assert_contains( self.assert_contains(
['error:', ['error:', "argument -i/--independent-samples: " +
"argument -i/--iterations: invalid positive_int value: '-3'"], "invalid positive_int value: '-3'"],
err.getvalue()) err.getvalue())
def test_output_dir(self): def test_output_dir(self):
@@ -279,7 +280,7 @@ class TestBenchmarkDriverRunningTests(unittest.TestCase):
('/benchmarks/Benchmark_O', 'b', '--memory')) ('/benchmarks/Benchmark_O', 'b', '--memory'))
def test_run_benchmark_independent_samples(self): def test_run_benchmark_independent_samples(self):
self.driver.args.iterations = 3 self.driver.args.independent_samples = 3
r = self.driver.run_independent_samples('b1') r = self.driver.run_independent_samples('b1')
self.assertEquals(self.subprocess_mock.calls.count( self.assertEquals(self.subprocess_mock.calls.count(
('/benchmarks/Benchmark_O', 'b1', '--memory')), 3) ('/benchmarks/Benchmark_O', 'b1', '--memory')), 3)