Commit 6d5d27bf authored by Andrea Petrucci's avatar Andrea Petrucci
Browse files

references #226: remove numa setting for R7515, fix runBenchmarks

parent 92304bfd
......@@ -14,11 +14,16 @@ class Context:
def __init__(self,role,hostinfo):
self.role = role
self.hostinfo = hostinfo
self.polns = 'http://xdaq.web.cern.ch/xdaq/xsd/2013/XDAQPolicy-10'
try:
self.policyElements = self.getPolicyElements()
except KeyError:
self.policyElements = []
if 'd3vrubu-c2e33-06-01' in self.hostinfo['i2oHostname'] or 'd3vrubu-c2e33-08-01' in self.hostinfo['i2oHostname'] or\
'd3vrubu-c2e33-10-01' in self.hostinfo['i2oHostname'] or 'd3vrubu-c2e33-12-01' in self.hostinfo['i2oHostname'] or\
'rubu-c2a15-33-01' in self.hostinfo['i2oHostname'] or 'rubu-c2a15-33-01' in self.hostinfo['i2oHostname']:
self.policyElements = None
else:
self.polns = 'http://xdaq.web.cern.ch/xdaq/xsd/2013/XDAQPolicy-10'
try:
self.policyElements = self.getPolicyElements()
except KeyError:
self.policyElements = []
self.applications = [Application.Application('xmem::probe::Application',Context.ptInstance,[]),]
......@@ -45,8 +50,10 @@ class Context:
try:
# Current DAQ3VAL machineswith CC8 and RoCE
if 'd3vrubu-c2e33-06-01' in self.hostinfo['i2oHostname'] or 'd3vrubu-c2e33-08-01' in self.hostinfo['i2oHostname'] or\
'd3vrubu-c2e33-10-01' in self.hostinfo['i2oHostname'] or 'd3vrubu-c2e33-12-01' in self.hostinfo['i2oHostname']:
'd3vrubu-c2e33-10-01' in self.hostinfo['i2oHostname'] or 'd3vrubu-c2e33-12-01' in self.hostinfo['i2oHostname'] or\
'rubu-c2a15-33-01' in self.hostinfo['i2oHostname'] or 'rubu-c2a15-33-01' in self.hostinfo['i2oHostname']:
app = self.getPtIbvApplication(maxMessageSize,True)
#app = self.getPtUtcpApplication(maxMessageSize)
elif 'd3v' in self.hostinfo['i2oHostname'] or 'rbs1v0' in self.hostinfo['i2oHostname'] or 'ebs0v0' in self.hostinfo['i2oHostname'] or 'ebs1v0' in self.hostinfo['i2oHostname']:
app = self.getPtIbvApplication(maxMessageSize,False)
else:
......
......@@ -93,6 +93,7 @@ class TestRunner:
def scanFedSizes(self,testName,test):
outputFileName = self.args['outputDir']+"/"+testName+".dat"
self.args['waitForStateTransitions']= test.waitForStateTransitions
if self.args['append']:
mode = 'a'
else:
......
......@@ -109,7 +109,7 @@ class RunBenchmarks(TestRunner):
('fragmentRequestFIFOCapacity','unsignedInt','8000')
]
if self.args['canonicalEVM']:
evmConfig.append( ('fedSourceIds','unsignedInt',range(1000,1008)) )
evmConfig.append( ('fedSourceIds','unsignedInt',list(range(1000,1008))) )
evmConfig.append( ('blockSize','unsignedInt','0x3fff0') )
evmConfig.append( ('numberOfResponders','unsignedInt','6') )
else:
......@@ -160,7 +160,7 @@ class RunBenchmarks(TestRunner):
for ru in range(self.args['nRUs']):
config.add( RU(self._symbolMap,
ruConfig +
[('fedSourceIds','unsignedInt',range(8*ru,8*ru+8)),]
[('fedSourceIds','unsignedInt',list(range(8*ru,8*ru+8))),]
) )
# BUs
for bu in range(self.args['nBUs']):
......@@ -169,7 +169,7 @@ class RunBenchmarks(TestRunner):
for rubu in range(self.args['nRUBUs']):
config.add( RUBU(self._symbolMap,
ruConfig +
[('fedSourceIds','unsignedInt',range(8*rubu+1100,8*rubu+1108)),] #avoid softFED
[('fedSourceIds','unsignedInt',list(range(8*rubu+1100,8*rubu+1108))),] #avoid softFED
, buConfig
) )
return config
......
......@@ -36,15 +36,15 @@ class xdaqThread(threading.Thread):
hostname = socket.gethostname()
numaCtl = []
if useNuma:
if 'ru-' in hostname:
numaCtl = ['/usr/bin/numactl','--cpunodebind=1','--membind=1']
elif 'dvrubu-' in hostname:
numaCtl = ['/usr/bin/numactl','--cpunodebind=0','--membind=0']
# no numa configuration for DAQ3VAL AMD machines
elif 'd3vrubu-c2e33-10-01' in hostname or 'd3vrubu-c2e34-20-01' in hostname or 'd3vrubu-c2e34-27-01' in hostname or\
if 'd3vrubu-c2e33-10-01' in hostname or 'd3vrubu-c2e34-20-01' in hostname or 'd3vrubu-c2e34-27-01' in hostname or\
'd3vrubu-c2e33-06-01' in hostname or 'd3vrubu-c2e33-08-01' in hostname or 'd3vrubu-c2e33-10-01' in hostname or\
'd3vrubu-c2e33-12-01' in hostname:
'd3vrubu-c2e33-12-01' in hostname or 'rubu-c2a15-31-01' in hostname or 'rubu-c2a15-33-01' in hostname:
pass
elif 'ru-' in hostname:
numaCtl = ['/usr/bin/numactl','--cpunodebind=1','--membind=1']
elif 'dvrubu-' in hostname:
numaCtl = ['/usr/bin/numactl','--cpunodebind=0','--membind=0']
elif 'd3vrubu-' in hostname:
numaCtl = ['/usr/bin/numactl','--cpunodebind=1','--membind=1']
elif 'bu-' in hostname:
......
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