From d63855b8e4cfead35b8c42062262f4a27f623bd9 Mon Sep 17 00:00:00 2001
From: Jeff Fifield <jeff.fifield@amd.com>
Date: Tue, 22 Oct 2024 10:05:51 -0600
Subject: [PATCH] Add vitis components to ryzenai cmake args

---
 .github/workflows/buildAndTestRyzenAI.yml   | 1 +
 .github/workflows/buildAndTestRyzenAISw.yml | 2 +-
 utils/build-mlir-aie-from-wheels.sh         | 1 +
 utils/mlir_aie_wheels/setup.py              | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/buildAndTestRyzenAI.yml b/.github/workflows/buildAndTestRyzenAI.yml
index 918851e3c6..8fd09812de 100644
--- a/.github/workflows/buildAndTestRyzenAI.yml
+++ b/.github/workflows/buildAndTestRyzenAI.yml
@@ -46,6 +46,7 @@ env:
             -DCMAKE_MODULE_LINKER_FLAGS_INIT="-fuse-ld=lld" \
             -DCMAKE_SHARED_LINKER_FLAGS_INIT="-fuse-ld=lld" \
             -DXRT_ROOT=/opt/xilinx/xrt \
+            -DAIE_VITIS_COMPONENTS=AIE2;AIE2P \
             -DAIE_ENABLE_PYTHON_PASSES=OFF \
             -DAIE_ENABLE_XRT_PYTHON_BINDINGS=ON \
             -DAIE_INCLUDE_INTEGRATION_TESTS=OFF
diff --git a/.github/workflows/buildAndTestRyzenAISw.yml b/.github/workflows/buildAndTestRyzenAISw.yml
index bf4813bbb9..35bd3746e7 100644
--- a/.github/workflows/buildAndTestRyzenAISw.yml
+++ b/.github/workflows/buildAndTestRyzenAISw.yml
@@ -121,7 +121,7 @@ jobs:
                 -DAIE_ENABLE_PYTHON_PASSES=OFF \
                 -DAIE_ENABLE_XRT_PYTHON_BINDINGS=ON \
                 -DAIE_INCLUDE_INTEGRATION_TESTS=OFF \
-                -DAIE_VITIS_COMPOONENTS=AIE2 \
+                -DAIE_VITIS_COMPOONENTS=AIE2;AIE2P \
                 -DPython3_EXECUTABLE=$(which python) \
                 -DLLVM_EXTERNAL_LIT=$(which lit) \
                 -DCMAKE_INSTALL_PREFIX=/workspace/install \
diff --git a/utils/build-mlir-aie-from-wheels.sh b/utils/build-mlir-aie-from-wheels.sh
index de4f004869..1a7828e38e 100755
--- a/utils/build-mlir-aie-from-wheels.sh
+++ b/utils/build-mlir-aie-from-wheels.sh
@@ -59,6 +59,7 @@ CMAKE_CONFIGS="\
     -DLLVM_ENABLE_ASSERTIONS=ON \
     -DAIE_ENABLE_BINDINGS_PYTHON=ON \
     -DLLVM_ENABLE_RTTI=$LLVM_ENABLE_RTTI \
+    -DAIE_VITIS_COMPONENTS=AIE2;AIE2P \
     -DAIE_RUNTIME_TARGETS=x86_64 \
     -DAIE_RUNTIME_TEST_TARGET=x86_64 "
 
diff --git a/utils/mlir_aie_wheels/setup.py b/utils/mlir_aie_wheels/setup.py
index c42f09d213..c801f50951 100644
--- a/utils/mlir_aie_wheels/setup.py
+++ b/utils/mlir_aie_wheels/setup.py
@@ -142,6 +142,7 @@ def build_extension(self, ext: CMakeExtension) -> None:
             "-DCMAKE_PLATFORM_NO_VERSIONED_SONAME=ON",
             "-DLLVM_CCACHE_BUILD=ON",
             f"-DLLVM_ENABLE_RTTI={os.getenv('ENABLE_RTTI', 'ON')}",
+            "-DAIE_VITIS_COMPONENTS=AIE2;AIE2P",
             "-DAIE_ENABLE_BINDINGS_PYTHON=ON",
             "-DAIE_ENABLE_PYTHON_PASSES=OFF",
             "-DMLIR_DETECT_PYTHON_ENV_PRIME_SEARCH=ON",