Merge remote-tracking branch 'origin/main' into clangir

Resolve conflicts on:
- README.md
- python/compiler/aiecc/main.py

Author: keryell

.github/workflows/buildAndTestMulti.yml

@@ -45,22 +45,6 @@ jobs:
         ENABLE_RTTI: [ ON, OFF ]
 
         include:
-          - OS: ubuntu-20.04
-            COMPILER: gcc-11
-            ENABLE_ASSERTIONS: ON
-            ENABLE_RTTI: OFF
-          - OS: ubuntu-20.04
-            COMPILER: gcc-11
-            ENABLE_ASSERTIONS: OFF
-            ENABLE_RTTI: OFF
-          - OS: ubuntu-20.04
-            COMPILER: gcc-11
-            ENABLE_ASSERTIONS: ON
-            ENABLE_RTTI: ON
-          - OS: ubuntu-20.04
-            COMPILER: gcc-11
-            ENABLE_ASSERTIONS: OFF
-            ENABLE_RTTI: ON
           - OS: windows-2019
             COMPILER: msvc
             ENABLE_ASSERTIONS: ON
@@ -97,7 +81,7 @@ jobs:
           HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install -r python/requirements_extras.txt
 
       - name: Setup Cpp
-        uses: aminya/setup-cpp@v1
+        uses: aminya/setup-cpp@1fd813945e55021261b381c59275db442da4082f
         with:
           compiler: ${{ matrix.COMPILER }}
           vcvarsall: ${{ contains(matrix.OS, 'windows') }}

.github/workflows/buildAndTestPythons.yml

@@ -34,7 +34,7 @@ jobs:
       # Run the tests on the Cartesian product of the following
       matrix:
         build_type: [ Assert, Release ]
-        ubuntu_version: [ 20.04, 22.04, 24.04 ]
+        ubuntu_version: [ 22.04, 24.04 ]
         python_version: [ "3.10", "3.11", "3.12" ]
 
     steps:
@@ -59,26 +59,6 @@ jobs:
         run: |
           sudo apt-get install -y ninja-build clang lld
 
-      - name: Upgrade gcc
-        if: matrix.ubuntu_version == '20.04'
-        run: |
-          sudo apt-get install -y ninja-build clang lld
-
-          sudo apt install build-essential manpages-dev software-properties-common
-          sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-          GCC_VERSION=11
-          sudo apt update && sudo apt install gcc-$GCC_VERSION g++-$GCC_VERSION
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 90 \
-            --slave /usr/bin/g++ g++ /usr/bin/g++-9 \
-            --slave /usr/bin/gcov gcov /usr/bin/gcov-9 \
-            --slave /usr/bin/gcc-ar gcc-ar /usr/bin/gcc-ar-9 \
-            --slave /usr/bin/gcc-ranlib gcc-ranlib /usr/bin/gcc-ranlib-9
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-$GCC_VERSION 110 \
-            --slave /usr/bin/g++ g++ /usr/bin/g++-$GCC_VERSION \
-            --slave /usr/bin/gcov gcov /usr/bin/gcov-$GCC_VERSION \
-            --slave /usr/bin/gcc-ar gcc-ar /usr/bin/gcc-ar-$GCC_VERSION \
-            --slave /usr/bin/gcc-ranlib gcc-ranlib /usr/bin/gcc-ranlib-$GCC_VERSION
-
       - name: Get MLIR
         id: mlir-wheels
         run: |

.github/workflows/buildAndTestRyzenAI.yml

@@ -155,12 +155,14 @@ jobs:
           # quick_setup changes directory to programming_examples, so we need to return to mlir-aie
           cd ..
 
+          ./utils/build-mlir-aie-from-wheels.sh
+
           # I have no clue why but the system clock on GHA containers is like 12 hours ahead.
           # That means wheels have file with time stamps in the future which makes ninja loop
           # forever when configuring. Set the time to some arbitrary stamp in the past just to be safe.
-          find my_install/mlir -exec touch -a -m -t 201108231405.14 {} \;
-
-          ./utils/build-mlir-aie-from-wheels.sh ./my_install/mlir build install ./my_install/llvm-aie
+          pushd my_install
+          find mlir -exec touch -a -m -t 201108231405.14 {} \;
+          popd
 
           # build is created by the build-mlir-aie-from-wheels.sh script
           pushd build

.github/workflows/buildRyzenWheels.yml

