X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e6922052a379f423787d14dafec9d41e37713ebc..587516180ca0f3c1bcbf1c2eff38908454082e14:/src/kernel/routing/FatTreeZone.cpp diff --git a/src/kernel/routing/FatTreeZone.cpp b/src/kernel/routing/FatTreeZone.cpp index 0d396ee01e..faa06f6fcc 100644 --- a/src/kernel/routing/FatTreeZone.cpp +++ b/src/kernel/routing/FatTreeZone.cpp @@ -4,6 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include +#include #include #include @@ -71,9 +72,9 @@ void FatTreeZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArg /* 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 && has_loopback()) { - into->link_list.push_back(source->loopback); + into->link_list.push_back(source->loopback_); if (latency) - *latency += source->loopback->get_latency(); + *latency += source->loopback_->get_latency(); return; } @@ -93,7 +94,7 @@ void FatTreeZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArg if (latency) *latency += currentNode->parents[d]->up_link_->get_latency(); - if (has_limiter()) + if (currentNode->limiter_link_) into->link_list.push_back(currentNode->limiter_link_); currentNode = currentNode->parents[d]->up_node_; } @@ -109,13 +110,16 @@ void FatTreeZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArg if (latency) *latency += currentNode->children[i]->down_link_->get_latency(); currentNode = currentNode->children[i]->down_node_; - if (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 @@ -255,7 +259,7 @@ void FatTreeZone::generate_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++) { - auto* 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) { @@ -323,12 +327,11 @@ int FatTreeZone::get_level_position(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)); @@ -337,8 +340,22 @@ void FatTreeZone::add_processing_node(int id) 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; @@ -347,33 +364,76 @@ void FatTreeZone::add_link(FatTreeNode* parent, unsigned int parentPort, FatTree 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(";")); - // TODO : we have to check for zeros and negative numbers, or it might crash 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]); + 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(",")); - surf_parse_assert(tmp.size() == this->levels_, std::string("You specified ") + std::to_string(this->levels_) + - " levels but the child count vector (the first one) contains " + - std::to_string(tmp.size()) + " levels."); + 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(level)); + down.push_back(std::stoi(level)); } catch (const std::invalid_argument&) { surf_parse_error(std::string("Invalid child count: ") + level); } @@ -381,12 +441,12 @@ void FatTreeZone::parse_specific_arguments(ClusterCreationArgs* cluster) // 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() == this->levels_, std::string("You specified ") + std::to_string(this->levels_) + - " levels but the parent count vector (the second one) contains " + - std::to_string(tmp.size()) + " levels."); + 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(parent)); + up.push_back(std::stoi(parent)); } catch (const std::invalid_argument&) { surf_parse_error(std::string("Invalid parent count: ") + parent); } @@ -394,17 +454,22 @@ void FatTreeZone::parse_specific_arguments(ClusterCreationArgs* cluster) // 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() == this->levels_, std::string("You specified ") + std::to_string(this->levels_) + - " levels but the port count vector (the third one) contains " + - std::to_string(tmp.size()) + " levels."); + 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(port)); + 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 @@ -428,57 +493,43 @@ void FatTreeZone::generate_dot_file(const std::string& filename) const file << "}"; file.close(); } - -FatTreeNode::FatTreeNode(const ClusterCreationArgs* cluster, int id, int level, int position) - : id(id), level(level), position(position) -{ - LinkCreationArgs linkTemplate; - if (cluster->limiter_link != 0.0) { - linkTemplate.bandwidths.push_back(cluster->limiter_link); - linkTemplate.latency = 0; - linkTemplate.policy = s4u::Link::SharingPolicy::SHARED; - linkTemplate.id = "limiter_" + std::to_string(id); - sg_platf_new_link(&linkTemplate); - this->limiter_link_ = s4u::Link::by_name(linkTemplate.id)->get_impl(); - } - if (cluster->loopback_bw != 0.0 || cluster->loopback_lat != 0.0) { - linkTemplate.bandwidths.push_back(cluster->loopback_bw); - linkTemplate.latency = cluster->loopback_lat; - linkTemplate.policy = s4u::Link::SharingPolicy::FATPIPE; - linkTemplate.id = "loopback_" + std::to_string(id); - sg_platf_new_link(&linkTemplate); - this->loopback = s4u::Link::by_name(linkTemplate.id)->get_impl(); - } -} - -FatTreeLink::FatTreeLink(const ClusterCreationArgs* cluster, FatTreeNode* downNode, FatTreeNode* upNode) - : up_node_(upNode), down_node_(downNode) -{ - static int uniqueId = 0; - LinkCreationArgs linkTemplate; - linkTemplate.bandwidths.push_back(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 == s4u::Link::SharingPolicy::SPLITDUPLEX) { - this->up_link_ = s4u::Link::by_name(linkTemplate.id + "_UP")->get_impl(); // check link? - this->down_link_ = s4u::Link::by_name(linkTemplate.id + "_DOWN")->get_impl(); // check link ? - } else { - this->up_link_ = s4u::Link::by_name(linkTemplate.id)->get_impl(); - this->down_link_ = this->up_link_; - } - uniqueId++; -} } // namespace routing } // namespace kernel namespace s4u { -NetZone* create_fatTree_zone(const std::string& name) +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) { - return (new kernel::routing::FatTreeZone(name))->get_iface(); + /* 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