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.

diff --git a/SConstruct b/SConstruct
index 5699cda73e21d23a43d94aad112467d2e9435fed..06e1c3f16392598617dd4c87b7ab622c800e9ff8 100755 (executable)
--- a/SConstruct
+++ b/SConstruct
@@ -979,11 +979,6 @@ for variant_path in variant_paths:
     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 --git a/src/cpu/testers/directedtest/SConscript b/src/cpu/testers/directedtest/SConscript
index a321a404c6793ae5d31fa8a0c50737c4a66f0851..01e778fd53efbef3c7e069955ddc89e75b8c1708 100644 (file)
--- a/src/cpu/testers/directedtest/SConscript
+++ b/src/cpu/testers/directedtest/SConscript
@@ -35,7 +35,7 @@ Import('*')
 # 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 --git a/src/cpu/testers/rubytest/SConscript b/src/cpu/testers/rubytest/SConscript
index 1b65932e7a2f73d02b3ff62085fb994539c75286..70a4f480da88cb6353bb9934dcc75fa350bce44b 100644 (file)
--- a/src/cpu/testers/rubytest/SConscript
+++ b/src/cpu/testers/rubytest/SConscript
@@ -35,7 +35,7 @@ Import('*')
 # 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 --git a/src/mem/protocol/SConscript b/src/mem/protocol/SConscript
index a4e2a5264629770aa4a5903f1cc0b56290c25383..e7efe8b1c5ff96a3f099fa432a8ec79640e263e5 100644 (file)
--- a/src/mem/protocol/SConscript
+++ b/src/mem/protocol/SConscript
@@ -38,7 +38,7 @@ from SCons.Scanner import Classic
 
 Import('*')
 
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
     Return()
 
 protocol_dir = Dir('.')

diff --git a/src/mem/ruby/SConscript b/src/mem/ruby/SConscript
index d52383d09b7785ce0b9f372705c9c63ebe4fd742..64dd83bb07ba7792224d5b08b9c63fb905478659 100644 (file)
--- a/src/mem/ruby/SConscript
+++ b/src/mem/ruby/SConscript
@@ -40,7 +40,7 @@ Import('*')
 if env['TARGET_ISA'] == 'no':
     Return()
 
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
     Return()
 
 def do_embed_text(target, source, env):

diff --git a/src/mem/ruby/buffers/SConscript b/src/mem/ruby/buffers/SConscript
index 2608d5e2344d850a52c0cf26d7d7a22c6cd9d296..ff0b5e9bcef2963a24e7bf768ec5acfa975ed1e6 100644 (file)
--- a/src/mem/ruby/buffers/SConscript
+++ b/src/mem/ruby/buffers/SConscript
@@ -30,7 +30,7 @@
 
 Import('*')
 
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
     Return()
 
 Source('MessageBuffer.cc')

diff --git a/src/mem/ruby/common/SConscript b/src/mem/ruby/common/SConscript
index 4184b4b5fff2d870a78eed81455059dc49eab296..8c2442c0079c4c1bf1f9957dd8036b464b9103dc 100644 (file)
--- a/src/mem/ruby/common/SConscript
+++ b/src/mem/ruby/common/SConscript
@@ -30,7 +30,7 @@
 
 Import('*')
 
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
     Return()
 
 Source('Address.cc')

diff --git a/src/mem/ruby/eventqueue/SConscript b/src/mem/ruby/eventqueue/SConscript
index 0312df4e4b3f22b9e02cb06a4b8a3fd01f4f561d..a74d53139438bd447df3f10364c7696515e38fc9 100644 (file)
--- a/src/mem/ruby/eventqueue/SConscript
+++ b/src/mem/ruby/eventqueue/SConscript
@@ -30,7 +30,7 @@
 
 Import('*')
 
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
     Return()
 
 Source('RubyEventQueue.cc')

