X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bf41d7b09bccdac18be3631c03256f2a34bdb202..587516180ca0f3c1bcbf1c2eff38908454082e14:/src/kernel/routing/FatTreeZone.cpp diff --git a/src/kernel/routing/FatTreeZone.cpp b/src/kernel/routing/FatTreeZone.cpp index 2c59ed92b6..faa06f6fcc 100644 --- a/src/kernel/routing/FatTreeZone.cpp +++ b/src/kernel/routing/FatTreeZone.cpp @@ -1,9 +1,10 @@ -/* Copyright (c) 2014-2018. 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. */ #include +#include #include #include @@ -12,7 +13,6 @@ #include "src/surf/network_interface.hpp" #include "src/surf/xml/platf_private.hpp" - #include #include @@ -22,22 +22,15 @@ namespace simgrid { namespace kernel { namespace routing { -FatTreeZone::FatTreeZone(NetZone* father, std::string name) : ClusterZone(father, name) -{ - XBT_DEBUG("Creating a new fat tree."); -} - FatTreeZone::~FatTreeZone() { - for (unsigned int i = 0; i < this->nodes_.size(); i++) { - delete this->nodes_[i]; - } - for (unsigned int i = 0; i < this->links_.size(); i++) { - delete this->links_[i]; - } + for (FatTreeNode const* node : this->nodes_) + delete node; + for (FatTreeLink const* link : this->links_) + delete link; } -bool FatTreeZone::isInSubTree(FatTreeNode* root, FatTreeNode* node) +bool FatTreeZone::is_in_sub_tree(FatTreeNode* root, FatTreeNode* node) const { XBT_DEBUG("Is %d(%u,%u) in the sub tree of %d(%u,%u) ?", node->id, node->level, node->position, root->id, root->level, root->position); @@ -58,38 +51,37 @@ bool FatTreeZone::isInSubTree(FatTreeNode* root, FatTreeNode* node) return true; } -void FatTreeZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency) +void FatTreeZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency) { - - if (dst->isRouter() || src->isRouter()) + if (dst->is_router() || src->is_router()) return; /* 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", - src->getCname(), src->id()); + src->get_cname(), src->id()); FatTreeNode* source = searchedNode->second; 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", - dst->getCname(), dst->id()); + dst->get_cname(), dst->id()); FatTreeNode* destination = searchedNode->second; - XBT_VERB("Get route and latency from '%s' [%u] to '%s' [%u] in a fat tree", src->getCname(), src->id(), - dst->getCname(), dst->id()); + XBT_VERB("Get route and latency from '%s' [%u] to '%s' [%u] 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 */ - if (source->id == destination->id && this->has_loopback_) { - into->link_list.push_back(source->loopback); + if (source->id == destination->id && has_loopback()) { + into->link_list.push_back(source->loopback_); if (latency) - *latency += source->loopback->latency(); + *latency += source->loopback_->get_latency(); return; } FatTreeNode* currentNode = source; // up part - while (not isInSubTree(currentNode, destination)) { + while (not is_in_sub_tree(currentNode, destination)) { int d = destination->position; // as in d-mod-k for (unsigned int i = 0; i < currentNode->level; i++) @@ -100,9 +92,9 @@ void FatTreeZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* into->link_list.push_back(currentNode->parents[d]->up_link_); if (latency) - *latency += currentNode->parents[d]->up_link_->latency(); + *latency += currentNode->parents[d]->up_link_->get_latency(); - if (this->has_limiter_) + if (currentNode->limiter_link_) into->link_list.push_back(currentNode->limiter_link_); currentNode = currentNode->parents[d]->up_node_; } @@ -116,26 +108,29 @@ void FatTreeZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* if (i % this->num_children_per_node_[currentNode->level - 1] == destination->label[currentNode->level - 1]) { into->link_list.push_back(currentNode->children[i]->down_link_); if (latency) - *latency += currentNode->children[i]->down_link_->latency(); + *latency += currentNode->children[i]->down_link_->get_latency(); currentNode = currentNode->children[i]->down_node_; - if (this->has_limiter_) + if (currentNode->limiter_link_) into->link_list.push_back(currentNode->limiter_link_); XBT_DEBUG("%d(%u,%u) is accessible through %d(%u,%u)", destination->id, destination->level, destination->position, currentNode->id, currentNode->level, currentNode->position); } } } + // set gateways (if any) + into->gw_src = get_gateway(src->id()); + into->gw_dst = get_gateway(dst->id()); } /* This function makes the assumption that parse_specific_arguments() and * addNodes() have already been called */ -void FatTreeZone::seal() +void FatTreeZone::do_seal() { if (this->levels_ == 0) { return; } - this->generateSwitches(); + this->generate_switches(); if (XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) { std::stringstream msgBuffer; @@ -149,19 +144,19 @@ void FatTreeZone::seal() msgBuffer.str(""); msgBuffer << "Nodes are : "; - for (unsigned int i = 0; i < this->nodes_.size(); i++) { - msgBuffer << this->nodes_[i]->id << "(" << this->nodes_[i]->level << "," << this->nodes_[i]->position << ") "; + for (FatTreeNode const* node : this->nodes_) { + msgBuffer << node->id << "(" << node->level << "," << node->position << ") "; } XBT_DEBUG("%s", msgBuffer.str().c_str()); } - this->generateLabels(); + this->generate_labels(); unsigned int k = 0; // Nodes are totally ordered, by level and then by position, in this->nodes for (unsigned int i = 0; i < this->levels_; i++) { for (unsigned int j = 0; j < this->nodes_by_level_[i]; j++) { - this->connectNodeToParents(this->nodes_[k]); + this->connect_node_to_parents(this->nodes_[k]); k++; } } @@ -169,29 +164,29 @@ void FatTreeZone::seal() if (XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) { std::stringstream msgBuffer; msgBuffer << "Links are : "; - for (unsigned int i = 0; i < this->links_.size(); i++) { - msgBuffer << "(" << this->links_[i]->up_node_->id << "," << this->links_[i]->down_node_->id << ") "; + for (FatTreeLink const* link : this->links_) { + msgBuffer << "(" << link->up_node_->id << "," << link->down_node_->id << ") "; } XBT_DEBUG("%s", msgBuffer.str().c_str()); } } -int FatTreeZone::connectNodeToParents(FatTreeNode* node) +int FatTreeZone::connect_node_to_parents(FatTreeNode* node) { - std::vector::iterator currentParentNode = this->nodes_.begin(); - int connectionsNumber = 0; - const int level = node->level; + auto currentParentNode = this->nodes_.begin(); + int connectionsNumber = 0; + const int level = node->level; XBT_DEBUG("We are connecting node %d(%u,%u) to his parents.", node->id, node->level, node->position); - currentParentNode += this->getLevelPosition(level + 1); + currentParentNode += this->get_level_position(level + 1); for (unsigned int i = 0; i < this->nodes_by_level_[level + 1]; i++) { - if (this->areRelated(*currentParentNode, node)) { + if (this->are_related(*currentParentNode, node)) { XBT_DEBUG("%d(%u,%u) and %d(%u,%u) are related," " with %u links between them.", node->id, node->level, node->position, (*currentParentNode)->id, (*currentParentNode)->level, (*currentParentNode)->position, this->num_port_lower_level_[level]); for (unsigned int j = 0; j < this->num_port_lower_level_[level]; j++) { - this->addLink(*currentParentNode, node->label[level] + j * this->num_children_per_node_[level], node, - (*currentParentNode)->label[level] + j * this->num_parents_per_node_[level]); + this->add_link(*currentParentNode, node->label[level] + j * this->num_children_per_node_[level], node, + (*currentParentNode)->label[level] + j * this->num_parents_per_node_[level]); } connectionsNumber++; } @@ -200,7 +195,7 @@ int FatTreeZone::connectNodeToParents(FatTreeNode* node) return connectionsNumber; } -bool FatTreeZone::areRelated(FatTreeNode* parent, FatTreeNode* child) +bool FatTreeZone::are_related(FatTreeNode* parent, FatTreeNode* child) const { std::stringstream msgBuffer; @@ -232,7 +227,7 @@ bool FatTreeZone::areRelated(FatTreeNode* parent, FatTreeNode* child) return true; } -void FatTreeZone::generateSwitches() +void FatTreeZone::generate_switches() { XBT_DEBUG("Generating switches."); this->nodes_by_level_.resize(this->levels_ + 1, 0); @@ -246,7 +241,6 @@ void FatTreeZone::generateSwitches() 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())); - return; } for (unsigned int i = 0; i < this->levels_; i++) { @@ -265,7 +259,7 @@ void FatTreeZone::generateSwitches() 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++) { - FatTreeNode* newNode = new FatTreeNode(this->cluster_, --k, i + 1, j); + auto* newNode = new FatTreeNode(--k, i + 1, j, nullptr, 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]); if (i != this->levels_ - 1) { @@ -277,7 +271,7 @@ void FatTreeZone::generateSwitches() } } -void FatTreeZone::generateLabels() +void FatTreeZone::generate_labels() { XBT_DEBUG("Generating labels."); // TODO : check if nodesByLevel and nodes are filled @@ -291,7 +285,6 @@ void FatTreeZone::generateLabels() } for (unsigned int j = 0; j < this->nodes_by_level_[i]; j++) { - if (XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) { std::stringstream msgBuffer; @@ -323,7 +316,7 @@ void FatTreeZone::generateLabels() } } -int FatTreeZone::getLevelPosition(const unsigned int level) +int FatTreeZone::get_level_position(const unsigned int level) { xbt_assert(level <= this->levels_, "The impossible did happen. Yet again."); int tempPosition = 0; @@ -334,22 +327,35 @@ int FatTreeZone::getLevelPosition(const unsigned int level) return tempPosition; } -void FatTreeZone::add_processing_node(int id) +void FatTreeZone::add_processing_node(int id, resource::LinkImpl* limiter, resource::LinkImpl* loopback) { using std::make_pair; static int position = 0; - FatTreeNode* newNode; - newNode = new FatTreeNode(this->cluster_, id, 0, position++); + auto* newNode = new FatTreeNode(id, 0, position++, limiter, loopback); newNode->parents.resize(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->nodes_.push_back(newNode); } -void FatTreeZone::addLink(FatTreeNode* parent, unsigned int parentPort, FatTreeNode* child, unsigned int childPort) +void FatTreeZone::add_link(FatTreeNode* parent, unsigned int parentPort, FatTreeNode* child, unsigned int childPort) { - FatTreeLink* newLink; - newLink = new FatTreeLink(this->cluster_, child, parent); + static int uniqueId = 0; + const s4u::Link* linkup; + const s4u::Link* linkdown; + std::string id = + "link_from_" + std::to_string(child->id) + "_" + std::to_string(parent->id) + "_" + std::to_string(uniqueId); + + if (link_sharing_policy_ == s4u::Link::SharingPolicy::SPLITDUPLEX) { + linkup = create_link(id + "_UP", std::vector{link_bw_})->set_latency(link_lat_)->seal(); + linkdown = create_link(id + "_DOWN", std::vector{link_bw_})->set_latency(link_lat_)->seal(); + } else { + linkup = create_link(id, std::vector{link_bw_})->set_latency(link_lat_)->seal(); + linkdown = linkup; + } + uniqueId++; + + auto* newLink = new FatTreeLink(child, parent, linkup->get_impl(), linkdown->get_impl()); XBT_DEBUG("Creating a link between the parent (%u,%u,%u) and the child (%u,%u,%u)", parent->level, parent->position, parentPort, child->level, child->position, childPort); parent->children[parentPort] = newLink; @@ -358,64 +364,112 @@ void FatTreeZone::addLink(FatTreeNode* parent, unsigned int parentPort, FatTreeN this->links_.push_back(newLink); } +void FatTreeZone::check_topology(unsigned int n_levels, const std::vector& down_links, + const std::vector& up_links, const std::vector& link_count) + +{ + /* check number of levels */ + if (n_levels <= 0) + throw std::invalid_argument("FatTreeZone: invalid number of levels, must be > 0"); + + auto check_vector = [&n_levels](const std::vector& vector, const std::string& var_name) { + if (vector.size() != n_levels) + throw std::invalid_argument("FatTreeZone: invalid " + var_name + " parameter, vector has " + + std::to_string(vector.size()) + " elements, must have " + std::to_string(n_levels)); + + auto check_zero = [](unsigned int i) { return i == 0; }; + if (std::any_of(vector.begin(), vector.end(), check_zero)) + throw std::invalid_argument("FatTreeZone: invalid " + var_name + " parameter, all values must be greater than 0"); + }; + + /* check remaining vectors */ + check_vector(down_links, "down links"); + check_vector(up_links, "up links"); + check_vector(link_count, "link count"); +} + +void FatTreeZone::set_link_characteristics(double bw, double lat, s4u::Link::SharingPolicy sharing_policy) +{ + link_sharing_policy_ = sharing_policy; + link_bw_ = bw; + link_lat_ = lat; +} + +void FatTreeZone::set_topology(unsigned int n_levels, const std::vector& down_links, + const std::vector& up_links, const std::vector& link_count) +{ + levels_ = n_levels; + num_children_per_node_ = down_links; + num_parents_per_node_ = up_links; + num_port_lower_level_ = link_count; +} + void FatTreeZone::parse_specific_arguments(ClusterCreationArgs* cluster) { std::vector parameters; std::vector tmp; + unsigned int n_lev = 0; + std::vector down; + std::vector up; + std::vector count; boost::split(parameters, cluster->topo_parameters, boost::is_any_of(";")); - const std::string error_msg {"Fat trees are defined by the levels number and 3 vectors, see the documentation for more information"}; - // TODO : we have to check for zeros and negative numbers, or it might crash - if (parameters.size() != 4) { - surf_parse_error(error_msg); - } + surf_parse_assert( + parameters.size() == 4, + "Fat trees are defined by the levels number and 3 vectors, see the documentation for more information."); // The first parts of topo_parameters should be the levels number try { - this->levels_ = std::stoi(parameters[0]); - } catch (std::invalid_argument& ia) { - throw std::invalid_argument(std::string("First parameter is not the amount of levels:") + parameters[0]); + 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]); } // Then, a l-sized vector standing for the children number by level boost::split(tmp, parameters[1], boost::is_any_of(",")); - if (tmp.size() != this->levels_) { - surf_parse_error(error_msg); - } - for (size_t i = 0; i < tmp.size(); i++) { + 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."); + + for (std::string const& level : tmp) { try { - this->num_children_per_node_.push_back(std::stoi(tmp[i])); - } catch (std::invalid_argument& ia) { - throw std::invalid_argument(std::string("Invalid lower level node number:") + tmp[i]); + down.push_back(std::stoi(level)); + } catch (const std::invalid_argument&) { + surf_parse_error(std::string("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(",")); - if (tmp.size() != this->levels_) { - surf_parse_error(error_msg); - } - for (size_t i = 0; i < tmp.size(); i++) { + 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."); + for (std::string const& parent : tmp) { try { - this->num_parents_per_node_.push_back(std::stoi(tmp[i])); - } catch (std::invalid_argument& ia) { - throw std::invalid_argument(std::string("Invalid upper level node number:") + tmp[i]); + up.push_back(std::stoi(parent)); + } catch (const std::invalid_argument&) { + surf_parse_error(std::string("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(",")); - if (tmp.size() != this->levels_) { - surf_parse_error(error_msg); - } - for (size_t i = 0; i < tmp.size(); i++) { + 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."); + for (std::string const& port : tmp) { try { - this->num_port_lower_level_.push_back(std::stoi(tmp[i])); - } catch (std::invalid_argument& ia) { - throw std::invalid_argument(std::string("Invalid lower level port number:") + tmp[i]); + count.push_back(std::stoi(port)); + } catch (const std::invalid_argument&) { + throw std::invalid_argument(std::string("Invalid lower level port number:") + port); } } - this->cluster_ = cluster; + + /* set topology */ + FatTreeZone::check_topology(n_lev, down, up, count); + set_topology(n_lev, down, up, count); + /* saving internal links properties */ + set_link_characteristics(cluster->bw, cluster->lat, cluster->sharing_policy); } void FatTreeZone::generate_dot_file(const std::string& filename) const @@ -425,66 +479,58 @@ void FatTreeZone::generate_dot_file(const std::string& filename) const xbt_assert(file.is_open(), "Unable to open file %s", filename.c_str()); file << "graph AsClusterFatTree {\n"; - for (unsigned int i = 0; i < this->nodes_.size(); i++) { - file << this->nodes_[i]->id; - if (this->nodes_[i]->id < 0) + for (FatTreeNode const* node : this->nodes_) { + file << node->id; + if (node->id < 0) file << " [shape=circle];\n"; else file << " [shape=hexagon];\n"; } - for (unsigned int i = 0; i < this->links_.size(); i++) { - file << this->links_[i]->down_node_->id << " -- " << this->links_[i]->up_node_->id << ";\n"; + for (FatTreeLink const* link : this->links_) { + file << link->down_node_->id << " -- " << link->up_node_->id << ";\n"; } file << "}"; file.close(); } - -FatTreeNode::FatTreeNode(ClusterCreationArgs* cluster, int id, int level, int position) - : id(id), level(level), position(position) +} // namespace routing +} // namespace kernel + +namespace s4u { +NetZone* create_fatTree_zone(const std::string& name, const NetZone* parent, const FatTreeParams& params, + double bandwidth, double latency, Link::SharingPolicy sharing_policy, + const std::function& set_netpoint, + const std::function& set_loopback, + const std::function& set_limiter) { - LinkCreationArgs linkTemplate; - if (cluster->limiter_link) { - linkTemplate.bandwidth = cluster->limiter_link; - linkTemplate.latency = 0; - linkTemplate.policy = SURF_LINK_SHARED; - linkTemplate.id = "limiter_"+std::to_string(id); - sg_platf_new_link(&linkTemplate); - this->limiter_link_ = surf::LinkImpl::byName(linkTemplate.id); - } - if (cluster->loopback_bw || cluster->loopback_lat) { - linkTemplate.bandwidth = cluster->loopback_bw; - linkTemplate.latency = cluster->loopback_lat; - linkTemplate.policy = SURF_LINK_FATPIPE; - linkTemplate.id = "loopback_"+ std::to_string(id); - sg_platf_new_link(&linkTemplate); - this->loopback = surf::LinkImpl::byName(linkTemplate.id); - } + /* initial checks */ + if (bandwidth <= 0) + throw std::invalid_argument("FatTreeZone: incorrect bandwidth for internode communication, bw=" + + std::to_string(bandwidth)); + if (latency < 0) + throw std::invalid_argument("FatTreeZone: incorrect latency for internode communication, lat=" + + std::to_string(latency)); + kernel::routing::FatTreeZone::check_topology(params.levels, params.down, params.up, params.number); + + /* creating zone */ + auto* zone = new kernel::routing::FatTreeZone(name); + zone->set_topology(params.levels, params.down, params.up, params.number); + if (parent) + zone->set_parent(parent->get_impl()); + zone->set_link_characteristics(bandwidth, latency, sharing_policy); + + /* populating it */ + int tot_elements = std::accumulate(params.down.begin(), params.down.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, params.down, set_netpoint, set_loopback, set_limiter, &netpoint, &loopback, &limiter); + zone->add_processing_node(i, limiter ? limiter->get_impl() : nullptr, loopback ? loopback->get_impl() : nullptr); + } + + return zone->get_iface(); } +} // namespace s4u -FatTreeLink::FatTreeLink(ClusterCreationArgs* cluster, FatTreeNode* downNode, FatTreeNode* upNode) - : up_node_(upNode), down_node_(downNode) -{ - static int uniqueId = 0; - LinkCreationArgs linkTemplate; - linkTemplate.bandwidth = cluster->bw; - linkTemplate.latency = cluster->lat; - linkTemplate.policy = cluster->sharing_policy; // sthg to do with that ? - linkTemplate.id = - "link_from_" + std::to_string(downNode->id) + "_" + std::to_string(upNode->id) + "_" + std::to_string(uniqueId); - sg_platf_new_link(&linkTemplate); - - if (cluster->sharing_policy == SURF_LINK_SPLITDUPLEX) { - std::string tmpID = std::string(linkTemplate.id) + "_UP"; - this->up_link_ = surf::LinkImpl::byName(tmpID); // check link? - tmpID = std::string(linkTemplate.id) + "_DOWN"; - this->down_link_ = surf::LinkImpl::byName(tmpID); // check link ? - } else { - this->up_link_ = surf::LinkImpl::byName(linkTemplate.id); - this->down_link_ = this->up_link_; - } - uniqueId++; -} -} -} -} // namespace +} // namespace simgrid