Update to the new compiler version published by ETHZ

diff --git a/HerculesCompiler b/HerculesCompiler
index ce8c623e21f4ae874be5fd9b7d26f16edca294e9..738ca0ce4ccf59a15b4a0b59a74db99c584c7e83 160000 (submodule)
--- a/HerculesCompiler
+++ b/HerculesCompiler
@@ -1 +1 @@
-Subproject commit ce8c623e21f4ae874be5fd9b7d26f16edca294e9
+Subproject commit 738ca0ce4ccf59a15b4a0b59a74db99c584c7e83

diff --git a/clang b/clang
index 91f50ec6a72e172bcdf3a1001007ffe7f431edbd..fa98fd2c878db20e8228ae88bb55d175a2a2cbf3 160000 (submodule)
--- a/clang
+++ b/clang
@@ -1 +1 @@
-Subproject commit 91f50ec6a72e172bcdf3a1001007ffe7f431edbd
+Subproject commit fa98fd2c878db20e8228ae88bb55d175a2a2cbf3

diff --git a/debian/patches/configuration.patch b/debian/patches/configuration.patch
index 83fe207eb8cb6c176be0a2c17f793a3744614c00..ec8c967d1d7dcf52f8ffbf10fad303d01f7a0ad9 100644 (file)
--- a/debian/patches/configuration.patch
+++ b/debian/patches/configuration.patch
@@ -1,9 +1,11 @@
 Description: Configuration for TX2 according to M24CompilerRuntime.docx
 
---- hercules-compiler-2017.11.orig/HerculesCompiler/llvm-passes/include/Config/Options.h
-+++ hercules-compiler-2017.11/HerculesCompiler/llvm-passes/include/Config/Options.h
-@@ -39,11 +39,11 @@
- //#define AGGRESSIVELY_INLINE_CALL_TREE
+Index: hercules-compiler/HerculesCompiler/llvm-passes/include/Config/Options.h
+===================================================================
+--- hercules-compiler.orig/HerculesCompiler/llvm-passes/include/Config/Options.h
++++ hercules-compiler/HerculesCompiler/llvm-passes/include/Config/Options.h
+@@ -41,11 +41,11 @@
+ //#define NEVER_INLINE_SYNC
  
  // Use hardware cache prefetches in Specialized function, in place of SPM-based.
 -//#define USE_HW_CACHES
@@ -13,11 +15,13 @@ Description: Configuration for TX2 according to M24CompilerRuntime.docx
  // to bring the data local.
 -//#define USE_HW_CACHES_PREFETCH
 +#define USE_HW_CACHES_PREFETCH
+ //#define USE_HW_CACHES_INLINEPTX_PREFETCH
+ //#define USE_HW_CACHES_LIBCALL
  //#define USE_HW_CACHES_VOLALOAD
