Skip to content

Small generate harness improvements #4993

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

Merged
merged 3 commits into from
Sep 24, 2016
Merged

Small generate harness improvements #4993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff634f6
[benchmarks] Make generate_harness.py executable.
gottesmm Sep 24, 2016
6c97be8
[benchmark] Sort tests so that after generate_harness.py is rerun we …
gottesmm Sep 24, 2016
dc64594
[benchmark][generate-harness] When generating the CMakeLists.txt file…
gottesmm Sep 24, 2016
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
14 changes: 7 additions & 7 deletions benchmark/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ set(SWIFT_BENCH_MODULES
single-source/Chars
single-source/ClassArrayGetter
single-source/DeadArray
single-source/DictTest
single-source/DictTest2
single-source/DictTest3
single-source/DictionaryBridge
single-source/DictionaryLiteral
single-source/DictionaryRemove
single-source/DictionarySwap
single-source/DictTest
single-source/DictTest2
single-source/DictTest3
single-source/ErrorHandling
single-source/Fibonacci
single-source/GlobalClass
Expand All @@ -59,10 +59,10 @@ set(SWIFT_BENCH_MODULES
single-source/Memset
single-source/MonteCarloE
single-source/MonteCarloPi
single-source/NopDeinit
single-source/NSDictionaryCastToSwift
single-source/NSError
single-source/NSStringConversion
single-source/NopDeinit
single-source/ObjectAllocation
single-source/OpenClose
single-source/Phonebook
Expand All @@ -72,22 +72,22 @@ set(SWIFT_BENCH_MODULES
single-source/Prims
single-source/ProtocolDispatch
single-source/ProtocolDispatch2
single-source/RangeAssignment
single-source/RC4
single-source/RecursiveOwnedParameter
single-source/RGBHistogram
single-source/RangeAssignment
single-source/RecursiveOwnedParameter
single-source/SetTests
single-source/SevenBoom
single-source/Sim2DArray
single-source/SortLettersInPlace
single-source/SortStrings
single-source/StaticArray
single-source/StrComplexWalk
single-source/StrToInt
single-source/StringBuilder
single-source/StringInterpolation
single-source/StringTests
single-source/StringWalk
single-source/StrToInt
single-source/SuperChars
single-source/TwoSum
single-source/TypeFlood
Expand Down
4 changes: 2 additions & 2 deletions benchmark/scripts/generate_harness/generate_harness.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@

if __name__ == '__main__':
# CMakeList single-source
tests = [os.path.basename(x).split('.')[0]
for x in glob.glob(os.path.join(single_source_dir, '*.swift'))]
test_files = glob.glob(os.path.join(single_source_dir, '*.swift'))
tests = sorted(os.path.basename(x).split('.')[0] for x in test_files)

# CMakeList multi-source
class MultiSourceBench(object):
Expand Down
44 changes: 22 additions & 22 deletions benchmark/utils/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,13 @@ precommitTests = [
"ClassArrayGetter": run_ClassArrayGetter,
"DeadArray": run_DeadArray,
"Dictionary": run_Dictionary,
"DictionaryOfObjects": run_DictionaryOfObjects,
"Dictionary2": run_Dictionary2,
"Dictionary2OfObjects": run_Dictionary2OfObjects,
"Dictionary3": run_Dictionary3,
"Dictionary3OfObjects": run_Dictionary3OfObjects,
"DictionaryBridge": run_DictionaryBridge,
"DictionaryLiteral": run_DictionaryLiteral,
"DictionaryOfObjects": run_DictionaryOfObjects,
"DictionaryRemove": run_DictionaryRemove,
"DictionaryRemoveOfObjects": run_DictionaryRemoveOfObjects,
"DictionarySwap": run_DictionarySwap,
Expand All @@ -154,42 +154,42 @@ precommitTests = [
"NSStringConversion": run_NSStringConversion,
"NopDeinit": run_NopDeinit,
"ObjectAllocation": run_ObjectAllocation,
"ObjectiveCBridgeFromNSString": run_ObjectiveCBridgeFromNSString,
"ObjectiveCBridgeFromNSStringForced": run_ObjectiveCBridgeFromNSStringForced,
"ObjectiveCBridgeToNSString": run_ObjectiveCBridgeToNSString,
"ObjectiveCBridgeFromNSArrayAnyObject": run_ObjectiveCBridgeFromNSArrayAnyObject,
"ObjectiveCBridgeFromNSArrayAnyObjectForced": run_ObjectiveCBridgeFromNSArrayAnyObjectForced,
"ObjectiveCBridgeToNSArray": run_ObjectiveCBridgeToNSArray,
"ObjectiveCBridgeFromNSArrayAnyObjectToString": run_ObjectiveCBridgeFromNSArrayAnyObjectToString,
"ObjectiveCBridgeFromNSArrayAnyObjectToStringForced": run_ObjectiveCBridgeFromNSArrayAnyObjectToStringForced,
"ObjectiveCBridgeFromNSDictionaryAnyObject": run_ObjectiveCBridgeFromNSDictionaryAnyObject,
"ObjectiveCBridgeFromNSDictionaryAnyObjectForced": run_ObjectiveCBridgeFromNSDictionaryAnyObjectForced,
"ObjectiveCBridgeFromNSDictionaryAnyObjectToString": run_ObjectiveCBridgeFromNSDictionaryAnyObjectToString,
"ObjectiveCBridgeFromNSDictionaryAnyObjectToStringForced": run_ObjectiveCBridgeFromNSDictionaryAnyObjectToStringForced,
"ObjectiveCBridgeToNSDictionary": run_ObjectiveCBridgeToNSDictionary,
"ObjectiveCBridgeFromNSSetAnyObject": run_ObjectiveCBridgeFromNSSetAnyObject,
"ObjectiveCBridgeFromNSSetAnyObjectForced": run_ObjectiveCBridgeFromNSSetAnyObjectForced,
"ObjectiveCBridgeFromNSSetAnyObjectToString": run_ObjectiveCBridgeFromNSSetAnyObjectToString,
"ObjectiveCBridgeFromNSSetAnyObjectToStringForced": run_ObjectiveCBridgeFromNSSetAnyObjectToStringForced,
"ObjectiveCBridgeToNSSet": run_ObjectiveCBridgeToNSSet,
"ObjectiveCBridgeStubFromNSString": run_ObjectiveCBridgeStubFromNSString,
"ObjectiveCBridgeStubFromNSStringRef": run_ObjectiveCBridgeStubFromNSStringRef,
"ObjectiveCBridgeStubToNSString": run_ObjectiveCBridgeStubToNSString,
"ObjectiveCBridgeStubToNSStringRef": run_ObjectiveCBridgeStubToNSStringRef,
"ObjectiveCBridgeFromNSString": run_ObjectiveCBridgeFromNSString,
"ObjectiveCBridgeFromNSStringForced": run_ObjectiveCBridgeFromNSStringForced,
"ObjectiveCBridgeStubDataAppend": run_ObjectiveCBridgeStubDataAppend,
"ObjectiveCBridgeStubDateAccess": run_ObjectiveCBridgeStubDateAccess,
"ObjectiveCBridgeStubDateMutation": run_ObjectiveCBridgeStubDateMutation,
"ObjectiveCBridgeStubFromArrayOfNSString": run_ObjectiveCBridgeStubFromArrayOfNSString,
"ObjectiveCBridgeStubToArrayOfNSString": run_ObjectiveCBridgeStubToArrayOfNSString,
"ObjectiveCBridgeStubFromNSDate": run_ObjectiveCBridgeStubFromNSDate,
"ObjectiveCBridgeStubFromNSDateRef": run_ObjectiveCBridgeStubFromNSDateRef,
"ObjectiveCBridgeStubFromNSString": run_ObjectiveCBridgeStubFromNSString,
"ObjectiveCBridgeStubFromNSStringRef": run_ObjectiveCBridgeStubFromNSStringRef,
"ObjectiveCBridgeStubNSDataAppend": run_ObjectiveCBridgeStubNSDataAppend,
"ObjectiveCBridgeStubNSDateMutationRef": run_ObjectiveCBridgeStubNSDateMutationRef,
"ObjectiveCBridgeStubNSDateRefAccess": run_ObjectiveCBridgeStubNSDateRefAccess,
"ObjectiveCBridgeStubToArrayOfNSString": run_ObjectiveCBridgeStubToArrayOfNSString,
"ObjectiveCBridgeStubToNSDate": run_ObjectiveCBridgeStubToNSDate,
"ObjectiveCBridgeStubToNSDateRef": run_ObjectiveCBridgeStubToNSDateRef,
"ObjectiveCBridgeStubDateAccess": run_ObjectiveCBridgeStubDateAccess,
"ObjectiveCBridgeStubNSDateRefAccess": run_ObjectiveCBridgeStubNSDateRefAccess,
"ObjectiveCBridgeStubDateMutation": run_ObjectiveCBridgeStubDateMutation,
"ObjectiveCBridgeStubNSDateMutationRef": run_ObjectiveCBridgeStubNSDateMutationRef,
"ObjectiveCBridgeStubToNSString": run_ObjectiveCBridgeStubToNSString,
"ObjectiveCBridgeStubToNSStringRef": run_ObjectiveCBridgeStubToNSStringRef,
"ObjectiveCBridgeStubURLAppendPath": run_ObjectiveCBridgeStubURLAppendPath,
"ObjectiveCBridgeStubURLAppendPathRef": run_ObjectiveCBridgeStubURLAppendPathRef,
"ObjectiveCBridgeStubDataAppend": run_ObjectiveCBridgeStubDataAppend,
"ObjectiveCBridgeStubNSDataAppend": run_ObjectiveCBridgeStubNSDataAppend,
"ObjectiveCBridgeToNSArray": run_ObjectiveCBridgeToNSArray,
"ObjectiveCBridgeToNSDictionary": run_ObjectiveCBridgeToNSDictionary,
"ObjectiveCBridgeToNSSet": run_ObjectiveCBridgeToNSSet,
"ObjectiveCBridgeToNSString": run_ObjectiveCBridgeToNSString,
"OpenClose": run_OpenClose,
"Phonebook": run_Phonebook,
"PolymorphicCalls": run_PolymorphicCalls,
Expand All @@ -205,12 +205,12 @@ precommitTests = [
"RangeAssignment": run_RangeAssignment,
"RecursiveOwnedParameter": run_RecursiveOwnedParameter,
"SetExclusiveOr": run_SetExclusiveOr,
"SetIntersect": run_SetIntersect,
"SetIsSubsetOf": run_SetIsSubsetOf,
"SetUnion": run_SetUnion,
"SetExclusiveOr_OfObjects": run_SetExclusiveOr_OfObjects,
"SetIntersect": run_SetIntersect,
"SetIntersect_OfObjects": run_SetIntersect_OfObjects,
"SetIsSubsetOf": run_SetIsSubsetOf,
"SetIsSubsetOf_OfObjects": run_SetIsSubsetOf_OfObjects,
"SetUnion": run_SetUnion,
"SetUnion_OfObjects": run_SetUnion_OfObjects,
"SevenBoom": run_SevenBoom,
"Sim2DArray": run_Sim2DArray,
Expand All @@ -223,11 +223,11 @@ precommitTests = [
"StrToInt": run_StrToInt,
"StringBuilder": run_StringBuilder,
"StringEqualPointerComparison": run_StringEqualPointerComparison,
"StringInterpolation": run_StringInterpolation,
"StringHasPrefix": run_StringHasPrefix,
"StringHasPrefixUnicode": run_StringHasPrefixUnicode,
"StringHasSuffix": run_StringHasSuffix,
"StringHasSuffixUnicode": run_StringHasSuffixUnicode,
"StringInterpolation": run_StringInterpolation,
"StringWalk": run_StringWalk,
"StringWithCString": run_StringWithCString,
"SuperChars": run_SuperChars,
Expand Down