@@ -36,6 +36,13 @@ jobs:
       contents: write
       packages: read
 
+    strategy:
+      fail-fast: false
+      matrix:
+        python_version: [
+          "3.10", "3.12", "3.13",
+        ]
+
     steps:
       - name: Free disk space
         uses: descriptinc/free-disk-space@main
@@ -69,7 +76,7 @@ jobs:
             MLIR_VERSION=$(git rev-parse --short HEAD)
             echo "Building mlir-aie version $MLIR_VERSION"
 
-            python -m venv ${{ github.workspace }}/aie-venv
+            python${{ matrix.python_version }} -m venv ${{ github.workspace }}/aie-venv
             source ${{ github.workspace }}/aie-venv/bin/activate
 
             echo "Installing vitis_aie_essentials ..."
@@ -108,14 +115,14 @@ jobs:
             popd
 
             auditwheel repair -w $WHEELHOUSE_DIR/repaired_wheel $WHEELHOUSE_DIR/mlir_aie-*.whl --plat manylinux_2_35_x86_64 --exclude libcdo_driver.so --exclude libmlir_float16_utils.so
-            WHL_FN=$(ls $WHEELHOUSE_DIR/repaired_wheel/mlir_aie*whl)
-            mv "$WHL_FN" "`echo $WHL_FN | sed "s/cp310-cp310/py3-none/"`"
+            # WHL_FN=$(ls $WHEELHOUSE_DIR/repaired_wheel/mlir_aie*whl)
+            # mv "$WHL_FN" "`echo $WHL_FN | sed "s/cp310-cp310/py3-none/"`"
 
       - name: Upload mlir_aie
         uses: actions/upload-artifact@v4
         with:
           path: wheelhouse/repaired_wheel/mlir_aie*whl
-          name: mlir_aie
+          name: mlir_aie-${{ matrix.python_version }}
 
       - name: Release current commit
         if: github.event_name == 'workflow_dispatch' || github.event_name == 'schedule'
@@ -129,119 +136,3 @@ jobs:
           allowUpdates: true
           replacesArtifacts: true
           makeLatest: true
