NativeAOT-LLVM Merge sep 23

.config/dotnet-tools.json

@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "8.0.0-prerelease.23321.2",
+      "version": "8.0.0-prerelease.23431.1",
       "commands": [
         "xharness"
       ]

.devcontainer/libraries/Dockerfile → .devcontainer/Dockerfile

@@ -1,22 +1,22 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/dotnet/.devcontainer/base.Dockerfile
 # For details on dotnet specific container, see: https://github.com/microsoft/vscode-dev-containers/tree/main/containers/dotnet
 
-# [Choice] .NET version: 6.0, 3.1
-ARG VARIANT="6.0-focal"
+# [Choice] .NET version: 6.0, 7.0
+ARG VARIANT="6.0-jammy"
 FROM mcr.microsoft.com/devcontainers/dotnet:0-${VARIANT}
 
 # Set up machine requirements to build the repo and the gh CLI
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y install --no-install-recommends \
         cmake \
-        llvm-10 \
-        clang-10 \
+        llvm \
+        clang \
         build-essential \
-        python \
+        python3 \
         curl \
         git \
-        lldb-6.0 \
-        liblldb-6.0-dev \
+        lldb \
+        liblldb-dev \
         libunwind8 \
         libunwind8-dev \
         gettext \

.devcontainer/devcontainer.json

@@ -0,0 +1,48 @@
+// For format details, see https://aka.ms/devcontainer.json.
+{
+	"name": "Standard configuration",
+	"build": {
+		"dockerfile": "Dockerfile",
+		"args": {
+			// Update 'VARIANT' to pick a .NET Core version: 6.0, 7.0
+			"VARIANT": "6.0-jammy"
+		}
+	},
+	"hostRequirements": {
+		"cpus": 4,
+		"memory": "8gb"
+	},
+
+	"features": {
+		"ghcr.io/devcontainers/features/github-cli:1": {}
+	},
+
+	// Configure tool-specific properties.
+	"customizations": {
+		// Configure properties specific to VS Code.
+		"vscode": {
+			// Add the IDs of extensions you want installed when the container is created.
+			"extensions": [
+				"ms-dotnettools.csharp"
+			],
+			"settings": {
+				// Loading projects on demand is better for larger codebases
+				"omnisharp.enableMsBuildLoadProjectsOnDemand": true,
+				"omnisharp.enableRoslynAnalyzers": true,
+				"omnisharp.enableEditorConfigSupport": true,
+				"omnisharp.enableAsyncCompletion": true,
+				"omnisharp.testRunSettings": "${containerWorkspaceFolder}/artifacts/obj/vscode/.runsettings"
+			}
+		}
+	},
+
+	// Add the locally installed dotnet to the path to ensure that it is activated
+	// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
+	"remoteEnv": {
+		"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
+		"DOTNET_MULTILEVEL_LOOKUP": "0"
+	},
+
+	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode"
+}

.devcontainer/libraries/devcontainer.json

