X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/38ffc837c5692a4d52e7610a67453a5335434bbd..f9b13d923d31bb0336aeeaab6d5b7ba33812f3f7:/src/kernel/routing/DragonflyZone.cpp diff --git a/src/kernel/routing/DragonflyZone.cpp b/src/kernel/routing/DragonflyZone.cpp index f6e7d95efd..8273672eab 100644 --- a/src/kernel/routing/DragonflyZone.cpp +++ b/src/kernel/routing/DragonflyZone.cpp @@ -1,27 +1,26 @@ -/* Copyright (c) 2014-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2014-2022. 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. */ #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 "src/kernel/resource/StandardLinkImpl.hpp" #include #include #include #include -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster_dragonfly, surf_route_cluster, "Dragonfly Routing part of surf"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_routing_dragonfly, ker_routing, "Kernel Dragonfly Routing"); namespace simgrid { namespace kernel { namespace routing { -DragonflyZone::DragonflyZone(const std::string& name) : ClusterZone(name) {} +DragonflyZone::DragonflyZone(const std::string& name) : ClusterBase(name) {} -DragonflyZone::Coords DragonflyZone::rankId_to_coords(int rankId) const +DragonflyZone::Coords DragonflyZone::rankId_to_coords(unsigned long rankId) const { // coords : group, chassis, blade, node Coords coords; @@ -34,22 +33,11 @@ DragonflyZone::Coords DragonflyZone::rankId_to_coords(int rankId) const return coords; } -void DragonflyZone::rankId_to_coords(int rankId, unsigned int coords[4]) const // XBT_ATTRIB_DEPRECATED_v330 -{ - 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) { - sharing_policy_ = sharing_policy; + ClusterBase::set_link_characteristics(bw, lat, sharing_policy); if (sharing_policy == s4u::Link::SharingPolicy::SPLITDUPLEX) num_links_per_link_ = 2; - bw_ = bw; - lat_ = lat; } void DragonflyZone::set_topology(unsigned int n_groups, unsigned int groups_links, unsigned int n_chassis, @@ -75,13 +63,12 @@ s4u::DragonflyParams DragonflyZone::parse_topo_parameters(const std::string& top boost::split(parameters, topo_parameters, boost::is_any_of(";")); if (parameters.size() != 4) - surf_parse_error( - "Dragonfly are defined by the number of groups, chassis per groups, blades per chassis, nodes per blade"); + 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"); + xbt_die("Dragonfly topologies are defined by 3 levels with 2 elements each, and one with one element"); unsigned int n_groups; try { @@ -100,7 +87,7 @@ s4u::DragonflyParams DragonflyZone::parse_topo_parameters(const std::string& top // 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"); + xbt_die("Dragonfly topologies are defined by 3 levels with 2 elements each, and one with one element"); unsigned int n_chassis; try { @@ -119,7 +106,7 @@ s4u::DragonflyParams DragonflyZone::parse_topo_parameters(const std::string& top // 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"); + xbt_die("Dragonfly topologies are defined by 3 levels with 2 elements each, and one with one element"); unsigned int n_routers; try { @@ -146,35 +133,55 @@ s4u::DragonflyParams DragonflyZone::parse_topo_parameters(const std::string& top } /* Generate the cluster once every node is created */ -void DragonflyZone::do_seal() +void DragonflyZone::build_upper_levels(const s4u::ClusterCallbacks& set_callbacks) { - if (num_nodes_per_blade_ == 0) - return; - - generate_routers(); + generate_routers(set_callbacks); generate_links(); } -void DragonflyZone::generate_routers() +void DragonflyZone::generate_routers(const s4u::ClusterCallbacks& set_callbacks) { - routers_.reserve(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); + unsigned long id = 2UL * 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::StandardLinkImpl* { + kernel::resource::StandardLinkImpl* 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::generate_link(const std::string& id, int numlinks, resource::LinkImpl** linkup, - resource::LinkImpl** linkdown) +void DragonflyZone::generate_link(const std::string& id, int numlinks, resource::StandardLinkImpl** linkup, + resource::StandardLinkImpl** linkdown) { XBT_DEBUG("Generating link %s", id.c_str()); *linkup = nullptr; *linkdown = nullptr; - if (sharing_policy_ == s4u::Link::SharingPolicy::SPLITDUPLEX) { - *linkup = create_link(id + "_UP", std::vector{bw_ * numlinks})->set_latency(lat_)->seal()->get_impl(); - *linkdown = create_link(id + "_DOWN", std::vector{bw_ * numlinks})->set_latency(lat_)->seal()->get_impl(); + 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 { - *linkup = create_link(id, std::vector{bw_ * numlinks})->set_latency(lat_)->seal()->get_impl(); + *linkup = create_link(id, {get_link_bandwidth() * numlinks})->set_latency(get_link_latency())->seal()->get_impl(); *linkdown = *linkup; } } @@ -182,15 +189,15 @@ void DragonflyZone::generate_link(const std::string& id, int numlinks, resource: void DragonflyZone::generate_links() { static int uniqueId = 0; - resource::LinkImpl* linkup; - resource::LinkImpl* linkdown; + resource::StandardLinkImpl* linkup; + resource::StandardLinkImpl* linkdown; 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 - routers_[i].my_nodes_.resize(num_links_per_link_ * num_nodes_per_blade_); + 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_); @@ -200,7 +207,7 @@ void DragonflyZone::generate_links() generate_link(id, 1, &linkup, &linkdown); routers_[i].my_nodes_[j] = linkup; - if (sharing_policy_ == s4u::Link::SharingPolicy::SPLITDUPLEX) + if (get_link_sharing_policy() == s4u::Link::SharingPolicy::SPLITDUPLEX) routers_[i].my_nodes_[j + 1] = linkdown; uniqueId++; @@ -260,7 +267,7 @@ void DragonflyZone::generate_links() } } -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 ? @@ -268,23 +275,21 @@ 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()) { - resource::LinkImpl* uplink = get_uplink_from(node_pos(src->id())); + resource::StandardLinkImpl* uplink = get_uplink_from(node_pos(src->id())); - route->link_list.push_back(uplink); - if (latency) - *latency += uplink->get_latency(); + add_link_latency(route->link_list_, uplink, latency); return; } 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, + XBT_DEBUG("src : %lu group, %lu chassis, %lu blade, %lu node", myCoords.group, myCoords.chassis, myCoords.blade, myCoords.node); - XBT_DEBUG("dst : %u group, %u chassis, %u blade, %u node", targetCoords.group, targetCoords.chassis, + XBT_DEBUG("dst : %lu group, %lu chassis, %lu blade, %lu node", targetCoords.group, targetCoords.chassis, targetCoords.blade, targetCoords.node); DragonflyRouter* myRouter = &routers_[myCoords.group * (num_chassis_per_group_ * num_blades_per_chassis_) + @@ -293,76 +298,73 @@ void DragonflyZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationA targetCoords.chassis * num_blades_per_chassis_ + targetCoords.blade]; DragonflyRouter* currentRouter = myRouter; - // node->router local link - route->link_list.push_back(myRouter->my_nodes_[myCoords.node * num_links_per_link_]); - if (latency) - *latency += myRouter->my_nodes_[myCoords.node * num_links_per_link_]->get_latency(); - if (has_limiter()) { // limiter for sender - route->link_list.push_back(get_uplink_from(node_pos_with_loopback(src->id()))); + 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_[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.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.group]); - if (latency) - *latency += currentRouter->green_links_[targetCoords.group]->get_latency(); + 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(); + 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(); + 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.blade]); - if (latency) - *latency += currentRouter->green_links_[targetCoords.blade]->get_latency(); + 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.chassis]); - if (latency) - *latency += currentRouter->black_links_[targetCoords.chassis]->get_latency(); + if (currentRouter->limiter_) + route->link_list_.push_back(currentRouter->limiter_); + add_link_latency(route->link_list_, currentRouter->black_links_[targetCoords.chassis], latency); } } + // 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()))); + 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.node * num_links_per_link_ + num_links_per_link_ - 1]); - if (latency) - *latency += - targetRouter->my_nodes_[targetCoords.node * 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()); + route->gw_src_ = get_gateway(src->id()); + route->gw_dst_ = get_gateway(dst->id()); } } // namespace routing } // namespace kernel @@ -410,8 +412,8 @@ NetZone* create_dragonfly_zone(const std::string& name, const NetZone* parent, c zone->set_link_characteristics(bandwidth, latency, sharing_policy); /* populating it */ - std::vector dimensions = {params.groups.first, params.chassis.first, params.routers.first, - params.nodes}; + 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; @@ -419,7 +421,7 @@ NetZone* create_dragonfly_zone(const std::string& name, const NetZone* parent, c 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 s4u