ci(CI): make CI work again

UCLA-VAST · Aug 1, 2024 · 115735e · 115735e
1 parent fcf66d6
commit 115735e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 19 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -12,15 +12,16 @@ jobs:
 
     strategy:
       matrix:
+        xocl-platform:
+          - xilinx_u250_gen3x16_xdma_4_1_202210_1
         xocl-version:
-          - 2019.2
-          - 2020.2
-          - 2021.1
-          - 2021.2
+          - 2023.2
 
     env:
       # Cannot source Xilinx scripts because they mess up many system libraries.
+      XILINX_HLS: /opt/tools/xilinx/Vitis_HLS/${{ matrix.xocl-version }}
       XILINX_VITIS: /opt/tools/xilinx/Vitis/${{ matrix.xocl-version }}
+      XILINX_VIVADO: /opt/tools/xilinx/Vivado/${{ matrix.xocl-version }}
 
     steps:
       - name: Checkout myself
@@ -35,13 +36,11 @@ jobs:
             libtinyxml-dev \
             opencl-headers \
             python3-pip \
-            xilinx-u250-xdma-dev \
-            xilinx-u280-xdma-dev \
 
           python3 -m pip install --user \
-            git+https://github.com/Licheng-Guo/tapa-fast-cosim.git@02ecd87c4d24d6513d8c0d15af8046d5ee05a2ae
+            git+https://github.com/UCLA-VAST/tapa-fast-cosim.git@93646a999b786e94626982700dfaf708fe3deec0
       - name: Configure myself
-        run: cmake -S. -Bbuild
+        run: cmake -S. -Bbuild -DXRT_PLATFORM=${{ matrix.xocl-platform }}
       - name: Build myself
         run: cmake --build build --target all
       - name: Test myself
@@ -50,12 +49,5 @@ jobs:
           # Some Vitis versions have a bug where xclbinutil is not found without
           # manually sourcing the XRT setup script.
           source "${XILINX_XRT}"/setup.sh
-          # Vivado doesn't like running concurrently for the first time.
-          (
-            source "${XILINX_VITIS}"/settings64.sh
-            vivado -mode batch -nojournal -nolog
-          )
-          ctest --verbose --parallel $(nproc)
-      - name: Run TAPA fast cosim
-        if: ${{ matrix.xocl-version == '2020.2' }}
-        run: cmake --build build --target xdma-xosim
+          source "${XILINX_VITIS}"/settings64.sh
+          /usr/bin/ctest --verbose --stop-on-failure
diff --git a/tests/xdma/CMakeLists.txt b/tests/xdma/CMakeLists.txt
@@ -23,7 +23,6 @@ add_xocc_targets(${CMAKE_CURRENT_BINARY_DIR}
                  HW_EMU_XCLBIN hw_emu_xclbin
                  HW_XCLBIN hw_xclbin)
 
-# Only works for 2020.2.
 file(
   DOWNLOAD
   https://github.com/Licheng-Guo/tapa-fast-cosim/raw/02ecd87c4d24d6513d8c0d15af8046d5ee05a2ae/example/vadd/vadd.xo
@@ -38,7 +37,7 @@ add_custom_target(xdma-csim
                   WORKING_DIRECTORY ${CMAKE_PROJECT_DIR})
 add_custom_target(xdma-xosim
                   COMMAND xdma-vadd ${CMAKE_CURRENT_BINARY_DIR}/vadd.xo 1000
-                  DEPENDS xdma-vadd ${hw_xo}
+                  DEPENDS xdma-vadd ${CMAKE_CURRENT_BINARY_DIR}/vadd.xo
                   WORKING_DIRECTORY ${CMAKE_PROJECT_DIR})
 add_custom_target(xdma-cosim
                   COMMAND xdma-vadd