From 59a5ffb3ccb6abf62024698479d60c426c7d79f0 Mon Sep 17 00:00:00 2001
From: Mark Anderson <andersonmark@fb.com>
Date: Thu, 18 Aug 2022 17:09:29 -0700
Subject: [PATCH] Update iOSPlatform to mask platform_model with mapping.

Summary: Update platform_model resolution for iOS platform, enables device-name mapping on top of a hash-platform map (equivalent to android platforms)

Reviewed By: vmpuri

Differential Revision: D38529898

fbshipit-source-id: b367cc68c4c0624fb8402ed5121e3670289c47e7
---
 benchmarking/platforms/ios/ios_driver.py   |  2 +-
 benchmarking/platforms/ios/ios_platform.py | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/benchmarking/platforms/ios/ios_driver.py b/benchmarking/platforms/ios/ios_driver.py
index 269560d8..020f723f 100644
--- a/benchmarking/platforms/ios/ios_driver.py
+++ b/benchmarking/platforms/ios/ios_driver.py
@@ -88,7 +88,7 @@ def getIOSPlatforms(self, tempdir, usb_controller):
                 "abi": self.devices[device]["abi"],
             }
             platform = IOSPlatform(tempdir, idb, self.args, platform_meta)
-            platform.setPlatform(self.devices[device]["model"])
+            # platform.setPlatform(self.devices[device]["platform"])
             platforms.append(platform)
 
         return platforms
diff --git a/benchmarking/platforms/ios/ios_platform.py b/benchmarking/platforms/ios/ios_platform.py
index 39676cf1..26c34316 100644
--- a/benchmarking/platforms/ios/ios_platform.py
+++ b/benchmarking/platforms/ios/ios_platform.py
@@ -12,6 +12,7 @@
 
 import json
 import os
+import re
 import shlex
 import time
 
@@ -31,10 +32,15 @@ def __init__(self, tempdir, idb, args, platform_meta, usb_controller=None):
             args.hash_platform_mapping,
             args.device_name_mapping,
         )
+        self.setPlatformHash(idb.device)
+        if self.platform:
+            self.platform_model = (
+                re.findall(r"(.*)-[0-9.]+", self.platform) or [self.platform]
+            )[0]
+        else:
+            self.platform_model = platform_meta.get("model")
         self.platform_os_version = platform_meta.get("os_version")
-        self.platform_model = platform_meta.get("model")
         self.platform_abi = platform_meta.get("abi")
-        self.setPlatformHash(idb.device)
         self.usb_controller = usb_controller
         self.type = "ios"
         self.app = None