changeset ba6fe02228db in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=ba6fe02228db
description:
ruby: add RUBY sticky option that must be set to add ruby to the build
Default is false
diffstat:
22 files changed, 69 insertions(+), 6 deletions(-)
SConstruct | 5 +++--
src/mem/SConscript | 8 ++++++--
src/mem/gems_common/SConscript | 3 +++
src/mem/gems_common/ioutil/SConscript | 3 +++
src/mem/protocol/SConscript | 3 +++
src/mem/ruby/SConscript | 3 +++
src/mem/ruby/SConsopts | 3 +++
src/mem/ruby/buffers/SConscript | 3 +++
src/mem/ruby/common/SConscript | 3 +++
src/mem/ruby/config/SConscript | 3 +++
src/mem/ruby/eventqueue/SConscript | 3 +++
src/mem/ruby/network/garnet-fixed-pipeline/SConscript | 3 +++
src/mem/ruby/network/garnet-flexible-pipeline/SConscript | 3 +++
src/mem/ruby/network/orion/SConscript | 3 +++
src/mem/ruby/network/simple/SConscript | 3 +++
src/mem/ruby/profiler/SConscript | 3 +++
src/mem/ruby/recorder/SConscript | 3 +++
src/mem/ruby/slicc_interface/SConscript | 3 +++
src/mem/ruby/system/SConscript | 3 +++
src/mem/ruby/tester/SConscript | 3 +++
src/mem/slicc/SConscript | 3 +++
tests/SConscript | 5 +++--
diffs (295 lines):
diff -r 8b240f106634 -r ba6fe02228db SConstruct
--- a/SConstruct Mon May 11 10:38:46 2009 -0700
+++ b/SConstruct Mon May 11 10:38:46 2009 -0700
@@ -345,8 +345,9 @@
('BATCH', 'Use batch pool for build and tests', False),
('BATCH_CMD', 'Batch pool submission command name', 'qdo'),
('EXTRAS', 'Add Extra directories to the compilation', '',
- PathListAllExist, PathListMakeAbsolute)
- )
+ PathListAllExist, PathListMakeAbsolute),
+ BoolVariable('RUBY', 'Build with Ruby', False),
+ )
# base help text
help_text = '''
diff -r 8b240f106634 -r ba6fe02228db src/mem/SConscript
--- a/src/mem/SConscript Mon May 11 10:38:46 2009 -0700
+++ b/src/mem/SConscript Mon May 11 10:38:46 2009 -0700
@@ -34,7 +34,9 @@
SimObject('Bus.py')
SimObject('MemObject.py')
SimObject('PhysicalMemory.py')
-SimObject('RubyMemory.py')
+
+if env['RUBY']:
+ SimObject('RubyMemory.py')
Source('bridge.cc')
Source('bus.cc')
@@ -45,7 +47,9 @@
Source('port.cc')
Source('tport.cc')
Source('mport.cc')
-Source('rubymem.cc')
+
+if env['RUBY']:
+ Source('rubymem.cc')
if env['FULL_SYSTEM']:
Source('vport.cc')
diff -r 8b240f106634 -r ba6fe02228db src/mem/gems_common/SConscript
--- a/src/mem/gems_common/SConscript Mon May 11 10:38:46 2009 -0700
+++ b/src/mem/gems_common/SConscript Mon May 11 10:38:46 2009 -0700
@@ -30,6 +30,9 @@
Import('*')
+if not env['RUBY']:
+ Return()
+
#benv['LEXCOM'] = "$LEX $LEXFLAGS -o$TARGET $SOURCES"
benv = env.Clone()
benv.Append(YACCFLAGS=["-pat"])
diff -r 8b240f106634 -r ba6fe02228db src/mem/gems_common/ioutil/SConscript
--- a/src/mem/gems_common/ioutil/SConscript Mon May 11 10:38:46 2009 -0700
+++ b/src/mem/gems_common/ioutil/SConscript Mon May 11 10:38:46 2009 -0700
@@ -30,5 +30,8 @@
Import('*')
+if not env['RUBY']:
+ Return()
+
Source('confio.cc')
Source('initvar.cc')
diff -r 8b240f106634 -r ba6fe02228db src/mem/protocol/SConscript
--- a/src/mem/protocol/SConscript Mon May 11 10:38:46 2009 -0700
+++ b/src/mem/protocol/SConscript Mon May 11 10:38:46 2009 -0700
@@ -40,6 +40,9 @@
Import('*')
+if not env['RUBY']:
+ Return()
+
slicc_dir = Dir('../slicc')
protocol_dir = Dir('.')
html_dir = Dir('html')
diff -r 8b240f106634 -r ba6fe02228db src/mem/ruby/SConscript
--- a/src/mem/ruby/SConscript Mon May 11 10:38:46 2009 -0700
+++ b/src/mem/ruby/SConscript Mon May 11 10:38:46 2009 -0700
@@ -37,6 +37,9 @@
Import('*')
+if not env['RUBY']:
+ Return()
+
Source('init.cc')
def do_embed_text(target, source, env):
diff -r 8b240f106634 -r ba6fe02228db src/mem/ruby/SConsopts
--- a/src/mem/ruby/SConsopts Mon May 11 10:38:46 2009 -0700
+++ b/src/mem/ruby/SConsopts Mon May 11 10:38:46 2009 -0700
@@ -30,6 +30,9 @@
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))
diff -r 8b240f106634 -r ba6fe02228db src/mem/ruby/buffers/SConscript
--- a/src/mem/ruby/buffers/SConscript Mon May 11 10:38:46 2009 -0700
+++ b/src/mem/ruby/buffers/SConscript Mon May 11 10:38:46 2009 -0700
@@ -30,5 +30,8 @@
Import('*')
+if not env['RUBY']:
+ Return()
+
Source('MessageBuffer.cc')
Source('MessageBufferNode.cc')
diff -r 8b240f106634 -r ba6fe02228db src/mem/ruby/common/SConscript
--- a/src/mem/ruby/common/SConscript Mon May 11 10:38:46 2009 -0700
+++ b/src/mem/ruby/common/SConscript Mon May 11 10:38:46 2009 -0700
@@ -30,6 +30,9 @@
Import('*')
+if not env['RUBY']:
+ Return()
+
Source('Address.cc')
Source('DataBlock.cc')
Source('Debug.cc')
diff -r 8b240f106634 -r ba6fe02228db src/mem/ruby/config/SConscript
--- a/src/mem/ruby/config/SConscript Mon May 11 10:38:46 2009 -0700
+++ b/src/mem/ruby/config/SConscript Mon May 11 10:38:46 2009 -0700
@@ -30,4 +30,7 @@
Import('*')
+if not env['RUBY']:
+ Return()
+
Source('RubyConfig.cc')
diff -r 8b240f106634 -r ba6fe02228db src/mem/ruby/eventqueue/SConscript
--- a/src/mem/ruby/eventqueue/SConscript Mon May 11 10:38:46 2009 -0700
+++ b/src/mem/ruby/eventqueue/SConscript Mon May 11 10:38:46 2009 -0700
@@ -30,5 +30,8 @@
Import('*')
+if not env['RUBY']:
+ Return()
+
Source('RubyEventQueue.cc')
Source('RubyEventQueueNode.cc')
diff -r 8b240f106634 -r ba6fe02228db
src/mem/ruby/network/garnet-fixed-pipeline/SConscript
--- a/src/mem/ruby/network/garnet-fixed-pipeline/SConscript Mon May 11
10:38:46 2009 -0700
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/SConscript Mon May 11
10:38:46 2009 -0700
@@ -30,6 +30,9 @@
Import('*')
+if not env['RUBY']:
+ Return()
+
Source('GarnetNetwork_d.cc')
Source('InputUnit_d.cc')
Source('NetworkInterface_d.cc')
diff -r 8b240f106634 -r ba6fe02228db
src/mem/ruby/network/garnet-flexible-pipeline/SConscript
--- a/src/mem/ruby/network/garnet-flexible-pipeline/SConscript Mon May 11
10:38:46 2009 -0700
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/SConscript Mon May 11
10:38:46 2009 -0700
@@ -30,6 +30,9 @@
Import('*')
+if not env['RUBY']:
+ Return()
+
Source('GarnetNetwork.cc')
Source('InVcState.cc')
Source('NetworkInterface.cc')
diff -r 8b240f106634 -r ba6fe02228db src/mem/ruby/network/orion/SConscript
--- a/src/mem/ruby/network/orion/SConscript Mon May 11 10:38:46 2009 -0700
+++ b/src/mem/ruby/network/orion/SConscript Mon May 11 10:38:46 2009 -0700
@@ -30,6 +30,9 @@
Import('*')
+if not env['RUBY']:
+ Return()
+
Source('NetworkPower.cc', Werror=False)
Source('power_arbiter.cc')
Source('power_array.cc', Werror=False)
diff -r 8b240f106634 -r ba6fe02228db src/mem/ruby/network/simple/SConscript
--- a/src/mem/ruby/network/simple/SConscript Mon May 11 10:38:46 2009 -0700
+++ b/src/mem/ruby/network/simple/SConscript Mon May 11 10:38:46 2009 -0700
@@ -30,6 +30,9 @@
Import('*')
+if not env['RUBY']:
+ Return()
+
Source('PerfectSwitch.cc')
Source('SimpleNetwork.cc')
Source('Switch.cc')
diff -r 8b240f106634 -r ba6fe02228db src/mem/ruby/profiler/SConscript
--- a/src/mem/ruby/profiler/SConscript Mon May 11 10:38:46 2009 -0700
+++ b/src/mem/ruby/profiler/SConscript Mon May 11 10:38:46 2009 -0700
@@ -30,6 +30,9 @@
Import('*')
+if not env['RUBY']:
+ Return()
+
Source('AccessTraceForAddress.cc')
Source('AddressProfiler.cc')
Source('CacheProfiler.cc')
diff -r 8b240f106634 -r ba6fe02228db src/mem/ruby/recorder/SConscript
--- a/src/mem/ruby/recorder/SConscript Mon May 11 10:38:46 2009 -0700
+++ b/src/mem/ruby/recorder/SConscript Mon May 11 10:38:46 2009 -0700
@@ -30,4 +30,7 @@
Import('*')
+if not env['RUBY']:
+ Return()
+
Source('TraceRecord.cc', Werror=False)
diff -r 8b240f106634 -r ba6fe02228db src/mem/ruby/slicc_interface/SConscript
--- a/src/mem/ruby/slicc_interface/SConscript Mon May 11 10:38:46 2009 -0700
+++ b/src/mem/ruby/slicc_interface/SConscript Mon May 11 10:38:46 2009 -0700
@@ -30,6 +30,9 @@
Import('*')
+if not env['RUBY']:
+ Return()
+
Source('AbstractCacheEntry.cc')
Source('AbstractChip.cc')
Source('RubySlicc_Profiler_interface.cc')
diff -r 8b240f106634 -r ba6fe02228db src/mem/ruby/system/SConscript
--- a/src/mem/ruby/system/SConscript Mon May 11 10:38:46 2009 -0700
+++ b/src/mem/ruby/system/SConscript Mon May 11 10:38:46 2009 -0700
@@ -30,6 +30,9 @@
Import('*')
+if not env['RUBY']:
+ Return()
+
Source('DirectoryMemory.cc')
Source('MemoryControl.cc')
Source('MemoryNode.cc')
diff -r 8b240f106634 -r ba6fe02228db src/mem/ruby/tester/SConscript
--- a/src/mem/ruby/tester/SConscript Mon May 11 10:38:46 2009 -0700
+++ b/src/mem/ruby/tester/SConscript Mon May 11 10:38:46 2009 -0700
@@ -30,6 +30,9 @@
Import('*')
+if not env['RUBY']:
+ Return()
+
Source('Check.cc')
Source('CheckTable.cc')
Source('DetermGETXGenerator.cc')
diff -r 8b240f106634 -r ba6fe02228db src/mem/slicc/SConscript
--- a/src/mem/slicc/SConscript Mon May 11 10:38:46 2009 -0700
+++ b/src/mem/slicc/SConscript Mon May 11 10:38:46 2009 -0700
@@ -40,6 +40,9 @@
Import('*')
+if not env['RUBY']:
+ Return()
+
common_dir = Dir('../gems_common')
#
diff -r 8b240f106634 -r ba6fe02228db tests/SConscript
--- a/tests/SConscript Mon May 11 10:38:46 2009 -0700
+++ b/tests/SConscript Mon May 11 10:38:46 2009 -0700
@@ -265,8 +265,9 @@
configs += ['simple-atomic', 'simple-timing', 'o3-timing', 'memtest',
'simple-atomic-mp', 'simple-timing-mp', 'o3-timing-mp']
-# Hack for Ruby
-configs += [c + '-ruby' for c in configs]
+if env['RUBY']:
+ # Hack for Ruby
+ configs += [c + '-ruby' for c in configs]
cwd = os.getcwd()
os.chdir(str(Dir('.').srcdir))
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
