Detect and convert uint64 based events

Author: mandolaerik

py/dml/codegen.py

@@ -3538,6 +3538,18 @@ def report_pevent_data_arg(meth_node, site, inargs):
         if structure.method_is_std(meth_node.parent, 'get_event_info'):
             report(PEVENT_NO_ARG(dmlparse.start_site(inargs[-1].site),
                                    dmlparse.end_site(site)))
+        elif (isinstance(inargs[-1], ctree.Cast)
+              and safe_realtype(inargs[-1].expr.ctype()).is_int):
+            report(PEVENT_UINT64_ARG(
+                inargs[-1].site, dmlparse.end_site(inargs[-1].site),
+                meth_node.parent.site))
+            event_meth_node = meth_node.parent.get_component('event')
+            (argname, _) = event_meth_node.inp[0]
+            report(PCHANGE_INARGS(event_meth_node.site,
+                                  f'method event(uint64 {argname})'))
+            for methname in ['get_event_info', 'set_event_info']:
+                meth = meth_node.parent.get_component(methname)
+                report(PEVENT_REMOVE_INFO(meth.site, dmlparse.end_site(meth.site)))
 
 def codegen_inline(site, meth_node, indices, inargs, outargs,
                    inhibit_copyin = False):

py/dml/messages.py

@@ -2519,6 +2519,21 @@ class PEVENT_NO_ARG(PortingMessage):
     `post`, `posted`, `next` and `remove` are removed.
     """
 
+class PEVENT_UINT64_ARG(PortingMessage):
+    """When one of the methods `post`, `posted`, `next` and `remove`
+    is called with an integer value cast to a pointer in the `data`
+    arg, that event is converted to a `uint64_time_event` or
+    `uint64_cycle_event`. The converter removes the cast and
+    causes the event object to be converted to a
+    `uint64_time_event` instead of `uint64_custom_event`.
+    """
+
+class PEVENT_REMOVE_INFO(PortingMessage):
+    """When an event is converted to a `uint64_time_event` or
+    `uint64_cycle_event`, the `set_event_info` and `get_event_info` methods
+    are removed.
+    """
+
 class POVERRIDE(PortingMessage):
     """If a method has exactly one default and one non-default
     declaration, and the non-default declaration resides in a

py/port_dml.py

@@ -409,6 +409,8 @@ def apply(self, f):
         f.edit(offset, length, decl)
 
 class PINVOKE(Transformation):
