From 859220b1baf71583ed7743626a78a198bc41ff43 Mon Sep 17 00:00:00 2001
From: Stephen Neuendorffer <stephen.neuendorffer@amd.com>
Date: Thu, 19 Oct 2023 12:34:12 -0700
Subject: [PATCH] [chess-clang] Add proper defines for Vitis kernel code

The vitis headers use some defines to switch between synthesizable
and functional models.  When feeding code to chess, these always need
to be defined.
---
 tools/chess-clang/chess-clang         |  3 +++
 tools/chess-clang/xchesscc_wrapper.in | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/tools/chess-clang/chess-clang b/tools/chess-clang/chess-clang
index 1b9f3082f1..3c1a32d546 100755
--- a/tools/chess-clang/chess-clang
+++ b/tools/chess-clang/chess-clang
@@ -56,6 +56,9 @@ do
   fi
 done
 
+# aie_api.h spews tons of warnings here.
+ArgsArr+=( "-Wno-deprecated-declarations" )
+
 # Has to be invoked with exec, which means it never returns to this script
 # so this has to be the final invocation.
 exec $CHESSROOT/target/bin/LNa64bin/chess-clang "${ArgsArr[@]}"
\ No newline at end of file
diff --git a/tools/chess-clang/xchesscc_wrapper.in b/tools/chess-clang/xchesscc_wrapper.in
index 079f72ec71..9e8e813263 100755
--- a/tools/chess-clang/xchesscc_wrapper.in
+++ b/tools/chess-clang/xchesscc_wrapper.in
@@ -5,6 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 #
 # (c) Copyright 2021 Xilinx Inc.
+# (c) Copyright 2022-2023 Advanced Micro Devices, Inc.
 
 TARGET_AIE_LIBDIR="@VITIS_AIE_INCLUDE_DIR@"
 TARGET_AIE2_LIBDIR="@VITIS_AIE2_INCLUDE_DIR@"
@@ -17,6 +18,18 @@ if [ $TARGET != "AIE" -a $TARGET != "AIE2" ]
     echo "xchesscc_wrapper: first argument is expected to be the target architecture (aie or aie2)"
     exit 1
 fi
+if [ $TARGET == "AIE" ]
+  then
+    EXTRA_DEFS="-D__AIE_ARCH__=10 -D__AIEARCH__=10"
+elif [ $TARGET == "AIE2" ]
+  then
+    EXTRA_DEFS="-D__AIE_ARCH__=20 -D__AIEARCH__=20"
+fi
+if [ -z "$AIETOOLS" ]
+  then
+    echo "xchesscc_wrapper needs a valid Vitis installation"
+    exit 1
+fi
 
 TARGETVAR=TARGET_${TARGET}_LIBDIR
 LIBDIR=${!TARGETVAR}
@@ -27,4 +40,4 @@ export UNWRAPPED_XCHESSCC=$AIETOOLS/bin/unwrapped/lnx64.o/xchesscc
 export LD_LIBRARY_PATH=$AIETOOLS/lib/lnx64.o:$AIETOOLS/lnx64/tools/dot/lib:$LD_LIBRARY_PATH
 # Carefully crafted path so that we can inject other scripts into the chess path, namely chess-clang
 export PATH=$DIR:$AIETOOLS/bin/unwrapped/lnx64.o:$AIETOOLS/tps/lnx64/target/bin/LNa64bin
-$UNWRAPPED_XCHESSCC +P 4 -p me -C Release_LLVM -Y clang=$DIR/chess-clang -P $LIBDIR -d -f $@
\ No newline at end of file
+$UNWRAPPED_XCHESSCC +P 4 -p me -C Release_LLVM -D__AIENGINE__ $EXTRA_DEFS -Y clang=$DIR/chess-clang -P $LIBDIR -d -f $@
\ No newline at end of file