Merge pull request #4993 from gottesmm/small_generate_harness_improvements

Small generate harness improvements

Author: gottesmm

benchmark/CMakeLists.txt

@@ -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
@@ -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
@@ -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

benchmark/scripts/generate_harness/generate_harness.py

@@ -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):

benchmark/utils/main.swift

@@ -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,
@@ -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,
@@ -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,
@@ -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,