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, 48 deletions

diff --git a/benchmarks/CUDA/CP/common/mk/rules.mk b/benchmarks/CUDA/CP/common/mk/rules.mk
deleted file mode 100644
index 0e6304d..0000000
--- a/benchmarks/CUDA/CP/common/mk/rules.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# (c) 2007 The Board of Trustees of the University of Illinois.
-
-# Rules common to all makefiles
-
-########################################
-# Environment variable check
-########################################
-
-# The second-last directory in the $(BUILDDIR) path
-# must have the name "build".  This reduces the risk of terrible
-# accidents if paths are not set up correctly.
-ifeq ("$(notdir $(BUILDDIR))", "")
-$(error $$BUILDDIR is not set correctly)
-endif
-
-ifneq ("$(notdir $(patsubst %/,%,$(dir $(BUILDDIR))))", "build")
-$(error $$BUILDDIR is not set correctly)
-endif
-
-########################################
-# Derived variables
-########################################
-
-OBJS = $(call INBUILDDIR,$(SRCDIR_OBJS))
-
-########################################
-# Rules
-########################################
-
-clean :
-	rm -f $(BUILDDIR)/*
-	if [ -d $(BUILDDIR) ]; then rmdir $(BUILDDIR); fi
-
-ifeq ("$(LINK_MODE)","C")
-$(BIN) : $(OBJS)
-	$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
-endif
-
-$(BUILDDIR) :
-	mkdir $(BUILDDIR)
-
-$(BUILDDIR)/%.o : $(SRCDIR)/%.c
-	mkdir -p $(BUILDDIR)
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(BUILDDIR)/%.o : $(SRCDIR)/%.cc
-	mkdir -p $(BUILDDIR)
-	$(CXX) $(CXXFLAGS) -c $< -o $@