Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
codes
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
38
Issues
38
List
Boards
Labels
Milestones
Merge Requests
8
Merge Requests
8
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
codes
codes
Commits
9c2e5cb3
Commit
9c2e5cb3
authored
Dec 13, 2013
by
Misbah Mubarak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updates to dragonfly+torus models; removing the dependency of MODELNET_GRP from the code
parent
bd8eca73
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
13 deletions
+15
-13
src/models/networks/model-net/dragonfly.c
src/models/networks/model-net/dragonfly.c
+10
-8
src/models/networks/model-net/torus.c
src/models/networks/model-net/torus.c
+5
-5
No files found.
src/models/networks/model-net/dragonfly.c
View file @
9c2e5cb3
...
...
@@ -67,10 +67,10 @@ static void dragonfly_packet_event(char* category, tw_lpid final_dest_lp, int pa
int
mapping_grp_id
,
mapping_rep_id
,
mapping_type_id
,
mapping_offset
;
codes_mapping_get_lp_info
(
sender
->
gid
,
lp_group_name
,
&
mapping_grp_id
,
&
mapping_type_id
,
lp_type_name
,
&
mapping_rep_id
,
&
mapping_offset
);
codes_mapping_get_lp_id
(
"MODELNET_GRP"
,
"modelnet_dragonfly"
,
mapping_rep_id
,
mapping_offset
,
&
local_nic_id
);
codes_mapping_get_lp_id
(
lp_group_name
,
"modelnet_dragonfly"
,
mapping_rep_id
,
mapping_offset
,
&
local_nic_id
);
codes_mapping_get_lp_info
(
final_dest_lp
,
lp_group_name
,
&
mapping_grp_id
,
&
mapping_type_id
,
lp_type_name
,
&
mapping_rep_id
,
&
mapping_offset
);
codes_mapping_get_lp_id
(
"MODELNET_GRP"
,
"modelnet_dragonfly"
,
mapping_rep_id
,
mapping_offset
,
&
dest_nic_id
);
codes_mapping_get_lp_id
(
lp_group_name
,
"modelnet_dragonfly"
,
mapping_rep_id
,
mapping_offset
,
&
dest_nic_id
);
xfer_to_nic_time
=
0
.
01
+
codes_local_latency
(
sender
);
/* Throws an error of found last KP time > current event time otherwise when LPs of one type are placed together*/
e_new
=
codes_event_new
(
local_nic_id
,
xfer_to_nic_time
,
sender
);
...
...
@@ -274,7 +274,8 @@ void packet_send(terminal_state * s, tw_bf * bf, terminal_message * msg, tw_lp *
s
->
terminal_available_time
=
max
(
s
->
terminal_available_time
,
tw_now
(
lp
));
s
->
terminal_available_time
+=
ts
;
codes_mapping_get_lp_id
(
"MODELNET_GRP"
,
"dragonfly_router"
,
s
->
router_id
,
0
,
&
router_id
);
codes_mapping_get_lp_info
(
lp
->
gid
,
lp_group_name
,
&
mapping_grp_id
,
&
mapping_type_id
,
lp_type_name
,
&
mapping_rep_id
,
&
mapping_offset
);
codes_mapping_get_lp_id
(
lp_group_name
,
"dragonfly_router"
,
s
->
router_id
,
0
,
&
router_id
);
e
=
tw_event_new
(
router_id
,
s
->
terminal_available_time
-
tw_now
(
lp
),
lp
);
if
(
msg
->
packet_ID
==
TRACK
&&
msg
->
chunk_id
==
num_chunks
-
1
)
...
...
@@ -380,7 +381,8 @@ if( msg->packet_ID == TRACK && msg->chunk_id == num_chunks-1)
s
->
next_credit_available_time
+=
ts
;
tw_lpid
router_dest_id
;
codes_mapping_get_lp_id
(
"MODELNET_GRP"
,
"dragonfly_router"
,
s
->
router_id
,
0
,
&
router_dest_id
);
codes_mapping_get_lp_info
(
lp
->
gid
,
lp_group_name
,
&
mapping_grp_id
,
&
mapping_type_id
,
lp_type_name
,
&
mapping_rep_id
,
&
mapping_offset
);
codes_mapping_get_lp_id
(
lp_group_name
,
"dragonfly_router"
,
s
->
router_id
,
0
,
&
router_dest_id
);
buf_e
=
tw_event_new
(
router_dest_id
,
s
->
next_credit_available_time
-
tw_now
(
lp
),
lp
);
buf_msg
=
tw_event_data
(
buf_e
);
buf_msg
->
vc_index
=
msg
->
saved_vc
;
...
...
@@ -400,7 +402,7 @@ terminal_init( terminal_state * s,
int
i
;
// Assign the global router ID
codes_mapping_get_lp_info
(
lp
->
gid
,
lp_group_name
,
&
mapping_grp_id
,
&
mapping_type_id
,
lp_type_name
,
&
mapping_rep_id
,
&
mapping_offset
);
int
num_lps
=
codes_mapping_get_lp_count
(
"MODELNET_GRP"
,
"modelnet_dragonfly"
);
int
num_lps
=
codes_mapping_get_lp_count
(
lp_group_name
,
"modelnet_dragonfly"
);
s
->
terminal_id
=
(
mapping_rep_id
*
num_lps
)
+
mapping_offset
;
s
->
router_id
=
(
int
)
s
->
terminal_id
/
num_routers
;
...
...
@@ -492,7 +494,7 @@ get_next_stop(router_state * s,
int
dest_group_id
;
codes_mapping_get_lp_info
(
msg
->
dest_terminal_id
,
lp_group_name
,
&
mapping_grp_id
,
&
mapping_type_id
,
lp_type_name
,
&
mapping_rep_id
,
&
mapping_offset
);
int
num_lps
=
codes_mapping_get_lp_count
(
"MODELNET_GRP"
,
"modelnet_dragonfly"
);
int
num_lps
=
codes_mapping_get_lp_count
(
lp_group_name
,
"modelnet_dragonfly"
);
int
dest_router_id
=
(
mapping_offset
+
(
mapping_rep_id
*
num_lps
))
/
num_routers
;
codes_mapping_get_lp_info
(
lp
->
gid
,
lp_group_name
,
&
mapping_grp_id
,
&
mapping_type_id
,
lp_type_name
,
&
mapping_rep_id
,
&
mapping_offset
);
...
...
@@ -546,7 +548,7 @@ get_next_stop(router_state * s,
}
}
}
codes_mapping_get_lp_id
(
"MODELNET_GRP"
,
"dragonfly_router"
,
dest_lp
,
0
,
&
router_dest_id
);
codes_mapping_get_lp_id
(
lp_group_name
,
"dragonfly_router"
,
dest_lp
,
0
,
&
router_dest_id
);
return
router_dest_id
;
}
...
...
@@ -560,7 +562,7 @@ get_output_port( router_state * s,
{
int
output_port
=
-
1
,
i
,
terminal_id
;
codes_mapping_get_lp_info
(
msg
->
dest_terminal_id
,
lp_group_name
,
&
mapping_grp_id
,
&
mapping_type_id
,
lp_type_name
,
&
mapping_rep_id
,
&
mapping_offset
);
int
num_lps
=
codes_mapping_get_lp_count
(
"MODELNET_GRP"
,
"modelnet_dragonfly"
);
int
num_lps
=
codes_mapping_get_lp_count
(
lp_group_name
,
"modelnet_dragonfly"
);
terminal_id
=
(
mapping_rep_id
*
num_lps
)
+
mapping_offset
;
if
(
next_stop
==
msg
->
dest_terminal_id
)
...
...
src/models/networks/model-net/torus.c
View file @
9c2e5cb3
...
...
@@ -44,10 +44,10 @@ static void torus_packet_event(char* category, tw_lpid final_dest_lp, int packet
int
mapping_grp_id
,
mapping_rep_id
,
mapping_type_id
,
mapping_offset
;
codes_mapping_get_lp_info
(
sender
->
gid
,
lp_group_name
,
&
mapping_grp_id
,
&
mapping_type_id
,
lp_type_name
,
&
mapping_rep_id
,
&
mapping_offset
);
codes_mapping_get_lp_id
(
"MODELNET_GRP"
,
"modelnet_torus"
,
mapping_rep_id
,
mapping_offset
,
&
local_nic_id
);
codes_mapping_get_lp_id
(
lp_group_name
,
"modelnet_torus"
,
mapping_rep_id
,
mapping_offset
,
&
local_nic_id
);
codes_mapping_get_lp_info
(
final_dest_lp
,
lp_group_name
,
&
mapping_grp_id
,
&
mapping_type_id
,
lp_type_name
,
&
mapping_rep_id
,
&
mapping_offset
);
codes_mapping_get_lp_id
(
"MODELNET_GRP"
,
"modelnet_torus"
,
mapping_rep_id
,
mapping_offset
,
&
dest_nic_id
);
codes_mapping_get_lp_id
(
lp_group_name
,
"modelnet_torus"
,
mapping_rep_id
,
mapping_offset
,
&
dest_nic_id
);
/* TODO: Should send the packets in correct sequence. Currently the last packet is being sent first due to codes_local_latency offset. */
xfer_to_nic_time
=
0
.
01
+
codes_local_latency
(
sender
);
/* Throws an error of found last KP time > current event time otherwise */
...
...
@@ -143,7 +143,7 @@ static void torus_init( nodes_state * s,
for
(
i
=
0
;
i
<
n_dims
;
i
++
)
s
->
neighbour_minus_lpID
[
j
]
+=
factor
[
i
]
*
temp_dim_pos
[
i
];
codes_mapping_get_lp_id
(
"MODELNET_GRP"
,
"modelnet_torus"
,
s
->
neighbour_minus_lpID
[
j
],
0
,
&
neighbor_id
);
codes_mapping_get_lp_id
(
grp_name
,
"modelnet_torus"
,
s
->
neighbour_minus_lpID
[
j
],
0
,
&
neighbor_id
);
//printf("\n neighbor %d lp id %d ", (int)s->neighbour_minus_lpID[ j ], (int)neighbor_id);
temp_dim_pos
[
j
]
=
s
->
dim_position
[
j
];
...
...
@@ -158,7 +158,7 @@ static void torus_init( nodes_state * s,
for
(
i
=
0
;
i
<
n_dims
;
i
++
)
s
->
neighbour_plus_lpID
[
j
]
+=
factor
[
i
]
*
temp_dim_pos
[
i
];
codes_mapping_get_lp_id
(
"MODELNET_GRP"
,
"modelnet_torus"
,
s
->
neighbour_plus_lpID
[
j
],
0
,
&
neighbor_id
);
codes_mapping_get_lp_id
(
grp_name
,
"modelnet_torus"
,
s
->
neighbour_plus_lpID
[
j
],
0
,
&
neighbor_id
);
//printf("\n neighbor %d lp id %d ", (int)s->neighbour_plus_lpID[ j ], (int)neighbor_id);
temp_dim_pos
[
j
]
=
s
->
dim_position
[
j
];
...
...
@@ -236,7 +236,7 @@ static void dimension_order_routing( nodes_state * s,
break
;
}
}
codes_mapping_get_lp_id
(
"MODELNET_GRP"
,
"modelnet_torus"
,
dest_id
,
0
,
dst_lp
);
codes_mapping_get_lp_id
(
grp_name
,
"modelnet_torus"
,
dest_id
,
0
,
dst_lp
);
}
/*Generates a packet. If there is a buffer slot available, then the packet is
...
...
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