Skip to content
Snippets Groups Projects
Commit 9aaf2bc2 authored by John Tromp's avatar John Tromp
Browse files

c11 for nvcc

parent 609dde26
No related branches found
No related tags found
No related merge requests found
...@@ -12,6 +12,7 @@ GPP ?= g++ $(GPP_ARCH_FLAGS) -std=c++11 $(FLAGS) ...@@ -12,6 +12,7 @@ GPP ?= g++ $(GPP_ARCH_FLAGS) -std=c++11 $(FLAGS)
CFLAGS ?= -Wall -Wno-format -fomit-frame-pointer $(OPT) CFLAGS ?= -Wall -Wno-format -fomit-frame-pointer $(OPT)
GCC ?= gcc $(GCC_ARCH_FLAGS) -std=gnu11 $(CFLAGS) GCC ?= gcc $(GCC_ARCH_FLAGS) -std=gnu11 $(CFLAGS)
BLAKE_2B_SRC ?= ../crypto/blake2b-ref.c BLAKE_2B_SRC ?= ../crypto/blake2b-ref.c
NVCC ?= nvcc -std=c++11
all : simpletest leantest all : simpletest leantest
...@@ -64,19 +65,19 @@ mean30x1: cuckatoo.h bitmap.hpp graph.hpp ../threads/barrier.hpp ../crypto/siph ...@@ -64,19 +65,19 @@ mean30x1: cuckatoo.h bitmap.hpp graph.hpp ../threads/barrier.hpp ../crypto/siph
$(GPP) -o $@ -DNSIPHASH=1 -DEXPANDROUND=10 -DCOMPRESSROUND=22 -DEDGEBITS=30 mean.cpp $(BLAKE_2B_SRC) $(GPP) -o $@ -DNSIPHASH=1 -DEXPANDROUND=10 -DCOMPRESSROUND=22 -DEDGEBITS=30 mean.cpp $(BLAKE_2B_SRC)
lcuda19: ../crypto/siphash.cuh lean.cu Makefile lcuda19: ../crypto/siphash.cuh lean.cu Makefile
nvcc -o $@ -DEDGEBITS=19 -arch sm_35 lean.cu $(BLAKE_2B_SRC) $(NVCC) -o $@ -DEDGEBITS=19 -arch sm_35 lean.cu $(BLAKE_2B_SRC)
lcuda29: ../crypto/siphash.cuh lean.cu Makefile lcuda29: ../crypto/siphash.cuh lean.cu Makefile
nvcc -o $@ -DEDGEBITS=29 -arch sm_35 lean.cu $(BLAKE_2B_SRC) $(NVCC) -o $@ -DEDGEBITS=29 -arch sm_35 lean.cu $(BLAKE_2B_SRC)
lcuda30: ../crypto/siphash.cuh lean.cu Makefile lcuda30: ../crypto/siphash.cuh lean.cu Makefile
nvcc -o $@ -DEDGEBITS=30 -arch sm_35 lean.cu $(BLAKE_2B_SRC) $(NVCC) -o $@ -DEDGEBITS=30 -arch sm_35 lean.cu $(BLAKE_2B_SRC)
lcuda32: ../crypto/siphash.cuh lean.cu Makefile lcuda32: ../crypto/siphash.cuh lean.cu Makefile
nvcc -o $@ -DEDGEBITS=32 -arch sm_35 lean.cu $(BLAKE_2B_SRC) $(NVCC) -o $@ -DEDGEBITS=32 -arch sm_35 lean.cu $(BLAKE_2B_SRC)
cuda19: ../crypto/siphash.cuh mean.cu Makefile cuda19: ../crypto/siphash.cuh mean.cu Makefile
nvcc -o $@ -DEPS_A=4 -DEPS_B=3 -DIDXSHIFT=6 -DEDGEBITS=19 -arch sm_35 mean.cu $(BLAKE_2B_SRC) $(NVCC) -o $@ -DEPS_A=4 -DEPS_B=3 -DIDXSHIFT=6 -DEDGEBITS=19 -arch sm_35 mean.cu $(BLAKE_2B_SRC)
cuda29: ../crypto/siphash.cuh mean.cu Makefile cuda29: ../crypto/siphash.cuh mean.cu Makefile
nvcc -o $@ -DEDGEBITS=29 -arch sm_35 mean.cu $(BLAKE_2B_SRC) $(NVCC) -o $@ -DEDGEBITS=29 -arch sm_35 mean.cu $(BLAKE_2B_SRC)
...@@ -12,6 +12,7 @@ GPP ?= g++ $(GPP_ARCH_FLAGS) -std=c++11 $(FLAGS) ...@@ -12,6 +12,7 @@ GPP ?= g++ $(GPP_ARCH_FLAGS) -std=c++11 $(FLAGS)
CFLAGS ?= -Wall -Wno-format -fomit-frame-pointer $(OPT) CFLAGS ?= -Wall -Wno-format -fomit-frame-pointer $(OPT)
GCC ?= gcc $(GCC_ARCH_FLAGS) -std=gnu11 $(CFLAGS) GCC ?= gcc $(GCC_ARCH_FLAGS) -std=gnu11 $(CFLAGS)
BLAKE_2B_SRC ?= ../crypto/blake2b-ref.c BLAKE_2B_SRC ?= ../crypto/blake2b-ref.c
NVCC ?= nvcc -std=c++11
all : simpletest leantest all : simpletest leantest
...@@ -55,7 +56,7 @@ mean29x1: cuckoo.h ../crypto/siphash.h mean.hpp mean.cpp Makefile ...@@ -55,7 +56,7 @@ mean29x1: cuckoo.h ../crypto/siphash.h mean.hpp mean.cpp Makefile
$(GPP) -o $@ -DNSIPHASH=1 -DEDGEBITS=29 mean.cpp $(BLAKE_2B_SRC) $(GPP) -o $@ -DNSIPHASH=1 -DEDGEBITS=29 mean.cpp $(BLAKE_2B_SRC)
lcuda29: ../crypto/siphash.cuh lean.cu Makefile lcuda29: ../crypto/siphash.cuh lean.cu Makefile
nvcc -o $@ -DEDGEBITS=29 -arch sm_35 lean.cu $(BLAKE_2B_SRC) $(NVCC) -o $@ -DEDGEBITS=29 -arch sm_35 lean.cu $(BLAKE_2B_SRC)
cuda29: ../crypto/siphash.cuh mean.cu Makefile cuda29: ../crypto/siphash.cuh mean.cu Makefile
nvcc -o $@ -DEDGEBITS=29 -arch sm_35 mean.cu $(BLAKE_2B_SRC) $(NVCC) -o $@ -DEDGEBITS=29 -arch sm_35 mean.cu $(BLAKE_2B_SRC)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment