0.9.5

- (#237) - Add support for specifying cross-bins to ignore

Signed-off-by: Matthew Ballance <[email protected]>

Author: mballance

doc/Changelog.md

@@ -1,3 +1,5 @@
+## 0.9.5
+- (#237) - Add support for specifying cross-bins to ignore
 
 ## 0.9.4
 - (#233) - Propagate docstring and modulename across `randobj` inheritance

doc/source/coverage.rst

@@ -332,6 +332,41 @@ compose the coverpoint cross.
                 
                 self.cp1X2 = vsc.cross([self.cp1, self.cp2])
 
+Coverpoint Cross Ignore Bins
+............................
+
+Coverpoint cross-bins to ignore may be specified as follows.
+
+.. code-block:: python3
+    def filter(a, b):
+        v_set = (1, 2, 4, 8)
+        for i,v in enumerate(v_set):
+            b_set = v_set[i+1:]
+            if len(b_set) and a.intersect(v) and b.intersect(b_set):
+                print("Intersect: a: %s ; b: %s" % (str(a.range), str(b.range)))
+                return True
+        return False
+
+
+    @vsc.covergroup
+    class cg_t(object):
+        def __init__(self):
+            self.with_sample(dict(
+                a=vsc.int8_t(),
+                b=vsc.int8_t()))
+            self.cp_a = vsc.coverpoint(self.a, 
+                bins=dict(rng=vsc.bin_array([], 1, 2, 4, 8)))
+            self.cp_b = vsc.coverpoint(self.b, 
+                bins=dict(rng=vsc.bin_array([], 1, 2, 4, 8)))
+            self.cr = vsc.cross([self.cp_a, self.cp_b], ignore_bins=dict(b1=filter))
+
+The `ignore_bins` argument must be a dictionary of bin-name and filter-method.
+The filter function is invoked with a bin specification for each coverpoint
+in the cross-point. The function returns `True` if the specified bin 
+combination should be ignored and `False`` otherwise. In this case,
+bins where (b>a) are ignored.
+
+
 Specifying Coverpoint Sampling Conditions
 -----------------------------------------
 A sampling condition can be specified on both coverpoints and coverpoint

src/vsc/coverage.py

@@ -899,7 +899,8 @@ def __init__(self,
                  bins=None, 
                  options=None,
                  name=None,
-                 iff=None):
+                 iff=None,
+                 ignore_bins=None):
         for t in target_l:
             if not isinstance(t, coverpoint):
                 raise Exception("Cross target \"" + str(t) + "\" is not a coverpoint")
@@ -912,6 +913,7 @@ def __init__(self,
 
         self.iff_f = None
         self.iff = None
+        self.ignore_bins = ignore_bins
 
         if iff is not None:        
             with expr_mode():
@@ -946,7 +948,8 @@ def build_cov_model(self, parent, name):
             ret = CoverpointCrossModel(
                 name if self.name is None else self.name,
                 options,
-                iff)
+                iff,
+                self.ignore_bins)
 
             ret.srcinfo_decl = self.srcinfo_decl
 

src/vsc/model/coverpoint_bin_array_model.py

@@ -72,7 +72,7 @@ def dump(self, ind=""):
         pass
 
     def get_bin_range(self, bin_idx):
-        print("get_bin_range: " + str(bin_idx))
+        return (self.low+bin_idx,)
 
     def get_n_bins(self):
         return (self.high-self.low+1)

src/vsc/model/coverpoint_bin_collection_model.py

@@ -95,15 +95,14 @@ def sample(self):
         return self.hit_bin_idx
 
     def get_bin_range(self, idx):
-        print("get_bin_range: " + str(idx))
         b = None
         for i in range(len(self.bin_l)):
             b = self.bin_l[i]
             if b.get_n_bins() > idx:
                 break;
             idx -= b.get_n_bins()
-            
-        return b.get_bin_range(idx)
+        ret = b.get_bin_range(idx)
+        return ret
 
     def dump(self, ind=""):
         print(ind + "Bins " + self.name)

src/vsc/model/coverpoint_bin_enum_model.py

@@ -38,6 +38,9 @@ def finalize(self, bin_idx_base:int)->int:
 
     def get_bin_name(self, bin_idx):
         return self.name 
+    
+    def get_bin_range(self, bin_idx):
+        return (self.target_val,)
 
     def sample(self):
         # Query value from the actual coverpoint or expression

src/vsc/model/coverpoint_bin_model_base.py

@@ -56,6 +56,9 @@ def get_bin_expr(self, idx):
     def get_bin_name(self, bin_idx):
         raise NotImplementedError()
 
+    def get_bin_range(self, bin_idx):
+        raise NotImplementedError()
+    
     def sample(self):
         raise NotImplementedError("sample not implemented for " + str(type(self)))
 

src/vsc/model/coverpoint_bin_single_bag_model.py

@@ -71,6 +71,9 @@ def get_bin_expr(self, bin_idx):
 
     def get_bin_name(self, bin_idx):
         return self.name 
+    
+    def get_bin_range(self, bin_idx):
+        return self.binspec
 
     def sample(self):
         # Query value from the actual coverpoint or expression

src/vsc/model/coverpoint_bin_single_range_model.py

@@ -41,6 +41,9 @@ def get_bin_expr(self, bin_idx):
 
     def get_bin_name(self, bin_idx):
         return self.name 
+
+    def get_bin_range(self, bin_idx):
+        return ((self.target_val_low, self.target_val_high),)
 
     def sample(self):
         val = int(self.cp.get_val())

src/vsc/model/coverpoint_bin_single_val_model.py

@@ -34,7 +34,7 @@ def get_bin_expr(self, bin_idx):
 
     def get_bin_name(self, bin_idx):
         return self.name 
-    
+
     def sample(self):
         val = self.cp.get_val()
         if val == self.target_val:
@@ -48,8 +48,7 @@ def sample(self):
         return self.hit_bin_idx
 
     def get_bin_range(self, idx):
-        print("get_bin_range: " + str(idx))
-        return RangelistModel([self.target_val])
+        return (self.target_val,)
 
     def accept(self, v):
         v.visit_coverpoint_bin_single(self)