modify cnt analyzer test

Author: fukatani

pyverilog_toolbox/testcode/norm_cnt3.v

@@ -0,0 +1,29 @@
+module TOP(CLK, RSTN);
+  input CLK,RSTN;
+
+  reg [2:0] up_cnt;
+
+  always @(posedge CLK or negedge RSTN) begin
+    if(!RSTN) begin
+      up_cnt <= 0;
+    end else if(up_cnt >= 3'd5) begin
+      up_cnt <= 0;
+    end else begin
+      up_cnt <= up_cnt + 'd1;
+    end
+  end
+
+
+  reg now;
+  always @(posedge CLK or negedge RSTN) begin
+    if(!RSTN) begin
+      now <= 0;
+    end else if(up_cnt[1] == 'd2) begin
+      now <= 0;
+    end else begin
+      now <= 1;
+    end
+  end
+
+endmodule
+

pyverilog_toolbox/testcode/test_ra.py

@@ -91,9 +91,15 @@ def test_cnt_analyzer(self):
         c_analyzer.make_cnt_event_all()
         cnt_event_result = str(c_analyzer.cnt_dict['TOP.up_cnt'].cnt_event_dict).replace('"','')
 
-        self.assertEqual(set(c_analyzer.cnt_dict['TOP.up_cnt'].cnt_event_dict[2]),
-                        set(["TOP.now=TOP_now @(!((TOP_up_cnt=='d2)&&(TOP_up_cnt2=='d2)))",
-                        "TOP.now='d1 @((TOP_up_cnt=='d2)&&(TOP_up_cnt2=='d2))"]))
+        #maybe depend on funcdict
+        ok1 = (set(c_analyzer.cnt_dict['TOP.up_cnt'].cnt_event_dict[2]) ==
+                set(["TOP.now=TOP_now @(!((TOP_up_cnt=='d2)&&(TOP_up_cnt2=='d2)))",
+                "TOP.now='d1 @((TOP_up_cnt=='d2)&&(TOP_up_cnt2=='d2))"]))
+        ok2 = (set(c_analyzer.cnt_dict['TOP.up_cnt'].cnt_event_dict[2]) ==
+                set(["TOP.now=TOP_now @(!((TOP_up_cnt=='d2)&&(TOP_up_cnt2=='d2)))",
+                "TOP.now='d1 @(TOP_up_cnt==3'd2)"]))
+        self.assertTrue(ok1 or ok2)
+
         self.assertEqual(c_analyzer.cnt_dict['TOP.up_cnt'].cnt_event_dict[4],
                         ["TOP.now='d0 @(TOP_up_cnt==3'd4)"])
         self.assertEqual(set(c_analyzer.cnt_dict['TOP.up_cnt'].cnt_event_dict[5]),

pyverilog_toolbox/verify_tool/cnt_analyzer.py

@@ -281,27 +281,8 @@ def get_ope(self):
                 if len(ref_cnt) != 1:
                     raise Exception('Found redundunt condition description @' + term_name)
                 ref_cnt = tuple(ref_cnt)[0]
-                if ref_cnt.mother_node.operator in self.compare_ope:
-                    root_ope_info_dict[ref_cnt, value] = root_ope_info(ref_cnt.mother_node, 0, [1,], branch)
-                elif ref_cnt.mother_node.operator == 'Ulnot' and ref_cnt.mother_node.children()[0].operator in self.compare_ope:
-                    root_ope_info_dict[ref_cnt, value] = root_ope_info(ref_cnt.mother_node.children()[0], 0, [1,], branch)
-                elif isinstance(ref_cnt.mother_node, pyverilog.dataflow.dataflow.DFPartselect):
-                    if ref_cnt.mother_node.mother_node.operator in self.compare_ope:
-                        root_ope = ref_cnt.mother_node.mother_node
-                        cond_lsb = ref_cnt.mother_node.lsb
-                        inverted = False
-                    elif ref_cnt.mother_node.mother_node.operator == 'Ulnot' and \
-                        ref_cnt.mother_node.mother_node.children()[0].operator in self.compare_ope:
-                            root_ope = ref_cnt.mother_node.mother_node.children()[0]
-                            cond_lsb = ref_cnt.mother_node.children()[0].lsb
-                            inverted = True
-                    else:
-                        continue
-                    if ref_cnt.mother_node.msb == self.msb:
-                        diff_list = [1,]
-                    else:
-                        diff_list = [i for i in range(1,self.msb - ref_cnt.mother_node.msb)]
-                    root_ope_info_dict[ref_cnt, value] = root_ope_info(root_ope, cond_lsb, diff_list, branch)
+                root_ope = ref_cnt.mother_node
+                root_ope_info_dict[ref_cnt, value] = root_ope_info(root_ope, 0, [1,], branch)
 
             for ref_cnt, value in root_ope_info_dict.keys():
                 root_info = root_ope_info_dict[ref_cnt, value]
@@ -361,6 +342,6 @@ def calc_cnt_period(self):
         return 2 ** (self.msb + 1) - 1
 
 if __name__ == '__main__':
-    cnt_analyzer = CntAnalyzer("../testcode/norm_cnt2.v")
+    cnt_analyzer = CntAnalyzer("../testcode/norm_cnt3.v")
     cnt_analyzer.show()
 

setup.py

@@ -3,7 +3,7 @@
 import re
 import os
 
-version = '0.0.4'
+version = '0.0.5'
 
 def read(filename):
     return open(os.path.join(os.path.dirname(__file__), filename)).read()