Commit ba0c722f authored by Hejing Li's avatar Hejing Li
Browse files

simulator.py: add MemNic, NetMem run paramemeters

parent 7f6b3145
...@@ -232,6 +232,9 @@ class NetMemSim(NICSim): ...@@ -232,6 +232,9 @@ class NetMemSim(NICSim):
self.start_tick = 0 self.start_tick = 0
self.sync_period = 500 self.sync_period = 500
self.eth_latency = 500 self.eth_latency = 500
self.addr = 0xe000000000000000
self.size = 1024 * 1024 * 1024 # 1GB
self.as_id = 0
def full_name(self): def full_name(self):
return 'netmem.' + self.name return 'netmem.' + self.name
...@@ -715,9 +718,14 @@ class MemNIC(MemDevSim): ...@@ -715,9 +718,14 @@ class MemNIC(MemDevSim):
f'{env.repodir}/sims/mem/memnic/memnic' f'{env.repodir}/sims/mem/memnic/memnic'
f' {env.dev_mem_path(self)} {env.nic_eth_path(self)}' f' {env.dev_mem_path(self)} {env.nic_eth_path(self)}'
f' {env.dev_shm_path(self)}' f' {env.dev_shm_path(self)}'
f' {self.sync_mode} {self.start_tick} {self.sync_period}'
f' {self.mem_latency} {self.eth_latency}'
) )
if self.mac is not None:
cmd += ' ' + (''.join(reversed(self.mac.split(':'))))
cmd += f' {self.sync_mode} {self.start_tick} {self.sync_period}'
cmd += f' {self.mem_latency} {self.eth_latency}'
return cmd return cmd
def sockets_cleanup(self, env): def sockets_cleanup(self, env):
...@@ -731,8 +739,14 @@ class NetMem(NetMemSim): ...@@ -731,8 +739,14 @@ class NetMem(NetMemSim):
def run_cmd(self, env): def run_cmd(self, env):
cmd = ( cmd = (
f'{env.repodir}/sims/mem/netmem/netmem' f'{env.repodir}/sims/mem/netmem/netmem'
f' {env.nic_eth_path(self)} {env.dev_shm_path(self)}' f' {self.size} {self.addr} {self.as_id}'
f' {self.sync_mode} {self.start_tick} {self.sync_period}' f' {env.nic_eth_path(self)}'
f' {self.eth_latency}' f' {env.dev_shm_path(self)}'
) )
if self.mac is not None:
cmd += ' ' + (''.join(reversed(self.mac.split(':'))))
cmd += f' {self.sync_mode} {self.start_tick} {self.sync_period}'
cmd += f' {self.eth_latency}'
return cmd return cmd
Markdown is supported
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