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]

1 files changed, 0 insertions, 62 deletions

diff --git a/benchmarks/CUDA/DG/Makefile b/benchmarks/CUDA/DG/Makefile
deleted file mode 100644
index 5988bab..0000000
--- a/benchmarks/CUDA/DG/Makefile
+++ /dev/null
@@ -1,62 +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	:= gpuDG3d 
-# Cuda source files (compiled with cudacc)
-CUFILES		:= src/MaxwellsKernel3d.cu 
-# C/C++ source files (compiled with gcc / c++)
-CFILES		:= src/Mesh3d.c src/Utils.c src/LoadBalance3d.c src/FacePair3d.c src/ParallelPairs.c src/BuildMaps3d.c src/StartUp3d.c src/MaxwellsRun3d.c \
-		src/MaxwellsMPI3d.c src/MaxwellsDriver3d.c
-GPGPUSIM_ROOT   := ../../..
-LIB             := -lparmetis -lmetis -lm -lmpi
-HDRDIR  = ./include
-NEWLIBDIR  := -L./3rdParty/ParMetis-3.1/  -L/usr/lib64/mpi/gcc/openmpi/lib64/
-N ?= 6
-HOSTNAME=$(shell hostname | awk '/aamodt/ {print 1;}')
-ifeq ($(HOSTNAME),1)
-CFLAGS = -Dp_N=$(N) -DNDG3d -DCUDA -I/opt/local/include -I/usr/include/malloc -I$(HDRDIR) -O3 -I/opt/mpich/include
-else
-CFLAGS = -Dp_N=$(N) -DNDG3d -DCUDA -I/opt/local/include -I/usr/include/malloc -I$(HDRDIR) -O3 
-endif
-CUFLAGS = $(CFLAGS)
-
-NEWCC = mpicc
-LD = mpicc
-NEWCPP = mpicxx
-###############################################################################
-# Rules and targets
-
-include ../../../common/common.mk