Add M1 build to build-toolchain.yml for 5.4 (#3528)

Cherry-pick of #3463 for the 5.4 release branch.

Author: MaxDesiatov

.github/workflows/build-toolchain.yml

@@ -15,30 +15,52 @@ jobs:
   build_toolchain:
     env:
       TOOLCHAIN_CHANNEL: 5.4
+      DEVELOPER_DIR: /Applications/Xcode_12.5.app/Contents/Developer/
     strategy:
       matrix:
         include:
           - build_os: ubuntu-18.04
+            agent_query: ubuntu-18.04
             target: ubuntu18.04_x86_64
+            run_stdlib_test: false
             run_full_test: false
             run_e2e_test: true
             build_hello_wasm: true
+            clean_build_dir: false
 
           - build_os: ubuntu-20.04
+            agent_query: ubuntu-20.04
             target: ubuntu20.04_x86_64
+            run_stdlib_test: false
             run_full_test: false
             run_e2e_test: true
             build_hello_wasm: true
+            clean_build_dir: false
 
-          - build_os: macos-10.15
+          - build_os: macos-11
+            agent_query: macos-11
             target: macos_x86_64
+            run_stdlib_test: true
             run_full_test: true
             run_e2e_test: true
             build_hello_wasm: true
+            clean_build_dir: false
+
+          - build_os: macos-11
+            agent_query: [self-hosted, macOS, ARM64]
+            target: macos_arm64
+            # FIXME: Enable stdlib test after wasmer fixes singlepass bug on arm64,
+            # fixes cranelift bug on x64, or wasmtime supports arm64
+            # Currently it's hard to run tests on both x64 and arm64.
+            run_stdlib_test: false
+            run_full_test: false
+            run_e2e_test: false
+            build_hello_wasm: true
+            clean_build_dir: true
 
     name: Target ${{ matrix.target }}
     timeout-minutes: 0
-    runs-on: ${{ matrix.build_os }}
+    runs-on: ${{ matrix.agent_query }}
     steps:
       - name: Free disk space
         if: ${{ matrix.build_os == 'ubuntu-20.04' || matrix.build_os == 'ubuntu-18.04' }}
@@ -65,26 +87,33 @@ jobs:
           string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
           message("::set-output name=timestamp::${current_date}")
 
+      - name: Check Xcode version
+        if: ${{ startsWith(matrix.build_os, 'macos-') }}
+        run: |
+          xcodebuild -version
+
       - uses: actions/cache@v1
         with:
           path: build-cache
           key: ${{ matrix.target }}-sccache-v10-${{ steps.cache_timestamp.outputs.timestamp }}
           restore-keys: |
             ${{ matrix.target }}-sccache-v10-
 
-      - name: Select Xcode version
-        if: ${{ matrix.build_os == 'macos-10.15' }}
+      - name: Clean stdlib build directory
+        if: ${{ matrix.clean_build_dir }}
         run: |
-          sudo xcode-select --switch /Applications/Xcode_12.3.app/Contents/Developer/
-          xcodebuild -version
+          rm -rf ${{ github.workspace }}/target-build \
+            ${{ github.workspace }}/host-build \
+            ${{ github.workspace }}/host-toolchain-sdk \
+            ${{ github.workspace }}/dist-toolchain-sdk
 
       - name: Build ${{ matrix.target }} installable archive
         env:
           SKIP_XCODE_VERSION_CHECK: 1
         run: |
 
           case "${{ matrix.target }}" in
-            "ubuntu20.04_x86_64" | "ubuntu18.04_x86_64" | "macos_x86_64")
+            "ubuntu20.04_x86_64" | "ubuntu18.04_x86_64" | "macos_x86_64" | "macos_arm64")
               ./swift/utils/webassembly/ci.sh
             ;;
             *)
@@ -99,6 +128,23 @@ jobs:
           name: ${{ matrix.target }}-installable
           path: swift-wasm-${{ env.TOOLCHAIN_CHANNEL }}-SNAPSHOT-${{ matrix.target }}.tar.gz
 
+      - name: Add wasmer in PATH for testing
+        run: echo "$HOME/.wasmer/bin" >> $GITHUB_PATH
+
+      - name: Run stdlib tests for wasi-wasm32
+        if: ${{ matrix.run_stdlib_test }}
+        run: |
+          TARGET_STDLIB_BUILD_DIR=${{ github.workspace }}/target-build/swift-stdlib-wasi-wasm32
+          ./swift/utils/run-test --build-dir "$TARGET_STDLIB_BUILD_DIR" --target wasi-wasm32 \
+            "$TARGET_STDLIB_BUILD_DIR/test-wasi-wasm32/stdlib"
+
+      - name: Run all tests for wasi-wasm32
+        if: ${{ matrix.run_full_test }}
+        run: |
+          TARGET_STDLIB_BUILD_DIR=${{ github.workspace }}/target-build/swift-stdlib-wasi-wasm32
+          # Run all tests but ignore failure temporarily
+          ninja check-swift-wasi-wasm32 -C "$TARGET_STDLIB_BUILD_DIR" || true
+
       - name: Pack test results
         if: ${{ matrix.run_full_test }}
         run: |
@@ -143,4 +189,3 @@ jobs:
         run: |
           swift run # Use TOOLCHAIN env value
         working-directory: ${{ github.workspace }}/integration-tests
-

utils/webassembly/ci.sh

@@ -28,29 +28,10 @@ TARGET_STDLIB_BUILD_DIR=$SOURCE_PATH/target-build/swift-stdlib-wasi-wasm32
 $DEPENDENCIES_SCRIPT
 $UTILS_PATH/install-build-sdk.sh
 
-export PATH="$HOME/.wasmer/bin:$PATH"
-
 export SCCACHE_CACHE_SIZE="50G"
 export SCCACHE_DIR="$SOURCE_PATH/build-cache"
 
 $BUILD_SCRIPT
 
-echo "Build script completed, will attempt to run test suites..."
-
 # workaround: host target test directory is necessary to use run-test
 mkdir -p "$TARGET_STDLIB_BUILD_DIR/test-$HOST_SUFFIX"
-
-# Run tests
-$RUN_TEST_BIN --build-dir "$TARGET_STDLIB_BUILD_DIR" --target wasi-wasm32 \
-  "$TARGET_STDLIB_BUILD_DIR/test-wasi-wasm32/stdlib"
-$RUN_TEST_BIN --build-dir "$TARGET_STDLIB_BUILD_DIR" --target wasi-wasm32 \
-  "$TARGET_STDLIB_BUILD_DIR/test-wasi-wasm32/LTO"
-
-if [[ "$(uname)" == "Linux" ]]; then
-  echo "Skip running all test suites for Linux"
-else
-  # Run all tests but ignore failure temporarily
-  ninja check-swift-wasi-wasm32 -C "$TARGET_STDLIB_BUILD_DIR" || true
-fi
-
-echo "The test suite has finished"