scons: update SCons files for changes in ruby.

This commit is contained in:
Nathan Binkert 2009-07-06 15:49:47 -07:00
parent 92de70b69a
commit 1f6933503d
13 changed files with 144 additions and 29 deletions

View file

@ -34,4 +34,3 @@ if not env['RUBY']:
Return()
Source('confio.cc')
Source('initvar.cc')

View file

@ -50,7 +50,7 @@ html_dir = Dir('html')
#
# 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 @@ def slicc_action(target, source, env):
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 @@ hh = [ protocol_dir.File(f) for f in hh ]
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)

View file

@ -49,7 +49,7 @@ all_protocols = [
'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)

View file

@ -40,7 +40,7 @@ Import('*')
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 @@ def MakeInclude(source):
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')

View 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')

View 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')

View file

@ -33,6 +33,7 @@ Import('*')
if not env['RUBY']:
Return()
Source('CustomTopology.cc')
Source('PerfectSwitch.cc')
Source('SimpleNetwork.cc')
Source('Switch.cc')

View file

@ -33,4 +33,6 @@ Import('*')
if not env['RUBY']:
Return()
Source('CacheRecorder.cc')
Source('Tracer.cc')
Source('TraceRecord.cc', Werror=False)

View file

@ -34,5 +34,4 @@ if not env['RUBY']:
Return()
Source('AbstractCacheEntry.cc')
Source('AbstractChip.cc')
Source('RubySlicc_Profiler_interface.cc')

View 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')

View file

@ -33,13 +33,11 @@ Import('*')
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')

View file

@ -33,14 +33,8 @@ Import('*')
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')

View file

@ -107,6 +107,7 @@ SliccSource('ast/Location.cc')
SliccSource('ast/MachineAST.cc')
SliccSource('ast/MemberExprAST.cc')
SliccSource('ast/MethodCallExprAST.cc')
SliccSource('ast/NewExprAST.cc')
SliccSource('ast/ObjDeclAST.cc')
SliccSource('ast/OutPortDeclAST.cc')
SliccSource('ast/PairAST.cc')