diff --git a/.gitmodules b/.gitmodules index c5aadcbc8d71..f363c608cb8c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -56,6 +56,3 @@ [submodule "third_party/mlir-hlo"] path = third_party/mlir-hlo url = https://github.com/tensorflow/mlir-hlo.git -[submodule "third_party/wasm-micro-runtime"] - path = third_party/wasm-micro-runtime - url = https://github.com/bytecodealliance/wasm-micro-runtime.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 752b05f4004f..e3d7b27565f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -385,7 +385,6 @@ add_subdirectory(build_tools/third_party/half EXCLUDE_FROM_ALL) add_subdirectory(build_tools/third_party/pffft EXCLUDE_FROM_ALL) add_subdirectory(build_tools/third_party/renderdoc_api EXCLUDE_FROM_ALL) add_subdirectory(build_tools/third_party/vulkan_memory_allocator EXCLUDE_FROM_ALL) -add_subdirectory(build_tools/third_party/wasm-micro-runtime EXCLUDE_FROM_ALL) add_subdirectory(third_party/cpuinfo EXCLUDE_FROM_ALL) add_subdirectory(third_party/googletest EXCLUDE_FROM_ALL) diff --git a/SUBMODULE_VERSIONS.txt b/SUBMODULE_VERSIONS.txt index 561f7c982c43..fd2c825ca291 100644 --- a/SUBMODULE_VERSIONS.txt +++ b/SUBMODULE_VERSIONS.txt @@ -17,4 +17,3 @@ f8bf11a0253a32375c32cad92c841237b96696c0 third_party/spirv_headers e35d02186d00eff26ec6c698331a0767a28a51b0 third_party/tracy 9bd3f561bcee3f01d22912de10bb07ce4e23d378 third_party/vulkan_headers 3528e2aed3e8808f33e1e7d63eeb1560456a605a third_party/vulkan_memory_allocator -54e82ec439552018d0f26c60b0fd6cc9e36b42a8 third_party/wasm-micro-runtime diff --git a/build_tools/third_party/wasm-micro-runtime/CMakeLists.txt b/build_tools/third_party/wasm-micro-runtime/CMakeLists.txt deleted file mode 100644 index 21a2c7f5b245..000000000000 --- a/build_tools/third_party/wasm-micro-runtime/CMakeLists.txt +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2021 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# This file modeled after the instructions at -# https://github.com/bytecodealliance/wasm-micro-runtime/blob/main/doc/build_wamr.md - -set(WAMR_SOURCE_DIR "${IREE_SOURCE_DIR}/third_party/wasm-micro-runtime") - -# Runtime build target -> platform in wasm-micro-runtime/core/shared/platform/ -if(ANDROID) - set(WAMR_BUILD_PLATFORM "android") -elseif(APPLE) - set(WAMR_BUILD_PLATFORM "darwin") -elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(WAMR_BUILD_PLATFORM "linux") -elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") - set(WAMR_BUILD_PLATFORM "windows") - # Enable MASM (Microsoft Macro Assembler) for compiling .asm files. - enable_language(ASM_MASM) -endif() - -# Pick the features we want. Most default to disabled. -set(WAMR_BUILD_INTERP 1) - -include(${WAMR_SOURCE_DIR}/build-scripts/runtime_lib.cmake) - -# WAMR unconditionally adds a global compiler flag for 64 bit targets, which -# is not handled or needed by MSVC. -# TODO(scotttodd): Omit the flag upstream rather than work around it here. -if(MSVC) - string(REGEX REPLACE " -fPIC" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) -endif() - -set(_WAMR_LIBRARY_NAME "wasm_micro_runtime_vmlib") -add_library(${_WAMR_LIBRARY_NAME} STATIC "") -target_sources(${_WAMR_LIBRARY_NAME} - PRIVATE - ${WAMR_RUNTIME_LIB_SOURCE}) -target_include_directories(${_WAMR_LIBRARY_NAME} SYSTEM - PUBLIC - "$") - -# Suppress all warnings for this third party code. -if(MSVC) - target_compile_options(${_WAMR_LIBRARY_NAME} PRIVATE "/W0") -else() - target_compile_options(${_WAMR_LIBRARY_NAME} PRIVATE "-w") -endif() diff --git a/third_party/wasm-micro-runtime b/third_party/wasm-micro-runtime deleted file mode 160000 index 54e82ec43955..000000000000 --- a/third_party/wasm-micro-runtime +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 54e82ec439552018d0f26c60b0fd6cc9e36b42a8