diff --git a/src/mem/ruby/filters/SConscript b/src/mem/ruby/filters/SConscript
index ac03aaf36dec2b01474b3bda051092c0831bafc5..adfe214c007421e200275c87a5e323fbd18ac2b8 100644 (file)
--- a/src/mem/ruby/filters/SConscript
+++ b/src/mem/ruby/filters/SConscript
@@ -30,7 +30,7 @@
 
 Import('*')
 
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
     Return()
 
 Source('BlockBloomFilter.cc')

diff --git a/src/mem/ruby/network/SConscript b/src/mem/ruby/network/SConscript
index 3c3bcea064c68db0501d664a580e3f8d317397ae..c4abba716553e7edcf18b88516abdd5b748c8cf0 100644 (file)
--- a/src/mem/ruby/network/SConscript
+++ b/src/mem/ruby/network/SConscript
@@ -30,7 +30,7 @@
 
 Import('*')
 
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
     Return()
 
 SimObject('BasicLink.py')

diff --git a/src/mem/ruby/network/garnet/SConscript b/src/mem/ruby/network/garnet/SConscript
index 14540426f941f6de56cce78a9ea72c323726083c..516bdb5645b0d6f66c813e770823260141d349c6 100644 (file)
--- a/src/mem/ruby/network/garnet/SConscript
+++ b/src/mem/ruby/network/garnet/SConscript
@@ -30,7 +30,7 @@
 
 Import('*')
 
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
     Return()
 
 SimObject('BaseGarnetNetwork.py')

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/SConscript b/src/mem/ruby/network/garnet/fixed-pipeline/SConscript
index ae3b964de52cf9f9a45985c5603a0debf5dc4f10..0010f3d1ae5f656e01eb68f13089497344c66702 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/SConscript
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/SConscript
@@ -30,7 +30,7 @@
 
 Import('*')
 
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
     Return()
 
 SimObject('GarnetLink_d.py')

diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/SConscript b/src/mem/ruby/network/garnet/flexible-pipeline/SConscript
index 03f4e3fdb3becba164580c3ce074cc23662294b8..0e97f16986c3f53ac70636c237a910d0b36d0d64 100644 (file)
--- a/src/mem/ruby/network/garnet/flexible-pipeline/SConscript
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/SConscript
@@ -30,7 +30,7 @@
 
 Import('*')
 
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
     Return()
 
 SimObject('GarnetLink.py')

diff --git a/src/mem/ruby/network/orion/Allocator/SConscript b/src/mem/ruby/network/orion/Allocator/SConscript
index eede26a79df545139a8124f820285dea06d99c86..e85844bac7df9fee8ce97e4925cc6d3a331c2ebc 100644 (file)
--- a/src/mem/ruby/network/orion/Allocator/SConscript
+++ b/src/mem/ruby/network/orion/Allocator/SConscript
@@ -28,7 +28,7 @@
 
 Import('*')
 
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
     Return()
 
 Source('Arbiter.cc')

diff --git a/src/mem/ruby/network/orion/Buffer/SConscript b/src/mem/ruby/network/orion/Buffer/SConscript
index 3db8c4a012ce1442af0f99cc5863d3441780610a..20e528c09568cf458544d4d5cd10fa205aec02af 100644 (file)
--- a/src/mem/ruby/network/orion/Buffer/SConscript
+++ b/src/mem/ruby/network/orion/Buffer/SConscript
@@ -28,7 +28,7 @@
 
 Import('*')
 
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
     Return()
 
 Source('AmpUnit.cc')

diff --git a/src/mem/ruby/network/orion/Crossbar/SConscript b/src/mem/ruby/network/orion/Crossbar/SConscript
index 76774da1b665dbaa358366d9b13bec70d91f8920..71004697826787cad8cbb65f442b1ef5f9cb464a 100644 (file)
--- a/src/mem/ruby/network/orion/Crossbar/SConscript
+++ b/src/mem/ruby/network/orion/Crossbar/SConscript
@@ -28,7 +28,7 @@
 
 Import('*')
 
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
     Return()
 
 Source('Crossbar.cc')

