integrating recent changes from fermi-test into fermi

(i'll use "fermi" for more disruptive changes to the pipeline model such
as updating the MSHRs and getting rid of the warp tracker, ripping out DWF, etc...)

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

1 files changed, 60 insertions, 1 deletions

diff --git a/src/Makefile b/src/Makefile
index 36b695a..453469c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -76,7 +76,7 @@ endif
 ifneq ($(DEBUG),1)
 	OPTFLAGS += -O3
 else
-	CXXFLAGS += -D_GLIBCXX_DEBUG -DGLIBCXX_DEBUG_PEDANTIC
+	CXXFLAGS += 
 endif
 
 OPTFLAGS += -g3 -fPIC
@@ -106,3 +106,62 @@ 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