Added commands for building libpremnotify-gpu

[Minor modifications by Michal Sojka]

diff --git a/Makefile b/Makefile
index d89a1e24f7b80ccbf08c57c0b3315456b5c85623..3b3e29b3b97dabba570d741ea9c5b53c8049e611 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ TMP_DESTDIR = $(CURDIR)/install
 export CC = gcc-5
 export CXX = g++-5
 
-all: libpremnotify-cpu
+all: libpremnotify
 all: passes
 
 llvm-clang: build/bin/opt
@@ -54,7 +54,7 @@ build_native/build.ninja: | build_native
                -DCMAKE_CXX_FLAGS='-DHERCULES_PASS_ROOT=\"$(PREFIX)/lib/hercules/\"' \
                -G "Ninja" $(CURDIR)/llvm
 
-libpremnotify-cpu: export CC=$(DEB_HOST_GNU_TYPE)-gcc
+libpremnotify: export CC=$(DEB_HOST_GNU_TYPE)-gcc
 endif
 
 
@@ -84,7 +84,7 @@ $(DESTDIR)$(PREFIX)/bin/herculesCompileCPU.sh: HerculesCompiler/cpu-driver/hercu
                < $< > $@
        chmod +x $@
 
-libpremnotify-cpu:
+libpremnotify:
        $(MAKE) -C HerculesCompiler/libpremnotify
 
 install: all

diff --git a/debian/patches/libpremnotify-makefile.patch b/debian/patches/libpremnotify-makefile.patch
new file mode 100644 (file)
index 0000000..d0de472
--- /dev/null
+++ b/debian/patches/libpremnotify-makefile.patch
@@ -0,0 +1,26 @@
+--- hercules-compiler.orig/HerculesCompiler/libpremnotify/Makefile
++++ hercules-compiler/HerculesCompiler/libpremnotify/Makefile
+@@ -1,12 +1,22 @@
+ PREFIX=/usr/local
++NVCC=$(or $(shell which nvcc),$(wildcard /usr/local/cuda/bin/nvcc),nvcc)
+ 
+-all: libpremnotify-cpu.a
++all: libpremnotify-cpu.a libpremnotify-gpu.a
+ 
+ libpremnotify-cpu.a: libpremnotify-cpu.o
+       $(AR) rcs $@ $^
+ 
++libpremnotify-gpu.a: libpremnotify-gpu.o
++      $(AR) qc $@ $^
++      ranlib libpremnotify-gpu.a
++
++libpremnotify-gpu.o:
++      $(NVCC) -ccbin $(CC) -arch=compute_62 -code=sm_62 -dc libpremnotify-gpu.cu -Xptxas -v -Xnvlink -v -Xptxas -maxrregcount=16,-func-maxrregcount=16 -o libpremnotify-gpu.o
++
+ install: all
+       install -D -m 644 libpremnotify-cpu.a $(DESTDIR)$(PREFIX)/lib/hercules/libpremnotify-cpu.a
++      install -D -m 644 libpremnotify-gpu.a $(DESTDIR)$(PREFIX)/lib/hercules/libpremnotify-gpu.a
+ 
+ clean:
+       rm -rf libpremnotify-cpu.o libpremnotify-cpu.a
++      rm -rf libpremnotify-gpu.o libpremnotify-gpu.a

diff --git a/debian/patches/series b/debian/patches/series
index de2441767bc95a5f6baa47d1629069a58c53d728..434a9e0fbcdacf23b577ae637469c277e728e477 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 configuration.patch
 Guard-architecture-dependent-code-with-#ifdefs.patch
 require-cuda.patch
+libpremnotify-makefile.patch