Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Xin Wang
codes-dev
Commits
2e4e0f3e
Commit
2e4e0f3e
authored
Jan 20, 2017
by
Caitlin Ross
Browse files
Merge branch 'master' into vis-changes
parents
1203794b
d4a1ac9a
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
codes/net/slimfly.h
View file @
2e4e0f3e
...
...
@@ -52,7 +52,7 @@ struct slim_terminal_message
/* For routing */
int
intm_group_id
;
int
intm_router_id
;
int
chunk_id
;
u
int
64_t
chunk_id
;
uint64_t
packet_size
;
uint64_t
message_id
;
uint64_t
total_size
;
...
...
@@ -73,8 +73,11 @@ struct slim_terminal_message
short
path_type
;
tw_stime
saved_available_time
;
tw_stime
saved_avg_time
;
tw_stime
saved_credit_time
;
tw_stime
saved_collective_init_time
;
tw_stime
saved_rcv_time
;
tw_stime
saved_busy_time
;
tw_stime
saved_total_time
;
// tw_stime saved_credit_time;
// tw_stime saved_collective_init_time;
tw_stime
saved_hist_start_time
;
tw_stime
msg_start_time
;
...
...
src/network-workloads/model-net-mpi-replay.c
View file @
2e4e0f3e
...
...
@@ -603,8 +603,9 @@ static int rm_matching_rcv(nw_state * ns,
qlist_for_each
(
ent
,
&
ns
->
pending_recvs_queue
){
qi
=
qlist_entry
(
ent
,
mpi_msgs_queue
,
ql
);
if
((
qi
->
num_bytes
==
qitem
->
num_bytes
)
&&
((
qi
->
tag
==
qitem
->
tag
)
||
qi
->
tag
==
-
1
)
if
(
//(qi->num_bytes == qitem->num_bytes)
//&&
((
qi
->
tag
==
qitem
->
tag
)
||
qi
->
tag
==
-
1
)
&&
((
qi
->
source_rank
==
qitem
->
source_rank
)
||
qi
->
source_rank
==
-
1
))
{
matched
=
1
;
...
...
src/network-workloads/model-net-synthetic-slimfly.c
View file @
2e4e0f3e
...
...
@@ -230,11 +230,11 @@ static void issue_event(
}
if
(
load
!=
0
)
{
MEAN_INTERVAL
=
bytes_to_ns
(
this_packet_size
,
load
*
this_global_bandwidth
)
+
this_link_delay
;
MEAN_INTERVAL
=
bytes_to_ns
(
this_packet_size
,
load
*
this_global_bandwidth
);
}
/* skew each kickoff event slightly to help avoid event ties later on */
kickoff_time
=
g_tw_lookahead
+
MEAN_INTERVAL
+
tw_rand_exponential
(
lp
->
rng
,
(
double
)
MEAN_INTERVAL
/
100
);
kickoff_time
=
g_tw_lookahead
+
tw_rand_exponential
(
lp
->
rng
,
MEAN_INTERVAL
);
e
=
tw_event_new
(
lp
->
gid
,
kickoff_time
,
lp
);
m
=
tw_event_data
(
e
);
...
...
@@ -256,8 +256,13 @@ static void handle_kickoff_rev_event(
svr_msg
*
m
,
tw_lp
*
lp
)
{
if
(
b
->
c1
)
tw_rand_reverse_unif
(
lp
->
rng
);
ns
->
msg_sent_count
--
;
model_net_event_rc
(
net_id
,
lp
,
PAYLOAD_SZ
);
tw_rand_reverse_unif
(
lp
->
rng
);
}
static
void
handle_kickoff_event
(
svr_state
*
ns
,
...
...
@@ -284,6 +289,7 @@ static void handle_kickoff_event(
/* in case of uniform random traffic, send to a random destination. */
if
(
traffic
==
UNIFORM
)
{
b
->
c1
=
1
;
local_dest
=
tw_rand_integer
(
lp
->
rng
,
0
,
num_nodes
-
1
);
// printf("\n LP %ld sending to %d ", lp->gid, local_dest);
}
...
...
src/networks/model-net/fattree.c
View file @
2e4e0f3e
...
...
@@ -2773,7 +2773,9 @@ void fattree_terminal_final( ft_terminal_state * s, tw_lp * lp )
#endif
}
qhash_finalize
(
s
->
rank_tbl
);
if
(
s
->
rank_tbl
)
qhash_finalize
(
s
->
rank_tbl
);
rc_stack_destroy
(
s
->
st
);
// free(s->vc_occupancy);
free
(
s
->
terminal_msgs
);
...
...
src/networks/model-net/slimfly.c
View file @
2e4e0f3e
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment