Merge branch 'main' into InstantiationArgs2-wasinn

Author: zhanheng1

.clang-tidy

@@ -1,16 +1,49 @@
 # refer to https://clang.llvm.org/extra/clang-tidy/checks/list.html
+#
+# Configure clang-tidy for this project.
+
+# Here is an explanation for why some of the checks are disabled:
+#
+
+Checks: >
+  -*,
+  bugprone-*,
+  cert-*,
+  clang-analyzer-*,
+  concurrency-*,
+  misc-*,
+  modernize-*,
+  performance-*,
+  portability-*,
+  readability-*,
+  -bugprone-easily-swappable-parameters,
+  -bugprone-macro-parentheses,
+  -misc-no-recursion,
+  -misc-unused-parameters,
+  -readability-braces-around-statements,
+  -readability-else-after-return,
+  -readability-function-cognitive-complexity,
+  -readability-identifier-length,
+  -readability-isolate-declaration,
+  -readability-magic-numbers,
+  -readability-named-parameter,
+  -readability-non-const-parameter,
+  -readability-redundant-preprocessor,
+  -readability-suspicious-call-argument,
+  -readability-uppercase-literal-suffix
+
+
+# Turn all the warnings from the checks above into errors.
+WarningsAsErrors: "*"
+
+# headers in the following directories will be checked:
+#   - core/iwasm/
+#   - core/shared/
+HeaderFilterRegex: '(core/iwasm/|core/shared/).*\\.h$'
+
+# goto .clang-format at root directory to see the format style
+FormatStyle: file
 
-Checks:  '-*, readability-identifier-naming, clang-analyzer-core.*,'
-WarningsAsErrors:    '-*'
-HeaderFilterRegex:   ''
-FormatStyle:         file
-InheritParentConfig: false
-AnalyzeTemporaryDtors: false
-User:                wamr
 CheckOptions:
-  - key:             readability-identifier-naming.VariableCase
-    value:           lower_case
-  - key:             readability-identifier-naming.ParameterCase
-    value:           lower_case
-  - key:             readability-identifier-naming.MacroDefinitionCase
-    value:           UPPER_CASE
+  - { key: readability-identifier-naming.NamespaceCase, value: lower_case }
+  - { key: readability-function-cognitive-complexity.Threshold, value: 100 }

.devcontainer/Dockerfile

@@ -1,150 +1,42 @@
 # Copyright (C) 2019 Intel Corporation.  All rights reserved.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/cpp/.devcontainer/base.Dockerfile
-# [Choice] Debian / Ubuntu version (use Debian 12/11/9, Ubuntu 18.04/21.04 on local arm64/Apple Silicon): debian-12, debian-11, debian-10, debian-9, ubuntu-21.04, ubuntu-20.04, ubuntu-18.04
+# hadolint global ignore=DL3008,DL3009
+
 ARG VARIANT=debian-12
-FROM mcr.microsoft.com/vscode/devcontainers/cpp:${VARIANT}
+FROM mcr.microsoft.com/devcontainers/cpp:${VARIANT}
 
 ARG DEBIAN_FRONTEND=noninteractive
-ENV TZ=Asian/Shanghai
+ENV TZ=Asia/Shanghai
 
-# hadolint ignore=DL3008
 RUN apt-get update \
