From af16855f0556e92be92366d8adec26f179967e21 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Castelli?= Date: Mon, 5 May 2014 17:10:20 +0200 Subject: [PATCH] Rewrite of the fat trees implementation --- src/surf/surf_routing_cluster_fat_tree.cpp | 195 ++++++++++++++------- src/surf/surf_routing_cluster_fat_tree.hpp | 35 ++-- 2 files changed, 155 insertions(+), 75 deletions(-) diff --git a/src/surf/surf_routing_cluster_fat_tree.cpp b/src/surf/surf_routing_cluster_fat_tree.cpp index 01d40f035a..40948d23cc 100644 --- a/src/surf/surf_routing_cluster_fat_tree.cpp +++ b/src/surf/surf_routing_cluster_fat_tree.cpp @@ -25,19 +25,78 @@ void AsClusterFatTree::getRouteAndLatency(RoutingEdgePtr src, /* This function makes the assumption that parse_specific_arguments() and * addNodes() have already been called */ -void AsClusterFatTree::create_links(sg_platf_cluster_cbarg_t cluster) { - +void AsClusterFatTree::create_links(sg_platf_cluster_cbarg_t cluster){ if(this->levels == 0) { return; } + this->generateSwitches(); + this->generateLabels(); + 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->nodesByLevel[i] ; j++) { + if(i != this->levels - 1) { + for(unsigned int l = 0 ; l < this->nodesByLevel[i+1] ; l++) { + this->connectNodeToParents(cluster, this->nodes[k]); + } + } + k++; + } + } +} + +int AsClusterFatTree::connectNodeToParents(sg_platf_cluster_cbarg_t cluster, + FatTreeNode *node) { + FatTreeNode* currentParentNode; + int connectionsNumber = 0; + const int level = node->level; + currentParentNode = this->nodes[this->getLevelPosition(level + 1)]; + for (unsigned int i = 0 ; i < this->nodesByLevel[level] ; i++ ) { + if(this->areRelated(currentParentNode, node)) { + this->addLink(cluster, currentParentNode, node->label[level + 1], node, + currentParentNode->label[level + 1]); + connectionsNumber++; + } + } + return connectionsNumber; +} + + +bool AsClusterFatTree::areRelated(FatTreeNode *parent, FatTreeNode *child) { + if (parent->level != child->level + 1) { + return false; + } + + for (unsigned int i = 0 ; i < this->levels; i++) { + if (parent->label[i] != child->label[i] && i != parent->level) { + return false; + } + } + return true; +} + +void AsClusterFatTree::generateSwitches() { this->nodesByLevel.resize(this->levels, 0); unsigned int nodesRequired = 0; + // We take care of the number of nodes by level + this->nodesByLevel[0] = 1; + for (unsigned int i = 0 ; i < this->levels ; i++) { + this->nodesByLevel[0] *= this->lowerLevelNodesNumber[i]; + } + + if(this->nodesByLevel[0] < this->nodes.size()) { + surf_parse_error("There is not enough nodes to fit to the described topology." + " Please check your platform description (We need %d nodes, we only got %zu)", + this->nodesByLevel[0], this->nodes.size()); + return; + } + for (unsigned int i = 0 ; i < this->levels ; i++) { int nodesInThisLevel = 1; - for (unsigned int j = 0 ; j < i ; j++) { + for (unsigned int j = 0 ; j <= i ; j++) { nodesInThisLevel *= this->upperLevelNodesNumber[j]; } @@ -45,79 +104,93 @@ void AsClusterFatTree::create_links(sg_platf_cluster_cbarg_t cluster) { nodesInThisLevel *= this->lowerLevelNodesNumber[j]; } - this->nodesByLevel[i] = nodesInThisLevel; + this->nodesByLevel[i+1] = nodesInThisLevel; nodesRequired += nodesInThisLevel; } - - if(nodesRequired > this->nodes.size()) { - surf_parse_error("There is not enough nodes to fit to the described topology." - " Please check your platform description (We need %d nodes, we only got %zu)", - nodesRequired, this->nodes.size()); - return; + + + // If we have to many compute nodes, we ditch them + if (this->nodesByLevel[0] > this->nodes.size()) { + for (unsigned int i = this->nodesByLevel[0] ; i < this->nodes.size() ; i++) { + delete this->nodes[i]; + } + this->nodes.resize(this->nodesByLevel[0]); } - // Nodes are totally ordered, by level and then by position, in this->nodes + // We create the switches int k = 0; + for (unsigned int i = 1 ; i < this->levels ; i++) { + for (unsigned int j = 0 ; j < this->nodesByLevel[i] ; j++) { + FatTreeNode* newNode; + newNode = new FatTreeNode(--k, i, j); + newNode->children.resize(this->lowerLevelNodesNumber[i]); + newNode->parents.resize(this->upperLevelNodesNumber[i]); + this->nodes.push_back(newNode); + } + } +} + +void AsClusterFatTree::generateLabels() { + // TODO : check if nodesByLevel and nodes are filled for (unsigned int i = 0 ; i < this->levels ; i++) { + std::vector maxLabel(this->nodesByLevel[i]); + std::vector currentLabel(this->nodesByLevel[i], 0); + unsigned int k = 0; + for (unsigned int j = 0 ; j < this->nodesByLevel[i] ; j++) { + maxLabel[j] = j > i ? + this->lowerLevelNodesNumber[i] : this->upperLevelNodesNumber[i]; + } + for (unsigned int j = 0 ; j < this->nodesByLevel[i] ; j++) { - this->nodes[k]->level = i; - this->nodes[k]->position = j; - if(i != 0) { - int position, size; - this->getLevelPosition(i - 1, &position, &size); // TODO : check position and size ? - /* We create the connexions between this nodes and all its parents - */ - for (unsigned int l = this->upperLevelNodesNumber[i] * j ; - l < this->upperLevelNodesNumber[i] * (j + 1) ; l++) - this->addLink(cluster, this->nodes[position + l], this->nodes[k]); + this->nodes[k]->label.assign(currentLabel.begin(), currentLabel.end()); + + int remainder = 0; + + do { + int pos = currentLabel.size() - 1; + remainder = ++currentLabel[pos] / maxLabel[pos]; + currentLabel[pos] = currentLabel[pos] % maxLabel[pos]; + --pos; } - k++; + while(remainder != 0); + k++; } } } -void AsClusterFatTree::getLevelPosition(const unsigned int level, int *position, int *size) { + +int AsClusterFatTree::getLevelPosition(const unsigned int level) { if (level > this->levels - 1) { - *position = -1; - *size = -1; - return; + // Well, that should never happen. Maybe should we throw instead. + return -1; } int tempPosition = 0; for (unsigned int i = 0 ; i < level ; i++) { tempPosition += this->nodesByLevel[i]; } - *position = tempPosition; - *size = this->nodesByLevel[level]; + return tempPosition; } -void AsClusterFatTree::addNodes(std::vector const& id) { +void AsClusterFatTree::addComputeNodes(std::vector const& id) { for (size_t i = 0 ; i < id.size() ; i++) { this->nodes.push_back(new FatTreeNode(id[i])); } } -void AsClusterFatTree::addLink(sg_platf_cluster_cbarg_t cluster, FatTreeNode *parent, - FatTreeNode *child) { +void AsClusterFatTree::addLink(sg_platf_cluster_cbarg_t cluster, + FatTreeNode *parent, unsigned int parentPort, + FatTreeNode *child, unsigned int childPort) { using std::make_pair; - if (parent->children.size() == this->nodesByLevel[parent->level] || - child->parents.size() == this->nodesByLevel[child->level]) { - /* NB : This case should never happen, if this private function is not misused, - * so should we keep this test, keep it only for debug, throw an exception - * or get rid of it ? In all cases, anytime we get in there, code should be - * fixed - */ - xbt_die("I've been asked to create a link that could not possibly exist"); - return; - } - parent->children.push_back(child); - child->parents.push_back(parent); FatTreeLink *newLink; + newLink = new FatTreeLink(cluster, parent, child); + + parent->children[parentPort] = newLink; + child->parents[childPort] = newLink; - newLink = new FatTreeLink(cluster, parent, child, this->lowerLevelPortsNumber[parent->level]); - this->links.insert(make_pair(make_pair(parent->id, child->id), newLink)); + this->links.insert(make_pair(make_pair(parent->id, child->id), newLink)); @@ -185,12 +258,10 @@ void AsClusterFatTree::generateDotFile(const string& filename) const { std::map,FatTreeLink*>::const_iterator iter; file << "graph AsClusterFatTree {\n"; for (iter = this->links.begin() ; iter != this->links.end() ; iter++ ) { - for (unsigned int j = 0 ; j < iter->second->ports ; j++) { file << iter->second->source->id << " -- " << iter->second->destination->id << ";\n"; - } } file << "}"; file.close(); @@ -206,24 +277,26 @@ FatTreeNode::FatTreeNode(int id, int level, int position) : id(id), position(position){} FatTreeLink::FatTreeLink(sg_platf_cluster_cbarg_t cluster, FatTreeNode *source, - FatTreeNode *destination, - unsigned int ports) : ports(ports), source(source), - destination(destination) { + FatTreeNode *destination) : source(source), + destination(destination) { + static int uniqueId = 0; s_sg_platf_link_cbarg_t linkTemplate; linkTemplate.bandwidth = cluster->bw; linkTemplate.latency = cluster->lat; linkTemplate.state = SURF_RESOURCE_ON; linkTemplate.policy = cluster->sharing_policy; // Maybe should we do sthg with that ? - for(unsigned int i = 0 ; i < ports ; i++) { - NetworkLink* link; - linkTemplate.id = bprintf("link_from_%d_to_%d_%d_UP", source->id, destination->id, i); - sg_platf_new_link(&linkTemplate); - link = (NetworkLink*) xbt_lib_get_or_null(link_lib, linkTemplate.id, SURF_LINK_LEVEL); - this->linksUp.push_back(link); // check link? - linkTemplate.id = bprintf("link_from_%d_to_%d_%d_DOWN", source->id, destination->id, i); - sg_platf_new_link(&linkTemplate); - link = (NetworkLink*) xbt_lib_get_or_null(link_lib, linkTemplate.id, SURF_LINK_LEVEL); - this->linksDown.push_back(link); // check link ? - } + + NetworkLink* link; + linkTemplate.id = bprintf("link_from_%d_to_%d_%d_UP", source->id, destination->id, uniqueId); + sg_platf_new_link(&linkTemplate); + link = (NetworkLink*) xbt_lib_get_or_null(link_lib, linkTemplate.id, SURF_LINK_LEVEL); + this->linkUp = link; // check link? + linkTemplate.id = bprintf("link_from_%d_to_%d_%d_DOWN", source->id, destination->id, uniqueId); + sg_platf_new_link(&linkTemplate); + link = (NetworkLink*) xbt_lib_get_or_null(link_lib, linkTemplate.id, SURF_LINK_LEVEL); + this->linkDown = link; // check link ? + + uniqueId++; + } diff --git a/src/surf/surf_routing_cluster_fat_tree.hpp b/src/surf/surf_routing_cluster_fat_tree.hpp index 62f9354b4e..fa63eb4a8e 100644 --- a/src/surf/surf_routing_cluster_fat_tree.hpp +++ b/src/surf/surf_routing_cluster_fat_tree.hpp @@ -20,33 +20,35 @@ /* TODO : limiter link ? Loopback? * */ +class FatTreeNode; +class FatTreeLink; class FatTreeNode { public: - int id; // ID as given by the user, should be unique - int level; // The 0th level represents the leafs of the PGFT - int position; // Position in the level - + int id; + unsigned int level; // The 0th level represents the leafs of the PGFT + unsigned int position; // Position in the level + std::vector label; /* We can see the sizes sum of the two following vectors as the device * ports number. If we use the notations used in Zahavi's paper, * children.size() = m_level and parents.size() = w_(level+1) * */ - std::vector children; // m, apply from lvl 0 to levels - 1 - std::vector parents; // w, apply from lvl 1 to levels + std::vector children; // m, apply from lvl 0 to levels - 1 + std::vector parents; // w, apply from lvl 1 to levels FatTreeNode(int id, int level=-1, int position=-1); }; class FatTreeLink { public: FatTreeLink(sg_platf_cluster_cbarg_t cluster, FatTreeNode *source, - FatTreeNode *destination, unsigned int ports = 0); - unsigned int ports; + FatTreeNode *destination); + // unsigned int ports; /* Links are dependant of the chosen network model, but must implement * NetworkLink */ - std::vector linksUp; // From source to destination - std::vector linksDown; // From destination to source + NetworkLink* linkUp; // From source to destination + NetworkLink* linkDown; // From destination to source /* As it is symetric, it might as well be first / second instead * of source / destination */ @@ -66,7 +68,7 @@ public: // double *latency) const; virtual void create_links(sg_platf_cluster_cbarg_t cluster); void parse_specific_arguments(sg_platf_cluster_cbarg_t cluster); - void addNodes(std::vector const& id); + void addComputeNodes(std::vector const& id); void generateDotFile(const string& filename = "fatTree.dot") const; protected: @@ -80,8 +82,13 @@ protected: std::map, FatTreeLink*> links; std::vector nodesByLevel; - void addLink(sg_platf_cluster_cbarg_t cluster, FatTreeNode *parent, - FatTreeNode *child); - void getLevelPosition(const unsigned int level, int *position, int *size); + void addLink(sg_platf_cluster_cbarg_t cluster, + FatTreeNode *parent, unsigned int parentPort, + FatTreeNode *child, unsigned int childPort); + int getLevelPosition(const unsigned int level); + void generateLabels(); + void generateSwitches(); + int connectNodeToParents(sg_platf_cluster_cbarg_t cluster, FatTreeNode *node); + bool areRelated(FatTreeNode *parent, FatTreeNode *child); }; #endif -- 2.20.1