From: Bruno Donassolo Date: Wed, 5 May 2021 16:53:08 +0000 (+0200) Subject: Cluster with StarZones X-Git-Tag: v3.28~297 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/657a66f7b1356f4d91ae3392f2cd999f0406a60c Cluster with StarZones Finish cleaning-up of old cluster zones. Implements and with StarZones. Keep old ClusterZone as base for Torus, Dragonfly and Fat-Tree. --- diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 6b162892d8..e62ee466b9 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -150,6 +150,7 @@ void sg_platf_new_disk(const simgrid::kernel::routing::DiskCreationArgs* disk) current_host->add_disk(new_disk); } +/*************************************************************************************************/ /** @brief Auxiliary function to create hosts */ static std::pair sg_platf_cluster_create_host(const simgrid::kernel::routing::ClusterCreationArgs* cluster, simgrid::s4u::NetZone* zone, @@ -246,7 +247,176 @@ static void sg_platf_new_cluster_hierarchical(const simgrid::kernel::routing::Cl zone->seal(); } +/*************************************************************************************************/ /** @brief Create regular Cluster */ +static void sg_platf_new_cluster_flat2(simgrid::kernel::routing::ClusterCreationArgs* cluster) +{ + auto* zone = simgrid::s4u::create_star_zone(cluster->id); + simgrid::s4u::NetZone const* parent = routing_get_current() ? routing_get_current()->get_iface() : nullptr; + if (parent) + zone->set_parent(parent); + + /* set properties */ + for (auto const& elm : cluster->properties) + zone->set_property(elm.first, elm.second); + + /* Make the backbone */ + simgrid::s4u::Link* backbone = nullptr; + if ((cluster->bb_bw > 0) || (cluster->bb_lat > 0)) { + std::string bb_name = std::string(cluster->id) + "_backbone"; + XBT_DEBUG(" ", bb_name.c_str(), cluster->bb_bw, + cluster->bb_lat); + + backbone = zone->create_link(bb_name, std::vector{cluster->bb_bw}) + ->set_sharing_policy(cluster->bb_sharing_policy) + ->set_latency(cluster->bb_lat) + ->seal(); + } + + for (int const& i : cluster->radicals) { + std::string host_id = std::string(cluster->prefix) + std::to_string(i) + cluster->suffix; + + XBT_DEBUG("", host_id.c_str(), cluster->speeds.front()); + const auto* host = zone->create_host(host_id, cluster->speeds) + ->set_core_count(cluster->core_amount) + ->set_properties(cluster->properties) + ->seal(); + + XBT_DEBUG(""); + + std::string link_id = std::string(cluster->id) + "_link_" + std::to_string(i); + XBT_DEBUG("", link_id.c_str(), cluster->bw, cluster->lat); + + // add a loopback link + if (cluster->loopback_bw > 0 || cluster->loopback_lat > 0) { + std::string loopback_name = link_id + "_loopback"; + XBT_DEBUG("", loopback_name.c_str(), cluster->loopback_bw); + + auto* loopback = zone->create_link(loopback_name, std::vector{cluster->loopback_bw}) + ->set_sharing_policy(simgrid::s4u::Link::SharingPolicy::FATPIPE) + ->set_latency(cluster->loopback_lat) + ->seal(); + + zone->add_route(host->get_netpoint(), host->get_netpoint(), nullptr, nullptr, + std::vector{loopback}); + } + + // add a limiter link (shared link to account for maximal bandwidth of the node) + simgrid::s4u::Link* limiter = nullptr; + if (cluster->limiter_link > 0) { + std::string limiter_name = std::string(link_id) + "_limiter"; + XBT_DEBUG("", limiter_name.c_str(), cluster->limiter_link); + + limiter = zone->create_link(limiter_name, std::vector{cluster->limiter_link})->seal(); + } + + // create link + simgrid::s4u::Link* link_up; + simgrid::s4u::Link* link_down; + if (cluster->sharing_policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) { + link_up = zone->create_link(link_id + "_UP", std::vector{cluster->bw})->set_latency(cluster->lat)->seal(); + link_down = + zone->create_link(link_id + "_DOWN", std::vector{cluster->bw})->set_latency(cluster->lat)->seal(); + } else { + link_up = zone->create_link(link_id, std::vector{cluster->bw})->set_latency(cluster->lat)->seal(); + link_down = link_up; + } + + /* adding routes */ + std::vector links_up{limiter, link_up, backbone}; + links_up.erase(std::remove(links_up.begin(), links_up.end(), nullptr), links_up.end()); + std::vector links_down{backbone, link_down, limiter}; + links_down.erase(std::remove(links_down.begin(), links_down.end(), nullptr), links_down.end()); + + zone->add_route(host->get_netpoint(), nullptr, nullptr, nullptr, links_up, false); + zone->add_route(nullptr, host->get_netpoint(), nullptr, nullptr, links_down, false); + } + + // Add a router. + XBT_DEBUG(" "); + XBT_DEBUG("", cluster->router_id.c_str()); + if (cluster->router_id.empty()) + cluster->router_id = std::string(cluster->prefix) + cluster->id + "_router" + cluster->suffix; + auto* router = zone->create_router(cluster->router_id); + zone->add_route(router, nullptr, nullptr, nullptr, {}); + + simgrid::kernel::routing::on_cluster_creation(*cluster); +} + +/*************************************************************************************************/ +/** @brief Set the links for internal node inside a Cluster(Star) */ +static void sg_platf_cluster_set_hostlink(simgrid::kernel::routing::StarZone* zone, + simgrid::kernel::routing::NetPoint* netpoint, simgrid::s4u::Link* link_up, + simgrid::s4u::Link* link_down, simgrid::kernel::resource::LinkImpl* backbone) +{ + XBT_DEBUG("Push Host_link for host '%s' to position %u", netpoint->get_cname(), netpoint->id()); + if (backbone) { + zone->add_route(netpoint, nullptr, nullptr, nullptr, {link_up->get_impl(), backbone}, false); + zone->add_route(nullptr, netpoint, nullptr, nullptr, {backbone, link_down->get_impl()}, false); + } else { + zone->add_route(netpoint, nullptr, nullptr, nullptr, {link_up->get_impl()}, false); + zone->add_route(nullptr, netpoint, nullptr, nullptr, {link_down->get_impl()}, false); + } +} + +/** @brief Add a link connecting a host to the rest of its StarZone */ +static void sg_platf_new_hostlink(simgrid::kernel::routing::StarZone* zone, + const simgrid::kernel::routing::HostLinkCreationArgs* hostlink, + simgrid::kernel::resource::LinkImpl* backbone) +{ + simgrid::kernel::routing::NetPoint* netpoint = simgrid::s4u::Host::by_name(hostlink->id)->get_netpoint(); + xbt_assert(netpoint, "Host '%s' not found!", hostlink->id.c_str()); + + simgrid::s4u::Link* linkUp = simgrid::s4u::Link::by_name_or_null(hostlink->link_up); + simgrid::s4u::Link* linkDown = simgrid::s4u::Link::by_name_or_null(hostlink->link_down); + + xbt_assert(linkUp, "Link '%s' not found!", hostlink->link_up.c_str()); + xbt_assert(linkDown, "Link '%s' not found!", hostlink->link_down.c_str()); + sg_platf_cluster_set_hostlink(zone, netpoint, linkUp, linkDown, backbone); +} + +/** @brief Create a cabinet (set of hosts) inside a Cluster(StarZone) */ +static void sg_platf_new_cabinet(simgrid::kernel::routing::StarZone* zone, + const simgrid::kernel::routing::CabinetCreationArgs* args, + simgrid::kernel::resource::LinkImpl* backbone) +{ + for (int const& radical : args->radicals) { + std::string id = args->prefix + std::to_string(radical) + args->suffix; + auto const* host = zone->create_host(id, std::vector{args->speed})->seal(); + + auto* link_up = + zone->create_link("link_" + id + "_UP", std::vector{args->bw})->set_latency(args->lat)->seal(); + auto* link_down = + zone->create_link("link_" + id + "_DOWN", std::vector{args->bw})->set_latency(args->lat)->seal(); + + sg_platf_cluster_set_hostlink(zone, host->get_netpoint(), link_up, link_down, backbone); + } +} + +void sg_platf_zone_cluster_populate(simgrid::kernel::routing::ClusterZoneCreationArgs* cluster) +{ + auto* zone = dynamic_cast(current_routing); + xbt_assert(zone, "Host_links are only valid for Cluster(Star)"); + + simgrid::kernel::resource::LinkImpl* backbone = nullptr; + /* create backbone */ + if (cluster->backbone) { + sg_platf_new_link(cluster->backbone.get()); + backbone = simgrid::s4u::Link::by_name(cluster->backbone->id)->get_impl(); + } + + /* create host_links for hosts */ + for (auto const& hostlink : cluster->host_links) { + sg_platf_new_hostlink(zone, &hostlink, backbone); + } + + /* create cabinets */ + for (auto const& cabinet : cluster->cabinets) { + sg_platf_new_cabinet(zone, &cabinet, backbone); + } +} +/*************************************************************************************************/ + static void sg_platf_new_cluster_flat(simgrid::kernel::routing::ClusterCreationArgs* cluster) { using simgrid::kernel::routing::ClusterZone; @@ -348,7 +518,7 @@ static void sg_platf_new_cluster_flat(simgrid::kernel::routing::ClusterCreationA simgrid::kernel::routing::on_cluster_creation(*cluster); } -void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster) +void sg_platf_new_tag_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster) { switch (cluster->topology) { case simgrid::kernel::routing::ClusterTopology::TORUS: @@ -357,38 +527,11 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster sg_platf_new_cluster_hierarchical(cluster); break; default: - sg_platf_new_cluster_flat(cluster); + sg_platf_new_cluster_flat2(cluster); break; } } - -void routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl* bb) -{ - auto* cluster = dynamic_cast(current_routing); - - xbt_assert(cluster, "Only hosts from Cluster can get a backbone."); - xbt_assert(not cluster->has_backbone(), "Cluster %s already has a backbone link!", cluster->get_cname()); - - cluster->set_backbone(bb); - XBT_DEBUG("Add a backbone to zone '%s'", current_routing->get_cname()); -} - -void sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* args) -{ - auto* zone = static_cast(routing_get_current()); - for (int const& radical : args->radicals) { - std::string id = args->prefix + std::to_string(radical) + args->suffix; - auto const* host = zone->create_host(id, std::vector{args->speed})->seal(); - - const auto* link_up = - zone->create_link("link_" + id + "_UP", std::vector{args->bw})->set_latency(args->lat)->seal(); - - const auto* link_down = - zone->create_link("link_" + id + "_DOWN", std::vector{args->bw})->set_latency(args->lat)->seal(); - - zone->add_private_link_at(host->get_netpoint()->id(), {link_up->get_impl(), link_down->get_impl()}); - } -} +/*************************************************************************************************/ void sg_platf_new_route(simgrid::kernel::routing::RouteCreationArgs* route) { @@ -486,13 +629,7 @@ sg_platf_create_zone(const simgrid::kernel::routing::ZoneCreationArgs* zone) simgrid::kernel::routing::NetZoneImpl* new_zone = nullptr; if (strcasecmp(zone->routing.c_str(), "Cluster") == 0) { - new_zone = new simgrid::kernel::routing::ClusterZone(zone->id); - } else if (strcasecmp(zone->routing.c_str(), "ClusterDragonfly") == 0) { - new_zone = new simgrid::kernel::routing::DragonflyZone(zone->id); - } else if (strcasecmp(zone->routing.c_str(), "ClusterTorus") == 0) { - new_zone = new simgrid::kernel::routing::TorusZone(zone->id); - } else if (strcasecmp(zone->routing.c_str(), "ClusterFatTree") == 0) { - new_zone = new simgrid::kernel::routing::FatTreeZone(zone->id); + new_zone = new simgrid::kernel::routing::StarZone(zone->id); } else if (strcasecmp(zone->routing.c_str(), "Dijkstra") == 0) { new_zone = new simgrid::kernel::routing::DijkstraZone(zone->id, false); } else if (strcasecmp(zone->routing.c_str(), "DijkstraCache") == 0) { @@ -552,29 +689,6 @@ void sg_platf_new_Zone_seal() current_routing = current_routing->get_parent(); } -/** @brief Add a link connecting a host to the rest of its Zone (which must be cluster or vivaldi) */ -void sg_platf_new_hostlink(const simgrid::kernel::routing::HostLinkCreationArgs* hostlink) -{ - const simgrid::kernel::routing::NetPoint* netpoint = simgrid::s4u::Host::by_name(hostlink->id)->get_netpoint(); - xbt_assert(netpoint, "Host '%s' not found!", hostlink->id.c_str()); - xbt_assert(dynamic_cast(current_routing), - "Only hosts from Cluster and Vivaldi Zones can get a host_link."); - - const simgrid::s4u::Link* linkUp = simgrid::s4u::Link::by_name_or_null(hostlink->link_up); - const simgrid::s4u::Link* linkDown = simgrid::s4u::Link::by_name_or_null(hostlink->link_down); - - xbt_assert(linkUp, "Link '%s' not found!", hostlink->link_up.c_str()); - xbt_assert(linkDown, "Link '%s' not found!", hostlink->link_down.c_str()); - - auto* cluster_zone = static_cast(current_routing); - - if (cluster_zone->private_link_exists_at(netpoint->id())) - surf_parse_error(std::string("Host_link for '") + hostlink->id.c_str() + "' is already defined!"); - - XBT_DEBUG("Push Host_link for host '%s' to position %u", netpoint->get_cname(), netpoint->id()); - cluster_zone->add_private_link_at(netpoint->id(), {linkUp->get_impl(), linkDown->get_impl()}); -} - void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* args) { simgrid::kernel::profile::Profile* profile; diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp index 66f1ef2c3a..fbe530cb4b 100644 --- a/src/surf/xml/platf_private.hpp +++ b/src/surf/xml/platf_private.hpp @@ -119,6 +119,13 @@ public: double lat; }; +class ClusterZoneCreationArgs { +public: + std::vector host_links; + std::vector cabinets; + std::unique_ptr backbone; +}; + class DiskCreationArgs { public: std::string id; @@ -167,8 +174,6 @@ extern XBT_PRIVATE xbt::signal on_cluster_crea } // namespace kernel } // namespace simgrid -/********** Routing **********/ -void routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl* bb); /*** END of the parsing cruft ***/ XBT_PUBLIC simgrid::kernel::routing::NetZoneImpl* @@ -181,17 +186,16 @@ sg_platf_new_host_begin(const simgrid::kernel::routing::HostCreationArgs* host); XBT_PUBLIC void sg_platf_new_host_set_properties(const std::unordered_map& props); XBT_PUBLIC void sg_platf_new_host_seal(int pstate); // That Host is fully described -XBT_PUBLIC void -sg_platf_new_hostlink(const simgrid::kernel::routing::HostLinkCreationArgs* h); // Add a host_link to the current Zone XBT_PUBLIC void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* link); // Add a link to the current Zone XBT_PUBLIC void sg_platf_new_disk(const simgrid::kernel::routing::DiskCreationArgs* disk); // Add a disk to the current host XBT_PUBLIC void sg_platf_new_peer(const simgrid::kernel::routing::PeerCreationArgs* peer); // Add a peer to the current Zone -XBT_PUBLIC void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* clust); // Add a cluster to the current Zone -XBT_PUBLIC void -sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* cabinet); // Add a cabinet to the current Zone +XBT_PUBLIC void sg_platf_new_tag_cluster( + simgrid::kernel::routing::ClusterCreationArgs* clust); // Add a regular cluster to the current Zone +XBT_PUBLIC void sg_platf_zone_cluster_populate( + simgrid::kernel::routing::ClusterZoneCreationArgs* clust); // Add a routing cluster to the current Zone XBT_PUBLIC simgrid::kernel::routing::NetPoint* // Add a router to the current Zone sg_platf_new_router(const std::string&, const std::string& coords); diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp index 4692ecd9d7..3850ea7504 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -30,6 +30,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF std::string surf_parsed_filename; // Currently parsed file (for the error messages) std::vector parsed_link_list; /* temporary store of current link list of a route */ +simgrid::kernel::routing::ClusterZoneCreationArgs + zone_cluster; /* temporary store data for irregular clusters, created with */ /* Helping functions */ void surf_parse_assert(bool cond, const std::string& msg) @@ -290,7 +292,7 @@ void STag_surfxml_host___link(){ host_link.id = A_surfxml_host___link_id; host_link.link_up = A_surfxml_host___link_up; host_link.link_down = A_surfxml_host___link_down; - sg_platf_new_hostlink(&host_link); + zone_cluster.host_links.emplace_back(host_link); } void STag_surfxml_router(){ @@ -378,7 +380,7 @@ void ETag_surfxml_cluster(){ surf_parse_error(std::string("Invalid bb sharing policy in cluster ") + cluster.id); } - sg_platf_new_cluster(&cluster); + sg_platf_new_tag_cluster(&cluster); } void STag_surfxml_cluster(){ @@ -398,7 +400,7 @@ void STag_surfxml_cabinet(){ cabinet.id.c_str()); explodesRadical(A_surfxml_cabinet_radical, &cabinet.radicals); - sg_platf_new_cabinet(&cabinet); + zone_cluster.cabinets.emplace_back(cabinet); } void STag_surfxml_peer(){ @@ -512,18 +514,19 @@ void STag_surfxml_link___ctn() parsed_link_list.push_back(link); } -void ETag_surfxml_backbone(){ - simgrid::kernel::routing::LinkCreationArgs link; +void ETag_surfxml_backbone() +{ + auto link = std::make_unique(); - link.id = std::string(A_surfxml_backbone_id); - link.bandwidths.push_back(xbt_parse_get_bandwidth( - surf_parsed_filename, surf_parse_lineno, A_surfxml_backbone_bandwidth, "bandwidth of backbone", link.id.c_str())); - link.latency = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_backbone_latency, - "latency of backbone", link.id.c_str()); - link.policy = simgrid::s4u::Link::SharingPolicy::SHARED; + link->id = std::string(A_surfxml_backbone_id); + link->bandwidths.push_back(xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, + A_surfxml_backbone_bandwidth, "bandwidth of backbone", + link->id.c_str())); + link->latency = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_backbone_latency, + "latency of backbone", link->id.c_str()); + link->policy = simgrid::s4u::Link::SharingPolicy::SHARED; - sg_platf_new_link(&link); - routing_cluster_add_backbone(simgrid::s4u::Link::by_name(std::string(A_surfxml_backbone_id))->get_impl()); + zone_cluster.backbone = std::move(link); } void STag_surfxml_route(){ @@ -701,13 +704,21 @@ void STag_surfxml_zone() zone.id = A_surfxml_zone_id; zone.routing = A_surfxml_zone_routing; sg_platf_new_Zone_begin(&zone); + /* new cluster zone, clear temp structures */ + if (strcasecmp(A_surfxml_zone_routing, "Cluster") == 0) { + zone_cluster.host_links.clear(); + zone_cluster.cabinets.clear(); + zone_cluster.backbone.release(); + } } void ETag_surfxml_zone() { sg_platf_new_Zone_set_properties(property_sets.back()); property_sets.pop_back(); - + if (strcasecmp(A_surfxml_zone_routing, "Cluster") == 0) { + sg_platf_zone_cluster_populate(&zone_cluster); + } sg_platf_new_Zone_seal(); }