summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorSteve Reinhardt <steve.reinhardt@amd.com>2016-02-06 17:21:18 -0800
committerSteve Reinhardt <steve.reinhardt@amd.com>2016-02-06 17:21:18 -0800
commitdc8018a5c3482008232e6faaa2d96cf20aed7485 (patch)
treea972ac4544e227397595baf6eeb30e1854f480fc /util
parentc8c82f09a282832d919f7eb073a47be838e65b29 (diff)
downloadgem5-dc8018a5c3482008232e6faaa2d96cf20aed7485.tar.xz
style: remove trailing whitespace
Result of running 'hg m5style --skip-all --fix-white -a'.
Diffstat (limited to 'util')
-rwxr-xr-xutil/checkpoint-tester.py4
-rwxr-xr-xutil/compile2
-rw-r--r--util/m5/m5.c4
-rwxr-xr-xutil/qdo18
-rw-r--r--util/statetrace/SConstruct2
5 files changed, 15 insertions, 15 deletions
diff --git a/util/checkpoint-tester.py b/util/checkpoint-tester.py
index d5d8004a2..530462758 100755
--- a/util/checkpoint-tester.py
+++ b/util/checkpoint-tester.py
@@ -109,7 +109,7 @@ for dir in dirs:
cpts.append(int(match.group(1)))
cpts.sort()
-
+
# We test by loading checkpoint N, simulating to (and dumping at)
# checkpoint N+1, then comparing the resulting checkpoint with the
# original checkpoint N+1. Thus the number of tests we can run is one
@@ -132,4 +132,4 @@ for i in range(1, len(cpts)):
print diffout.read(),
diffout.close()
-
+
diff --git a/util/compile b/util/compile
index 7f9b5d447..627e78b74 100755
--- a/util/compile
+++ b/util/compile
@@ -147,7 +147,7 @@ add_option('-E', "--experimental", action='store_true', default=False,
help="enable experimental builds")
add_option('-v', "--verbose", default=False, action='store_true',
help="be verbose")
-
+
set_group("Output binary types")
bool_option("debug", default=False, help="compile debug binaries")
bool_option("opt", default=False, help="compile opt binaries")
diff --git a/util/m5/m5.c b/util/m5/m5.c
index 522268410..f773153da 100644
--- a/util/m5/m5.c
+++ b/util/m5/m5.c
@@ -285,7 +285,7 @@ do_pin(int argc, char *argv[])
if (argc < 2)
usage();
- cpu_set_t mask;
+ cpu_set_t mask;
CPU_ZERO(&mask);
const char *sep = ",";
@@ -293,7 +293,7 @@ do_pin(int argc, char *argv[])
while (target) {
CPU_SET(atoi(target), &mask);
target = strtok(NULL, sep);
- }
+ }
if (sched_setaffinity(0, sizeof(cpu_set_t), &mask) < 0)
err(1, "setaffinity");
diff --git a/util/qdo b/util/qdo
index 2c47fa654..d53f3e9b1 100755
--- a/util/qdo
+++ b/util/qdo
@@ -30,7 +30,7 @@
# Ali Saidi
# Important!
-# This script expects a simple $ prompt, if you are using a shell other than
+# This script expects a simple $ prompt, if you are using a shell other than
# sh which defaults to this you'll need to add something like the following
# to your bashrc/bash_profile script:
#if [ "$OAR_USER" = "xxxx" ]; then
@@ -97,11 +97,11 @@ class Shell(pexpect.spawn):
def __init__(self, cmd):
# initialize base pexpect.spawn object
- try:
+ try:
pexpect.spawn.__init__(self, cmd)
- except pexpect.ExceptionPexpect, exc:
- print "%s:" % progname, exc
- sys.exit(1)
+ except pexpect.ExceptionPexpect, exc:
+ print "%s:" % progname, exc
+ sys.exit(1)
# full_output accumulates the full output of the session
self.full_output = ""
self.quick_timeout = 15
@@ -146,17 +146,17 @@ class Shell(pexpect.spawn):
(output, status) = shell.do_command('[ -d %s ]' % dirname,
self.quick_timeout)
return status == 0
-
+
# Don't actually try to close it.. just wait until it closes by itself
- # We can't actually kill the pid which is what it's trying to do, and if
- # we call wait we could be in an unfortunate situation of it printing input
+ # We can't actually kill the pid which is what it's trying to do, and if
+ # we call wait we could be in an unfortunate situation of it printing input
# right as we call wait, so the input is never read and the process never ends
def safe_close(self):
count = 0
while self.isalive() and count < 10:
time.sleep(1)
self.close(force=False)
-
+
# Spawn the interactive pool job.
# Hack to do link on poolfs... disabled for now since
diff --git a/util/statetrace/SConstruct b/util/statetrace/SConstruct
index 5909772c6..ce914d79d 100644
--- a/util/statetrace/SConstruct
+++ b/util/statetrace/SConstruct
@@ -35,7 +35,7 @@ scons build/arm/statetrace
You may need a cross compiler in order to build statetrace successfully. To
specify an alternative compiler, set the CXX scons argument on the command
-line. The CXX environment variable is NOT considered when selecting the
+line. The CXX environment variable is NOT considered when selecting the
compiler. To override the compiler for a particular target ISA, set the
<arch>CXX scons argument. For example, to build both the AMD64 version and
the ARM version at the same time using the system compiler for the AMD64