Browse Source

Make nvcc compilation respect V=1

Samuel Thibault 7 years ago
parent
commit
a0cb67caa4

+ 1 - 2
examples/Makefile.am

@@ -93,8 +93,7 @@ else
 NVCCFLAGS += --compiler-options -fno-strict-aliasing  -I$(top_srcdir)/include/ -I$(top_builddir)/include/ $(HWLOC_CFLAGS)
 
 .cu.o:
-	@echo "  NVCC     $@"
-	@$(NVCC) $< -c -o $@ $(NVCCFLAGS)
+	$(V_nvcc) $(NVCC) $< -c -o $@ $(NVCCFLAGS)
 endif
 
 endif

+ 2 - 4
examples/stencil/Makefile.am

@@ -49,12 +49,10 @@ else
 NVCCFLAGS += --compiler-options -fno-strict-aliasing  -I$(top_srcdir)/include/ -I$(top_builddir)/include/ -I$(top_srcdir)/examples/  $(HWLOC_CFLAGS)
 
 .cu.cubin:
-	@echo "  NVCC     $@"
-	@$(NVCC) -cubin $< -o $@ $(NVCCFLAGS)
+	$(V_nvcc) $(NVCC) -cubin $< -o $@ $(NVCCFLAGS)
 
 .cu.o:
-	@echo "  NVCC     $@"
-	@$(NVCC) $< -c -o $@ $(NVCCFLAGS)
+	$(V_nvcc) $(NVCC) $< -c -o $@ $(NVCCFLAGS)
 endif
 
 

+ 1 - 2
gcc-plugin/examples/Makefile.am

@@ -95,8 +95,7 @@ if STARPU_COVERITY
 include $(top_srcdir)/starpu-mynvcc.mk
 else
 .cu.o:
-	@echo "  NVCC     $@"
-	@$(NVCC) $< -c -o $@ $(NVCCFLAGS) -I$(top_builddir)/include -I$(top_srcdir)/include
+	$(V_nvcc) $(NVCC) $< -c -o $@ $(NVCCFLAGS) -I$(top_builddir)/include -I$(top_srcdir)/include
 endif
 
 else !STARPU_USE_CUDA

+ 2 - 4
mpi/examples/Makefile.am

@@ -103,12 +103,10 @@ else
 NVCCFLAGS += --compiler-options -fno-strict-aliasing  -I$(top_srcdir)/include/ -I$(top_builddir)/include/ $(HWLOC_CFLAGS)
 
 .cu.cubin:
-	@echo "  NVCC     $@"
-	@$(NVCC) -cubin $< -o $@ $(NVCCFLAGS)
+	$(V_nvcc) $(NVCC) -cubin $< -o $@ $(NVCCFLAGS)
 
 .cu.o:
-	@echo "  NVCC     $@"
-	@$(NVCC) $< -c -o $@ $(NVCCFLAGS)
+	$(V_nvcc) $(NVCC) $< -c -o $@ $(NVCCFLAGS)
 endif
 endif
 

+ 2 - 4
mpi/tests/Makefile.am

@@ -82,12 +82,10 @@ else
 NVCCFLAGS += --compiler-options -fno-strict-aliasing  -I$(top_srcdir)/include/ -I$(top_builddir)/include/ $(HWLOC_CFLAGS)
 
 .cu.cubin:
-	@echo "  NVCC     $@"
-	@$(NVCC) -cubin $< -o $@ $(NVCCFLAGS)
+	$(V_nvcc) $(NVCC) -cubin $< -o $@ $(NVCCFLAGS)
 
 .cu.o:
-	@echo "  NVCC     $@"
-	@$(NVCC) $< -c -o $@ $(NVCCFLAGS)
+	$(V_nvcc) $(NVCC) $< -c -o $@ $(NVCCFLAGS)
 endif
 endif
 

+ 6 - 1
starpu.mk

@@ -1,6 +1,6 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2016  Université de Bordeaux
+# Copyright (C) 2016-2017  Université de Bordeaux
 #
 # StarPU is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -19,6 +19,11 @@ MPI_LAUNCHER 			= $(MPIEXEC)  $(MPIEXEC_ARGS) -np 4
 MPI_RUN_ARGS			= STARPU_WORKERS_NOBIND=1 STARPU_NCPU=4 STARPU_NMPIMSTHREADS=4
 endif
 
+V_nvcc_ = $(V_nvcc_$(AM_DEFAULT_VERBOSITY))
+V_nvcc_0 = @echo "  NVCC    " $@;
+V_nvcc_1 = 
+V_nvcc = $(V_nvcc_$(V))
+
 showcheck:
 	-cat $(TEST_LOGS) /dev/null
 	@! grep -q "ERROR: AddressSanitizer: " $(TEST_LOGS) /dev/null

+ 2 - 4
tests/Makefile.am

@@ -92,12 +92,10 @@ else
 NVCCFLAGS += --compiler-options -fno-strict-aliasing $(AM_CPPFLAGS) -I$(top_builddir)/include -I${includedir} $(HWLOC_CFLAGS) $(SIMGRID_CFLAGS)
 
 .cu.cubin:
-	@echo "  NVCC     $@"
-	$(NVCC) -cubin $< -o $@ $(NVCCFLAGS)
+	$(V_nvcc) $(NVCC) -cubin $< -o $@ $(NVCCFLAGS)
 
 .cu.o:
-	@echo "  NVCC     $@"
-	@$(NVCC) $< -c -o $@ $(NVCCFLAGS)
+	$(V_nvcc) $(NVCC) $< -c -o $@ $(NVCCFLAGS)
 endif
 
 endif