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]

3 files changed, 0 insertions, 154 deletions

diff --git a/benchmarks/CUDA/DG/Makefiles/Makefile b/benchmarks/CUDA/DG/Makefiles/Makefile
deleted file mode 100644
index 742c1d7..0000000
--- a/benchmarks/CUDA/DG/Makefiles/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-################################################################################
-#
-# Copyright 1993-2006 NVIDIA Corporation.  All rights reserved.
-#
-# NOTICE TO USER:   
-#
-# This source code is subject to NVIDIA ownership rights under U.S. and 
-# international Copyright laws.  
-#
-# NVIDIA MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE 
-# CODE FOR ANY PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR 
-# IMPLIED WARRANTY OF ANY KIND.  NVIDIA DISCLAIMS ALL WARRANTIES WITH 
-# REGARD TO THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF 
-# MERCHANTABILITY, NONINFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE.   
-# IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL, 
-# OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS 
-# OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE 
-# OR PERFORMANCE OF THIS SOURCE CODE.  
-#
-# U.S. Government End Users.  This source code is a "commercial item" as 
-# that term is defined at 48 C.F.R. 2.101 (OCT 1995), consisting  of 
-# "commercial computer software" and "commercial computer software 
-# documentation" as such terms are used in 48 C.F.R. 12.212 (SEPT 1995) 
-# and is provided to the U.S. Government only as a commercial end item.  
-# Consistent with 48 C.F.R.12.212 and 48 C.F.R. 227.7202-1 through 
-# 227.7202-4 (JUNE 1995), all U.S. Government End Users acquire the 
-# source code with only those rights set forth herein.
-#
-################################################################################
-#
-# Build script for project
-#
-###############################################################################
-
-# Add source files here
-EXECUTABLE	:= MaxwellsGPU2d
-# Cuda source files (compiled with cudacc)
-CUFILES		:= src/MaxwellsKernel2d.cu 
-# C/C++ source files (compiled with gcc / c++)
-CCFILES		:= src/Mesh2d.c src/Utils.c src/LoadBalance2d.c src/FacePair2d.c src/ParallelPairs.c src/BuildMaps2d.c src/StartUp2d.c src/MaxwellsRun2d.c \
-		src/MaxwellsMPI2d.c src/MaxwellsDriver2d.c
-GPGPUSIM_ROOT   := ../../..
-LIB             := -lparmetis -lmetis -lm -lcuda -lcudart
-
-###############################################################################
-# Rules and targets
-
-include ../cuda_sdk_1.1/common/common.mk
diff --git a/benchmarks/CUDA/DG/Makefiles/MakefileCPU3d b/benchmarks/CUDA/DG/Makefiles/MakefileCPU3d
deleted file mode 100644
index 771a15f..0000000
--- a/benchmarks/CUDA/DG/Makefiles/MakefileCPU3d
+++ /dev/null
@@ -1,51 +0,0 @@
-# define variables
-VPATH   = ./
-HDRDIR  = ./include
-LIBDIR	= ./lib
-# adjust this for your system
-
-# set options for this machine
-# specify which compilers to use for c, fortran and linking
-CC	= mpicc
-LD	= mpicc
-
-# compiler flags to be used (set to compile with debugging on)
-CFLAGS = -Dp_N=$(N) -DNDG3d -I/opt/local/include -I/usr/include/malloc -I$(HDRDIR) -O3 
-
-# link flags to be used 
-LDFLAGS	= -I$(HDRDIR) -L. -L./$(LIBDIR) -O3
-
-# libraries to be linked in
-LIBS	=  -lparmetis -lmetis  -lm 
-
-# types of files we are going to construct rules for
-.SUFFIXES: .c .f .cu
-
-# rule for .c files
-.c.o:
-	$(CC) $(CFLAGS) -o $*.o -c $*.c
-
-# list of objects to be compiled
-OBJS    = \
-	src/Mesh3d.o\
-	src/Utils.o\
-	src/LoadBalance3d.o\
-	src/FacePair3d.o\
-	src/ParallelPairs.o\
-	src/BuildMaps3d.o\
-	src/StartUp3d.o\
-	src/MaxwellsRun3d.o\
-	src/MaxwellsRHS3d.o\
-	src/MaxwellsMPI3d.o\
-	src/MaxwellsDriver3d.o\
-	src/InitCPU3d.o
-
-MaxwellsCPU3d:$(OBJS)
-	$(LD)  $(LDFLAGS)  -o MaxwellsCPU3d $(OBJS) $(LIBS)
-#	rm -r $(OBJS)
-
-# what to do if user types "make clean"
-clean :
-	rm -r $(OBJS)
-
-
diff --git a/benchmarks/CUDA/DG/Makefiles/MakefileGPU3d b/benchmarks/CUDA/DG/Makefiles/MakefileGPU3d
deleted file mode 100644
index 1af50c2..0000000
--- a/benchmarks/CUDA/DG/Makefiles/MakefileGPU3d
+++ /dev/null
@@ -1,54 +0,0 @@
-# define variables
-VPATH   = ./
-HDRDIR  = ./include
-LIBDIR	= ./lib
-# adjust this for your system
-CUDADIR=/usr/local/cuda/
-
-# set options for this machine
-# specify which compilers to use for c, fortran and linking
-CC	= mpicc
-LD	= mpicc
-NVCC	= nvcc
-
-# compiler flags to be used (set to compile with debugging on)
-CFLAGS = -Dp_N=$(N) -DNDG3d -DCUDA -I/opt/local/include -I/usr/include/malloc -I$(HDRDIR) -O3 -I$(CUDADIR)/include
-
-# link flags to be used 
-LDFLAGS	= -I$(HDRDIR) -L. -L./$(LIBDIR) -O3 -L$(CUDADIR)/lib
-
-# libraries to be linked in
-LIBS	=  -lparmetis -lmetis  -lm -lcuda -lcudart
-
-# types of files we are going to construct rules for
-.SUFFIXES: .c .f .cu
-
-# rule for .c files
-.c.o:
-	$(CC) $(CFLAGS) -o $*.o -c $*.c
-.cu.o: 
-	$(NVCC) -o $*.o -c $*.cu --compiler-options -O3 --use_fast_math  $(CFLAGS) 
-
-# list of objects to be compiled
-OBJS    = \
-	src/Mesh3d.o\
-	src/Utils.o\
-	src/LoadBalance3d.o\
-	src/FacePair3d.o\
-	src/ParallelPairs.o\
-	src/BuildMaps3d.o\
-	src/StartUp3d.o\
-	src/MaxwellsRun3d.o\
-	src/MaxwellsMPI3d.o\
-	src/MaxwellsKernel3d.o\
-	src/MaxwellsDriver3d.o
-
-MaxwellsGPU3d:$(OBJS) 
-	$(LD)  $(LDFLAGS)  -o MaxwellsGPU3d $(OBJS) $(LIBS)
-	rm -r $(OBJS)
-
-# what to do if user types "make clean"
-clean :
-	rm -r $(OBJS)
-
-