update windows

Author: vickiegpt

CMakeLists.txt

@@ -6,7 +6,7 @@ find_package(fmt REQUIRED)
 find_package(spdlog REQUIRED)
 find_package(cxxopts REQUIRED)
 find_package(jsoncpp REQUIRED)
-find_package(LLVM REQUIRED)
+find_package(LLVM REQUIRED CONFIG)
 include(CTest)
 if (WIN32)
     set(WASI_SDK_DIR D:/wasi-sdk/)
@@ -53,7 +53,7 @@ else ()
     set(WAMR_BUILD_LIBC_UVWASI 1)
     set(CMAKE_MSVC_RUNTIME_LIBRARY "")
     set(CMAKE_GENERATOR_PLATFORM "")
-    set(CMAKE_CXX_FLAGS "/MD /EHsc")
+    set(CMAKE_CXX_FLAGS "/MD /EHsc /DNOMINMAX")
     find_library(DETOURS_LIBRARY detours REQUIRED)
     find_path(DETOURS_INCLUDE_DIRS "detours/detours.h")
     find_library(DETOURS_LIBRARY detours REQUIRED)
@@ -101,8 +101,14 @@ set(WAMR_BUILD_JIT 0)
 set(WAMR_BUILD_DEBUG_INTERP 0)
 set(WAMR_BUILD_DEBUG_AOT 0)
 set(WAMR_BUILD_FAST_JIT 0)
-set(WAMR_BUILD_WASI_NN 1)
-set(WAMR_BUILD_WASI_NN_ENABLE_GPU 1)
+if(WIN32)
+    # Disable WASI-NN on Windows due to TensorFlow Lite header compatibility issues
+    set(WAMR_BUILD_WASI_NN 0)
+    set(WAMR_BUILD_WASI_NN_ENABLE_GPU 0)
+else()
+    set(WAMR_BUILD_WASI_NN 1)
+    set(WAMR_BUILD_WASI_NN_ENABLE_GPU 1)
+endif()
 set(WAMR_BUILD_LIBC_BUILTIN 1)
 set(WAMR_BUILD_LIBC_WASI 1)
 set(WAMR_BUILD_DUMP_CALL_STACK 1)
@@ -123,13 +129,16 @@ set(CMAKE_MACOSX_RPATH True)
 set(WAMR_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/wasm-micro-runtime)
 
 include(${WAMR_ROOT_DIR}/build-scripts/runtime_lib.cmake)
-add_library(vmlib ${WAMR_RUNTIME_LIB_SOURCE})
+add_library(vmlib STATIC ${WAMR_RUNTIME_LIB_SOURCE})
 
 include(${SHARED_DIR}/utils/uncommon/shared_uncommon.cmake)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/lib/wasm-micro-runtime/core/iwasm/aot ${CMAKE_CURRENT_SOURCE_DIR}/lib/yalantinglibs/include ${BLAS_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/lib/libcrafter/libcrafter/ ${jsoncpp_INCLUDE_DIRS})
 
-set(BUILD_TESTING OFF CACHE BOOL "Disable s2n-tls tests" FORCE)
-add_subdirectory(lib/s2n-tls)
+if(NOT WIN32)
+    # s2n-tls is not compatible with Windows
+    set(BUILD_TESTING OFF CACHE BOOL "Disable s2n-tls tests" FORCE)
+    add_subdirectory(lib/s2n-tls)
+endif()
 
 if (MVVM_BUILD_BENCH)
     add_subdirectory(bench)
@@ -150,14 +159,30 @@ set(GPU_CC_SOURCES
     src/wamr_gpu_cc_amd.cpp
     src/wamr_gpu_cc_intel.cpp
 )