-  && apt-get upgrade -y \
-  && apt-get install -y apt-transport-https apt-utils build-essential \
-  ca-certificates ccache cmake curl g++-multilib git gnupg \
-  libgcc-12-dev lib32gcc-12-dev lsb-release \
-  ninja-build ocaml ocamlbuild \
-  software-properties-common tree tzdata \
-  unzip valgrind vim wget zip --no-install-recommends \
-  && apt-get clean -y \
-  && rm -rf /var/lib/apt/lists/*
-
-#
-# binaryen
-ARG BINARYEN_VER=114
-WORKDIR /opt
-RUN wget -c --progress=dot:giga https://github.com/WebAssembly/binaryen/releases/download/version_${BINARYEN_VER}/binaryen-version_${BINARYEN_VER}-x86_64-linux.tar.gz \
-  && tar xf binaryen-version_${BINARYEN_VER}-x86_64-linux.tar.gz \
-  && ln -sf /opt/binaryen-version_${BINARYEN_VER} /opt/binaryen \
-  && rm binaryen-version_${BINARYEN_VER}-x86_64-linux.tar.gz
-
-#
-# CMAKE (https://apt.kitware.com/)
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-# hadolint ignore=DL3008
-ARG CMAKE_VER=3.27.0
-RUN wget https://github.com/Kitware/CMake/releases/download/v${CMAKE_VER}/cmake-${CMAKE_VER}-Linux-x86_64.sh \
-      -q -O /tmp/cmake-install.sh \
-      && chmod u+x /tmp/cmake-install.sh \
-      && mkdir /opt/cmake-${CMAKE_VER} \
-      && /tmp/cmake-install.sh --skip-license --prefix=/opt/cmake-${CMAKE_VER} \
-      && rm /tmp/cmake-install.sh \
-      && ln -s /opt/cmake-${CMAKE_VER}/bin/* /usr/local/bin
-
-#
-# install emsdk
-WORKDIR /opt
-RUN git clone https://github.com/emscripten-core/emsdk.git
-
-ARG EMSDK_VER=3.1.43
-WORKDIR /opt/emsdk
-RUN  git pull \
-  && ./emsdk install ${EMSDK_VER} \
-  && ./emsdk activate ${EMSDK_VER} \
-  && echo "source /opt/emsdk/emsdk_env.sh" >> /root/.bashrc
-
-#
-# install wasi-sdk
-ARG WASI_SDK_VER=20
-RUN wget -c --progress=dot:giga https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VER}/wasi-sdk-${WASI_SDK_VER}.0-linux.tar.gz -P /opt \
-  && tar xf /opt/wasi-sdk-${WASI_SDK_VER}.0-linux.tar.gz -C /opt \
-  && ln -sf /opt/wasi-sdk-${WASI_SDK_VER}.0 /opt/wasi-sdk \
-  && rm /opt/wasi-sdk-${WASI_SDK_VER}.0-linux.tar.gz
-
-#
-#install wabt
-ARG WABT_VER=1.0.33
-RUN wget -c --progress=dot:giga https://github.com/WebAssembly/wabt/releases/download/${WABT_VER}/wabt-${WABT_VER}-ubuntu.tar.gz -P /opt \
-  && tar xf /opt/wabt-${WABT_VER}-ubuntu.tar.gz -C /opt \
-  && ln -sf /opt/wabt-${WABT_VER} /opt/wabt \
-  && rm /opt/wabt-${WABT_VER}-ubuntu.tar.gz
+  && apt-get upgrade -y
 
-#
-# install bazelisk
-ARG BAZELISK_VER=1.17.0
-RUN mkdir /opt/bazelisk \
-  && wget -c --progress=dot:giga https://github.com/bazelbuild/bazelisk/releases/download/v${BAZELISK_VER}/bazelisk-linux-amd64 -P /opt/bazelisk \
-  && chmod a+x /opt/bazelisk/bazelisk-linux-amd64 \
-  && ln -fs /opt/bazelisk/bazelisk-linux-amd64 /opt/bazelisk/bazel
-
-#
-# install clang+llvm
-ARG LLVM_VER=16
-RUN apt-get purge -y clang-14 llvm-14 && apt-get autoremove -y
-WORKDIR /etc/apt/apt.conf.d
-RUN touch 99verfiy-peer.conf \
-  && echo "Acquire { https::Verify-Peer false }" > 99verfiy-peer.conf
-
-WORKDIR /tmp
-#RUN wget --progress=dot:giga https://apt.llvm.org/llvm.sh \
-#  && chmod a+x ./llvm.sh \
-#  && ./llvm.sh ${LLVM_VER} all
-
-# Workaround due to https://github.com/llvm/llvm-project/issues/62475
-# hadolint ignore=DL3008
-RUN set -ex \
-    && echo "deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-${LLVM_VER} main" > /etc/apt/sources.list.d/apt.llvm.org.list \
-    && wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc \
-    && apt-get update \
-    && apt-get install -y \
-    clang-${LLVM_VER} lldb-${LLVM_VER} lld-${LLVM_VER} clangd-${LLVM_VER} clang-tidy-${LLVM_VER} clang-format-${LLVM_VER} clang-tools-${LLVM_VER} \
-    llvm-${LLVM_VER}-dev lld-${LLVM_VER} lldb-${LLVM_VER} llvm-${LLVM_VER}-tools libomp-${LLVM_VER}-dev libc++-${LLVM_VER}-dev libc++abi-${LLVM_VER}-dev \
-    libclang-common-${LLVM_VER}-dev libclang-${LLVM_VER}-dev libclang-cpp${LLVM_VER}-dev libunwind-${LLVM_VER}-dev \
-    libclang-rt-${LLVM_VER}-dev libpolly-${LLVM_VER}-dev --no-install-recommends \
-    && apt-get clean -y \
-    && rm -rf /var/lib/apt/lists/*
-
-#
-# [Optional]
-
-#
-# Install pip
-# hadolint ignore=DL3008
 RUN apt-get update \
-  && apt-get install -y --reinstall python3-venv python3-pip --no-install-recommends \
-  && apt-get clean -y \
-  && rm -rf /var/lib/apt/lists/*
+  && apt-get install -y apt-transport-https apt-utils build-essential \
+      ca-certificates ccache clang-format-14 curl file g++-multilib git gnupg \
+      libgcc-12-dev lib32gcc-12-dev libzstd-dev lsb-release \
+      ninja-build ocaml ocamlbuild opam \
+      python3-venv python3-pip \
+      software-properties-common tree tzdata \
+      unzip valgrind vim wget zip --no-install-recommends
 
-#
-# Install required python packages
-# hadolint ignore=DL3013
-RUN python3 -m pip install --no-cache-dir --break-system-packages --upgrade pip \
-  && pip3 install --no-cache-dir --break-system-packages black nose pycparser pylint
+WORKDIR /opt
 
-#
-# Install github-cli. It doens't work as a feature of devcontainer.json
-ARG GH_CLI_VER=2.32.0
-WORKDIR /tmp
-RUN wget -q https://github.com/cli/cli/releases/download/v${GH_CLI_VER}/gh_${GH_CLI_VER}_linux_amd64.deb \
-  && dpkg -i gh_${GH_CLI_VER}_linux_amd64.deb
+ARG WASI_SDK_VER=25
+RUN wget -c --progress=dot:giga https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VER}/wasi-sdk-${WASI_SDK_VER}.0-x86_64-linux.tar.gz -P /tmp \
+  && tar xf /tmp/wasi-sdk-${WASI_SDK_VER}.0-x86_64-linux.tar.gz -C /opt \
+  && ln -sf /opt/wasi-sdk-${WASI_SDK_VER}.0-x86_64-linux /opt/wasi-sdk
 
-#
-# Install NodeJS
-RUN wget -qO- https://deb.nodesource.com/setup_20.x | bash -
-# hadolint ignore=DL3008
-RUN apt-get install -y nodejs --no-install-recommends
+ARG WABT_VER=1.0.37
+RUN wget -c --progress=dot:giga https://github.com/WebAssembly/wabt/releases/download/${WABT_VER}/wabt-${WABT_VER}-ubuntu-20.04.tar.gz -P /tmp \
+  && tar xf /tmp/wabt-${WABT_VER}-ubuntu-20.04.tar.gz -C /opt \
+  && ln -sf /opt/wabt-${WABT_VER} /opt/wabt
 
 # set path
-ENV PATH="/opt/bazelisk:/usr/lib/llvm-${LLVM_VER}/bin:${PATH}"
-ENV CC=/usr/lib/llvm-${LLVM_VER}/bin/clang CXX=/usr/lib/llvm-${LLVM_VER}/bin/clang++
-RUN printf "%s\n" "PS1='\n[ \u@wamr-dev-docker \W ]\n$ '" >> /root/.bashrc \
-  && apt-get autoremove -y \
+
+# clean up
+RUN apt-get autoremove -y \
   && apt-get clean -y \
   && rm -rf /var/lib/apt/lists/* \
   && rm -rf /tmp/*
-
-# set workdir when container run
-VOLUME /workspaces
-WORKDIR /workspaces

.devcontainer/devcontainer.json

@@ -1,50 +1,29 @@
-// Copyright (C) 2019 Intel Corporation.  All rights reserved.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/cpp
 {
   "name": "WAMR-Dev",
   "build": {
     "dockerfile": "Dockerfile",
-    // Update 'VARIANT' to pick an Debian / Ubuntu OS version: debian-12, debian-11, debian-10, debian-9, ubuntu-21.04, ubuntu-20.04, ubuntu-18.04
-    // Use Debian 12, Debian 11, Debian 9, Ubuntu 18.04 or Ubuntu 21.04 on local arm64/Apple Silicon
     "args": {
-      "BINARYEN_VER": "114",
-      "BAZELISK_VER": "1.17.0",
-      "CMAKE_VER": "3.27.0",
-      "EMSDK_VER": "3.1.43",
-      "GH_CLI_VER": "2.32.0",
-      "LLVM_VER": "16",
       "VARIANT": "debian-12",
-      "WASI_SDK_VER": "20",
-      "WABT_VER": "1.0.33"
+      "WASI_SDK_VER": "25",
+      "WABT_VER": "1.0.37"
     }
   },
   "runArgs": [
     "--cap-add=SYS_PTRACE",
     "--security-opt",
     "seccomp=unconfined"
   ],
-  // Configure tool-specific properties.
   "customizations": {
-    // Configure properties specific to VS Code.
     "vscode": {
-      // Set *default* container specific settings.json values on container create.
       "settings": {},
-      // Add the IDs of extensions you want installed when the container is created.
       "extensions": [
         "dtsvet.vscode-wasm",
-        "llvm-vs-code-extensions.vscode-clangd",
         "ms-python.python",
         "ms-python.vscode-pylance",
         "ms-vscode.cmake-tools"
       ]
     }
   },
-  // Use 'forwardPorts' to make a list of ports inside the container available locally.
-  // "forwardPorts": [],
-  // Use 'postCreateCommand' to run commands after the container is created.
-  "postCreateCommand": "curl https://sh.rustup.rs -sSf | bash -s -- -y",
-  // Comment out this line to run as root instead.
+  "postCreateCommand": "bash .devcontainer/finalize.sh",
   "remoteUser": "vscode"
 }

.devcontainer/finalize.sh

@@ -0,0 +1,18 @@
+echo "Running finalize script..."
+
+#
+# Python Package Installation
+#
+echo "--- Installing Python Dependencies\n"
+
+# Upgrade pip first
+python3 -m pip install --no-cache-dir --break-system-packages --upgrade pip
+# Install required packages
+pip3 install --no-cache-dir --break-system-packages -r .devcontainer/requirements.txt
+
+echo "--- Installing Ocaml stuff\n"
+opam init --yes --shell-setup
+eval $(opam env --switch=default)
+opam install --yes dune menhir
+
+echo "Finalize script completed. ✅"

.devcontainer/requirements.txt

@@ -0,0 +1,5 @@
+black
+nose
+pycparser
+pylint
+requests

.github/actions/install-wasi-sdk-wabt/action.yml

@@ -50,18 +50,18 @@ runs:
         echo "::notice::wasi-sdk-25 and wabt-1.0.37 installed on ubuntu"
       working-directory: /opt
 
-    - name: Set up wasi-sdk and wabt on macOS-13 (intel)
-      if: ${{ inputs.os == 'macos-13' }}
+    - name: Set up wasi-sdk and wabt on macOS on Intel
+      if: ${{ inputs.os == 'macos-15-intel' }}
       shell: bash
       run: |
-        echo "Downloading wasi-sdk for macOS-13..."
+        echo "Downloading wasi-sdk for macOS on Intel..."
         sudo wget -O wasi-sdk.tar.gz --progress=dot:giga https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-x86_64-macos.tar.gz
 
         echo "Extracting wasi-sdk..."
         sudo tar -xf wasi-sdk.tar.gz
         sudo ln -sf  wasi-sdk-25.0-x86_64-macos wasi-sdk
 
-        echo "Downloading wabt for macOS-13..."
+        echo "Downloading wabt for macOS on Intel..."
         sudo wget -O wabt.tar.gz     --progress=dot:giga https://github.com/WebAssembly/wabt/releases/download/1.0.36/wabt-1.0.36-macos-12.tar.gz
 
         echo "Extracting wabt..."
@@ -71,21 +71,21 @@ runs:
         /opt/wasi-sdk/bin/clang --version
         /opt/wabt/bin/wasm-interp --version
 
-        echo "::notice::wasi-sdk-25 and wabt-1.0.36 installed on macos-13"
+        echo "::notice::wasi-sdk-25 and wabt-1.0.36 installed on ${{ inputs.os }}"
       working-directory: /opt
 
-    - name: Set up wasi-sdk and wabt on macOS-14 (arm64)
-      if: ${{ inputs.os == 'macos-14' }}
+    - name: Set up wasi-sdk and wabt on macOS on ARM
+      if: ${{ inputs.os == 'macos-15' }}
       shell: bash
       run: |
-        echo "Downloading wasi-sdk for macOS-14..."
+        echo "Downloading wasi-sdk for macOS on ARM..."
         sudo wget -O wasi-sdk.tar.gz --progress=dot:giga https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-arm64-macos.tar.gz
 
         echo "Extracting wasi-sdk..."
         sudo tar -xf wasi-sdk.tar.gz
         sudo ln -sf  wasi-sdk-25.0-arm64-macos wasi-sdk
 
-        echo "Downloading wabt for macOS-14..."
+        echo "Downloading wabt for macOS on ARM..."
         sudo wget -O wabt.tar.gz     --progress=dot:giga https://github.com/WebAssembly/wabt/releases/download/1.0.37/wabt-1.0.37-macos-14.tar.gz
 
         echo "Extracting wabt..."
@@ -95,7 +95,7 @@ runs:
         /opt/wasi-sdk/bin/clang --version
         /opt/wabt/bin/wasm-interp --version
 
-        echo "::notice::wasi-sdk-25 and wabt-1.0.37 installed on macos-14"
+        echo "::notice::wasi-sdk-25 and wabt-1.0.37 installed on ${{ inputs.os }}"
       working-directory: /opt
 
     - name: Set up wasi-sdk and wabt on Windows