Using nvcc present in CUDA_INSTALL_PATH instead of the one in PATH

Adding -DCUDART_VERSION to CXXFLAGS

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

3 files changed, 268 insertions, 181 deletions

diff --git a/libcuda/Makefile b/libcuda/Makefile
index 8ba09f3..b5664db 100644
--- a/libcuda/Makefile
+++ b/libcuda/Makefile
@@ -60,7 +60,7 @@
 # Vancouver, BC V6T 1Z4
 
 
-CUDART_VERSION:=$(shell nvcc --version | awk '/release/ {print $$5;}' | sed 's/,//' | sed 's/\./ /' | awk '{printf("%02u%02u", 10*int($$1), 10*$$2);}')
+CUDART_VERSION:=$(shell $(CUDA_INSTALL_PATH)/bin/nvcc --version | awk '/release/ {print $$5;}' | sed 's/,//' | sed 's/\./ /' | awk '{printf("%02u%02u", 10*int($$1), 10*$$2);}')
 
 ifeq ($(OPENGL_SUPPORT),1) 
 	GL = -DOPENGL_SUPPORT
@@ -111,76 +111,83 @@ clean:
 	rm -f lib$(PROG).a
 # DO NOT DELETE
 
-../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
+../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/xlocale.h
+../build/debug/libcuda/cuda_runtime_api.o: /usr/include/assert.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/huge_valf.h
+../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/huge_vall.h
+../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/inf.h
+../build/debug/libcuda/cuda_runtime_api.o: /usr/include/bits/nan.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/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/mem_fetch_status.tup
+../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/gpgpu-sim/shader.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_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_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
diff --git a/libopencl/Makefile b/libopencl/Makefile
index 3502ed3..b36614b 100644
--- a/libopencl/Makefile
+++ b/libopencl/Makefile
@@ -60,7 +60,7 @@
 # Vancouver, BC V6T 1Z4
 
 
-CUDART_VERSION:=$(shell nvcc --version | awk '/release/ {print $$5;}' | sed 's/,//' | sed 's/\./ /' | awk '{printf("%02u%02u", 10*int($$1), 10*$$2);}')
+CUDART_VERSION:=$(shell $(CUDA_INSTALL_PATH)/bin/nvcc --version | awk '/release/ {print $$5;}' | sed 's/,//' | sed 's/\./ /' | awk '{printf("%02u%02u", 10*int($$1), 10*$$2);}')
 
 ifeq ($(OPENGL_SUPPORT),1) 
 	GL = -DOPENGL_SUPPORT
@@ -117,74 +117,76 @@ clean:
 	rm -f bin/nvopencl_wrapper
 # DO NOT DELETE
 
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/stdlib.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/features.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/sys/cdefs.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/wordsize.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/gnu/stubs.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/gnu/stubs-64.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/sys/types.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/types.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/typesizes.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/time.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/endian.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/endian.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/byteswap.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/sys/select.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/select.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/sigset.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/time.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/sys/sysmacros.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/pthreadtypes.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/alloca.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/stdio.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/libio.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/_G_config.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/wchar.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/stdio_lim.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/sys_errlist.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/string.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/xlocale.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/assert.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/abstract_hardware_model.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/cuda-sim/cuda-sim.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/abstract_hardware_model.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/cuda-sim/ptx_loader.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/cuda-sim/ptx_ir.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/cuda-sim/ptx.tab.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/cuda-sim/ptx_sim.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/tr1_hash_map.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/cuda-sim/opcodes.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/cuda-sim/opcodes.def
-../build/release/libopencl/opencl_runtime_api.o: ../src/cuda-sim/memory.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/option_parser.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpusim_entrypoint.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/abstract_hardware_model.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/gpu-sim.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/addrdec.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/shader.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/math.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/huge_val.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/huge_valf.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/huge_vall.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/inf.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/nan.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/mathdef.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/mathcalls.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/cuda-sim/ptx.tab.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/delayqueue.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/intersim/statwraper.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/gpu-misc.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/stack.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/dram.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/zlib.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/zconf.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/unistd.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/posix_opt.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/confname.h
-../build/release/libopencl/opencl_runtime_api.o: /usr/include/getopt.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/scoreboard.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/mem_fetch.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/stats.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/gpu-cache.h
-../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/shader.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/stdlib.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/features.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/sys/cdefs.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/wordsize.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/gnu/stubs.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/gnu/stubs-64.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/sys/types.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/types.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/typesizes.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/time.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/endian.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/endian.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/byteswap.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/sys/select.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/select.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/sigset.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/time.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/sys/sysmacros.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/pthreadtypes.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/alloca.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/stdio.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/libio.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/_G_config.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/wchar.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/stdio_lim.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/sys_errlist.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/string.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/xlocale.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/assert.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/abstract_hardware_model.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/cuda-sim/cuda-sim.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/abstract_hardware_model.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/shader.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/math.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/huge_val.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/huge_valf.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/huge_vall.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/inf.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/nan.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/mathdef.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/mathcalls.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/cuda-sim/ptx.tab.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/delayqueue.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/intersim/statwraper.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/gpu-misc.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/stack.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/dram.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/zlib.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/zconf.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/unistd.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/posix_opt.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/confname.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/getopt.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/scoreboard.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/mem_fetch.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/addrdec.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/option_parser.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/mem_fetch_status.tup
+../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/stats.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/gpu-cache.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/tr1_hash_map.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/cuda-sim/ptx_sim.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/cuda-sim/opcodes.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/cuda-sim/opcodes.def
+../build/debug/libopencl/opencl_runtime_api.o: ../src/cuda-sim/memory.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/cuda-sim/ptx_loader.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/cuda-sim/ptx_ir.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/cuda-sim/ptx.tab.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpusim_entrypoint.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/abstract_hardware_model.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/gpu-sim.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/shader.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/shader.h
diff --git a/src/Makefile b/src/Makefile
index 40d7a89..e96e79b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -31,7 +31,10 @@
 
 DEBUG?=0
 
