feat: working compilation for ipad

Author: polvalente

liveview_native/live_nx_iree/native/swiftui/LiveNxIREE.xcodeproj/project.pbxproj

@@ -12,6 +12,8 @@
 		0A6CE5F5167F6157FF061569 /* DisconnectedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D488732A3104CEE004CB7B42 /* DisconnectedView.swift */; };
 		125165EBA8D40490F0AABE88 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 51F3B59B97B70D891071B6C4 /* Assets.xcassets */; };
 		137E19B83B668B9C3130A3D7 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7955FA5760A1DB1E827049B /* ContentView.swift */; };
+		373496882C7707DE00FD2E6F /* NxAddon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373496872C7707DE00FD2E6F /* NxAddon.swift */; };
+		3734968B2C77081100FD2E6F /* NxFunctionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3734968A2C77081100FD2E6F /* NxFunctionView.swift */; };
 		379E276B2C76D40900624AA7 /* nx_iree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 379E276A2C76D40900624AA7 /* nx_iree.cpp */; };
 		459F92DE90F9275614EDC9F7 /* LiveViewNative in Frameworks */ = {isa = PBXBuildFile; productRef = 6767E5600DE50B2F89C488A9 /* LiveViewNative */; };
 		82539B66B2DD23CF4560F655 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7BB2FC47EF2667DBC127B716 /* Preview Assets.xcassets */; };
@@ -22,6 +24,8 @@
 
 /* Begin PBXFileReference section */
 		0C32E6E8FE5182B70F4A8001 /* ReconnectingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReconnectingView.swift; sourceTree = "<group>"; };
+		373496872C7707DE00FD2E6F /* NxAddon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NxAddon.swift; sourceTree = "<group>"; };
+		3734968A2C77081100FD2E6F /* NxFunctionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NxFunctionView.swift; sourceTree = "<group>"; };
 		379E257A2C76CD5400624AA7 /* building.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = building.h; sourceTree = "<group>"; };
 		379E257B2C76CD5400624AA7 /* debugging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debugging.h; sourceTree = "<group>"; };
 		379E257C2C76CD5400624AA7 /* parsing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parsing.h; sourceTree = "<group>"; };
@@ -423,6 +427,7 @@
 		2F2E8465248E555C831C9B55 /* LiveNxIREE */ = {
 			isa = PBXGroup;
 			children = (
+				373496892C7707F700FD2E6F /* NxAddon */,
 				379E27692C76D3E500624AA7 /* c_src */,
 				379E27432C76CD5400624AA7 /* nx_iree */,
 				163C4DE8D68444A97E61DD40 /* Preview Content */,
@@ -434,10 +439,19 @@
 				FB615E539217C456B9FBC1F5 /* LiveNxIREE.swift */,
 				0C32E6E8FE5182B70F4A8001 /* ReconnectingView.swift */,
 				379E27672C76D25900624AA7 /* LiveNxIREE-Bridging-Header.h */,
+				373496872C7707DE00FD2E6F /* NxAddon.swift */,
 			);
 			path = LiveNxIREE;
 			sourceTree = "<group>";
 		};
