Commit ddd6a5c1 authored by Matthieu Dorier's avatar Matthieu Dorier
Browse files

Merge branch 'master' of xgitlab.cels.anl.gov:codes/codes into cortex

parents 6a8d31e6 30c16180
......@@ -17,7 +17,7 @@
#define MEAN_PROCESS 1.0
#define TERMINAL_GUID_PREFIX ((uint64_t)(64) << 32)
#define FTREE_HASH_TABLE_SIZE 5000
#define FTREE_HASH_TABLE_SIZE 4999
// debugging parameters
#define TRACK_PKT -1
......@@ -2773,7 +2773,9 @@ void fattree_terminal_final( ft_terminal_state * s, tw_lp * lp )
#endif
}
if(s->rank_tbl)
qhash_finalize(s->rank_tbl);
rc_stack_destroy(s->st);
// free(s->vc_occupancy);
free(s->terminal_msgs);
......
......@@ -113,6 +113,23 @@ tw_lptype model_net_base_lp = {
sizeof(model_net_base_state),
};
/* setup for the ROSS event tracing
* can have a different function for rbev_trace_f and ev_trace_f
* but right now it is set to the same function for both
*/
void mn_event_collect(model_net_wrap_msg *m, tw_lp *lp, char *buffer)
{
int type = (int) m->h.event_type;
memcpy(buffer, &type, sizeof(type));
}
st_trace_type mn_trace_types = {
(rbev_trace_f) mn_event_collect,
sizeof(int),
(ev_trace_f) mn_event_collect,
sizeof(int),
};
/**** END LP, EVENT PROCESSING FUNCTION DECLS ****/
/**** BEGIN IMPLEMENTATIONS ****/
......@@ -151,6 +168,13 @@ void model_net_base_register(int *do_config_nets){
&model_net_base_lp);
else
method_array[i]->mn_register(&model_net_base_lp);
if (g_st_ev_trace) // for ROSS event tracing
{
if (method_array[i]->mn_trace_register == NULL)
trace_type_register(model_net_lp_config_names[i], &mn_trace_types);
else
method_array[i]->mn_trace_register(&mn_trace_types);
}
}
}
}
......
......@@ -25,7 +25,7 @@
#define MEAN_PROCESS 1.0
/* collective specific parameters */
#define SFLY_HASH_TABLE_SIZE 5000
#define SFLY_HASH_TABLE_SIZE 4999
// debugging parameters
#define TRACK 4
......
......@@ -458,6 +458,7 @@ static void codes_mapping_init(void)
tw_lpid nkp_per_pe = g_tw_nkp;
tw_lpid lpid, kpid;
const tw_lptype *lptype;
const st_trace_type *trace_type;
/* have 16 kps per pe, this is the optimized configuration for ROSS custom mapping */
for(kpid = 0; kpid < nkp_per_pe; kpid++)
......@@ -488,6 +489,11 @@ static void codes_mapping_init(void)
else
/* sorry, const... */
tw_lp_settype(ross_lid, (tw_lptype*) lptype);
if (g_st_ev_trace)
{
trace_type = trace_type_lookup(lp_type_name);
st_evtrace_settype(ross_lid, (st_trace_type*) trace_type);
}
}
return;
}
......
......@@ -16,6 +16,7 @@ struct lp_name_mapping
{
const char* name;
const tw_lptype* type;
const st_trace_type* trace_type;
};
static struct lp_name_mapping map_array[MAX_LP_TYPES];
......@@ -46,6 +47,35 @@ const tw_lptype* lp_type_lookup(const char* name)
return(NULL);
}
// needs to be called after lp_type_register()
void trace_type_register(const char* name, const st_trace_type* type)
{
int i;
for(i=0; i<map_array_size; i++)
{
if(strcmp(name, map_array[i].name) == 0)
{
map_array[i].trace_type = type;
}
}
}
const st_trace_type* trace_type_lookup(const char* name)
{
int i;
for(i=0; i<map_array_size; i++)
{
if(strcmp(name, map_array[i].name) == 0)
{
return(map_array[i].trace_type);
}
}
return(NULL);
}
/*
* Local variables:
* c-indent-level: 4
......
#!/bin/bash
FILE=/tmp/df_AMG_n27_dumpi/dumpi-2014.03.03.14.55.00-0000.bin
if [ ! -f $FILE ]; then
wget https://portal.nersc.gov/project/CAL/doe-miniapps-mpi-traces/AMG/df_AMG_n27_dumpi.tar.gz
tar -xvf df_AMG_n27_dumpi.tar.gz -C /tmp
fi
......@@ -5,7 +5,11 @@ if [ -z $srcdir ]; then
exit 1
fi
src/network-workloads/model-net-synthetic-custom-dfly --sync=1 --num_messages=1 -- $srcdir/src/network-workloads/conf/dragonfly-custom/modelnet-test-dragonfly-theta.conf
src/network-workloads/model-net-synthetic-custom-dfly --sync=1 --num_messages=1 -- src/network-workloads/conf/dragonfly-custom/modelnet-test-dragonfly-1728-nodes.conf
mpirun -np 2 src/network-workloads/model-net-mpi-replay --sync=3 --num_net_traces=27 --workload_file=/tmp/df_AMG_n27_dumpi/dumpi-2014.03.03.14.55.00- --workload_type="dumpi" -- src/network-workloads/conf/dragonfly-custom/modelnet-test-dragonfly-1728-nodes.conf
......@@ -5,7 +5,10 @@ if [ -z $srcdir ]; then
exit 1
fi
source $srcdir/tests/download-traces.sh
src/network-workloads/model-net-synthetic --sync=1 --num_messages=1 -- $srcdir/src/network-workloads/conf/modelnet-synthetic-dragonfly.conf
mpirun -np 2 src/network-workloads/model-net-mpi-replay --sync=3 --num_net_traces=27 --workload_file=/tmp/df_AMG_n27_dumpi/dumpi-2014.03.03.14.55.00- --workload_type="dumpi" -- $srcdir/src/network-workloads/conf/modelnet-mpi-test-dfly-amg-216.conf
......@@ -5,7 +5,10 @@ if [ -z $srcdir ]; then
exit 1
fi
source $srcdir/tests/download-traces.sh
src/network-workloads/model-net-synthetic-fattree --sync=1 -- $srcdir/src/network-workloads/conf/modelnet-synthetic-fattree.conf
#src/network-workloads/model-net-mpi-replay --sync=1 --num_net_traces=27 --workload_file=/tmp/df_AMG_n27_dumpi/dumpi-2014.03.03.14.55.00- --workload_type="dumpi" -- $srcdir/src/network-workloads/conf/modelnet-mpi-test-fattree.conf
......@@ -5,7 +5,9 @@ if [ -z $srcdir ]; then
exit 1
fi
src/network-workloads/model-net-synthetic-slimfly --sync=1 -- $srcdir/src/network-workloads/conf/modelnet-synthetic-slimfly-min.conf
source $srcdir/tests/download-traces.sh
src/network-workloads/model-net-synthetic-slimfly --sync=1 -- $srcdir/src/network-workloads/conf/modelnet-synthetic-slimfly-min.conf
mpirun -np 2 src/network-workloads/model-net-mpi-replay --sync=3 --num_net_traces=27 --workload_file=/tmp/df_AMG_n27_dumpi/dumpi-2014.03.03.14.55.00- --workload_type="dumpi" -- $srcdir/src/network-workloads/conf/modelnet-mpi-test-slimfly-min.conf
#!/bin/bash
if [ -z $srcdir ]; then
echo srcdir variable not set.
exit 1
fi
source $srcdir/tests/download-traces.sh
tests/modelnet-test --sync=1 -- tests/conf/modelnet-test-torus.conf
mpirun -np 2 src/network-workloads/model-net-mpi-replay --sync=3 --num_net_traces=27 --workload_file=/tmp/df_AMG_n27_dumpi/dumpi-2014.03.03.14.55.00- --workload_type="dumpi" -- $srcdir/src/network-workloads/conf/modelnet-mpi-test-torus.conf
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