[m5-dev] Cron m5test@zizzer /z/m5/regression/do-regression quick
* build/ALPHA_SE/tests/opt/quick/00.hello/alpha/linux/o3-timing passed. * build/ALPHA_SE/tests/opt/quick/00.hello/alpha/linux/inorder-timing passed. * build/ALPHA_SE/tests/opt/quick/00.hello/alpha/linux/simple-atomic passed. * build/ALPHA_SE/tests/opt/quick/00.hello/alpha/linux/simple-timing passed. * build/ALPHA_SE/tests/opt/quick/00.hello/alpha/linux/simple-timing-ruby passed. * build/ALPHA_SE/tests/opt/quick/00.hello/alpha/tru64/o3-timing passed. * build/ALPHA_SE/tests/opt/quick/00.hello/alpha/tru64/simple-atomic passed. * build/ALPHA_SE/tests/opt/quick/00.hello/alpha/tru64/simple-timing passed. * build/ALPHA_SE/tests/opt/quick/00.hello/alpha/tru64/simple-timing-ruby passed. * build/ALPHA_SE/tests/opt/quick/01.hello-2T-smt/alpha/linux/o3-timing passed. * build/ALPHA_SE/tests/opt/quick/20.eio-short/alpha/eio/simple-atomic passed. * build/ALPHA_SE/tests/opt/quick/20.eio-short/alpha/eio/simple-timing passed. * build/ALPHA_SE/tests/opt/quick/30.eio-mp/alpha/eio/simple-timing-mp passed. * build/ALPHA_SE/tests/opt/quick/30.eio-mp/alpha/eio/simple-atomic-mp passed. * build/ALPHA_SE/tests/opt/quick/50.memtest/alpha/linux/memtest passed. * build/ALPHA_SE/tests/opt/quick/50.memtest/alpha/linux/memtest-ruby passed. * build/ALPHA_SE/tests/opt/quick/60.rubytest/alpha/linux/rubytest-ruby passed. * build/ALPHA_SE_MOESI_hammer/tests/opt/quick/00.hello/alpha/linux/simple-timing-ruby-MOESI_hammer passed. * build/ALPHA_SE_MOESI_hammer/tests/opt/quick/00.hello/alpha/tru64/simple-timing-ruby-MOESI_hammer passed. * build/ALPHA_SE_MOESI_hammer/tests/opt/quick/50.memtest/alpha/linux/memtest-ruby-MOESI_hammer passed. * build/ALPHA_SE_MOESI_hammer/tests/opt/quick/60.rubytest/alpha/linux/rubytest-ruby-MOESI_hammer passed. * build/ALPHA_SE_MESI_CMP_directory/tests/opt/quick/00.hello/alpha/linux/simple-timing-ruby-MESI_CMP_directory passed. * build/ALPHA_SE_MESI_CMP_directory/tests/opt/quick/00.hello/alpha/tru64/simple-timing-ruby-MESI_CMP_directory passed. * build/ALPHA_SE_MESI_CMP_directory/tests/opt/quick/50.memtest/alpha/linux/memtest-ruby-MESI_CMP_directory passed. * build/ALPHA_SE_MESI_CMP_directory/tests/opt/quick/60.rubytest/alpha/linux/rubytest-ruby-MESI_CMP_directory passed. * build/ALPHA_SE_MOESI_CMP_directory/tests/opt/quick/00.hello/alpha/linux/simple-timing-ruby-MOESI_CMP_directory passed. * build/ALPHA_SE_MOESI_CMP_directory/tests/opt/quick/00.hello/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory passed. * build/ALPHA_SE_MOESI_CMP_directory/tests/opt/quick/50.memtest/alpha/linux/memtest-ruby-MOESI_CMP_directory passed. * build/ALPHA_SE_MOESI_CMP_directory/tests/opt/quick/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_directory passed. * build/ALPHA_SE_MOESI_CMP_token/tests/opt/quick/00.hello/alpha/linux/simple-timing-ruby-MOESI_CMP_token passed. * build/ALPHA_SE_MOESI_CMP_token/tests/opt/quick/00.hello/alpha/tru64/simple-timing-ruby-MOESI_CMP_token passed. * build/ALPHA_SE_MOESI_CMP_token/tests/opt/quick/50.memtest/alpha/linux/memtest-ruby-MOESI_CMP_token passed. * build/ALPHA_SE_MOESI_CMP_token/tests/opt/quick/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_token passed. * build/ALPHA_FS/tests/opt/quick/10.linux-boot/alpha/linux/tsunami-simple-atomic passed. * build/ALPHA_FS/tests/opt/quick/10.linux-boot/alpha/linux/tsunami-simple-atomic-dual passed. * build/ALPHA_FS/tests/opt/quick/10.linux-boot/alpha/linux/tsunami-simple-timing passed. * build/ALPHA_FS/tests/opt/quick/10.linux-boot/alpha/linux/tsunami-simple-timing-dual passed. * build/ALPHA_FS/tests/opt/quick/80.netperf-stream/alpha/linux/twosys-tsunami-simple-atomic passed. * build/MIPS_SE/tests/opt/quick/00.hello/mips/linux/inorder-timing passed. * build/MIPS_SE/tests/opt/quick/00.hello/mips/linux/simple-atomic passed. * build/MIPS_SE/tests/opt/quick/00.hello/mips/linux/simple-timing-ruby passed. * build/MIPS_SE/tests/opt/quick/00.hello/mips/linux/simple-timing passed. * build/MIPS_SE/tests/opt/quick/00.hello/mips/linux/o3-timing passed. * build/POWER_SE/tests/opt/quick/00.hello/power/linux/o3-timing passed. * build/POWER_SE/tests/opt/quick/00.hello/power/linux/simple-atomic passed. * build/SPARC_SE/tests/opt/quick/00.hello/sparc/linux/simple-atomic passed. * build/SPARC_SE/tests/opt/quick/00.hello/sparc/linux/simple-timing passed. * build/SPARC_SE/tests/opt/quick/00.hello/sparc/linux/simple-timing-ruby passed. * build/SPARC_SE/tests/opt/quick/02.insttest/sparc/linux/o3-timing passed. * build/SPARC_SE/tests/opt/quick/02.insttest/sparc/linux/simple-atomic passed. * build/SPARC_SE/tests/opt/quick/40.m5threads-test-atomic/sparc/linux/o3-timing-mp passed. * build/SPARC_SE/tests/opt/quick/02.insttest/sparc/linux/simple-timing passed. *
Re: [m5-dev] Review Request: stats: better expose statistics to python.
--- This is an automatically generated e-mail. To reply, visit: http://reviews.m5sim.org/r/689/#review1228 --- src/python/m5/stats/__init__.py http://reviews.m5sim.org/r/689/#comment1694 Actually, this is fixed in the subsequent diff. This code is already in the tree and was just part of the rename from stats.py to stats/__init__.py - Nathan On 2011-05-10 06:08:21, Nathan Binkert wrote: --- This is an automatically generated e-mail. To reply, visit: http://reviews.m5sim.org/r/689/ --- (Updated 2011-05-10 06:08:21) Review request for Default, Ali Saidi, Gabe Black, Steve Reinhardt, and Nathan Binkert. Summary --- stats: better expose statistics to python. Build a python list and dict of all stats and expose flags properly. Diffs - src/python/SConscript 44f8c2507d85 src/python/m5/stats.py 44f8c2507d85 src/python/m5/stats/__init__.py PRE-CREATION src/python/swig/stats.i 44f8c2507d85 Diff: http://reviews.m5sim.org/r/689/diff Testing --- quick regressions pass (though most recently run with review 690 and 691) Thanks, Nathan ___ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev
Re: [m5-dev] Review Request: stats: better expose statistics to python.
On 2011-05-10 15:19:06, Ali Saidi wrote: src/python/m5/stats/__init__.py, line 29 http://reviews.m5sim.org/r/689/diff/1/?file=12548#file12548line29 Please add a this file does comment... e.g. This file provides accessors to all the m5 stats or something.. Actually, this file isn't new. It's the result of a rename. I'll try to add documentation nearer the end of all of these changes. - Nathan --- This is an automatically generated e-mail. To reply, visit: http://reviews.m5sim.org/r/689/#review1221 --- On 2011-05-10 06:08:21, Nathan Binkert wrote: --- This is an automatically generated e-mail. To reply, visit: http://reviews.m5sim.org/r/689/ --- (Updated 2011-05-10 06:08:21) Review request for Default, Ali Saidi, Gabe Black, Steve Reinhardt, and Nathan Binkert. Summary --- stats: better expose statistics to python. Build a python list and dict of all stats and expose flags properly. Diffs - src/python/SConscript 44f8c2507d85 src/python/m5/stats.py 44f8c2507d85 src/python/m5/stats/__init__.py PRE-CREATION src/python/swig/stats.i 44f8c2507d85 Diff: http://reviews.m5sim.org/r/689/diff Testing --- quick regressions pass (though most recently run with review 690 and 691) Thanks, Nathan ___ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev
Re: [m5-dev] Review Request: stats: move code that loops over all stats into python
--- This is an automatically generated e-mail. To reply, visit: http://reviews.m5sim.org/r/690/#review1230 --- Ship it! - Ali On 2011-05-10 06:08:36, Nathan Binkert wrote: --- This is an automatically generated e-mail. To reply, visit: http://reviews.m5sim.org/r/690/ --- (Updated 2011-05-10 06:08:36) Review request for Default, Ali Saidi, Gabe Black, Steve Reinhardt, and Nathan Binkert. Summary --- stats: move code that loops over all stats into python Diffs - src/base/SConscript 44f8c2507d85 src/base/statistics.hh 44f8c2507d85 src/base/statistics.cc 44f8c2507d85 src/base/stats/info.hh 44f8c2507d85 src/base/stats/mysql.hh 44f8c2507d85 src/base/stats/mysql.cc 44f8c2507d85 src/base/stats/output.hh 44f8c2507d85 src/base/stats/output.cc 44f8c2507d85 src/base/stats/text.hh 44f8c2507d85 src/base/stats/text.cc 44f8c2507d85 src/base/stats/visit.hh 44f8c2507d85 src/base/stats/visit.cc 44f8c2507d85 src/python/m5/simulate.py 44f8c2507d85 src/python/m5/stats/__init__.py PRE-CREATION src/python/swig/stats.i 44f8c2507d85 Diff: http://reviews.m5sim.org/r/690/diff Testing --- quick regressions pass (though most recently run with review 689 and 691) Thanks, Nathan ___ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev
Re: [m5-dev] Review Request: stats: better expose statistics to python.
--- This is an automatically generated e-mail. To reply, visit: http://reviews.m5sim.org/r/689/#review1231 --- Ship it! - Ali On 2011-05-10 06:08:21, Nathan Binkert wrote: --- This is an automatically generated e-mail. To reply, visit: http://reviews.m5sim.org/r/689/ --- (Updated 2011-05-10 06:08:21) Review request for Default, Ali Saidi, Gabe Black, Steve Reinhardt, and Nathan Binkert. Summary --- stats: better expose statistics to python. Build a python list and dict of all stats and expose flags properly. Diffs - src/python/SConscript 44f8c2507d85 src/python/m5/stats.py 44f8c2507d85 src/python/m5/stats/__init__.py PRE-CREATION src/python/swig/stats.i 44f8c2507d85 Diff: http://reviews.m5sim.org/r/689/diff Testing --- quick regressions pass (though most recently run with review 690 and 691) Thanks, Nathan ___ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev
[m5-dev] changeset in m5: stats: better expose statistics to python.
changeset 221013f9fd2f in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=221013f9fd2f
description:
stats: better expose statistics to python.
Build a python list and dict of all stats and expose flags properly.
diffstat:
src/python/SConscript |2 +-
src/python/m5/stats.py | 66
src/python/m5/stats/__init__.py | 110
src/python/swig/stats.i | 48 +
4 files changed, 159 insertions(+), 67 deletions(-)
diffs (271 lines):
diff -r 44f8c2507d85 -r 221013f9fd2f src/python/SConscript
--- a/src/python/SConscript Mon May 09 16:34:11 2011 -0400
+++ b/src/python/SConscript Thu May 12 11:19:32 2011 -0700
@@ -46,10 +46,10 @@
PySource('m5', 'm5/params.py')
PySource('m5', 'm5/proxy.py')
PySource('m5', 'm5/simulate.py')
-PySource('m5', 'm5/stats.py')
PySource('m5', 'm5/ticks.py')
PySource('m5', 'm5/trace.py')
PySource('m5.objects', 'm5/objects/__init__.py')
+PySource('m5.stats', 'm5/stats/__init__.py')
PySource('m5.util', 'm5/util/__init__.py')
PySource('m5.util', 'm5/util/attrdict.py')
PySource('m5.util', 'm5/util/code_formatter.py')
diff -r 44f8c2507d85 -r 221013f9fd2f src/python/m5/stats.py
--- a/src/python/m5/stats.pyMon May 09 16:34:11 2011 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +
@@ -1,66 +0,0 @@
-# Copyright (c) 2007 The Regents of The University of Michigan
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met: redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer;
-# redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution;
-# neither the name of the copyright holders nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Authors: Nathan Binkert
-
-import internal
-
-from internal.stats import schedStatEvent as schedEvent
-from objects import Root
-
-def initText(filename, desc=True):
-internal.stats.initText(filename, desc)
-
-def initMySQL(host, database, user='', passwd='', project='test', name='test',
- sample='0'):
-if not user:
-import getpass
-user = getpass.getuser()
-
-internal.stats.initMySQL(host, database, user, passwd, project, name,
- sample)
-
-def initSimStats():
-internal.stats.initSimStats()
-
-def enable():
-internal.stats.enable()
-
-def dump():
-# Currently prepare happens in the dump, but we should maybe move
-# that out.
-
-#internal.stats.prepare()
-internal.stats.dump()
-
-def reset():
-# call reset stats on all SimObjects
-root = Root.getInstance()
-if root:
-for obj in root.descendants(): obj.resetStats()
-
-# call any other registered stats reset callbacks
-internal.stats.reset()
diff -r 44f8c2507d85 -r 221013f9fd2f src/python/m5/stats/__init__.py
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/src/python/m5/stats/__init__.py Thu May 12 11:19:32 2011 -0700
@@ -0,0 +1,110 @@
+# Copyright (c) 2007 The Regents of The University of Michigan
+# Copyright (c) 2010 The Hewlett-Packard Development Company
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software
[m5-dev] changeset in m5: stats: move code that loops over all stats into...
changeset be7f03723412 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=be7f03723412
description:
stats: move code that loops over all stats into python
diffstat:
src/base/SConscript | 2 -
src/base/statistics.cc | 60 +++--
src/base/statistics.hh | 28 ++
src/base/stats/info.hh | 4 +-
src/base/stats/mysql.cc | 52 +---
src/base/stats/mysql.hh | 10 +++--
src/base/stats/output.cc| 73 -
src/base/stats/output.hh| 24 ++--
src/base/stats/text.cc | 29 +++
src/base/stats/text.hh | 5 +-
src/base/stats/visit.cc | 41 ---
src/base/stats/visit.hh | 59 -
src/python/m5/simulate.py | 2 +-
src/python/m5/stats/__init__.py | 57 ++-
src/python/swig/stats.i | 56 +++---
15 files changed, 183 insertions(+), 319 deletions(-)
diffs (truncated from 858 to 300 lines):
diff -r 221013f9fd2f -r be7f03723412 src/base/SConscript
--- a/src/base/SConscript Thu May 12 11:19:32 2011 -0700
+++ b/src/base/SConscript Thu May 12 11:19:35 2011 -0700
@@ -71,9 +71,7 @@
Source('loader/raw_object.cc')
Source('loader/symtab.cc')
-Source('stats/output.cc')
Source('stats/text.cc')
-Source('stats/visit.cc')
if env['USE_MYSQL']:
Source('mysql.cc')
diff -r 221013f9fd2f -r be7f03723412 src/base/statistics.cc
--- a/src/base/statistics.ccThu May 12 11:19:32 2011 -0700
+++ b/src/base/statistics.ccThu May 12 11:19:35 2011 -0700
@@ -433,66 +433,18 @@
return root ? root-str() : ;
}
-void
-enable()
-{
-typedef listInfo *::iterator iter_t;
-
-iter_t i, end = statsList().end();
-for (i = statsList().begin(); i != end; ++i) {
-Info *info = *i;
-assert(info);
-if (!info-check() || !info-baseCheck())
-panic(stat check failed for '%s' %d\n, info-name, info-id);
-}
-
-off_t j = 0;
-for (i = statsList().begin(); i != end; ++i) {
-Info *info = *i;
-if (!(info-flags display))
-info-name = __Stat + to_string(j++);
-}
-
-statsList().sort(Info::less);
-
-for (i = statsList().begin(); i != end; ++i) {
-Info *info = *i;
-info-enable();
-}
-}
-
-void
-prepare()
-{
-listInfo *::iterator i = statsList().begin();
-listInfo *::iterator end = statsList().end();
-while (i != end) {
-Info *info = *i;
-info-prepare();
-++i;
-}
-}
-
CallbackQueue resetQueue;
void
-reset()
-{
-listInfo *::iterator i = statsList().begin();
-listInfo *::iterator end = statsList().end();
-while (i != end) {
-Info *info = *i;
-info-reset();
-++i;
-}
-
-resetQueue.process();
-}
-
-void
registerResetCallback(Callback *cb)
{
resetQueue.add(cb);
}
} // namespace Stats
+
+void
+debugDumpStats()
+{
+Stats::dump();
+}
diff -r 221013f9fd2f -r be7f03723412 src/base/statistics.hh
--- a/src/base/statistics.hhThu May 12 11:19:32 2011 -0700
+++ b/src/base/statistics.hhThu May 12 11:19:35 2011 -0700
@@ -60,8 +60,8 @@
#include vector
#include base/stats/info.hh
+#include base/stats/output.hh
#include base/stats/types.hh
-#include base/stats/visit.hh
#include base/cast.hh
#include base/cprintf.hh
#include base/intmath.hh
@@ -90,7 +90,7 @@
void prepare() { s.prepare(); }
void reset() { s.reset(); }
void
-visit(Visit visitor)
+visit(Output visitor)
{
visitor.visit(*static_castBase *(this));
}
@@ -738,7 +738,7 @@
void reset() { }
bool zero() const { return value() == 0; }
-void visit(Visit visitor) { visitor.visit(*this); }
+void visit(Output visitor) { visitor.visit(*this); }
};
template class T
@@ -2933,28 +2933,10 @@
return NodePtr(new SumNodestd::plusResult (val));
}
-/**
- * Enable the statistics package. Before the statistics package is
- * enabled, all statistics must be created and initialized and once
- * the package is enabled, no more statistics can be created.
- */
-void enable();
-
-/**
- * Prepare all stats for data access. This must be done before
- * dumping and serialization.
- */
-void prepare();
-
-/**
- * Dump all statistics data to the registered outputs
- */
+/** Dump all statistics data to the registered outputs */
void dump();
-
-/**
- * Reset all statistics to the base state
- */
void reset();
+
/**
* Register a callback that should be called whenever statistics are
* reset
diff -r 221013f9fd2f -r be7f03723412 src/base/stats/info.hh
--- a/src/base/stats/info.hhThu May 12 11:19:32 2011 -0700
+++ b/src/base/stats/info.hhThu May 12 11:19:35 2011 -0700
@@ -62,7 +62,7 @@
const FlagsType __reserved =init | display;
struct
[m5-dev] changeset in m5: stats: delete mysql support
changeset d57afdcf38f5 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=d57afdcf38f5
description:
stats: delete mysql support
we can add it back within python in some future changeset
diffstat:
SConstruct | 39 +-
src/base/SConscript |4 -
src/base/mysql.cc | 113 -
src/base/mysql.hh | 426
src/base/stats/mysql.cc | 852
src/base/stats/mysql.hh | 190
src/base/stats/mysql_run.hh | 67 ---
src/python/m5/stats/__init__.py | 10 -
src/python/swig/stats.i |4 -
9 files changed, 1 insertions(+), 1704 deletions(-)
diffs (truncated from 1793 to 300 lines):
diff -r be7f03723412 -r d57afdcf38f5 SConstruct
--- a/SConstructThu May 12 11:19:35 2011 -0700
+++ b/SConstructThu May 12 11:19:35 2011 -0700
@@ -710,32 +710,6 @@
##
#
-# Check for mysql.
-#
-mysql_config = WhereIs('mysql_config')
-have_mysql = bool(mysql_config)
-
-# Check MySQL version.
-if have_mysql:
-mysql_version = readCommand(mysql_config + ' --version')
-min_mysql_version = '4.1'
-if compareVersions(mysql_version, min_mysql_version) 0:
-print 'Warning: MySQL', min_mysql_version, 'or newer required.'
-print ' Version', mysql_version, 'detected.'
-have_mysql = False
-
-# Set up mysql_config commands.
-if have_mysql:
-mysql_config_include = mysql_config + ' --include'
-if os.system(mysql_config_include + ' /dev/null') != 0:
-# older mysql_config versions don't support --include, use
-# --cflags instead
-mysql_config_include = mysql_config + ' --cflags | sed s/\\\'//g'
-# This seems to work in all versions
-mysql_config_libs = mysql_config + ' --libs'
-
-##
-#
# Finish the configuration
#
main = conf.Finish()
@@ -820,7 +794,6 @@
BoolVariable('USE_SSE2',
'Compile for SSE2 (-msse2) to get IEEE FP on x86 hosts',
False),
-BoolVariable('USE_MYSQL', 'Use MySQL for stats output', have_mysql),
BoolVariable('USE_POSIX_CLOCK', 'Use POSIX Clocks', have_posix_clock),
BoolVariable('USE_FENV', 'Use fenv.h IEEE mode control', have_fenv),
BoolVariable('USE_CHECKER', 'Use checker for detailed CPU models', False),
@@ -829,7 +802,7 @@
)
# These variables get exported to #defines in config/*.hh (see src/SConscript).
-export_vars += ['FULL_SYSTEM', 'USE_FENV', 'USE_MYSQL',
+export_vars += ['FULL_SYSTEM', 'USE_FENV',
'NO_FAST_ALLOC', 'FORCE_FAST_ALLOC', 'FAST_ALLOC_STATS',
'SS_COMPATIBLE_FP', 'USE_CHECKER', 'TARGET_ISA', 'CP_ANNOTATE',
'USE_POSIX_CLOCK' ]
@@ -994,16 +967,6 @@
if env['EFENCE']:
env.Append(LIBS=['efence'])
-if env['USE_MYSQL']:
-if not have_mysql:
-print Warning: MySQL not available; \
- forcing USE_MYSQL to False in, variant_dir + .
-env['USE_MYSQL'] = False
-else:
-print Compiling in, variant_dir, with MySQL support.
-env.ParseConfig(mysql_config_libs)
-env.ParseConfig(mysql_config_include)
-
# Save sticky variable settings back to current variables file
sticky_vars.Save(current_vars_file, env)
diff -r be7f03723412 -r d57afdcf38f5 src/base/SConscript
--- a/src/base/SConscript Thu May 12 11:19:35 2011 -0700
+++ b/src/base/SConscript Thu May 12 11:19:35 2011 -0700
@@ -73,10 +73,6 @@
Source('stats/text.cc')
-if env['USE_MYSQL']:
-Source('mysql.cc')
-Source('stats/mysql.cc')
-
TraceFlag('Annotate', State machine annotation debugging)
TraceFlag('AnnotateQ', State machine annotation queue debugging)
TraceFlag('AnnotateVerbose', Dump all state machine annotation details)
diff -r be7f03723412 -r d57afdcf38f5 src/base/mysql.cc
--- a/src/base/mysql.cc Thu May 12 11:19:35 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2004-2005 The Regents of The University of Michigan
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS
