Merge branch 'master' of github.com:cpc/tce

cpc · Jul 12, 2019 · acc2409 · acc2409
2 parents 911518e + 8a64810
commit acc2409
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 12 deletions.
diff --git a/tce/INSTALL.Debian → tce/INSTALL.UbuntuAndDebian b/tce/INSTALL.Debian → tce/INSTALL.UbuntuAndDebian
@@ -7,11 +7,18 @@ These instructions install everything locally under $HOME/local.
 
 This needs root/admin privileges.
 
-  ## In Debian 7:
+  ## Ubuntu 16.04 LTS and 18.04 LTS:
+  ## You need to enable the universe and multiverse repositories first:
+  ## https://help.ubuntu.com/community/Repositories/Ubuntu#Adding_Repositories_in_Ubuntu
 
-  sudo apt-get install libwxgtk2.8-dev libboost-{filesystem,graph,regex,thread}-dev \
-    tcl8.4-dev libedit-dev libsqlite3-dev sqlite3 libxerces-c2-dev g++ make latex2html \
-    libffi-dev autoconf automake libtool subversion git
+  sudo apt-get install libwxgtk3.0-dev libboost-all-dev \
+    tcl8.6-dev libedit-dev libsqlite3-dev sqlite3 libxerces-c-dev g++ make latex2html \
+    libffi-dev autoconf automake libtool subversion git cmake
+
+  ## Note! Since Ubuntu 18.04 might install libllvm8, it can cause
+  ## a problem with TCE patched LLVM at build time. You might need a
+  ## workaround that is documented in this issue
+  ## https://github.com/cpc/tce/issues/91
 
   ## Ubuntu 14.04 LTS:
   ## You need to enable the universe and multiverse repositories first:
@@ -21,13 +28,11 @@ This needs root/admin privileges.
     tcl8.4-dev libedit-dev libsqlite3-dev sqlite3 libxerces-c2-dev g++ make latex2html \
     libffi-dev autoconf automake libtool subversion git cmake
 
-  ## Ubuntu 16.04 LTS:
-  ## You need to enable the universe and multiverse repositories first:
-  ## https://help.ubuntu.com/community/Repositories/Ubuntu#Adding_Repositories_in_Ubuntu
+  ## In Debian 7:
 
-  sudo apt-get install libwxgtk3.0-dev libboost-all-dev \
-    tcl8.6-dev libedit-dev libsqlite3-dev sqlite3 libxerces-c-dev g++ make latex2html \
-    libffi-dev autoconf automake libtool subversion git cmake
+  sudo apt-get install libwxgtk2.8-dev libboost-{filesystem,graph,regex,thread}-dev \
+    tcl8.4-dev libedit-dev libsqlite3-dev sqlite3 libxerces-c2-dev g++ make latex2html \
+    libffi-dev autoconf automake libtool subversion git
 
 * Get the latest TCE source code from the version control system:
 

diff --git a/tce/src/applibs/LLVMBackend/InstructionPatternAnalyzer.hh b/tce/src/applibs/LLVMBackend/InstructionPatternAnalyzer.hh
@@ -28,13 +28,18 @@
  * Helps to find common instruction chains for conversion to custom 
  * operations.
  *
- * @author Pekka Jääskeläinen 2012
+ * @author Pekka Jääskeläinen 2012,2019
  */
 
 #ifndef TCE_INSTRUCTION_PATTERN_ANALYZER_HH
 #define TCE_INSTRUCTION_PATTERN_ANALYZER_HH
 
-#include "llvm/CodeGen/MachineFunctionPass.h"
+#include "CompilerWarnings.hh"
+
+IGNORE_COMPILER_WARNING("-Wunused-parameter")
+IGNORE_COMPILER_WARNING("-Wcomment")
+
+#include <llvm/CodeGen/MachineFunctionPass.h>
 
 struct InstructionPatternAnalyzer : public llvm::MachineFunctionPass {
     static char ID;

diff --git a/tce/src/applibs/LLVMBackend/LLVMBackend.cc b/tce/src/applibs/LLVMBackend/LLVMBackend.cc
@@ -34,6 +34,7 @@
 
 #include "CompilerWarnings.hh"
 IGNORE_COMPILER_WARNING("-Wunused-parameter")
+IGNORE_COMPILER_WARNING("-Wcomment")
 
 #include <llvm/Analysis/LoopInfo.h>
 #include <llvm/Analysis/LoopPass.h>

diff --git a/tce/src/applibs/LLVMBackend/passes/MachineDCE.hh b/tce/src/applibs/LLVMBackend/passes/MachineDCE.hh
@@ -32,6 +32,7 @@
 #include "CompilerWarnings.hh"
 
 IGNORE_COMPILER_WARNING("-Wunused-parameter")
+IGNORE_COMPILER_WARNING("-Wcomment")
 
 #include "llvm/CodeGen/Passes.h"
 #include "tce_config.h"

diff --git a/tce/tools/scripts/install_llvm_8.0.sh b/tce/tools/scripts/install_llvm_8.0.sh
@@ -89,11 +89,17 @@ cd $llvm_co_dir
 mkdir -p build
 cd build
 
+# -DLLVM_ENABLE_Z3_SOLVER=OFF due to the issue described in
+# https://reviews.llvm.org/D54978#1390652
+# You might also need to delete libz3-dev.
+# This appears at least with Ubuntu 18.04.
+
 cmake -G "Unix Makefiles" \
     $LLVM_BUILD_MODE\
     -DCMAKE_INSTALL_PREFIX=$TARGET_DIR \
     -DLLVM_LINK_LLVM_DYLIB=TRUE \
     -DLLVM_ENABLE_RTTI=TRUE \
+    -DLLVM_ENABLE_Z3_SOLVER=OFF \
     .. \
     || eexit "Configuring LLVM/Clang failed."
 make -j8 CXXFLAGS="-std=c++11" REQUIRES_RTTI=1 \