X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f90173083cea6c05e9a2418bc11c47750d006d8..7d195832dafde68afd749dd614e9a14d697bdb92:/src/kernel/routing/DragonflyZone.cpp diff --git a/src/kernel/routing/DragonflyZone.cpp b/src/kernel/routing/DragonflyZone.cpp index be88274f2f..2512b4f016 100644 --- a/src/kernel/routing/DragonflyZone.cpp +++ b/src/kernel/routing/DragonflyZone.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2014-2021. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -6,10 +6,10 @@ #include "simgrid/kernel/routing/DragonflyZone.hpp" #include "simgrid/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" -#include "src/surf/xml/platf_private.hpp" #include #include +#include #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster_dragonfly, surf_route_cluster, "Dragonfly Routing part of surf"); @@ -18,140 +18,180 @@ namespace simgrid { namespace kernel { namespace routing { -DragonflyZone::DragonflyZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel) - : ClusterZone(father, name, netmodel) +DragonflyZone::DragonflyZone(const std::string& name) : ClusterBase(name) {} + +DragonflyZone::Coords DragonflyZone::rankId_to_coords(unsigned long rankId) const { + // coords : group, chassis, blade, node + Coords coords; + coords.group = rankId / (num_chassis_per_group_ * num_blades_per_chassis_ * num_nodes_per_blade_); + rankId = rankId % (num_chassis_per_group_ * num_blades_per_chassis_ * num_nodes_per_blade_); + coords.chassis = rankId / (num_blades_per_chassis_ * num_nodes_per_blade_); + rankId = rankId % (num_blades_per_chassis_ * num_nodes_per_blade_); + coords.blade = rankId / num_nodes_per_blade_; + coords.node = rankId % num_nodes_per_blade_; + return coords; } -void DragonflyZone::rankId_to_coords(int rankId, unsigned int coords[4]) const +void DragonflyZone::rankId_to_coords(int rankId, unsigned int coords[4]) const // XBT_ATTRIB_DEPRECATED_v330 { - // coords : group, chassis, blade, node - coords[0] = rankId / (num_chassis_per_group_ * num_blades_per_chassis_ * num_nodes_per_blade_); - rankId = rankId % (num_chassis_per_group_ * num_blades_per_chassis_ * num_nodes_per_blade_); - coords[1] = rankId / (num_blades_per_chassis_ * num_nodes_per_blade_); - rankId = rankId % (num_blades_per_chassis_ * num_nodes_per_blade_); - coords[2] = rankId / num_nodes_per_blade_; - coords[3] = rankId % num_nodes_per_blade_; + const auto s_coords = rankId_to_coords(rankId); + coords[0] = s_coords.group; + coords[1] = s_coords.chassis; + coords[2] = s_coords.blade; + coords[3] = s_coords.node; +} + +void DragonflyZone::set_link_characteristics(double bw, double lat, s4u::Link::SharingPolicy sharing_policy) +{ + ClusterBase::set_link_characteristics(bw, lat, sharing_policy); + if (sharing_policy == s4u::Link::SharingPolicy::SPLITDUPLEX) + num_links_per_link_ = 2; +} + +void DragonflyZone::set_topology(unsigned int n_groups, unsigned int groups_links, unsigned int n_chassis, + unsigned int chassis_links, unsigned int n_routers, unsigned int routers_links, + unsigned int nodes) +{ + num_groups_ = n_groups; + num_links_blue_ = groups_links; + + num_chassis_per_group_ = n_chassis; + num_links_black_ = chassis_links; + + num_blades_per_chassis_ = n_routers; + num_links_green_ = routers_links; + + num_nodes_per_blade_ = nodes; } -void DragonflyZone::parse_specific_arguments(ClusterCreationArgs* cluster) +s4u::DragonflyParams DragonflyZone::parse_topo_parameters(const std::string& topo_parameters) { std::vector parameters; std::vector tmp; - boost::split(parameters, cluster->topo_parameters, boost::is_any_of(";")); + boost::split(parameters, topo_parameters, boost::is_any_of(";")); - if (parameters.size() != 4 || parameters.empty()) { - surf_parse_error( - "Dragonfly are defined by the number of groups, chassis per groups, blades per chassis, nodes per blade"); - } + if (parameters.size() != 4) + xbt_die("Dragonfly are defined by the number of groups, chassis per groups, blades per chassis, nodes per blade"); // Blue network : number of groups, number of links between each group boost::split(tmp, parameters[0], boost::is_any_of(",")); - if (tmp.size() != 2) { - surf_parse_error("Dragonfly topologies are defined by 3 levels with 2 elements each, and one with one element"); - } + if (tmp.size() != 2) + xbt_die("Dragonfly topologies are defined by 3 levels with 2 elements each, and one with one element"); + unsigned int n_groups; try { - this->num_groups_ = std::stoi(tmp[0]); + n_groups = std::stoi(tmp[0]); } catch (const std::invalid_argument&) { throw std::invalid_argument(std::string("Invalid number of groups:") + tmp[0]); } + unsigned int n_blue; try { - this->num_links_blue_ = std::stoi(tmp[1]); + n_blue = std::stoi(tmp[1]); } catch (const std::invalid_argument&) { throw std::invalid_argument(std::string("Invalid number of links for the blue level:") + tmp[1]); } + // Black network : number of chassis/group, number of links between each router on the black network boost::split(tmp, parameters[1], boost::is_any_of(",")); - if (tmp.size() != 2) { - surf_parse_error("Dragonfly topologies are defined by 3 levels with 2 elements each, and one with one element"); - } + if (tmp.size() != 2) + xbt_die("Dragonfly topologies are defined by 3 levels with 2 elements each, and one with one element"); + unsigned int n_chassis; try { - this->num_chassis_per_group_ = std::stoi(tmp[0]); + n_chassis = std::stoi(tmp[0]); } catch (const std::invalid_argument&) { - throw std::invalid_argument(std::string("Invalid number of groups:") + tmp[0]); + throw std::invalid_argument(std::string("Invalid number of chassis:") + tmp[0]); } + unsigned int n_black; try { - this->num_links_black_ = std::stoi(tmp[1]); + n_black = std::stoi(tmp[1]); } catch (const std::invalid_argument&) { throw std::invalid_argument(std::string("Invalid number of links for the black level:") + tmp[1]); } // Green network : number of blades/chassis, number of links between each router on the green network boost::split(tmp, parameters[2], boost::is_any_of(",")); - if (tmp.size() != 2) { - surf_parse_error("Dragonfly topologies are defined by 3 levels with 2 elements each, and one with one element"); - } + if (tmp.size() != 2) + xbt_die("Dragonfly topologies are defined by 3 levels with 2 elements each, and one with one element"); + unsigned int n_routers; try { - this->num_blades_per_chassis_ = std::stoi(tmp[0]); + n_routers = std::stoi(tmp[0]); } catch (const std::invalid_argument&) { - throw std::invalid_argument(std::string("Invalid number of groups:") + tmp[0]); + throw std::invalid_argument(std::string("Invalid number of routers:") + tmp[0]); } + unsigned int n_green; try { - this->num_links_green_ = std::stoi(tmp[1]); + n_green = std::stoi(tmp[1]); } catch (const std::invalid_argument&) { throw std::invalid_argument(std::string("Invalid number of links for the green level:") + tmp[1]); } // The last part of topo_parameters should be the number of nodes per blade + unsigned int n_nodes; try { - this->num_nodes_per_blade_ = std::stoi(parameters[3]); + n_nodes = std::stoi(parameters[3]); } catch (const std::invalid_argument&) { throw std::invalid_argument(std::string("Last parameter is not the amount of nodes per blade:") + parameters[3]); } - - this->sharing_policy_ = cluster->sharing_policy; - if (cluster->sharing_policy == s4u::Link::SharingPolicy::SPLITDUPLEX) - this->num_links_per_link_ = 2; - this->bw_ = cluster->bw; - this->lat_ = cluster->lat; + return s4u::DragonflyParams({n_groups, n_blue}, {n_chassis, n_black}, {n_routers, n_green}, n_nodes); } /* Generate the cluster once every node is created */ -void DragonflyZone::seal() +void DragonflyZone::build_upper_levels(const s4u::ClusterCallbacks& set_callbacks) { - if (this->num_nodes_per_blade_ == 0) { - return; - } - - this->generate_routers(); - this->generate_links(); + generate_routers(set_callbacks); + generate_links(); } -void DragonflyZone::generate_routers() +void DragonflyZone::generate_routers(const s4u::ClusterCallbacks& set_callbacks) { - this->routers_.reserve(this->num_groups_ * this->num_chassis_per_group_ * this->num_blades_per_chassis_); - for (unsigned int i = 0; i < this->num_groups_; i++) - for (unsigned int j = 0; j < this->num_chassis_per_group_; j++) - for (unsigned int k = 0; k < this->num_blades_per_chassis_; k++) - this->routers_.emplace_back(i, j, k); + unsigned long id = 2 * num_groups_ * num_chassis_per_group_ * num_blades_per_chassis_ * num_nodes_per_blade_; + /* get limiter for this router */ + auto get_limiter = [this, &id, &set_callbacks](unsigned int i, unsigned int j, + unsigned int k) -> resource::LinkImpl* { + kernel::resource::LinkImpl* limiter = nullptr; + if (set_callbacks.limiter) { + id--; + const auto* s4u_link = + set_callbacks.limiter(get_iface(), {i, j, k, std::numeric_limits::max()}, id); + if (s4u_link) { + limiter = s4u_link->get_impl(); + } + } + return limiter; + }; + + routers_.reserve(static_cast(num_groups_) * num_chassis_per_group_ * num_blades_per_chassis_); + for (unsigned int i = 0; i < num_groups_; i++) { + for (unsigned int j = 0; j < num_chassis_per_group_; j++) { + for (unsigned int k = 0; k < num_blades_per_chassis_; k++) { + routers_.emplace_back(i, j, k, get_limiter(i, j, k)); + } + } + } } -void DragonflyZone::create_link(const std::string& id, int numlinks, resource::LinkImpl** linkup, - resource::LinkImpl** linkdown) const +void DragonflyZone::generate_link(const std::string& id, int numlinks, resource::LinkImpl** linkup, + resource::LinkImpl** linkdown) { + XBT_DEBUG("Generating link %s", id.c_str()); *linkup = nullptr; *linkdown = nullptr; - LinkCreationArgs linkTemplate; - linkTemplate.bandwidths.push_back(this->bw_ * numlinks); - linkTemplate.latency = this->lat_; - linkTemplate.policy = this->sharing_policy_; - linkTemplate.id = std::move(id); - sg_platf_new_link(&linkTemplate); - XBT_DEBUG("Generating link %s", linkTemplate.id.c_str()); - resource::LinkImpl* link; - if (this->sharing_policy_ == s4u::Link::SharingPolicy::SPLITDUPLEX) { - *linkup = s4u::Link::by_name(linkTemplate.id + "_UP")->get_impl(); // check link? - *linkdown = s4u::Link::by_name(linkTemplate.id + "_DOWN")->get_impl(); // check link ? + if (get_link_sharing_policy() == s4u::Link::SharingPolicy::SPLITDUPLEX) { + *linkup = + create_link(id + "_UP", {get_link_bandwidth() * numlinks})->set_latency(get_link_latency())->seal()->get_impl(); + *linkdown = create_link(id + "_DOWN", {get_link_bandwidth() * numlinks}) + ->set_latency(get_link_latency()) + ->seal() + ->get_impl(); } else { - link = s4u::Link::by_name(linkTemplate.id)->get_impl(); - *linkup = link; - *linkdown = link; + *linkup = create_link(id, {get_link_bandwidth() * numlinks})->set_latency(get_link_latency())->seal()->get_impl(); + *linkdown = *linkup; } } @@ -161,55 +201,55 @@ void DragonflyZone::generate_links() resource::LinkImpl* linkup; resource::LinkImpl* linkdown; - unsigned int numRouters = this->num_groups_ * this->num_chassis_per_group_ * this->num_blades_per_chassis_; + unsigned int numRouters = num_groups_ * num_chassis_per_group_ * num_blades_per_chassis_; // Links from routers to their local nodes. for (unsigned int i = 0; i < numRouters; i++) { // allocate structures - this->routers_[i].my_nodes_.resize(num_links_per_link_ * this->num_nodes_per_blade_); - this->routers_[i].green_links_.resize(this->num_blades_per_chassis_); - this->routers_[i].black_links_.resize(this->num_chassis_per_group_); + routers_[i].my_nodes_.resize(static_cast(num_links_per_link_) * num_nodes_per_blade_); + routers_[i].green_links_.resize(num_blades_per_chassis_); + routers_[i].black_links_.resize(num_chassis_per_group_); - for (unsigned int j = 0; j < num_links_per_link_ * this->num_nodes_per_blade_; j += num_links_per_link_) { + for (unsigned int j = 0; j < num_links_per_link_ * num_nodes_per_blade_; j += num_links_per_link_) { std::string id = "local_link_from_router_" + std::to_string(i) + "_to_node_" + std::to_string(j / num_links_per_link_) + "_" + std::to_string(uniqueId); - this->create_link(id, 1, &linkup, &linkdown); + generate_link(id, 1, &linkup, &linkdown); - this->routers_[i].my_nodes_[j] = linkup; - if (this->sharing_policy_ == s4u::Link::SharingPolicy::SPLITDUPLEX) - this->routers_[i].my_nodes_[j + 1] = linkdown; + routers_[i].my_nodes_[j] = linkup; + if (get_link_sharing_policy() == s4u::Link::SharingPolicy::SPLITDUPLEX) + routers_[i].my_nodes_[j + 1] = linkdown; uniqueId++; } } // Green links from routers to same chassis routers - alltoall - for (unsigned int i = 0; i < this->num_groups_ * this->num_chassis_per_group_; i++) { - for (unsigned int j = 0; j < this->num_blades_per_chassis_; j++) { - for (unsigned int k = j + 1; k < this->num_blades_per_chassis_; k++) { + for (unsigned int i = 0; i < num_groups_ * num_chassis_per_group_; i++) { + for (unsigned int j = 0; j < num_blades_per_chassis_; j++) { + for (unsigned int k = j + 1; k < num_blades_per_chassis_; k++) { std::string id = "green_link_in_chassis_" + std::to_string(i % num_chassis_per_group_) + "_between_routers_" + std::to_string(j) + "_and_" + std::to_string(k) + "_" + std::to_string(uniqueId); - this->create_link(id, this->num_links_green_, &linkup, &linkdown); + generate_link(id, num_links_green_, &linkup, &linkdown); - this->routers_[i * num_blades_per_chassis_ + j].green_links_[k] = linkup; - this->routers_[i * num_blades_per_chassis_ + k].green_links_[j] = linkdown; + routers_[i * num_blades_per_chassis_ + j].green_links_[k] = linkup; + routers_[i * num_blades_per_chassis_ + k].green_links_[j] = linkdown; uniqueId++; } } } // Black links from routers to same group routers - alltoall - for (unsigned int i = 0; i < this->num_groups_; i++) { - for (unsigned int j = 0; j < this->num_chassis_per_group_; j++) { - for (unsigned int k = j + 1; k < this->num_chassis_per_group_; k++) { - for (unsigned int l = 0; l < this->num_blades_per_chassis_; l++) { + for (unsigned int i = 0; i < num_groups_; i++) { + for (unsigned int j = 0; j < num_chassis_per_group_; j++) { + for (unsigned int k = j + 1; k < num_chassis_per_group_; k++) { + for (unsigned int l = 0; l < num_blades_per_chassis_; l++) { std::string id = "black_link_in_group_" + std::to_string(i) + "_between_chassis_" + std::to_string(j) + - "_and_" + std::to_string(k) +"_blade_" + std::to_string(l) + "_" + std::to_string(uniqueId); - this->create_link(id, this->num_links_black_, &linkup, &linkdown); + "_and_" + std::to_string(k) + "_blade_" + std::to_string(l) + "_" + std::to_string(uniqueId); + generate_link(id, num_links_black_, &linkup, &linkdown); - this->routers_[i * num_blades_per_chassis_ * num_chassis_per_group_ + j * num_blades_per_chassis_ + l] + routers_[i * num_blades_per_chassis_ * num_chassis_per_group_ + j * num_blades_per_chassis_ + l] .black_links_[k] = linkup; - this->routers_[i * num_blades_per_chassis_ * num_chassis_per_group_ + k * num_blades_per_chassis_ + l] + routers_[i * num_blades_per_chassis_ * num_chassis_per_group_ + k * num_blades_per_chassis_ + l] .black_links_[j] = linkdown; uniqueId++; } @@ -220,22 +260,23 @@ void DragonflyZone::generate_links() // Blue links between groups - Not all routers involved, only one per group is linked to others. Let's say router n of // each group is linked to group n. // FIXME: in reality blue links may be attached to several different routers - for (unsigned int i = 0; i < this->num_groups_; i++) { - for (unsigned int j = i + 1; j < this->num_groups_; j++) { - unsigned int routernumi = i * num_blades_per_chassis_ * num_chassis_per_group_ + j; - unsigned int routernumj = j * num_blades_per_chassis_ * num_chassis_per_group_ + i; - std::string id = "blue_link_between_group_"+ std::to_string(i) +"_and_" + std::to_string(j) +"_routers_" + - std::to_string(routernumi) + "_and_" + std::to_string(routernumj) + "_" + std::to_string(uniqueId); - this->create_link(id, this->num_links_blue_, &linkup, &linkdown); - - this->routers_[routernumi].blue_link_ = linkup; - this->routers_[routernumj].blue_link_ = linkdown; + for (unsigned int i = 0; i < num_groups_; i++) { + for (unsigned int j = i + 1; j < num_groups_; j++) { + unsigned int routernumi = i * num_blades_per_chassis_ * num_chassis_per_group_ + j; + unsigned int routernumj = j * num_blades_per_chassis_ * num_chassis_per_group_ + i; + std::string id = "blue_link_between_group_" + std::to_string(i) + "_and_" + std::to_string(j) + "_routers_" + + std::to_string(routernumi) + "_and_" + std::to_string(routernumj) + "_" + + std::to_string(uniqueId); + generate_link(id, num_links_blue_, &linkup, &linkdown); + + routers_[routernumi].blue_link_ = linkup; + routers_[routernumj].blue_link_ = linkdown; uniqueId++; } } } -void DragonflyZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* latency) +void DragonflyZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* route, double* latency) { // Minimal routing version. // TODO : non-minimal random one, and adaptive ? @@ -243,96 +284,156 @@ void DragonflyZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationA if (dst->is_router() || src->is_router()) return; - XBT_VERB("dragonfly getLocalRoute from '%s'[%u] to '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(), + XBT_VERB("dragonfly getLocalRoute from '%s'[%lu] to '%s'[%lu]", src->get_cname(), src->id(), dst->get_cname(), dst->id()); - if ((src->id() == dst->id()) && has_loopback_) { - std::pair info = private_links_.at(node_pos(src->id())); + if ((src->id() == dst->id()) && has_loopback()) { + resource::LinkImpl* uplink = get_uplink_from(node_pos(src->id())); - route->link_list.push_back(info.first); - if (latency) - *latency += info.first->get_latency(); + add_link_latency(route->link_list_, uplink, latency); return; } - unsigned int myCoords[4]; - rankId_to_coords(src->id(), myCoords); - unsigned int targetCoords[4]; - rankId_to_coords(dst->id(), targetCoords); - XBT_DEBUG("src : %u group, %u chassis, %u blade, %u node", myCoords[0], myCoords[1], myCoords[2], myCoords[3]); - XBT_DEBUG("dst : %u group, %u chassis, %u blade, %u node", targetCoords[0], targetCoords[1], targetCoords[2], - targetCoords[3]); - - DragonflyRouter* myRouter = &routers_[myCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + - myCoords[1] * num_blades_per_chassis_ + myCoords[2]]; - DragonflyRouter* targetRouter = &routers_[targetCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + - targetCoords[1] * num_blades_per_chassis_ + targetCoords[2]]; + const auto myCoords = rankId_to_coords(src->id()); + const auto targetCoords = rankId_to_coords(dst->id()); + XBT_DEBUG("src : %u group, %u chassis, %u blade, %u node", myCoords.group, myCoords.chassis, myCoords.blade, + myCoords.node); + XBT_DEBUG("dst : %u group, %u chassis, %u blade, %u node", targetCoords.group, targetCoords.chassis, + targetCoords.blade, targetCoords.node); + + DragonflyRouter* myRouter = &routers_[myCoords.group * (num_chassis_per_group_ * num_blades_per_chassis_) + + myCoords.chassis * num_blades_per_chassis_ + myCoords.blade]; + DragonflyRouter* targetRouter = &routers_[targetCoords.group * (num_chassis_per_group_ * num_blades_per_chassis_) + + targetCoords.chassis * num_blades_per_chassis_ + targetCoords.blade]; DragonflyRouter* currentRouter = myRouter; - // node->router local link - route->link_list.push_back(myRouter->my_nodes_[myCoords[3] * num_links_per_link_]); - if (latency) - *latency += myRouter->my_nodes_[myCoords[3] * num_links_per_link_]->get_latency(); - - if (has_limiter_) { // limiter for sender - std::pair info = private_links_.at(node_pos_with_loopback(src->id())); - route->link_list.push_back(info.first); + if (has_limiter()) { // limiter for sender + route->link_list_.push_back(get_uplink_from(node_pos_with_loopback(src->id()))); } + // node->router local link + add_link_latency(route->link_list_, myRouter->my_nodes_[static_cast(myCoords.node) * num_links_per_link_], + latency); + if (targetRouter != myRouter) { // are we on a different group ? if (targetRouter->group_ != currentRouter->group_) { // go to the router of our group connected to this one. - if (currentRouter->blade_ != targetCoords[0]) { + if (currentRouter->blade_ != targetCoords.group) { + if (currentRouter->limiter_) + route->link_list_.push_back(currentRouter->limiter_); // go to the nth router in our chassis - route->link_list.push_back(currentRouter->green_links_[targetCoords[0]]); - if (latency) - *latency += currentRouter->green_links_[targetCoords[0]]->get_latency(); - currentRouter = &routers_[myCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + - myCoords[1] * num_blades_per_chassis_ + targetCoords[0]]; + add_link_latency(route->link_list_, currentRouter->green_links_[targetCoords.group], latency); + currentRouter = &routers_[myCoords.group * (num_chassis_per_group_ * num_blades_per_chassis_) + + myCoords.chassis * num_blades_per_chassis_ + targetCoords.group]; } if (currentRouter->chassis_ != 0) { // go to the first chassis of our group - route->link_list.push_back(currentRouter->black_links_[0]); - if (latency) - *latency += currentRouter->black_links_[0]->get_latency(); - currentRouter = &routers_[myCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + targetCoords[0]]; + if (currentRouter->limiter_) + route->link_list_.push_back(currentRouter->limiter_); + add_link_latency(route->link_list_, currentRouter->black_links_[0], latency); + currentRouter = + &routers_[myCoords.group * (num_chassis_per_group_ * num_blades_per_chassis_) + targetCoords.group]; } // go to destination group - the only optical hop - route->link_list.push_back(currentRouter->blue_link_); - if (latency) - *latency += currentRouter->blue_link_->get_latency(); - currentRouter = &routers_[targetCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + myCoords[0]]; + add_link_latency(route->link_list_, currentRouter->blue_link_, latency); + if (currentRouter->limiter_) + route->link_list_.push_back(currentRouter->limiter_); + currentRouter = + &routers_[targetCoords.group * (num_chassis_per_group_ * num_blades_per_chassis_) + myCoords.group]; } // same group, but same blade ? if (targetRouter->blade_ != currentRouter->blade_) { - route->link_list.push_back(currentRouter->green_links_[targetCoords[2]]); - if (latency) - *latency += currentRouter->green_links_[targetCoords[2]]->get_latency(); - currentRouter = &routers_[targetCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + targetCoords[2]]; + if (currentRouter->limiter_) + route->link_list_.push_back(currentRouter->limiter_); + add_link_latency(route->link_list_, currentRouter->green_links_[targetCoords.blade], latency); + currentRouter = + &routers_[targetCoords.group * (num_chassis_per_group_ * num_blades_per_chassis_) + targetCoords.blade]; } // same blade, but same chassis ? if (targetRouter->chassis_ != currentRouter->chassis_) { - route->link_list.push_back(currentRouter->black_links_[targetCoords[1]]); - if (latency) - *latency += currentRouter->black_links_[targetCoords[1]]->get_latency(); + if (currentRouter->limiter_) + route->link_list_.push_back(currentRouter->limiter_); + add_link_latency(route->link_list_, currentRouter->black_links_[targetCoords.chassis], latency); } } - if (has_limiter_) { // limiter for receiver - std::pair info = private_links_.at(node_pos_with_loopback(dst->id())); - route->link_list.push_back(info.first); + // router->node local link + if (targetRouter->limiter_) + route->link_list_.push_back(targetRouter->limiter_); + add_link_latency(route->link_list_, + targetRouter->my_nodes_[targetCoords.node * num_links_per_link_ + num_links_per_link_ - 1], latency); + + if (has_limiter()) { // limiter for receiver + route->link_list_.push_back(get_downlink_to(node_pos_with_loopback(dst->id()))); } - // router->node local link - route->link_list.push_back(targetRouter->my_nodes_[targetCoords[3] * num_links_per_link_ + num_links_per_link_ - 1]); - if (latency) - *latency += targetRouter->my_nodes_[targetCoords[3] * num_links_per_link_ + num_links_per_link_ - 1]->get_latency(); + // set gateways (if any) + route->gw_src_ = get_gateway(src->id()); + route->gw_dst_ = get_gateway(dst->id()); } +} // namespace routing +} // namespace kernel + +namespace s4u { +DragonflyParams::DragonflyParams(const std::pair& groups, + const std::pair& chassis, + const std::pair& routers, unsigned int nodes) + : groups(groups), chassis(chassis), routers(routers), nodes(nodes) +{ + if (groups.first == 0) + throw std::invalid_argument("Dragonfly: Invalid number of groups, must be > 0"); + if (groups.second == 0) + throw std::invalid_argument("Dragonfly: Invalid number of blue (groups) links, must be > 0"); + if (chassis.first == 0) + throw std::invalid_argument("Dragonfly: Invalid number of chassis, must be > 0"); + if (chassis.second == 0) + throw std::invalid_argument("Dragonfly: Invalid number of black (chassis) links, must be > 0"); + if (routers.first == 0) + throw std::invalid_argument("Dragonfly: Invalid number of routers, must be > 0"); + if (routers.second == 0) + throw std::invalid_argument("Dragonfly: Invalid number of green (routers) links, must be > 0"); + if (nodes == 0) + throw std::invalid_argument("Dragonfly: Invalid number of nodes, must be > 0"); } + +NetZone* create_dragonfly_zone(const std::string& name, const NetZone* parent, const DragonflyParams& params, + const ClusterCallbacks& set_callbacks, double bandwidth, double latency, + Link::SharingPolicy sharing_policy) +{ + /* initial checks */ + if (bandwidth <= 0) + throw std::invalid_argument("DragonflyZone: incorrect bandwidth for internode communication, bw=" + + std::to_string(bandwidth)); + if (latency < 0) + throw std::invalid_argument("DragonflyZone: incorrect latency for internode communication, lat=" + + std::to_string(latency)); + + /* creating zone */ + auto* zone = new kernel::routing::DragonflyZone(name); + zone->set_topology(params.groups.first, params.groups.second, params.chassis.first, params.chassis.second, + params.routers.first, params.routers.second, params.nodes); + if (parent) + zone->set_parent(parent->get_impl()); + zone->set_link_characteristics(bandwidth, latency, sharing_policy); + + /* populating it */ + std::vector dimensions = {params.groups.first, params.chassis.first, params.routers.first, + params.nodes}; + int tot_elements = std::accumulate(dimensions.begin(), dimensions.end(), 1, std::multiplies<>()); + for (int i = 0; i < tot_elements; i++) { + kernel::routing::NetPoint* netpoint; + Link* limiter; + Link* loopback; + zone->fill_leaf_from_cb(i, dimensions, set_callbacks, &netpoint, &loopback, &limiter); + } + zone->build_upper_levels(set_callbacks); + return zone->get_iface(); } -} // namespace +} // namespace s4u + +} // namespace simgrid