wip

Author: robtaylor

chipflow_lib/common/sim/models.cc

@@ -284,16 +284,16 @@ void gpio_model::step(unsigned timestamp) {
         if (action.event == "set") {
             auto bin = std::string(action.payload);
             input_data = 0;
-            for (unsigned i = 0; i < width; i++) {
-                if (bin.at((width - 1) - i) == '1')
+            for (unsigned i = 0; i < pin_count; i++) {
+                if (bin.at((pin_count - 1) - i) == '1')
                     input_data |= (1U << i);
             }
         }
     }
 
     if (o_value != s.o_last || oe_value != s.oe_last) {
         std::string formatted_value;
-        for (int i = width - 1; i >= 0; i--) {
+        for (int i = pin_count - 1; i >= 0; i--) {
             if (oe_value & (1U << unsigned(i)))
                 formatted_value += (o_value & (1U << unsigned(i))) ? '1' : '0';
             else

chipflow_lib/common/sim/models.h

@@ -83,17 +83,21 @@ struct uart_model {
 };
 
 struct gpio_model {
-    static constexpr unsigned width = 8;
     std::string name;
-    gpio_model(const std::string &name, const value<width> &o, const value<width> &oe, value<width> &i) : name(name), o(o), oe(oe), i(i) {};
+    struct parameters {
+        unsigned pin_count;
+    };
+    parameters parameters;
+
+    gpio_model(const std::string &name, parameters, const value<paramters.pin_count> &o, const value<parameters.pin_count> &oe, value<parameters.pin_count> &i) : name(name), parameters(parameters), o(o), oe(oe), i(i) {};
 
     void step(unsigned timestamp);
 
 private:
     uint32_t input_data = 0;
-    const value<width> &o;
-    const value<width> &oe;
-    value<width> &i;
+    const value<pin_count> &o;
+    const value<pin_count> &oe;
+    value<pin_count> &i;
     struct {
         uint32_t o_last = 0;
         uint32_t oe_last = 0;

chipflow_lib/platforms/_signatures.py

@@ -23,17 +23,19 @@ def decorate(klass):
         dec = amaranth_annotate(SimInterface, SIM_ANNOTATION_SCHEMA)
         klass = dec(klass)
 
-        original_init = klass.__init__
         def new_init(self,*args, **kwargs):
+            print("called new_init")
             original_init(self, *args, **kwargs)
             self.__chipflow_annotation__ = {
                 "uid": klass.__chipflow_uid__,
                 "parameters": self.__chipflow_parameters__(),
                 }
 
+        original_init = klass.__init__
         klass.__init__ = new_init
         klass.__chipflow_uid__ = f"{base}.{klass.__name__}"
-        klass.__chipflow_parameters__ = lambda self: {}
+        if not hasattr(klass, '__chipflow_parameters__'):
+            klass.__chipflow_parameters__ = lambda self: {}
         return klass
     return decorate
 
@@ -98,6 +100,7 @@ def __init__(self, pin_count=1, **kwargs: Unpack[IOModelOptions]):
             })
 
     def __chipflow_parameters__(self):
+        print("called GPIOSignature.__chipflow_parameters__")
         return {'pin_count': self._pin_count}
 
     def __repr__(self) -> str:

chipflow_lib/platforms/sim.py

@@ -107,8 +107,6 @@ def uid_to_c(self, uid: str) -> str:
         return uid.replace('.','__')
 
     def instantiate_model(self, interface: str, sim_interface: SimInterface, interface_desc: Interface, ports: Dict[str, io.SimulationPort]) -> str:
-        #TODO cache if this gets slow
-
         uid = sim_interface['uid']
         parameters = sim_interface['parameters']
         if uid not in self._table:
@@ -127,6 +125,11 @@ def instantiate_model(self, interface: str, sim_interface: SimInterface, interfa
         params = [f"top.{cxxrtlmangle(n)}" for n in names]
 
         out = f"{model.name} {interface}(\"{interface}\", "
+        if len(parameters):
+            cpp_params = []
+            for p,v in parameters.items():
+                cpp_params.append(f"{p} = {v}")
+            out += '{' + ', '.join(cpp_params) + '}, '
         out += ', '.join(list(params))
         out += ')\n'
         return out