add graph modif, progress on vhdl generation

[blast.git] / GroupBlock.cpp

diff --git a/GroupBlock.cpp b/GroupBlock.cpp
index 62fd6ec8c813599c568d8c928b901f7ffc6e5aba..b515b543aae9f1e8643de694235d224e31163097 100644 (file)
--- a/GroupBlock.cpp
+++ b/GroupBlock.cpp
@@ -10,7 +10,7 @@ int GroupBlock::counter = 1;
 GroupBlock::GroupBlock(GroupBlock *_parent) throw(Exception) :  AbstractBlock() {
 
   // force topGroup to false if this group has a parent
 GroupBlock::GroupBlock(GroupBlock *_parent) throw(Exception) :  AbstractBlock() {
 
   // force topGroup to false if this group has a parent

-  if (_parent != NULL) {    
+  if (_parent != NULL) {

     topGroup = false;
     name = QString("sub_group")+"_"+QString::number(counter++);
   }
     topGroup = false;
     name = QString("sub_group")+"_"+QString::number(counter++);
   }


@@ -108,14 +108,20 @@ void GroupBlock::removeGenericParameter(QString name) {
 void GroupBlock::createInputPattern() {
   foreach(AbstractInterface* iface, getControlInputs()) {
     ConnectedInterface* connIface = AI_TO_CON(iface);
 void GroupBlock::createInputPattern() {
   foreach(AbstractInterface* iface, getControlInputs()) {
     ConnectedInterface* connIface = AI_TO_CON(iface);

-    QList<char>* pattern = new QList<char>(*(connIface->getConnectedFrom()->getOutputPattern()));    
-    connIface->setOutputPattern(pattern);    
-  }  
+    QList<char>* pattern = new QList<char>(*(connIface->getConnectedFrom()->getOutputPattern()));
+    connIface->setOutputPattern(pattern);
+  }
+}
+
+void GroupBlock::computeAdmittanceDelays() throw(Exception) {
+  throw(Exception(INVALID_GROUPBLOCK_USE));

 }
 
 }
 

-void GroupBlock::checkInputPatternCompatibility() throw(Exception){  
+void GroupBlock::checkInputPatternCompatibility()  throw(Exception){
+  throw(Exception(INVALID_GROUPBLOCK_USE));

 }
 
 }
 

+

 void GroupBlock::computeOutputPattern(int nbExec) throw(Exception) {
 
   static QString fctName = "GroupBlock::computeOutputPattern()";
 void GroupBlock::computeOutputPattern(int nbExec) throw(Exception) {
 
   static QString fctName = "GroupBlock::computeOutputPattern()";


@@ -125,7 +131,7 @@ void GroupBlock::computeOutputPattern(int nbExec) throw(Exception) {
 
   cout << "computing output pattern of group " << qPrintable(name) << endl;
   
 
   cout << "computing output pattern of group " << qPrintable(name) << endl;
   

-  bool canCompute = false;  
+  bool canCompute = false;

   // get the input pattern on each inputs
   createInputPattern();
   
   // get the input pattern on each inputs
   createInputPattern();
   


@@ -133,28 +139,34 @@ void GroupBlock::computeOutputPattern(int nbExec) throw(Exception) {
   // find blocks that are connected to that inputs and generators
   QList<AbstractBlock*> fifo;
   foreach(AbstractBlock* block, blocks) {
   // find blocks that are connected to that inputs and generators
   QList<AbstractBlock*> fifo;
   foreach(AbstractBlock* block, blocks) {

-        
+

     bool addIt = false;
     // if a block is a generator and has control outputs, add it
     if (block->isGeneratorBlock()) {
       if (block->getControlOutputs().size() > 0) addIt = true;
     }
     else {
     bool addIt = false;
     // if a block is a generator and has control outputs, add it
     if (block->isGeneratorBlock()) {
       if (block->getControlOutputs().size() > 0) addIt = true;
     }
     else {

-      // if the block has a control input connected from an intput of the group, add it too
+      // if the block has all its connected inputs that are connected to an intput of the group, add it too
+      addIt = true;

       foreach(AbstractInterface* iface, block->getControlInputs()) {
       foreach(AbstractInterface* iface, block->getControlInputs()) {

-        //cout << qPrintable(iface->getName()) << " of " << qPrintable(iface->getOwner()->getName()) << " connected to " << endl;       
+        //cout << qPrintable(iface->getName()) << " of " << qPrintable(iface->getOwner()->getName()) << " connected to " << endl;

         ConnectedInterface* connFrom = ((ConnectedInterface*)iface)->getConnectedFrom();
         //cout << qPrintable(connFrom->getName()) << " of " << qPrintable(connFrom->getOwner()->getName()) << endl;
         
         ConnectedInterface* connFrom = ((ConnectedInterface*)iface)->getConnectedFrom();
         //cout << qPrintable(connFrom->getName()) << " of " << qPrintable(connFrom->getOwner()->getName()) << endl;
         

-        if (connFrom->getOwner() == this) {
-          addIt = true;
+        if (connFrom == NULL) {
+          addIt = false;
+          break;
+        }
+        else if (connFrom->getOwner() != this) {
+          addIt = false;

           break;
         }
       }
     }
     if (addIt) {
       cout << "adding " << qPrintable(block->getName()) << " to initialize the FIFO" << endl;
           break;
         }
       }
     }
     if (addIt) {
       cout << "adding " << qPrintable(block->getName()) << " to initialize the FIFO" << endl;

-      fifo.append(block);    
+      block->setTraversalLevel(0); // level 0 = first blocks to be evaluated
+      fifo.append(block);

     }
   }
   
     }
   }
   


@@ -162,47 +174,70 @@ void GroupBlock::computeOutputPattern(int nbExec) throw(Exception) {
     AbstractBlock* block = fifo.takeFirst();
     
     if (block->getPatternComputed()) continue; // block has already been processed
     AbstractBlock* block = fifo.takeFirst();
     
     if (block->getPatternComputed()) continue; // block has already been processed

+
+    cout << "computing compat and output for " << qPrintable(block->getName()) << endl;

     
     

+

     try {
       block->checkInputPatternCompatibility();
     }
     try {
       block->checkInputPatternCompatibility();
     }

-    catch(Exception e) {
-      cout << qPrintable(block->getName()) << " is not compatible with his input pattern" << endl;
+    catch(Exception e) {      
+      cout << qPrintable(block->getName()) << " is not compatible with its input pattern" << endl;

       throw(e);
       throw(e);

-    }    
+    }   

     
     try {
       block->computeOutputPattern();
     }
     
     try {
       block->computeOutputPattern();
     }

-    catch(Exception e) {    
+    catch(Exception e) {

       cout << "cannot finalize output pattern computation of " << qPrintable(block->getName()) << endl;
       cout << "cannot finalize output pattern computation of " << qPrintable(block->getName()) << endl;

-      throw(e);      
+      throw(e);

     }
     canCompute = true;
     block->setPatternComputed(true);
     }
     canCompute = true;
     block->setPatternComputed(true);

-    // add other blocks connected from block to the fifo
+    /* add other blocks connected from block to the fifo but only if
+       all their connected inputs are connected to blocks that have
+       a traversalLevel >=0
+     */

     foreach(AbstractInterface* iface, block->getControlOutputs()) {
       ConnectedInterface* conn = (ConnectedInterface*)iface;
       foreach(ConnectedInterface* connTo, conn->getConnectedTo()) {
     foreach(AbstractInterface* iface, block->getControlOutputs()) {
       ConnectedInterface* conn = (ConnectedInterface*)iface;
       foreach(ConnectedInterface* connTo, conn->getConnectedTo()) {

-        /* if connTo is owned by a functional block
-           or by a group block that is within this, add the block to the fifo.
-         */
-        if (connTo->getOwner()->isFunctionalBlock()) {
-          fifo.append(connTo->getOwner());
+
+        AbstractBlock* block1 = connTo->getOwner();
+        cout << "testing if " << qPrintable(block1->getName()) << " has all connected inputs connected to already processed blocks" << endl;
+        bool addIt = true;
+        int maxLevel = 0;
+
+        foreach(AbstractInterface* iface, block1->getControlInputs()) {
+          //cout << qPrintable(iface->getName()) << " of " << qPrintable(iface->getOwner()->getName()) << " connected to " << endl;
+          ConnectedInterface* connFrom = ((ConnectedInterface*)iface)->getConnectedFrom();
+          //cout << qPrintable(connFrom->getName()) << " of " << qPrintable(connFrom->getOwner()->getName()) << endl;
+
+          if ((connFrom != NULL) && (connFrom->getOwner()->getPatternComputed() == false)) {
+            addIt = false;
+            break;
+          }
+          else {
+            if (connFrom->getOwner()->getTraversalLevel() > maxLevel) maxLevel = connFrom->getOwner()->getTraversalLevel();
+          }
+        }
+
+        if (addIt) {
+          cout << "adding " << qPrintable(block1->getName()) << " to the FIFO" << endl;
+          block1->setTraversalLevel(maxLevel+1); // level 0 = first blocks to be evaluated
+          fifo.append(block1);

         }
         }

-        else if (connTo->getOwner() != this) {
-          fifo.append(connTo->getOwner());
-        }      

       }
     }
   }
       }
     }
   }

-  
+

   if (canCompute) {
     foreach(AbstractInterface* iface, getControlOutputs()) {
       ConnectedInterface* connIface = AI_TO_CON(iface);
       QList<char>* pattern = new QList<char>(*(connIface->getConnectedFrom()->getOutputPattern()));
   if (canCompute) {
     foreach(AbstractInterface* iface, getControlOutputs()) {
       ConnectedInterface* connIface = AI_TO_CON(iface);
       QList<char>* pattern = new QList<char>(*(connIface->getConnectedFrom()->getOutputPattern()));

-      connIface->setOutputPattern(pattern);    
+      connIface->setOutputPattern(pattern);

     }
     setPatternComputed(true);
     }
     setPatternComputed(true);

-  }  
+  }
+

 }
 }