PBVDDs are default now

Author: ckirsch

tools/bitme.py

@@ -90,7 +90,7 @@ def __init__(self, sid_line, value, var_line = None, bvdd = None, cflobvdd = Non
             assert sid_line.is_unsigned_value(value)
 
             if Values.BVDD:
-                self.bvdd = BVDD.BVDD.constant(value)
+                self.bvdd = BVDD.PBVDD.constant(value)
             if Values.CFLOBVDD:
                 self.cflobvdd = CFLOBVDD.CFLOBVDD.byte_constant(
                     Values.CFLOBVDD_level,
@@ -102,7 +102,7 @@ def __init__(self, sid_line, value, var_line = None, bvdd = None, cflobvdd = Non
             Values.total_number_of_constants += 1
         elif isinstance(var_line, Variable):
             if Values.BVDD:
-                self.bvdd = BVDD.BVDD.projection(var_line.input_index)
+                self.bvdd = BVDD.PBVDD.projection(var_line.input_index)
             if Values.CFLOBVDD:
                 self.cflobvdd = CFLOBVDD.CFLOBVDD.byte_projection(
                     Values.CFLOBVDD_level,
@@ -1799,9 +1799,9 @@ def main():
                 bmc(bitwuzla_solver, kmin, kmax, args)
 
         if Values.BVDD:
-            BVDD.BVDD.print_profile()
+            BVDD.PBVDD.print_profile()
         if Values.CFLOBVDD:
-            BVDD.BVDD.print_profile()
+            BVDD.PBVDD.print_profile()
             CFLOBVDD.CFLOBVDD.print_profile()
 
     print_separator('#')

tools/bvdd.py

@@ -1106,10 +1106,10 @@ def compute_ternary(self, op, bvdd2, bvdd3, op_id = None, ternary = None):
     def print_profile():
         BVDD.print_profile()
         print("PBVDD cache profile:")
-        print(f"unary operators:      {utilization(PBVDD_cached.compute_unary_hits, len(PBVDD_cached.compute_unary_cache))}")
-        print(f"binary operators:     {utilization(PBVDD_cached.compute_binary_hits, len(PBVDD_cached.compute_binary_cache))}")
-        print(f"ite operators:        {utilization(PBVDD_cached.compute_ite_hits, len(PBVDD_cached.compute_ite_cache))}")
-        print(f"ternary operators:    {utilization(PBVDD_cached.compute_ternary_hits, len(PBVDD_cached.compute_ternary_cache))}")
+        print(f"unary operators:   {utilization(PBVDD_cached.compute_unary_hits, len(PBVDD_cached.compute_unary_cache))}")
+        print(f"binary operators:  {utilization(PBVDD_cached.compute_binary_hits, len(PBVDD_cached.compute_binary_cache))}")
+        print(f"ite operators:     {utilization(PBVDD_cached.compute_ite_hits, len(PBVDD_cached.compute_ite_cache))}")
+        print(f"ternary operators: {utilization(PBVDD_cached.compute_ternary_hits, len(PBVDD_cached.compute_ternary_cache))}")
 
 class PBVDD(PBVDD_cached):
     pass