From b87e5b374caece38305de8f2ba68fa341496963e Mon Sep 17 00:00:00 2001
From: Jeff Fifield <jeff.fifield@amd.com>
Date: Thu, 24 Oct 2024 13:35:14 -0600
Subject: [PATCH] Add ubuntu 24 to buildAndTestRyzenAISw workflow (#1880)

---
 .github/workflows/buildAndTestRyzenAISw.yml | 33 +++++++++------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/buildAndTestRyzenAISw.yml b/.github/workflows/buildAndTestRyzenAISw.yml
index aace4d8739..bc1c2c9f59 100644
--- a/.github/workflows/buildAndTestRyzenAISw.yml
+++ b/.github/workflows/buildAndTestRyzenAISw.yml
@@ -4,8 +4,7 @@ on:
   push:
     branches:
       - main
-      - ryzen-ai-sw-test
-#  pull_request:
+  pull_request:
   workflow_dispatch:
     inputs:
       AIE_COMMIT:
@@ -13,11 +12,6 @@ on:
         type: string
         required: false
         default: ''
-      LIT_FILTER:
-        description: 'LIT_FILTER for tests (regex of paths in test/)'
-        type: string
-        required: false
-        default: ''
 
 defaults:
   run:
@@ -38,7 +32,9 @@ jobs:
     name: Build and Test with Ryzen AI Software
 
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        ubuntu_version: [ "ubuntu22", "ubuntu24" ]
     steps:
 
       - name: Free disk space
@@ -59,37 +55,36 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: "true"
-      - uses: uraimo/run-on-arch-action@v2.5.0
+      - uses: uraimo/run-on-arch-action@v2.7.0
         name: Build and Test
         id: runcmd
         with:
           distro: none
-          base_image: ghcr.io/xilinx/mlir-aie/ubuntu22-ryzenai-1.3.0ea
+          base_image: ghcr.io/xilinx/mlir-aie/${{ matrix.ubuntu_version }}-ryzenai-1.3.0ea:1.0
           githubToken: ${{ github.token }}
           dockerRunArgs: |
-            --mac-address ${{ secrets.XILINX_MAC }}
+            --mac-address 02:42:ac:11:00:02
+          env: |
+            XILINXD_LICENSE_FILE: /opt/xilinx/Xilinx.lic
           run: |
 
             MLIR_DIR=$PWD
             pushd /workspace
 
-            # this is the inverse of `base64 -w 1000000 Xilinx.lic`
-            # the -w ("wrap after 1000000 cols") is so that there are no spaces in the XILINX_LIC env var
-            echo -n "${{ secrets.XILINX_LIC }}" | base64 --decode > /workspace/Xilinx.lic
-            export XILINXD_LICENSE_FILE=/workspace/Xilinx.lic
-
-            ccrypt -d -K ${{ secrets.RYZEN_AI_SW_KEY }} /workspace/ryzen_ai-1.3.0ea1.tgz.cpt
             tar xvf /workspace/ryzen_ai-1.3.0ea1.tgz
             pushd /workspace/ryzen_ai-1.3.0
+            # The ryzen_ai-1.3 wheels are built for python3.10
+            sed -i 's/python -/python3.10 -/g' install_ryzen_ai_1_3.sh
             ./install_ryzen_ai_1_3.sh -a yes -p /workspace/venv -l
             popd
 
             export LD_LIBRARY_PATH=
             export PYTHONPATH=
             source /workspace/venv/bin/activate
+            export LD_LIBRARY_PATH=
             source /opt/xilinx/xrt/setup.sh
             popd
-            
+
             if [ x"${{ inputs.AIE_COMMIT }}" != x"" ]; then
               git reset --hard ${{ inputs.AIE_COMMIT }}
             fi
@@ -121,7 +116,7 @@ jobs:
                 -DAIE_ENABLE_PYTHON_PASSES=OFF \
                 -DAIE_ENABLE_XRT_PYTHON_BINDINGS=ON \
                 -DAIE_INCLUDE_INTEGRATION_TESTS=OFF \
-                -DAIE_VITIS_COMPOONENTS="AIE2;AIE2P" \
+                -DAIE_VITIS_COMPONENTS='AIE2;AIE2P' \
                 -DPython3_EXECUTABLE=$(which python) \
                 -DLLVM_EXTERNAL_LIT=$(which lit) \
                 -DCMAKE_INSTALL_PREFIX=/workspace/install \