X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/737a256dd1d7adf4255c24729ae6069284049d2c..6985b5de45eda7769cd98891461948ae298eb8c3:/src/kernel/routing/DragonflyZone.cpp diff --git a/src/kernel/routing/DragonflyZone.cpp b/src/kernel/routing/DragonflyZone.cpp index bc7a8c1fb5..8e674525bd 100644 --- a/src/kernel/routing/DragonflyZone.cpp +++ b/src/kernel/routing/DragonflyZone.cpp @@ -18,7 +18,7 @@ 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 { @@ -44,7 +44,7 @@ void DragonflyZone::rankId_to_coords(int rankId, unsigned int coords[4]) const / void DragonflyZone::set_link_characteristics(double bw, double lat, s4u::Link::SharingPolicy sharing_policy) { - ClusterZone::set_link_characteristics(bw, lat, sharing_policy); + ClusterBase::set_link_characteristics(bw, lat, sharing_policy); if (sharing_policy == s4u::Link::SharingPolicy::SPLITDUPLEX) num_links_per_link_ = 2; } @@ -142,22 +142,38 @@ 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); + int id = 0; + /* 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::generate_link(const std::string& id, int numlinks, resource::LinkImpl** linkup, @@ -167,19 +183,14 @@ void DragonflyZone::generate_link(const std::string& id, int numlinks, resource: *linkup = nullptr; *linkdown = nullptr; if (get_link_sharing_policy() == s4u::Link::SharingPolicy::SPLITDUPLEX) { - *linkup = create_link(id + "_UP", std::vector{get_link_bandwidth() * numlinks}) - ->set_latency(get_link_latency()) - ->seal() - ->get_impl(); - *linkdown = create_link(id + "_DOWN", std::vector{get_link_bandwidth() * numlinks}) + *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{get_link_bandwidth() * numlinks}) - ->set_latency(get_link_latency()) - ->seal() - ->get_impl(); + *linkup = create_link(id, {get_link_bandwidth() * numlinks})->set_latency(get_link_latency())->seal()->get_impl(); *linkdown = *linkup; } } @@ -195,7 +206,7 @@ void DragonflyZone::generate_links() // 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_); @@ -265,7 +276,7 @@ void DragonflyZone::generate_links() } } -void DragonflyZone::get_local_route(NetPoint* src, NetPoint* dst, Route* 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 ? @@ -273,15 +284,13 @@ void DragonflyZone::get_local_route(NetPoint* src, NetPoint* dst, Route* route, 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())); - route->link_list_.push_back(uplink); - if (latency) - *latency += uplink->get_latency(); + add_link_latency(route->link_list_, uplink, latency); return; } @@ -298,73 +307,71 @@ void DragonflyZone::get_local_route(NetPoint* src, NetPoint* dst, Route* route, 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()))); } + // 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.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()))); } - // 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()); @@ -415,8 +422,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; @@ -424,6 +431,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(); }