riscv
/
coriolis
mirror of https://gitlab.lip6.fr/vlsi-eda/coriolis.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adapt socInstaller to the new SL7 & benchmarks.

This commit is contained in:
Jean-Paul Chaput 2019-05-26 15:41:24 +02:00
parent 4cd0bcb009
commit 911095284f
1 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
bootstrap/socInstaller.py
View File

@ -7,7 +7,7 @@
# #
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
# | C O R I O L I S | # | C O R I O L I S |
# | C o r i o l i s / C h a m s I n s t a l l e r | # | C o r i o l i s I n s t a l l e r |
# | | # | |
# | Authors : Jean-Paul Chaput | # | Authors : Jean-Paul Chaput |
# | E-mail : Jean-Paul.Chaput@asim.lip6.fr | # | E-mail : Jean-Paul.Chaput@asim.lip6.fr |
@ -17,7 +17,7 @@
# #
# WARNING: # WARNING:
# This script has been designed only for internal use in the # This script has been designed only for internal use in the
# LIP6/SoC department. If you want to use it you will need to # LIP6/CIAN department. If you want to use it you will need to
# change the hardwired configuration. # change the hardwired configuration.
@ -232,7 +232,7 @@ class Configuration ( object ):
def __init__ ( self ): def __init__ ( self ):
self._sender = 'Jean-Paul.Chaput@soc.lip6.fr' self._sender = 'Jean-Paul.Chaput@soc.lip6.fr'
self._receivers = [ 'Jean-Paul.Chaput@lip6.fr', 'Eric.Lao@lip6.fr' ] self._receivers = [ 'Jean-Paul.Chaput@lip6.fr', ]
self._supportRepos = [ 'http://github.com/miloyip/rapidjson' ] self._supportRepos = [ 'http://github.com/miloyip/rapidjson' ]
self._coriolisRepo = 'https://www-soc.lip6.fr/git/coriolis.git' self._coriolisRepo = 'https://www-soc.lip6.fr/git/coriolis.git'
self._benchsRepo = 'https://www-soc.lip6.fr/git/alliance-check-toolkit.git' self._benchsRepo = 'https://www-soc.lip6.fr/git/alliance-check-toolkit.git'
@ -271,9 +271,9 @@ class Configuration ( object ):
, 'SL7_64':'lepka' , 'SL7_64':'lepka'
} }
else: else:
self._targets = { 'SL6' :'rock' self._targets = { 'SL6' :None
, 'SL6_64':'bip' , 'SL6_64':None
, 'SL7_64':None , 'SL7_64':'bop'
} }
if attribute[0] == '_': if attribute[0] == '_':
@ -298,7 +298,7 @@ class Configuration ( object ):
self._rootDir = self._homeDir + '/nightly/coriolis-2.x' self._rootDir = self._homeDir + '/nightly/coriolis-2.x'
else: else:
if self._masterHost != 'lepka': if self._masterHost != 'lepka':
self._targets['SL6'] = 'rock' self._targets['SL6'] = None
self._rootDir = self._homeDir + '/coriolis-2.x' self._rootDir = self._homeDir + '/coriolis-2.x'
self._srcDir = self._rootDir + '/src' self._srcDir = self._rootDir + '/src'
self._logDir = self._srcDir + '/logs' self._logDir = self._srcDir + '/logs'
@ -366,7 +366,7 @@ class Report ( object ):
if self.conf.nightlyMode: modeText = 'Nightly build' if self.conf.nightlyMode: modeText = 'Nightly build'
self.message = MIMEMultipart() self.message = MIMEMultipart()
self.message['Subject'] = '[%s] Coriolis & Chams %s %s' % (stateText,modeText,date) self.message['Subject'] = '[%s] Coriolis %s %s' % (stateText,modeText,date)
self.message['From' ] = self.conf.sender self.message['From' ] = self.conf.sender
self.message['To' ] = commaspace.join( self.conf.receivers ) self.message['To' ] = commaspace.join( self.conf.receivers )
self.attachements = [] self.attachements = []
@ -375,9 +375,9 @@ class Report ( object ):
self.mainText += 'Salut le Crevard,\n' self.mainText += 'Salut le Crevard,\n'
self.mainText += '\n' self.mainText += '\n'
if self.conf.nightlyMode: if self.conf.nightlyMode:
self.mainText += 'This is the nightly build report of Coriolis & Chams.\n' self.mainText += 'This is the nightly build report of Coriolis.\n'
else: else:
self.mainText += 'SoC installer report of Coriolis & Chams.\n' self.mainText += 'SoC installer report of Coriolis.\n'
self.mainText += '%s\n' % date self.mainText += '%s\n' % date
self.mainText += '\n' self.mainText += '\n'
if self.conf.success: if self.conf.success:
@ -470,10 +470,6 @@ try:
gitCoriolis.clone () gitCoriolis.clone ()
gitCoriolis.checkout( 'devel_anabatic' ) gitCoriolis.checkout( 'devel_anabatic' )
if conf.rmSource: gitChams.removeLocalRepo()
gitChams.clone ()
gitChams.checkout( 'devel' )
if conf.rmSource: gitBenchs.removeLocalRepo() if conf.rmSource: gitBenchs.removeLocalRepo()
gitBenchs.clone() gitBenchs.clone()
@ -492,19 +488,18 @@ try:
buildCommand = '%s --root=%s --project=support --project=coriolis --make="-j%%d install" %%s' \ buildCommand = '%s --root=%s --project=support --project=coriolis --make="-j%%d install" %%s' \
% (ccbBin,conf.rootDir) % (ccbBin,conf.rootDir)
benchsCommand = 'cd %s/benchs && ./bin/go.sh clean && ./bin/go.sh lvx' \ benchsCommand = 'cd %s/benchs && ../bin/go.sh' % (gitBenchs.localRepoDir)
% (gitBenchs.localRepoDir)
commands = \ commands = \
[ ( conf.targets['SL7_64'], buildCommand % (3,conf.debugArg) , conf.fds['build' ] ) [ ( conf.targets['SL7_64'], buildCommand % (3,conf.debugArg) , conf.fds['build' ] )
, ( conf.targets['SL7_64'], buildCommand % (1,conf.debugArg+' --doc') , conf.fds['build' ] ) , ( conf.targets['SL7_64'], buildCommand % (1,conf.debugArg+' --doc') , conf.fds['build' ] )
, ( conf.targets['SL7_64'], benchsCommand , conf.fds['benchs'] ) , ( conf.targets['SL7_64'], benchsCommand , conf.fds['benchs'] )
, ( conf.targets['SL6_64'], buildCommand % (6,conf.debugArg+' --devtoolset-8') , conf.fds['build' ] ) #, ( conf.targets['SL6_64'], buildCommand % (6,conf.debugArg+' --devtoolset-8') , conf.fds['build' ] )
, ( conf.targets['SL6_64'], buildCommand % (1,conf.debugArg+' --devtoolset-8 --doc'), conf.fds['build' ] ) #, ( conf.targets['SL6_64'], buildCommand % (1,conf.debugArg+' --devtoolset-8 --doc'), conf.fds['build' ] )
, ( conf.targets['SL6_64'], benchsCommand , conf.fds['benchs'] ) #, ( conf.targets['SL6_64'], benchsCommand , conf.fds['benchs'] )
, ( conf.targets['SL6'] , buildCommand % (2,conf.debugArg+' --devtoolset-8') , conf.fds['build' ] ) #, ( conf.targets['SL6'] , buildCommand % (2,conf.debugArg+' --devtoolset-8') , conf.fds['build' ] )
, ( conf.targets['SL6'] , buildCommand % (1,conf.debugArg+' --devtoolset-8 --doc'), conf.fds['build' ] ) #, ( conf.targets['SL6'] , buildCommand % (1,conf.debugArg+' --devtoolset-8 --doc'), conf.fds['build' ] )
, ( conf.targets['SL6'] , benchsCommand , conf.fds['benchs'] ) #, ( conf.targets['SL6'] , benchsCommand , conf.fds['benchs'] )
] ]
for host,command,fd in commands: for host,command,fd in commands: