Brandon Potter has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/8381 )
Change subject: scons,ruby: do not generate unnecessary files
......................................................................
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 <[email protected]>
Reviewed-by: Andreas Sandberg <[email protected]>
Maintainer: Jason Lowe-Power <[email protected]>
---
M src/cpu/testers/garnet_synthetic_traffic/SConscript
M src/mem/ruby/SConscript
2 files changed, 6 insertions(+), 3 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
Andreas Sandberg: Looks good to me, approved
diff --git a/src/cpu/testers/garnet_synthetic_traffic/SConscript
b/src/cpu/testers/garnet_synthetic_traffic/SConscript
index f1624b0..8fe4def 100644
--- 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 64e798f..be52c02 100644
--- a/src/mem/ruby/SConscript
+++ b/src/mem/ruby/SConscript
@@ -41,6 +41,9 @@
Import('*')
+if env['PROTOCOL'] == 'None':
+ Return()
+
DebugFlag('ProtocolTrace')
DebugFlag('RubyCache')
DebugFlag('RubyCacheTrace')
@@ -62,9 +65,6 @@
'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
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/8381
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I8db4dd532f60008217a10c88a2e089f85df9d104
Gerrit-Change-Number: 8381
Gerrit-PatchSet: 6
Gerrit-Owner: Brandon Potter <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Brandon Potter <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
