diff --git a/.github/workflows/runtime-ci.yml b/.github/workflows/runtime-ci.yml index 84120fe..cf9c6d4 100644 --- a/.github/workflows/runtime-ci.yml +++ b/.github/workflows/runtime-ci.yml @@ -30,7 +30,7 @@ jobs: matrix: BUILD_CONFIGURATION: [Release] MONO_WASM_THREADS: ['multithread', 'singlethread'] - + MONO_WASM_SIMD: ['true', 'false'] steps: - name: Setup .NET SDK @@ -49,6 +49,7 @@ jobs: echo "CurrentCommit=$CURRENT_COMMIT" echo "BUILD_CONFIGURATION=${{ matrix.BUILD_CONFIGURATION }}" >> $env:GITHUB_ENV echo "MONO_WASM_THREADS=${{ matrix.MONO_WASM_THREADS }}" >> $env:GITHUB_ENV + echo "MONO_WASM_SIMD=${{ matrix.MONO_WASM_SIMD }}" >> $env:GITHUB_ENV - name: Remove ccache from chocolatey run: | @@ -87,7 +88,7 @@ jobs: $env:EMSDK_PATH="$env:GITHUB_WORKSPACE\emsdk" $env:MonoEnableAssertMessages=true # enable emsdk assert messages cd runtime - .\build.cmd -arch wasm -os browser -subset mono+libs /p:RuntimeFlavor=Mono -c $env:BUILD_CONFIGURATION $env:ADDITIONAL_BUILD_ARGS /p:TestAssemblies=false "/p:MonoWasmBuildVariant=$env:MONO_WASM_THREADS" /p:CrossBuild=false /bl:ci-artifacts\msbuild.binlog + .\build.cmd -arch wasm -os browser -subset mono+libs /p:RuntimeFlavor=Mono -c $env:BUILD_CONFIGURATION $env:ADDITIONAL_BUILD_ARGS /p:TestAssemblies=false "/p:MonoWasmBuildVariant=$env:MONO_WASM_THREADS" "/p:WasmEnableSIMD=$MONO_WASM_SIMD" /p:CrossBuild=false /bl:ci-artifacts\msbuild.binlog # Move cross compiler to appropriate location move .\artifacts\bin\mono\Browser.wasm.Release\cross .\artifacts\bin\microsoft.netcore.app.runtime.browser-wasm\$env:BUILD_CONFIGURATION\runtimes\browser-wasm\native @@ -124,6 +125,10 @@ jobs: $archiveConfiguration="-threads"; } + if('${{ matrix.MONO_WASM_SIMD }}' -ne 'false') { + $archiveConfiguration="$archiveConfiguration-simd"; + } + Invoke-Expression "Get-Location | select -ExpandProperty Path" | Out-String -NoNewLine -OutVariable Current_Path $ARTIFACTS_FOLDER="$Current_Path\ci-artifacts" mkdir -p $ARTIFACTS_FOLDER @@ -148,6 +153,7 @@ jobs: matrix: BUILD_CONFIGURATION: [Release] MONO_WASM_THREADS: ['multithread', 'singlethread'] + MONO_WASM_SIMD: ['true', 'false'] steps: - name: Setup .NET SDK @@ -198,6 +204,7 @@ jobs: echo "CurrentCommit=$CURRENT_COMMIT" echo "BUILD_CONFIGURATION=${{ matrix.BUILD_CONFIGURATION }}" >> $GITHUB_ENV echo "MONO_WASM_THREADS=${{ matrix.MONO_WASM_THREADS }}" >> $GITHUB_ENV + echo "MONO_WASM_SIMD=${{ matrix.MONO_WASM_SIMD }}" >> $GITHUB_ENV - name: Clone dotnet/runtime run: | @@ -233,7 +240,7 @@ jobs: set -e export EMSDK_PATH=$HOME/emsdk cd runtime - ./build.sh -arch wasm -os browser -c $BUILD_CONFIGURATION $ADDITIONAL_BUILD_ARGS /p:TestAssemblies=false "/p:MonoWasmBuildVariant=$MONO_WASM_THREADS" + ./build.sh -arch wasm -os browser -c $BUILD_CONFIGURATION $ADDITIONAL_BUILD_ARGS /p:TestAssemblies=false "/p:MonoWasmBuildVariant=$MONO_WASM_THREADS" "/p:WasmEnableSIMD=$MONO_WASM_SIMD" # Mark AOT generation binaries executable chmod +x ./artifacts/bin/mono/browser.wasm.Release/cross/* @@ -267,6 +274,9 @@ jobs: if [ '${{ matrix.MONO_WASM_THREADS }}' != 'singlethread' ]; then ARCHIVE_CONFIGURATION="-threads"; fi + if [ '${{ matrix.MONO_WASM_SIMD }}' != 'false' ]; then + ARCHIVE_CONFIGURATION="$ARCHIVE_CONFIGURATION-simd"; + fi ARTIFACTS_FOLDER=`pwd`/ci-artifacts mkdir -p $ARTIFACTS_FOLDER