Skip to content

Add DeviceInfo in iOS benchmark run #5410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
03ED6D152C8AAFFF00F2D6EE /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03ED6D142C8AAFFF00F2D6EE /* Metal.framework */; };
03ED6D172C8AB00500F2D6EE /* CoreML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03ED6D162C8AB00500F2D6EE /* CoreML.framework */; };
03ED6D192C8AB00A00F2D6EE /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03ED6D182C8AB00A00F2D6EE /* Accelerate.framework */; };
8493389C2C9918950071ABAD /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8493389B2C9918950071ABAD /* UIKit.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -59,6 +60,7 @@
03ED6D142C8AAFFF00F2D6EE /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS17.5.sdk/System/Library/Frameworks/Metal.framework; sourceTree = DEVELOPER_DIR; };
03ED6D162C8AB00500F2D6EE /* CoreML.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreML.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS17.5.sdk/System/Library/Frameworks/CoreML.framework; sourceTree = DEVELOPER_DIR; };
03ED6D182C8AB00A00F2D6EE /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS17.5.sdk/System/Library/Frameworks/Accelerate.framework; sourceTree = DEVELOPER_DIR; };
8493389B2C9918950071ABAD /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS17.5.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -77,6 +79,7 @@
03ED6D172C8AB00500F2D6EE /* CoreML.framework in Frameworks */,
03ED6D152C8AAFFF00F2D6EE /* Metal.framework in Frameworks */,
03ED6D132C8AAFF700F2D6EE /* MetalPerformanceShaders.framework in Frameworks */,
8493389C2C9918950071ABAD /* UIKit.framework in Frameworks */,
03ED6D112C8AAFF200F2D6EE /* MetalPerformanceShadersGraph.framework in Frameworks */,
03ED6D0F2C8AAFE900F2D6EE /* libsqlite3.0.tbd in Frameworks */,
03DD00A92C8FE44600FE4619 /* backend_coreml.xcframework in Frameworks */,
Expand Down Expand Up @@ -135,6 +138,7 @@
03ED6CEB2C8AAF5300F2D6EE /* Frameworks */ = {
isa = PBXGroup;
children = (
8493389B2C9918950071ABAD /* UIKit.framework */,
03ED6D182C8AB00A00F2D6EE /* Accelerate.framework */,
03ED6D162C8AB00500F2D6EE /* CoreML.framework */,
03ED6D142C8AAFFF00F2D6EE /* Metal.framework */,
Expand Down
34 changes: 30 additions & 4 deletions extension/apple/Benchmark/Tests/Tests.mm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@

#import <XCTest/XCTest.h>

#import <UIKit/UIDevice.h>
#import <objc/runtime.h>
#import <sys/utsname.h>

#import <executorch/extension/module/module.h>
#import <executorch/extension/tensor/tensor.h>
Expand All @@ -17,14 +19,32 @@
using namespace ::executorch::runtime;

@interface Tests : XCTestCase

@end

@implementation Tests

+ (NSString *)getDeviceInfo {
NSString *device = [[UIDevice currentDevice] model];

// i.e. iPhone15
struct utsname systemInfo;
uname(&systemInfo);
NSString *name = [NSString stringWithCString:systemInfo.machine
encoding:NSUTF8StringEncoding];

NSString *systemName = [[UIDevice currentDevice] systemName];
NSString *systemVersion = [[UIDevice currentDevice] systemVersion];
return [NSString
stringWithFormat:@"%@_%@_%@_%@", device, name, systemName, systemVersion];
}

+ (void)initialize {
if (self != [self class]) {
return;
}
NSString *deviceInfo = [Tests getDeviceInfo];

for (NSBundle *bundle in @[
[NSBundle mainBundle],
[NSBundle bundleForClass:[self class]],
Expand All @@ -51,8 +71,11 @@ + (void)initialize {
NSString *modelName =
modelPath.lastPathComponent.stringByDeletingPathExtension;

SEL testLoadSelector = NSSelectorFromString([NSString
stringWithFormat:@"test_load_%@_%@", directoryName, modelName]);
SEL testLoadSelector = NSSelectorFromString(
[NSString stringWithFormat:@"test_load_%@_%@_%@",
directoryName,
modelName,
deviceInfo]);
IMP testLoadImplementation = imp_implementationWithBlock(^(id _self) {
auto __block module = std::make_unique<Module>(modelPath.UTF8String);
[_self measureWithMetrics:@[
Expand All @@ -68,8 +91,11 @@ + (void)initialize {
class_addMethod(
[self class], testLoadSelector, testLoadImplementation, "v@:");

SEL testForwardSelector = NSSelectorFromString([NSString
stringWithFormat:@"test_forward_%@_%@", directoryName, modelName]);
SEL testForwardSelector = NSSelectorFromString(
[NSString stringWithFormat:@"test_forward_%@_%@_%@",
directoryName,
modelName,
deviceInfo]);
IMP testForwardImplementation = imp_implementationWithBlock(^(
id _self) {
auto __block module = std::make_unique<Module>(modelPath.UTF8String);
Expand Down
Loading