Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor chess interface #1775

Merged
merged 2 commits into from
Sep 18, 2024
Merged

refactor chess interface #1775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2754262
refactor chess interface
stephenneuendorffer Sep 18, 2024
63435a0
add explicit path to chess-llvm-link
stephenneuendorffer Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions python/compiler/aiecc/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,20 +430,25 @@ async def chesshack(self, task, llvmir, aie_target):
llvmir_chesslinked_path = llvmir + "chesslinked.ll"
if not self.opts.execute:
return llvmir_chesslinked_path
llvmir = await read_file_async(llvmir)

install_path = aie.compiler.aiecc.configure.install_path()
runtime_lib_path = os.path.join(install_path, "aie_runtime_lib")
chess_intrinsic_wrapper_ll_path = os.path.join(
runtime_lib_path, aie_target.upper(), "chess_intrinsic_wrapper.ll"
)

await write_file_async(llvmir, llvmir_chesshack)
llvmir_ir = await read_file_async(llvmir)
llvmir_hacked_ir = downgrade_ir_for_chess(llvmir_ir)
await write_file_async(llvmir_hacked_ir, llvmir_chesshack)

assert os.path.exists(llvmir_chesshack)
await self.do_call(
task,
[
"llvm-link",
# The path below is cheating a bit since it refers directly to the AIE1
# version of llvm-link, rather than calling the architecture-specific
# tool version.
opts.aietools_path + "/tps/lnx64/target/bin/LNa64bin/chess-llvm-link",
Comment on lines +448 to +451
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So it does not matter which version is used?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The different synopsys versions are currently pretty close to one another, and 'HEAD' is diverging relatively quickly... This is at some level kicking the can down the road, but it's better than what we have.

llvmir_chesshack,
chess_intrinsic_wrapper_ll_path,
"-S",
Expand All @@ -452,10 +457,6 @@ async def chesshack(self, task, llvmir, aie_target):
],
)

llvmir_chesslinked_ir = await read_file_async(llvmir_chesslinked_path)
llvmir_chesslinked_ir = downgrade_ir_for_chess(llvmir_chesslinked_ir)
await write_file_async(llvmir_chesslinked_ir, llvmir_chesslinked_path)

return llvmir_chesslinked_path

