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

diff --git a/benchmarks/CUDA/CP/common/python/textfilecompare.py b/benchmarks/CUDA/CP/common/python/textfilecompare.py
deleted file mode 100644
index 2f6ef68..0000000
--- a/benchmarks/CUDA/CP/common/python/textfilecompare.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# (c) Copyright 2007 The Board of Trustees of the University of Illinois.
-
-from binaryfilecompare import eof, many
-
-# Rename the builtin 'float' variable to avoid name conflicts
-builtin_float = float
-
-def verbatim(f):
-	"""Read a line of text from file 'f'."""
-	line = f.readline()
-	return line
-
-def float(f):
-	"""Read a line of text from file 'f' as a single floating-point
-	number."""
-	words = f.readline().split()
-	if len(words) != 1:
-		raise ValueError, "Expecting line to contain a single number"
-	return builtin_float(words[0])
-
-def floats(f):
-	"""Read a line of text from file 'f' as a list of floating-point
-	numbers."""
-	words = f.readline().split()
-	return [builtin_float(x) for x in words]
-
-