[benchmark] Stop capitalizing function and variable names

Author: lorentey

benchmark/README.md

@@ -296,10 +296,10 @@ public let YourTestName = BenchmarkInfo(
   tags: [.regression])
 
 @inline(never)
-public func run_YourTestName(N: Int) {
+public func run_YourTestName(n: Int) {
     # Declare variables
 
-    for i in 1...N {
+    for i in 1...n {
         # Perform work
 
         # Verify work was done; break otherwise

benchmark/cxx-source/CreateObjects.swift

@@ -22,8 +22,8 @@ public let CreateObjects = BenchmarkInfo(
   tags: [.validation, .bridging])
 
 @inline(never)
-public func run_CreateObjects(_ N: Int) {
-  for i in 0...(N * 10_000) {
+public func run_CreateObjects(_ n: Int) {
+  for i in 0...(n * 10_000) {
     let x = Int32(i)
     let f = CxxLoadableIntWrapper(value: x)
     blackHole(f)

benchmark/multi-source/PrimsSplit/Prims.swift

@@ -70,7 +70,7 @@ class PriorityQueue {
     while (ind != 0) {
       let p = getParentIndex(ind)
       if heap[p].cost > c {
-        Swap(p, with: ind)
+        swap(p, with: ind)
         ind = p
       } else {
         break
@@ -83,7 +83,7 @@ class PriorityQueue {
     if (heap.isEmpty) {
       return nil
     }
-    Swap(0, with:heap.count-1)
+    swap(0, with:heap.count-1)
     let r = heap.removeLast()
     graphIndexToHeapIndexMap[r.to] = nil
     bubbleDown(0)
@@ -111,21 +111,21 @@ class PriorityQueue {
       if (heap[ind].cost <= heap[min].cost) {
         break
       }
-      Swap(ind, with: min)
+      swap(ind, with: min)
       ind = min
     }
   }
 
   // Swaps elements I and J in the heap and correspondingly updates
   // graphIndexToHeapIndexMap.
-  func Swap(_ i: Int, with j : Int) {
+  func swap(_ i: Int, with j : Int) {
     if (i == j) {
       return
     }
     (heap[i], heap[j]) = (heap[j], heap[i])
-    let (I, J) = (heap[i].to, heap[j].to)
-    (graphIndexToHeapIndexMap[I], graphIndexToHeapIndexMap[J]) =
-    (graphIndexToHeapIndexMap[J], graphIndexToHeapIndexMap[I])
+    let (i2, j2) = (heap[i].to, heap[j].to)
+    (graphIndexToHeapIndexMap[i2], graphIndexToHeapIndexMap[j2]) =
+    (graphIndexToHeapIndexMap[j2], graphIndexToHeapIndexMap[i2])
   }
 
   // Dumps the heap.
@@ -182,7 +182,7 @@ extension Edge : Hashable {
   }
 }
 
-func Prims(_ graph : Array<GraphNode>, _ fun : (Int, Int) -> Double) -> Array<Int?> {
+func prims(_ graph : Array<GraphNode>, _ fun : (Int, Int) -> Double) -> Array<Int?> {
   var treeEdges = Array<Int?>(repeating:nil, count:graph.count)
 
   let queue = PriorityQueue(Num:graph.count)

benchmark/multi-source/PrimsSplit/Prims_main.swift

@@ -19,8 +19,8 @@ public let PrimsSplit = BenchmarkInfo(
   legacyFactor: 5)
 
 @inline(never)
-public func run_PrimsSplit(_ N: Int) {
-  for _ in 1...N {
+public func run_PrimsSplit(_ n: Int) {
+  for _ in 1...n {
     let nodes : [Int] = [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
       13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
       29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
@@ -547,7 +547,7 @@ public func run_PrimsSplit(_ N: Int) {
     }
 
     // Find spanning tree
-    let treeEdges = Prims(graph, { (start: Int, end: Int) in
+    let treeEdges = prims(graph, { (start: Int, end: Int) in
         return map[Edge(start: start, end: end)]!
     })
 

benchmark/scripts/Template.swift

@@ -17,6 +17,6 @@ public let {name} = [
 ]
 
 @inline(never)
-public func run_{name}(N: Int) {{
+public func run_{name}(n: Int) {{
     // TODO
 }}

benchmark/single-source/Ackermann.swift

@@ -19,30 +19,30 @@ public let Ackermann = BenchmarkInfo(
   runFunction: run_Ackermann,
   tags: [.algorithm])
 
-func ackermann(_ M: Int, _ N : Int) -> Int {
-  if (M == 0) { return N + 1 }
-  if (N == 0) { return ackermann(M - 1, 1) }
-  return ackermann(M - 1, ackermann(M, N - 1))
+func _ackermann(_ m: Int, _ n : Int) -> Int {
+  if (m == 0) { return n + 1 }
+  if (n == 0) { return ackermann(m - 1, 1) }
+  return ackermann(m - 1, ackermann(m, n - 1))
 }
 
 @inline(never)
-func Ackermann(_ M: Int, _ N : Int) -> Int {
+func ackermann(_ m: Int, _ n : Int) -> Int {
   // This if prevents optimizer from computing return value of Ackermann(3,9)
   // at compile time.
   if getFalse() { return 0 }
-  if (M == 0) { return N + 1 }
-  if (N == 0) { return ackermann(M - 1, 1) }
-  return ackermann(M - 1, ackermann(M, N - 1))
+  if (m == 0) { return n + 1 }
+  if (n == 0) { return _ackermann(m - 1, 1) }
+  return _ackermann(m - 1, _ackermann(m, n - 1))
 }
 
 let ref_result = [5, 13, 29, 61, 125, 253, 509, 1021, 2045, 4093, 8189, 16381, 32765, 65533, 131069]
 
 @inline(never)
-public func run_Ackermann(_ N: Int) {
+public func run_Ackermann(_ n: Int) {
   let (m, n) = (3, 6)
   var result = 0
-  for _ in 1...N {
-    result = Ackermann(m, n)
+  for _ in 1...n {
+    result = ackermann(m, n)
     if result != ref_result[n] {
       break
     }

benchmark/single-source/AngryPhonebook.swift

@@ -76,9 +76,9 @@ let words = [
   "Nicholas", "Eric", "Stephen", "Jacob", "Larry", "Frank"]
 
 @inline(never)
-public func run_AngryPhonebook(_ N: Int) {
+public func run_AngryPhonebook(_ n: Int) {
   // Permute the names.
-  for _ in 1...N {
+  for _ in 1...n {
     for firstname in words {
       for lastname in words {
         _ = (firstname.uppercased(), lastname.lowercased())
@@ -132,10 +132,10 @@ let longArmenian = phonebook(armenian)
 let longCyrillic = phonebook(cyrillic)
 
 @inline(never)
-public func angryPhonebook(_ N: Int, _ names: [String]) {
+public func angryPhonebook(_ n: Int, _ names: [String]) {
   assert(names.count == 20)
   // Permute the names.
-  for _ in 1...N {
+  for _ in 1...n {
     for firstname in names {
       for lastname in names {
         blackHole((firstname.uppercased(), lastname.lowercased()))
@@ -145,8 +145,8 @@ public func angryPhonebook(_ N: Int, _ names: [String]) {
 }
 
 @inline(never)
-public func angryPhonebook(_ N: Int, precomposed names: String) {
-  for _ in 1...N {
+public func angryPhonebook(_ n: Int, precomposed names: String) {
+  for _ in 1...n {
     blackHole((names.uppercased(), names.lowercased()))
   }
 }

benchmark/single-source/AnyHashableWithAClass.swift

@@ -54,9 +54,9 @@ class TestHashableDerived4 : TestHashableDerived3 {}
 class TestHashableDerived5 : TestHashableDerived4 {}
 
 @inline(never)
-public func run_AnyHashableWithAClass(_ N: Int) {
+public func run_AnyHashableWithAClass(_ n: Int) {
   let c = TestHashableDerived5(10)
-  for _ in 0...(N*1000) {
+  for _ in 0...(n*1000) {
     _ = AnyHashable(c)
   }
 }

benchmark/single-source/Array2D.swift

@@ -23,27 +23,27 @@ public let Array2D = BenchmarkInfo(
 let size = 256
 
 var inputArray: [[Int]]! = {
-  var A: [[Int]] = []
-  A.reserveCapacity(size)
+  var a: [[Int]] = []
+  a.reserveCapacity(size)
   for _ in 0 ..< size {
-    A.append(Array(0 ..< size))
+    a.append(Array(0 ..< size))
   }
-  return A
+  return a
 }()
 
 @inline(never)
-func modifyArray(_ A: inout [[Int]], _ N: Int) {
-  for _ in 0..<N {
+func modifyArray(_ a: inout [[Int]], _ n: Int) {
+  for _ in 0..<n {
     for i in 0 ..< size {
       for y in 0 ..< size {
-        A[i][y] = A[i][y] + 1
-        A[i][y] = A[i][y] - 1
+        a[i][y] = a[i][y] + 1
+        a[i][y] = a[i][y] - 1
       }
     }
   }
 }
 
 @inline(never)
-public func run_Array2D(_ N: Int) {
-  modifyArray(&inputArray, N)
+public func run_Array2D(_ n: Int) {
+  modifyArray(&inputArray, n)
 }