update performance testing

ios/maps/MCMapView.swift

@@ -190,7 +190,7 @@ open class MCMapView: MTKView, @unchecked Sendable {
         mapInterface.prepare()
     }
 
-    open func drawFrame(in view: MTKView, completion: @escaping (Bool) -> Void) {
+    open func drawFrame(in view: MTKView, completion: @escaping (CFTimeInterval?) -> Void) {
         guard
             let commandBuffer = MetalContext.current.commandQueue
                 .makeCommandBuffer(),
@@ -208,7 +208,7 @@ open class MCMapView: MTKView, @unchecked Sendable {
             let renderEncoder = commandBuffer.makeRenderCommandEncoder(
                 descriptor: renderPassDescriptor)
         else {
-            completion(false)
+            completion(nil)
             return
         }
 
@@ -227,12 +227,17 @@ open class MCMapView: MTKView, @unchecked Sendable {
         renderEncoder.endEncoding()
 
         guard let drawable = view.currentDrawable else {
-            completion(false)
+            completion(nil)
             return
         }
 
-        commandBuffer.addCompletedHandler { _ in
-            completion(true)
+        commandBuffer.addCompletedHandler { commandBuffer in
+            let start = commandBuffer.gpuStartTime
+            let end = commandBuffer.gpuEndTime
+
+
+            let gpuRuntimeDuration = end - start
+            completion(gpuRuntimeDuration)
         }
 
         // if we want to save the drawable (offscreen rendering), we commit and wait synchronously

tests/TestPlan.xctestplan

@@ -14,6 +14,7 @@
   },
   "testTargets" : [
     {
+      "parallelizable" : false,
       "target" : {
         "containerPath" : "container:",
         "identifier" : "iOSTests",

tests/ios/BasemapLayerPerformanceTests.swift

@@ -17,12 +17,10 @@ struct BasemapLayerPerformanceTests {
 
         try await view.prepare(.zurich)
 
-        for _ in 0..<10 {
-            print("measuring fps")
-            let fps = view.measureFPS(duration: 30)
-            print("fps: \(fps)")
-        }
-
+        let fps = (0 ..< 100).map { _ in  view.measureFPS(duration: 5) }
+        let maxFps = fps.max()!
+        print(maxFps)
+        #expect(maxFps > 80.0)
     }
 
     @Test func testStyleParsing() async throws {

tests/ios/BasemapPerformanceTests.swift

@@ -17,11 +17,8 @@ final class BasemapPerformanceTests: XCTestCase {
 
         try await view.prepare(.aletsch)
 
-        let prepareMetric = XCTOSSignpostMetric(subsystem: TestingMapView.signposterSubsystem, category: TestingMapView.signposterCategory, name: "\(TestingMapView.signposterIntervalPrepare)")
-        let drawMetric = XCTOSSignpostMetric(subsystem: TestingMapView.signposterSubsystem, category: TestingMapView.signposterCategory, name: "\(TestingMapView.signposterIntervalDraw)")
-        let awaitMetric = XCTOSSignpostMetric(subsystem: TestingMapView.signposterSubsystem, category: TestingMapView.signposterCategory, name: "\(TestingMapView.signposterIntervalAwait)")
-        self.measure(metrics: [prepareMetric, drawMetric, awaitMetric]) {
-            view.drawMeasured(frames: 70)
+        self.measure(metrics: [FPSMetric(mapView: view)]) {
+            view.drawMeasured()
         }
     }
 

tests/ios/helpers/FPSMetric.swift

@@ -0,0 +1,31 @@
+//
+//  FPSMetric.swift
+//  MapCore
+//
+//  Created by Nicolas Märki on 25.02.2025.
+//
+
+import XCTest
+
+class FPSMetric: NSObject, XCTMetric {
+
+    var mapView: TestingMapView
+
+    init(mapView: TestingMapView) {
+        self.mapView = mapView
+    }
+
+    func reportMeasurements(from startTime: XCTPerformanceMeasurementTimestamp, to endTime: XCTPerformanceMeasurementTimestamp) throws -> [XCTPerformanceMeasurement] {
+        let frames = self.mapView.frames.count { $0.start.absoluteTimeNanoSeconds > startTime.absoluteTimeNanoSeconds && $0.end.absoluteTimeNanoSeconds < endTime.absoluteTimeNanoSeconds }
+        let duration = Double(endTime.absoluteTimeNanoSeconds - startTime.absoluteTimeNanoSeconds) / Double(1_000_000_000)
+        let fps = Double(frames) / duration
+        return [.init(identifier: "FPS", displayName: "Frames per Second", value: .init(value: fps, unit: .init(symbol: "fps")), polarity: .prefersLarger)]
+    }
+
+    func copy(with zone: NSZone? = nil) -> Any {
+        let copy = FPSMetric(mapView: mapView)
+        return copy
+    }
+
+
+}

tests/ios/helpers/TestingMapView.swift

@@ -9,6 +9,7 @@ import MapCore
 import MetalKit
 import UIKit
 import os
+import XCTest
 
 @available(iOS 15.0, *)
 class TestingMapView: MCMapView, @unchecked Sendable, MCMapReadyCallbackInterface {
@@ -134,14 +135,19 @@ class TestingMapView: MCMapView, @unchecked Sendable, MCMapReadyCallbackInterfac
         signposter.endInterval(Self.signposterIntervalPrepare, state)
     }
 
-    override func drawFrame(in view: MTKView, completion: @escaping (Bool) -> Void) {
+    private(set) var frames: [(start: XCTPerformanceMeasurementTimestamp, end: XCTPerformanceMeasurementTimestamp)] = []
+
+    override func drawFrame(in view: MTKView, completion: @escaping (CFTimeInterval?) -> Void) {
         let signpostID = signposter.makeSignpostID()
 
         let state = signposter.beginInterval(Self.signposterIntervalDraw, id: signpostID)
+        let start = XCTPerformanceMeasurementTimestamp()
 
         super.drawFrame(in: view) { [signposter] in
             signposter.endInterval(Self.signposterIntervalDraw, state)
             completion($0)
+            let end = XCTPerformanceMeasurementTimestamp()
+            self.frames.append((start, end))
         }
 
     }