Commit 1a955c8f authored by Andrea Petrucci's avatar Andrea Petrucci
Browse files

references #226: set 16 byte evm stream in oneStream option

parent 5a4e6e06
......@@ -593,7 +593,7 @@ class TestCase:
def checkBuDir(self,testDir,runNumber,eventSize=None,buInstance=None):
runDir=testDir+"/run"+runNumber
print( subprocess.Popen(["ls","--full-time","-rt","-R",runDir], stdout=subprocess.PIPE).communicate()[0].decode() )
print( subprocess.Popen(["ls","--full-time","-rt","-R",runDir], stdout=subprocess.PIPE).communicate()[0].decode() )
if os.path.isdir(runDir+"/open"):
raise FileException(runDir+"/open still exists")
for jsdFile in ('EoLS.jsd','EoR.jsd'):
......@@ -705,14 +705,17 @@ class TestCase:
return int(size*rate/1000000)
def calculateFedSize(self,fedId,fragSize,fragSizeRMS):
def calculateFedSize(self,fedId,fragSize,fragSizeRMS,args):
if fedId == self._config.evmFedId:
return 1024,0
if args['oneFEDxRU']:
return 16,0
else:
return 1024,0
else:
return int(fragSize),int(fragSizeRMS)
def setFragmentSizes(self,fragSize,fragSizeRMS):
def setFragmentSizes(self,fragSize,fragSizeRMS,args):
"""
configures the fragment size to be generated at the FEROL/FRL or EvB
"""
......@@ -733,7 +736,7 @@ class TestCase:
if prop[0] == 'fedSourceIds':
sources = []
for item in prop[2]:
fedSize,fedSizeRMS = self.calculateFedSize(item,fragSize,fragSizeRMS)
fedSize,fedSizeRMS = self.calculateFedSize(item,fragSize,fragSizeRMS,args)
sources.append((('dummyFedSize','unsignedInt',str(fedSize)),('dummyFedSizeStdDev','unsignedInt',str(fedSizeRMS))))
messengers.setParam('ferolSources','Array',sources,**application)
......@@ -833,7 +836,7 @@ class TestCase:
"""
dataPoints = []
self.setFragmentSizes(fragSize,fragSizeRMS)
self.setFragmentSizes(fragSize,fragSizeRMS,args)
# start running
self.start()
......
......@@ -23,7 +23,7 @@ class RunBenchmarks(TestRunner):
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("--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("--oneFEDxRU",action='store_true',help="emulate 1 FED on RU and EVM master stream at 16 bytes[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("--nRUBUs",default=0,type=int,help="number of RUBUs, excl. EVM [default: %(default)s]")
......@@ -119,7 +119,8 @@ class RunBenchmarks(TestRunner):
evmConfig.append( ('numberOfResponders','unsignedInt','2') )
ruConfig = [
('inputSource','string','Local'),
('blockSize','unsignedInt','0x1E8580'),
#('blockSize','unsignedInt','0x1E8580'),
('blockSize','unsignedInt','0x3fff0'),
('numberOfResponders','unsignedInt','6'),
('socketBufferFIFOCapacity','unsignedInt','16'),
('grantFIFOCapacity','unsignedInt','128'),
......@@ -164,7 +165,7 @@ class RunBenchmarks(TestRunner):
ruConfig +
[('fedSourceIds','unsignedInt',[ru+1100]),] #avoid softFED
) )
else:
else:
config.add( RU(self._symbolMap,
ruConfig +
[('fedSourceIds','unsignedInt',list(range(8*ru+1100,8*ru+1108))),] #avoid softFED
......@@ -178,7 +179,7 @@ class RunBenchmarks(TestRunner):
config.add( RUBU(self._symbolMap,
ruConfig +
[('fedSourceIds','unsignedInt',[rubu+1100]),] #avoid softFED
, buConfig,'0x1E8580'
, buConfig #,'0x1E8580' max buffer to 2 MB
) )
else:
config.add( RUBU(self._symbolMap,
......
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