+    # before PEVENT_NO_ARG, PEVENT_UINT64_ARG
+    phase = 0
     def apply(self, f):
         [offs, expr_offs, outarg_offs, semi_offs] = [
             self.offset(f, loc)
@@ -634,6 +636,10 @@ def instantiate_template(f, decl_offset, new_tpl):
     f.edit(offs, length, '(%s)' % (', '.join(sorted(tpls + [new_tpl])),))
 
 class PATTRIBUTE(Transformation):
+    # after PEVENT_UINT64_ARG
+    phase = 2
+    uint64_event_sites = set()
+
     def remove_param_decl(self, f, param_site):
         offs = self.offset(f, param_site)
         # skip spaces backward
@@ -648,6 +654,8 @@ def remove_param_decl(self, f, param_site):
     def apply(self, f):
         offs = self.offset(f)
         (template, allocate_type_param, type_param) = self.params
+        if self.loc in self.uint64_event_sites:
+            template = template.replace('custom_', 'uint64_')
         instantiate_template(f, offs, template)
         self.remove_param_decl(f, allocate_type_param)
         if type_param:
@@ -665,6 +673,37 @@ def apply(self, f):
         end_offs -= 1
         f.edit(start_offs, end_offs - start_offs, '')
 
+class PEVENT_UINT64_ARG(Transformation):
+    # after PINVOKE
+    phase = 1
+    def apply(self, f):
+        start_offs = self.offset(f)
+        (end_site, event_site) = self.params
+        PATTRIBUTE.uint64_event_sites.add(event_site)
+        # remove `cast(..., void *)`
+        end_offs = self.offset(f, end_site)
+        line = f.read_line_up_to(end_offs)
+        voidp_chars = len(line) - line.rindex(',')
+        f.edit(end_offs - voidp_chars, voidp_chars + 1, '')
+        f.edit(start_offs, 'cast(', '')
+
+class RemoveMethod(Transformation):
+    # after PRETVAL
+    phase = 3
+    def apply(self, f):
+        offs = self.offset(f)
+        (end_site,) = self.params
+        end_offs = self.offset(f, end_site)
+        offs -= len(rspace(f.read_line_up_to(offs)))
+        end_offs += len(f.read_regexp(end_offs, re.compile(' *[}] *'))) + 1
+        extra_blank = f.read_line(end_offs)
+        sys.stderr.write(repr([end_offs, extra_blank]))
+        if not extra_blank.strip():
+            end_offs += len(extra_blank) + 1
+
+        f.edit(offs, end_offs - offs, '')
+
+
 class POVERRIDE(Transformation):
     class EPOVERRIDE(PortingFailure): tag = 'EPOVERRIDE'
     def apply(self, f):
@@ -1010,6 +1049,8 @@ def report(f, dest):
     'PATTRIBUTE': PATTRIBUTE,
     'PEVENT': PATTRIBUTE,
     'PEVENT_NO_ARG': PEVENT_NO_ARG,
+    'PEVENT_UINT64_ARG': PEVENT_UINT64_ARG,
+    'PEVENT_REMOVE_INFO': RemoveMethod,
     'POVERRIDE': POVERRIDE,
     'POVERRIDE_IMPORT': POVERRIDE_IMPORT,
     'PBEFAFT': PBEFAFT,

test/1.2/misc/porting.dml

@@ -378,6 +378,18 @@ event simple_ev2 {
     method event(data) {}
 }
 
+event uint64_ev {
+    parameter timebase = "seconds";
+    method event(data) {}
+    method get_event_info(void *data) -> (attr_value_t attr) {
+        attr = SIM_make_attr_uint64(cast(data, uintptr_t));
+    }
+
+    method set_event_info(attr_value_t attr) -> (void *data) {
+        data = cast(SIM_attr_integer(attr), void *);
+    }
+}
+
 event custom_ev {
     parameter timebase = "cycles";
     method get_event_info(void *data) -> (attr_value_t attr) {
@@ -445,4 +457,9 @@ method init() {
     local uint64 next;
     call $simple_ev.next(NULL) -> (next);
     $simple_ev.remove(NULL);
+
+    inline $uint64_ev.post(1, cast(7 + 84, void *));
+    call $uint64_ev.posted(cast(0, void *)) -> (posted);
+    call $uint64_ev.next(cast(74, void *)) -> (next);
+    $uint64_ev.remove(cast(cast(4, uintptr_t), void*));
 }

test/1.4/misc/porting.dml

@@ -399,6 +399,10 @@ event simple_ev2 is simple_time_event {
     method event() {}
 }
 
+event uint64_ev is uint64_time_event {
+    method event(uint64 data) {}
+}
+
 event custom_ev is custom_cycle_event {
     method get_event_info(void *data) -> (attr_value_t) {
         return SIM_make_attr_nil();
@@ -470,4 +474,9 @@ method init() {
     local uint64 next;
     next = simple_ev.next();
     simple_ev.remove();
+
+    uint64_ev.post(1, 7 + 84);
+    posted = uint64_ev.posted(0);
+    next = uint64_ev.next(74);
+    uint64_ev.remove(cast(4, uintptr_t));
 }

test/tests.py

@@ -1408,6 +1408,8 @@ def test(self):
         'PATTRIBUTE',
         'PEVENT',
         'PEVENT_NO_ARG',
+        'PEVENT_UINT64_ARG',
+        'PEVENT_REMOVE_INFO',
         'POVERRIDE',
         'PBEFAFT',
         'PABSTRACT_TEMPLATE',