+CUDART_VERSION:=$(shell $(CUDA_INSTALL_PATH)/bin/nvcc --version | awk '/release/ {print $$5;}' | sed 's/,//' | sed 's/\./ /' | awk '{printf("%02u%02u", 10*int($$1), 10*$$2);}')
+
 CXXFLAGS = -Wall -DDEBUG
+CXXFLAGS += -DCUDART_VERSION=$(CUDART_VERSION)
 
 GNUC_CPP0X := $(shell gcc --version | perl -ne 'if (/gcc\s+\(.*\)\s+([0-9.]+)/){ if($$1 >= 4.3) {$$n=1} else {$$n=0;} } END { print $$n; }')
 ifeq ($(GNUC_CPP0X), 1)
@@ -83,6 +86,7 @@ option_parser.$(OEXT): option_parser.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/xlocale.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
@@ -106,12 +110,40 @@ option_parser.$(OEXT): option_parser.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/ptx_sim.h tr1_hash_map.h
+../build/debug/abstract_hardware_model.o: 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: cuda-sim/cuda-sim.h
+../build/debug/abstract_hardware_model.o: gpgpu-sim/shader.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/huge_valf.h
+../build/debug/abstract_hardware_model.o: /usr/include/bits/huge_vall.h
+../build/debug/abstract_hardware_model.o: /usr/include/bits/inf.h
+../build/debug/abstract_hardware_model.o: /usr/include/bits/nan.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/abstract_hardware_model.o: cuda-sim/ptx.tab.h
+../build/debug/abstract_hardware_model.o: gpgpu-sim/delayqueue.h
+../build/debug/abstract_hardware_model.o: intersim/statwraper.h
+../build/debug/abstract_hardware_model.o: gpgpu-sim/gpu-misc.h
+../build/debug/abstract_hardware_model.o: gpgpu-sim/stack.h gpgpu-sim/dram.h
+../build/debug/abstract_hardware_model.o: /usr/include/zlib.h
+../build/debug/abstract_hardware_model.o: /usr/include/zconf.h
+../build/debug/abstract_hardware_model.o: /usr/include/unistd.h
+../build/debug/abstract_hardware_model.o: /usr/include/bits/posix_opt.h
+../build/debug/abstract_hardware_model.o: /usr/include/bits/confname.h
+../build/debug/abstract_hardware_model.o: /usr/include/getopt.h
+../build/debug/abstract_hardware_model.o: gpgpu-sim/scoreboard.h
+../build/debug/abstract_hardware_model.o: gpgpu-sim/mem_fetch.h
+../build/debug/abstract_hardware_model.o: gpgpu-sim/addrdec.h
+../build/debug/abstract_hardware_model.o: gpgpu-sim/mem_fetch_status.tup
+../build/debug/abstract_hardware_model.o: gpgpu-sim/stats.h
+../build/debug/abstract_hardware_model.o: gpgpu-sim/gpu-cache.h
+../build/debug/abstract_hardware_model.o: gpgpu-sim/gpu-sim.h
+../build/debug/abstract_hardware_model.o: gpgpu-sim/shader.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
@@ -130,24 +162,28 @@ option_parser.$(OEXT): option_parser.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/huge_valf.h
+../build/debug/debug.o: /usr/include/bits/huge_vall.h /usr/include/bits/inf.h
+../build/debug/debug.o: /usr/include/bits/nan.h /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: cuda-sim/ptx.tab.h gpgpu-sim/delayqueue.h
+../build/debug/debug.o: intersim/statwraper.h gpgpu-sim/gpu-misc.h
+../build/debug/debug.o: gpgpu-sim/stack.h abstract_hardware_model.h
+../build/debug/debug.o: gpgpu-sim/dram.h /usr/include/zlib.h
+../build/debug/debug.o: /usr/include/zconf.h /usr/include/unistd.h
+../build/debug/debug.o: /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/addrdec.h option_parser.h
+../build/debug/debug.o: gpgpu-sim/mem_fetch_status.tup 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/debug.o: cuda-sim/ptx_sim.h cuda-sim/opcodes.h
+../build/debug/debug.o: cuda-sim/opcodes.def cuda-sim/memory.h
+../build/debug/debug.o: cuda-sim/cuda-sim.h gpgpu-sim/shader.h
+../build/debug/debug.o: cuda-sim/ptx_sim.h cuda-sim/ptx_ir.h
+../build/debug/debug.o: cuda-sim/ptx.tab.h /usr/include/string.h
+../build/debug/debug.o: /usr/include/xlocale.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
@@ -178,14 +214,36 @@ option_parser.$(OEXT): option_parser.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/shader.h /usr/include/math.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/huge_val.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/huge_valf.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/huge_vall.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/inf.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/nan.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/mathdef.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/mathcalls.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/assert.h
+../build/debug/gpgpusim_entrypoint.o: cuda-sim/ptx.tab.h
+../build/debug/gpgpusim_entrypoint.o: gpgpu-sim/delayqueue.h
+../build/debug/gpgpusim_entrypoint.o: intersim/statwraper.h
+../build/debug/gpgpusim_entrypoint.o: gpgpu-sim/gpu-misc.h gpgpu-sim/stack.h
+../build/debug/gpgpusim_entrypoint.o: gpgpu-sim/dram.h /usr/include/zlib.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/zconf.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/unistd.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/posix_opt.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/bits/confname.h
+../build/debug/gpgpusim_entrypoint.o: /usr/include/getopt.h
+../build/debug/gpgpusim_entrypoint.o: gpgpu-sim/scoreboard.h
+../build/debug/gpgpusim_entrypoint.o: gpgpu-sim/mem_fetch.h
+../build/debug/gpgpusim_entrypoint.o: gpgpu-sim/addrdec.h option_parser.h
+../build/debug/gpgpusim_entrypoint.o: gpgpu-sim/mem_fetch_status.tup
+../build/debug/gpgpusim_entrypoint.o: gpgpu-sim/stats.h gpgpu-sim/gpu-cache.h
+../build/debug/gpgpusim_entrypoint.o: tr1_hash_map.h cuda-sim/ptx_sim.h
+../build/debug/gpgpusim_entrypoint.o: cuda-sim/opcodes.h cuda-sim/opcodes.def
+../build/debug/gpgpusim_entrypoint.o: cuda-sim/memory.h cuda-sim/ptx_ir.h
+../build/debug/gpgpusim_entrypoint.o: cuda-sim/ptx.tab.h
+../build/debug/gpgpusim_entrypoint.o: cuda-sim/ptx_parser.h
+../build/debug/gpgpusim_entrypoint.o: gpgpu-sim/gpu-sim.h 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
@@ -217,7 +275,8 @@ option_parser.$(OEXT): option_parser.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/option_parser.o: /usr/include/string.h /usr/include/xlocale.h
+../build/debug/option_parser.o: 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
@@ -238,20 +297,39 @@ option_parser.$(OEXT): option_parser.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: abstract_hardware_model.h gpgpu-sim/shader.h
+../build/debug/stream_manager.o: /usr/include/stdio.h /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/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: /usr/include/alloca.h /usr/include/math.h
+../build/debug/stream_manager.o: /usr/include/bits/huge_val.h
+../build/debug/stream_manager.o: /usr/include/bits/huge_valf.h
+../build/debug/stream_manager.o: /usr/include/bits/huge_vall.h
+../build/debug/stream_manager.o: /usr/include/bits/inf.h
+../build/debug/stream_manager.o: /usr/include/bits/nan.h
+../build/debug/stream_manager.o: /usr/include/bits/mathdef.h
+../build/debug/stream_manager.o: /usr/include/bits/mathcalls.h
+../build/debug/stream_manager.o: /usr/include/assert.h cuda-sim/ptx.tab.h
+../build/debug/stream_manager.o: gpgpu-sim/delayqueue.h intersim/statwraper.h
+../build/debug/stream_manager.o: gpgpu-sim/gpu-misc.h gpgpu-sim/stack.h
+../build/debug/stream_manager.o: gpgpu-sim/dram.h /usr/include/zlib.h
+../build/debug/stream_manager.o: /usr/include/zconf.h /usr/include/unistd.h
+../build/debug/stream_manager.o: /usr/include/bits/posix_opt.h
+../build/debug/stream_manager.o: /usr/include/bits/confname.h
+../build/debug/stream_manager.o: /usr/include/getopt.h gpgpu-sim/scoreboard.h
+../build/debug/stream_manager.o: gpgpu-sim/mem_fetch.h gpgpu-sim/addrdec.h
+../build/debug/stream_manager.o: option_parser.h
+../build/debug/stream_manager.o: gpgpu-sim/mem_fetch_status.tup
+../build/debug/stream_manager.o: gpgpu-sim/stats.h gpgpu-sim/gpu-cache.h
+../build/debug/stream_manager.o: tr1_hash_map.h cuda-sim/ptx_sim.h
+../build/debug/stream_manager.o: cuda-sim/opcodes.h cuda-sim/opcodes.def
+../build/debug/stream_manager.o: cuda-sim/memory.h gpgpu-sim/gpu-sim.h
 ../build/debug/stream_manager.o: gpgpu-sim/shader.h