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, 116 insertions, 58 deletions

diff --git a/Makefile b/Makefile
index 3399812..01fb0be 100644
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,68 @@
-# Copyright (c) 2009-2011, The University of British Columbia
-# All rights reserved.
+# Copyright (c) 2009 by Tor M. Aamodt, Ali Bakhoda and the 
+# University of British Columbia
+# Vancouver, BC  V6T 1Z4
+# All Rights Reserved.
 #
+# Copyright © 2009 by Tor M. Aamodt, Wilson W. L. Fung, Ali Bakhoda, 
+# George L. Yuan and the University of British Columbia, Vancouver, 
+# BC V6T 1Z4, All Rights Reserved.
+# 
+# THIS IS A LEGAL DOCUMENT BY DOWNLOADING GPGPU-SIM, YOU ARE AGREEING TO THESE
+# TERMS AND CONDITIONS.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNERS OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# 
+# NOTE: The files libcuda/cuda_runtime_api.c and src/cuda-sim/cuda-math.h
+# are derived from the CUDA Toolset available from http://www.nvidia.com/cuda
+# (property of NVIDIA).  The files benchmarks/BlackScholes/ and 
+# benchmarks/template/ are derived from the CUDA SDK available from 
+# http://www.nvidia.com/cuda (also property of NVIDIA).  The files from 
+# src/intersim/ are derived from Booksim (a simulator provided with the 
+# textbook "Principles and Practices of Interconnection Networks" available 
+# from http://cva.stanford.edu/books/ppin/). As such, those files are bound by 
+# the corresponding legal terms and conditions set forth separately (original 
+# copyright notices are left in files from these sources and where we have 
+# modified a file our copyright notice appears before the original copyright 
+# notice).  
+# 
+# Using this version of GPGPU-Sim requires a complete installation of CUDA 
+# which is distributed seperately by NVIDIA under separate terms and 
+# conditions.  To use this version of GPGPU-Sim with OpenCL requires a
+# recent version of NVIDIA's drivers which support OpenCL.
+# 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-#
-# Redistributions of source code must retain the above copyright notice, this
-# list of conditions and the following disclaimer.
-# Redistributions in binary form must reproduce the above copyright notice, this
-# list of conditions and the following disclaimer in the documentation and/or
-# other materials provided with the distribution.
-# Neither the name of The University of British Columbia nor the names of its
-# contributors may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+# 
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+# 
+# 3. Neither the name of the University of British Columbia nor the names of
+# its contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+# 
+# 4. This version of GPGPU-SIM is distributed freely for non-commercial use only.  
+#  
+# 5. No nonprofit user may place any restrictions on the use of this software,
+# including as modified by the user, by any other authorized user.
+# 
+# 6. GPGPU-SIM was developed primarily by Tor M. Aamodt, Wilson W. L. Fung, 
+# Ali Bakhoda, George L. Yuan, at the University of British Columbia, 
+# Vancouver, BC V6T 1Z4
+
 
 
 # comment out next line to disable OpenGL support
@@ -31,59 +71,64 @@
 export DEBUG?=0 
 export SNOW?=
 
+ifeq ($(DEBUG), 1)
+	export SIM_LIB_DIR=lib/debug
+	export SIM_OBJ_FILES_DIR=build/debug
+else
+	export SIM_LIB_DIR=lib/release
+	export SIM_OBJ_FILES_DIR=build/release
+endif
+
 LIBS = cuda-sim gpgpu-sim_uarch intersim gpgpusimlib
 
 TARGETS =
 ifeq ($(shell uname),Linux)
-	TARGETS += lib/libcudart.so
+	TARGETS += $(SIM_LIB_DIR)/libcudart.so
 else
-	TARGETS += lib/libcudart.dylib
+	TARGETS += $(SIM_LIB_DIR)/libcudart.dylib
 endif
 ifneq  ($(NVOPENCL_LIBDIR),)
