From 81ed6576f8f619bdd7a3e18e3814e7f91916daa7 Mon Sep 17 00:00:00 2001
From: Jeff Fifield <jeff.fifield@amd.com>
Date: Mon, 29 Jan 2024 11:23:11 -0700
Subject: [PATCH 1/2] update mlir-aie

---
 utils/clone-llvm.sh     | 6 +++---
 utils/clone-mlir-aie.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/utils/clone-llvm.sh b/utils/clone-llvm.sh
index 51fb591e4..92bbb8c07 100755
--- a/utils/clone-llvm.sh
+++ b/utils/clone-llvm.sh
@@ -14,13 +14,13 @@
 #
 ##===----------------------------------------------------------------------===##
 
-export commithash=0f80f5e362fb43a9335bd154c5f7976a96e32cfc
+LLVM_PROJECT_COMMIT=7c03d5d41daad230406890499cf4fa14973ee5eb
 branch=air
 
 git clone --depth 1 https://github.com/llvm/llvm-project.git llvm
 pushd llvm
-git fetch --depth=1 origin $commithash
-git checkout $commithash -b $branch
+git fetch --depth=1 origin $LLVM_PROJECT_COMMIT
+git checkout $LLVM_PROJECT_COMMIT -b $branch
 # Make mlir_async_runtime library's symbol visible
 # so that we can link to this library in channel sim tests
 sed -i '/set_property(TARGET mlir_async_runtime PROPERTY CXX_VISIBILITY_PRESET hidden)/d' ./mlir/lib/ExecutionEngine/CMakeLists.txt
diff --git a/utils/clone-mlir-aie.sh b/utils/clone-mlir-aie.sh
index 2e881d939..3e1f43574 100755
--- a/utils/clone-mlir-aie.sh
+++ b/utils/clone-mlir-aie.sh
@@ -14,7 +14,7 @@
 #
 ##===----------------------------------------------------------------------===##
 
-export HASH=48329cab738a35d6fd8e8b9f86ddcf68b459a176
+export HASH=c2fe3c71af3a90023dba0d0a9360c11a140330f2
 
 git clone --depth 1 https://github.com/Xilinx/mlir-aie.git mlir-aie
 pushd mlir-aie

From 43192efb3e84c03c41a461c8508fc697e907c080 Mon Sep 17 00:00:00 2001
From: Jeff Fifield <jeff.fifield@amd.com>
Date: Mon, 29 Jan 2024 15:34:51 -0700
Subject: [PATCH 2/2] enable direct cdo

---
 .github/workflows/buildAndTestNoRuntime.yml | 1 +
 utils/github-build-mlir-aie.sh              | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/buildAndTestNoRuntime.yml b/.github/workflows/buildAndTestNoRuntime.yml
index 42411d6f9..27cba9e04 100644
--- a/.github/workflows/buildAndTestNoRuntime.yml
+++ b/.github/workflows/buildAndTestNoRuntime.yml
@@ -93,6 +93,7 @@ jobs:
               -DLLVM_EXTERNAL_LIT=`pwd`/../../llvm/build/bin/llvm-lit \
               -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
               -DLibXAIE_x86_64_DIR=`pwd`/../../aienginev2/install/lib \
+              -DAIE_ENABLE_GENERATE_CDO_DIRECT=ON \
               -DCMAKE_INSTALL_PREFIX=`pwd`/../install
           ninja install
           popd
diff --git a/utils/github-build-mlir-aie.sh b/utils/github-build-mlir-aie.sh
index 2e9f30186..928af6ed5 100755
--- a/utils/github-build-mlir-aie.sh
+++ b/utils/github-build-mlir-aie.sh
@@ -37,6 +37,7 @@ cmake .. \
     -DLLVM_EXTERNAL_LIT=`pwd`/../../llvm/build/bin/llvm-lit \
     -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
     -DLibXAIE_x86_64_DIR=`pwd`/../../aienginev2/install/lib \
+    -DAIE_ENABLE_GENERATE_CDO_DIRECT=ON \
     -DCMAKE_INSTALL_PREFIX=`pwd`/../$INSTALL_DIR
 
 ec=$?