Skip to content

GitLab

Commit c1ebe224 authored by Remi Mommsen's avatar Remi Mommsen
Browse files

references #94: cleanup after rebase

parent 0e7e193a
Show whitespace changes
Inline Side-by-side
evb/test/scripts/Configuration.py
View file @ c1ebe224
......@@ -175,9 +175,9 @@ class ConfigFromFile(Configuration):
context.extractPolicy(c)
if isAMD:
context.policyElements = self.getPolicyForRUBUonAMD(hostinfo)
context.policyElements = self.getPolicyForRUBUonAMD(hostinfo,directSocketRead)
else:
context.policyElements = self.getPolicyForRUBUonSkylake(hostinfo)
context.policyElements = self.getPolicyForRUBUonSkylake(hostinfo,directSocketRead)
for endpoint in c.findall(QN(self.xcns,'Endpoint').text): ## all 'Endpoint's of this context
if endpoint.attrib['protocol'] == "btcp":
......@@ -241,6 +241,10 @@ class ConfigFromFile(Configuration):
self.dropInputData(app,'dropAtStream')
elif fixPorts:
self.fixFerolPorts(app)
if isAMD:
self.setParamsForAMD(app)
if directSocketRead:
self.setDSR(app)
context.applications.append(app)
self.add(context)
......@@ -322,16 +326,6 @@ class ConfigFromFile(Configuration):
return None
def setBlockSize(self,app,maxBlockSize):
newProp = []
for prop in app.properties:
if prop[0] == 'maxBlockSize':
newProp.append(('maxBlockSize','unsignedInt',maxBlockSize))
else:
newProp.append(prop)
app.properties = newProp
def setOperationMode(self,app,ferolMode):
newProp = []
for prop in app.properties:
......@@ -543,7 +537,7 @@ class ConfigFromFile(Configuration):
{'mempolicy':'onnode','node':'1','package':'numa','pattern':'urn:eventFIFO:alloc','type':'alloc'},
{'mempolicy':'onnode','node':'1','package':'numa','pattern':'urn:eventFragmentFIFO:alloc','type':'alloc'},
]
if 'frlHostname' not in hostinfo:
if directSocketRead or 'frlHostname' not in hostinfo:
return policy
else:
return policy + [
......@@ -570,6 +564,78 @@ class ConfigFromFile(Configuration):
def getPolicyForRUBUonAMD(self,hostinfo):
if directSocketRead:
return [
{'affinity':'15','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:pt::ibv::acceptor(.*)/waiting','type':'thread'},
{'affinity':'45','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:pt::ibv::eventworkloop/polling','type':'thread'},
{'affinity':'58','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:pt::ibv::completionworkloopr(.*)/polling','type':'thread'},
{'affinity':'22','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:pt::ibv::completionworkloops(.*)/polling','type':'thread'},
{'affinity':'21','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_0/waiting','type':'thread'},
{'affinity':'3', 'memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_1/waiting','type':'thread'},
{'affinity':'4', 'memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_2/waiting','type':'thread'},
{'affinity':'49','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_3/waiting','type':'thread'},
{'affinity':'61','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_4/waiting','type':'thread'},
{'affinity':'5', 'memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_5/waiting','type':'thread'},
{'affinity':'60','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_6/waiting','type':'thread'},
{'affinity':'55','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_7/waiting','type':'thread'},
{'affinity':'63','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_8/waiting','type':'thread'},
{'affinity':'46','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_9/waiting','type':'thread'},
{'affinity':'57','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_10/waiting','type':'thread'},
{'affinity':'43','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_11/waiting','type':'thread'},
{'affinity':'28','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_12/waiting','type':'thread'},
{'affinity':'52','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_13/waiting','type':'thread'},
{'affinity':'8', 'memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_14/waiting','type':'thread'},
{'affinity':'11','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_15/waiting','type':'thread'},
{'affinity':'8', 'memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_16/waiting','type':'thread'},
{'affinity':'7', 'memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_17/waiting','type':'thread'},
{'affinity':'24','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_18/waiting','type':'thread'},
{'affinity':'58','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_19/waiting','type':'thread'},
{'affinity':'46','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_20/waiting','type':'thread'},
{'affinity':'49','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_21/waiting','type':'thread'},
{'affinity':'58','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_22/waiting','type':'thread'},
{'affinity':'53','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_23/waiting','type':'thread'},
{'affinity':'46','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_24/waiting','type':'thread'},
{'affinity':'50','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_25/waiting','type':'thread'},
{'affinity':'51','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_26/waiting','type':'thread'},
{'affinity':'54','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_27/waiting','type':'thread'},
{'affinity':'32','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_28/waiting','type':'thread'},
{'affinity':'37','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_29/waiting','type':'thread'},
{'affinity':'18','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_30/waiting','type':'thread'},
{'affinity':'18','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_31/waiting','type':'thread'},
{'affinity':'20','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_32/waiting','type':'thread'},
{'affinity':'32','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_33/waiting','type':'thread'},
{'affinity':'54','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_34/waiting','type':'thread'},
{'affinity':'36','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/parseSocketBuffers_35/waiting','type':'thread'},
{'affinity':'44','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Responder_0/waiting','type':'thread'},
{'affinity':'39','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Responder_1/waiting','type':'thread'},
{'affinity':'30','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Responder_2/waiting','type':'thread'},
{'affinity':'16','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Responder_3/waiting','type':'thread'},
{'affinity':'29','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Responder_4/waiting','type':'thread'},
{'affinity':'38','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Responder_5/waiting','type':'thread'},
{'affinity':'45','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Responder_6/waiting','type':'thread'},
{'affinity':'42','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Responder_7/waiting','type':'thread'},
{'affinity':'20','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:fifo/PeerTransport/waiting','type':'thread'},
{'affinity':'35','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/buPoster/waiting','type':'thread'},
{'affinity':'55','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/monitoring/waiting','type':'thread'},
{'affinity':'9', 'memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Builder_0/waiting','type':'thread'},
{'affinity':'18','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Builder_1/waiting','type':'thread'},
{'affinity':'12','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Builder_2/waiting','type':'thread'},
{'affinity':'15','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Builder_3/waiting','type':'thread'},
{'affinity':'56','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Builder_4/waiting','type':'thread'},
{'affinity':'40', 'memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Builder_5/waiting','type':'thread'},
{'affinity':'26','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Writer_0/waiting','type':'thread'},
{'affinity':'27','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Writer_1/waiting','type':'thread'},
{'affinity':'19','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Writer_2/waiting','type':'thread'},
{'affinity':'27','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Writer_3/waiting','type':'thread'},
{'affinity':'23','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Writer_4/waiting','type':'thread'},
{'affinity':'0', 'memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Writer_5/waiting','type':'thread'},
{'affinity':'35','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/Writer_6/waiting','type':'thread'},
{'affinity':'8', 'memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/eventFragment/waiting','type':'thread'},
{'affinity':'23','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/requestFragments/waiting','type':'thread'},
{'affinity':'57','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/fileAccounting/waiting','type':'thread'},
{'affinity':'15','memnodes':'all','mempolicy':'interleaved','package':'numa','pattern':'urn:toolbox-task-workloop:evb::(.+)/resourceMonitor/waiting','type':'thread'},
]
else:
policy = [
{'affinity':'15','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:pt::ibv::acceptor(.*)/waiting','type':'thread'},
{'affinity':'58','memnodes':'all','mempolicy':'local','package':'numa','pattern':'urn:toolbox-task-workloop:pt::ibv::completionworkloopr(.*)/polling','type':'thread'},
......
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