- 
- 
---- hercules-compiler-2017.11.orig/clang/lib/Driver/ToolChains.cpp
-+++ hercules-compiler-2017.11/clang/lib/Driver/ToolChains.cpp
+Index: hercules-compiler/clang/lib/Driver/ToolChains.cpp
+===================================================================
+--- hercules-compiler.orig/clang/lib/Driver/ToolChains.cpp
++++ hercules-compiler/clang/lib/Driver/ToolChains.cpp
 @@ -4967,7 +4967,7 @@ Tool *DragonFly::buildLinker() const {
  // macro for it. Also, select the default PTX version to be used. We use 4.2 for
  // compute capabilities older than 6.0 and 5.0 otherwise.
@@ -27,8 +31,10 @@ Description: Configuration for TX2 according to M24CompilerRuntime.docx
  #endif
  
  #if OPENMP_NVPTX_COMPUTE_CAPABILITY < 60
---- hercules-compiler-2017.11.orig/openmp/libomptarget/deviceRTLs/nvptx/CMakeLists.txt
-+++ hercules-compiler-2017.11/openmp/libomptarget/deviceRTLs/nvptx/CMakeLists.txt
+Index: hercules-compiler/openmp/libomptarget/deviceRTLs/nvptx/CMakeLists.txt
+===================================================================
+--- hercules-compiler.orig/openmp/libomptarget/deviceRTLs/nvptx/CMakeLists.txt
++++ hercules-compiler/openmp/libomptarget/deviceRTLs/nvptx/CMakeLists.txt
 @@ -66,7 +66,7 @@ if(LIBOMPTARGET_DEP_CUDA_FOUND)
        set(CUDA_ARCH ${CUDA_ARCH} -gencode arch=compute_${sm},code=sm_${sm})
      endforeach()

diff --git a/debian/patches/install-passes.patch b/debian/patches/install-passes.patch
deleted file mode 100644 (file)
index 4d97635..0000000
--- a/debian/patches/install-passes.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: Allow installing the Hercules passes
-
---- hercules-compiler-2017.11.orig/HerculesCompiler/llvm-passes/src/Passes/AnnotatePTXGlobals/CMakeLists.txt
-+++ hercules-compiler-2017.11/HerculesCompiler/llvm-passes/src/Passes/AnnotatePTXGlobals/CMakeLists.txt
-@@ -7,3 +7,4 @@ add_library(AnnotatePTXGlobals
-   ${PROJECTS_MAIN_INCLUDE_DIR}/Config/Macros.h
-   ${PROJECTS_MAIN_INCLUDE_DIR}/Config/PassOptions.h )
- 
-+install(TARGETS AnnotatePTXGlobals LIBRARY DESTINATION lib/hercules/AnnotatePTXGlobals)
---- hercules-compiler-2017.11.orig/HerculesCompiler/llvm-passes/src/Passes/ChannelArgInsertion/CMakeLists.txt
-+++ hercules-compiler-2017.11/HerculesCompiler/llvm-passes/src/Passes/ChannelArgInsertion/CMakeLists.txt
-@@ -7,3 +7,5 @@ add_library(ChannelArgInsertion
-   ${PROJECTS_MAIN_INCLUDE_DIR}/Config/Constants.h
-   ${PROJECTS_MAIN_INCLUDE_DIR}/Config/PassOptions.h
-   ${PROJECTS_MAIN_INCLUDE_DIR}/Config/Macros.h )
-+
-+install(TARGETS ChannelArgInsertion LIBRARY DESTINATION lib/hercules/ChannelArgInsertion)
---- hercules-compiler-2017.11.orig/HerculesCompiler/llvm-passes/src/Passes/LoopChunk/CMakeLists.txt
-+++ hercules-compiler-2017.11/HerculesCompiler/llvm-passes/src/Passes/LoopChunk/CMakeLists.txt
-@@ -6,4 +6,4 @@ add_library(LoopChunk SHARED LoopChunk.c
-     ${PROJECTS_MAIN_INCLUDE_DIR}/Config/PassOptions.h
-     ${PROJECTS_MAIN_INCLUDE_DIR}/Config/Macros.h
-     )
--
-+install(TARGETS LoopChunk LIBRARY DESTINATION lib/hercules/LoopChunk)
---- hercules-compiler-2017.11.orig/HerculesCompiler/llvm-passes/src/Passes/LoopExtract/CMakeLists.txt
-+++ hercules-compiler-2017.11/HerculesCompiler/llvm-passes/src/Passes/LoopExtract/CMakeLists.txt
-@@ -8,3 +8,5 @@ add_library(LoopExtract MODULE LoopExtra
- 
- get_property(MODULE_FILE TARGET LoopExtract PROPERTY LOCATION)
- #configure_file(run.sh.in run.sh @ONLY)
-+
-+install(TARGETS LoopExtract LIBRARY DESTINATION lib/hercules/LoopExtract)
---- hercules-compiler-2017.11.orig/HerculesCompiler/llvm-passes/src/Passes/MarkLoopsToTransform/CMakeLists.txt
-+++ hercules-compiler-2017.11/HerculesCompiler/llvm-passes/src/Passes/MarkLoopsToTransform/CMakeLists.txt
-@@ -9,3 +9,4 @@ add_library(MarkLoopsToTransform
-   ${PROJECTS_MAIN_INCLUDE_DIR}/Config/PassOptions.h
-   ${PROJECTS_MAIN_INCLUDE_DIR}/Config/Macros.h )
- 
-+install(TARGETS MarkLoopsToTransform LIBRARY DESTINATION lib/hercules/MarkLoopsToTransform)
---- hercules-compiler-2017.11.orig/HerculesCompiler/llvm-passes/src/Passes/WarpSeparate/CMakeLists.txt
-+++ hercules-compiler-2017.11/HerculesCompiler/llvm-passes/src/Passes/WarpSeparate/CMakeLists.txt
-@@ -9,3 +9,4 @@ add_library(WarpSeparate
-   ${PROJECTS_MAIN_INCLUDE_DIR}/Config/PassOptions.h
-   ${PROJECTS_MAIN_INCLUDE_DIR}/Config/Macros.h )
- 
-+install(TARGETS WarpSeparate LIBRARY DESTINATION lib/hercules/WarpSeparate)
---- hercules-compiler-2017.11.orig/HerculesCompiler/llvm-passes/src/Passes/WarpSpecialize/CMakeLists.txt
-+++ hercules-compiler-2017.11/HerculesCompiler/llvm-passes/src/Passes/WarpSpecialize/CMakeLists.txt
-@@ -9,3 +9,4 @@ add_library(WarpSpecialize
-   ${PROJECTS_MAIN_INCLUDE_DIR}/Config/PassOptions.h
-   ${PROJECTS_MAIN_INCLUDE_DIR}/Config/Macros.h )
- 
-+install(TARGETS WarpSpecialize LIBRARY DESTINATION lib/hercules/WarpSpecialize)

diff --git a/debian/patches/libpremnotify-makefile.patch b/debian/patches/libpremnotify-makefile.patch
deleted file mode 100644 (file)
index d7dfd88..0000000
--- a/debian/patches/libpremnotify-makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Add Makefile for libpremnotify
- This allows easy cross-compilation of the libpremnotify.
-
-Index: hercules-compiler_2017.11/HerculesCompiler/libpremnotify/Makefile
-===================================================================
---- /dev/null
-+++ hercules-compiler_2017.11/HerculesCompiler/libpremnotify/Makefile
-@@ -0,0 +1,12 @@
-+PREFIX=/usr/local
-+
-+all: libpremnotify-cpu.a
-+
-+libpremnotify-cpu.a: libpremnotify-cpu.o
-+      $(AR) rcs $@ $^
-+
-+install: all
-+      install -D -m 644 libpremnotify-cpu.a $(DESTDIR)$(PREFIX)/lib/hercules/libpremnotify-cpu.a
-+
-+clean:
-+      rm -rf libpremnotify-cpu.o libpremnotify-cpu.a

diff --git a/debian/patches/series b/debian/patches/series
index 76164b1b5ea5a979d4fdec9271f1cad3a291d5f3..284ab08e8df346153a222d76ab6fe3e3a30aa527 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-install-passes.patch
-libpremnotify-makefile.patch
 configuration.patch