Skip to content

[WIP][benchmark] Flatten - Extended test family #20552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
palimondo wants to merge 8 commits into from
Closed

[WIP][benchmark] Flatten - Extended test family #20552

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1e7b28a
[benchmark] Adjust Driver’s console output format
palimondo Nov 13, 2018
e59cfbc
[benchmark] LogParser: Accept `-` in bench. names
palimondo Nov 13, 2018
bc47e8a
[benchmark] Flatten - Extended test family
palimondo Nov 13, 2018
3fd54b7
[benchmark] Flatten: fine-tuning and documentation
palimondo Nov 22, 2018
5c2c4e0
[benchmark] Flatten: materializeSequence
palimondo Nov 26, 2018
1fa9440
Merge branch 'master' into fluctuation-of-the-pupil
palimondo Feb 4, 2019
aefb507
Merge branch 'master' into fluctuation-of-the-pupil
palimondo Feb 24, 2019
b7eaa79
Merge branch 'master' into fluctuation-of-the-pupil
palimondo May 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions benchmark/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,13 @@ set(SWIFT_BENCH_MODULES
single-source/Exclusivity
single-source/ExistentialPerformance
single-source/Fibonacci
single-source/FlattenList
single-source/Flatten
single-source/FloatingPointPrinting
single-source/Hanoi
single-source/Hash
single-source/HashQuadratic
single-source/Histogram
single-source/InsertCharacter
single-source/InsertCharacter
single-source/Integrate
single-source/IterateData
single-source/Join
Expand Down
2 changes: 1 addition & 1 deletion benchmark/scripts/Benchmark_Driver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ class BenchmarkDriver(object):
with open(log_file, 'w') as f:
f.write(output)

RESULT = '{:>3} {:<25} {:>7} {:>7} {:>6} {:>10} {:>6} {:>7} {:>10}'
RESULT = '{:>3} {:<40} {:>7} {:>7} {:>6} {:>10} {:>6} {:>7} {:>10}'

def run_and_log(self, csv_console=True):
"""Run benchmarks and continuously log results to the console.
Expand Down
6 changes: 3 additions & 3 deletions benchmark/scripts/compare_perf_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,9 @@ def _reset(self):
# Parse lines like this
# #,TEST,SAMPLES,MIN(μs),MAX(μs),MEAN(μs),SD(μs),MEDIAN(μs)
results_re = re.compile(
r'( *\d+[, \t]+[\w.]+[, \t]+' + # #,TEST
r'[, \t]+'.join([r'\d+'] * 2) + # at least 2...
r'(?:[, \t]+\d*)*)') # ...or more numeric columns
r'( *\d+[, \t]+[\w.\-]+[, \t]+' + # #,TEST
r'[, \t]+'.join([r'\d+'] * 2) + # at least 2...
r'(?:[, \t]+\d*)*)') # ...or more numeric columns

def _append_result(self, result):
columns = result.split(',') if ',' in result else result.split()
Expand Down
8 changes: 4 additions & 4 deletions benchmark/scripts/test_Benchmark_Driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,10 +323,10 @@ def mock_run(test):
self.assertEquals(log, header + csv_log)
self.assertEquals(
out.getvalue(),
' # TEST SAMPLES MIN(μs) Q1(μs)' +
' MEDIAN(μs) Q3(μs) MAX(μs) MAX_RSS(B)\n' +
' 3 b1 5 101 102' +
' 103 104 105 888\n' +
' # TEST SAMPLES MIN(μs)' +
' Q1(μs) MEDIAN(μs) Q3(μs) MAX(μs) MAX_RSS(B)\n' +
' 3 b1 5 101' +
' 102 103 104 105 888\n' +
'\n' +
'Total performance tests executed: 1\n')

Expand Down
5 changes: 3 additions & 2 deletions benchmark/scripts/test_compare_perf_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,14 +445,15 @@ class TestLogParser(unittest.TestCase):
def test_parse_results_csv(self):
"""Ignores uknown lines, extracts data from supported formats."""
log = """#,TEST,SAMPLES,MIN(us),MAX(us),MEAN(us),SD(us),MEDIAN(us)
34,BitCount,20,3,4,4,0,4
34,Flatten.Array.Tuple4.lazy.for-in.Reserve,20,3,4,4,0,4

Total performance tests executed: 1
"""
parser = LogParser()
results = parser.parse_results(log.splitlines())
self.assertTrue(isinstance(results[0], PerformanceTestResult))
self.assertEquals(results[0].name, 'BitCount')
self.assertEquals(results[0].name,
'Flatten.Array.Tuple4.lazy.for-in.Reserve')

def test_parse_results_tab_delimited(self):
log = '34\tBitCount\t20\t3\t4\t4\t0\t4'
Expand Down
Loading