4a5
> * Copyright (c) 2010-2013 Advanced Micro Devices, Inc.
28c29
< * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.”
---
> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
38d38
< #include "XML_Parse.h"
39a40
> #include "common.h"
45,57c46,54
< NoC::NoC(ParseXML *XML_interface, int ithNoC_, InputParameter* interface_ip_, double M_traffic_pattern_, double link_len_)
< :XML(XML_interface),
< ithNoC(ithNoC_),
< interface_ip(*interface_ip_),
< router(0),
< link_bus(0),
< link_bus_exist(false),
< router_exist(false),
< M_traffic_pattern(M_traffic_pattern_)
< {
< /*
< * initialize, compute and optimize individual components.
< */
---
> OnChipNetwork::OnChipNetwork(XMLNode* _xml_data, int ithNoC_,
> InputParameter* interface_ip_)
> : McPATComponent(_xml_data), router(NULL), link_bus(NULL), ithNoC(ithNoC_),
> interface_ip(*interface_ip_), link_bus_exist(false),
> router_exist(false) {
> name = "On-Chip Network";
> set_param_stats();
> local_result = init_interface(&interface_ip, name);
> scktRatio = g_tp.sckt_co_eff;
59,94c56,61
< if (XML->sys.Embedded)
< {
< interface_ip.wt =Global_30;
< interface_ip.wire_is_mat_type = 0;
< interface_ip.wire_os_mat_type = 1;
< }
< else
< {
< interface_ip.wt =Global;
< interface_ip.wire_is_mat_type = 2;
< interface_ip.wire_os_mat_type = 2;
< }
< set_noc_param();
< local_result=init_interface(&interface_ip);
< scktRatio = g_tp.sckt_co_eff;
<
< if (nocdynp.type)
< {/*
< * if NOC compute router, router links must be computed separately
< * and called from external
< * since total chip area must be known first
< */
< init_router();
< }
< else
< {
< init_link_bus(link_len_); //if bus compute bus
< }
<
< // //clock power
< // clockNetwork.init_wire_external(is_default, &interface_ip);
< // clockNetwork.clk_area =area*1.1;//10% of placement overhead. rule of thumb
< // clockNetwork.end_wiring_level =5;//toplevel metal
< // clockNetwork.start_wiring_level =5;//toplevel metal
< // clockNetwork.num_regs = corepipe.tot_stage_vector;
< // clockNetwork.optimize_wire();
---
> // TODO: Routers and links should be children of the NOC component
> if (noc_params.type) {
> init_router();
> } else {
> init_link_bus();
> }
97,104c64,75
< void NoC::init_router()
< {
< router = new Router(nocdynp.flit_size,
< nocdynp.virtual_channel_per_port*nocdynp.input_buffer_entries_per_vc,
< nocdynp.virtual_channel_per_port, &(g_tp.peri_global),
< nocdynp.input_ports,nocdynp.output_ports, M_traffic_pattern);
< //router->print_router();
< area.set_area(area.get_area()+ router->area.get_area()*nocdynp.total_nodes);
---
> void OnChipNetwork::init_router() {
> router = new Router(noc_params.flit_size,
> noc_params.virtual_channel_per_port *
> noc_params.input_buffer_entries_per_vc,
> noc_params.virtual_channel_per_port,
> &(g_tp.peri_global),
> noc_params.input_ports, noc_params.output_ports,
> noc_params.M_traffic_pattern);
> // TODO: Make a router class within McPAT that descends from McPATComponent
> // children.push_back(router);
> area.set_area(area.get_area() + router->area.get_area() *
> noc_params.total_nodes);
106,111c77,82
< double long_channel_device_reduction = longer_channel_device_reduction(Uncore_device);
< router->power.readOp.longer_channel_leakage = router->power.readOp.leakage * long_channel_device_reduction;
< router->buffer.power.readOp.longer_channel_leakage = router->buffer.power.readOp.leakage * long_channel_device_reduction;
< router->crossbar.power.readOp.longer_channel_leakage = router->crossbar.power.readOp.leakage * long_channel_device_reduction;
< router->arbiter.power.readOp.longer_channel_leakage = router->arbiter.power.readOp.leakage * long_channel_device_reduction;
< router_exist = true;
---
> double long_channel_device_reduction = longer_channel_device_reduction(Uncore_device);
> router->power.readOp.longer_channel_leakage = router->power.readOp.leakage * long_channel_device_reduction;
> router->buffer.power.readOp.longer_channel_leakage = router->buffer.power.readOp.leakage * long_channel_device_reduction;
> router->crossbar.power.readOp.longer_channel_leakage = router->crossbar.power.readOp.leakage * long_channel_device_reduction;
> router->arbiter.power.readOp.longer_channel_leakage = router->arbiter.power.readOp.leakage * long_channel_device_reduction;
> router_exist = true;
114,115c85,90
< void NoC ::init_link_bus(double link_len_)
< {
---
> void OnChipNetwork::init_link_bus() {
> if (noc_params.type) {
> link_name = "Links";
> } else {
> link_name = "Bus";
> }
116a92,94
> interface_ip.throughput = noc_params.link_throughput /
> noc_params.clockRate;
> interface_ip.latency = noc_params.link_latency / noc_params.clockRate;
118,122c96
< // if (nocdynp.min_ports==1 )
< if (nocdynp.type)
< link_name = "Links";
< else
< link_name = "Bus";
---
> link_len /= (noc_params.horizontal_nodes + noc_params.vertical_nodes) / 2;
124,125c98,109
< link_len=link_len_;
< assert(link_len>0);
---
> if (noc_params.total_nodes > 1) {
> //All links are shared by neighbors
> link_len /= 2;
> }
> link_bus = new Interconnect(xml_data, "Link", Uncore_device,
> noc_params.link_base_width,
> noc_params.link_base_height,
> noc_params.flit_size, link_len, &interface_ip,
> noc_params.link_start_wiring_level,
> noc_params.clockRate, true/*pipelinable*/,
> noc_params.route_over_perc);
> children.push_back(link_bus);
127,140c111
< interface_ip.throughput = nocdynp.link_throughput/nocdynp.clockRate;
< interface_ip.latency = nocdynp.link_latency/nocdynp.clockRate;
<
< link_len /= (nocdynp.horizontal_nodes + nocdynp.vertical_nodes)/2;
<
< if (nocdynp.total_nodes >1) link_len /=2; //All links are shared by neighbors
< link_bus = new interconnect(name, Uncore_device, 1, 1, nocdynp.flit_size,
< link_len, &interface_ip, 3, true/*pipelinable*/, nocdynp.route_over_perc);
<
< link_bus_tot_per_Router.area.set_area(link_bus_tot_per_Router.area.get_area()+ link_bus->area.get_area()
< * nocdynp.global_linked_ports);
<
< area.set_area(area.get_area()+ link_bus_tot_per_Router.area.get_area()* nocdynp.total_nodes);
< link_bus_exist = true;
---
> link_bus_exist = true;
142,167d112
< void NoC::computeEnergy(bool is_tdp)
< {
< //power_point_product_masks
< double pppm_t[4] = {1,1,1,1};
< double M=nocdynp.duty_cycle;
< if (is_tdp)
< {
< //init stats for TDP
< stats_t.readAc.access = M;
< tdp_stats = stats_t;
< if (router_exist)
< {
< set_pppm(pppm_t, 1*M, 1, 1, 1);//reset traffic pattern
< router->power = router->power*pppm_t;
< set_pppm(pppm_t, nocdynp.total_nodes, nocdynp.total_nodes, nocdynp.total_nodes, nocdynp.total_nodes);
< power = power + router->power*pppm_t;
< }
< if (link_bus_exist)
< {
< if (nocdynp.type)
< set_pppm(pppm_t, 1*M_traffic_pattern*M*(nocdynp.min_ports -1), nocdynp.global_linked_ports,
< nocdynp.global_linked_ports, nocdynp.global_linked_ports);
< //reset traffic pattern; local port do not have router links
< else
< set_pppm(pppm_t, 1*M_traffic_pattern*M*(nocdynp.min_ports), nocdynp.global_linked_ports,
< nocdynp.global_linked_ports, nocdynp.global_linked_ports);//reset traffic pattern
169c114,117
< link_bus_tot_per_Router.power = link_bus->power*pppm_t;
---
> // TODO: This should use the McPATComponent::computeEnergy function to
> // recursively calculate energy of routers and links and then add
> void OnChipNetwork::computeEnergy() {
> double pppm_t[4] = {1, 1, 1, 1};
171,175c119,139
< set_pppm(pppm_t, nocdynp.total_nodes,
< nocdynp.total_nodes,
< nocdynp.total_nodes,
< nocdynp.total_nodes);
< power = power + link_bus_tot_per_Router.power*pppm_t;
---
> // Initialize stats for TDP
> tdp_stats.reset();
> tdp_stats.readAc.access = noc_stats.duty_cycle;
> if (router_exist) {
> // TODO: Define a regression to exercise routers
> // TODO: Clean this up: it is too invasive and breaks abstraction
> set_pppm(pppm_t, 1 * tdp_stats.readAc.access, 1, 1, 1);
> router->power = router->power * pppm_t;
> set_pppm(pppm_t, noc_params.total_nodes,
> noc_params.total_nodes,
> noc_params.total_nodes,
> noc_params.total_nodes);
> }
> if (link_bus_exist) {
> if (noc_params.type) {
> link_bus->int_params.active_ports = noc_params.min_ports - 1;
> } else {
> link_bus->int_params.active_ports = noc_params.min_ports;
> }
> link_bus->int_stats.duty_cycle =
> noc_params.M_traffic_pattern * noc_stats.duty_cycle;
177,189c141,147
< }
< }
< else
< {
< //init stats for runtime power (RTP)
< stats_t.readAc.access = XML->sys.NoC[ithNoC].total_accesses;
< rtp_stats = stats_t;
< set_pppm(pppm_t, 1, 0 , 0, 0);
< if (router_exist)
< {
< router->buffer.rt_power.readOp.dynamic = (router->buffer.power.readOp.dynamic + router->buffer.power.writeOp.dynamic)*rtp_stats.readAc.access ;
< router->crossbar.rt_power.readOp.dynamic = router->crossbar.power.readOp.dynamic*rtp_stats.readAc.access ;
< router->arbiter.rt_power.readOp.dynamic = router->arbiter.power.readOp.dynamic*rtp_stats.readAc.access ;
---
> // TODO: Decide how to roll multiple routers into a single top-level
> // NOC module. I would prefer not to, but it might be a nice feature
> set_pppm(pppm_t, noc_params.total_nodes,
> noc_params.total_nodes,
> noc_params.total_nodes,
> noc_params.total_nodes);
> }
191,200c149,161
< router->rt_power = router->rt_power + (router->buffer.rt_power + router->crossbar.rt_power + router->arbiter.rt_power)*pppm_t +
< router->power*pppm_lkg;//TDP power must be calculated first!
< rt_power = rt_power + router->rt_power;
< }
< if (link_bus_exist)
< {
< set_pppm(pppm_t, rtp_stats.readAc.access, 1 , 1, rtp_stats.readAc.access);
< link_bus->rt_power = link_bus->power * pppm_t;
< rt_power = rt_power + link_bus->rt_power;
< }
---
> // Initialize stats for runtime energy and power
> rtp_stats.reset();
> rtp_stats.readAc.access = noc_stats.total_access;
> set_pppm(pppm_t, 1, 0 , 0, 0);
> if (router_exist) {
> // TODO: Move this to a McPATComponent parent class of Router
> router->buffer.rt_power.readOp.dynamic =
> (router->buffer.power.readOp.dynamic +
> router->buffer.power.writeOp.dynamic) * rtp_stats.readAc.access;
> router->crossbar.rt_power.readOp.dynamic =
> router->crossbar.power.readOp.dynamic * rtp_stats.readAc.access;
> router->arbiter.rt_power.readOp.dynamic =
> router->arbiter.power.readOp.dynamic * rtp_stats.readAc.access;
202c163,173
< }
---
> router->rt_power = router->rt_power +
> (router->buffer.rt_power + router->crossbar.rt_power +
> router->arbiter.rt_power) * pppm_t +
> router->power * pppm_lkg;//TDP power must be calculated first!
> }
> if (link_bus_exist) {
> link_bus->int_stats.accesses = noc_stats.total_access;
> }
>
> // Recursively compute energy
> McPATComponent::computeEnergy();
204a176,178
> void OnChipNetwork::set_param_stats() {
> // TODO: Remove this or move initialization elsewhere
> memset(&noc_params, 0, sizeof(OnChipNetworkParameters));
206,210c180,186
< void NoC::displayEnergy(uint32_t indent,int plevel,bool is_tdp)
< {
< string indent_str(indent, ' ');
< string indent_str_next(indent+2, ' ');
< bool long_channel = XML->sys.longer_channel_device;
---
> int num_children = xml_data->nChildNode("param");
> int i;
> int mat_type;
> for (i = 0; i < num_children; i++) {
> XMLNode* paramNode = xml_data->getChildNodePtr("param", &i);
> XMLCSTR node_name = paramNode->getAttribute("name");
> XMLCSTR value = paramNode->getAttribute("value");
212,226c188,189
< double M =M_traffic_pattern*nocdynp.duty_cycle;
< /*only router as a whole has been applied the M_traffic_pattern(0.6 by default) factor in router.cc;
< * When power of crossbars, arbiters, etc need to be displayed, the M_traffic_pattern factor need to
< * be applied together with McPAT's extra traffic pattern.
< * */
< if (is_tdp)
< {
< cout << name << endl;
< cout << indent_str << "Area = " << area.get_area()*1e-6<< " mm^2" << endl;
< cout << indent_str<< "Peak Dynamic = " << power.readOp.dynamic*nocdynp.clockRate << " W" << endl;
< cout << indent_str << "Subthreshold Leakage = "
< << (long_channel? power.readOp.longer_channel_leakage:power.readOp.leakage) <<" W" << endl;
< cout << indent_str << "Gate Leakage = " << power.readOp.gate_leakage << " W" << endl;
< cout << indent_str<< "Runtime Dynamic = " << rt_power.readOp.dynamic/nocdynp.executionTime << " W" << endl;
< cout<<endl;
---
> if (!node_name)
> warnMissingParamName(paramNode->getAttribute("id"));
228,277c191,216
< if (router_exist)
< {
< cout << indent_str << "Router: " << endl;
< cout << indent_str_next << "Area = " << router->area.get_area()*1e-6<< " mm^2" << endl;
< cout << indent_str_next<< "Peak Dynamic = " << router->power.readOp.dynamic*nocdynp.clockRate << " W" << endl;
< cout << indent_str_next << "Subthreshold Leakage = "
< << (long_channel? router->power.readOp.longer_channel_leakage:router->power.readOp.leakage) <<" W" << endl;
< cout << indent_str_next << "Gate Leakage = " << router->power.readOp.gate_leakage << " W" << endl;
< cout << indent_str_next<< "Runtime Dynamic = " << router->rt_power.readOp.dynamic/nocdynp.executionTime << " W" << endl;
< cout<<endl;
< if (plevel >2){
< cout << indent_str<< indent_str << "Virtual Channel Buffer:" << endl;
< cout << indent_str<< indent_str_next << "Area = " << router->buffer.area.get_area()*1e-6*nocdynp.input_ports<< " mm^2" << endl;
< cout << indent_str<< indent_str_next << "Peak Dynamic = " <<(router->buffer.power.readOp.dynamic + router->buffer.power.writeOp.dynamic)
< *nocdynp.min_ports*M*nocdynp.clockRate << " W" << endl;
< cout << indent_str<< indent_str_next << "Subthreshold Leakage = "
< << (long_channel? router->buffer.power.readOp.longer_channel_leakage*nocdynp.input_ports:router->buffer.power.readOp.leakage*nocdynp.input_ports) <<" W" << endl;
< cout << indent_str<< indent_str_next << "Gate Leakage = " << router->buffer.power.readOp.gate_leakage*nocdynp.input_ports << " W" << endl;
< cout << indent_str<< indent_str_next << "Runtime Dynamic = " << router->buffer.rt_power.readOp.dynamic/nocdynp.executionTime << " W" << endl;
< cout <<endl;
< cout << indent_str<< indent_str<< "Crossbar:" << endl;
< cout << indent_str<< indent_str_next << "Area = " << router->crossbar.area.get_area()*1e-6 << " mm^2" << endl;
< cout << indent_str<< indent_str_next << "Peak Dynamic = " << router->crossbar.power.readOp.dynamic*nocdynp.clockRate*nocdynp.min_ports*M << " W" << endl;
< cout << indent_str<< indent_str_next << "Subthreshold Leakage = "
< << (long_channel? router->crossbar.power.readOp.longer_channel_leakage:router->crossbar.power.readOp.leakage) << " W" << endl;
< cout << indent_str<< indent_str_next << "Gate Leakage = " << router->crossbar.power.readOp.gate_leakage << " W" << endl;
< cout << indent_str<< indent_str_next << "Runtime Dynamic = " << router->crossbar.rt_power.readOp.dynamic/nocdynp.executionTime << " W" << endl;
< cout <<endl;
< cout << indent_str<< indent_str<< "Arbiter:" << endl;
< cout << indent_str<< indent_str_next << "Peak Dynamic = " << router->arbiter.power.readOp.dynamic*nocdynp.clockRate*nocdynp.min_ports*M << " W" << endl;
< cout << indent_str<< indent_str_next << "Subthreshold Leakage = "
< << (long_channel? router->arbiter.power.readOp.longer_channel_leakage:router->arbiter.power.readOp.leakage) << " W" << endl;
< cout << indent_str<< indent_str_next << "Gate Leakage = " << router->arbiter.power.readOp.gate_leakage << " W" << endl;
< cout << indent_str<< indent_str_next << "Runtime Dynamic = " << router->arbiter.rt_power.readOp.dynamic/nocdynp.executionTime << " W" << endl;
< cout <<endl;
< }
< }
< if (link_bus_exist)
< {
< cout << indent_str << (nocdynp.type? "Per Router ":"") << link_name<<": " << endl;
< cout << indent_str_next << "Area = " << link_bus_tot_per_Router.area.get_area()*1e-6<< " mm^2" << endl;
< cout << indent_str_next<< "Peak Dynamic = " << link_bus_tot_per_Router.power.readOp.dynamic*
< nocdynp.clockRate << " W" << endl;
< cout << indent_str_next << "Subthreshold Leakage = "
< << (long_channel? link_bus_tot_per_Router.power.readOp.longer_channel_leakage:link_bus_tot_per_Router.power.readOp.leakage)
< <<" W" << endl;
< cout << indent_str_next << "Gate Leakage = " << link_bus_tot_per_Router.power.readOp.gate_leakage
< << " W" << endl;
< cout << indent_str_next<< "Runtime Dynamic = " << link_bus->rt_power.readOp.dynamic/nocdynp.executionTime << " W" << endl;
< cout<<endl;
---
> ASSIGN_INT_IF("type", noc_params.type);
> ASSIGN_FP_IF("clockrate", noc_params.clockRate);
> ASSIGN_INT_IF("flit_bits", noc_params.flit_size);
> ASSIGN_FP_IF("link_len", link_len);
> ASSIGN_FP_IF("link_throughput", noc_params.link_throughput);
> ASSIGN_FP_IF("link_latency", noc_params.link_latency);
> ASSIGN_INT_IF("input_ports", noc_params.input_ports);
> ASSIGN_INT_IF("output_ports", noc_params.output_ports);
> ASSIGN_INT_IF("global_linked_ports", noc_params.global_linked_ports);
> ASSIGN_INT_IF("horizontal_nodes", noc_params.horizontal_nodes);
> ASSIGN_INT_IF("vertical_nodes", noc_params.vertical_nodes);
> ASSIGN_FP_IF("chip_coverage", noc_params.chip_coverage);
> ASSIGN_FP_IF("link_routing_over_percentage",
> noc_params.route_over_perc);
> ASSIGN_INT_IF("has_global_link", noc_params.has_global_link);
> ASSIGN_INT_IF("virtual_channel_per_port",
> noc_params.virtual_channel_per_port);
> ASSIGN_INT_IF("input_buffer_entries_per_vc",
> noc_params.input_buffer_entries_per_vc);
> ASSIGN_FP_IF("M_traffic_pattern", noc_params.M_traffic_pattern);
> ASSIGN_FP_IF("link_base_width", noc_params.link_base_width);
> ASSIGN_FP_IF("link_base_height", noc_params.link_base_height);
> ASSIGN_INT_IF("link_start_wiring_level",
> noc_params.link_start_wiring_level);
> ASSIGN_INT_IF("wire_mat_type", mat_type);
> ASSIGN_ENUM_IF("wire_type", interface_ip.wt, Wire_type);
279c218,219
< }
---
> else {
> warnUnrecognizedParam(node_name);
281,296c221
< else
< {
< // cout << indent_str_next << "Instruction Fetch Unit Peak Dynamic = " << ifu->rt_power.readOp.dynamic*clockRate << " W" << endl;
< // cout << indent_str_next << "Instruction Fetch Unit Subthreshold Leakage = " << ifu->rt_power.readOp.leakage <<" W" << endl;
< // cout << indent_str_next << "Instruction Fetch Unit Gate Leakage = " << ifu->rt_power.readOp.gate_leakage << " W" << endl;
< // cout << indent_str_next << "Load Store Unit Peak Dynamic = " << lsu->rt_power.readOp.dynamic*clockRate << " W" << endl;
< // cout << indent_str_next << "Load Store Unit Subthreshold Leakage = " << lsu->rt_power.readOp.leakage << " W" << endl;
< // cout << indent_str_next << "Load Store Unit Gate Leakage = " << lsu->rt_power.readOp.gate_leakage << " W" << endl;
< // cout << indent_str_next << "Memory Management Unit Peak Dynamic = " << mmu->rt_power.readOp.dynamic*clockRate << " W" << endl;
< // cout << indent_str_next << "Memory Management Unit Subthreshold Leakage = " << mmu->rt_power.readOp.leakage << " W" << endl;
< // cout << indent_str_next << "Memory Management Unit Gate Leakage = " << mmu->rt_power.readOp.gate_leakage << " W" << endl;
< // cout << indent_str_next << "Execution Unit Peak Dynamic = " << exu->rt_power.readOp.dynamic*clockRate << " W" << endl;
< // cout << indent_str_next << "Execution Unit Subthreshold Leakage = " << exu->rt_power.readOp.leakage << " W" << endl;
< // cout << indent_str_next << "Execution Unit Gate Leakage = " << exu->rt_power.readOp.gate_leakage << " W" << endl;
< }
< }
---
> }
298,299c223,224
< void NoC::set_noc_param()
< {
---
> // Change from MHz to Hz
> noc_params.clockRate *= 1e6;
301,304c226,227
< nocdynp.type = XML->sys.NoC[ithNoC].type;
< nocdynp.clockRate =XML->sys.NoC[ithNoC].clockrate;
< nocdynp.clockRate *= 1e6;
< nocdynp.executionTime = XML->sys.total_cycles/(XML->sys.target_core_clockrate*1e6);
---
> interface_ip.wire_is_mat_type = mat_type;
> interface_ip.wire_os_mat_type = mat_type;
306,325c229,233
< nocdynp.flit_size = XML->sys.NoC[ithNoC].flit_bits;
< if (nocdynp.type)
< {
< nocdynp.input_ports = XML->sys.NoC[ithNoC].input_ports;
< nocdynp.output_ports = XML->sys.NoC[ithNoC].output_ports;//later minus 1
< nocdynp.min_ports = min(nocdynp.input_ports,nocdynp.output_ports);
< nocdynp.global_linked_ports = (nocdynp.input_ports-1) + (nocdynp.output_ports-1);
< /*
< * Except local i/o ports, all ports needs links( global_linked_ports);
< * However only min_ports can be fully active simultaneously
< * since the fewer number of ports (input or output ) is the bottleneck.
< */
< }
< else
< {
< nocdynp.input_ports = 1;
< nocdynp.output_ports = 1;
< nocdynp.min_ports = min(nocdynp.input_ports,nocdynp.output_ports);
< nocdynp.global_linked_ports = 1;
< }
---
> num_children = xml_data->nChildNode("stat");
> for (i = 0; i < num_children; i++) {
> XMLNode* statNode = xml_data->getChildNodePtr("stat", &i);
> XMLCSTR node_name = statNode->getAttribute("name");
> XMLCSTR value = statNode->getAttribute("value");
327,328c235,236
< nocdynp.virtual_channel_per_port = XML->sys.NoC[ithNoC].virtual_channel_per_port;
< nocdynp.input_buffer_entries_per_vc = XML->sys.NoC[ithNoC].input_buffer_entries_per_vc;
---
> if (!node_name)
> warnMissingStatName(statNode->getAttribute("id"));
330,338c238,239
< nocdynp.horizontal_nodes = XML->sys.NoC[ithNoC].horizontal_nodes;
< nocdynp.vertical_nodes = XML->sys.NoC[ithNoC].vertical_nodes;
< nocdynp.total_nodes = nocdynp.horizontal_nodes*nocdynp.vertical_nodes;
< nocdynp.duty_cycle = XML->sys.NoC[ithNoC].duty_cycle;
< nocdynp.has_global_link = XML->sys.NoC[ithNoC].has_global_link;
< nocdynp.link_throughput = XML->sys.NoC[ithNoC].link_throughput;
< nocdynp.link_latency = XML->sys.NoC[ithNoC].link_latency;
< nocdynp.chip_coverage = XML->sys.NoC[ithNoC].chip_coverage;
< nocdynp.route_over_perc = XML->sys.NoC[ithNoC].route_over_perc;
---
> ASSIGN_FP_IF("duty_cycle", noc_stats.duty_cycle);
> ASSIGN_FP_IF("total_accesses", noc_stats.total_access);
340,341c241,244
< assert (nocdynp.chip_coverage <=1);
< assert (nocdynp.route_over_perc <=1);
---
> else {
> warnUnrecognizedStat(node_name);
> }
> }
343,346c246,254
< if (nocdynp.type)
< name = "NOC";
< else
< name = "BUSES";
---
> clockRate = noc_params.clockRate;
> noc_params.min_ports =
> min(noc_params.input_ports, noc_params.output_ports);
> if (noc_params.type) {
> noc_params.global_linked_ports = (noc_params.input_ports - 1) +
> (noc_params.output_ports - 1);
> }
> noc_params.total_nodes =
> noc_params.horizontal_nodes * noc_params.vertical_nodes;
347a256,258
> assert(noc_params.chip_coverage <= 1);
> assert(noc_params.route_over_perc <= 1);
> assert(link_len > 0);
349a261
> OnChipNetwork ::~OnChipNetwork() {
351,354c263,270
< NoC ::~NoC(){
<
< if(router) {delete router; router = 0;}
< if(link_bus) {delete link_bus; link_bus = 0;}
---
> if (router) {
> delete router;
> router = 0;
> }
> if (link_bus) {
> delete link_bus;
> link_bus = 0;
> }