-add_library(MVVM_export ${SOURCE_FILES} ${GPU_CC_SOURCES} ${UNCOMMON_SHARED_SOURCE})
+add_library(MVVM_export SHARED ${SOURCE_FILES} ${GPU_CC_SOURCES} ${UNCOMMON_SHARED_SOURCE})
+target_compile_definitions(MVVM_export PRIVATE MVVM_EXPORT_EXPORTS)
 add_executable(MVVM_restore src/restore.cpp ${UNCOMMON_SHARED_SOURCE})
 add_executable(MVVM_checkpoint src/checkpoint.cpp ${UNCOMMON_SHARED_SOURCE})
-add_executable(MVVM_profile src/profile.cpp ${UNCOMMON_SHARED_SOURCE})
+if(NOT WIN32)
+    # Profile tool uses Unix-specific features
+    add_executable(MVVM_profile src/profile.cpp ${UNCOMMON_SHARED_SOURCE})
+endif()
 include_directories(${LLVM_INCLUDE_DIRS} ${s2n_SOURCE_DIR}/api)
 add_definitions(${LLVM_DEFINITIONS})
-target_link_libraries(MVVM_export fmt::fmt spdlog::spdlog jsoncpp_lib ${BLAS_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARY} ${OPENSSL_SSL_LIBRARY} ZLIB::ZLIB zstd dl)
-target_link_libraries(MVVM_restore ${LLVM_LIBRARIES} LLVM fmt::fmt spdlog::spdlog cxxopts::cxxopts ${BLAS_LIBRARIES} MVVM_export vmlib s2n  tensorflow-lite)
-target_link_libraries(MVVM_checkpoint ${LLVM_LIBRARIES} LLVM fmt::fmt spdlog::spdlog cxxopts::cxxopts ${BLAS_LIBRARIES} MVVM_export vmlib s2n tensorflow-lite)
-target_link_libraries(MVVM_profile ${LLVM_LIBRARIES} LLVM fmt::fmt spdlog::spdlog cxxopts::cxxopts ${BLAS_LIBRARIES} MVVM_export vmlib s2n tensorflow-lite)
+
+# Get LLVM components
+llvm_map_components_to_libnames(llvm_libs Support Core IRReader)
+
+if(WIN32)
+    # Windows specific libraries
+    target_link_libraries(MVVM_export fmt::fmt spdlog::spdlog jsoncpp_lib ${BLAS_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARY} ${OPENSSL_SSL_LIBRARY} ZLIB::ZLIB $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>)
+    target_link_libraries(MVVM_restore ${llvm_libs} fmt::fmt spdlog::spdlog cxxopts::cxxopts ${BLAS_LIBRARIES} MVVM_export vmlib ${WIN_EXTRA_LIBS})
+    target_link_libraries(MVVM_checkpoint ${llvm_libs} fmt::fmt spdlog::spdlog cxxopts::cxxopts ${BLAS_LIBRARIES} MVVM_export vmlib ${WIN_EXTRA_LIBS})
+else()
+    # Non-Windows platforms
+    target_link_libraries(MVVM_export fmt::fmt spdlog::spdlog jsoncpp_lib ${BLAS_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARY} ${OPENSSL_SSL_LIBRARY} ZLIB::ZLIB zstd dl)
+    target_link_libraries(MVVM_restore ${LLVM_LIBRARIES} fmt::fmt spdlog::spdlog cxxopts::cxxopts ${BLAS_LIBRARIES} MVVM_export vmlib s2n tensorflow-lite)
+    target_link_libraries(MVVM_checkpoint ${LLVM_LIBRARIES} fmt::fmt spdlog::spdlog cxxopts::cxxopts ${BLAS_LIBRARIES} MVVM_export vmlib s2n tensorflow-lite)
+    target_link_libraries(MVVM_profile ${LLVM_LIBRARIES} fmt::fmt spdlog::spdlog cxxopts::cxxopts ${BLAS_LIBRARIES} MVVM_export vmlib s2n tensorflow-lite)
+endif()
 add_definitions(-DCXXOPTS_NO_RTTI=1)

include/mvvm_export.h

