scons,ruby: do not generate unnecessary files

Do not generate garnet tester file or Ruby debug headers without a Ruby
protocol (i.e. PROTOCOL=None). It makes no sense to include these files
into the build when there will be no protocol to utilize them.

Change-Id: I8db4dd532f60008217a10c88a2e089f85df9d104
Reviewed-on: https://gem5-review.googlesource.com/8381
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>

diff --git a/src/cpu/testers/garnet_synthetic_traffic/SConscript b/src/cpu/testers/garnet_synthetic_traffic/SConscript
index f1624b05e2ae2ce53297e49a27fc9ad918815fba..8fe4def36ae3c7231be0f8932cdb068acc8bf1e7 100644 (file)
--- a/src/cpu/testers/garnet_synthetic_traffic/SConscript
+++ b/src/cpu/testers/garnet_synthetic_traffic/SConscript
@@ -30,6 +30,9 @@
 
 Import('*')
 
+if env['PROTOCOL'] == 'None':
+    Return()
+
 SimObject('GarnetSyntheticTraffic.py')
 
 Source('GarnetSyntheticTraffic.cc')

diff --git a/src/mem/ruby/SConscript b/src/mem/ruby/SConscript
index 64e798fd51aebb3b215dacaa729639c4e8573311..be52c02d04ef027048aa3cdd3702ca3418ffabc5 100644 (file)
--- a/src/mem/ruby/SConscript
+++ b/src/mem/ruby/SConscript
@@ -41,6 +41,9 @@ from gem5_scons import Transform
 
 Import('*')
 
+if env['PROTOCOL'] == 'None':
+    Return()
+
 DebugFlag('ProtocolTrace')
 DebugFlag('RubyCache')
 DebugFlag('RubyCacheTrace')
@@ -62,9 +65,6 @@ CompoundFlag('Ruby', [ 'RubyQueue', 'RubyNetwork', 'RubyTester',
     'RubyDma', 'RubyPort', 'RubySequencer', 'RubyCacheTrace',
     'RubyPrefetcher'])
 
-if env['PROTOCOL'] == 'None':
-    Return()
-
 def do_embed_text(target, source, env):
     """convert a text file into a file that can be embedded in C
     using an #include statement, that defines a \"const char *\" pointing