-
-  build-wheel:
-    name: Build wheel
-    runs-on: ubuntu-latest
-    needs: build-repo
-
-    permissions:
-      id-token: write
-      contents: write
-      packages: read
-
-    strategy:
-      fail-fast: false
-      matrix:
-        python_version: [
-          "3.10", "3.12",
-        ]
-
-    steps:
-      - name: Get the project repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
-          submodules: "true"
-
-      - uses: actions/download-artifact@v4
-        with:
-          # unpacks default artifact into dist/
-          # if `name: artifact` is omitted, the action will create extra parent dir
-          name: mlir_aie
-          path: .
-
-      - uses: uraimo/[email protected]
-        name: Build mlir-aie python bindings
-        id: runcmd
-        with:
-          distro: none
-          arch: none
-          base_image: ghcr.io/xilinx/mlir-aie/ubuntu22-ryzenai-1.3.0ea:1.1
-          githubToken: ${{ github.token }}
-          dockerRunArgs: |
-            --mac-address 02:42:ac:11:00:02
-          env: |
-            VITIS: ${{ env.VITIS }}
-            XILINXD_LICENSE_FILE: ${{ env.XILINXD_LICENSE_FILE }}
-          run: |
-            git config --global --add safe.directory $PWD
-            MLIR_VERSION=$(git rev-parse --short HEAD)
-            echo "Building mlir-aie version $MLIR_VERSION ..."
-
-            # faster to do this twice instead of upload the directory with ~4000 files in it...
-            VERSION=$(utils/clone-llvm.sh --get-wheel-version)
-            pip -q download mlir==$VERSION \
-              -f https://github.com/Xilinx/mlir-aie/releases/expanded_assets/mlir-distro
-            unzip -q mlir-*.whl
-            # I have no clue why but the system clock on GHA containers is like 12 hours ahead.
-            # That means wheels have file with time stamps in the future which makes ninja loop
-            # forever when configuring. Set the time to some arbitrary stamp in the past just to be safe.
-            find mlir -exec touch -a -m -t 201108231405.14 {} \;
-
-            unzip -q mlir_aie-*.whl
-            find mlir_aie -exec touch -a -m -t 201108231405.14 {} \;
-
-            python${{ matrix.python_version }} -m venv aie-venv
-            source aie-venv/bin/activate
-
-            pip install -r python/requirements.txt
-            HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install -r python/requirements_extras.txt
-            source aie-venv/bin/activate
-
-            export MLIR_INSTALL_ABS_PATH=$PWD/mlir
-            export MLIR_AIE_INSTALL_ABS_PATH=$PWD/mlir_aie
-            export WHEELHOUSE_DIR=$PWD/wheelhouse
-            export CMAKE_MODULE_PATH=$PWD/cmake/modulesXilinx
-
-            export PATH=$VITIS/bin:$VITIS/aietools/bin:$PATH
-            export XRT_ROOT=/opt/xilinx/xrt
-            export AIE_PROJECT_COMMIT=$MLIR_VERSION
-            export DATETIME=$(date +"%Y%m%d%H")
-
-            cp python/requirements.txt utils/mlir_aie_wheels/python_bindings
-
-            pushd utils/mlir_aie_wheels/python_bindings
-
-            pip install wheel auditwheel patchelf
-            CIBW_ARCHS=x86_64 pip wheel . -v -w $WHEELHOUSE_DIR --no-build-isolation
-            DEBUG=1 CIBW_ARCHS=x86_64 pip wheel . -v -w $WHEELHOUSE_DIR --no-build-isolation
-
-            popd
-
-            auditwheel repair -w $WHEELHOUSE_DIR/repaired_wheel $WHEELHOUSE_DIR/aie_python_bindings*whl --plat manylinux_2_35_x86_64
-
-      - uses: geekyeggo/delete-artifact@v5
-        if: github.event_name == 'pull_request'
-        with:
-          name: mlir_aie
-
-      - name: Upload wheels
-        if: github.event_name == 'workflow_dispatch' || github.event_name == 'schedule'
-        uses: actions/upload-artifact@v4
-        with:
-          path: wheelhouse/repaired_wheel/aie_python_bindings*.whl
-          name: ryzen_ai_wheel-python-${{ matrix.python_version }}
-
-      - name: Release current commit
-        if: github.event_name == 'workflow_dispatch' || github.event_name == 'schedule'
-        uses: ncipollo/[email protected]
-        with:
-          artifacts: wheelhouse/repaired_wheel/aie_python_bindings*.whl
-          token: "${{ secrets.GITHUB_TOKEN }}"
-          tag: 'latest-wheels'
-          name: 'latest-wheels'
-          removeArtifacts: false
-          allowUpdates: true
-          replacesArtifacts: true
-          makeLatest: true

.gitignore

@@ -25,3 +25,5 @@ lib/**/Makefile
 /platforms/vck190_bare/vivado/vck190_bare_proj
 utils/vitisVariables.config
 runtime_lib/xaiengine/src
+/ironenv
+/.cache

CMakeLists.txt

@@ -201,7 +201,7 @@ cmake_dependent_option(AIE_ENABLE_AIRBIN
 # If we need runtime libs, then statically link them.
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
-# add_flag_if_supported("-Werror=sign-compare" WERROR_SIGN_COMPARE)
+add_flag_if_supported("-Werror=sign-compare" WERROR_SIGN_COMPARE)
 add_flag_if_supported("-Werror=unused" WERROR_USED)
 
 # What happens when you have a non-void function with no return?

README.md

@@ -39,7 +39,7 @@ Turn off SecureBoot (Allows for unsigned drivers to be installed):
 
 ## Prerequisites
 
-### Install AIETools
+### Install the XDNA™ Driver
 
 #### Supporting AMD Ryzen™ AI with AMD XDNA™/AIE-ML (AIE2) and AMD XDNA™ 2 (AIE2P): Install AMD Vitis™ AIE Essentials
 

aie_kernels/aie2/bf16_softmax.cc

@@ -4,6 +4,7 @@
 void softmax_simple_bf16(bfloat16 *restrict input_vector,
                          bfloat16 *restrict output_vector,
                          const int32_t vector_size) {
+  event0();
   // Find maximum for numerical stability
   float max_val = (float)input_vector[0];
   for (uint32_t i = 1; i < vector_size; i++) {
@@ -47,6 +48,7 @@ void softmax_simple_bf16(bfloat16 *restrict input_vector,
     float val = (float)output_vector[i] * inv_sum;
     output_vector[i] = (bfloat16)val;
   }
+  event1();
   return;
 }