From 9d4be38c4ef49b344e539bcd1f4ec1273d1d7759 Mon Sep 17 00:00:00 2001 From: Tim Rogers Date: Tue, 17 Jul 2012 16:36:16 -0800 Subject: Changes to get the regression running: Removed the dependency on specifying the interconnect in the sweep file. Changed the extension on the icnt files to icnt instead of txt. Now we just copy any icnt file in the same directory as the config file [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 13384] --- configs/GTX480/config_fermi_islip.icnt | 49 +++++++++++++++++++++++ configs/GTX480/gpgpusim.config | 2 +- configs/GTX480/icnt_config_fermi_islip.txt | 49 ----------------------- configs/QuadroFX5800/config_quadro_islip.icnt | 49 +++++++++++++++++++++++ configs/QuadroFX5800/gpgpusim.config | 2 +- configs/QuadroFX5800/icnt_config_quadro_islip.txt | 49 ----------------------- configs/TeslaC2050/config_islip.icnt | 49 +++++++++++++++++++++++ configs/TeslaC2050/gpgpusim.config | 2 +- configs/TeslaC2050/icnt_config_islip.txt | 49 ----------------------- 9 files changed, 150 insertions(+), 150 deletions(-) create mode 100644 configs/GTX480/config_fermi_islip.icnt delete mode 100644 configs/GTX480/icnt_config_fermi_islip.txt create mode 100644 configs/QuadroFX5800/config_quadro_islip.icnt delete mode 100644 configs/QuadroFX5800/icnt_config_quadro_islip.txt create mode 100644 configs/TeslaC2050/config_islip.icnt delete mode 100644 configs/TeslaC2050/icnt_config_islip.txt diff --git a/configs/GTX480/config_fermi_islip.icnt b/configs/GTX480/config_fermi_islip.icnt new file mode 100644 index 0000000..f2bb38e --- /dev/null +++ b/configs/GTX480/config_fermi_islip.icnt @@ -0,0 +1,49 @@ +use_map = 0; +flit_size = 32; + +network_count = 2; + +// Topology +topology = fly; +k = 23; +n = 1; + +// Routing +routing_function = dest_tag;//dim_order;//min_adapt;//dim_order;//_ni; + +// Flow control +num_vcs = 1; //4; +vc_buf_size = 8; //16; +wait_for_tail_credit = 0; + +// Router architecture + +vc_allocator = islip;//i1_pim; //islip; //pim +sw_allocator = islip;//i1_pim;//islip; //pim +alloc_iters = 1; + +credit_delay = 0; +routing_delay = 0; +vc_alloc_delay = 0; + +input_speedup = 2; +output_speedup = 1; +internal_speedup = 1.0; + +// Traffic (DO NOT CHANGE THIS) +traffic = gpgpusim; + +//not used in gpgpusim +// const_flits_per_packet = 3; +injection_process = gpgpu_injector; +// Simulation +//not used in gpgpusim +sim_type = latency; +injection_rate = 0.1; + + +// Statistics for Interconnection (Added for GPGPU-Sim) +MATLAB_OUTPUT = 1; // output data in MATLAB friendly format +DISPLAY_LAT_DIST = 1; // distribution of packet latencies +DISPLAY_HOP_DIST = 1; // distribution of hop counts +DISPLAY_PAIR_LATENCY = 0; diff --git a/configs/GTX480/gpgpusim.config b/configs/GTX480/gpgpusim.config index 72777a1..a3450e1 100644 --- a/configs/GTX480/gpgpusim.config +++ b/configs/GTX480/gpgpusim.config @@ -62,7 +62,7 @@ # interconnection -network_mode 1 --inter_config_file icnt_config_fermi_islip.txt +-inter_config_file config_fermi_islip.icnt # memory partition latency config -rop_latency 120 diff --git a/configs/GTX480/icnt_config_fermi_islip.txt b/configs/GTX480/icnt_config_fermi_islip.txt deleted file mode 100644 index f2bb38e..0000000 --- a/configs/GTX480/icnt_config_fermi_islip.txt +++ /dev/null @@ -1,49 +0,0 @@ -use_map = 0; -flit_size = 32; - -network_count = 2; - -// Topology -topology = fly; -k = 23; -n = 1; - -// Routing -routing_function = dest_tag;//dim_order;//min_adapt;//dim_order;//_ni; - -// Flow control -num_vcs = 1; //4; -vc_buf_size = 8; //16; -wait_for_tail_credit = 0; - -// Router architecture - -vc_allocator = islip;//i1_pim; //islip; //pim -sw_allocator = islip;//i1_pim;//islip; //pim -alloc_iters = 1; - -credit_delay = 0; -routing_delay = 0; -vc_alloc_delay = 0; - -input_speedup = 2; -output_speedup = 1; -internal_speedup = 1.0; - -// Traffic (DO NOT CHANGE THIS) -traffic = gpgpusim; - -//not used in gpgpusim -// const_flits_per_packet = 3; -injection_process = gpgpu_injector; -// Simulation -//not used in gpgpusim -sim_type = latency; -injection_rate = 0.1; - - -// Statistics for Interconnection (Added for GPGPU-Sim) -MATLAB_OUTPUT = 1; // output data in MATLAB friendly format -DISPLAY_LAT_DIST = 1; // distribution of packet latencies -DISPLAY_HOP_DIST = 1; // distribution of hop counts -DISPLAY_PAIR_LATENCY = 0; diff --git a/configs/QuadroFX5800/config_quadro_islip.icnt b/configs/QuadroFX5800/config_quadro_islip.icnt new file mode 100644 index 0000000..be385a1 --- /dev/null +++ b/configs/QuadroFX5800/config_quadro_islip.icnt @@ -0,0 +1,49 @@ +use_map = 0; +flit_size = 32; + +network_count = 2; + +// Topology +topology = fly; +k = 18; +n = 1; + +// Routing +routing_function = dest_tag;//dim_order;//min_adapt;//dim_order;//_ni; + +// Flow control +num_vcs = 1; //4; +vc_buf_size = 8; //16; +wait_for_tail_credit = 0; + +// Router architecture + +vc_allocator = islip;//i1_pim; //islip; //pim +sw_allocator = islip;//i1_pim;//islip; //pim +alloc_iters = 1; + +credit_delay = 0; +routing_delay = 0; +vc_alloc_delay = 0; + +input_speedup = 2; +output_speedup = 1; +internal_speedup = 1.0; + +// Traffic (DO NOT CHANGE THIS) +traffic = gpgpusim; + +//not used in gpgpusim +// const_flits_per_packet = 3; +injection_process = gpgpu_injector; +// Simulation +//not used in gpgpusim +sim_type = latency; +injection_rate = 0.1; + + +// Statistics for Interconnection (Added for GPGPU-Sim) +MATLAB_OUTPUT = 1; // output data in MATLAB friendly format +DISPLAY_LAT_DIST = 1; // distribution of packet latencies +DISPLAY_HOP_DIST = 1; // distribution of hop counts +DISPLAY_PAIR_LATENCY = 0; diff --git a/configs/QuadroFX5800/gpgpusim.config b/configs/QuadroFX5800/gpgpusim.config index 47d3a64..fbe21d7 100644 --- a/configs/QuadroFX5800/gpgpusim.config +++ b/configs/QuadroFX5800/gpgpusim.config @@ -41,7 +41,7 @@ # interconnection -network_mode 1 --inter_config_file icnt_config_quadro_islip.txt +-inter_config_file config_quadro_islip.icnt # dram model config -gpgpu_dram_scheduler 1 diff --git a/configs/QuadroFX5800/icnt_config_quadro_islip.txt b/configs/QuadroFX5800/icnt_config_quadro_islip.txt deleted file mode 100644 index be385a1..0000000 --- a/configs/QuadroFX5800/icnt_config_quadro_islip.txt +++ /dev/null @@ -1,49 +0,0 @@ -use_map = 0; -flit_size = 32; - -network_count = 2; - -// Topology -topology = fly; -k = 18; -n = 1; - -// Routing -routing_function = dest_tag;//dim_order;//min_adapt;//dim_order;//_ni; - -// Flow control -num_vcs = 1; //4; -vc_buf_size = 8; //16; -wait_for_tail_credit = 0; - -// Router architecture - -vc_allocator = islip;//i1_pim; //islip; //pim -sw_allocator = islip;//i1_pim;//islip; //pim -alloc_iters = 1; - -credit_delay = 0; -routing_delay = 0; -vc_alloc_delay = 0; - -input_speedup = 2; -output_speedup = 1; -internal_speedup = 1.0; - -// Traffic (DO NOT CHANGE THIS) -traffic = gpgpusim; - -//not used in gpgpusim -// const_flits_per_packet = 3; -injection_process = gpgpu_injector; -// Simulation -//not used in gpgpusim -sim_type = latency; -injection_rate = 0.1; - - -// Statistics for Interconnection (Added for GPGPU-Sim) -MATLAB_OUTPUT = 1; // output data in MATLAB friendly format -DISPLAY_LAT_DIST = 1; // distribution of packet latencies -DISPLAY_HOP_DIST = 1; // distribution of hop counts -DISPLAY_PAIR_LATENCY = 0; diff --git a/configs/TeslaC2050/config_islip.icnt b/configs/TeslaC2050/config_islip.icnt new file mode 100644 index 0000000..f2bb38e --- /dev/null +++ b/configs/TeslaC2050/config_islip.icnt @@ -0,0 +1,49 @@ +use_map = 0; +flit_size = 32; + +network_count = 2; + +// Topology +topology = fly; +k = 23; +n = 1; + +// Routing +routing_function = dest_tag;//dim_order;//min_adapt;//dim_order;//_ni; + +// Flow control +num_vcs = 1; //4; +vc_buf_size = 8; //16; +wait_for_tail_credit = 0; + +// Router architecture + +vc_allocator = islip;//i1_pim; //islip; //pim +sw_allocator = islip;//i1_pim;//islip; //pim +alloc_iters = 1; + +credit_delay = 0; +routing_delay = 0; +vc_alloc_delay = 0; + +input_speedup = 2; +output_speedup = 1; +internal_speedup = 1.0; + +// Traffic (DO NOT CHANGE THIS) +traffic = gpgpusim; + +//not used in gpgpusim +// const_flits_per_packet = 3; +injection_process = gpgpu_injector; +// Simulation +//not used in gpgpusim +sim_type = latency; +injection_rate = 0.1; + + +// Statistics for Interconnection (Added for GPGPU-Sim) +MATLAB_OUTPUT = 1; // output data in MATLAB friendly format +DISPLAY_LAT_DIST = 1; // distribution of packet latencies +DISPLAY_HOP_DIST = 1; // distribution of hop counts +DISPLAY_PAIR_LATENCY = 0; diff --git a/configs/TeslaC2050/gpgpusim.config b/configs/TeslaC2050/gpgpusim.config index 7ff39b1..77a81a2 100644 --- a/configs/TeslaC2050/gpgpusim.config +++ b/configs/TeslaC2050/gpgpusim.config @@ -62,7 +62,7 @@ # interconnection -network_mode 1 --inter_config_file icnt_config_islip.txt +-inter_config_file config_islip.icnt # memory partition latency config -rop_latency 120 diff --git a/configs/TeslaC2050/icnt_config_islip.txt b/configs/TeslaC2050/icnt_config_islip.txt deleted file mode 100644 index f2bb38e..0000000 --- a/configs/TeslaC2050/icnt_config_islip.txt +++ /dev/null @@ -1,49 +0,0 @@ -use_map = 0; -flit_size = 32; - -network_count = 2; - -// Topology -topology = fly; -k = 23; -n = 1; - -// Routing -routing_function = dest_tag;//dim_order;//min_adapt;//dim_order;//_ni; - -// Flow control -num_vcs = 1; //4; -vc_buf_size = 8; //16; -wait_for_tail_credit = 0; - -// Router architecture - -vc_allocator = islip;//i1_pim; //islip; //pim -sw_allocator = islip;//i1_pim;//islip; //pim -alloc_iters = 1; - -credit_delay = 0; -routing_delay = 0; -vc_alloc_delay = 0; - -input_speedup = 2; -output_speedup = 1; -internal_speedup = 1.0; - -// Traffic (DO NOT CHANGE THIS) -traffic = gpgpusim; - -//not used in gpgpusim -// const_flits_per_packet = 3; -injection_process = gpgpu_injector; -// Simulation -//not used in gpgpusim -sim_type = latency; -injection_rate = 0.1; - - -// Statistics for Interconnection (Added for GPGPU-Sim) -MATLAB_OUTPUT = 1; // output data in MATLAB friendly format -DISPLAY_LAT_DIST = 1; // distribution of packet latencies -DISPLAY_HOP_DIST = 1; // distribution of hop counts -DISPLAY_PAIR_LATENCY = 0; -- cgit v1.3