changeset 40b142645016 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=40b142645016
description:
scons: update SCons files for changes in ruby.
diffstat:
13 files changed, 144 insertions(+), 29 deletions(-)
src/mem/gems_common/ioutil/SConscript | 1
src/mem/protocol/SConscript | 10 +++++--
src/mem/protocol/SConsopts | 2 -
src/mem/ruby/SConscript | 17 ++++++------
src/mem/ruby/filters/SConscript | 43 +++++++++++++++++++++++++++++++
src/mem/ruby/network/SConscript | 36 +++++++++++++++++++++++++
src/mem/ruby/network/simple/SConscript | 1
src/mem/ruby/recorder/SConscript | 2 +
src/mem/ruby/slicc_interface/SConscript | 1
src/mem/ruby/storebuffer/SConscript | 37 ++++++++++++++++++++++++++
src/mem/ruby/system/SConscript | 6 +---
src/mem/ruby/tester/SConscript | 16 +++--------
src/mem/slicc/SConscript | 1
diffs (truncated from 310 to 300 lines):
diff -r ce086eca1ede -r 40b142645016 src/mem/gems_common/ioutil/SConscript
--- a/src/mem/gems_common/ioutil/SConscript Mon Jul 06 15:49:47 2009 -0700
+++ b/src/mem/gems_common/ioutil/SConscript Mon Jul 06 15:49:47 2009 -0700
@@ -34,4 +34,3 @@
Return()
Source('confio.cc')
-Source('initvar.cc')
diff -r ce086eca1ede -r 40b142645016 src/mem/protocol/SConscript
--- a/src/mem/protocol/SConscript Mon Jul 06 15:49:47 2009 -0700
+++ b/src/mem/protocol/SConscript Mon Jul 06 15:49:47 2009 -0700
@@ -50,7 +50,7 @@
#
# Use SLICC
#
-def slicc_action(target, source, env):
+def slicc_generator(target, source, env, for_signature):
slicc_bin = str(source[0])
protocol = source[1].get_contents()
pdir = str(protocol_dir)
@@ -65,7 +65,9 @@
cmdline = [ slicc_bin, pdir, hdir, protocol, do_html ]
cmdline += [ str(s) for s in source[2:] ]
cmdline = ' '.join(cmdline)
- os.system(cmdline)
+ return cmdline
+
+slicc_builder = Builder(generator=slicc_generator)
protocol = env['PROTOCOL']
sources = [ protocol_dir.File("RubySlicc_interfaces.slicc"),
@@ -91,7 +93,9 @@
cc = [ protocol_dir.File(f) for f in cc ]
slicc_bin = slicc_dir.File("slicc")
-env.Command(hh + cc, [ slicc_bin, Value(protocol) ] + sm_files, slicc_action)
+
+env.Append(BUILDERS={'SLICC' : slicc_builder})
+env.SLICC(hh + cc, [ slicc_bin, Value(protocol) ] + sm_files)
for f in cc:
Source(f)
diff -r ce086eca1ede -r 40b142645016 src/mem/protocol/SConsopts
--- a/src/mem/protocol/SConsopts Mon Jul 06 15:49:47 2009 -0700
+++ b/src/mem/protocol/SConsopts Mon Jul 06 15:49:47 2009 -0700
@@ -49,7 +49,7 @@
'MSI_MOSI_CMP_directory',
]
-opt = EnumVariable('PROTOCOL', 'Coherence Protocol for Ruby', 'MOSI_SMP_bcast',
+opt = EnumVariable('PROTOCOL', 'Coherence Protocol for Ruby', 'MI_example',
all_protocols)
sticky_vars.AddVariables(opt)
diff -r ce086eca1ede -r 40b142645016 src/mem/ruby/SConscript
--- a/src/mem/ruby/SConscript Mon Jul 06 15:49:47 2009 -0700
+++ b/src/mem/ruby/SConscript Mon Jul 06 15:49:47 2009 -0700
@@ -40,7 +40,7 @@
if not env['RUBY']:
Return()
-Source('init.cc')
+Source('libruby.cc')
def do_embed_text(target, source, env):
"""convert a text file into a file that can be embedded in C
@@ -95,24 +95,25 @@
target = generated_dir.File(basename(source))
env.Command(target, source, MakeIncludeAction)
+MakeInclude('slicc_interface/AbstractCacheEntry.hh')
+MakeInclude('slicc_interface/AbstractProtocol.hh')
+MakeInclude('slicc_interface/Message.hh')
+MakeInclude('slicc_interface/NetworkMessage.hh')
+
+# External types
MakeInclude('buffers/MessageBuffer.hh')
MakeInclude('common/Address.hh')
MakeInclude('common/DataBlock.hh')
MakeInclude('common/NetDest.hh')
MakeInclude('common/Set.hh')
-MakeInclude('slicc_interface/AbstractCacheEntry.hh')
-MakeInclude('slicc_interface/AbstractProtocol.hh')
-MakeInclude('slicc_interface/Message.hh')
-MakeInclude('slicc_interface/NetworkMessage.hh')
+MakeInclude('filters/GenericBloomFilter.hh')
MakeInclude('system/CacheMemory.hh')
+MakeInclude('system/DMASequencer.hh')
MakeInclude('system/DirectoryMemory.hh')
MakeInclude('system/MachineID.hh')
MakeInclude('system/MemoryControl.hh')
MakeInclude('system/NodeID.hh')
-MakeInclude('system/NodePersistentTable.hh')
MakeInclude('system/PerfectCacheMemory.hh')
-MakeInclude('system/PersistentTable.hh')
MakeInclude('system/Sequencer.hh')
-MakeInclude('system/StoreBuffer.hh')
MakeInclude('system/TBETable.hh')
MakeInclude('system/TimerTable.hh')
diff -r ce086eca1ede -r 40b142645016 src/mem/ruby/filters/SConscript
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mem/ruby/filters/SConscript Mon Jul 06 15:49:47 2009 -0700
@@ -0,0 +1,43 @@
+# -*- mode:python -*-
+
+# Copyright (c) 2009 The Hewlett-Packard Development Company
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Authors: Nathan Binkert
+
+Import('*')
+
+if not env['RUBY']:
+ Return()
+
+Source('BlockBloomFilter.cc')
+Source('BulkBloomFilter.cc')
+Source('GenericBloomFilter.cc')
+Source('H3BloomFilter.cc')
+Source('LSB_CountingBloomFilter.cc')
+Source('MultiBitSelBloomFilter.cc')
+Source('MultiGrainBloomFilter.cc')
+Source('NonCountingBloomFilter.cc')
diff -r ce086eca1ede -r 40b142645016 src/mem/ruby/network/SConscript
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mem/ruby/network/SConscript Mon Jul 06 15:49:47 2009 -0700
@@ -0,0 +1,36 @@
+# -*- mode:python -*-
+
+# Copyright (c) 2009 The Hewlett-Packard Development Company
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Authors: Nathan Binkert
+
+Import('*')
+
+if not env['RUBY']:
+ Return()
+
+Source('Network.cc')
diff -r ce086eca1ede -r 40b142645016 src/mem/ruby/network/simple/SConscript
--- a/src/mem/ruby/network/simple/SConscript Mon Jul 06 15:49:47 2009 -0700
+++ b/src/mem/ruby/network/simple/SConscript Mon Jul 06 15:49:47 2009 -0700
@@ -33,6 +33,7 @@
if not env['RUBY']:
Return()
+Source('CustomTopology.cc')
Source('PerfectSwitch.cc')
Source('SimpleNetwork.cc')
Source('Switch.cc')
diff -r ce086eca1ede -r 40b142645016 src/mem/ruby/recorder/SConscript
--- a/src/mem/ruby/recorder/SConscript Mon Jul 06 15:49:47 2009 -0700
+++ b/src/mem/ruby/recorder/SConscript Mon Jul 06 15:49:47 2009 -0700
@@ -33,4 +33,6 @@
if not env['RUBY']:
Return()
+Source('CacheRecorder.cc')
+Source('Tracer.cc')
Source('TraceRecord.cc', Werror=False)
diff -r ce086eca1ede -r 40b142645016 src/mem/ruby/slicc_interface/SConscript
--- a/src/mem/ruby/slicc_interface/SConscript Mon Jul 06 15:49:47 2009 -0700
+++ b/src/mem/ruby/slicc_interface/SConscript Mon Jul 06 15:49:47 2009 -0700
@@ -34,5 +34,4 @@
Return()
Source('AbstractCacheEntry.cc')
-Source('AbstractChip.cc')
Source('RubySlicc_Profiler_interface.cc')
diff -r ce086eca1ede -r 40b142645016 src/mem/ruby/storebuffer/SConscript
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mem/ruby/storebuffer/SConscript Mon Jul 06 15:49:47 2009 -0700
@@ -0,0 +1,37 @@
+# -*- mode:python -*-
+
+# Copyright (c) 2009 The Hewlett-Packard Development Company
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Authors: Nathan Binkert
+
+Import('*')
+
+if not env['RUBY']:
+ Return()
+
+Source('stb_interface.cc')
+Source('storebuffer.cc')
diff -r ce086eca1ede -r 40b142645016 src/mem/ruby/system/SConscript
--- a/src/mem/ruby/system/SConscript Mon Jul 06 15:49:47 2009 -0700
+++ b/src/mem/ruby/system/SConscript Mon Jul 06 15:49:47 2009 -0700
@@ -33,13 +33,11 @@
if not env['RUBY']:
Return()
+Source('DMASequencer.cc')
Source('DirectoryMemory.cc')
Source('MemoryControl.cc')
Source('MemoryNode.cc')
-Source('NodePersistentTable.cc')
-Source('PersistentTable.cc')
+Source('RubyPort.cc')
Source('Sequencer.cc', Werror=False)
-Source('StoreBuffer.cc')
-Source('StoreCache.cc')
Source('System.cc')
Source('TimerTable.cc')
diff -r ce086eca1ede -r 40b142645016 src/mem/ruby/tester/SConscript
--- a/src/mem/ruby/tester/SConscript Mon Jul 06 15:49:47 2009 -0700
+++ b/src/mem/ruby/tester/SConscript Mon Jul 06 15:49:47 2009 -0700
@@ -33,14 +33,8 @@
if not env['RUBY']:
Return()
-Source('Check.cc')
-Source('CheckTable.cc')
-Source('DetermGETXGenerator.cc')
-Source('DetermInvGenerator.cc')
-Source('DetermSeriesGETSGenerator.cc')
-Source('DeterministicDriver.cc')
-Source('Instruction.cc')
-Source('RequestGenerator.cc')
-Source('SpecifiedGenerator.cc')
-Source('SyntheticDriver.cc')
-Source('Tester.cc')
+#Source('DetermGETXGenerator.cc')
+#Source('DetermInvGenerator.cc')
+#Source('DetermSeriesGETSGenerator.cc')
+#Source('DeterministicDriver.cc')
+#ource('SpecifiedGenerator.cc')
diff -r ce086eca1ede -r 40b142645016 src/mem/slicc/SConscript
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
