Commit aef7d4e3 authored by Jonas Kaufmann's avatar Jonas Kaufmann Committed by Antoine Kaufmann
Browse files

move simulator helper functions to own module

moved functions:
- create_basic_hosts()
- create_multinic_hosts()
- create_dctcp_hosts()
parent f9113631
......@@ -23,6 +23,7 @@
import simbricks.experiments as exp
import simbricks.simulators as sim
import simbricks.nodeconfig as node
from simbricks.simulator_utils import create_basic_hosts
# iperf UDP test
......@@ -98,11 +99,11 @@ for n_client in num_client_types:
raise NameError(nic_type)
# create servers and clients
servers = sim.create_basic_hosts(e, 1, 'server', net, nic_class, host_class,
servers = create_basic_hosts(e, 1, 'server', net, nic_class, host_class,
nc_class, node.IperfUDPServer)
clients = sim.create_basic_hosts(e, n_client, 'client', net, nic_class, host_class,
clients = create_basic_hosts(e, n_client, 'client', net, nic_class, host_class,
nc_class, node.IperfUDPClient, ip_start=2)
clients[n_client-1].node_config.app.is_last = True
......
......@@ -23,6 +23,7 @@
import simbricks.experiments as exp
import simbricks.simulators as sim
import simbricks.nodeconfig as node
from simbricks.simulator_utils import create_basic_hosts
# iperf UDP Load Scalability test
......@@ -94,14 +95,14 @@ for rate in rate_types:
raise NameError(nic_type)
# create servers and clients
servers = sim.create_basic_hosts(e, 1, 'server', net, nic_class, host_class,
servers = create_basic_hosts(e, 1, 'server', net, nic_class, host_class,
nc_class, node.IperfUDPServer)
if rate == '0m':
clients = sim.create_basic_hosts(e, 1, 'client', net, nic_class, host_class,
clients = create_basic_hosts(e, 1, 'client', net, nic_class, host_class,
nc_class, node.IperfUDPClientSleep, ip_start=2)
else:
clients = sim.create_basic_hosts(e, 1, 'client', net, nic_class, host_class,
clients = create_basic_hosts(e, 1, 'client', net, nic_class, host_class,
nc_class, node.IperfUDPClient, ip_start=2)
clients[0].wait = True
......
......@@ -23,6 +23,7 @@
import simbricks.experiments as exp
import simbricks.simulators as sim
import simbricks.nodeconfig as node
from simbricks.simulator_utils import create_dctcp_hosts
# iperf TCP_multi_client test
......@@ -110,9 +111,9 @@ for mtu in types_of_mtu:
raise NameError(c)
servers = sim.create_dctcp_hosts(e, num_pairs, 'server', net, nic_class, host_class,
servers = create_dctcp_hosts(e, num_pairs, 'server', net, nic_class, host_class,
nc_class, node.DctcpServer, freq, mtu)
clients = sim.create_dctcp_hosts(e, num_pairs, 'client', net, nic_class, host_class,
clients = create_dctcp_hosts(e, num_pairs, 'client', net, nic_class, host_class,
nc_class, node.DctcpClient, freq, mtu, ip_start=num_pairs+1)
......
......@@ -26,6 +26,7 @@ import simbricks.experiments as exp
import simbricks.simulators as sim
import simbricks.proxy as proxy
import simbricks.nodeconfig as node
from simbricks.simulator_utils import create_multinic_hosts
host_types = ['qemu', 'gem5', 'qt']
n_nets = [1, 2, 3, 4, 8, 16, 32]
......@@ -105,7 +106,7 @@ for host_type in host_types:
# create servers and clients
m = int(n_host / 2)
servers = sim.create_multinic_hosts(e, m, 'server_%d' % (i,),
servers = create_multinic_hosts(e, m, 'server_%d' % (i,),
switch, host_class, node.I40eLinuxNode,
node.MemcachedServer, ip_start = i * n_host + 1,
ip_prefix=16)
......@@ -113,7 +114,7 @@ for host_type in host_types:
e.assign_sim_host(s, h_i)
e.assign_sim_host(s.nics[0].multinic, h_i)
clients = sim.create_multinic_hosts(e, m, 'client_%d' % (i,),
clients = create_multinic_hosts(e, m, 'client_%d' % (i,),
switch, host_class, node.I40eLinuxNode,
node.MemcachedClient, ip_start = i * n_host + 1 + m,
ip_prefix=16)
......
......@@ -24,6 +24,7 @@ import simbricks.experiments as exp
import simbricks.simulators as sim
import simbricks.proxy as proxy
import simbricks.nodeconfig as node
from simbricks.simulator_utils import create_basic_hosts
host_types = ['qemu', 'gem5', 'qt']
n_nets = [1, 2, 3, 4]
......@@ -74,7 +75,7 @@ for host_type in host_types:
# create servers and clients
m = n_client
if i == 0 or separate_server:
servers = sim.create_basic_hosts(e, 1, 'server_%d' % (i,),
servers = create_basic_hosts(e, 1, 'server_%d' % (i,),
switch, sim.I40eNIC, host_class, node.I40eLinuxNode,
node.NetperfServer, ip_start = i * (n_client + 1) + 1)
if not separate_server:
......@@ -83,7 +84,7 @@ for host_type in host_types:
e.assign_sim_host(servers[0], h_i)
e.assign_sim_host(servers[0].nics[0], h_i)
clients = sim.create_basic_hosts(e, m, 'client_%d' % (i,),
clients = create_basic_hosts(e, m, 'client_%d' % (i,),
switch, sim.I40eNIC, host_class, node.I40eLinuxNode,
node.NetperfClient, ip_start = i * (n_client + 1) + 2)
......
......@@ -24,6 +24,7 @@ import simbricks.experiments as exp
import simbricks.simulators as sim
import simbricks.proxy as proxy
import simbricks.nodeconfig as node
from simbricks.simulator_utils import create_basic_hosts
host_types = ['qemu', 'gem5', 'qt']
nic_types = ['i40e', 'cd_bm', 'cd_verilator']
......@@ -68,10 +69,10 @@ for host_type in host_types:
raise NameError(nic_type)
# create servers and clients
servers = sim.create_basic_hosts(e, 1, 'server', net, nic_class, host_class,
servers = create_basic_hosts(e, 1, 'server', net, nic_class, host_class,
nc_class, node.NetperfServer)
clients = sim.create_basic_hosts(e, n, 'client', net, nic_class, host_class,
clients = create_basic_hosts(e, n, 'client', net, nic_class, host_class,
nc_class, node.NetperfClient, ip_start = 2)
for c in clients:
......
......@@ -23,6 +23,7 @@
import simbricks.experiments as exp
import simbricks.simulators as sim
import simbricks.nodeconfig as node
from simbricks.simulator_utils import create_basic_hosts
e = exp.Experiment('gem5-i40e-pair')
#e.timeout = 5 * 60
......@@ -30,10 +31,10 @@ e.checkpoint = True
net = sim.SwitchNet()
e.add_network(net)
servers = sim.create_basic_hosts(e, 1, 'server', net, sim.I40eNIC, sim.Gem5Host,
servers = create_basic_hosts(e, 1, 'server', net, sim.I40eNIC, sim.Gem5Host,
node.I40eLinuxNode, node.IperfTCPServer)
clients = sim.create_basic_hosts(e, 2, 'client', net, sim.I40eNIC, sim.Gem5Host,
clients = create_basic_hosts(e, 2, 'client', net, sim.I40eNIC, sim.Gem5Host,
node.I40eLinuxNode, node.IperfTCPClient, ip_start = 2)
for h in servers + clients:
......
......@@ -23,6 +23,7 @@
import simbricks.experiments as exp
import simbricks.simulators as sim
import simbricks.nodeconfig as node
from simbricks.simulator_utils import create_basic_hosts
# iperf TCP_multi_client test
......@@ -60,24 +61,24 @@ for n in kinds_of_net:
e.checkpoint = True
if c == 'cv':
servers = sim.create_basic_hosts(e, 1, 'server', net, sim.CorundumVerilatorNIC, sim.Gem5Host,
servers = create_basic_hosts(e, 1, 'server', net, sim.CorundumVerilatorNIC, sim.Gem5Host,
node.CorundumLinuxNode, node.IperfTCPServer)
clients = sim.create_basic_hosts(e, num_client, 'client', net, sim.CorundumVerilatorNIC, sim.Gem5Host,
clients = create_basic_hosts(e, num_client, 'client', net, sim.CorundumVerilatorNIC, sim.Gem5Host,
node.CorundumLinuxNode, node.IperfTCPClient, ip_start = 2)
if c == 'cb':
servers = sim.create_basic_hosts(e, 1, 'server', net, sim.CorundumBMNIC, sim.Gem5Host,
servers = create_basic_hosts(e, 1, 'server', net, sim.CorundumBMNIC, sim.Gem5Host,
node.CorundumLinuxNode, node.IperfTCPServer)
clients = sim.create_basic_hosts(e, num_client, 'client', net, sim.CorundumBMNIC, sim.Gem5Host,
clients = create_basic_hosts(e, num_client, 'client', net, sim.CorundumBMNIC, sim.Gem5Host,
node.CorundumLinuxNode, node.IperfTCPClient, ip_start = 2)
if c == 'ib':
servers = sim.create_basic_hosts(e, 1, 'server', net, sim.I40eNIC, sim.Gem5Host,
servers = create_basic_hosts(e, 1, 'server', net, sim.I40eNIC, sim.Gem5Host,
node.I40eLinuxNode, node.IperfTCPServer)
clients = sim.create_basic_hosts(e, num_client, 'client', net, sim.I40eNIC, sim.Gem5Host,
clients = create_basic_hosts(e, num_client, 'client', net, sim.I40eNIC, sim.Gem5Host,
node.I40eLinuxNode, node.IperfTCPClient, ip_start = 2)
......
......@@ -23,6 +23,7 @@
import simbricks.experiments as exp
import simbricks.simulators as sim
import simbricks.nodeconfig as node
from simbricks.simulator_utils import create_basic_hosts
# iperf TCP_single test
......@@ -59,24 +60,24 @@ for n in kinds_of_net:
e.add_network(net)
if c == 'cv':
servers = sim.create_basic_hosts(e, 1, 'server', net, sim.CorundumVerilatorNIC, sim.Gem5Host,
servers = create_basic_hosts(e, 1, 'server', net, sim.CorundumVerilatorNIC, sim.Gem5Host,
node.CorundumLinuxNode, node.IperfTCPServer)
clients = sim.create_basic_hosts(e, 1, 'client', net, sim.CorundumVerilatorNIC, sim.Gem5Host,
clients = create_basic_hosts(e, 1, 'client', net, sim.CorundumVerilatorNIC, sim.Gem5Host,
node.CorundumLinuxNode, node.IperfTCPClient, ip_start = 2)
if c == 'cb':
servers = sim.create_basic_hosts(e, 1, 'server', net, sim.CorundumBMNIC, sim.Gem5Host,
servers = create_basic_hosts(e, 1, 'server', net, sim.CorundumBMNIC, sim.Gem5Host,
node.CorundumLinuxNode, node.IperfTCPServer)
clients = sim.create_basic_hosts(e, 1, 'client', net, sim.CorundumBMNIC, sim.Gem5Host,
clients = create_basic_hosts(e, 1, 'client', net, sim.CorundumBMNIC, sim.Gem5Host,
node.CorundumLinuxNode, node.IperfTCPClient, ip_start = 2)
if c == 'ib':
servers = sim.create_basic_hosts(e, 1, 'server', net, sim.I40eNIC, sim.Gem5Host,
servers = create_basic_hosts(e, 1, 'server', net, sim.I40eNIC, sim.Gem5Host,
node.I40eLinuxNode, node.IperfTCPServer)
clients = sim.create_basic_hosts(e, 1, 'client', net, sim.I40eNIC, sim.Gem5Host,
clients = create_basic_hosts(e, 1, 'client', net, sim.I40eNIC, sim.Gem5Host,
node.I40eLinuxNode, node.IperfTCPClient, ip_start = 2)
clients[0].wait = True
......
......@@ -23,6 +23,7 @@
import simbricks.experiments as exp
import simbricks.simulators as sim
import simbricks.nodeconfig as node
from simbricks.simulator_utils import create_basic_hosts
# iperf TCP_multi_client test
......@@ -61,24 +62,24 @@ for n in kinds_of_net:
e.add_network(net)
if c == 'cv':
servers = sim.create_basic_hosts(e, 1, 'server', net, sim.CorundumVerilatorNIC, sim.Gem5Host,
servers = create_basic_hosts(e, 1, 'server', net, sim.CorundumVerilatorNIC, sim.Gem5Host,
node.CorundumLinuxNode, node.IperfUDPServer)
clients = sim.create_basic_hosts(e, num_client, 'client', net, sim.CorundumVerilatorNIC, sim.Gem5Host,
clients = create_basic_hosts(e, num_client, 'client', net, sim.CorundumVerilatorNIC, sim.Gem5Host,
node.CorundumLinuxNode, node.IperfUDPClient, ip_start = 2)
if c == 'cb':
servers = sim.create_basic_hosts(e, 1, 'server', net, sim.CorundumBMNIC, sim.Gem5Host,
servers = create_basic_hosts(e, 1, 'server', net, sim.CorundumBMNIC, sim.Gem5Host,
node.CorundumLinuxNode, node.IperfUDPServer)
clients = sim.create_basic_hosts(e, num_client, 'client', net, sim.CorundumBMNIC, sim.Gem5Host,
clients = create_basic_hosts(e, num_client, 'client', net, sim.CorundumBMNIC, sim.Gem5Host,
node.CorundumLinuxNode, node.IperfUDPClient, ip_start = 2)
if c == 'ib':
servers = sim.create_basic_hosts(e, 1, 'server', net, sim.I40eNIC, sim.Gem5Host,
servers = create_basic_hosts(e, 1, 'server', net, sim.I40eNIC, sim.Gem5Host,
node.I40eLinuxNode, node.IperfUDPServer)
clients = sim.create_basic_hosts(e, num_client, 'client', net, sim.I40eNIC, sim.Gem5Host,
clients = create_basic_hosts(e, num_client, 'client', net, sim.I40eNIC, sim.Gem5Host,
node.I40eLinuxNode, node.IperfUDPClient, ip_start = 2)
......
......@@ -23,6 +23,7 @@
import simbricks.experiments as exp
import simbricks.simulators as sim
import simbricks.nodeconfig as node
from simbricks.simulator_utils import create_basic_hosts
# iperf TCP_multi_client test
......@@ -89,9 +90,9 @@ for mode in types_of_mode:
raise NameError(c)
servers = sim.create_basic_hosts(e, num_pairs, 'server', net, nic_class, host_class,
servers = create_basic_hosts(e, num_pairs, 'server', net, nic_class, host_class,
nc_class, node.IperfTCPServer)
clients = sim.create_basic_hosts(e, num_pairs, 'client', net, nic_class, host_class,
clients = create_basic_hosts(e, num_pairs, 'client', net, nic_class, host_class,
nc_class, node.IperfTCPClient, ip_start=num_pairs+1)
for se in servers:
......
......@@ -23,6 +23,7 @@
import simbricks.experiments as exp
import simbricks.simulators as sim
import simbricks.nodeconfig as node
from simbricks.simulator_utils import create_basic_hosts
server_cores_configs = [1, 2, 4, 8]
......@@ -51,10 +52,10 @@ for server_cores in server_cores_configs:
else:
n = node.I40eLinuxNode
servers = sim.create_basic_hosts(e, 1, 'server', net, sim.I40eNIC, sim.QemuHost,
servers = create_basic_hosts(e, 1, 'server', net, sim.I40eNIC, sim.QemuHost,
n, node.RPCServer)
clients = sim.create_basic_hosts(e, num_clients, 'client', net, sim.I40eNIC,
clients = create_basic_hosts(e, num_clients, 'client', net, sim.I40eNIC,
sim.QemuHost, n, node.RPCClient, ip_start = 2)
for h in servers:
......
......@@ -23,6 +23,7 @@
import simbricks.experiments as exp
import simbricks.simulators as sim
import simbricks.nodeconfig as node
from simbricks.simulator_utils import create_basic_hosts
configs = [
(node.I40eLinuxNode, node.HTTPDLinux, node.HTTPCLinux, 'linux'),
......@@ -45,10 +46,10 @@ for (nodec, appc, clientc, label) in configs:
net = sim.SwitchNet()
e.add_network(net)
servers = sim.create_basic_hosts(e, 1, 'server', net, sim.I40eNIC,
servers = create_basic_hosts(e, 1, 'server', net, sim.I40eNIC,
sim.QemuHost, nodec, appc)
clients = sim.create_basic_hosts(e, num_clients, 'client', net, sim.I40eNIC,
clients = create_basic_hosts(e, num_clients, 'client', net, sim.I40eNIC,
sim.QemuHost, nodec, clientc, ip_start = 2)
for h in servers:
......
......@@ -23,6 +23,7 @@
import simbricks.experiments as exp
import simbricks.simulators as sim
import simbricks.nodeconfig as node
from simbricks.simulator_utils import create_basic_hosts
mpcs = [1, 8, 128]
......@@ -52,10 +53,10 @@ for mpc in mpcs:
else:
n = node.I40eLinuxNode
servers = sim.create_basic_hosts(e, 1, 'server', net, sim.I40eNIC, sim.QemuHost,
servers = create_basic_hosts(e, 1, 'server', net, sim.I40eNIC, sim.QemuHost,
n, node.RPCServer)
clients = sim.create_basic_hosts(e, num_clients, 'client', net, sim.I40eNIC,
clients = create_basic_hosts(e, num_clients, 'client', net, sim.I40eNIC,
sim.QemuHost, n, node.RPCClient, ip_start = 2)
for h in servers:
......
......@@ -23,6 +23,7 @@
import simbricks.experiments as exp
import simbricks.simulators as sim
import simbricks.nodeconfig as node
from simbricks.simulator_utils import create_basic_hosts
msg_sizes = [64, 1024, 8092]
......@@ -51,10 +52,10 @@ for msg_size in msg_sizes:
else:
n = node.I40eLinuxNode
servers = sim.create_basic_hosts(e, 1, 'server', net, sim.I40eNIC, sim.QemuHost,
servers = create_basic_hosts(e, 1, 'server', net, sim.I40eNIC, sim.QemuHost,
n, node.RPCServer)
clients = sim.create_basic_hosts(e, num_clients, 'client', net, sim.I40eNIC,
clients = create_basic_hosts(e, num_clients, 'client', net, sim.I40eNIC,
sim.QemuHost, n, node.RPCClient, ip_start = 2)
for h in servers:
......
......@@ -23,12 +23,15 @@
import simbricks.experiments as exp
import simbricks.simulators as sim
import simbricks.nodeconfig as node
from simbricks.simulator_utils import create_basic_hosts
host_types = ['qemu', 'gem5', 'qt']
nic_types = ['i40e', 'cd_bm', 'cd_verilator']
net_types = ['switch', 'ns3']
experiments = []
# Create multiple experiments with different simulator permutations, which can
# be filtered later.
for host_type in host_types:
for nic_type in nic_types:
for net_type in net_types:
......@@ -72,10 +75,10 @@ for host_type in host_types:
raise NameError(nic_type)
# create servers and clients
servers = sim.create_basic_hosts(e, 1, 'server', net, nic_class, host_class,
servers = create_basic_hosts(e, 1, 'server', net, nic_class, host_class,
nc_class, node.NetperfServer)
clients = sim.create_basic_hosts(e, 1, 'client', net, nic_class, host_class,
clients = create_basic_hosts(e, 1, 'client', net, nic_class, host_class,
nc_class, node.NetperfClient, ip_start = 2)
for c in clients:
......
......@@ -23,6 +23,7 @@
import simbricks.experiments as exp
import simbricks.simulators as sim
import simbricks.nodeconfig as node
from simbricks.simulator_utils import create_basic_hosts
# iperf TCP_single test
......@@ -89,7 +90,7 @@ for host_type in host_types:
# create servers and clients
"""
servers = sim.create_basic_hosts(e, 1, 'server', net, nic_class, host_class,
servers = create_basic_hosts(e, 1, 'server', net, nic_class, host_class,
nc_class, node.NoTraffic)
for s in servers:
......@@ -99,7 +100,7 @@ for host_type in host_types:
"""
clients = sim.create_basic_hosts(e, n_client, 'client', net, nic_class, host_class,
clients = create_basic_hosts(e, n_client, 'client', net, nic_class, host_class,
nc_class, node.NoTraffic, ip_start=2)
clients[n_client-1].wait = True
......
......@@ -23,6 +23,7 @@
import simbricks.experiments as exp
import simbricks.simulators as sim
import simbricks.nodeconfig as node
from simbricks.simulator_utils import create_basic_hosts
host_configs = ['qemu', 'gt', 'qt']
seq_configs = ['swseq', 'ehseq', 'tofino']
......@@ -91,14 +92,14 @@ for proto_config in proto_configs:
# endhost sequencer
if seq_config == 'ehseq' and proto_config == 'nopaxos':
sequencer = sim.create_basic_hosts(e, 1, 'sequencer', net, nic_class,
sequencer = create_basic_hosts(e, 1, 'sequencer', net, nic_class,
host_class, nc_class, node.NOPaxosSequencer, ip_start = 100)
sequencer[0].sleep = 1
sequencer[0].node_config.disk_image = 'nopaxos'
sequencer[0].pcidevs[0].sync_period = sync_period
sequencer[0].sync_period = sync_period
replicas = sim.create_basic_hosts(e, 3, 'replica', net, nic_class,
replicas = create_basic_hosts(e, 3, 'replica', net, nic_class,
host_class, nc_class, replica_class)
for i in range(len(replicas)):
replicas[i].node_config.app.index = i
......@@ -107,7 +108,7 @@ for proto_config in proto_configs:
replicas[i].pcidevs[0].sync_period = sync_period
replicas[i].sync_period = sync_period
clients = sim.create_basic_hosts(e, num_c, 'client', net, nic_class,
clients = create_basic_hosts(e, num_c, 'client', net, nic_class,
host_class, nc_class, client_class, ip_start = 4)
for c in clients:
......
......@@ -23,16 +23,17 @@
import simbricks.experiments as exp
import simbricks.simulators as sim
import simbricks.nodeconfig as node
from simbricks.simulator_utils import create_basic_hosts
e = exp.Experiment('qemu-e1000-pair')
net = sim.SwitchNet()
e.add_network(net)
servers = sim.create_basic_hosts(e, 1, 'server', net, sim.E1000NIC, sim.QemuHost,
servers = create_basic_hosts(e, 1, 'server', net, sim.E1000NIC, sim.QemuHost,
node.E1000LinuxNode, node.IperfTCPServer)
clients = sim.create_basic_hosts(e, 1, 'client', net, sim.E1000NIC, sim.QemuHost,
clients = create_basic_hosts(e, 1, 'client', net, sim.E1000NIC, sim.QemuHost,
node.E1000LinuxNode, node.IperfTCPClient, ip_start = 2)
for c in clients:
......
......@@ -23,16 +23,17 @@
import simbricks.experiments as exp
import simbricks.simulators as sim
import simbricks.nodeconfig as node
from simbricks.simulator_utils import create_basic_hosts
e = exp.Experiment('qemu-i40e-pair')
net = sim.SwitchNet()
e.add_network(net)
servers = sim.create_basic_hosts(e, 1, 'server', net, sim.I40eNIC, sim.QemuHost,
servers = create_basic_hosts(e, 1, 'server', net, sim.I40eNIC, sim.QemuHost,
node.I40eLinuxNode, node.IperfTCPServer)
clients = sim.create_basic_hosts(e, 2, 'client', net, sim.I40eNIC, sim.QemuHost,
clients = create_basic_hosts(e, 2, 'client', net, sim.I40eNIC, sim.QemuHost,
node.I40eLinuxNode, node.IperfTCPClient, ip_start = 2)
for c in clients:
......
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