From faec221021266754fbeb9bc471f25cbad41dde3f Mon Sep 17 00:00:00 2001 From: "Andrew M. B. Boktor" Date: Fri, 23 Sep 2011 18:21:01 -0800 Subject: - Minor change to make things simpler, basically removing all instances of $CUDAHOME and replacing them with $CUDA_INSTALL_PATH. Removing all instances of $NVIDIA_CUDA_SDK_LOCATION with $NVIDIA_COMPUTE_SDK_LOCATION. - Some additions/changes to the README file to make it a little more intuitive. - Default values added to setup_environment to make things easier for the average user. - My first perforce submit :D [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 10401] --- libcuda/Makefile | 153 +++++++++++++++++++++++++++---------------------------- 1 file changed, 74 insertions(+), 79 deletions(-) (limited to 'libcuda/Makefile') diff --git a/libcuda/Makefile b/libcuda/Makefile index 9c18466..8ba09f3 100644 --- a/libcuda/Makefile +++ b/libcuda/Makefile @@ -100,7 +100,7 @@ lib$(PROG).a: $(OBJS) ar rcs $(OUTPUT_DIR)/lib$(PROG).a $(OBJS) $(OUTPUT_DIR)/%.o: %.cc - $(CPP) $(CXXFLAGS) -I./ -I$(CUDAHOME)/include -c $< -o $@ + $(CPP) $(CXXFLAGS) -I./ -I$(CUDA_INSTALL_PATH)/include -c $< -o $@ depend: makedepend -p$(OUTPUT_DIR)/ $(CXX_SRCS) 2> /dev/null @@ -111,81 +111,76 @@ clean: rm -f lib$(PROG).a # DO NOT DELETE -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/stdlib.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/features.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/sys/cdefs.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/wordsize.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/gnu/stubs.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/gnu/stubs-64.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/sys/types.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/types.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/typesizes.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/time.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/endian.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/endian.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/byteswap.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/sys/select.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/select.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/sigset.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/time.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/sys/sysmacros.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/pthreadtypes.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/alloca.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/stdio.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/libio.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/_G_config.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/wchar.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/stdio_lim.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/sys_errlist.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/string.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/assert.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/sys/mman.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/mman.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/abstract_hardware_model.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/gpu-sim.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/abstract_hardware_model.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/addrdec.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/option_parser.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/shader.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/math.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/huge_val.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/mathdef.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/mathcalls.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/cuda-sim/ptx.tab.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/cuda-sim/dram_callback.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/delayqueue.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/intersim/statwraper.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/gpu-misc.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/stack.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/dram.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/zlib.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/zconf.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/unistd.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/posix_opt.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/confname.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/getopt.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/scoreboard.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/mem_fetch.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/stats.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/gpu-cache.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/tr1_hash_map.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/cuda-sim/ptx_loader.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/cuda-sim/cuda-sim.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/cuda-sim/dram_callback.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/cuda-sim/ptx_ir.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/cuda-sim/ptx.tab.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/cuda-sim/ptx_sim.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/cuda-sim/opcodes.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/cuda-sim/opcodes.def -../build/debug/libcuda/cuda_runtime_api.o: ../src/cuda-sim/memory.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/cuda-sim/ptx_parser.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/gpgpusim_entrypoint.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/abstract_hardware_model.h -../build/debug/libcuda/cuda_runtime_api.o: ../src/stream_manager.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/pthread.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/sched.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/sched.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/signal.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/setjmp.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/semaphore.h -../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/semaphore.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/stdlib.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/features.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/sys/cdefs.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/bits/wordsize.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/gnu/stubs.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/gnu/stubs-64.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/sys/types.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/bits/types.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/bits/typesizes.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/time.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/endian.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/bits/endian.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/bits/byteswap.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/sys/select.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/bits/select.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/bits/sigset.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/bits/time.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/sys/sysmacros.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/bits/pthreadtypes.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/alloca.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/stdio.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/libio.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/_G_config.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/wchar.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/bits/stdio_lim.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/bits/sys_errlist.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/string.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/assert.h +../build/release/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/gpu-sim.h +../build/release/libcuda/cuda_runtime_api.o: ../src/abstract_hardware_model.h +../build/release/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/addrdec.h +../build/release/libcuda/cuda_runtime_api.o: ../src/option_parser.h +../build/release/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/shader.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/math.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/bits/huge_val.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/bits/mathdef.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/bits/mathcalls.h +../build/release/libcuda/cuda_runtime_api.o: ../src/cuda-sim/ptx.tab.h +../build/release/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/delayqueue.h +../build/release/libcuda/cuda_runtime_api.o: ../src/intersim/statwraper.h +../build/release/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/gpu-misc.h +../build/release/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/stack.h +../build/release/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/dram.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/zlib.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/zconf.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/unistd.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/bits/posix_opt.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/bits/confname.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/getopt.h +../build/release/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/scoreboard.h +../build/release/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/mem_fetch.h +../build/release/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/stats.h +../build/release/libcuda/cuda_runtime_api.o: ../src/gpgpu-sim/gpu-cache.h +../build/release/libcuda/cuda_runtime_api.o: ../src/tr1_hash_map.h +../build/release/libcuda/cuda_runtime_api.o: ../src/cuda-sim/ptx_loader.h +../build/release/libcuda/cuda_runtime_api.o: ../src/cuda-sim/cuda-sim.h +../build/release/libcuda/cuda_runtime_api.o: ../src/cuda-sim/ptx_ir.h +../build/release/libcuda/cuda_runtime_api.o: ../src/cuda-sim/ptx.tab.h +../build/release/libcuda/cuda_runtime_api.o: ../src/cuda-sim/ptx_sim.h +../build/release/libcuda/cuda_runtime_api.o: ../src/cuda-sim/opcodes.h +../build/release/libcuda/cuda_runtime_api.o: ../src/cuda-sim/opcodes.def +../build/release/libcuda/cuda_runtime_api.o: ../src/cuda-sim/memory.h +../build/release/libcuda/cuda_runtime_api.o: ../src/cuda-sim/ptx_parser.h +../build/release/libcuda/cuda_runtime_api.o: ../src/gpgpusim_entrypoint.h +../build/release/libcuda/cuda_runtime_api.o: ../src/abstract_hardware_model.h +../build/release/libcuda/cuda_runtime_api.o: ../src/stream_manager.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/pthread.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/sched.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/bits/sched.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/signal.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/bits/setjmp.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/semaphore.h +../build/release/libcuda/cuda_runtime_api.o: /usr/include/bits/semaphore.h -- cgit v1.3