Commit bbdbaba0 authored by Andrea Petrucci's avatar Andrea Petrucci
Browse files

references #226: runBenchmarks add option with 1 stream per RU

parent 93c06a1b
...@@ -23,6 +23,7 @@ class RunBenchmarks(TestRunner): ...@@ -23,6 +23,7 @@ class RunBenchmarks(TestRunner):
TestRunner.addScanOptions(self,parser) TestRunner.addScanOptions(self,parser)
parser.add_argument("--foldedEVM",action='store_true',help="run a BU on the EVM node [default: %(default)s]") parser.add_argument("--foldedEVM",action='store_true',help="run a BU on the EVM node [default: %(default)s]")
parser.add_argument("--canonicalEVM",action='store_true',help="emulate 7 additional FEDs on EVM [default: %(default)s]") parser.add_argument("--canonicalEVM",action='store_true',help="emulate 7 additional FEDs on EVM [default: %(default)s]")
parser.add_argument("--oneFEDxRU",action='store_true',help="emulate 1 FED on RU[default: %(default)s]")
parser.add_argument("--nRUs",default=1,type=int,help="number of RUs, excl. EVM [default: %(default)s]") parser.add_argument("--nRUs",default=1,type=int,help="number of RUs, excl. EVM [default: %(default)s]")
parser.add_argument("--nBUs",default=1,type=int,help="number of BUs [default: %(default)s]") parser.add_argument("--nBUs",default=1,type=int,help="number of BUs [default: %(default)s]")
parser.add_argument("--nRUBUs",default=0,type=int,help="number of RUBUs, excl. EVM [default: %(default)s]") parser.add_argument("--nRUBUs",default=0,type=int,help="number of RUBUs, excl. EVM [default: %(default)s]")
...@@ -158,16 +159,29 @@ class RunBenchmarks(TestRunner): ...@@ -158,16 +159,29 @@ class RunBenchmarks(TestRunner):
config.add( RU(self._symbolMap,evmConfig) ) config.add( RU(self._symbolMap,evmConfig) )
# RUs with 8 FEDs each # RUs with 8 FEDs each
for ru in range(self.args['nRUs']): for ru in range(self.args['nRUs']):
config.add( RU(self._symbolMap, if self.args['oneFEDxRU']:
config.add( RU(self._symbolMap,
ruConfig + ruConfig +
[('fedSourceIds','unsignedInt',list(range(8*ru,8*ru+8))),] [('fedSourceIds','unsignedInt',[ru+1100]),] #avoid softFED
) )
else:
config.add( RU(self._symbolMap,
ruConfig +
[('fedSourceIds','unsignedInt',list(range(8*ru+1100,8*ru+1108))),] #avoid softFED
) ) ) )
# BUs # BUs
for bu in range(self.args['nBUs']): for bu in range(self.args['nBUs']):
config.add( BU(self._symbolMap,buConfig) ) config.add( BU(self._symbolMap,buConfig) )
# RUBUs with 8 FEDs each # RUBUs with 8 FEDs each
for rubu in range(self.args['nRUBUs']): for rubu in range(self.args['nRUBUs']):
config.add( RUBU(self._symbolMap, if self.args['oneFEDxRU']:
config.add( RUBU(self._symbolMap,
ruConfig +
[('fedSourceIds','unsignedInt',[rubu+1100]),] #avoid softFED
, buConfig
) )
else:
config.add( RUBU(self._symbolMap,
ruConfig + ruConfig +
[('fedSourceIds','unsignedInt',list(range(8*rubu+1100,8*rubu+1108))),] #avoid softFED [('fedSourceIds','unsignedInt',list(range(8*rubu+1100,8*rubu+1108))),] #avoid softFED
, buConfig , buConfig
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment