verification/rvgen: Fix variable definition generation
Subsystems (2)
cover verification/rvgen: Fix variable definition generation
Hi,
The ltl2k script generates a variable definition for each node in the abstract syntax tree. This may causes compiler warning on the generated monitors, because:
- Some of the variables may be unused
- Some of the variables may be duplicated
This series fixes these issues.
Nam Cao (2):
verification/rvgen: Generate each variable definition only once verification/rvgen: Do not generate unused variables
tools/verification/rvgen/rvgen/ltl2k.py | 33 +++++++++++++++++++------ 1 file changed, 26 insertions(+), 7 deletions(-)
Signature · 1 line
2.39.5
PATCH 1/2 verification/rvgen: Generate each variable definition only once
If a variable appears multiple times in the specification, ltl2k generates multiple variable definitions. This fails the build.
Make sure each variable is only defined once.
--- tools/verification/rvgen/rvgen/ltl2k.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
tools/verification/rvgen/rvgen/ltl2k.py +5 -3
@@ -112,14 +112,16 @@ class ltl2k(generator.Monitor): if node.op.is_temporal(): continue - if isinstance(node.op, ltl2ba.Variable): - buf.append("\tbool %s = test_bit(LTL_%s, mon->atoms);" % (node, node.op.name)) - elif isinstance(node.op, ltl2ba.AndOp): + if isinstance(node.op, ltl2ba.AndOp): buf.append("\tbool %s = %s && %s;" % (node, node.op.left, node.op.right)) elif isinstance(node.op, ltl2ba.OrOp): buf.append("\tbool %s = %s || %s;" % (node, node.op.left, node.op.right)) elif isinstance(node.op, ltl2ba.NotOp): buf.append("\tbool %s = !%s;" % (node, node.op.child)) + + for atom in self.atoms: + buf.append("\tbool %s = test_bit(LTL_%s, mon->atoms);" % (atom.lower(), atom)) + buf.reverse() buf2 = []
Signature · 1 line
2.39.5
PATCH 2/2 verification/rvgen: Do not generate unused variables
In reply to Nam Caoltl2k generates all variable definition in both ltl_start() and ltl_possible_next_states(). However, these two functions may not use all the variables, causing "unused variable" compiler warning.
Change the script to only generate used variables.
--- tools/verification/rvgen/rvgen/ltl2k.py | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)
tools/verification/rvgen/rvgen/ltl2k.py +21 -4
@@ -106,20 +106,25 @@ class ltl2k(generator.Monitor): ]) return buf - def _fill_atom_values(self): + def _fill_atom_values(self, required_values): buf = [] for node in self.ltl: - if node.op.is_temporal(): + if str(node) not in required_values: continue if isinstance(node.op, ltl2ba.AndOp): buf.append("\tbool %s = %s && %s;" % (node, node.op.left, node.op.right)) + required_values |= {str(node.op.left), str(node.op.right)} elif isinstance(node.op, ltl2ba.OrOp): buf.append("\tbool %s = %s || %s;" % (node, node.op.left, node.op.right)) + required_values |= {str(node.op.left), str(node.op.right)} elif isinstance(node.op, ltl2ba.NotOp): buf.append("\tbool %s = !%s;" % (node, node.op.child)) + required_values.add(str(node.op.child)) for atom in self.atoms: + if atom.lower() not in required_values: + continue buf.append("\tbool %s = test_bit(LTL_%s, mon->atoms);" % (atom.lower(), atom)) buf.reverse()
@@ -135,7 +140,13 @@ class ltl2k(generator.Monitor): "ltl_possible_next_states(struct ltl_monitor *mon, unsigned int state, unsigned long *next)", "{" ] - buf.extend(self._fill_atom_values()) + + required_values = set() + for node in self.ba: + for o in sorted(node.outgoing): + required_values |= o.labels + + buf.extend(self._fill_atom_values(required_values)) buf.extend([ "", "\tswitch (state) {"
@@ -166,7 +177,13 @@ class ltl2k(generator.Monitor): "static void ltl_start(struct task_struct *task, struct ltl_monitor *mon)", "{" ] - buf.extend(self._fill_atom_values()) + + required_values = set() + for node in self.ba: + if node.init: + required_values |= node.labels + + buf.extend(self._fill_atom_values(required_values)) buf.append("") for node in self.ba:
Signature · 1 line
2.39.5
Re: [PATCH 2/2] verification/rvgen: Do not generate unused variables
Quoted 8 lines · Nam Cao
ltl2k generates all variable definition in both
ltl_start()andltl_possible_next_states(). However, these two functions may not use all
the variables, causing "unused variable" compiler warning.Change the script to only generate used variables.
Signed-off-by Nam Cao <[email protected]>
Tried both patches and they seem to work as intended.
Thanks,
Gabriele
Quoted 76 lines
---
tools/verification/rvgen/rvgen/ltl2k.py | 25 +++++++++++++++++++++-- --1 file changed, 21 insertions(+), 4 deletions(-)tools/verification/rvgen/rvgen/ltl2k.py +0
-0@@ -106,20 +106,25 @@ class ltl2k(generator.Monitor): ])return buf
- def_fill_atom_values(self):
+ def_fill_atom_values(self, required_values):
buf = []
for node in self.ltl:
- ifnode.op.is_temporal():
+ if str(node) not inrequired_values:
continue
ifisinstance(node.op, ltl2ba.AndOp):
buf.append("\tbool %s = %s && %s;" % (node, node.op.left, node.op.right))
+required_values|= {str(node.op.left), str(node.op.right)}
elifisinstance(node.op, ltl2ba.OrOp):
buf.append("\tbool %s = %s || %s;" % (node, node.op.left, node.op.right))
+required_values|= {str(node.op.left), str(node.op.right)}
elifisinstance(node.op, ltl2ba.NotOp):
buf.append("\tbool %s = !%s;" % (node, node.op.child))
+ required_values.add(str(node.op.child))
for atom in self.atoms:
+ ifatom.lower()not inrequired_values:
+ continue
buf.append("\tbool %s = test_bit(LTL_%s, mon->atoms);" % (atom.lower(), atom))
buf.reverse()tools/verification/rvgen/rvgen/ltl2k.py +0
-0@@ -135,7 +140,13 @@ class ltl2k(generator.Monitor): "ltl_possible_next_states(struct ltl_monitor *mon, unsigned int state, unsigned long *next)","{"
]
- buf.extend(self._fill_atom_values())tools/verification/rvgen/rvgen/ltl2k.py +7
-0+ + required_values = set() + for node in self.ba: + for o in sorted(node.outgoing): + required_values |= o.labels + + buf.extend(self._fill_atom_values(required_values))buf.extend([
"",
"\tswitch (state) {"tools/verification/rvgen/rvgen/ltl2k.py +0
-0@@ -166,7 +177,13 @@ class ltl2k(generator.Monitor):"static void
ltl_start(struct task_struct *task, struct ltl_monitor *mon)",
"{"
]
- buf.extend(self._fill_atom_values())tools/verification/rvgen/rvgen/ltl2k.py +7
-0+ + required_values = set() + for node in self.ba: + if node.init: + required_values |= node.labels + + buf.extend(self._fill_atom_values(required_values))
buf.append("")
for node in self.ba: