From 87e4da5fc6086c3d0a661af1929255a8cbd728d7 Mon Sep 17 00:00:00 2001
From: Tor Aamodt <aamodt@ece.ubc.ca>
Date: Mon, 18 Oct 2010 02:43:17 -0800
Subject: Re-designed cache model: - read only cache model with integrated
 mshrs (no L1D, yet); new   cache interface should be easily extendable to
 support texture   cache with latency fifo and separate tag/data arrays,
 though   this is not yet added (currently tags and data arrays are not  
 decoupled for texture) - new partition model using the above

removes all old MSHRs, L1D etc...

passing CUDA 3.1 regression

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7875]
---
 Makefile | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f6e2787..a9469ec 100644
--- a/Makefile
+++ b/Makefile
@@ -121,40 +121,40 @@ lib/libOpenCL.so: $(LIBS) opencllib
 	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
 
-cudalib:
-	make -C ./libcuda/
+cudalib: cuda-sim
+	$(MAKE) -C ./libcuda/
 
 cuda-sim:
-	make -C ./src/cuda-sim/ depend
-	make -C ./src/cuda-sim/
+	$(MAKE) -C ./src/cuda-sim/ depend
+	$(MAKE) -C ./src/cuda-sim/
 
-gpgpu-sim_uarch:
-	make -C ./src/gpgpu-sim/ depend
-	make -C ./src/gpgpu-sim/
+gpgpu-sim_uarch: cuda-sim
+	$(MAKE) -C ./src/gpgpu-sim/ depend
+	$(MAKE) -C ./src/gpgpu-sim/
 
-intersim:
-	make "CREATELIBRARY=1" "DEBUG=$(DEBUG)" -C ./src/intersim	
+intersim: cuda-sim gpgpu-sim_uarch
+	$(MAKE) "CREATELIBRARY=1" "DEBUG=$(DEBUG)" -C ./src/intersim	
 
-gpgpusimlib:
-	make -C ./src/ depend
-	make -C ./src/
+gpgpusimlib: cuda-sim gpgpu-sim_uarch intersim
+	$(MAKE) -C ./src/ depend
+	$(MAKE) -C ./src/
 
-opencllib:
-	make -C ./libopencl/
+opencllib: cuda-sim
+	$(MAKE) -C ./libopencl/
 
 all:
-	make gpgpusim
+	$(MAKE) gpgpusim
 
 clean: 
-	make cleangpgpusim
+	$(MAKE) cleangpgpusim
 
 cleangpgpusim:
-	make clean -C ./libcuda/
+	$(MAKE) clean -C ./libcuda/
 ifneq  ($(NVOPENCL_LIBDIR),)
-	make clean -C ./libopencl/
+	$(MAKE) clean -C ./libopencl/
 endif
-	make clean -C ./src/intersim/
-	make clean -C ./src/cuda-sim/
-	make clean -C ./src/gpgpu-sim/
-	make clean -C ./src/
+	$(MAKE) clean -C ./src/intersim/
+	$(MAKE) clean -C ./src/cuda-sim/
+	$(MAKE) clean -C ./src/gpgpu-sim/
+	$(MAKE) clean -C ./src/
 	rm -rf ./lib/*.so*
-- 
cgit v1.3