Windows E2E

.github/workflows/ci-linux.yml

@@ -70,9 +70,7 @@ jobs:
       - name: Create artifacts
         if: ${{ !cancelled() }}
         run: |
-          rm -f iree-install/bin/clang*
-          rm -f iree-install/bin/llvm-link*
-          tar cf iree-dist-linux.tar -C iree-install . -C ../iree-build tools/testing/e2e/iree-e2e-matmul-test
+          tar cf iree-dist-linux.tar -C iree-install .
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -95,7 +93,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runs-on: [linux-phoenix-20240606, linux-phoenix-20240819]
+        runs-on: [linux-phoenix]
     runs-on: ${{ matrix.runs-on }}
     env:
       XILINXD_LICENSE_FILE: /opt/xilinx/Xilinx.lic
@@ -152,6 +150,7 @@ jobs:
           # on the guthub CI machine.
           sudo prlimit -lunlimited --pid $$
 
+          source /opt/xilinx/xrt/setup.sh
           bash build_tools/ci/run_matmul_test.sh \
             test_matmuls \
             iree-install \
@@ -163,20 +162,14 @@ jobs:
       - name : Smoke E2E comparison flag test
         run: |
           source .venv/bin/activate
-          # install requirements
-          # TODO(newling) make requirements.txt file
-          pip install numpy
           source /opt/xilinx/xrt/setup.sh
           python3 build_tools/ci/cpu_comparison/run_test.py \
             test_aie_vs_cpu \
             iree-install \
             $PWD/llvm-aie \
-            /opt/xilinx/xrt \
-            /opt/Xilinx/Vitis/2024.2 \
-            --reset_npu_between_runs=0 \
-            --test_set='Smoke' \
-            --do_not_run_aie=1 \
-            --verbose=0
+            --xrt-dir /opt/xilinx/xrt \
+            --test-set='Smoke' \
+            --do-not-run-aie
 
           # Assert that output.log is empty (because verbose=0)
           if [ -s output.log ]; then
@@ -190,23 +183,20 @@ jobs:
       - name : E2E comparison of AIE to llvm-cpu
         run: |
           source .venv/bin/activate
-          # install requirements
-          # TODO(newling) make requirements.txt file
-          pip install numpy
           source /opt/xilinx/xrt/setup.sh
           python3 build_tools/ci/cpu_comparison/run_test.py \
             test_aie_vs_cpu \
-            iree-install \
+            $PWD/iree-install \
             $PWD/llvm-aie \
-            /opt/xilinx/xrt \
-            /opt/Xilinx/Vitis/2024.2
+            --xrt-dir /opt/xilinx/xrt \
+            --vitis-dir /opt/Xilinx/Vitis/2024.2 \
+            --reset-npu-between-runs -v
 
       - name: Printing IR from aie2xclbin
         run: |
           source .venv/bin/activate
+          source /opt/xilinx/xrt/setup.sh
           bash build_tools/ci/print_ir_aie2xclbin/print_ir_aie2xclbin.sh \
             iree-install \
             print_ir_aie2xclbin_results \
-            $PWD/llvm-aie \
-            /opt/xilinx/xrt \
-            /opt/Xilinx/Vitis/2024.2
+            $PWD/llvm-aie

.github/workflows/ci-windows.yml

@@ -51,7 +51,7 @@ jobs:
       - name: Setup Cpp
         uses: aminya/setup-cpp@v1
         with:
-          compiler: msvc
+          compiler: llvm
           vcvarsall: true
           cmake: true
           ninja: true
@@ -86,9 +86,7 @@ jobs:
       - name: Create artifacts
         if: ${{ !cancelled() }}
         run: |
-          rm -f iree-install/bin/clang*
-          rm -f iree-install/bin/llvm-link*
-          tar cf iree-dist-windows.tar -C iree-install . -C ../iree-build tools/testing/e2e/iree-e2e-matmul-test.exe
+          tar cf iree-dist-windows.tar -C iree-install .
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -104,3 +102,59 @@ jobs:
         with:
           path: ${{ env.CACHE_DIR }}
           key: windows-build-test-cpp-asserts-v1-${{ github.sha }}-${{ github.event.repository.updated_at }}
