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, 84 insertions, 3 deletions

diff --git a/libopencl/Makefile b/libopencl/Makefile
index 1352764..1831c30 100644
--- a/libopencl/Makefile
+++ b/libopencl/Makefile
@@ -87,20 +87,27 @@ CCFLAGS += -DCUDART_VERSION=$(CUDART_VERSION)
 
 .PHONY: clean
 
-OBJS = $(CXX_SRCS:.cc=.o)
+OUTPUT_DIR=../$(SIM_OBJ_FILES_DIR)/libopencl
+
+OBJS = $(CXX_SRCS:%.cc=$(OUTPUT_DIR)/%.o)
 
 #--- Make rules ---
 
 all: lib$(PROG).a nvopencl_wrapper
 
 lib$(PROG).a: $(OBJS)
-	ar rcs lib$(PROG).a $(OBJS)
+	ar rcs $(OUTPUT_DIR)/lib$(PROG).a $(OBJS)
+	
+depend:
+	makedepend -p$(OUTPUT_DIR)/ $(CXX_SRCS) 2> /dev/null
 
 nvopencl_wrapper: nvopencl_wrapper.cc
 	if [ ! -d bin ]; then mkdir bin; fi
 	g++ $(CCFLAGS) nvopencl_wrapper.cc -I./ -L $(NVOPENCL_LIBDIR) -lOpenCL  -o bin/nvopencl_wrapper
+	
+OUTPUT_DIR=../$(SIM_OBJ_FILES_DIR)/libopencl
 
-%.o: %.cc
+$(OUTPUT_DIR)/%.o: %.cc
 	$(CPP) $(CCFLAGS) -I./ -I$(CUDAHOME)/include  -c $< -o $@
 
 clean:
@@ -108,3 +115,77 @@ clean:
 	rm -f *.o
 	rm -f lib$(PROG).a
 	rm -f bin/nvopencl_wrapper
+# DO NOT DELETE
+
+../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/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/cuda-sim/dram_callback.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/cuda-sim/ptx_sim.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/tr1_hash_map.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/option_parser.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/addrdec.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/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/cuda-sim/dram_callback.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/stats.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/gpu-cache.h
+../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/shader.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/CL/cl.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/CL/cl_platform.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/stdint.h
+../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/wchar.h