X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/54848f1b36dd4b0b508a77de74dfad59dd439a08..b2852b7c61948f495d7437ffaa7fd9aced12849c:/src/kernel/routing/FatTreeZone.cpp diff --git a/src/kernel/routing/FatTreeZone.cpp b/src/kernel/routing/FatTreeZone.cpp index be69aebdd7..03aed92435 100644 --- a/src/kernel/routing/FatTreeZone.cpp +++ b/src/kernel/routing/FatTreeZone.cpp @@ -1,26 +1,26 @@ -/* Copyright (c) 2014-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2014-2023. 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 +#include + +#include "src/kernel/resource/NetworkModel.hpp" +#include "src/kernel/xml/platf.hpp" // simgrid_parse_error() and simgrid_parse_assert() + #include #include #include #include -#include "simgrid/kernel/routing/FatTreeZone.hpp" -#include "simgrid/kernel/routing/NetPoint.hpp" -#include "src/surf/network_interface.hpp" -#include "src/surf/xml/platf_private.hpp" - #include #include -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_fat_tree, surf, "Routing for fat trees"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_routing_fat_tree, ker_platform, "Kernel Fat-Tree Routing"); namespace simgrid { -namespace kernel { -namespace routing { +namespace kernel::routing { bool FatTreeZone::is_in_sub_tree(const FatTreeNode* root, const FatTreeNode* node) const { @@ -50,16 +50,16 @@ void FatTreeZone::get_local_route(const NetPoint* src, const NetPoint* dst, Rout /* Let's find the source and the destination in our internal structure */ auto searchedNode = this->compute_nodes_.find(src->id()); - xbt_assert(searchedNode != this->compute_nodes_.end(), "Could not find the source %s [%u] in the fat tree", + xbt_assert(searchedNode != this->compute_nodes_.end(), "Could not find the source %s [%lu] in the fat tree", src->get_cname(), src->id()); const FatTreeNode* source = searchedNode->second.get(); searchedNode = this->compute_nodes_.find(dst->id()); - xbt_assert(searchedNode != this->compute_nodes_.end(), "Could not find the destination %s [%u] in the fat tree", + xbt_assert(searchedNode != this->compute_nodes_.end(), "Could not find the destination %s [%lu] in the fat tree", dst->get_cname(), dst->id()); const FatTreeNode* destination = searchedNode->second.get(); - XBT_VERB("Get route and latency from '%s' [%u] to '%s' [%u] in a fat tree", src->get_cname(), src->id(), + XBT_VERB("Get route and latency from '%s' [%lu] to '%s' [%lu] in a fat tree", src->get_cname(), src->id(), dst->get_cname(), dst->id()); /* In case destination is the source, and there is a loopback, let's use it instead of going up to a switch */ @@ -77,8 +77,8 @@ void FatTreeZone::get_local_route(const NetPoint* src, const NetPoint* dst, Rout for (unsigned int i = 0; i < currentNode->level; i++) d /= this->num_parents_per_node_[i]; - int k = this->num_parents_per_node_[currentNode->level]; - d = d % k; + int k = this->num_parents_per_node_[currentNode->level] * this->num_port_lower_level_[currentNode->level]; + d = d % k; if (currentNode->limiter_link_) into->link_list_.push_back(currentNode->limiter_link_); @@ -93,7 +93,9 @@ void FatTreeZone::get_local_route(const NetPoint* src, const NetPoint* dst, Rout // Down part while (currentNode != destination) { - for (unsigned int i = 0; i < currentNode->children.size(); i++) { + //pick cable when multiple parallels + int d = source->position % this->num_port_lower_level_[currentNode->level - 1]; + for (unsigned int i = d * this->num_children_per_node_[currentNode->level - 1]; i < currentNode->children.size(); i++) { if (i % this->num_children_per_node_[currentNode->level - 1] == destination->label[currentNode->level - 1]) { add_link_latency(into->link_list_, currentNode->children[i]->down_link_, latency); @@ -134,7 +136,7 @@ void FatTreeZone::do_seal() if (this->levels_ == 0) { return; } - if (not XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) { + if (not XBT_LOG_ISENABLED(ker_routing_fat_tree, xbt_log_priority_debug)) { return; } @@ -191,7 +193,7 @@ bool FatTreeZone::are_related(FatTreeNode* parent, FatTreeNode* child) const { std::stringstream msgBuffer; - if (XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) { + if (XBT_LOG_ISENABLED(ker_routing_fat_tree, xbt_log_priority_debug)) { msgBuffer << "Are " << child->id << "(" << child->level << "," << child->position << ") <"; for (unsigned int i = 0; i < this->levels_; i++) { @@ -230,9 +232,10 @@ void FatTreeZone::generate_switches(const s4u::ClusterCallbacks& set_callbacks) this->nodes_by_level_[0] *= this->num_children_per_node_[i]; if (this->nodes_by_level_[0] != this->nodes_.size()) { - surf_parse_error(std::string("The number of provided nodes does not fit with the wanted topology.") + - " Please check your platform description (We need " + std::to_string(this->nodes_by_level_[0]) + - "nodes, we got " + std::to_string(this->nodes_.size())); + simgrid_parse_error("The number of provided nodes does not fit with the wanted topology." + " Please check your platform description (We need " + + std::to_string(this->nodes_by_level_[0]) + "nodes, we got " + + std::to_string(this->nodes_.size())); } for (unsigned int i = 0; i < this->levels_; i++) { @@ -248,8 +251,8 @@ void FatTreeZone::generate_switches(const s4u::ClusterCallbacks& set_callbacks) } /* get limiter for this router */ - auto get_limiter = [this, &set_callbacks](unsigned int i, unsigned int j, int id) -> resource::LinkImpl* { - kernel::resource::LinkImpl* limiter = nullptr; + auto get_limiter = [this, &set_callbacks](unsigned long i, unsigned long j, long id) -> resource::StandardLinkImpl* { + kernel::resource::StandardLinkImpl* limiter = nullptr; if (set_callbacks.limiter) { const auto* s4u_link = set_callbacks.limiter(get_iface(), {i + 1, j}, id); if (s4u_link) { @@ -259,15 +262,16 @@ void FatTreeZone::generate_switches(const s4u::ClusterCallbacks& set_callbacks) return limiter; }; // Create the switches - int k = 0; - for (unsigned int i = 0; i < this->levels_; i++) { - for (unsigned int j = 0; j < this->nodes_by_level_[i + 1]; j++) { + unsigned long k = 2 * nodes_.size(); + for (unsigned long i = 0; i < this->levels_; i++) { + for (unsigned long j = 0; j < this->nodes_by_level_[i + 1]; j++) { k--; auto newNode = std::make_shared(k, i + 1, j, get_limiter(i, j, k), nullptr); XBT_DEBUG("We create the switch %d(%u,%u)", newNode->id, newNode->level, newNode->position); - newNode->children.resize(this->num_children_per_node_[i] * this->num_port_lower_level_[i]); + newNode->children.resize(static_cast(this->num_children_per_node_[i]) * this->num_port_lower_level_[i]); if (i != this->levels_ - 1) { - newNode->parents.resize(this->num_parents_per_node_[i + 1] * this->num_port_lower_level_[i + 1]); + newNode->parents.resize(static_cast(this->num_parents_per_node_[i + 1]) * + this->num_port_lower_level_[i + 1]); } newNode->label.resize(this->levels_); this->nodes_.emplace_back(newNode); @@ -289,7 +293,7 @@ void FatTreeZone::generate_labels() } for (unsigned int j = 0; j < this->nodes_by_level_[i]; j++) { - if (XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) { + if (XBT_LOG_ISENABLED(ker_routing_fat_tree, xbt_log_priority_debug)) { std::stringstream msgBuffer; msgBuffer << "Assigning label <"; @@ -331,15 +335,15 @@ int FatTreeZone::get_level_position(const unsigned int level) return tempPosition; } -void FatTreeZone::add_processing_node(int id, resource::LinkImpl* limiter, resource::LinkImpl* loopback) +void FatTreeZone::add_processing_node(int id, resource::StandardLinkImpl* limiter, resource::StandardLinkImpl* loopback) { using std::make_pair; static int position = 0; auto newNode = std::make_shared(id, 0, position, limiter, loopback); position++; - newNode->parents.resize(this->num_parents_per_node_[0] * this->num_port_lower_level_[0]); + newNode->parents.resize(static_cast(this->num_parents_per_node_[0]) * this->num_port_lower_level_[0]); newNode->label.resize(this->levels_); - this->compute_nodes_.insert(make_pair(id, newNode)); + this->compute_nodes_.try_emplace(id, newNode); this->nodes_.emplace_back(newNode); } @@ -412,7 +416,7 @@ s4u::FatTreeParams FatTreeZone::parse_topo_parameters(const std::string& topo_pa std::vector count; boost::split(parameters, topo_parameters, boost::is_any_of(";")); - surf_parse_assert( + simgrid_parse_assert( parameters.size() == 4, "Fat trees are defined by the levels number and 3 vectors, see the documentation for more information."); @@ -420,46 +424,46 @@ s4u::FatTreeParams FatTreeZone::parse_topo_parameters(const std::string& topo_pa try { n_lev = std::stoi(parameters[0]); } catch (const std::invalid_argument&) { - surf_parse_error(std::string("First parameter is not the amount of levels: ") + parameters[0]); + simgrid_parse_error("First parameter is not the amount of levels: " + parameters[0]); } // Then, a l-sized vector standing for the children number by level boost::split(tmp, parameters[1], boost::is_any_of(",")); - surf_parse_assert(tmp.size() == n_lev, std::string("You specified ") + std::to_string(n_lev) + - " levels but the child count vector (the first one) contains " + - std::to_string(tmp.size()) + " levels."); + simgrid_parse_assert(tmp.size() == n_lev, "You specified " + std::to_string(n_lev) + + " levels but the child count vector (the first one) contains " + + std::to_string(tmp.size()) + " levels."); for (std::string const& level : tmp) { try { down.push_back(std::stoi(level)); } catch (const std::invalid_argument&) { - surf_parse_error(std::string("Invalid child count: ") + level); + simgrid_parse_error("Invalid child count: " + level); } } // Then, a l-sized vector standing for the parents number by level boost::split(tmp, parameters[2], boost::is_any_of(",")); - surf_parse_assert(tmp.size() == n_lev, std::string("You specified ") + std::to_string(n_lev) + - " levels but the parent count vector (the second one) contains " + - std::to_string(tmp.size()) + " levels."); + simgrid_parse_assert(tmp.size() == n_lev, "You specified " + std::to_string(n_lev) + + " levels but the parent count vector (the second one) contains " + + std::to_string(tmp.size()) + " levels."); for (std::string const& parent : tmp) { try { up.push_back(std::stoi(parent)); } catch (const std::invalid_argument&) { - surf_parse_error(std::string("Invalid parent count: ") + parent); + simgrid_parse_error("Invalid parent count: " + parent); } } // Finally, a l-sized vector standing for the ports number with the lower level boost::split(tmp, parameters[3], boost::is_any_of(",")); - surf_parse_assert(tmp.size() == n_lev, std::string("You specified ") + std::to_string(n_lev) + - " levels but the port count vector (the third one) contains " + - std::to_string(tmp.size()) + " levels."); + simgrid_parse_assert(tmp.size() == n_lev, "You specified " + std::to_string(n_lev) + + " levels but the port count vector (the third one) contains " + + std::to_string(tmp.size()) + " levels."); for (std::string const& port : tmp) { try { count.push_back(std::stoi(port)); } catch (const std::invalid_argument&) { - throw std::invalid_argument(std::string("Invalid lower level port number:") + port); + throw std::invalid_argument("Invalid lower level port number:" + port); } } return s4u::FatTreeParams(n_lev, down, up, count); @@ -486,8 +490,7 @@ void FatTreeZone::generate_dot_file(const std::string& filename) const file << "}"; file.close(); } -} // namespace routing -} // namespace kernel +} // namespace kernel::routing namespace s4u { FatTreeParams::FatTreeParams(unsigned int n_levels, const std::vector& down_links,