From 1517f3c273e981d0c9609ae32b9259c3724c6406 Mon Sep 17 00:00:00 2001
From: Adel Ejjeh <aejjeh@hpvmfpga1.cs.illinois.edu>
Date: Tue, 21 Jan 2020 12:06:43 -0600
Subject: [PATCH] Making small changes to installer to improve usability
---
hpvm/llvm_installer/llvm_installer.sh | 32 +++++++++++++++++++--------
1 file changed, 23 insertions(+), 9 deletions(-)
diff --git a/hpvm/llvm_installer/llvm_installer.sh b/hpvm/llvm_installer/llvm_installer.sh
index 726a632190..dc250e5e7e 100755
--- a/hpvm/llvm_installer/llvm_installer.sh
+++ b/hpvm/llvm_installer/llvm_installer.sh
@@ -28,6 +28,8 @@ CLANG_TOOLS_SRC="clang-tools-extra-$VERSION.src"
if [ -d $LLVM_SRC ]; then
echo Found $LLVM_SRC!
+elif [ -d llvm ]; then
+ echo Found llvm, not downloading $LLVM_SRC!
else
echo $WGET $URL/$VERSION/$LLVM_SRC$SUFFIX
$WGET $URL/$VERSION/$LLVM_SRC$SUFFIX
@@ -37,6 +39,8 @@ fi
if [ -d $LLVM_SRC ]; then
echo Everything looks sane.
mv $LLVM_SRC llvm
+elif [ -d llvm ]; then
+ echo Everything looks sane.
else
echo Install had problems. Quitting.
exit
@@ -135,29 +139,37 @@ if [ $LLD_SRC != "" ]; then
fi
fi
-
-mkdir $CURRENT_DIR/$LLVM_SRC/tools/hpvm
+echo Adding HPVM sources to tree
+if [ -d $CURRENT_DIR/$LLVM_SRC/tools/hpvm ]; then
+ mkdir $CURRENT_DIR/$LLVM_SRC/tools/hpvm
+else
+ echo $CURRENT_DIR/$LLVM_SRC/tools/hpvm exists.
+fi
HPVM_DIR=$CURRENT_DIR/$LLVM_SRC/tools/hpvm
-cp $CURRENT_DIR/CMakeLists.txt $HPVM_DIR
-cp -r $CURRENT_DIR/include $HPVM_DIR/
-cp -r $CURRENT_DIR/lib $HPVM_DIR/
-cp -r $CURRENT_DIR/projects $HPVM_DIR/
-#rm -r $HPVM_DIR/projects/llvm-cbe
-cp -r $CURRENT_DIR/test $HPVM_DIR/
+cp -ruv $CURRENT_DIR/CMakeLists.txt $HPVM_DIR
+cp -ruv $CURRENT_DIR/CMakeLists.txt $HPVM_DIR
+cp -ruv $CURRENT_DIR/include $HPVM_DIR/
+cp -ruv $CURRENT_DIR/include $HPVM_DIR/
+cp -ruv $CURRENT_DIR/lib $HPVM_DIR/
+cp -ruv $CURRENT_DIR/projects $HPVM_DIR/
+cp -ruv $CURRENT_DIR/test $HPVM_DIR/
ls $HPVM_DIR
export LLVM_SRC_ROOT=$CURRENT_DIR/$LLVM_SRC
echo ${LLVM_SRC_ROOT}
+echo Applying HPVM patches
cd $CURRENT_DIR/llvm_patches
/bin/bash ./construct_patch.sh
/bin/bash ./apply_patch.sh
echo Patches applied.
+echo Now building...
+
if [ -d $BUILD_DIR ]; then
cd $BUILD_DIR
echo Found $BUILD_DIR.
@@ -165,9 +177,11 @@ else
mkdir -p $BUILD_DIR
mkdir -p $INSTALL_DIR
cd $BUILD_DIR
- cmake ../$LLVM_SRC -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DLLVM_TARGETS_TO_BUILD="X86;NVPTX" -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR
+ echo cmake ../$LLVM_SRC -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DLLVM_TARGETS_TO_BUILD="X86" -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR
+ cmake ../$LLVM_SRC -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DLLVM_TARGETS_TO_BUILD="X86" -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR
fi
+echo make -j$NUM_THREADS
make -j$NUM_THREADS
#make install
--
GitLab