diff --git a/README.md b/README.md index 27ad0e045b85bf32de78dc8a93f03456bb4d77de..7e027152e6eab728624d5080d5d475191fe6acf4 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ HPVM installer script can be used to download, configure and build HPVM along wi cd hpvm bash install.sh ``` -Specifically, the HPVM installer downloads LLVM, Clang, compiler-rt, libcxxabi and lld, copies HPVM source into +Specifically, the HPVM installer downloads LLVM, Clang, libcxx and libcxxabi, copies HPVM source into llvm/tools and builds the entire tree. It also builds a modified LLVM C-Backend, based on the one maintained by [Julia Computing](https://github.com/JuliaComputing/llvm-cbe), as a part of HPVM and is currently used to generate OpenCL kernels for GPUs. diff --git a/hpvm/llvm_installer/llvm_installer.sh b/hpvm/llvm_installer/llvm_installer.sh index e4bdd5b3eebe7ab655ad890f3de5c09613fd91f5..29d629c3f64efff3fdaf1bddedbeb87e071f9642 100755 --- a/hpvm/llvm_installer/llvm_installer.sh +++ b/hpvm/llvm_installer/llvm_installer.sh @@ -16,10 +16,8 @@ NUM_THREADS=2 SUFFIX=".tar.xz" CLANG_SRC="cfe-$VERSION.src" LLVM_SRC="llvm-$VERSION.src" -RT_SRC="compiler-rt-$VERSION.src" LIBCXX_SRC="libcxx-$VERSION.src" LIBCXXABI_SRC="libcxxabi-$VERSION.src" -LLD_SRC="lld-$VERSION.src" AUTOMATE="y" @@ -91,21 +89,6 @@ else exit 1 fi -if [ -d compiler-rt ]; then - echo Found compiler-rt! Not downloading compiler-rt again. -else - $WGET $URL/$VERSION/$RT_SRC$SUFFIX - tar xf $RT_SRC$SUFFIX - rm $RT_SRC$SUFFIX - mv $RT_SRC compiler-rt - if [ -d compiler-rt ]; then - echo Everything looks sane. - else - echo Install had problems. Quitting. - exit - fi -fi - if [ -d libcxx ]; then echo Found libcxx! Not downloading libcxx again. else @@ -138,23 +121,6 @@ if [ $LIBCXXABI_SRC != "" ]; then fi fi -if [ $LLD_SRC != "" ]; then - if [ -d lld ]; then - echo Found lld! Not downloading lld again. - else - $WGET $URL/$VERSION/$LLD_SRC$SUFFIX - tar xf $LLD_SRC$SUFFIX - rm $LLD_SRC$SUFFIX - mv $LLD_SRC lld - if [ -d lld ]; then - echo Everything looks sane. - else - echo Install had problems. Quitting. - exit - fi - fi -fi - HPVM_DIR=$CURRENT_DIR/$LLVM_SRC/tools/hpvm if [ ! -d $HPVM_DIR ]; then