0.4.5

mballance · mballance · commit eb6824c2c664 · 2021-06-30T07:30:09.000-07:00
- (#93) Support slices/part selects on int/bit-type fields in procedural code. - (#83) Correct an issue with variable-bounds detetion that resulted in little randomization being applied to constrained nested fields Signed-off-by: Matthew Ballance <matt.ballance@gmail.com>
diff --git a/doc/Changelog.md b/doc/Changelog.md
@@ -1,4 +1,10 @@
 
+## 0.4.5
+- (#93) Support slices/part selects on int/bit-type fields in
+  procedural code. 
+- (#83) Correct an issue with variable-bounds detetion that
+  resulted in little randomization being applied to 
+  constrained nested fields
 ## 0.4.4
 - (#92) Corrected an issue where soft constraints were dropped while
   combining solve sets
diff --git a/etc/ivpm.info b/etc/ivpm.info
@@ -1,4 +1,4 @@
 
 name=pyvsc
-version=0.4.4
+version=0.4.5
 
diff --git a/src/vsc/model/value_scalar.py b/src/vsc/model/value_scalar.py
@@ -6,14 +6,21 @@
 from vsc.model.value import Value, ValueType
 from vsc.model.value_bool import ValueBool
 
-# class ValueInt(int):
-#     
-#     def __getitem__(self, rng):
-#         val =  str.__int__()
-#         if 
-#         print("int rng: " + str(self.__int__()))
-#         for v in dir(self):
-#             print("  v: " + str(v))
+class ValueInt(int):
+    """Wrapper for 'int' values. Permits operators"""
+     
+    def __getitem__(self, rng):
+        val =  self.__int__()
+        
+        if isinstance(rng, slice):
+            if (rng.start < rng.stop):
+                raise Exception("integer slice bounds are reversed. Expect [%d:%d]" % (
+                    rng.stop, rng.start))
+            mask = ((1 << ((rng.start-rng.stop)+1)) - 1)
+            return ((val >> rng.stop) & mask)
+        else:
+            # Single bit
+            return ((val >> rng) & 1)
 
 class ValueScalar(Value):
     
@@ -29,10 +36,10 @@ def val(self):
         return self.v
     
     def __int__(self):
-        return self.v
+        return ValueInt(self.v)
     
-#    def toInt(self):
-#        return ValueInt(self.v)
+    def toInt(self):
+        return ValueInt(self.v)
     
     def __bool__(self):
         return self.v != 0
@@ -65,6 +72,10 @@ def __add__(self, rhs):
         v = int(rhs)
         return ValueScalar(self.v + v)
     
+    def __and__(self, rhs):
+        v = int(rhs)
+        return ValueScalar(self.v & v)
+    
     def __sub__(self, rhs):
         v = int(rhs)
         return ValueScalar(self.v - v)
diff --git a/src/vsc/types.py b/src/vsc/types.py
@@ -384,7 +384,7 @@ def val(self, v):
             self.get_model().set_val(ValueScalar(v))
             
     def get_val(self):
-        return int(self.get_model().get_val())
+        return self.get_model().get_val().toInt()
     
     def set_val(self, val):
         if self.is_signed:
diff --git a/src/vsc/visitors/expr2field_visitor.py b/src/vsc/visitors/expr2field_visitor.py
@@ -14,14 +14,23 @@ def __init__(self):
         super().__init__()
         self.fm = None
         
-    def field(self, e : ExprModel):
+    def field(self, e : ExprModel, fail_on_failure=True):
         e.accept(self)
         
-        if self.fm is None:
+        if self.fm is None and fail_on_failure:
             from vsc.visitors.model_pretty_printer import ModelPrettyPrinter
             raise Exception("Failed to obtain field from expression %s" % (
                 ModelPrettyPrinter.print(e)))
         return self.fm
+    
+    def visit_expr_bin(self, e):
+        self.fm = None
+        
+    def visit_expr_unary(self, e):
+        self.fm = None
+        
+    def visit_expr_cond(self, e):
+        self.fm = None
         
     def visit_expr_fieldref(self, e):
         self.fm = e.fm
diff --git a/src/vsc/visitors/variable_bound_visitor.py b/src/vsc/visitors/variable_bound_visitor.py
@@ -38,6 +38,7 @@
 from vsc.visitors.is_const_expr_visitor import IsConstExprVisitor
 from vsc.visitors.is_nonrand_expr_visitor import IsNonRandExprVisitor
 from vsc.visitors.model_pretty_printer import ModelPrettyPrinter
+from vsc.visitors.expr2field_visitor import Expr2FieldVisitor
 
 
 class VariableBoundVisitor(ModelVisitor):
@@ -147,29 +148,19 @@ def visit_expr_bin(self, e:ExprBinModel):
                 isinstance(e.lhs, ExprArraySubscriptModel) or 
                 isinstance(e.rhs, ExprArraySubscriptModel)):
                 return
-      
+            
+            lhs_fm = Expr2FieldVisitor().field(e.lhs, fail_on_failure=False)
+            rhs_fm = Expr2FieldVisitor().field(e.rhs, fail_on_failure=False)
+
+            # Check whether the expressions involve *any* random variables            
             lhs_is_nonrand = IsNonRandExprVisitor().is_nonrand(e.lhs)
             rhs_is_nonrand = IsNonRandExprVisitor().is_nonrand(e.rhs)
 
-            if isinstance(e.lhs, ExprArraySubscriptModel):
-                lhs_fm = e.lhs.subscript()
-            elif isinstance(e.lhs, ExprFieldRefModel):
-                lhs_fm = e.lhs.fm
-            else:
-                lhs_fm = None
-
             if lhs_fm is not None and lhs_fm in self.bound_m.keys():                
                 lhs_bounds = self.bound_m[lhs_fm]
             else:
                 lhs_bounds = None
                 
-            if isinstance(e.rhs, ExprArraySubscriptModel):
-                rhs_fm = e.rhs.subscript()
-            elif isinstance(e.rhs, ExprFieldRefModel):
-                rhs_fm = e.rhs.fm
-            else:
-                rhs_fm = None
-                
             if rhs_fm is not None and rhs_fm in self.bound_m.keys():                
                 rhs_bounds = self.bound_m[rhs_fm]
             else:
diff --git a/ve/unit/test_compound_obj.py b/ve/unit/test_compound_obj.py
@@ -542,7 +542,7 @@ def test_c(self):
                 self.x[0].value < self.x[1].value
 
         inst=Parent()
-        inst.randomize(debug=1)
+        inst.randomize(debug=0)
         print(inst.c1[0].a[0].value)
         print(inst.c2[0].x[0].value)        
     
diff --git a/ve/unit/test_constraint_foreach.py b/ve/unit/test_constraint_foreach.py
@@ -66,7 +66,7 @@ def test_c(self):
                 self.x[0].value < self.x[1].value
 
         inst=Parent()
-        inst.randomize(debug=1)
+        inst.randomize(debug=0)
         print(inst.c1[0].a[0].value)
         print(inst.c2[0].x[0].value)
         self.assertEqual(inst.c1[0].a[0].value, inst.c2[0].x[0].value)
@@ -132,7 +132,7 @@ def test_c(self):
                 pass
 
         inst=Parent()
-        inst.randomize(debug=1)
+        inst.randomize(debug=0)
         print(inst.c1[0].a[0].value)
         print(inst.c2[0].x[0].value)
         self.assertEqual(inst.c1[0].a[0].value, inst.c2[0].x[0].value)        
diff --git a/ve/unit/test_constraint_soft.py b/ve/unit/test_constraint_soft.py
@@ -65,7 +65,7 @@ def dist_a(self):
 
         item = my_item()
         for i in range(10):
-            with item.randomize_with(debug=1) as it:
+            with item.randomize_with(debug=0) as it:
                 it.b > 10
                 it.a == 1 #B
 
diff --git a/ve/unit/test_field_standalone.py b/ve/unit/test_field_standalone.py
@@ -194,4 +194,14 @@ def test_distweight(self):
 #             print("<== randomize")
 #             print("PCID: %d" % int(PCID.get_val()))
 
+    def test_bit_partselect(self):
+            
+        field = vsc.rand_uint32_t(0xFFEEAA55)
+            
+        self.assertEqual(field.get_val(), 0xFFEEAA55)
+        self.assertEqual(field.get_val()[7:0], 0x55)
+        self.assertEqual(field.get_val()[11:4], 0xA5)
+        self.assertEqual(field.get_val()[31], 1)
+        self.assertEqual(field.get_val()[0], 1)
+        self.assertEqual(field.get_val()[8], 0)
 
diff --git a/ve/unit/test_random_dist.py b/ve/unit/test_random_dist.py
@@ -374,4 +374,132 @@ def x_lt_y_c(self):
 
         print("x_hist=" + str(x_hist))
         print("y_hist=" + str(y_hist))
+        
+    def test_compound_arrays(self):
+        import vsc 
+        import matplotlib.pyplot as plt
+        
+        @vsc.randobj
+        class Parent:
+            def __init__(self):
+                self.id = 0
+                self.c1 = vsc.rand_list_t(vsc.attr(Child1()))
+                for i in range(10):    
+                    self.c1.append(vsc.attr(Child1()))
+        
+                self.c2 = vsc.rand_list_t(vsc.attr(Child2()))
+                for i in range(10):
+                    self.c2.append(vsc.attr(Child2()))
+        
+                self.non_list_child = vsc.rand_attr(Child1())
+        
+                self.top_lvl_val = vsc.rand_uint8_t(0)
+            
+            @vsc.constraint
+            def parent_c(self):
+                self.top_lvl_val < 10       # Works fine
+        
+                # Presence of list causes high skewness
+                self.c1[0].one_lvl_below_val < 10
+                self.c1[0].a[0].value < 10      # Two levels below
+        
+                self.non_list_child.one_lvl_below_val < 10      # Works fine
+                
+        @vsc.randobj
+        class Field():
+            def __init__(self, name, def_value):
+                self.name = name
+                self.value = vsc.rand_uint8_t(def_value)
+        
+        @vsc.randobj
+        class Child1:
+            def __init__(self):
+                self.a = vsc.rand_list_t(vsc.attr(Field('a', 10)))
+                for i in range(5):    
+                    self.a.append(vsc.attr(Field('a', 10)))
+        
+                self.b = vsc.rand_list_t(vsc.attr(Field('b', 10)))
+                for i in range(5):    
+                    self.b.append(vsc.attr(Field('b', 10)))
+        
+                self.one_lvl_below_val = vsc.rand_uint8_t(0)
+            
+        
+        @vsc.randobj
+        class Child2:
+            def __init__(self):
+                self.x = vsc.rand_list_t(vsc.attr(Field('x', 10)))
+                for i in range(5):    
+                    self.x.append(vsc.attr(Field('x', 10)))
+        
+                self.y = vsc.rand_list_t(vsc.attr(Field('y', 10)))
+                for i in range(5):    
+                    self.y.append(vsc.attr(Field('y', 10)))
+            
+            @vsc.constraint
+            def test_c(self):
+                self.x[0].value < self.x[1].value
+        
+        inst=Parent()
+        
+        top_lvl = []
+        top_lvl_hist = [0]*10
+        one_below = []
+        one_below_hist = [0]*10
+        two_below = []
+        two_below_hist = [0]*10
+        non_list = []
+        non_list_hist = [0]*10
+        
+        for i in range(1000):
+            inst.randomize(debug=0)
+            top_lvl.append(inst.top_lvl_val)
+            top_lvl_hist[inst.top_lvl_val%10] += 1
+            one_below.append(inst.c1[0].one_lvl_below_val)
+            one_below_hist[inst.c1[0].one_lvl_below_val%10] += 1
+            two_below.append(inst.c1[0].a[0].value)
+            two_below_hist[inst.c1[0].a[0].value%10] += 1
+            non_list.append(inst.non_list_child.one_lvl_below_val)
+            non_list_hist[inst.non_list_child.one_lvl_below_val%10] += 1
+        
+#        plt.hist(top_lvl)
+#        plt.title("Top level variable values")
+#        plt.show()
+        print("top_lvl_hist: " + str(top_lvl_hist))
+        zeros = 0
+        for e in top_lvl_hist:
+            if e == 0:
+                zeros += 1
+        self.assertEqual(zeros, 0)
+        
+#        plt.hist(one_below)
+#        plt.title("Variables one level below (with list)")
+#        plt.show()
+        print("one_below: " + str(one_below_hist))
+        zeros = 0
+        for e in one_below_hist:
+            if e == 0:
+                zeros += 1
+        self.assertEqual(zeros, 0)
+        
+#        plt.hist(two_below)
+#        plt.title("Variables two levels below (with lists)")
+#        plt.show()
+        print("two_below: " + str(two_below_hist))
+        zeros = 0
+        for e in two_below_hist:
+            if e == 0:
+                zeros += 1
+        self.assertEqual(zeros, 0)
+        
+#        plt.hist(non_list)
+#        plt.title("Child not in list")
+#        plt.show()
+        print("non_list: " + str(non_list_hist))
+        zeros = 0
+        for e in non_list_hist:
+            if e == 0:
+                zeros += 1
+        self.assertEqual(zeros, 0)
+        
         
diff --git a/ve/unit/test_scalar_array.py b/ve/unit/test_scalar_array.py
@@ -323,7 +323,7 @@ def test_c(self):
                 self.x[0].value < self.x[1].value
 
         inst=Parent()
-        inst.randomize(debug=1)
+        inst.randomize(debug=0)
 
         inst.randomize()
         self.assertEqual(inst.c1[0].a[0].enum_test, level_e.level_2)
diff --git a/ve/unit/test_types.py b/ve/unit/test_types.py
@@ -290,7 +290,7 @@ def __init__(self):
         my_item_i = my_item_c()
         my_cg_i.sample(my_item_i)
         
-    def disabled_test_bit_subscript(self):
+    def test_bit_subscript(self):
         import vsc
  
         @vsc.randobj

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`
`2`	`2`	`name=pyvsc`
`3`		`-version=0.4.4`
	`3`	`+version=0.4.5`
`4`	`4`