diff --git a/src/mem/ruby/network/orion/SConscript b/src/mem/ruby/network/orion/SConscript
index 8a6383bfb7a75a78fbf9877334a7da1f1872b01c..4a0e8fa9611caa99fc8e533c318a4e2b04ea6e24 100644 (file)
--- a/src/mem/ruby/network/orion/SConscript
+++ b/src/mem/ruby/network/orion/SConscript
@@ -27,7 +27,7 @@
 
 Import('*')
 
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
     Return()
 
 Source('NetworkPower.cc')

diff --git a/src/mem/ruby/network/simple/SConscript b/src/mem/ruby/network/simple/SConscript
index 6bd836784a93127bcd80b250afb1b255efff70f2..14d354b6505addcf30603b76d513040132d86f56 100644 (file)
--- a/src/mem/ruby/network/simple/SConscript
+++ b/src/mem/ruby/network/simple/SConscript
@@ -30,7 +30,7 @@
 
 Import('*')
 
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
     Return()
 
 SimObject('SimpleLink.py')

diff --git a/src/mem/ruby/network/topologies/SConscript b/src/mem/ruby/network/topologies/SConscript
index 0a2ba1b462a61d6acc23896cca88c0442fd473f3..a3c41a6d333fc6bab221b2cf273e7b6b1100b8fa 100644 (file)
--- a/src/mem/ruby/network/topologies/SConscript
+++ b/src/mem/ruby/network/topologies/SConscript
@@ -30,7 +30,7 @@
 
 Import('*')
 
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
     Return()
 
 PySource('', 'Crossbar.py')

diff --git a/src/mem/ruby/profiler/SConscript b/src/mem/ruby/profiler/SConscript
index 121a360c925fce7ac46057050886898971ca2a66..70082ad03b1eff51c2117d9c44c557b44e429ca9 100644 (file)
--- a/src/mem/ruby/profiler/SConscript
+++ b/src/mem/ruby/profiler/SConscript
@@ -30,7 +30,7 @@
 
 Import('*')
 
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
     Return()
 
 SimObject('Profiler.py')

diff --git a/src/mem/ruby/recorder/SConscript b/src/mem/ruby/recorder/SConscript
index ef4f4ef05e07c70fd733ac39c69d91ff151e7684..035f896a49a26e305517074c11998ecbafaa5007 100644 (file)
--- a/src/mem/ruby/recorder/SConscript
+++ b/src/mem/ruby/recorder/SConscript
@@ -30,7 +30,7 @@
 
 Import('*')
 
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
     Return()
 
 SimObject('Tracer.py')

diff --git a/src/mem/ruby/slicc_interface/SConscript b/src/mem/ruby/slicc_interface/SConscript
index 0fbdc1789916bf6e1eb3490c17d1377e365dc6eb..b51747b64a5270c1db267ad477f5e74ff0290f40 100644 (file)
--- a/src/mem/ruby/slicc_interface/SConscript
+++ b/src/mem/ruby/slicc_interface/SConscript
@@ -30,7 +30,7 @@
 
 Import('*')
 
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
     Return()
 
 SimObject('Controller.py')

diff --git a/src/mem/ruby/system/SConscript b/src/mem/ruby/system/SConscript
index f1e7c425c281179b11110829cc6173221e2a9402..4cf0b31adc9cfe353cd6ea571f004feb75f26789 100644 (file)
--- a/src/mem/ruby/system/SConscript
+++ b/src/mem/ruby/system/SConscript
@@ -30,7 +30,7 @@
 
 Import('*')
 
-if not env['RUBY']:
+if env['PROTOCOL'] == 'None':
     Return()
 
 SimObject('Cache.py')

diff --git a/tests/SConscript b/tests/SConscript
index 58a9596699099f943923f54168372f812385f871..58c21e0f3afcce8b1fd1852c405fc8477f92dd6d 100644 (file)
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -288,7 +288,7 @@ else:
                 '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: