slicc: added MOESI_CMP_directory, DMA SequencerMsg, parameterized controllers

This changeset contains a lot of different changes that are too
mingled to separate.  They are:

1.  Added MOESI_CMP_directory

I made the changes necessary to bring back MOESI_CMP_directory,
including adding a DMA controller.  I got rid of MOESI_CMP_directory_m
and made MOESI_CMP_directory use a memory controller. Added a new
configuration for two level protocols in general, and
MOESI_CMP_directory in particular.

2.  DMA Sequencer uses a generic SequencerMsg

I will eventually make the cache Sequencer use this type as well.  It
doesn't contain an offset field, just a physical address and a length.
MI_example has been updated to deal with this.

3. Parameterized Controllers

SLICC controllers can now take custom parameters to use for mapping,
latencies, etc.  Currently, only int parameters are supported.

14 files changed, 87 insertions, 97 deletions

diff --git a/src/mem/slicc/ast/AST.hh b/src/mem/slicc/ast/AST.hh
index 53f9a6c33..33c9b84ed 100644
--- a/src/mem/slicc/ast/AST.hh
+++ b/src/mem/slicc/ast/AST.hh
@@ -50,28 +50,28 @@ public:
   // Constructors
   AST(Map<string, string> pairs) { m_pairs = pairs; };
   AST() {};
-
+  
   // Destructor
   virtual ~AST() {};
-
+  
   // Public Methods
   virtual void print(ostream& out) const = 0;
   void error(string err_msg) const { m_location.error(err_msg); };
   string embedError(string err_msg) const { return m_location.embedError(err_msg); };
   void warning(string err_msg) const { m_location.warning(err_msg); };
-
+  
   const Location& getLocation() const { return m_location; };
-
+  
   const Map<string, string>& getPairs() const { return m_pairs; };
   Map<string, string>& getPairs() { return m_pairs; };
-
+  
 private:
   // Private Methods
-
+  
   // Private copy constructor and assignment operator
   //  AST(const AST& obj);
   //  AST& operator=(const AST& obj);
-
+  
   // Data Members (m_ prefix)
   Location m_location;
   Map<string, string> m_pairs;
diff --git a/src/mem/slicc/ast/ActionDeclAST.cc b/src/mem/slicc/ast/ActionDeclAST.cc
index 2734722d1..e46412ff7 100644
--- a/src/mem/slicc/ast/ActionDeclAST.cc
+++ b/src/mem/slicc/ast/ActionDeclAST.cc
@@ -36,8 +36,10 @@
  *
  */
 
+
 #include "mem/slicc/ast/ActionDeclAST.hh"
 #include "mem/slicc/symbols/Action.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
 
 ActionDeclAST::ActionDeclAST(string* ident_ptr,
                              PairListAST* pairs_ptr,
diff --git a/src/mem/slicc/ast/ActionDeclAST.hh b/src/mem/slicc/ast/ActionDeclAST.hh
index 53d938ca8..4970ee254 100644
--- a/src/mem/slicc/ast/ActionDeclAST.hh
+++ b/src/mem/slicc/ast/ActionDeclAST.hh
@@ -41,7 +41,8 @@
 
 #include "mem/slicc/slicc_global.hh"
 #include "mem/slicc/ast/DeclAST.hh"
-#include "mem/slicc/ast/StatementListAST.hh"
+
+class StatementListAST;
 
 class ActionDeclAST : public DeclAST {
 public:
diff --git a/src/mem/slicc/ast/EnqueueStatementAST.cc b/src/mem/slicc/ast/EnqueueStatementAST.cc
index 8be0378c9..a422d8a28 100644
--- a/src/mem/slicc/ast/EnqueueStatementAST.cc
+++ b/src/mem/slicc/ast/EnqueueStatementAST.cc
@@ -77,7 +77,14 @@ void EnqueueStatementAST::generate(string& code, Type* return_type_ptr) const
   code += ".enqueue(out_msg";
 
   if (getPairs().exist("latency")) {
-    code += ", m_LATENCY_" + getPairs().lookup("latency");
+    bool is_number = true;
+    string val = getPairs().lookup("latency");
+    for (int i=0; i<val.size(); i++)
+      if (!isdigit(val[i])) is_number = false;
+    if (is_number)
+      code += ", " + getPairs().lookup("latency");
+    else
+      code += ", m_" + getPairs().lookup("latency");
   }
 
   code += ");\n";
diff --git a/src/mem/slicc/ast/FormalParamAST.cc b/src/mem/slicc/ast/FormalParamAST.cc
index 4ca2c8978..529811f25 100644
--- a/src/mem/slicc/ast/FormalParamAST.cc
+++ b/src/mem/slicc/ast/FormalParamAST.cc
@@ -38,6 +38,7 @@
 
 #include "mem/slicc/ast/FormalParamAST.hh"
 #include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
 #include "mem/slicc/symbols/SymbolTable.hh"
 
 FormalParamAST::~FormalParamAST()
@@ -46,6 +47,16 @@ FormalParamAST::~FormalParamAST()
   delete m_type_ast_ptr;
 }
 
+string FormalParamAST::getTypeName() const 
+{ 
+  return m_type_ast_ptr->toString(); 
+}
+
+Type* FormalParamAST::getType() const
+{
+  return m_type_ast_ptr->lookupType();
+}
+
 Type* FormalParamAST::generate(string& code) const
 {
   string param = "param_" + *m_ident_ptr;
diff --git a/src/mem/slicc/ast/FormalParamAST.hh b/src/mem/slicc/ast/FormalParamAST.hh
index 63d66cc03..ca27948b7 100644
--- a/src/mem/slicc/ast/FormalParamAST.hh
+++ b/src/mem/slicc/ast/FormalParamAST.hh
@@ -40,7 +40,9 @@
 #define FORMALPARAMAST_H
 
 #include "mem/slicc/slicc_global.hh"
-#include "mem/slicc/ast/TypeAST.hh"
+#include "mem/slicc/ast/AST.hh"
+
+class TypeAST;
 
 
 class FormalParamAST : public AST {
@@ -55,6 +57,8 @@ public:
   Type* generate(string& code) const;
   void print(ostream& out) const { out << "[FormalParamAST: " << *m_ident_ptr << "]"; }
   string getName() const { return *m_ident_ptr; }
+  string getTypeName() const;
+  Type* getType() const;
 private:
   // Private Methods
 
diff --git a/src/mem/slicc/ast/FuncDeclAST.cc b/src/mem/slicc/ast/FuncDeclAST.cc
index 7fb0e6346..2a0905f06 100644
--- a/src/mem/slicc/ast/FuncDeclAST.cc
+++ b/src/mem/slicc/ast/FuncDeclAST.cc
@@ -37,6 +37,7 @@
  */
 
 #include "mem/slicc/ast/FuncDeclAST.hh"
+#include "mem/slicc/ast/FormalParamAST.hh"
 #include "mem/slicc/symbols/SymbolTable.hh"
 #include "mem/slicc/main.hh"
 
diff --git a/src/mem/slicc/ast/FuncDeclAST.hh b/src/mem/slicc/ast/FuncDeclAST.hh
index d60694303..205e71a85 100644
--- a/src/mem/slicc/ast/FuncDeclAST.hh
+++ b/src/mem/slicc/ast/FuncDeclAST.hh
@@ -43,7 +43,8 @@
 #include "mem/slicc/ast/DeclAST.hh"
 #include "mem/slicc/ast/TypeFieldAST.hh"
 #include "mem/slicc/ast/TypeAST.hh"
-#include "mem/slicc/ast/FormalParamAST.hh"
+
+class FormalParamsAST;
 
 class FuncDeclAST : public DeclAST {
 public:
diff --git a/src/mem/slicc/ast/MachineAST.cc b/src/mem/slicc/ast/MachineAST.cc
index 2096db591..ae8026458 100644
--- a/src/mem/slicc/ast/MachineAST.cc
+++ b/src/mem/slicc/ast/MachineAST.cc
@@ -37,21 +37,20 @@
  */
 
 #include "mem/slicc/ast/MachineAST.hh"
+#include "mem/slicc/ast/FormalParamAST.hh"
 #include "mem/slicc/symbols/SymbolTable.hh"
 
 MachineAST::MachineAST(string* ident_ptr,
                        PairListAST* pairs_ptr,
-                       Vector<TypeFieldAST*>* config_params_ptr,
-                       std::vector<std::string*>* latency_vector,
+                       Vector<FormalParamAST*>* config_parameters,
                        DeclListAST* decl_list_ptr)
 
   : DeclAST(pairs_ptr)
 {
   m_ident_ptr = ident_ptr;
   m_pairs_ptr = pairs_ptr;
-  m_config_params_ptr = config_params_ptr;
+  m_config_parameters = config_parameters;
   m_decl_list_ptr = decl_list_ptr;
-  m_latency_vector = latency_vector;
 }
 
 MachineAST::~MachineAST()
@@ -69,7 +68,7 @@ void MachineAST::generate()
   g_sym_table.pushFrame();
 
   // Create a new machine
-  machine_ptr = new StateMachine(*m_ident_ptr, getLocation(), getPairs(), m_latency_vector);
+  machine_ptr = new StateMachine(*m_ident_ptr, getLocation(), getPairs(), m_config_parameters);
   g_sym_table.newCurrentMachine(machine_ptr);
 
   // Generate code for all the internal decls
diff --git a/src/mem/slicc/ast/MachineAST.hh b/src/mem/slicc/ast/MachineAST.hh
index 8f83e4cfe..5d1bc2a1c 100644
--- a/src/mem/slicc/ast/MachineAST.hh
+++ b/src/mem/slicc/ast/MachineAST.hh
@@ -45,13 +45,14 @@
 #include "mem/slicc/ast/TypeFieldAST.hh"
 #include "mem/slicc/symbols/StateMachine.hh"
 
+class FormalParamAST;
+
 class MachineAST : public DeclAST {
 public:
   // Constructors
   MachineAST(string* ident_ptr,
              PairListAST* pairs_ptr,
-             Vector<TypeFieldAST*>* config_params_ptr,
-             std::vector<std::string*>* latency_vector,
+             Vector<FormalParamAST*>* config_parameters,
              DeclListAST* decl_list_ptr);
 
   // Destructor
@@ -69,10 +70,9 @@ private:
   MachineAST& operator=(const MachineAST& obj);
 
   // Data Members (m_ prefix)
-  std::vector<std::string*>* m_latency_vector;
+  Vector<FormalParamAST*>* m_config_parameters;
   string* m_ident_ptr;
   DeclListAST* m_decl_list_ptr;
-  Vector<TypeFieldAST*>* m_config_params_ptr;
   PairListAST* m_pairs_ptr;
 };
 
diff --git a/src/mem/slicc/parser/parser.py b/src/mem/slicc/parser/parser.py
index 1c7d582ec..95e8d25e5 100644
--- a/src/mem/slicc/parser/parser.py
+++ b/src/mem/slicc/parser/parser.py
@@ -76,7 +76,7 @@ tokens = [ 'EQ', 'NE', 'LT', 'GT', 'LE', 'GE',
            'NOT', 'AND', 'OR',
            'PLUS', 'DASH', 'STAR', 'SLASH',
            'DOUBLE_COLON', 'SEMICOLON',
-           'ASSIGN', 'DOT', 'LATENCY',
+           'ASSIGN', 'DOT',
            'IDENT', 'LIT_BOOL', 'FLOATNUMBER', 'NUMBER', 'STRING' ]
 tokens += reserved.values()
 
@@ -190,19 +190,8 @@ def p_decl(p):
             | d_func_def"""
     p[0] = p[1]
 
-def p_latency(p):
-    """latency : LATENCY"""
-    pass
-
-def p_latencies(p):
-    """latencies : latency latencies
-                 | empty"""
-    return []
-
 def p_d_machine(p):
-    """d_machine : MACHINE '(' ident pair_l ')' '{' decl_l '}'
-           | MACHINE '(' ident pair_l ')' ':' type_members '{' decl_l '}'
-           | MACHINE '(' ident pair_l ')' ':' latencies '{' decl_l '}'"""
+    """d_machine : MACHINE '(' ident pair_l ')' ':' param_l '{' decl_l '}'"""
 
     if len(p) == 9:
         decl_l = p[7]
@@ -542,10 +531,19 @@ def scan(filenames):
     for filename in filenames:
         lex.lexer.lineno = 1
         try:
+            print "parsing ",filename
             results = yacc.parse(file(filename, 'r').read())
-        except (TokenError, ParseError), e:
-            raise type(e), tuple([filename] + [ i for i in e ])
+        except (ParseError,TokenError), e:
+            print "File ",filename," ",e
+            raise e
+        #except ParseError, e:
+        #    print "File ",filename," "e
+        #    raise e, tuple([filename] + [ i for i in e ])
+
+        #except ParseError, e:
+        #    print e
 
+            
         for result in results:
             result.add(hh, cc)
 
diff --git a/src/mem/slicc/parser/parser.yy b/src/mem/slicc/parser/parser.yy
index fa5a3b355..c8cef3b21 100644
--- a/src/mem/slicc/parser/parser.yy
+++ b/src/mem/slicc/parser/parser.yy
@@ -111,8 +111,6 @@ extern "C" int yylex();
 %type <expr_ptr> expr literal enumeration
 %type <expr_vector_ptr> expr_list
 
-%type <stdstring_vector_ptr> myrule
-
 %type <pair_ptr> pair
 %type <pair_list_ptr> pair_list pairs
 
@@ -148,9 +146,7 @@ decls: decl decls { $2->insertAtTop($1); $$ = $2; }
      | { $$ = new Vector<DeclAST*>; }
      ;
 
-decl:  MACHINE_DECL     '(' ident pair_list ')' ':' myrule '{' decl_list '}' { $$ = new MachineAST($3, $4, NULL, $7, $9); }
-//    |  MACHINE_DECL     '(' ident pair_list ')' ':' type_members '{' decl_list '}' { $$ = new MachineAST($3, $4, $7, string_vector, $9); }
-    |  MACHINE_DECL     '(' ident pair_list ')' '{' decl_list '}' { $$ = new MachineAST($3, $4, NULL, new vector<string*>(), $7); }
+decl:  MACHINE_DECL     '(' ident pair_list ')' ':' formal_param_list '{' decl_list '}' { $$ = new MachineAST($3, $4, $7, $9); }
     |  ACTION_DECL      '(' ident pair_list ')' statement_list { $$ = new ActionDeclAST($3, $4, $6); }
     |  IN_PORT_DECL     '(' ident ',' type ',' var pair_list ')' statement_list { $$ = new InPortDeclAST($3, $5, $7, $8, $10); }
     |  OUT_PORT_DECL    '(' ident ',' type ',' var pair_list ')' SEMICOLON { $$ = new OutPortDeclAST($3, $5, $7, $8); }
@@ -336,10 +332,6 @@ var: ident { $$ = new VarExprAST($1); }
 field: ident { $$ = $1; }
      ;
 
-myrule: myrule IDENT { $1->push_back($2); }
-      | IDENT { $$ = new vector<string*>(1, $1); }
-      ;
-
 %%
 
 extern FILE *yyin;
diff --git a/src/mem/slicc/symbols/StateMachine.cc b/src/mem/slicc/symbols/StateMachine.cc
index 4a9ee3714..7bc84ffe0 100644
--- a/src/mem/slicc/symbols/StateMachine.cc
+++ b/src/mem/slicc/symbols/StateMachine.cc
@@ -43,14 +43,25 @@
 #include "mem/slicc/symbols/SymbolTable.hh"
 #include "mem/gems_common/util.hh"
 #include "mem/gems_common/Vector.hh"
+#include "mem/slicc/ast/FormalParamAST.hh"
 
 #include <set>
 
-StateMachine::StateMachine(string ident, const Location& location, const Map<string, string>& pairs,  std::vector<std::string*>* latency_vector)
+StateMachine::StateMachine(string ident, const Location& location, const Map<string, string>& pairs,  Vector<FormalParamAST*>* config_parameters)
   : Symbol(ident, location, pairs)
 {
   m_table_built = false;
-  m_latency_vector = *latency_vector;
+  m_config_parameters = config_parameters;
+  
+  for (int i=0; i< m_config_parameters->size(); i++) {
+    Var* var = new Var(m_config_parameters->ref(i)->getName(), 
+		       location, 
+		       m_config_parameters->ref(i)->getType(), 
+		       "m_"+m_config_parameters->ref(i)->getName(),
+		       Map<string, string>(),
+		       this);
+    g_sym_table.registerSym(m_config_parameters->ref(i)->getName(), var);
+  }
 }
 
 StateMachine::~StateMachine()
@@ -284,9 +295,8 @@ void StateMachine::printControllerH(ostream& out, string component)
   out << "private:" << endl;
 //added by SS
 //  found_to_mem = 0;
-  std::vector<std::string*>::const_iterator it;
-  for(it=m_latency_vector.begin();it!=m_latency_vector.end();it++){
-        out << "  int m_" << (*it)->c_str() << ";" << endl;
+  for(int i=0;i<m_config_parameters->size();i++){
+    out << "  int m_" << m_config_parameters->ref(i)->getName() << ";" << endl;
   }
   if (strncmp(component.c_str(), "L1Cache", 7) == 0) {
     out << "  bool servicing_atomic;" << endl;
@@ -429,41 +439,22 @@ void StateMachine::printControllerC(ostream& out, string component)
   out << "    else if (argv[i] == \"number_of_TBEs\") " << endl;
   out << "      m_number_of_TBEs = atoi(argv[i+1].c_str());" << endl;
 
-  if (m_latency_vector.size()) {
-  out << "    else { " << endl;
-    std::vector<std::string*>::const_iterator it;
-    for(it=m_latency_vector.begin();it!=m_latency_vector.end();it++) {
-      string str = (*it)->c_str();
-      str.erase(0,8);
-//convert to lowercase
-      size_t i;
-      char* strc = (char*) malloc (str.length()+1);
-      strc[str.length()]=0;
-      for(i=0; i < str.length(); i++) {
-        strc[i] = str.at(i);
-        strc[i] = tolower(strc[i]);
-      }
-      str = strc;
-      delete strc;
-      out << "      if (argv[i] == \"" << str << "\"){" << endl;
-      if (str == "to_mem_ctrl_latency")
-        out << "        m_" << (*it)->c_str() << "=" << "atoi(argv[i+1].c_str())+(random() % 5);" << endl;
+  if (m_config_parameters->size()) {
+    for(int i= 0 ; i < m_config_parameters->size(); i++) {
+      out << "    else if (argv[i] == \"" << m_config_parameters->ref(i)->getName() << "\")" << endl;
+      if (m_config_parameters->ref(i)->getTypeName() == "int")
+	out << "      m_" << m_config_parameters->ref(i)->getName() << "=" << "atoi(argv[i+1].c_str());" << endl;      
       else
-        out << "        m_" << (*it)->c_str() << "=" << "atoi(argv[i+1].c_str());" << endl;
-//      out << "        printf (\"SET m_" << it->c_str() << "= %i \\n \", m_" << it->c_str() << ");" << endl;
-      out << "      }" << endl;
+	assert(0); // only int parameters are supported right now
+      //      if (str == "to_mem_ctrl_latency")
+      //        out << "        m_" << (*it)->c_str() << "=" << "atoi(argv[i+1].c_str())+(random() % 5);" << endl;
     }
-  out << "    }" << endl;
   }
   out << "  }" << endl;
-
   out << "  m_net_ptr = net_ptr;" << endl;
   out << "  m_machineID.type = MachineType_" << component << ";" << endl;
   out << "  m_machineID.num = m_version;" << endl;
 
-//  out << "  printf (\"I set m_LATENCY_ISSUE_LATENCY to %i \\n \", m_LATENCY_ISSUE_LATENCY);" << endl;
-//  out << "  printf (\"I set m_LATENCY_CACHE_RESPONSE_LATENCY to %i \\n \", m_LATENCY_CACHE_RESPONSE_LATENCY);" << endl;
-
   // make configuration array
   out << "  for (size_t i=0; i < argv.size(); i+=2) {" << endl;
   out << "    if (argv[i] != \"version\") " << endl;
@@ -724,25 +715,7 @@ void StateMachine::printControllerC(ostream& out, string component)
 
 
       string c_code_string = action.lookupPair("c_code");
-/*
-      size_t found = c_code_string.find("RubyConfig::get");
-
-      if (found!=string::npos){ //found --> replace it with local access
-        //if it is related to latency --> replace it
-        std::vector<std::string*>::const_iterator it;
-        for(it=m_latency_vector.begin();it!=m_latency_vector.end();it++){
-          string str = (*it)->c_str();
-          str.erase(0,8);
-          size_t fd = c_code_string.find(str, found);
-          if (fd!=string::npos && (fd == found+15)){
-            string rstr = "m_";
-            rstr += (*it)->c_str();
-            c_code_string.replace(found,15+str.size()+2,rstr);
-            break;
-          }
-        }
-      }
-*/
+
       // add here:
       if (strncmp(component.c_str(), "L1Cache", 7) == 0) {
         if (c_code_string.find("writeCallback") != string::npos) {
diff --git a/src/mem/slicc/symbols/StateMachine.hh b/src/mem/slicc/symbols/StateMachine.hh
index 101e38547..f5f3ab073 100644
--- a/src/mem/slicc/symbols/StateMachine.hh
+++ b/src/mem/slicc/symbols/StateMachine.hh
@@ -49,11 +49,12 @@ class State;
 class Action;
 class Var;
 class Func;
+class FormalParamAST;
 
 class StateMachine : public Symbol {
 public:
   // Constructors
-  StateMachine(string ident, const Location& location, const Map<string, string>& pairs,  std::vector<std::string*>* latency_vector);
+  StateMachine(string ident, const Location& location, const Map<string, string>& pairs,  Vector<FormalParamAST*>* config_parameters);
 
   // Destructor
   ~StateMachine();
@@ -94,7 +95,7 @@ public:
   void print(ostream& out) const { out << "[StateMachine: " << toString() << "]" << endl; }
 private:
 
-  std::vector<std::string*> m_latency_vector;
+  Vector<FormalParamAST*>* m_config_parameters;
 
   // Private Methods
   void checkForDuplicate(const Symbol& sym) const;