Integration change. Bringing in some changes from mem_divergence that allow for multiple configs of the built simulator to exist at one time. Now you no longer have to clean build when changing from debug to release configs it also eliminates the possibility of having a fraken-file where some objects are in debug and some are in release.

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 9743]

1 files changed, 195 insertions, 66 deletions

diff --git a/src/Makefile b/src/Makefile
index 453469c..617dc7a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -64,7 +64,7 @@
 
 # GPGPU-Sim Makefile
 
-DEBUG=0
+DEBUG?=0
 
 CXXFLAGS = -Wall -DDEBUG
 
@@ -84,20 +84,22 @@ OPTFLAGS += -g3 -fPIC
 CPP = g++ $(SNOW)
 OEXT = o
 
+OUTPUT_DIR=../$(SIM_OBJ_FILES_DIR)
 SRCS = $(shell ls *.cc)
-OBJS = $(SRCS:.cc=.$(OEXT))
+OBJS = $(SRCS:%.cc=$(OUTPUT_DIR)/%.$(OEXT))
 
-libgpgpusim.a:	$(OBJS) gpu_uarch_simlib
-	ar rcs  libgpgpusim.a $(OBJS) gpgpu-sim/*.o
+$(OUTPUT_DIR)/libgpgpusim.a:	$(OBJS) gpu_uarch_simlib
+	ar rcs  $(OUTPUT_DIR)/libgpgpusim.a $(OBJS) $(OUTPUT_DIR)/gpgpu-sim/*.o
 
 gpu_uarch_simlib:
 	make   -C ./gpgpu-sim
+	
 
 depend:
-	makedepend $(SRCS) 2> /dev/null
+	makedepend -p$(OUTPUT_DIR)/ $(SRCS) 2> /dev/null
 
-.cc.$(OEXT):
-	$(CPP) $(OPTFLAGS) $(CXXFLAGS) -o $*.$(OEXT) -c $*.cc
+$(OUTPUT_DIR)/%.$(OEXT): %.cc
+	$(CPP) $(OPTFLAGS) $(CXXFLAGS) -o $(OUTPUT_DIR)/$*.$(OEXT) -c $*.cc
 
 clean:
 	rm -f *.o core *~ *.a 
@@ -106,62 +108,189 @@ option_parser.$(OEXT): option_parser.h
 
 # DO NOT DELETE
 
-debug.o: debug.h abstract_hardware_model.h gpgpu-sim/shader.h
-debug.o: /usr/include/stdio.h /usr/include/features.h
-debug.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
-debug.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
-debug.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
-debug.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h
-debug.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-debug.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h
-debug.o: /usr/include/endian.h /usr/include/bits/endian.h
-debug.o: /usr/include/bits/byteswap.h /usr/include/sys/select.h
-debug.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
-debug.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
-debug.o: /usr/include/bits/pthreadtypes.h /usr/include/alloca.h
-debug.o: /usr/include/math.h /usr/include/bits/huge_val.h
-debug.o: /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h
-debug.o: /usr/include/assert.h cuda-sim/ptx.tab.h cuda-sim/dram_callback.h
-debug.o: gpgpu-sim/gpu-cache.h abstract_hardware_model.h
-debug.o: gpgpu-sim/delayqueue.h gpgpu-sim/stack.h gpgpu-sim/dram.h
-debug.o: gpgpu-sim/scoreboard.h gpgpu-sim/gpu-sim.h cuda-sim/ptx_sim.h
-debug.o: cuda-sim/dram_callback.h tr1_hash_map.h cuda-sim/opcodes.h
-debug.o: cuda-sim/opcodes.def cuda-sim/memory.h /usr/include/string.h
-debug.o: cuda-sim/cuda-sim.h cuda-sim/ptx_ir.h cuda-sim/ptx.tab.h
-debug.o: cuda-sim/ptx_sim.h option_parser.h
-gpgpusim_entrypoint.o: gpgpusim_entrypoint.h abstract_hardware_model.h
-gpgpusim_entrypoint.o: /usr/include/time.h /usr/include/bits/types.h
-gpgpusim_entrypoint.o: /usr/include/features.h /usr/include/sys/cdefs.h
-gpgpusim_entrypoint.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h
-gpgpusim_entrypoint.o: /usr/include/gnu/stubs-64.h
-gpgpusim_entrypoint.o: /usr/include/bits/typesizes.h /usr/include/stdio.h
-gpgpusim_entrypoint.o: /usr/include/libio.h /usr/include/_G_config.h
-gpgpusim_entrypoint.o: /usr/include/wchar.h /usr/include/bits/stdio_lim.h
-gpgpusim_entrypoint.o: /usr/include/bits/sys_errlist.h option_parser.h
-gpgpusim_entrypoint.o: /usr/include/stdlib.h /usr/include/sys/types.h
-gpgpusim_entrypoint.o: /usr/include/endian.h /usr/include/bits/endian.h
-gpgpusim_entrypoint.o: /usr/include/bits/byteswap.h /usr/include/sys/select.h
-gpgpusim_entrypoint.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
-gpgpusim_entrypoint.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
-gpgpusim_entrypoint.o: /usr/include/bits/pthreadtypes.h /usr/include/alloca.h
-gpgpusim_entrypoint.o: cuda-sim/cuda-sim.h abstract_hardware_model.h
-gpgpusim_entrypoint.o: cuda-sim/dram_callback.h cuda-sim/ptx_ir.h
-gpgpusim_entrypoint.o: /usr/include/assert.h cuda-sim/ptx.tab.h
-gpgpusim_entrypoint.o: cuda-sim/ptx_sim.h cuda-sim/memory.h
-gpgpusim_entrypoint.o: /usr/include/string.h option_parser.h
-gpgpusim_entrypoint.o: cuda-sim/ptx_parser.h gpgpu-sim/gpu-sim.h
-gpgpusim_entrypoint.o: gpgpu-sim/icnt_wrapper.h
-option_parser.o: /usr/include/stdio.h /usr/include/features.h
-option_parser.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
-option_parser.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
-option_parser.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
-option_parser.o: /usr/include/libio.h /usr/include/_G_config.h
-option_parser.o: /usr/include/wchar.h /usr/include/bits/stdio_lim.h
-option_parser.o: /usr/include/bits/sys_errlist.h /usr/include/stdlib.h
-option_parser.o: /usr/include/sys/types.h /usr/include/time.h
-option_parser.o: /usr/include/endian.h /usr/include/bits/endian.h
-option_parser.o: /usr/include/bits/byteswap.h /usr/include/sys/select.h
-option_parser.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
-option_parser.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
-option_parser.o: /usr/include/bits/pthreadtypes.h /usr/include/alloca.h
-option_parser.o: /usr/include/assert.h /usr/include/string.h option_parser.h
+../build/debug/abstract_hardware_model.o: abstract_hardware_model.h
+../build/debug/abstract_hardware_model.o: cuda-sim/memory.h
+../build/debug/abstract_hardware_model.o: abstract_hardware_model.h
+../build/debug/abstract_hardware_model.o: /usr/include/assert.h
+../build/debug/abstract_hardware_model.o: /usr/include/features.h
+../build/debug/abstract_hardware_model.o: /usr/include/sys/cdefs.h
+../build/debug/abstract_hardware_model.o: /usr/include/bits/wordsize.h
+../build/debug/abstract_hardware_model.o: /usr/include/gnu/stubs.h
+../build/debug/abstract_hardware_model.o: /usr/include/gnu/stubs-64.h
+../build/debug/abstract_hardware_model.o: /usr/include/string.h
+../build/debug/abstract_hardware_model.o: /usr/include/stdio.h
+../build/debug/abstract_hardware_model.o: /usr/include/bits/types.h
+../build/debug/abstract_hardware_model.o: /usr/include/bits/typesizes.h
+../build/debug/abstract_hardware_model.o: /usr/include/libio.h
+../build/debug/abstract_hardware_model.o: /usr/include/_G_config.h
+../build/debug/abstract_hardware_model.o: /usr/include/wchar.h
+../build/debug/abstract_hardware_model.o: /usr/include/bits/stdio_lim.h
+../build/debug/abstract_hardware_model.o: /usr/include/bits/sys_errlist.h
+../build/debug/abstract_hardware_model.o: /usr/include/stdlib.h
+../build/debug/abstract_hardware_model.o: /usr/include/sys/types.h
+../build/debug/abstract_hardware_model.o: /usr/include/time.h
+../build/debug/abstract_hardware_model.o: /usr/include/endian.h
+../build/debug/abstract_hardware_model.o: /usr/include/bits/endian.h
+../build/debug/abstract_hardware_model.o: /usr/include/bits/byteswap.h
+../build/debug/abstract_hardware_model.o: /usr/include/sys/select.h
+../build/debug/abstract_hardware_model.o: /usr/include/bits/select.h
+../build/debug/abstract_hardware_model.o: /usr/include/bits/sigset.h
+../build/debug/abstract_hardware_model.o: /usr/include/bits/time.h
+../build/debug/abstract_hardware_model.o: /usr/include/sys/sysmacros.h
+../build/debug/abstract_hardware_model.o: /usr/include/bits/pthreadtypes.h
+../build/debug/abstract_hardware_model.o: /usr/include/alloca.h
+../build/debug/abstract_hardware_model.o: option_parser.h cuda-sim/ptx_ir.h
+../build/debug/abstract_hardware_model.o: cuda-sim/ptx.tab.h
+../build/debug/abstract_hardware_model.o: cuda-sim/ptx_sim.h
+../build/debug/abstract_hardware_model.o: cuda-sim/dram_callback.h
+../build/debug/abstract_hardware_model.o: tr1_hash_map.h cuda-sim/opcodes.h
+../build/debug/abstract_hardware_model.o: cuda-sim/opcodes.def
+../build/debug/abstract_hardware_model.o: cuda-sim/memory.h option_parser.h
+../build/debug/abstract_hardware_model.o: cuda-sim/ptx-stats.h
+../build/debug/abstract_hardware_model.o: /usr/include/math.h
+../build/debug/abstract_hardware_model.o: /usr/include/bits/huge_val.h
+../build/debug/abstract_hardware_model.o: /usr/include/bits/mathdef.h
+../build/debug/abstract_hardware_model.o: /usr/include/bits/mathcalls.h
+../build/debug/debug.o: debug.h abstract_hardware_model.h gpgpu-sim/shader.h
+../build/debug/debug.o: /usr/include/stdio.h /usr/include/features.h
+../build/debug/debug.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+../build/debug/debug.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+../build/debug/debug.o: /usr/include/bits/types.h
+../build/debug/debug.o: /usr/include/bits/typesizes.h /usr/include/libio.h
+../build/debug/debug.o: /usr/include/_G_config.h /usr/include/wchar.h
+../build/debug/debug.o: /usr/include/bits/stdio_lim.h
+../build/debug/debug.o: /usr/include/bits/sys_errlist.h /usr/include/stdlib.h
+../build/debug/debug.o: /usr/include/sys/types.h /usr/include/time.h
+../build/debug/debug.o: /usr/include/endian.h /usr/include/bits/endian.h
+../build/debug/debug.o: /usr/include/bits/byteswap.h
+../build/debug/debug.o: /usr/include/sys/select.h /usr/include/bits/select.h
+../build/debug/debug.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
+../build/debug/debug.o: /usr/include/sys/sysmacros.h
+../build/debug/debug.o: /usr/include/bits/pthreadtypes.h
+../build/debug/debug.o: /usr/include/alloca.h /usr/include/math.h
+../build/debug/debug.o: /usr/include/bits/huge_val.h
+../build/debug/debug.o: /usr/include/bits/mathdef.h
+../build/debug/debug.o: /usr/include/bits/mathcalls.h /usr/include/assert.h
+../build/debug/debug.o: cuda-sim/ptx.tab.h cuda-sim/dram_callback.h
+../build/debug/debug.o: gpgpu-sim/delayqueue.h intersim/statwraper.h
+../build/debug/debug.o: gpgpu-sim/gpu-misc.h gpgpu-sim/stack.h
+../build/debug/debug.o: abstract_hardware_model.h gpgpu-sim/dram.h
+../build/debug/debug.o: /usr/include/zlib.h /usr/include/zconf.h
+../build/debug/debug.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
+../build/debug/debug.o: /usr/include/bits/confname.h /usr/include/getopt.h
+../build/debug/debug.o: gpgpu-sim/scoreboard.h gpgpu-sim/mem_fetch.h
+../build/debug/debug.o: gpgpu-sim/addrdec.h option_parser.h gpgpu-sim/stats.h
+../build/debug/debug.o: gpgpu-sim/gpu-cache.h tr1_hash_map.h
+../build/debug/debug.o: gpgpu-sim/gpu-sim.h gpgpu-sim/shader.h
+../build/debug/debug.o: cuda-sim/ptx_sim.h cuda-sim/dram_callback.h
+../build/debug/debug.o: cuda-sim/opcodes.h cuda-sim/opcodes.def
+../build/debug/debug.o: cuda-sim/memory.h cuda-sim/cuda-sim.h
+../build/debug/debug.o: cuda-sim/ptx_ir.h cuda-sim/ptx.tab.h
+../build/debug/debug.o: cuda-sim/ptx_sim.h /usr/include/string.h
+../build/debug/gpgpusim_entrypoint.o: gpgpusim_entrypoint.h
+../build/debug/gpgpusim_entrypoint.o: abstract_hardware_model.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/time.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/types.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/features.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/sys/cdefs.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/wordsize.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/gnu/stubs.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/gnu/stubs-64.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/typesizes.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/stdio.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/libio.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/_G_config.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/wchar.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/stdio_lim.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/sys_errlist.h
+../build/debug/gpgpusim_entrypoint.o: option_parser.h /usr/include/stdlib.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/sys/types.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/endian.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/endian.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/byteswap.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/sys/select.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/select.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/sigset.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/time.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/sys/sysmacros.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/pthreadtypes.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/alloca.h
+../build/debug/gpgpusim_entrypoint.o: cuda-sim/cuda-sim.h
+../build/debug/gpgpusim_entrypoint.o: abstract_hardware_model.h
+../build/debug/gpgpusim_entrypoint.o: cuda-sim/dram_callback.h
+../build/debug/gpgpusim_entrypoint.o: cuda-sim/ptx_ir.h /usr/include/assert.h
+../build/debug/gpgpusim_entrypoint.o: cuda-sim/ptx.tab.h cuda-sim/ptx_sim.h
+../build/debug/gpgpusim_entrypoint.o: tr1_hash_map.h cuda-sim/opcodes.h
+../build/debug/gpgpusim_entrypoint.o: cuda-sim/opcodes.def cuda-sim/memory.h
+../build/debug/gpgpusim_entrypoint.o: option_parser.h cuda-sim/ptx_parser.h
+../build/debug/gpgpusim_entrypoint.o: gpgpu-sim/gpu-sim.h gpgpu-sim/addrdec.h
+../build/debug/gpgpusim_entrypoint.o: gpgpu-sim/shader.h
+../build/debug/gpgpusim_entrypoint.o: gpgpu-sim/icnt_wrapper.h
+../build/debug/gpgpusim_entrypoint.o: stream_manager.h /usr/include/pthread.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/sched.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/sched.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/signal.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/setjmp.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/semaphore.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/semaphore.h
+../build/debug/option_parser.o: /usr/include/stdio.h /usr/include/features.h
+../build/debug/option_parser.o: /usr/include/sys/cdefs.h
+../build/debug/option_parser.o: /usr/include/bits/wordsize.h
+../build/debug/option_parser.o: /usr/include/gnu/stubs.h
+../build/debug/option_parser.o: /usr/include/gnu/stubs-64.h
+../build/debug/option_parser.o: /usr/include/bits/types.h
+../build/debug/option_parser.o: /usr/include/bits/typesizes.h
+../build/debug/option_parser.o: /usr/include/libio.h /usr/include/_G_config.h
+../build/debug/option_parser.o: /usr/include/wchar.h
+../build/debug/option_parser.o: /usr/include/bits/stdio_lim.h
+../build/debug/option_parser.o: /usr/include/bits/sys_errlist.h
+../build/debug/option_parser.o: /usr/include/stdlib.h
+../build/debug/option_parser.o: /usr/include/sys/types.h /usr/include/time.h
+../build/debug/option_parser.o: /usr/include/endian.h
+../build/debug/option_parser.o: /usr/include/bits/endian.h
+../build/debug/option_parser.o: /usr/include/bits/byteswap.h
+../build/debug/option_parser.o: /usr/include/sys/select.h
+../build/debug/option_parser.o: /usr/include/bits/select.h
+../build/debug/option_parser.o: /usr/include/bits/sigset.h
+../build/debug/option_parser.o: /usr/include/bits/time.h
+../build/debug/option_parser.o: /usr/include/sys/sysmacros.h
+../build/debug/option_parser.o: /usr/include/bits/pthreadtypes.h
+../build/debug/option_parser.o: /usr/include/alloca.h /usr/include/assert.h
+../build/debug/option_parser.o: /usr/include/string.h option_parser.h
+../build/debug/stream_manager.o: stream_manager.h abstract_hardware_model.h
+../build/debug/stream_manager.o: /usr/include/pthread.h
+../build/debug/stream_manager.o: /usr/include/features.h
+../build/debug/stream_manager.o: /usr/include/sys/cdefs.h
+../build/debug/stream_manager.o: /usr/include/bits/wordsize.h
+../build/debug/stream_manager.o: /usr/include/gnu/stubs.h
+../build/debug/stream_manager.o: /usr/include/gnu/stubs-64.h
+../build/debug/stream_manager.o: /usr/include/endian.h
+../build/debug/stream_manager.o: /usr/include/bits/endian.h
+../build/debug/stream_manager.o: /usr/include/bits/byteswap.h
+../build/debug/stream_manager.o: /usr/include/sched.h
+../build/debug/stream_manager.o: /usr/include/bits/types.h
+../build/debug/stream_manager.o: /usr/include/bits/typesizes.h
+../build/debug/stream_manager.o: /usr/include/time.h
+../build/debug/stream_manager.o: /usr/include/bits/sched.h
+../build/debug/stream_manager.o: /usr/include/signal.h
+../build/debug/stream_manager.o: /usr/include/bits/sigset.h
+../build/debug/stream_manager.o: /usr/include/bits/pthreadtypes.h
+../build/debug/stream_manager.o: /usr/include/bits/setjmp.h
+../build/debug/stream_manager.o: gpgpusim_entrypoint.h cuda-sim/cuda-sim.h
+../build/debug/stream_manager.o: abstract_hardware_model.h
+../build/debug/stream_manager.o: cuda-sim/dram_callback.h
+../build/debug/stream_manager.o: /usr/include/stdlib.h
+../build/debug/stream_manager.o: /usr/include/sys/types.h
+../build/debug/stream_manager.o: /usr/include/sys/select.h
+../build/debug/stream_manager.o: /usr/include/bits/select.h
+../build/debug/stream_manager.o: /usr/include/bits/time.h
+../build/debug/stream_manager.o: /usr/include/sys/sysmacros.h
+../build/debug/stream_manager.o: /usr/include/alloca.h gpgpu-sim/gpu-sim.h
+../build/debug/stream_manager.o: gpgpu-sim/addrdec.h /usr/include/stdio.h
+../build/debug/stream_manager.o: /usr/include/libio.h
+../build/debug/stream_manager.o: /usr/include/_G_config.h
+../build/debug/stream_manager.o: /usr/include/wchar.h
+../build/debug/stream_manager.o: /usr/include/bits/stdio_lim.h
+../build/debug/stream_manager.o: /usr/include/bits/sys_errlist.h
+../build/debug/stream_manager.o: /usr/include/assert.h option_parser.h
+../build/debug/stream_manager.o: gpgpu-sim/shader.h