+
+  test_windows:
+    name: E2E Test windows
+    runs-on: windows-phoenix
+    needs: build_and_ctest
+    strategy:
+      fail-fast: true
+    steps:
+      - name: "Checking out repository" # for test scripts
+        uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
+        with:
+          submodules: false # not required for testbench
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: windows_x86_64_release_packages
+
+      - name: Extract artifact
+        run: |
+          mkdir iree-install
+          tar -xf iree-dist-windows.tar -C iree-install
+          bash build_tools/download_peano.sh
+
+      - name: Create venv and install dependencies
+        run: |
+          python -m venv .venv
+          source .venv/Scripts/activate
+          pip install -r tests/matmul/requirements.txt
+
+      - name: E2E correctness matmul test
+        run: |
+          source .venv/Scripts/activate
+          export XILINX_XRT=/c/Xilinx/XRT
+          bash build_tools/ci/run_matmul_test.sh \
+            /c/test_matmuls \
+            $PWD/iree-install \
+            $PWD/llvm-aie
+
+      - name : E2E comparison of AIE to llvm-cpu
+        run: |
+          source .venv/Scripts/activate
+          export XILINX_XRT=/c/Xilinx/XRT
+          python build_tools/ci/cpu_comparison/run_test.py \
+            /c/test_aie_vs_cpu \
+            $PWD/iree-install \
+            $PWD/llvm-aie -v
+
+      - name: Printing IR from aie2xclbin
+        run: |
+          source .venv/Scripts/activate
+          export XILINX_XRT=/c/Xilinx/XRT
+          bash build_tools/ci/print_ir_aie2xclbin/print_ir_aie2xclbin.sh \
+            $PWD/iree-install \
+            /c/print_ir_aie2xclbin_results \
+            $PWD/llvm-aie

.gitmodules

@@ -1,7 +1,8 @@
 [submodule "third_party/XRT"]
 	path = third_party/XRT
-	url = https://github.com/Xilinx/XRT.git
+	url = https://github.com/nod-ai/XRT.git
 	shallow = true
+	branch = iree-amd-aie-patches
 [submodule "third_party/mlir-air"]
 	path = third_party/mlir-air
 	url = https://github.com/nod-ai/mlir-air.git

build_tools/ci/build_test_cpp.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eu -o errtrace
+set -eux -o errtrace
 
 this_dir="$(cd $(dirname $0) && pwd)"
 repo_root="$(cd $this_dir/../.. && pwd)"
@@ -32,6 +32,9 @@ if [[ "$OSTYPE" == "linux-gnu"* ]]; then
   export CMAKE_TOOLCHAIN_FILE="$this_dir/linux_default_toolchain.cmake"
   export CC=clang
   export CXX=clang++
+elif [[ "$OSTYPE" == "msys"* ]]; then
+  export CC=clang-cl.exe
+  export CXX=clang-cl.exe
 fi
 export CCACHE_DIR="${cache_dir}/ccache"
 export CCACHE_MAXSIZE="700M"
@@ -57,8 +60,6 @@ echo '{
 
 cd $iree_dir
 CMAKE_ARGS="\
-  -S $iree_dir \
-  -B $build_dir \
   -GNinja \
   -DCMAKE_BUILD_TYPE=Release \
   -DCMAKE_INSTALL_PREFIX=$install_dir \
@@ -76,14 +77,24 @@ CMAKE_ARGS="\
   -DIREE_INPUT_STABLEHLO=OFF \
   -DIREE_INPUT_TORCH=OFF \
   -DCMAKE_OBJECT_PATH_MAX=4096 \
-  -DIREE_CMAKE_PLUGIN_PATHS=$PWD/../iree-amd-aie"
+  -DIREE_CMAKE_PLUGIN_PATHS=$repo_root"
 
 if [[ "$OSTYPE" != "darwin"* ]]; then
-  CMAKE_ARGS="$CMAKE_ARGS -DIREE_EXTERNAL_HAL_DRIVERS=xrt"
+  cmake $CMAKE_ARGS \
+    -DCMAKE_EXE_LINKER_FLAGS_INIT="-fuse-ld=lld" \
+    -DCMAKE_SHARED_LINKER_FLAGS_INIT="-fuse-ld=lld" \
+    -DCMAKE_MODULE_LINKER_FLAGS_INIT="-fuse-ld=lld" \
+    -DCMAKE_C_COMPILER="${CC}" \
+    -DCMAKE_CXX_COMPILER="${CXX}" \
+    -DLLVM_TARGET_ARCH=X86 \
+    -DLLVM_TARGETS_TO_BUILD=X86 \
+    -DIREE_EXTERNAL_HAL_DRIVERS=xrt \
+    -S $iree_dir -B $build_dir
+else
+  cmake $CMAKE_ARGS \
+    -S $iree_dir -B $build_dir
 fi
 
-cmake $CMAKE_ARGS
-
 echo "Building all"
 echo "------------"
 cmake --build "$build_dir" -- -k 0
@@ -99,10 +110,14 @@ if [[ "$OSTYPE" == "linux-gnu"* ]]; then
   ctest --test-dir "$build_dir" -R amd-aie --output-on-failure -j
 elif [[ "$OSTYPE" == "darwin"* ]]; then
   ctest --test-dir "$build_dir" -R amd-aie -E "pack_peel_pipeline_matmul|conv_fill_spec_pad" --output-on-failure -j --repeat until-pass:5
-else
+elif [[ "$OSTYPE" == "msys"* ]]; then
   # hack while windows is flaky to get past failing tests
   ctest --test-dir "$build_dir" -R amd-aie --output-on-failure -j --repeat until-pass:5
 fi
 
 # Show ccache stats.
 ccache --show-stats
+
+rm -f "$install_dir"/bin/clang*
+rm -f "$install_dir"/bin/llvm-link*
+cp "$build_dir"/tools/testing/e2e/iree-e2e-matmul-test "$install_dir"/bin