0.6.0

- (#115) Correct an issue with Jupyter notebooks and inability
  to obtain source information
- (#59) Add environment-variable support for controlling
  enhanced diagnostic messages, and add documentation

Signed-off-by: Matthew Ballance <matt.ballance@gmail.com>

Author: mballance

doc/Changelog.md

@@ -1,4 +1,10 @@
 
+## 0.6.0
+- (#115) Correct an issue with Jupyter notebooks and inability
+  to obtain source information
+- (#59) Add environment-variable support for controlling 
+  enhanced diagnostic messages, and add documentation
+
 ## 0.5.9
 - (#107) Added a new randomization approach that deals better
   with bit conflicts.

etc/ivpm.info

@@ -1,4 +1,4 @@
 
 name=pyvsc
-version=0.5.9
+version=0.6.0
 

src/vsc/__init__.py

@@ -42,6 +42,7 @@
 from ucis.ucdb.ucdb_factory import UcdbFactory
 from ucis.ucdb.ucdb_ucis import UcdbUCIS
 from vsc import profile
+from vsc.impl.ctor import glbl_debug, glbl_solvefail_debug
 
 
 def get_coverage_report(details=False)->str:
@@ -148,3 +149,12 @@ def vsc_static_init():
 
 #vsc_static_init()
 
+def vsc_debug(val):
+    global glbl_debug
+    glbl_debug = val
+    
+def vsc_solvefail_debug(val):
+    global glbl_solvefail_debug
+    glbl_solvefail_debug = val
+
+    

src/vsc/coverage.py

@@ -269,8 +269,12 @@ def configure_options(self, *args, **kwargs):
         raise Exception("Covergroup inheritance is not currently supported")
 
     # Store declaration information on the type
-    file = inspect.getsourcefile(T)
-    lineno = inspect.getsourcelines(T)[1]
+    if hasattr(T, "__file__"):
+        file = inspect.getsourcefile(T)
+        lineno = inspect.getsourcelines(T)[1]
+    else:
+        file = "<unknown>"
+        lineno = -1
     setattr(T, "_srcinfo_decl", SourceInfo(file, lineno))
 
     # This is the interposer class that wraps a user-defined

src/vsc/impl/ctor.py

@@ -14,21 +14,54 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from vsc.impl.coverage_registry import CoverageRegistry
-
 '''
 Created on Jul 23, 2019
 
 @author: ballance
 '''
 
+import os
+
+from vsc.impl.coverage_registry import CoverageRegistry
 from vsc.model.constraint_expr_model import ConstraintExprModel
 
+
 rand_obj_type_m = {}
 constraint_scope_stack = []
 expr_l = []
 foreach_arr_s = []
 
+if "VSC_CAPTURE_SRCINFO" in os.environ.keys() and os.environ["VSC_CAPTURE_SRCINFO"] != "":
+    try:
+        glbl_capture_srcinfo = int(os.environ["VSC_CAPTURE_SRCINFO"])
+    except Exception:
+        print("Note: VSC_CAPTURE_SRCINFO must be numeric, not %s" %
+              os.environ["VSC_CAPTURE_SRCINFO"])
+        glbl_capture_srcinfo = 0
+else:
+    glbl_capture_srcinfo = 0
+    
+if "VSC_DEBUG" in os.environ.keys() and os.environ["VSC_DEBUG"] != "":
+    try:
+        glbl_debug = int(os.environ["VSC_DEBUG"])
+    except Exception:
+        print("Note: VSC_DEBUG must be numeric, not %s" %
+              os.environ["VSC_DEBUG"])
+        glbl_debug = 0
+else:
+    glbl_debug = 0
+    
+if "VSC_SOLVEFAIL_DEBUG" in os.environ.keys() and os.environ["VSC_SOLVEFAIL_DEBUG"] != "":
+    try:
+        glbl_solvefail_debug = int(os.environ["VSC_SOLVEFAIL_DEBUG"])
+    except Exception:
+        print("Note: VSC_SOLVEFAIL_DEBUG must be numeric, not %s" %
+              os.environ["VSC_SOLVEFAIL_DEBUG"])
+        glbl_solvefail_debug = 0
+else:
+    glbl_solvefail_debug = 0
+    
+
 # Tracks whether srcinfo should be collected for a type
 srcinfo_mode_s = []
 
@@ -62,7 +95,11 @@ def push_srcinfo_mode(m):
     srcinfo_mode_s.append(m)
 
 def in_srcinfo_mode():
-    return len(srcinfo_mode_s) > 0 and srcinfo_mode_s[-1]
+    global glbl_capture_srcinfo
+    if glbl_capture_srcinfo > 0:
+        return True
+    else:
+        return len(srcinfo_mode_s) > 0 and srcinfo_mode_s[-1]
 
 def pop_srcinfo_mode():
     if len(srcinfo_mode_s) > 0:

src/vsc/impl/vscobj_int.py

@@ -8,4 +8,5 @@ class VscObjInt(object):
 
     def __init__(self):
         self.ctor_level = 0
+        self.srcinfo = False
 

src/vsc/model/randomizer.py

@@ -60,6 +60,7 @@
 from pip._internal.cli.cmdoptions import src
 from vsc.model.solvegroup_swizzler_range import SolveGroupSwizzlerRange
 from vsc.model.solvegroup_swizzler_partsel import SolveGroupSwizzlerPartsel
+from vsc.impl.ctor import glbl_debug, glbl_solvefail_debug
 
 
 class Randomizer(RandIF):
@@ -71,8 +72,14 @@ def __init__(self, debug=0, lint=0, solve_fail_debug=0, solve_info=None):
         self.pretty_printer = ModelPrettyPrinter()
         self.solve_info = solve_info
         self.debug = debug
+        if glbl_debug > 0 and glbl_debug > debug:
+            self.debug = glbl_debug
+
         self.lint = lint
         self.solve_fail_debug = solve_fail_debug
+        if glbl_solvefail_debug > 0 and glbl_solvefail_debug > solve_fail_debug:
+            self.solve_fail_debug = glbl_solvefail_debug
+            
 #        self.swizzler = SolveGroupSwizzlerRange(solve_info)
         self.swizzler = SolveGroupSwizzlerPartsel(solve_info)
 

src/vsc/rand_obj.py

@@ -59,6 +59,7 @@ class randobj_interposer(T):
 
             def __init__(self, *args, **kwargs):
                 ro_i = self._get_ro_int()
+                ro_i.srcinfo = srcinfo
 
                 # Capture the instantiation location
                 frame = inspect.stack()[1]
@@ -230,15 +231,18 @@ def _get_ro_int(self):
                 return self._ro_int
 
             def __enter__(self):
+                ro_i = self._get_ro_int()
                 enter_expr_mode()
                 self.get_model() # Ensure model is constructed
+                push_srcinfo_mode(ro_i.srcinfo)
                 push_constraint_scope(ConstraintBlockModel("inline"))
                 return self
 
             def __exit__(self, t, v, tb):
                 frame = inspect.stack()[1]
                 c = pop_constraint_scope()
                 leave_expr_mode()
+                pop_srcinfo_mode()
                 model = self.get_model() # Ensure model is constructed
                 try:
                     Randomizer.do_randomize(

src/vsc/types.py

@@ -43,7 +43,7 @@
 from vsc.model.field_const_array_model import FieldConstArrayModel
 from vsc.model.field_scalar_model import FieldScalarModel
 from vsc.model.unary_expr_type import UnaryExprType
-from vsc.model.value_scalar import ValueScalar
+from vsc.model.value_scalar import ValueScalar, ValueInt
 
 
 from vsc.impl.expr_mode import get_expr_mode, expr_mode, is_expr_mode
@@ -295,16 +295,16 @@ def to_expr(t):
         # This expression is already on the stack
 #        push_expr(t.em)
         return t
-    elif type(t) == int:
-        return expr(ExprLiteralModel(t, True, 32))
+    elif type(t) == int or type(t) == ValueInt:
+        return expr(ExprLiteralModel(int(t), True, 32))
     elif isinstance(type(t), (EnumMeta,IntEnum)):
         return expr(EnumInfo.get(type(t)).e2e(t))
     elif hasattr(t, "to_expr"):
         return t.to_expr()
     elif callable(t):
         raise Exception("TODO: support lambda references")
     else:
-        raise Exception("Element \"" + str(t) + "\" isn't recognized, and doesn't provide to_expr")
+        raise Exception("Element \"" + str(t) + "\" isn't recognized, and doesn't provide to_expr (type=%s)" % str(type(t)))
 
 
 class field_info(object):

ve/unit/test_constraint_expr.py

@@ -16,9 +16,10 @@ def __init__(self):
                 self.b = vsc.rand_uint8_t()
 
         my_i = my_c()
-        with my_i.randomize_with() as it:
-            it.a == it.b
-        self.assertEqual(my_i.a, my_i.b)
+        for i in range(2):
+            with my_i.randomize_with() as it:
+                it.a == it.b
+            self.assertEqual(my_i.a, my_i.b)
 
     def test_ne(self):
         @vsc.randobj