Python3 compatibility for Benchmarks (#33039)

Three issues addressed here:

1. Dependency on dictionary iteration order

 CharacterProperties.swift.gyb iterated a dictionary to produce its output.
 Changed this to a list of tuples to ensure the order is predictable.

2. Python3 `map` returns an iterator, not a list

 Changed a bunch of `map` calls to `list(map(...))` to ensure the result is a list

3. Python3 `int()` expects a string, won't accept a list of characters

 Added a concatenation step that is effectively a no-op on Python2

Author: tbkka

benchmark/single-source/CharacterProperties.swift

@@ -52,27 +52,27 @@ extension Character {
   var firstScalar: UnicodeScalar { return unicodeScalars.first! }
 }
 
-% Properties = { "Alphanumeric": "alphanumerics", \
-%              "Capitalized": "capitalizedLetters", \
-%              "Control": "controlCharacters", \
-%              "Decimal": "decimalDigits", \
-%              "Letter": "letters", \
-%              "Lowercase": "lowercaseLetters", \
-%              "Uppercase": "uppercaseLetters", \
-%              "Newline": "newlines", \
-%              "Whitespace": "whitespaces", \
-%              "Punctuation": "punctuationCharacters" \
-%              }
+% Properties = [ ( "Alphanumeric", "alphanumerics"),
+%                ( "Capitalized", "capitalizedLetters"),
+%                ( "Control", "controlCharacters"),
+%                ( "Decimal", "decimalDigits"),
+%                ( "Letter", "letters"),
+%                ( "Lowercase", "lowercaseLetters"),
+%                ( "Uppercase", "uppercaseLetters"),
+%                ( "Newline", "newlines"),
+%                ( "Whitespace", "whitespaces"),
+%                ( "Punctuation", "punctuationCharacters")
+%              ]
 
 // Fetch the CharacterSet for every call
-% for Property, Set in Properties.items():
+% for Property, Set in Properties:
 func is${Property}(_ c: Character) -> Bool {
   return CharacterSet.${Set}.contains(c.firstScalar)
 }
 % end
 
 // Stash the set
-% for Property, Set in Properties.items():
+% for Property, Set in Properties:
 let ${Set} = CharacterSet.${Set}
 func is${Property}Stashed(_ c: Character) -> Bool {
   return ${Set}.contains(c.firstScalar)
@@ -81,13 +81,13 @@ func is${Property}Stashed(_ c: Character) -> Bool {
 
 func setupStash() {
   blackHole(workload)
-% for Property, Set in Properties.items():
+% for Property, Set in Properties:
     blackHole(${Set})
 % end
 }
 
 // Memoize the stashed set
-% for Property, Set in Properties.items():
+% for Property, Set in Properties:
 var ${Set}Memo = Set<UInt32>()
 func is${Property}StashedMemo(_ c: Character) -> Bool {
   let scalar = c.firstScalar
@@ -102,7 +102,7 @@ func is${Property}StashedMemo(_ c: Character) -> Bool {
 
 func setupMemo() {
   blackHole(workload)
-% for Property, Set in Properties.items():
+% for Property, Set in Properties:
     blackHole(${Set}Memo)
 % end
 }
@@ -130,7 +130,7 @@ func precompute(_ charSet: CharacterSet, capacity: Int) -> Set<UInt32> {
     capitalizedLetters=31
   )
 }%
-% for Property, Set in Properties.items():
+% for Property, Set in Properties:
 var ${Set}Precomputed: Set<UInt32> =
   precompute(${Set}, capacity: ${precomputed_capacity[Set]})
 func is${Property}Precomputed(_ c: Character) -> Bool {
@@ -140,7 +140,7 @@ func is${Property}Precomputed(_ c: Character) -> Bool {
 
 func setupPrecomputed() {
   blackHole(workload)
-% for Property, Set in Properties.items():
+% for Property, Set in Properties:
     blackHole(${Set}Precomputed)
 %#//    print("${Set}: \(${Set}Precomputed.count)")
 % end
@@ -171,7 +171,7 @@ let workload = """
 public func run_CharacterPropertiesFetch(_ N: Int) {
   for _ in 1...N {
     for c in workload {
-    % for Property, Set in Properties.items():
+    % for Property, Set in Properties:
         blackHole(is${Property}(c))
     % end
     }
@@ -182,7 +182,7 @@ public func run_CharacterPropertiesFetch(_ N: Int) {
 public func run_CharacterPropertiesStashed(_ N: Int) {
   for _ in 1...N {
     for c in workload {
-    % for Property, Set in Properties.items():
+    % for Property, Set in Properties:
         blackHole(is${Property}Stashed(c))
     % end
     }
@@ -193,7 +193,7 @@ public func run_CharacterPropertiesStashed(_ N: Int) {
 public func run_CharacterPropertiesStashedMemo(_ N: Int) {
   for _ in 1...N {
     for c in workload {
-    % for Property, Set in Properties.items():
+    % for Property, Set in Properties:
         blackHole(is${Property}StashedMemo(c))
     % end
     }
@@ -204,7 +204,7 @@ public func run_CharacterPropertiesStashedMemo(_ N: Int) {
 public func run_CharacterPropertiesPrecomputed(_ N: Int) {
   for _ in 1...N {
     for c in workload {
-    % for Property, Set in Properties.items():
+    % for Property, Set in Properties:
         blackHole(is${Property}Precomputed(c))
     % end
     }

benchmark/single-source/CharacterProperties.swift.gyb

@@ -40,7 +40,7 @@ Sequences = [
 ]
 def lazy (NameExpr) : return (NameExpr[0] + 'Lazy', '(' + NameExpr[1] + ').lazy')
 
-Sequences = Sequences + map(lazy, Sequences)
+Sequences = Sequences + list(map(lazy, Sequences))
 }%
 
 public let DropFirst = [

benchmark/single-source/DropFirst.swift.gyb

@@ -40,7 +40,7 @@ Sequences = [
 ]
 def lazy (NameExpr) : return (NameExpr[0] + 'Lazy', '(' + NameExpr[1] + ').lazy')
 
-Sequences = Sequences + map(lazy, Sequences)
+Sequences = Sequences + list(map(lazy, Sequences))
 }%
 
 public let DropLast = [

benchmark/single-source/DropLast.swift.gyb

@@ -40,7 +40,7 @@ Sequences = [
 ]
 def lazy (NameExpr) : return (NameExpr[0] + 'Lazy', '(' + NameExpr[1] + ').lazy')
 
-Sequences = Sequences + map(lazy, Sequences)
+Sequences = Sequences + list(map(lazy, Sequences))
 }%
 
 public let DropWhile = [

benchmark/single-source/DropWhile.swift.gyb

@@ -169,7 +169,7 @@ func next(_ x: inout Int, upto mod: Int) {
   x = (x + 1) % (mod + 1)
 }
 
-% for (V, i) in [(v, int(filter(str.isdigit, v))) for v in Vals]:
+% for (V, i) in [(v, int(''.join(filter(str.isdigit, v)))) for v in Vals]:
 struct ${V} : Existential {${
   ''.join(['\n	var f{0}: Int = {1}'.format(vi, v)
               for (vi, v) in Vars[0:i]]) +
@@ -208,7 +208,7 @@ class Klazz { // body same as Val2
 	}
 }
 
-% for (V, i) in [(v, int(filter(str.isdigit, v))) for v in Refs]:
+% for (V, i) in [(v, int(''.join(filter(str.isdigit, v)))) for v in Refs]:
 struct ${V} : Existential {
 	${'\n	'.join([('var f{0}: Klazz = Klazz()'.format(vi) if vi < 3 else
                  'var f3: Int = 0') for (vi, _) in Vars[0:i]])}

benchmark/single-source/ExistentialPerformance.swift.gyb

@@ -39,7 +39,7 @@ Sequences = [
 ]
 def lazy (NameExpr) : return (NameExpr[0] + 'Lazy', '(' + NameExpr[1] + ').lazy')
 
-Sequences = Sequences + map(lazy, Sequences)
+Sequences = Sequences + list(map(lazy, Sequences))
 }%
 
 public let Prefix = [

benchmark/single-source/Prefix.swift.gyb

@@ -39,7 +39,7 @@ Sequences = [
 ]
 def lazy (NameExpr) : return (NameExpr[0] + 'Lazy', '(' + NameExpr[1] + ').lazy')
 
-Sequences = Sequences + map(lazy, Sequences)
+Sequences = Sequences + list(map(lazy, Sequences))
 }%
 
 public let PrefixWhile = [

benchmark/single-source/PrefixWhile.swift.gyb

@@ -39,7 +39,7 @@ Sequences = [
 ]
 def lazy (NameExpr) : return (NameExpr[0] + 'Lazy', '(' + NameExpr[1] + ').lazy')
 
-Sequences = Sequences + map(lazy, Sequences)
+Sequences = Sequences + list(map(lazy, Sequences))
 }%
 
 public let Suffix = [