@@ -0,0 +1,22 @@
+/*
+ * The WebAssembly Live Migration Project
+ *
+ * SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
+ * Copyright 2025 Regents of the University of California
+ * UC Santa Cruz Sluglab.
+ */
+
+#ifndef MVVM_EXPORT_H
+#define MVVM_EXPORT_H
+
+#ifdef _WIN32
+    #ifdef MVVM_EXPORT_EXPORTS
+        #define MVVM_API __declspec(dllexport)
+    #else
+        #define MVVM_API __declspec(dllimport)
+    #endif
+#else
+    #define MVVM_API
+#endif
+
+#endif // MVVM_EXPORT_H

include/wamr.h

@@ -130,8 +130,10 @@ class WAMRInstance {
     std::vector<const char *> addr_{};
     std::vector<const char *> ns_pool_{};
     std::vector<WAMRExecEnv *> execEnv{};
+#if defined(WAMR_BUILD_WASI_NN) && WAMR_BUILD_WASI_NN != 0
     std::vector<WAMRWASINNModel> nn_context{};
     WAMRWASINNContext nn_context_mvvm;
+#endif
     std::map<int, std::tuple<std::string, std::vector<std::tuple<int, int, fd_op>>>> fd_map_{};
     // add offset to pair->tuple, 3rd param 'int'
     std::map<int, int> new_sock_map_{};

include/wamr_export.h

@@ -13,11 +13,16 @@
 
 #include "platform_common.h"
 #include "wasm_runtime.h"
+#include "mvvm_export.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+// Forward declaration
+class WAMRInstance;
+extern MVVM_API WAMRInstance *wamr;
+
 #if !defined(MVVM_WASI)
 #define MVVM_WASI
 #define SNAPSHOT_DEBUG_STEP 0

include/wamr_platform_windows.h

@@ -0,0 +1,32 @@
+/*
+ * Windows Platform Configuration for WAMR
+ */
+
+#ifndef WAMR_PLATFORM_WINDOWS_H
+#define WAMR_PLATFORM_WINDOWS_H
+
+#ifdef _WIN32
+
+// Define Windows platform before including WAMR headers
+#ifndef BH_PLATFORM_WINDOWS
+#define BH_PLATFORM_WINDOWS
+#endif
+
+// Prevent inclusion of winsock.h - we want winsock2.h
+#ifndef _WINSOCKAPI_
+#define _WINSOCKAPI_
+#endif
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+// Include WAMR platform headers
+// Note: platform_internal.h will include windows.h and winsock2.h in the correct order
+#include "../lib/wasm-micro-runtime/core/shared/platform/windows/platform_internal.h"
+#else
+#include "platform_common.h"
+#include "platform_api_vmcore.h"
+#endif // _WIN32
+
+#endif // WAMR_PLATFORM_WINDOWS_H

include/wamr_security_framework.h

@@ -230,7 +230,7 @@ class SecureMigrationProtocol {
     ~SecureMigrationProtocol();
 
     // Protocol states
-    enum class ProtocolState { INIT, HANDSHAKE, AUTHENTICATED, MIGRATING, COMPLETED, ERROR };
+    enum class ProtocolState { STATE_INIT, STATE_HANDSHAKE, STATE_AUTHENTICATED, STATE_MIGRATING, STATE_COMPLETED, STATE_ERROR };
 
     // Initialize protocol
     bool initializeProtocol(bool is_source);

include/wamr_wasi_nn_context.h

@@ -14,16 +14,20 @@
 #ifndef MVVM_WAMR_WASI_NN_H
 #define MVVM_WAMR_WASI_NN_H
 
+#include "wasm_export.h"
+
+// Only include WASI-NN headers if it's enabled
+#if defined(WAMR_BUILD_WASI_NN) && WAMR_BUILD_WASI_NN != 0
 #include "wasi_nn.h"
 #include "wasi_nn_types.h"
-#include "wasm_export.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
 #include "wasi_nn_app_native.h"
 #ifdef __cplusplus
 }
 #endif
+#endif // WAMR_BUILD_WASI_NN
 #include <memory>
 #include <string>
 #include <unordered_map>
@@ -39,10 +43,13 @@ extern "C" {
 // Forward declaration
 struct WAMRWASINNContext;
 
+#if defined(WAMR_BUILD_WASI_NN) && WAMR_BUILD_WASI_NN != 0
 // We need to use the WAMR library's WASINNContext, but avoid conflicts
 // Include the required header that defines it
 #include "wasi_nn_private.h"
+#endif
 
+#if defined(WAMR_BUILD_WASI_NN) && WAMR_BUILD_WASI_NN != 0
 // 操作类型枚举
 enum class WASINNOperationType { LOAD_MODEL, INIT_EXECUTION_CONTEXT, SET_INPUT, COMPUTE, GET_OUTPUT };
 
@@ -168,10 +175,14 @@ struct WAMRWASINNContext {
 template <typename T> void dump(T *t, WASINNContext *env) { t->dump_impl(env); }
 template <typename T> void restore(T *t, WASINNContext *env) { t->restore_impl(env); }
 
+#endif // WAMR_BUILD_WASI_NN
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#if defined(WAMR_BUILD_WASI_NN) && WAMR_BUILD_WASI_NN != 0
+
 // Initialize the WASI-NN recorder for a module instance
 void wamr_wasi_nn_recorder_init(wasm_module_inst_t instance);
 
@@ -203,6 +214,8 @@ size_t wamr_wasi_nn_get_recorder_memory_size(wasm_module_inst_t instance);
 size_t wamr_wasi_nn_get_recorder_peak_memory_size(wasm_module_inst_t instance);
 size_t wamr_wasi_nn_get_recorder_operation_count(wasm_module_inst_t instance);
 
+#endif // WAMR_BUILD_WASI_NN
+
 #ifdef __cplusplus
 }
 #endif

include/wamr_wasi_nn_tflite_gpu_cc.h

@@ -8,7 +8,12 @@
 
 #include "wamr_gpu_cc_framework.h"
 #include <memory>
+
+#if defined(WAMR_BUILD_WASI_NN) && WAMR_BUILD_WASI_NN != 0
 #include <tensorflow/lite/delegates/gpu/delegate.h>
+#endif
+
+#if defined(WAMR_BUILD_WASI_NN) && WAMR_BUILD_WASI_NN != 0
 
 namespace mvvm {
 namespace wasi_nn {
@@ -97,4 +102,6 @@ int wasi_nn_tflite_gpu_cc_get_attestation(void *gpu_cc_ctx, uint8_t *report_buff
 } // namespace wasi_nn
 } // namespace mvvm
 
+#endif // WAMR_BUILD_WASI_NN
+
 #endif // WASI_NN_TFLITE_GPU_CC_H

src/restore.cpp

@@ -31,9 +31,6 @@ extern std::string target;
 extern ReadStream *reader;
 extern WriteStream *writer;
 
-
-void spdlog::logger::err_handler_(std::string const &) {}
-
 int main(int argc, char **argv) {
     cxxopts::Options options("MVVM", "Migratable Velocity Virtual Machine, to ship the VM state to another machine");
     options.add_options()("t,target", "The webassembly file to execute",

src/wamr.cpp

@@ -11,9 +11,9 @@
  *  UC Santa Cruz Sluglab.
  */
 
+#include "mvvm_export.h"
 #include "wamr.h"
-#include "platform_api_vmcore.h"
-#include "platform_common.h"
+#include "wamr_platform_windows.h"
 #include "wamr_export.h"
 #include "wamr_native.h"
 #include "wamr_read_write.h"
@@ -39,7 +39,7 @@
 #include <windows.h>
 #endif
 
-WAMRInstance *wamr = nullptr;
+MVVM_API WAMRInstance *wamr = nullptr;
 std::ostringstream re{};
 WriteStream *writer;
 ReadStream *reader;