async def process_core(
Expand Down Expand Up @@ -513,9 +514,9 @@ async def process_core(
file_core_llvmir_chesslinked = await self.chesshack(task, file_core_llvmir, aie_target)
if self.opts.link and self.opts.xbridge:
link_with_obj = await extract_input_files(file_core_bcf)
await self.do_call(task, ["xchesscc_wrapper", aie_target.lower(), "+w", self.prepend_tmp("work"), "-d", "-f", "+P", "4", file_core_llvmir_chesslinked, link_with_obj, "+l", file_core_bcf, "-o", file_core_elf])
await self.do_call(task, ["xchesscc_wrapper", aie_target.lower(), "+w", self.prepend_tmp("work"), "-d", "+Wclang,-xir", "-f", file_core_llvmir_chesslinked, link_with_obj, "+l", file_core_bcf, "-o", file_core_elf])
elif self.opts.link:
await self.do_call(task, ["xchesscc_wrapper", aie_target.lower(), "+w", self.prepend_tmp("work"), "-c", "-d", "-f", "+P", "4", file_core_llvmir_chesslinked, "-o", file_core_obj])
await self.do_call(task, ["xchesscc_wrapper", aie_target.lower(), "+w", self.prepend_tmp("work"), "-c", "-d", "+Wclang,-xir", "-f", file_core_llvmir_chesslinked, "-o", file_core_obj])
Comment on lines 518 to +519
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While you are here you could add a comment about what these options do without having to dive into Synopsys documentation since it is pretty ad-hoc.
Actually this is repeated 3 times, so perhaps a function?

await self.do_call(task, [self.peano_clang_path, "-O2", "--target=" + aie_peano_target, file_core_obj, *clang_link_args, "-Wl,-T," + file_core_ldscript, "-o", file_core_elf])
else:
file_core_obj = self.unified_file_core_obj
Expand Down Expand Up @@ -1113,7 +1114,7 @@ async def run_flow(self):
self.unified_file_core_obj = self.prepend_tmp("input.o")
if opts.compile and opts.xchesscc:
file_llvmir_hacked = await self.chesshack(progress_bar.task, file_llvmir, aie_target)
await self.do_call(progress_bar.task, ["xchesscc_wrapper", aie_target.lower(), "+w", self.prepend_tmp("work"), "-c", "-d", "-f", "+P", "4", file_llvmir_hacked, "-o", self.unified_file_core_obj])
await self.do_call(progress_bar.task, ["xchesscc_wrapper", aie_target.lower(), "+w", self.prepend_tmp("work"), "-c", "-d", "+Wclang,-xir", "-f", file_llvmir_hacked, "-o", self.unified_file_core_obj])
elif opts.compile:
file_llvmir_opt = self.prepend_tmp("input.opt.ll")
await self.do_call(progress_bar.task, [self.peano_opt_path, "--passes=default<O2>", "-inline-threshold=10", "-S", file_llvmir, "-o", file_llvmir_opt])
Expand Down
20 changes: 0 additions & 20 deletions tools/chess-clang/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,4 @@ if(NOT DEFINED CMAKE_CROSSCOMPILE)
# These files are only useful on host x86 compiles.
install(PROGRAMS xchesscc_wrapper DESTINATION ${PROJECT_BINARY_DIR}/bin)
install(PROGRAMS xchesscc_wrapper DESTINATION ${SCRIPT_INSTALL_PATH})

set(FILES
chess-clang)

set(TARGETS ${FILES})
list(TRANSFORM TARGETS PREPEND ${PROJECT_BINARY_DIR}/bin/)

# stuff into the build directory
add_custom_target(copy-scripts ALL DEPENDS ${TARGETS})
foreach(file ${FILES})
add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/bin/${file}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${file}
${PROJECT_BINARY_DIR}/bin/${file}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
endforeach()

# install too!
foreach(file ${FILES})
install(PROGRAMS ${file} DESTINATION ${SCRIPT_INSTALL_PATH})
endforeach()
endif()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing EOL.
Curious, this project has an .editorconfig stating

insert_final_newline = true

64 changes: 0 additions & 64 deletions tools/chess-clang/chess-clang
View file
Open in desktop

This file was deleted.

23 changes: 5 additions & 18 deletions tools/chess-clang/xchesscc_wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,10 @@
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
#
# (c) Copyright 2021 Xilinx Inc.
# (c) Copyright 2022-2023 Advanced Micro Devices, Inc.
# (c) Copyright 2022-2024 Advanced Micro Devices, Inc.

AIETOOLS=`realpath $(dirname $(which xchesscc))/../`

TARGET_AIE_LIBDIR=$AIETOOLS/data/versal_prod/lib
TARGET_AIE2_LIBDIR=$AIETOOLS/data/aie_ml/lib

TARGET=${1^^}
shift

Expand All @@ -23,29 +20,19 @@ fi
if [ $TARGET == "AIE" ]
then
EXTRA_DEFS="-D__AIE_ARCH__=10 -D__AIEARCH__=10"
AIEARCH=versal_prod
elif [ $TARGET == "AIE2" ]
then
EXTRA_DEFS="-D__AIE_ARCH__=20 -D__AIEARCH__=20"
AIEARCH=aie_ml
fi
if [ -z "$AIETOOLS" ]
then
echo "xchesscc_wrapper needs a valid Vitis installation"
exit 1
fi

if [ -z "$AIETOOLS" ]
then
echo "xchesscc_wrapper needs a valid Vitis installation"
exit 1
fi

TARGETVAR=TARGET_${TARGET}_LIBDIR
LIBDIR=${!TARGETVAR}
LIBDIR=${AIETOOLS}/data/${AIEARCH}/lib

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Useless line now?

export RDI_DATADIR=$AIETOOLS/data
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 me -C Release_LLVM -D__AIENGINE__ $EXTRA_DEFS -Y clang=$DIR/chess-clang -P $LIBDIR -d -f $@
xchesscc --aiearch ${AIEARCH} -p me -C Release_LLVM -D__AIENGINE__ $EXTRA_DEFS -P $LIBDIR -d -f $@
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding some comments for simple mortals wanting to understand?

Loading