changeset 1ad244a20877 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=1ad244a20877
description:
BuildEnv: Eliminate RUBY as build environment variable
This patch replaces RUBY with PROTOCOL in all the SConscript files as
the environment variable that decides whether or not certain components
of the simulator are compiled.
diffstat:
SConstruct | 5 -----
src/cpu/testers/directedtest/SConscript | 2 +-
src/cpu/testers/rubytest/SConscript | 2 +-
src/mem/protocol/SConscript | 2 +-
src/mem/ruby/SConscript | 2 +-
src/mem/ruby/buffers/SConscript | 2 +-
src/mem/ruby/common/SConscript | 2 +-
src/mem/ruby/eventqueue/SConscript | 2 +-
src/mem/ruby/filters/SConscript | 2 +-
src/mem/ruby/network/SConscript | 2 +-
src/mem/ruby/network/garnet/SConscript | 2 +-
src/mem/ruby/network/garnet/fixed-pipeline/SConscript | 2 +-
src/mem/ruby/network/garnet/flexible-pipeline/SConscript | 2 +-
src/mem/ruby/network/orion/Allocator/SConscript | 2 +-
src/mem/ruby/network/orion/Buffer/SConscript | 2 +-
src/mem/ruby/network/orion/Crossbar/SConscript | 2 +-
src/mem/ruby/network/orion/SConscript | 2 +-
src/mem/ruby/network/simple/SConscript | 2 +-
src/mem/ruby/network/topologies/SConscript | 2 +-
src/mem/ruby/profiler/SConscript | 2 +-
src/mem/ruby/recorder/SConscript | 2 +-
src/mem/ruby/slicc_interface/SConscript | 2 +-
src/mem/ruby/system/SConscript | 2 +-
tests/SConscript | 2 +-
24 files changed, 23 insertions(+), 28 deletions(-)
diffs (291 lines):
diff -r 606cf2660887 -r 1ad244a20877 SConstruct
--- a/SConstruct Sun Aug 07 15:41:10 2011 -0700
+++ b/SConstruct Mon Aug 08 10:50:13 2011 -0500
@@ -979,11 +979,6 @@
if env['USE_SSE2']:
env.Append(CCFLAGS=['-msse2'])
- if env['PROTOCOL'] != 'None':
- env['RUBY'] = True
- else:
- env['RUBY'] = False
-
# The src/SConscript file sets up the build rules in 'env' according
# to the configured variables. It returns a list of environments,
# one for each variant build (debug, opt, etc.)
diff -r 606cf2660887 -r 1ad244a20877 src/cpu/testers/directedtest/SConscript
--- a/src/cpu/testers/directedtest/SConscript Sun Aug 07 15:41:10 2011 -0700
+++ b/src/cpu/testers/directedtest/SConscript Mon Aug 08 10:50:13 2011 -0500
@@ -35,7 +35,7 @@
# When this dependency is removed, the ruby tester should be compiled
# independently from Ruby
#
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
SimObject('RubyDirectedTester.py')
diff -r 606cf2660887 -r 1ad244a20877 src/cpu/testers/rubytest/SConscript
--- a/src/cpu/testers/rubytest/SConscript Sun Aug 07 15:41:10 2011 -0700
+++ b/src/cpu/testers/rubytest/SConscript Mon Aug 08 10:50:13 2011 -0500
@@ -35,7 +35,7 @@
# When this dependency is removed, the ruby tester should be compiled
# independently from Ruby
#
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
SimObject('RubyTester.py')
diff -r 606cf2660887 -r 1ad244a20877 src/mem/protocol/SConscript
--- a/src/mem/protocol/SConscript Sun Aug 07 15:41:10 2011 -0700
+++ b/src/mem/protocol/SConscript Mon Aug 08 10:50:13 2011 -0500
@@ -38,7 +38,7 @@
Import('*')
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
protocol_dir = Dir('.')
diff -r 606cf2660887 -r 1ad244a20877 src/mem/ruby/SConscript
--- a/src/mem/ruby/SConscript Sun Aug 07 15:41:10 2011 -0700
+++ b/src/mem/ruby/SConscript Mon Aug 08 10:50:13 2011 -0500
@@ -40,7 +40,7 @@
if env['TARGET_ISA'] == 'no':
Return()
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
def do_embed_text(target, source, env):
diff -r 606cf2660887 -r 1ad244a20877 src/mem/ruby/buffers/SConscript
--- a/src/mem/ruby/buffers/SConscript Sun Aug 07 15:41:10 2011 -0700
+++ b/src/mem/ruby/buffers/SConscript Mon Aug 08 10:50:13 2011 -0500
@@ -30,7 +30,7 @@
Import('*')
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
Source('MessageBuffer.cc')
diff -r 606cf2660887 -r 1ad244a20877 src/mem/ruby/common/SConscript
--- a/src/mem/ruby/common/SConscript Sun Aug 07 15:41:10 2011 -0700
+++ b/src/mem/ruby/common/SConscript Mon Aug 08 10:50:13 2011 -0500
@@ -30,7 +30,7 @@
Import('*')
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
Source('Address.cc')
diff -r 606cf2660887 -r 1ad244a20877 src/mem/ruby/eventqueue/SConscript
--- a/src/mem/ruby/eventqueue/SConscript Sun Aug 07 15:41:10 2011 -0700
+++ b/src/mem/ruby/eventqueue/SConscript Mon Aug 08 10:50:13 2011 -0500
@@ -30,7 +30,7 @@
Import('*')
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
Source('RubyEventQueue.cc')
diff -r 606cf2660887 -r 1ad244a20877 src/mem/ruby/filters/SConscript
--- a/src/mem/ruby/filters/SConscript Sun Aug 07 15:41:10 2011 -0700
+++ b/src/mem/ruby/filters/SConscript Mon Aug 08 10:50:13 2011 -0500
@@ -30,7 +30,7 @@
Import('*')
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
Source('BlockBloomFilter.cc')
diff -r 606cf2660887 -r 1ad244a20877 src/mem/ruby/network/SConscript
--- a/src/mem/ruby/network/SConscript Sun Aug 07 15:41:10 2011 -0700
+++ b/src/mem/ruby/network/SConscript Mon Aug 08 10:50:13 2011 -0500
@@ -30,7 +30,7 @@
Import('*')
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
SimObject('BasicLink.py')
diff -r 606cf2660887 -r 1ad244a20877 src/mem/ruby/network/garnet/SConscript
--- a/src/mem/ruby/network/garnet/SConscript Sun Aug 07 15:41:10 2011 -0700
+++ b/src/mem/ruby/network/garnet/SConscript Mon Aug 08 10:50:13 2011 -0500
@@ -30,7 +30,7 @@
Import('*')
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
SimObject('BaseGarnetNetwork.py')
diff -r 606cf2660887 -r 1ad244a20877
src/mem/ruby/network/garnet/fixed-pipeline/SConscript
--- a/src/mem/ruby/network/garnet/fixed-pipeline/SConscript Sun Aug 07
15:41:10 2011 -0700
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/SConscript Mon Aug 08
10:50:13 2011 -0500
@@ -30,7 +30,7 @@
Import('*')
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
SimObject('GarnetLink_d.py')
diff -r 606cf2660887 -r 1ad244a20877
src/mem/ruby/network/garnet/flexible-pipeline/SConscript
--- a/src/mem/ruby/network/garnet/flexible-pipeline/SConscript Sun Aug 07
15:41:10 2011 -0700
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/SConscript Mon Aug 08
10:50:13 2011 -0500
@@ -30,7 +30,7 @@
Import('*')
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
SimObject('GarnetLink.py')
diff -r 606cf2660887 -r 1ad244a20877
src/mem/ruby/network/orion/Allocator/SConscript
--- a/src/mem/ruby/network/orion/Allocator/SConscript Sun Aug 07 15:41:10
2011 -0700
+++ b/src/mem/ruby/network/orion/Allocator/SConscript Mon Aug 08 10:50:13
2011 -0500
@@ -28,7 +28,7 @@
Import('*')
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
Source('Arbiter.cc')
diff -r 606cf2660887 -r 1ad244a20877
src/mem/ruby/network/orion/Buffer/SConscript
--- a/src/mem/ruby/network/orion/Buffer/SConscript Sun Aug 07 15:41:10
2011 -0700
+++ b/src/mem/ruby/network/orion/Buffer/SConscript Mon Aug 08 10:50:13
2011 -0500
@@ -28,7 +28,7 @@
Import('*')
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
Source('AmpUnit.cc')
diff -r 606cf2660887 -r 1ad244a20877
src/mem/ruby/network/orion/Crossbar/SConscript
--- a/src/mem/ruby/network/orion/Crossbar/SConscript Sun Aug 07 15:41:10
2011 -0700
+++ b/src/mem/ruby/network/orion/Crossbar/SConscript Mon Aug 08 10:50:13
2011 -0500
@@ -28,7 +28,7 @@
Import('*')
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
Source('Crossbar.cc')
diff -r 606cf2660887 -r 1ad244a20877 src/mem/ruby/network/orion/SConscript
--- a/src/mem/ruby/network/orion/SConscript Sun Aug 07 15:41:10 2011 -0700
+++ b/src/mem/ruby/network/orion/SConscript Mon Aug 08 10:50:13 2011 -0500
@@ -27,7 +27,7 @@
Import('*')
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
Source('NetworkPower.cc')
diff -r 606cf2660887 -r 1ad244a20877 src/mem/ruby/network/simple/SConscript
--- a/src/mem/ruby/network/simple/SConscript Sun Aug 07 15:41:10 2011 -0700
+++ b/src/mem/ruby/network/simple/SConscript Mon Aug 08 10:50:13 2011 -0500
@@ -30,7 +30,7 @@
Import('*')
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
SimObject('SimpleLink.py')
diff -r 606cf2660887 -r 1ad244a20877 src/mem/ruby/network/topologies/SConscript
--- a/src/mem/ruby/network/topologies/SConscript Sun Aug 07 15:41:10
2011 -0700
+++ b/src/mem/ruby/network/topologies/SConscript Mon Aug 08 10:50:13
2011 -0500
@@ -30,7 +30,7 @@
Import('*')
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
PySource('', 'Crossbar.py')
diff -r 606cf2660887 -r 1ad244a20877 src/mem/ruby/profiler/SConscript
--- a/src/mem/ruby/profiler/SConscript Sun Aug 07 15:41:10 2011 -0700
+++ b/src/mem/ruby/profiler/SConscript Mon Aug 08 10:50:13 2011 -0500
@@ -30,7 +30,7 @@
Import('*')
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
SimObject('Profiler.py')
diff -r 606cf2660887 -r 1ad244a20877 src/mem/ruby/recorder/SConscript
--- a/src/mem/ruby/recorder/SConscript Sun Aug 07 15:41:10 2011 -0700
+++ b/src/mem/ruby/recorder/SConscript Mon Aug 08 10:50:13 2011 -0500
@@ -30,7 +30,7 @@
Import('*')
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
SimObject('Tracer.py')
diff -r 606cf2660887 -r 1ad244a20877 src/mem/ruby/slicc_interface/SConscript
--- a/src/mem/ruby/slicc_interface/SConscript Sun Aug 07 15:41:10 2011 -0700
+++ b/src/mem/ruby/slicc_interface/SConscript Mon Aug 08 10:50:13 2011 -0500
@@ -30,7 +30,7 @@
Import('*')
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
SimObject('Controller.py')
diff -r 606cf2660887 -r 1ad244a20877 src/mem/ruby/system/SConscript
--- a/src/mem/ruby/system/SConscript Sun Aug 07 15:41:10 2011 -0700
+++ b/src/mem/ruby/system/SConscript Mon Aug 08 10:50:13 2011 -0500
@@ -30,7 +30,7 @@
Import('*')
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
Return()
SimObject('Cache.py')
diff -r 606cf2660887 -r 1ad244a20877 tests/SConscript
--- a/tests/SConscript Sun Aug 07 15:41:10 2011 -0700
+++ b/tests/SConscript Mon Aug 08 10:50:13 2011 -0500
@@ -288,7 +288,7 @@
'simple-atomic-mp', 'simple-timing-mp', 'o3-timing-mp',
'inorder-timing', 'rubytest']
-if env['RUBY']:
+if env['PROTOCOL'] != 'None':
if env['PROTOCOL'] == 'MI_example':
configs += [c + "-ruby" for c in configs]
else:
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
