This shouldn't change the nightly regressions at all, since those are built with RUBY=True globally. If you build with RUBY=False, then you didn't get an MI_example build before and you still won't get one now, but at least the builds named ALPHA_SE_<Ruby-protocol> will actually use Ruby and the named protocol rather than being non-Ruby clones of ALPHA_SE. There are some regressions that use these other protocols, so in that case the regression coverage is improved.
Arguably we could add an ALPHA_SE_MI_example build that forces Ruby on but with MI_example, and use that for the Ruby MI_example regressions. Then we would not need to build regressions (or anything else) with an explicit RUBY=True on the scons command line. That would be a step forward in terms of sanity, both in terms of getting rid of the need to specify that option and the need to special-case MI_example in tests/SConscript. However, I know Brad really wants to deprecate MI_example and probably not use it as the default protocol, and it seems like a vague step backward in terms of moving toward a world where Ruby is always on. Steve On Mon, Jun 7, 2010 at 9:29 AM, nathan binkert <[email protected]> wrote: > I think one problem with this commit is that now we don't build an > MI_example. Does this break any existing regressions? > > Nate > > On Mon, Jun 7, 2010 at 4:16 PM, Steve Reinhardt <[email protected]> wrote: >> changeset 2302e04c506e in /z/repo/m5 >> details: http://repo.m5sim.org/m5?cmd=changeset;node=2302e04c506e >> description: >> scons: make RUBY a regular (non-global) sticky var >> and force it to True for builds that imply Ruby protocols >> (else unexpected things happen when testing these builds >> with RUBY=False). >> >> diffstat: >> >> SConstruct | 2 +- >> build_opts/ALPHA_SE_MESI_CMP_directory | 1 + >> build_opts/ALPHA_SE_MOESI_CMP_directory | 1 + >> build_opts/ALPHA_SE_MOESI_CMP_token | 1 + >> build_opts/ALPHA_SE_MOESI_hammer | 1 + >> src/mem/ruby/SConsopts | 3 --- >> 6 files changed, 5 insertions(+), 4 deletions(-) >> >> diffs (64 lines): >> >> diff -r 111f36470db4 -r 2302e04c506e SConstruct >> --- a/SConstruct Sun Jun 06 18:39:10 2010 -0400 >> +++ b/SConstruct Mon Jun 07 12:19:59 2010 -0400 >> @@ -314,7 +314,6 @@ >> ('BATCH_CMD', 'Batch pool submission command name', 'qdo'), >> ('EXTRAS', 'Add Extra directories to the compilation', '', >> PathListAllExist, PathListMakeAbsolute), >> - BoolVariable('RUBY', 'Build with Ruby', False), >> ) >> >> # base help text >> @@ -688,6 +687,7 @@ >> BoolVariable('USE_FENV', 'Use <fenv.h> IEEE mode control', have_fenv), >> BoolVariable('USE_CHECKER', 'Use checker for detailed CPU models', >> False), >> BoolVariable('CP_ANNOTATE', 'Enable critical path annotation >> capability', False), >> + BoolVariable('RUBY', 'Build with Ruby', False), >> ) >> >> nonsticky_vars.AddVariables( >> diff -r 111f36470db4 -r 2302e04c506e build_opts/ALPHA_SE_MESI_CMP_directory >> --- a/build_opts/ALPHA_SE_MESI_CMP_directory Sun Jun 06 18:39:10 2010 >> -0400 >> +++ b/build_opts/ALPHA_SE_MESI_CMP_directory Mon Jun 07 12:19:59 2010 >> -0400 >> @@ -2,3 +2,4 @@ >> SS_COMPATIBLE_FP = 1 >> CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU' >> PROTOCOL = 'MESI_CMP_directory' >> +RUBY = True >> diff -r 111f36470db4 -r 2302e04c506e build_opts/ALPHA_SE_MOESI_CMP_directory >> --- a/build_opts/ALPHA_SE_MOESI_CMP_directory Sun Jun 06 18:39:10 2010 >> -0400 >> +++ b/build_opts/ALPHA_SE_MOESI_CMP_directory Mon Jun 07 12:19:59 2010 >> -0400 >> @@ -2,3 +2,4 @@ >> SS_COMPATIBLE_FP = 1 >> CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU' >> PROTOCOL = 'MOESI_CMP_directory' >> +RUBY = True >> diff -r 111f36470db4 -r 2302e04c506e build_opts/ALPHA_SE_MOESI_CMP_token >> --- a/build_opts/ALPHA_SE_MOESI_CMP_token Sun Jun 06 18:39:10 2010 >> -0400 >> +++ b/build_opts/ALPHA_SE_MOESI_CMP_token Mon Jun 07 12:19:59 2010 >> -0400 >> @@ -2,3 +2,4 @@ >> SS_COMPATIBLE_FP = 1 >> CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU' >> PROTOCOL = 'MOESI_CMP_token' >> +RUBY = True >> diff -r 111f36470db4 -r 2302e04c506e build_opts/ALPHA_SE_MOESI_hammer >> --- a/build_opts/ALPHA_SE_MOESI_hammer Sun Jun 06 18:39:10 2010 -0400 >> +++ b/build_opts/ALPHA_SE_MOESI_hammer Mon Jun 07 12:19:59 2010 -0400 >> @@ -2,3 +2,4 @@ >> SS_COMPATIBLE_FP = 1 >> CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU' >> PROTOCOL = 'MOESI_hammer' >> +RUBY = True >> diff -r 111f36470db4 -r 2302e04c506e src/mem/ruby/SConsopts >> --- a/src/mem/ruby/SConsopts Sun Jun 06 18:39:10 2010 -0400 >> +++ b/src/mem/ruby/SConsopts Mon Jun 07 12:19:59 2010 -0400 >> @@ -30,9 +30,6 @@ >> >> Import('*') >> >> -if not main['RUBY']: >> - Return() >> - >> sticky_vars.AddVariables( >> BoolVariable('NO_VECTOR_BOUNDS_CHECKS', "Don't do bounds checks", True), >> BoolVariable('RUBY_DEBUG', "Add debugging stuff to Ruby", False), >> _______________________________________________ >> m5-dev mailing list >> [email protected] >> http://m5sim.org/mailman/listinfo/m5-dev >> >> > _______________________________________________ > m5-dev mailing list > [email protected] > http://m5sim.org/mailman/listinfo/m5-dev > _______________________________________________ m5-dev mailing list [email protected] http://m5sim.org/mailman/listinfo/m5-dev
