azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix benchmarks with Swift interop after enabling -Xobjc-generics (#3804)

Browse Source
This commit is contained in:
LepilkinaElena
2020-01-30 11:46:07 +03:00
committed by GitHub
parent 59e71018da
commit 61d76192eb
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
performance/KotlinVsSwift/ring/src/main.swift
+2 -2
View File
@@ -7,8 +7,8 @@ import Foundation
import benchmark import benchmark
var runner = BenchmarksRunner() var runner = BenchmarksRunner()
let args = KotlinArray(size: Int32(CommandLine.arguments.count - 1), init: {index in let args = KotlinArray<NSString>(size: Int32(CommandLine.arguments.count - 1), init: {index in
CommandLine.arguments[Int(truncating: index) + 1] CommandLine.arguments[Int(truncating: index) + 1] as NSString
}) })
let companion = BenchmarkEntryWithInit.Companion() let companion = BenchmarkEntryWithInit.Companion()
performance/swiftinterop/swiftSrc/benchmarks.swift
+7 -7
View File
@@ -40,7 +40,7 @@ class SwiftInteropBenchmarks {
let BENCHMARK_SIZE = 10000 let BENCHMARK_SIZE = 10000
let SMALL_BENCHMARK_SIZE = 50 let SMALL_BENCHMARK_SIZE = 50
let MEDIUM_BENCHMARK_SIZE = 100 let MEDIUM_BENCHMARK_SIZE = 100
var multigraph = Multigraph() var multigraph = Multigraph<NSNumber>()
var cityMap = CityMap() var cityMap = CityMap()
func randomInt(border: Int) -> Int { func randomInt(border: Int) -> Int {
@@ -88,11 +88,11 @@ class SwiftInteropBenchmarks {
} }
func initMultigraph(size: Int) { func initMultigraph(size: Int) {
multigraph = Multigraph() multigraph = Multigraph<NSNumber>()
for i in 1...size { for i in 1...size {
multigraph.addEdge(from: i, to: i + 1, cost: SimpleCost(cost: (i + 1) % i )) multigraph.addEdge(from: NSNumber(value: i), to: NSNumber(value: i + 1), cost: SimpleCost(cost: (i + 1) % i ))
multigraph.addEdge(from: i, to: i * 2, cost: SimpleCost(cost: (i * 2) % i)) multigraph.addEdge(from: NSNumber(value: i), to: NSNumber(value: i * 2), cost: SimpleCost(cost: (i * 2) % i))
multigraph.addEdge(from: i + 5, to: i, cost: SimpleCost(cost: (i + 5) % i)) multigraph.addEdge(from: NSNumber(value: i + 5), to: NSNumber(value: i), cost: SimpleCost(cost: (i + 5) % i))
} }
} }
@@ -134,7 +134,7 @@ class SwiftInteropBenchmarks {
for _ in 0...SMALL_BENCHMARK_SIZE { for _ in 0...SMALL_BENCHMARK_SIZE {
var vertexes = Array(multigraph.allVertexes) var vertexes = Array(multigraph.allVertexes)
var result = multigraph.searchRoutesWithLimits(start: 1, var result = multigraph.searchRoutesWithLimits(start: 1,
finish: SMALL_BENCHMARK_SIZE / 2 + SMALL_BENCHMARK_SIZE / 4, finish: NSNumber(value: SMALL_BENCHMARK_SIZE / 2 + SMALL_BENCHMARK_SIZE / 4),
limits: SimpleCost(cost: SMALL_BENCHMARK_SIZE / 5)) limits: SimpleCost(cost: SMALL_BENCHMARK_SIZE / 5))
var count = result.map{ $0.count }.reduce(0, +) var count = result.map{ $0.count }.reduce(0, +)
} }
@@ -199,7 +199,7 @@ class SwiftInteropBenchmarks {
var edges = multigraphCopy.allEdges var edges = multigraphCopy.allEdges
while (!edges.isEmpty) { while (!edges.isEmpty) {
multigraphCopy.removeEdge(id: UInt32(edges.randomElement()!)) multigraphCopy.removeEdge(id: UInt32(edges.randomElement()!))
let vertexes = multigraphCopy.allVertexes let vertexes = multigraphCopy.allVertexes as! Set<NSNumber>
multigraphCopy.removeVertex(vertex: vertexes.randomElement()!) multigraphCopy.removeVertex(vertex: vertexes.randomElement()!)
edges = multigraphCopy.allEdges edges = multigraphCopy.allEdges
} }
performance/swiftinterop/swiftSrc/main.swift
+2 -2
View File
@@ -7,8 +7,8 @@ import Foundation
import benchmark import benchmark
var runner = BenchmarksRunner() var runner = BenchmarksRunner()
let args = KotlinArray(size: Int32(CommandLine.arguments.count - 1), init: {index in let args = KotlinArray<NSString>(size: Int32(CommandLine.arguments.count - 1), init: {index in
CommandLine.arguments[Int(truncating: index) + 1] CommandLine.arguments[Int(truncating: index) + 1] as NSString
}) })
let companion = BenchmarkEntryWithInit.Companion() let companion = BenchmarkEntryWithInit.Companion()