@@ -1,12 +1,11 @@
 // For format details, see https://aka.ms/devcontainer.json.
 {
-	"name": "C# (.NET)",
+	"name": "Libraries/Runtime development (prebuilt)",
 	"build": {
-		"dockerfile": "Dockerfile",
+		"dockerfile": "../Dockerfile",
 		"args": {
-			// Update 'VARIANT' to pick a .NET Core version: 3.1, 6.0
-			// Append -bullseye or -focal to pin to an OS version.
-			"VARIANT": "6.0-focal"
+			// Update 'VARIANT' to pick a .NET Core version: 6.0, 7.0
+			"VARIANT": "6.0-jammy"
 		}
 	},
 	"hostRequirements": {

.devcontainer/scripts/onCreateCommand.sh

@@ -19,7 +19,7 @@ case "$opt" in
         ./build.sh mono+libs -os browser -c Release
 
         # install dotnet-serve for running wasm samples
-        ./dotnet.sh tool install dotnet-serve --tool-path ./.dotnet-tools-global
+        ./dotnet.sh tool install dotnet-serve --version 1.10.172 --tool-path ./.dotnet-tools-global
     ;;
 esac
 

.devcontainer/wasm/Dockerfile

@@ -1,22 +1,22 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/dotnet/.devcontainer/base.Dockerfile
 # For details on dotnet specific container, see: https://github.com/microsoft/vscode-dev-containers/tree/main/containers/dotnet
 
-# [Choice] .NET version: 6.0, 3.1
-ARG VARIANT="6.0-focal"
+# [Choice] .NET version: 6.0, 7.0
+ARG VARIANT="6.0-jammy"
 FROM mcr.microsoft.com/devcontainers/dotnet:0-${VARIANT}
 
 # Set up machine requirements to build the repo and the gh CLI
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y install --no-install-recommends \
         cmake \
-        llvm-10 \
-        clang-10 \
+        llvm \
+        clang \
         build-essential \
-        python \
+        python3 \
         curl \
         git \
-        lldb-6.0 \
-        liblldb-6.0-dev \
+        lldb \
+        liblldb-dev \
         libunwind8 \
         libunwind8-dev \
         gettext \

.devcontainer/wasm/devcontainer.json

@@ -1,12 +1,11 @@
 // For format details, see https://aka.ms/devcontainer.json.
 {
-	"name": "C# (.NET)",
+	"name": "WASM development (prebuilt)",
 	"build": {
 		"dockerfile": "Dockerfile",
 		"args": {
-			// Update 'VARIANT' to pick a .NET Core version: 3.1, 6.0
-			// Append -bullseye or -focal to pin to an OS version.
-			"VARIANT": "6.0-focal"
+			// Update 'VARIANT' to pick a .NET Core version: 6.0, 7.0
+			"VARIANT": "6.0-jammy"
 		}
 	},
 	"hostRequirements": {

.gitattributes

@@ -16,6 +16,8 @@
 *.png 	binary
 *.gif 	binary
 
+*.lss 	text
+
 # Force bash scripts to always use lf line endings so that if a repo is accessed
 # in Unix via a file share from Windows, the scripts will work.
 *.in text eol=lf

.github/CODEOWNERS-stop-notifications

@@ -39,14 +39,15 @@
 /src/mono/mono/mini @vargaz @lambdageek @SamMonoRT
 /src/mono/mono/mini/*cfgdump* @vargaz
 /src/mono/mono/mini/*exceptions* @vargaz @BrzVlad
-/src/mono/mono/mini/*llvm* @vargaz
+/src/mono/mono/mini/*llvm* @vargaz @fanyang-mono
 /src/mono/mono/mini/*ppc* @vargaz
 /src/mono/mono/mini/*profiler* @BrzVlad @lambdageek
 /src/mono/mono/mini/*riscv* @vargaz @lambdageek
 /src/mono/mono/mini/*type-check* @lambdageek
 /src/mono/mono/mini/debugger-agent.c @vargaz @thaystg @lambdageek
 /src/mono/mono/mini/interp/* @BrzVlad @vargaz @kotlarmilos
 /src/mono/mono/mini/interp/*jiterp* @kg
+/src/mono/mono/mini/*simd* @fanyang-mono
 
 /src/mono/mono/profiler @BrzVlad @lambdageek
 /src/mono/mono/sgen @BrzVlad @lambdageek @SamMonoRT

.github/fabricbot.json

@@ -59,6 +59,15 @@
             "vargaz"
           ]
         },
+        {
+          "labels": [
+            "area-Codegen-Intrinsics-mono"
+          ],
+          "mentionees": [
+            "SamMonoRT",
+            "fanyang-mono"
+          ]
+        },
         {
           "labels": [
             "area-CodeGen-meta-Mono"
@@ -218,7 +227,7 @@
         },
         {
           "labels": [
-            "area-ILVerification"
+            "area-Tools-ILVerification"
           ],
           "mentionees": [
             "JulieLeeMSFT"
@@ -2131,6 +2140,18 @@
                   "label": "area-Tools-ILLink"
                 }
               },
+              {
+                "name": "hasLabel",
+                "parameters": {
+                  "label": "area-Interop-coreclr"
+                }
+              },
+              {
+                "name": "hasLabel",
+                "parameters": {
+                  "label": "area-System.Runtime.InteropServices"
+                }
+              },
               {
                 "name": "labelAdded",
                 "parameters": {
@@ -2166,6 +2187,18 @@
                 "parameters": {
                   "label": "area-Tools-ILLink"
                 }
+              },
+              {
+                "name": "labelAdded",
+                "parameters": {
+                  "label": "area-Interop-coreclr"
+                }
+              },
+              {
+                "name": "labelAdded",
+                "parameters": {
+                  "label": "area-System.Runtime.InteropServices"
+                }
               }
             ]
           },

.github/workflows/bump-chrome-version.yml

@@ -0,0 +1,74 @@
+name: Update Chrome Version used for wasm testing
+
+permissions:
+  contents: write
+  pull-requests: write
+
+on:
+  schedule:
+    - cron: '0 0 * * 0'
+
+  workflow_dispatch:
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Branch
+        run: |
+          git config user.name github-actions[bot]
+          git config user.email github-actions[bot]@users.noreply.github.com
+          git checkout -b update-chrome-version-${{ github.run_id }}
+
+      - name: Run UpdateToLatestVersion
+        run: >-
+          make -C src/mono/wasm build-tasks &&
+          .dotnet/dotnet build eng/testing/bump-chrome-version.proj -p:Configuration=Release &&
+          git add eng/testing/ChromeVersions.props &&
+          cat eng/testing/bump-chrome-pr.env >> "$GITHUB_ENV"
+
+      - name: Check for changes
+        id: check_changes
+        run: |
+          echo "has_changes=$(git diff-index --quiet HEAD && echo false || echo true)" >> $GITHUB_OUTPUT
+
+      - name: Commit Update
+        run: |
+          echo steps.check_changes.outputs.has_changes=${{steps.check_changes.outputs.has_changes}}
+          if ${{steps.check_changes.outputs.has_changes}} == 'true'; then
+            git commit -m "Automated bump of chrome version"
+            git push --set-upstream origin update-chrome-version-${{ github.run_id }}
+          else
+            echo "No changes detected."
+          fi
+
+      - name: Create PR
+        if: steps.check_changes.outputs.has_changes == 'true'
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const { CHROME_LINUX_VER, CHROME_WIN_VER } = process.env;
+            const title = `[wasm] Bump chrome for testing - linux: ${CHROME_LINUX_VER}, windows: ${CHROME_WIN_VER}`;
+            const { data: pullRequest } = await github.rest.pulls.create({
+              base: context.ref,
+              head: "update-chrome-version-${{ github.run_id }}",
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              title: title,
+              body: ''
+            });
+            await github.rest.issues.setLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: pullRequest.number,
+              labels: ['arch-wasm', 'area-infrastructure-mono']
+            });
+            await github.rest.pulls.requestReviewers({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: pullRequest.number,
+              reviewers: ["lewing", "pavelsavara", "maraf", "ilonatommy", "radical"]
+            });
+            return pullRequest.number;

.gitignore

@@ -326,6 +326,7 @@ Vagrantfile
 CMakeFiles/
 cmake_install.cmake
 CMakeCache.txt
+CMakeUserPresets.json
 
 # Cross compilation
 cross/rootfs/*