-	TARGETS += lib/libOpenCL.so
+	TARGETS += $(SIM_LIB_DIR)/libOpenCL.so
 endif
 	TARGETS += decuda_to_ptxplus/decuda_to_ptxplus
 	TARGETS += decuda
 
-gpgpusim: $(TARGETS)
+gpgpusim: makedirs $(TARGETS)
 
-lib/libcudart.so: $(LIBS) cudalib
-	if [ ! -d lib ]; then mkdir lib; fi;
+$(SIM_LIB_DIR)/libcudart.so: $(LIBS) cudalib
 	g++ $(SNOW) -shared -Wl,-soname,libcudart.so \
-			./libcuda/*.o \
-			./src/cuda-sim/*.o \
-			./src/cuda-sim/decuda_pred_table/*.o \
-			./src/gpgpu-sim/*.o \
-			./src/intersim/*.o \
-			./src/*.o -lm -lz -lGL -pthread \
-			-o lib/libcudart.so
-	if [ ! -f lib/libcudart.so.2 ]; then ln -s libcudart.so lib/libcudart.so.2; fi
-	if [ ! -f lib/libcudart.so.3 ]; then ln -s libcudart.so lib/libcudart.so.3; fi
+			$(SIM_OBJ_FILES_DIR)/libcuda/*.o \
+			$(SIM_OBJ_FILES_DIR)/cuda-sim/*.o \
+			$(SIM_OBJ_FILES_DIR)/gpgpu-sim/*.o \
+			$(SIM_OBJ_FILES_DIR)/intersim/*.o \
+            $(SIM_OBJ_FILES_DIR)/*.o -lm -lz -lGL -pthread \
+			-o $(SIM_LIB_DIR)/libcudart.so
+	if [ ! -f $(SIM_LIB_DIR)/libcudart.so.2 ]; then ln -s libcudart.so $(SIM_LIB_DIR)/libcudart.so.2; fi
+	if [ ! -f $(SIM_LIB_DIR)/libcudart.so.3 ]; then ln -s libcudart.so $(SIM_LIB_DIR)/libcudart.so.3; fi
 
-lib/libcudart.dylib: $(LIBS) cudalib
-	if [ ! -d lib ]; then mkdir lib; fi;
+$(SIM_LIB_DIR)/libcudart.dylib: $(LIBS) cudalib
 	g++ $(SNOW) -dynamiclib -Wl,-headerpad_max_install_names,-undefined,dynamic_lookup,-compatibility_version,1.1,-current_version,1.1\
-			./libcuda/*.o \
-			./src/cuda-sim/*.o \
-			./src/cuda-sim/decuda_pred_table/*.o \
-			./src/gpgpu-sim/*.o \
-			./src/intersim/*.o \
-			./src/*.o -lm -lz -pthread \
-			-o lib/libcudart.dylib
+			$(SIM_OBJ_FILES_DIR)/libcuda/*.o \
+			$(SIM_OBJ_FILES_DIR)/cuda-sim/*.o \
+			$(SIM_OBJ_FILES_DIR)/cuda-sim/decuda_pred_table/*.o \
+			$(SIM_OBJ_FILES_DIR)/gpgpu-sim/*.o \
+			$(SIM_OBJ_FILES_DIR)/intersim/*.o \
+			$(SIM_OBJ_FILES_DIR)/*.o -lm -lz -pthread \
+			-o $(SIM_LIB_DIR)/libcudart.dylib
 
-lib/libOpenCL.so: $(LIBS) opencllib
+$(SIM_LIB_DIR)/libOpenCL.so: $(LIBS) opencllib
 	g++ $(SNOW) -shared -Wl,-soname,libOpenCL.so \
-			./libopencl/*.o \
-			./src/cuda-sim/*.o \
-			./src/cuda-sim/decuda_pred_table/*.o \
-			./src/gpgpu-sim/*.o \
-			./src/intersim/*.o \
-			./src/*.o -lm -lz -lGL -pthread \
-			-o lib/libOpenCL.so 
-	if [ ! -f lib/libOpenCL.so.1 ]; then ln -s libOpenCL.so lib/libOpenCL.so.1; fi
-	if [ ! -f lib/libOpenCL.so.1.1 ]; then ln -s libOpenCL.so lib/libOpenCL.so.1.1; fi
+			$(SIM_OBJ_FILES_DIR)/libopencl/*.o \
+			$(SIM_OBJ_FILES_DIR)/cuda-sim/*.o \
+			$(SIM_OBJ_FILES_DIR)/gpgpu-sim/*.o \
+			$(SIM_OBJ_FILES_DIR)/intersim/*.o \
+			$(SIM_OBJ_FILES_DIR)/*.o -lm -lz -lGL -pthread \
+			-o $(SIM_LIB_DIR)/libOpenCL.so 
+	if [ ! -f $(SIM_LIB_DIR)/libOpenCL.so.1 ]; then ln -s libOpenCL.so $(SIM_LIB_DIR)/libOpenCL.so.1; fi
+	if [ ! -f $(SIM_LIB_DIR)/libOpenCL.so.1.1 ]; then ln -s libOpenCL.so $(SIM_LIB_DIR)/libOpenCL.so.1.1; fi
 
 cudalib: cuda-sim
+	$(MAKE) -C ./libcuda/ depend
 	$(MAKE) -C ./libcuda/
 
 cuda-sim:
@@ -102,14 +147,26 @@ gpgpusimlib: cuda-sim gpgpu-sim_uarch intersim
 	$(MAKE) -C ./src/
 
 opencllib: cuda-sim
+	$(MAKE) -C ./libopencl/ depend
 	$(MAKE) -C ./libopencl/
 
-decuda_to_ptxplus/decuda_to_ptxplus: 
+decuda_to_ptxplus/decuda_to_ptxplus:
+	$(MAKE) -C ./decuda_to_ptxplus/ depend 
 	$(MAKE) -C ./decuda_to_ptxplus/
 
 decuda:
 	./getDecuda/getDecuda.sh
 
+makedirs:
+	if [ ! -d $(SIM_LIB_DIR) ]; then mkdir -p $(SIM_LIB_DIR); fi;
+	if [ ! -d $(SIM_OBJ_FILES_DIR)/libcuda ]; then mkdir -p $(SIM_OBJ_FILES_DIR)/libcuda; fi;
+	if [ ! -d $(SIM_OBJ_FILES_DIR)/cuda-sim ]; then mkdir -p $(SIM_OBJ_FILES_DIR)/cuda-sim; fi;
+	if [ ! -d $(SIM_OBJ_FILES_DIR)/cuda-sim/decuda_pred_table ]; then mkdir -p $(SIM_OBJ_FILES_DIR)/cuda-sim/decuda_pred_table; fi;
+	if [ ! -d $(SIM_OBJ_FILES_DIR)/gpgpu-sim ]; then mkdir -p $(SIM_OBJ_FILES_DIR)/gpgpu-sim; fi;
+	if [ ! -d $(SIM_OBJ_FILES_DIR)/libopencl ]; then mkdir -p $(SIM_OBJ_FILES_DIR)/libopencl; fi;
+	if [ ! -d $(SIM_OBJ_FILES_DIR)/intersim ]; then mkdir -p $(SIM_OBJ_FILES_DIR)/intersim; fi;
+	if [ ! -d $(SIM_OBJ_FILES_DIR)/decuda_to_ptxplus ]; then mkdir -p $(SIM_OBJ_FILES_DIR)/decuda_to_ptxplus; fi;
+
 all:
 	$(MAKE) gpgpusim
 
@@ -126,4 +183,5 @@ endif
 	$(MAKE) clean -C ./src/gpgpu-sim/
 	$(MAKE) clean -C ./src/
 	$(MAKE) clean -C ./decuda_to_ptxplus/
-	rm -rf ./lib/*.so*
+	rm -rf $(SIM_LIB_DIR)
+	rm -rf $(SIM_OBJ_FILES_DIR)