scons: update SCons files for changes in ruby.
This commit is contained in:
parent
92de70b69a
commit
1f6933503d
|
@ -34,4 +34,3 @@ if not env['RUBY']:
|
||||||
Return()
|
Return()
|
||||||
|
|
||||||
Source('confio.cc')
|
Source('confio.cc')
|
||||||
Source('initvar.cc')
|
|
||||||
|
|
|
@ -50,7 +50,7 @@ html_dir = Dir('html')
|
||||||
#
|
#
|
||||||
# Use SLICC
|
# Use SLICC
|
||||||
#
|
#
|
||||||
def slicc_action(target, source, env):
|
def slicc_generator(target, source, env, for_signature):
|
||||||
slicc_bin = str(source[0])
|
slicc_bin = str(source[0])
|
||||||
protocol = source[1].get_contents()
|
protocol = source[1].get_contents()
|
||||||
pdir = str(protocol_dir)
|
pdir = str(protocol_dir)
|
||||||
|
@ -65,7 +65,9 @@ def slicc_action(target, source, env):
|
||||||
cmdline = [ slicc_bin, pdir, hdir, protocol, do_html ]
|
cmdline = [ slicc_bin, pdir, hdir, protocol, do_html ]
|
||||||
cmdline += [ str(s) for s in source[2:] ]
|
cmdline += [ str(s) for s in source[2:] ]
|
||||||
cmdline = ' '.join(cmdline)
|
cmdline = ' '.join(cmdline)
|
||||||
os.system(cmdline)
|
return cmdline
|
||||||
|
|
||||||
|
slicc_builder = Builder(generator=slicc_generator)
|
||||||
|
|
||||||
protocol = env['PROTOCOL']
|
protocol = env['PROTOCOL']
|
||||||
sources = [ protocol_dir.File("RubySlicc_interfaces.slicc"),
|
sources = [ protocol_dir.File("RubySlicc_interfaces.slicc"),
|
||||||
|
@ -91,7 +93,9 @@ hh = [ protocol_dir.File(f) for f in hh ]
|
||||||
cc = [ protocol_dir.File(f) for f in cc ]
|
cc = [ protocol_dir.File(f) for f in cc ]
|
||||||
|
|
||||||
slicc_bin = slicc_dir.File("slicc")
|
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:
|
for f in cc:
|
||||||
Source(f)
|
Source(f)
|
||||||
|
|
|
@ -49,7 +49,7 @@ all_protocols = [
|
||||||
'MSI_MOSI_CMP_directory',
|
'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)
|
all_protocols)
|
||||||
|
|
||||||
sticky_vars.AddVariables(opt)
|
sticky_vars.AddVariables(opt)
|
||||||
|
|
|
@ -40,7 +40,7 @@ Import('*')
|
||||||
if not env['RUBY']:
|
if not env['RUBY']:
|
||||||
Return()
|
Return()
|
||||||
|
|
||||||
Source('init.cc')
|
Source('libruby.cc')
|
||||||
|
|
||||||
def do_embed_text(target, source, env):
|
def do_embed_text(target, source, env):
|
||||||
"""convert a text file into a file that can be embedded in C
|
"""convert a text file into a file that can be embedded in C
|
||||||
|
@ -95,24 +95,25 @@ def MakeInclude(source):
|
||||||
target = generated_dir.File(basename(source))
|
target = generated_dir.File(basename(source))
|
||||||
env.Command(target, source, MakeIncludeAction)
|
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('buffers/MessageBuffer.hh')
|
||||||
MakeInclude('common/Address.hh')
|
MakeInclude('common/Address.hh')
|
||||||
MakeInclude('common/DataBlock.hh')
|
MakeInclude('common/DataBlock.hh')
|
||||||
MakeInclude('common/NetDest.hh')
|
MakeInclude('common/NetDest.hh')
|
||||||
MakeInclude('common/Set.hh')
|
MakeInclude('common/Set.hh')
|
||||||
MakeInclude('slicc_interface/AbstractCacheEntry.hh')
|
MakeInclude('filters/GenericBloomFilter.hh')
|
||||||
MakeInclude('slicc_interface/AbstractProtocol.hh')
|
|
||||||
MakeInclude('slicc_interface/Message.hh')
|
|
||||||
MakeInclude('slicc_interface/NetworkMessage.hh')
|
|
||||||
MakeInclude('system/CacheMemory.hh')
|
MakeInclude('system/CacheMemory.hh')
|
||||||
|
MakeInclude('system/DMASequencer.hh')
|
||||||
MakeInclude('system/DirectoryMemory.hh')
|
MakeInclude('system/DirectoryMemory.hh')
|
||||||
MakeInclude('system/MachineID.hh')
|
MakeInclude('system/MachineID.hh')
|
||||||
MakeInclude('system/MemoryControl.hh')
|
MakeInclude('system/MemoryControl.hh')
|
||||||
MakeInclude('system/NodeID.hh')
|
MakeInclude('system/NodeID.hh')
|
||||||
MakeInclude('system/NodePersistentTable.hh')
|
|
||||||
MakeInclude('system/PerfectCacheMemory.hh')
|
MakeInclude('system/PerfectCacheMemory.hh')
|
||||||
MakeInclude('system/PersistentTable.hh')
|
|
||||||
MakeInclude('system/Sequencer.hh')
|
MakeInclude('system/Sequencer.hh')
|
||||||
MakeInclude('system/StoreBuffer.hh')
|
|
||||||
MakeInclude('system/TBETable.hh')
|
MakeInclude('system/TBETable.hh')
|
||||||
MakeInclude('system/TimerTable.hh')
|
MakeInclude('system/TimerTable.hh')
|
||||||
|
|
43
src/mem/ruby/filters/SConscript
Normal file
43
src/mem/ruby/filters/SConscript
Normal file
|
@ -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')
|
36
src/mem/ruby/network/SConscript
Normal file
36
src/mem/ruby/network/SConscript
Normal file
|
@ -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')
|
|
@ -33,6 +33,7 @@ Import('*')
|
||||||
if not env['RUBY']:
|
if not env['RUBY']:
|
||||||
Return()
|
Return()
|
||||||
|
|
||||||
|
Source('CustomTopology.cc')
|
||||||
Source('PerfectSwitch.cc')
|
Source('PerfectSwitch.cc')
|
||||||
Source('SimpleNetwork.cc')
|
Source('SimpleNetwork.cc')
|
||||||
Source('Switch.cc')
|
Source('Switch.cc')
|
||||||
|
|
|
@ -33,4 +33,6 @@ Import('*')
|
||||||
if not env['RUBY']:
|
if not env['RUBY']:
|
||||||
Return()
|
Return()
|
||||||
|
|
||||||
|
Source('CacheRecorder.cc')
|
||||||
|
Source('Tracer.cc')
|
||||||
Source('TraceRecord.cc', Werror=False)
|
Source('TraceRecord.cc', Werror=False)
|
||||||
|
|
|
@ -34,5 +34,4 @@ if not env['RUBY']:
|
||||||
Return()
|
Return()
|
||||||
|
|
||||||
Source('AbstractCacheEntry.cc')
|
Source('AbstractCacheEntry.cc')
|
||||||
Source('AbstractChip.cc')
|
|
||||||
Source('RubySlicc_Profiler_interface.cc')
|
Source('RubySlicc_Profiler_interface.cc')
|
||||||
|
|
37
src/mem/ruby/storebuffer/SConscript
Normal file
37
src/mem/ruby/storebuffer/SConscript
Normal file
|
@ -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')
|
|
@ -33,13 +33,11 @@ Import('*')
|
||||||
if not env['RUBY']:
|
if not env['RUBY']:
|
||||||
Return()
|
Return()
|
||||||
|
|
||||||
|
Source('DMASequencer.cc')
|
||||||
Source('DirectoryMemory.cc')
|
Source('DirectoryMemory.cc')
|
||||||
Source('MemoryControl.cc')
|
Source('MemoryControl.cc')
|
||||||
Source('MemoryNode.cc')
|
Source('MemoryNode.cc')
|
||||||
Source('NodePersistentTable.cc')
|
Source('RubyPort.cc')
|
||||||
Source('PersistentTable.cc')
|
|
||||||
Source('Sequencer.cc', Werror=False)
|
Source('Sequencer.cc', Werror=False)
|
||||||
Source('StoreBuffer.cc')
|
|
||||||
Source('StoreCache.cc')
|
|
||||||
Source('System.cc')
|
Source('System.cc')
|
||||||
Source('TimerTable.cc')
|
Source('TimerTable.cc')
|
||||||
|
|
|
@ -33,14 +33,8 @@ Import('*')
|
||||||
if not env['RUBY']:
|
if not env['RUBY']:
|
||||||
Return()
|
Return()
|
||||||
|
|
||||||
Source('Check.cc')
|
#Source('DetermGETXGenerator.cc')
|
||||||
Source('CheckTable.cc')
|
#Source('DetermInvGenerator.cc')
|
||||||
Source('DetermGETXGenerator.cc')
|
#Source('DetermSeriesGETSGenerator.cc')
|
||||||
Source('DetermInvGenerator.cc')
|
#Source('DeterministicDriver.cc')
|
||||||
Source('DetermSeriesGETSGenerator.cc')
|
#ource('SpecifiedGenerator.cc')
|
||||||
Source('DeterministicDriver.cc')
|
|
||||||
Source('Instruction.cc')
|
|
||||||
Source('RequestGenerator.cc')
|
|
||||||
Source('SpecifiedGenerator.cc')
|
|
||||||
Source('SyntheticDriver.cc')
|
|
||||||
Source('Tester.cc')
|
|
||||||
|
|
|
@ -107,6 +107,7 @@ SliccSource('ast/Location.cc')
|
||||||
SliccSource('ast/MachineAST.cc')
|
SliccSource('ast/MachineAST.cc')
|
||||||
SliccSource('ast/MemberExprAST.cc')
|
SliccSource('ast/MemberExprAST.cc')
|
||||||
SliccSource('ast/MethodCallExprAST.cc')
|
SliccSource('ast/MethodCallExprAST.cc')
|
||||||
|
SliccSource('ast/NewExprAST.cc')
|
||||||
SliccSource('ast/ObjDeclAST.cc')
|
SliccSource('ast/ObjDeclAST.cc')
|
||||||
SliccSource('ast/OutPortDeclAST.cc')
|
SliccSource('ast/OutPortDeclAST.cc')
|
||||||
SliccSource('ast/PairAST.cc')
|
SliccSource('ast/PairAST.cc')
|
||||||
|
|
Loading…
Reference in a new issue