From: Victor Julien Date: Sat, 30 Jan 2016 16:28:28 +0000 (+0100) Subject: cuda: update build system for modern versions X-Git-Tag: suricata-3.0.1RC1~103 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c12044c6c53b3af388dbc06006b0230991eac38a;p=thirdparty%2Fsuricata.git cuda: update build system for modern versions Remove support for compute capabilities below 2.0. Add capabilities until 5.3. --- diff --git a/src/Makefile.am b/src/Makefile.am index 4af253a896..d2111e602e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -433,36 +433,15 @@ util-mpm-ac-cuda-kernel.cu NVCCFLAGS=-O2 -SUFFIXES = \ -.ptx_sm_10 \ -.ptx_sm_11 \ -.ptx_sm_12 \ -.ptx_sm_13 \ -.ptx_sm_20 \ -.ptx_sm_21 \ -.ptx_sm_30 \ -.ptx_sm_35 - -PTXS = $(suricata_CUDA_KERNELS:.cu=.ptx_sm_10) -PTXS += $(suricata_CUDA_KERNELS:.cu=.ptx_sm_11) -PTXS += $(suricata_CUDA_KERNELS:.cu=.ptx_sm_12) -PTXS += $(suricata_CUDA_KERNELS:.cu=.ptx_sm_13) -PTXS += $(suricata_CUDA_KERNELS:.cu=.ptx_sm_20) +PTXS = $(suricata_CUDA_KERNELS:.cu=.ptx_sm_20) PTXS += $(suricata_CUDA_KERNELS:.cu=.ptx_sm_21) PTXS += $(suricata_CUDA_KERNELS:.cu=.ptx_sm_30) +PTXS += $(suricata_CUDA_KERNELS:.cu=.ptx_sm_32) PTXS += $(suricata_CUDA_KERNELS:.cu=.ptx_sm_35) - -.cu.ptx_sm_10: - $(NVCC) $(NVCCFLAGS) -o $@ -arch=sm_10 -ptx $< - -.cu.ptx_sm_11: - $(NVCC) $(NVCCFLAGS) -o $@ -arch=sm_11 -ptx $< - -.cu.ptx_sm_12: - $(NVCC) $(NVCCFLAGS) -o $@ -arch=sm_12 -ptx $< - -.cu.ptx_sm_13: - $(NVCC) $(NVCCFLAGS) -o $@ -arch=sm_13 -ptx $< +PTXS += $(suricata_CUDA_KERNELS:.cu=.ptx_sm_37) +PTXS += $(suricata_CUDA_KERNELS:.cu=.ptx_sm_50) +PTXS += $(suricata_CUDA_KERNELS:.cu=.ptx_sm_52) +PTXS += $(suricata_CUDA_KERNELS:.cu=.ptx_sm_53) .cu.ptx_sm_20: $(NVCC) $(NVCCFLAGS) -o $@ -arch=sm_20 -ptx $< @@ -473,9 +452,24 @@ PTXS += $(suricata_CUDA_KERNELS:.cu=.ptx_sm_35) .cu.ptx_sm_30: $(NVCC) $(NVCCFLAGS) -o $@ -arch=sm_30 -ptx $< +.cu.ptx_sm_32: + $(NVCC) $(NVCCFLAGS) -o $@ -arch=sm_32 -ptx $< + .cu.ptx_sm_35: $(NVCC) $(NVCCFLAGS) -o $@ -arch=sm_35 -ptx $< +.cu.ptx_sm_37: + $(NVCC) $(NVCCFLAGS) -o $@ -arch=sm_37 -ptx $< + +.cu.ptx_sm_50: + $(NVCC) $(NVCCFLAGS) -o $@ -arch=sm_50 -ptx $< + +.cu.ptx_sm_52: + $(NVCC) $(NVCCFLAGS) -o $@ -arch=sm_52 -ptx $< + +.cu.ptx_sm_53: + $(NVCC) $(NVCCFLAGS) -o $@ -arch=sm_53 -ptx $< + cuda-ptxdump.h: $(PTXS) $(PYTHON) ptxdump.py cuda-ptxdump $(PTXS)