chess_wrapper: remove hard coded paths (Xilinx#1047)

jackl-xilinx · Feb 23, 2024 · d3d2c04 · d3d2c04
1 parent 58c0dc8
commit d3d2c04
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/tools/chess-clang/CMakeLists.txt b/tools/chess-clang/CMakeLists.txt
@@ -8,8 +8,8 @@
 if(NOT DEFINED CMAKE_CROSSCOMPILE)
   set(SCRIPT_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/bin)
   # These files are only useful on host x86 compiles.
-  configure_file(xchesscc_wrapper.in ${PROJECT_BINARY_DIR}/bin/xchesscc_wrapper @ONLY)
-  install(PROGRAMS ${PROJECT_BINARY_DIR}/bin/xchesscc_wrapper DESTINATION ${SCRIPT_INSTALL_PATH})
+  install(PROGRAMS xchesscc_wrapper DESTINATION ${PROJECT_BINARY_DIR}/bin)
+  install(PROGRAMS xchesscc_wrapper DESTINATION ${SCRIPT_INSTALL_PATH})
 
   set(FILES
     chess-clang)

diff --git a/tools/chess-clang/xchesscc_wrapper.in → tools/chess-clang/xchesscc_wrapper b/tools/chess-clang/xchesscc_wrapper.in → tools/chess-clang/xchesscc_wrapper
@@ -7,10 +7,10 @@
 # (c) Copyright 2021 Xilinx Inc.
 # (c) Copyright 2022-2023 Advanced Micro Devices, Inc.
 
-TARGET_AIE_LIBDIR=${VITIS_AIE_INCLUDE_DIR:-"@VITIS_AIE_INCLUDE_DIR@"}
-TARGET_AIE2_LIBDIR=${VITIS_AIE2_INCLUDE_DIR:-"@VITIS_AIE2_INCLUDE_DIR@"}
+AIETOOLS=`realpath $(dirname $(which xchesscc))/../`
 
-AIETOOLS=${VITIS_AIETOOLS_DIR:-"@VITIS_AIETOOLS_DIR@"}
+TARGET_AIE_LIBDIR=$AIETOOLS/data/versal_prod/lib
+TARGET_AIE2_LIBDIR=$AIETOOLS/data/aie_ml/lib
 
 TARGET=${1^^}
 shift

diff --git a/utils/quick_setup.sh b/utils/quick_setup.sh
@@ -63,9 +63,6 @@ if test -f "$VPP"; then
   pushd my_install
   pip download mlir_aie -f https://github.com/Xilinx/mlir-aie/releases/expanded_assets/latest-wheels/
   unzip -q mlir_aie-*_x86_64.whl
-  sed -i "s^TARGET_AIE_LIBDIR=.*^TARGET_AIE_LIBDIR=\"$AIETOOLS/data/versal_prod/lib\"^g" mlir_aie/bin/xchesscc_wrapper
-  sed -i "s^TARGET_AIE2_LIBDIR=.*^TARGET_AIE2_LIBDIR=\"$AIETOOLS/data/aie_ml/lib\"^g" mlir_aie/bin/xchesscc_wrapper
-  sed -i "s^AIETOOLS=.*^AIETOOLS=\"$AIETOOLS\"^g" mlir_aie/bin/xchesscc_wrapper
   pip download mlir -f https://github.com/Xilinx/mlir-aie/releases/expanded_assets/mlir-distro/
   unzip -q mlir-*_x86_64.whl
   pip install https://github.com/makslevental/mlir-python-extras/archive/d84f05582adb2eed07145dabce1e03e13d0e29a6.zip