+		373496892C7707F700FD2E6F /* NxAddon */ = {
+			isa = PBXGroup;
+			children = (
+				3734968A2C77081100FD2E6F /* NxFunctionView.swift */,
+			);
+			path = NxAddon;
+			sourceTree = "<group>";
+		};
 		379E257D2C76CD5400624AA7 /* flatcc */ = {
 			isa = PBXGroup;
 			children = (
@@ -1714,9 +1728,11 @@
 				137E19B83B668B9C3130A3D7 /* ContentView.swift in Sources */,
 				0A6CE5F5167F6157FF061569 /* DisconnectedView.swift in Sources */,
 				E8ABDB597CE60B7A14F06131 /* ErrorView.swift in Sources */,
+				373496882C7707DE00FD2E6F /* NxAddon.swift in Sources */,
 				019462C5C187024761226CEE /* LiveNxIREE.swift in Sources */,
 				BFA36AAE5D8350C95692758F /* ReconnectingView.swift in Sources */,
 				379E276B2C76D40900624AA7 /* nx_iree.cpp in Sources */,
+				3734968B2C77081100FD2E6F /* NxFunctionView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1727,6 +1743,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -1750,6 +1767,7 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -1758,6 +1776,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				GENERATE_INFOPLIST_FILE = YES;
+				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_KEY_CFBundleDisplayName = LiveNxIREE;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_WKCompanionAppBundleIdentifier = com.example.LiveNxIREE;
@@ -1776,6 +1795,7 @@
 				OTHER_LDFLAGS = "-lnx_iree_runtime";
 				"OTHER_LDFLAGS[arch=*]" = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_NAME)/$(PROJECT_NAME)-Bridging-Header.h";
+				SYSTEM_HEADER_SEARCH_PATHS = "";
 				TVOS_DEPLOYMENT_TARGET = 16.0;
 				WATCHOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -1784,8 +1804,11 @@
 		556320541024795EE191F9E8 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
+				HEADER_SEARCH_PATHS = "$(SRCROOT)/LiveNxIREE/nx_iree/include";
 				IPHONEOS_DEPLOYMENT_TARGET = 17.3;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1805,15 +1828,19 @@
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_VERSION = 5.0;
+				SYSTEM_HEADER_SEARCH_PATHS = "";
 				TARGETED_DEVICE_FAMILY = 2;
 			};
 			name = Release;
 		};
 		5B0E672056F80B1EDCDCE967 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
+				HEADER_SEARCH_PATHS = "$(SRCROOT)/LiveNxIREE/nx_iree/include";
 				IPHONEOS_DEPLOYMENT_TARGET = 17.3;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1833,6 +1860,7 @@
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_VERSION = 5.0;
+				SYSTEM_HEADER_SEARCH_PATHS = "";
 				TARGETED_DEVICE_FAMILY = 2;
 			};
 			name = Debug;
@@ -1841,6 +1869,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -1863,6 +1892,7 @@
 				DEAD_CODE_STRIPPING = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -1871,6 +1901,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				GENERATE_INFOPLIST_FILE = YES;
+				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_KEY_CFBundleDisplayName = LiveNxIREE;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_WKCompanionAppBundleIdentifier = com.example.LiveNxIREE;
@@ -1903,6 +1934,7 @@
 				OTHER_LDFLAGS = "-lnx_iree_runtime";
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_NAME)/$(PROJECT_NAME)-Bridging-Header.h";
+				SYSTEM_HEADER_SEARCH_PATHS = "";
 				TVOS_DEPLOYMENT_TARGET = 16.0;
 				WATCHOS_DEPLOYMENT_TARGET = 9.0;
 			};

liveview_native/live_nx_iree/native/swiftui/LiveNxIREE.xcodeproj/project.xcworkspace/xcuserdata/paulo.valente.xcuserdatad/UserInterfaceState.xcuserstate

@@ -15,7 +15,8 @@ struct ContentView: View {
                 production: URL(string: "https://example.com")!
             ),
             addons: [
-                .liveForm
+                .liveForm,
+                .nxAddon
             ]
         ) {
             ConnectingView()

liveview_native/live_nx_iree/native/swiftui/LiveNxIREE/ContentView.swift

@@ -0,0 +1,26 @@
+//
+//  NxAddon.swift
+//  LiveNxIREE
+//
+//  Created by Paulo.Valente on 8/22/24.
+//
+
+import LiveViewNative
+import SwiftUI
+
+public extension Addons {
+    @Addon
+    struct NxAddon<Root: RootRegistry> {
+        public enum TagName: String {
+            case nxFunction = "NxFunction"
+        }
+
+        @ViewBuilder
+        public static func lookup(_ name: TagName, element: ElementNode) -> some View {
+            switch name {
+            case .nxFunction:
+                NxFunctionView<Root>()
+            }
+        }
+    }
+}

liveview_native/live_nx_iree/native/swiftui/LiveNxIREE/NxAddon.swift

@@ -0,0 +1,17 @@
+//
+//  NxFunction.swift
+//  LiveNxIREE
+//
+//  Created by Paulo.Valente on 8/22/24.
+//
+
+import SwiftUI
+import LiveViewNative
+
+struct NxFunctionView<Root: RootRegistry>: View {
+    var body: some View {
+        Text("NxFunction Component")
+            .padding()
+    }
+}
+

liveview_native/live_nx_iree/native/swiftui/LiveNxIREE/NxAddon/NxFunctionView.swift

@@ -0,0 +1,18 @@
+//
+//  NxInputView.swift
+//  LiveNxIREE
+//
+//  Created by Paulo.Valente on 8/22/24.
+//
+
+import SwiftUI
+
+struct NxInputView: View {
+    var body: some View {
+        Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/)
+    }
+}
+
+#Preview {
+    NxInputView()
+}

liveview_native/live_nx_iree/native/swiftui/LiveNxIREE/NxAddon/NxInputView.swift

@@ -0,0 +1,18 @@
+//
+//  NxOutputView.swift
+//  LiveNxIREE
+//
+//  Created by Paulo.Valente on 8/22/24.
+//
+
+import SwiftUI
+
+struct NxOutputView: View {
+    var body: some View {
+        Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/)
+    }
+}
+
+#Preview {
+    NxOutputView()
+}

liveview_native/live_nx_iree/native/swiftui/LiveNxIREE/NxAddon/NxOutputView.swift

@@ -0,0 +1,12 @@
+//
+//  NxIREECppBridge.swift
+//  LiveNxIREE
+//
+//  Created by Paulo.Valente on 8/22/24.
+//
+
+import SwiftUI
+
+struct NxIREECppBridge {
+    
+}

liveview_native/live_nx_iree/native/swiftui/LiveNxIREE/NxIREECppBridge.swift

@@ -6,23 +6,51 @@
 //
 
 #include "nx_iree.h"
-#include "nx_iree/runtime.h"
 
-extern "C" {
+#include <string>
+#include <vector>
 
-int nx_iree_initialize(iree_vm_instance_t* instance, iree_hal_driver_registry_t* driver_registry, iree_hal_device_t* device) {
+int func(int x) {
+    return x;
+}
+
+/*
+int nx_iree_initialize(iree_vm_instance_t* vm_instance, iree_hal_driver_registry_t* driver_registry, iree_hal_device_t* device, char* device_uri, char* error_message) {
+    vm_instance = create_instance();
+    driver_registry = get_driver_registry();
+    auto status = register_all_drivers(driver_registry);
+    
+    if (!is_ok(status)) {
+        if (error_message) {
+            std::string msg = get_status_message(status);
+            strncpy(error_message, msg.c_str(), msg.length());
+        }
+        
+        return 1;
+    }
+    
+    
+    device = create_device(std::string(device_uri));
+    
+    if (!device) {
+        const char* msg = "Unable to initialize device\0";
+        strncpy(error_message, msg, strlen(msg));
+        return 1;
+    }
     
+    return 0;
 }
 
-int nx_iree_call(uint64_t bytecode_size, char* bytecode, uint64_t num_inputs, char** serialized_inputs, uint64_t num_outputs, char** serialized_outputs, char* error_message) {
-    std::vector<iree::runtime::IREETensor> inputs;
+int nx_iree_call(iree_vm_instance_t* vm_instance, iree_hal_device_t* device, uint64_t bytecode_size, unsigned char* bytecode, uint64_t num_inputs, char** serialized_inputs, uint64_t num_outputs, char** serialized_outputs, char* error_message) {
+    std::vector<iree::runtime::IREETensor*> inputs;
     
     for (size_t i = 0; i < num_inputs; i++) {
-        inputs.push_back(iree::runtime::IREETensor(serialized_inputs[i]));
+        inputs.push_back(new iree::runtime::IREETensor(serialized_inputs[i]));
     }
     
-    auto [status, optional_result] = call(vm_instance, device, driver_name, static_cast<size_t>(bytecode_size), inputs);
-    
+    // driver name is hardcoded because there is only a check for CUDA
+    auto [status, optional_result] = call(vm_instance, device, "not_cuda", bytecode, static_cast<size_t>(bytecode_size), inputs);
+        
     if (!is_ok(status)) {
         if (error_message) {
             std::string msg = get_status_message(status);
@@ -34,12 +62,15 @@ int nx_iree_call(uint64_t bytecode_size, char* bytecode, uint64_t num_inputs, ch
     
     serialized_outputs = new char*[num_outputs];
     
+    auto result = optional_result.value();
     for (size_t i = 0; i < num_outputs; i++) {
-        std::vector<char> *serialized = optional_result.value().serialize();
+        std::vector<char> *serialized = result[i]->serialize();
         serialized_outputs[i] = new char[serialized->size()];
         memcpy(serialized_outputs[i], serialized->data(), serialized->size());
     }
     
     return 0;
 }
+
 }
+*/

liveview_native/live_nx_iree/native/swiftui/LiveNxIREE/c_src/nx_iree.cpp

@@ -8,11 +8,20 @@
 #ifndef nx_iree_h
 #define nx_iree_h
 
-#include <cstdint>
+#include <iree/hal/api.h>
+#include <iree/vm/api.h>
 
+#ifdef __cplusplus
 extern "C" {
-    int nx_iree_initialize(iree_vm_instance_t* instance, iree_hal_driver_registry_t* driver_registry, iree_hal_device_t* device);
-    int nx_iree_call(uint64_t bytecode_size, char* bytecode, uint64_t num_inputs, char** serialized_inputs, uint64_t num_outputs, char** serialized_outputs, char* error_message);
+#endif
+
+int nx_iree_initialize(iree_vm_instance_t* vm_instance, iree_hal_driver_registry_t* driver_registry, iree_hal_device_t* device, char* device_uri, char* error_message);
+int nx_iree_call(iree_vm_instance_t* vm_instance, iree_hal_device_t* device, uint64_t bytecode_size, unsigned char* bytecode, uint64_t num_inputs, char** serialized_inputs, uint64_t num_outputs, char** serialized_outputs, char* error_message);
+
+
+#ifdef __cplusplus
 }
+#endif
+
 
 #endif /* nx_iree_h */