From 54a946604b2fa81c0d58fc41bfe1d82840f44793 Mon Sep 17 00:00:00 2001
From: Kevin Lim <ktlim@umich.edu>
Date: Tue, 5 Dec 2006 11:12:18 -0500
Subject: Override default SConscript options and only build the SimpleCPUs.

--HG--
extra : convert_revision : cfcfb787d8442cb76ed766aa5bc947636f067209
---
 build_opts/SPARC_FS | 1 +
 build_opts/SPARC_SE | 1 +
 2 files changed, 2 insertions(+)

diff --git a/build_opts/SPARC_FS b/build_opts/SPARC_FS
index 59d17eee9..7c8bda0ce 100644
--- a/build_opts/SPARC_FS
+++ b/build_opts/SPARC_FS
@@ -1,2 +1,3 @@
 TARGET_ISA = 'sparc'
+CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU'
 FULL_SYSTEM = 1
diff --git a/build_opts/SPARC_SE b/build_opts/SPARC_SE
index 3b256fc34..62b6841ad 100644
--- a/build_opts/SPARC_SE
+++ b/build_opts/SPARC_SE
@@ -1,2 +1,3 @@
 TARGET_ISA = 'sparc'
+CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU'
 FULL_SYSTEM = 0
-- 
cgit v1.2.3


From b618e733bd580391702a844404417f9723b94588 Mon Sep 17 00:00:00 2001
From: Kevin Lim <ktlim@umich.edu>
Date: Wed, 6 Dec 2006 14:23:31 -0500
Subject: Fix for MIPS_SE/m5.fast compile.

--HG--
extra : convert_revision : dbb893250974ac6db7b6c1ba67263fd35098ca43
---
 src/cpu/o3/commit_impl.hh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh
index 43305f962..f400d757b 100644
--- a/src/cpu/o3/commit_impl.hh
+++ b/src/cpu/o3/commit_impl.hh
@@ -1197,16 +1197,16 @@ DefaultCommit<Impl>::getInsts()
              rename_idx < fromRename->size;
              rename_idx++) {
             DynInstPtr inst = fromRename->insts[rename_idx];
-            int tid = inst->threadNumber;
 
             if (!inst->isSquashed()) {
                 DPRINTF(Commit, "Inserting PC %#x [sn:%i] [tid:%i] into ",
-                        "skidBuffer.\n", inst->readPC(), inst->seqNum, tid);
+                        "skidBuffer.\n", inst->readPC(), inst->seqNum,
+                        inst->threadNumber);
                 skidBuffer.push(inst);
             } else {
                 DPRINTF(Commit, "Instruction PC %#x [sn:%i] [tid:%i] was "
                         "squashed, skipping.\n",
-                        inst->readPC(), inst->seqNum, tid);
+                        inst->readPC(), inst->seqNum, inst->threadNumber);
             }
         }
     }
-- 
cgit v1.2.3


From ac32645c27c51f5eb5e20adecab4758352265aa5 Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Thu, 7 Dec 2006 14:41:56 -0500
Subject: Change detault regression build from opt to fast.

--HG--
extra : convert_revision : b6db0254b73a97ab6e3685c90cc9cd30ea274d4f
---
 util/regress | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/regress b/util/regress
index 8e60b6fee..83d8b4ddc 100755
--- a/util/regress
+++ b/util/regress
@@ -43,7 +43,7 @@ optparser.add_option('--builds', dest='builds',
                      help='comma-separated list of build targets to test  '
                      " (default: '%default')" )
 optparser.add_option('--variants', dest='variants',
-                     default='opt',
+                     default='fast',
                      help='comma-separated list of build variants to test '
                      " (default: '%default')" )
 optparser.add_option('--scons-opts', dest='scons_opts', default='',
-- 
cgit v1.2.3