Commit 7b01cadc authored by Hejing Li's avatar Hejing Li
Browse files

Merge branch 'master' of github.com:simbricks/simbricks

parents 9ca4cd28 8bd1069a
...@@ -28,7 +28,7 @@ host_configs = ['qemu', 'gt'] ...@@ -28,7 +28,7 @@ host_configs = ['qemu', 'gt']
seq_configs = ['swseq', 'ehseq'] seq_configs = ['swseq', 'ehseq']
nic_configs = ['ib', 'cb', 'cv'] nic_configs = ['ib', 'cb', 'cv']
proto_configs = ['vr', 'nopaxos'] proto_configs = ['vr', 'nopaxos']
num_client_configs = [1, 2, 3, 4, 5, 6, 7, 8] num_client_configs = [1, 2, 3, 4, 5, 6, 7, 8, 10, 12]
experiments = [] experiments = []
sync_period = 200 sync_period = 200
......
...@@ -416,7 +416,7 @@ class NOPaxosClient(AppConfig): ...@@ -416,7 +416,7 @@ class NOPaxosClient(AppConfig):
for ip in self.server_ips: for ip in self.server_ips:
cmds.append('ping -c 1 ' + ip) cmds.append('ping -c 1 ' + ip)
cmds.append('/root/nopaxos/bench/client -c /root/nopaxos.config ' + cmds.append('/root/nopaxos/bench/client -c /root/nopaxos.config ' +
'-m nopaxos -n 2000') '-m nopaxos -n 40000')
if self.is_last: if self.is_last:
cmds.append('sleep 1') cmds.append('sleep 1')
else: else:
......
...@@ -197,10 +197,11 @@ class Gem5Host(HostSim): ...@@ -197,10 +197,11 @@ class Gem5Host(HostSim):
f'--num-cpus={self.node_config.cores} ' f'--num-cpus={self.node_config.cores} '
'--ddio-enabled --ddio-way-part=8 --mem-type=DDR4_2400_16x4 ') '--ddio-enabled --ddio-way-part=8 --mem-type=DDR4_2400_16x4 ')
if (env.no_simbricks): if (env.no_simbricks):
cmd += '--no-simbricks ' cmd += '--no-simbricks '
if env.create_cp:
cmd += '--max-checkpoints=1 '
if env.restore_cp: if env.restore_cp:
cmd += '-r 0 ' cmd += '-r 0 '
......
...@@ -31,7 +31,7 @@ if len(sys.argv) != 2: ...@@ -31,7 +31,7 @@ if len(sys.argv) != 2:
basedir = sys.argv[1] + '/' basedir = sys.argv[1] + '/'
types_of_seq = ['ehseq', 'swseq'] types_of_seq = ['ehseq', 'swseq']
num_clients = [1, 2, 3, 4, 5, 6, 7, 8] num_clients = [1, 2, 3, 4, 5, 6, 7, 8, 10, 12]
...@@ -41,7 +41,7 @@ for num_c in num_clients: ...@@ -41,7 +41,7 @@ for num_c in num_clients:
line = [str(num_c)] line = [str(num_c)]
for seq in types_of_seq: for seq in types_of_seq:
path_pat = '%snopaxos-gt-cb-%s-%d-1.json' % (basedir, seq, num_c) path_pat = '%snopaxos-gt-ib-%s-%d-1.json' % (basedir, seq, num_c)
res = utils.parse_nopaxos.parse_nopaxos_run(num_c, seq, path_pat) res = utils.parse_nopaxos.parse_nopaxos_run(num_c, seq, path_pat)
#print(path_pat) #print(path_pat)
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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