Use of 'eq' greatly improves performance.

3 files changed, 281 insertions, 252 deletions

diff --git a/data/property/cnes/CNE_01700.pro b/data/property/cnes/CNE_01700.pro
index bc83c8c..edbb622 100644
--- a/data/property/cnes/CNE_01700.pro
+++ b/data/property/cnes/CNE_01700.pro
@@ -5,36 +5,41 @@
    (and
       (not (string_matches [identifier [is_waveform_of x_re]] ".*_re"))
       (exists x waveform
-         (exists x_r1 waveform
-            (and
-               (exists ps2 process
-                  (and
-                     (is_in_sensitivity_list x_r1 ps2)
-                     (is_in_sensitivity_list x ps2)
-                     (is_accessed_by x_re ps2)
-                     (CTL_verifies ps2
-                        (AF
-                           (and
-                              (expr_writes x_re)
-                              (is_read_element "0" "and")
-                              (or
-                                 (and
-                                    (is_read_structure "(?(??)?)")
-                                    (is_read_element "1" "not")
-                                    (is_read_element "2" x_r1)
-                                    (is_read_element "3" x)
-                                 )
-                                 (and
-                                    (is_read_structure "(??(??))")
-                                    (is_read_element "1" x)
-                                    (is_read_element "2" "not")
-                                    (is_read_element "3" x_r1)
+         (and
+            (not (eq x x_re))
+            (exists x_r1 waveform
+               (and
+                  (not (eq x_r1 x_re))
+                  (not (eq x_r1 x))
+                  (exists ps2 process
+                     (and
+                        (is_in_sensitivity_list x_r1 ps2)
+                        (is_in_sensitivity_list x ps2)
+                        (is_accessed_by x_re ps2)
+                        (CTL_verifies ps2
+                           (AF
+                              (and
+                                 (expr_writes x_re)
+                                 (is_read_element "0" "and")
+                                 (or
+                                    (and
+                                       (is_read_structure "(?(??)?)")
+                                       (is_read_element "1" "not")
+                                       (is_read_element "2" x_r1)
+                                       (is_read_element "3" x)
+                                    )
+                                    (and
+                                       (is_read_structure "(??(??))")
+                                       (is_read_element "1" x)
+                                       (is_read_element "2" "not")
+                                       (is_read_element "3" x_r1)
+                                    )
                                  )
-                              )
-                              (AX
-                                 (not
-                                    (EF
-                                       (expr_writes x_r1)
+                                 (AX
+                                    (not
+                                       (EF
+                                          (expr_writes x_r1)
+                                       )
                                     )
                                  )
                               )
@@ -42,38 +47,41 @@
                         )
                      )
                   )
-               )
-               (exists ps1 process
-                  (and
-                     (is_accessed_by x_r1 ps1)
-                     (is_accessed_by x ps1)
-                     (is_explicit_process ps1)
-                     (exists clk1 waveform
-                        (and
-                           (is_in_sensitivity_list clk1 ps1)
-                           (or
-                              (CTL_verifies ps1
-                                 (AF
-                                    (and
-                                       (kind "if")
-                                       (is_read_structure "(??)")
-                                       (or
-                                          (is_read_element "0" "falling_edge")
-                                          (is_read_element "0" "rising_edge")
-                                       )
-                                       (is_read_element "1" clk1)
-                                       (EX
-                                          (and
-                                             (has_option "cond_was_true")
-                                             (does_not_reach_parent_before
-                                                (and
-                                                   (expr_writes x_r1)
-                                                   (is_read_structure "?")
-                                                   (is_read_element "0" x)
-                                                   (AX
-                                                      (not
-                                                         (EF
-                                                            (expr_writes x_r1)
+                  (exists ps1 process
+                     (and
+                        (is_accessed_by x_r1 ps1)
+                        (is_accessed_by x ps1)
+                        (is_explicit_process ps1)
+                        (exists clk1 waveform
+                           (and
+                              (is_in_sensitivity_list clk1 ps1)
+                              (not (eq clk1 x_re))
+                              (not (eq clk1 x))
+                              (not (eq clk1 x_r1))
+                              (or
+                                 (CTL_verifies ps1
+                                    (AF
+                                       (and
+                                          (kind "if")
+                                          (is_read_structure "(??)")
+                                          (or
+                                             (is_read_element "0" "falling_edge")
+                                             (is_read_element "0" "rising_edge")
+                                          )
+                                          (is_read_element "1" clk1)
+                                          (EX
+                                             (and
+                                                (has_option "cond_was_true")
+                                                (does_not_reach_parent_before
+                                                   (and
+                                                      (expr_writes x_r1)
+                                                      (is_read_structure "?")
+                                                      (is_read_element "0" x)
+                                                      (AX
+                                                         (not
+                                                            (EF
+                                                               (expr_writes x_r1)
+                                                            )
                                                          )
                                                       )
                                                    )
@@ -83,39 +91,43 @@
                                        )
                                     )
                                  )
-                              )
-                              (exists rst1 waveform
-                                 (and
-                                    (is_in_sensitivity_list rst1 ps1)
-                                    (CTL_verifies ps1
-                                       (AF
-                                          (and
-                                             (kind "if")
-                                             (is_read_structure "(???)")
-                                             (is_read_element "0" "=")
-                                             (is_read_element _ rst1)
-                                             (EX
-                                                (and
-                                                   (not (has_option "cond_was_true"))
-                                                   (kind "if")
-                                                   (is_read_structure "(??)")
-                                                   (or
-                                                      (is_read_element "0" "falling_edge")
-                                                      (is_read_element "0" "rising_edge")
-                                                   )
-                                                   (is_read_element "1" clk1)
-                                                   (EX
-                                                      (and
-                                                         (has_option "cond_was_true")
-                                                         (does_not_reach_parent_before
-                                                            (and
-                                                               (expr_writes x_r1)
-                                                               (is_read_structure "?")
-                                                               (is_read_element "0" x)
-                                                               (AX
-                                                                  (not
-                                                                     (EF
-                                                                        (expr_writes x_r1)
+                                 (exists rst1 waveform
+                                    (and
+                                       (is_in_sensitivity_list rst1 ps1)
+                                       (not (eq rst1 x_re))
+                                       (not (eq rst1 x))
+                                       (not (eq rst1 x_r1))
+                                       (not (eq rst1 clk1))
+                                       (CTL_verifies ps1
+                                          (AF
+                                             (and
+                                                (kind "if")
+                                                (is_read_structure "(???)")
+                                                (is_read_element "0" "=")
+                                                (is_read_element _ rst1)
+                                                (EX
+                                                   (and
+                                                      (not (has_option "cond_was_true"))
+                                                      (kind "if")
+                                                      (is_read_structure "(??)")
+                                                      (or
+                                                         (is_read_element "0" "falling_edge")
+                                                         (is_read_element "0" "rising_edge")
+                                                      )
+                                                      (is_read_element "1" clk1)
+                                                      (EX
+                                                         (and
+                                                            (has_option "cond_was_true")
+                                                            (does_not_reach_parent_before
+                                                               (and
+                                                                  (expr_writes x_r1)
+                                                                  (is_read_structure "?")
+                                                                  (is_read_element "0" x)
+                                                                  (AX
+                                                                     (not
+                                                                        (EF
+                                                                           (expr_writes x_r1)
+                                                                        )
                                                                      )
                                                                   )
                                                                )
diff --git a/data/property/cnes/CNE_01800.pro b/data/property/cnes/CNE_01800.pro
index 6895f85..521cd8a 100644
--- a/data/property/cnes/CNE_01800.pro
+++ b/data/property/cnes/CNE_01800.pro
@@ -5,36 +5,41 @@
    (and
       (not (string_matches [identifier [is_waveform_of x_fe]] ".*_fe"))
       (exists x waveform
-         (exists x_r1 waveform
-            (and
-               (exists ps2 process
-                  (and
-                     (is_in_sensitivity_list x_r1 ps2)
-                     (is_in_sensitivity_list x ps2)
-                     (is_accessed_by x_fe ps2)
-                     (CTL_verifies ps2
-                        (AF
-                           (and
-                              (expr_writes x_fe)
-                              (is_read_element "0" "and")
-                              (or
-                                 (and
-                                    (is_read_structure "(?(??)?)")
-                                    (is_read_element "1" "not")
-                                    (is_read_element "2" x)
-                                    (is_read_element "3" x_r1)
-                                 )
-                                 (and
-                                    (is_read_structure "(??(??))")
-                                    (is_read_element "1" x_r1)
-                                    (is_read_element "2" "not")
-                                    (is_read_element "3" x)
+         (and
+            (not (eq x x_fe))
+            (exists x_r1 waveform
+               (and
+                  (not (eq x_r1 x_fe))
+                  (not (eq x_r1 x))
+                  (exists ps2 process
+                     (and
+                        (is_in_sensitivity_list x_r1 ps2)
+                        (is_in_sensitivity_list x ps2)
+                        (is_accessed_by x_fe ps2)
+                        (CTL_verifies ps2
+                           (AF
+                              (and
+                                 (expr_writes x_fe)
+                                 (is_read_element "0" "and")
+                                 (or
+                                    (and
+                                       (is_read_structure "(?(??)?)")
+                                       (is_read_element "1" "not")
+                                       (is_read_element "2" x)
+                                       (is_read_element "3" x_r1)
+                                    )
+                                    (and
+                                       (is_read_structure "(??(??))")
+                                       (is_read_element "1" x_r1)
+                                       (is_read_element "2" "not")
+                                       (is_read_element "3" x)
+                                    )
                                  )
-                              )
-                              (AX
-                                 (not
-                                    (EF
-                                       (expr_writes x_r1)
+                                 (AX
+                                    (not
+                                       (EF
+                                          (expr_writes x_r1)
+                                       )
                                     )
                                  )
                               )
@@ -42,38 +47,38 @@
                         )
                      )
                   )
-               )
-               (exists ps1 process
-                  (and
-                     (is_accessed_by x_r1 ps1)
-                     (is_accessed_by x ps1)
-                     (is_explicit_process ps1)
-                     (exists clk1 waveform
-                        (and
-                           (is_in_sensitivity_list clk1 ps1)
-                           (or
-                              (CTL_verifies ps1
-                                 (AF
-                                    (and
-                                       (kind "if")
-                                       (is_read_structure "(??)")
-                                       (or
-                                          (is_read_element "0" "falling_edge")
-                                          (is_read_element "0" "rising_edge")
-                                       )
-                                       (is_read_element "1" clk1)
-                                       (EX
-                                          (and
-                                             (has_option "cond_was_true")
-                                             (does_not_reach_parent_before
-                                                (and
-                                                   (expr_writes x_r1)
-                                                   (is_read_structure "?")
-                                                   (is_read_element "0" x)
-                                                   (AX
-                                                      (not
-                                                         (EF
-                                                            (expr_writes x_r1)
+                  (exists ps1 process
+                     (and
+                        (is_accessed_by x_r1 ps1)
+                        (is_accessed_by x ps1)
+                        (is_explicit_process ps1)
+                        (exists clk1 waveform
+                           (and
+                              (is_in_sensitivity_list clk1 ps1)
+                              (or
+                                 (CTL_verifies ps1
+                                    (AF
+                                       (and
+                                          (kind "if")
+                                          (is_read_structure "(??)")
+                                          (or
+                                             (is_read_element "0" "falling_edge")
+                                             (is_read_element "0" "rising_edge")
+                                          )
+                                          (is_read_element "1" clk1)
+                                          (EX
+                                             (and
+                                                (has_option "cond_was_true")
+                                                (does_not_reach_parent_before
+                                                   (and
+                                                      (expr_writes x_r1)
+                                                      (is_read_structure "?")
+                                                      (is_read_element "0" x)
+                                                      (AX
+                                                         (not
+                                                            (EF
+                                                               (expr_writes x_r1)
+                                                            )
                                                          )
                                                       )
                                                    )
@@ -83,39 +88,43 @@
                                        )
                                     )
                                  )
-                              )
-                              (exists rst1 waveform
-                                 (and
-                                    (is_in_sensitivity_list rst1 ps1)
-                                    (CTL_verifies ps1
-                                       (AF
-                                          (and
-                                             (kind "if")
-                                             (is_read_structure "(???)")
-                                             (is_read_element "0" "=")
-                                             (is_read_element _ rst1)
-                                             (EX
-                                                (and
-                                                   (not (has_option "cond_was_true"))
-                                                   (kind "if")
-                                                   (is_read_structure "(??)")
-                                                   (or
-                                                      (is_read_element "0" "falling_edge")
-                                                      (is_read_element "0" "rising_edge")
-                                                   )
-                                                   (is_read_element "1" clk1)
-                                                   (EX
-                                                      (and
-                                                         (has_option "cond_was_true")
-                                                         (does_not_reach_parent_before
-                                                            (and
-                                                               (expr_writes x_r1)
-                                                               (is_read_structure "?")
-                                                               (is_read_element "0" x)
-                                                               (AX
-                                                                  (not
-                                                                     (EF
-                                                                        (expr_writes x_r1)
+                                 (exists rst1 waveform
+                                    (and
+                                       (is_in_sensitivity_list rst1 ps1)
+                                       (not (eq rst1 x_fe))
+                                       (not (eq rst1 x))
+                                       (not (eq rst1 x_r1))
+                                       (not (eq rst1 clk1))
+                                       (CTL_verifies ps1
+                                          (AF
+                                             (and
+                                                (kind "if")
+                                                (is_read_structure "(???)")
+                                                (is_read_element "0" "=")
+                                                (is_read_element _ rst1)
+                                                (EX
+                                                   (and
+                                                      (not (has_option "cond_was_true"))
+                                                      (kind "if")
+                                                      (is_read_structure "(??)")
+                                                      (or
+                                                         (is_read_element "0" "falling_edge")
+                                                         (is_read_element "0" "rising_edge")
+                                                      )
+                                                      (is_read_element "1" clk1)
+                                                      (EX
+                                                         (and
+                                                            (has_option "cond_was_true")
+                                                            (does_not_reach_parent_before
+                                                               (and
+                                                                  (expr_writes x_r1)
+                                                                  (is_read_structure "?")
+                                                                  (is_read_element "0" x)
+                                                                  (AX
+                                                                     (not
+                                                                        (EF
+                                                                           (expr_writes x_r1)
+                                                                        )
                                                                      )
                                                                   )
                                                                )
diff --git a/data/property/cnes/CNE_01900.pro b/data/property/cnes/CNE_01900.pro
index 0e11415..6e2beff 100644
--- a/data/property/cnes/CNE_01900.pro
+++ b/data/property/cnes/CNE_01900.pro
@@ -5,37 +5,42 @@
    (and
       (not (string_matches [identifier [is_waveform_of x_r]] ".*_r[0-9]*"))
       (exists x waveform
-         (exists ps1 process
-            (and
-               (is_accessed_by x_r ps1)
-               (is_accessed_by x ps1)
-               (is_explicit_process ps1)
-               (exists clk1 waveform
-                  (and
-                     (is_in_sensitivity_list clk1 ps1)
-                     (or
-                        (CTL_verifies ps1
-                           (AF
-                              (and
-                                 (kind "if")
-                                 (is_read_structure "(??)")
-                                 (or
-                                    (is_read_element "0" "falling_edge")
-                                    (is_read_element "0" "rising_edge")
-                                 )
-                                 (is_read_element "1" clk1)
-                                 (EX
-                                    (and
-                                       (has_option "cond_was_true")
-                                       (does_not_reach_parent_before
-                                          (and
-                                             (expr_writes x_r)
-                                             (is_read_structure "?")
-                                             (is_read_element "0" x)
-                                             (AX
-                                                (not
-                                                   (EF
-                                                      (expr_writes x_r)
+         (and
+            (not (eq x x_r))
+            (exists ps1 process
+               (and
+                  (is_accessed_by x_r ps1)
+                  (is_accessed_by x ps1)
+                  (is_explicit_process ps1)
+                  (exists clk1 waveform
+                     (and
+                        (is_in_sensitivity_list clk1 ps1)
+                        (not (eq clk1 x_r))
+                        (not (eq clk1 x))
+                        (or
+                           (CTL_verifies ps1
+                              (AF
+                                 (and
+                                    (kind "if")
+                                    (is_read_structure "(??)")
+                                    (or
+                                       (is_read_element "0" "falling_edge")
+                                       (is_read_element "0" "rising_edge")
+                                    )
+                                    (is_read_element "1" clk1)
+                                    (EX
+                                       (and
+                                          (has_option "cond_was_true")
+                                          (does_not_reach_parent_before
+                                             (and
+                                                (expr_writes x_r)
+                                                (is_read_structure "?")
+                                                (is_read_element "0" x)
+                                                (AX
+                                                   (not
+                                                      (EF
+                                                         (expr_writes x_r)
+                                                      )
                                                    )
                                                 )
                                              )
@@ -45,39 +50,42 @@
                                  )
                               )
                            )
-                        )
-                        (exists rst1 waveform
-                           (and
-                              (is_in_sensitivity_list rst1 ps1)
-                              (CTL_verifies ps1
-                                 (AF
-                                    (and
-                                       (kind "if")
-                                       (is_read_structure "(???)")
-                                       (is_read_element "0" "=")
-                                       (is_read_element _ rst1)
-                                       (EX
-                                          (and
-                                             (not (has_option "cond_was_true"))
-                                             (kind "if")
-                                             (is_read_structure "(??)")
-                                             (or
-                                                (is_read_element "0" "falling_edge")
-                                                (is_read_element "0" "rising_edge")
-                                             )
-                                             (is_read_element "1" clk1)
-                                             (EX
-                                                (and
-                                                   (has_option "cond_was_true")
-                                                   (does_not_reach_parent_before
-                                                      (and
-                                                         (expr_writes x_r)
-                                                         (is_read_structure "?")
-                                                         (is_read_element "0" x)
-                                                         (AX
-                                                            (not
-                                                               (EF
-                                                                  (expr_writes x_r)
+                           (exists rst1 waveform
+                              (and
+                                 (is_in_sensitivity_list rst1 ps1)
+                                 (not (eq rst1 x_r))
+                                 (not (eq rst1 x))
+                                 (not (eq rst1 clk1))
+                                 (CTL_verifies ps1
+                                    (AF
+                                       (and
+                                          (kind "if")
+                                          (is_read_structure "(???)")
+                                          (is_read_element "0" "=")
+                                          (is_read_element _ rst1)
+                                          (EX
+                                             (and
+                                                (not (has_option "cond_was_true"))
+                                                (kind "if")
+                                                (is_read_structure "(??)")
+                                                (or
+                                                   (is_read_element "0" "falling_edge")
+                                                   (is_read_element "0" "rising_edge")
+                                                )
+                                                (is_read_element "1" clk1)
+                                                (EX
+                                                   (and
+                                                      (has_option "cond_was_true")
+                                                      (does_not_reach_parent_before
+                                                         (and
+                                                            (expr_writes x_r)
+                                                            (is_read_structure "?")
+                                                            (is_read_element "0" x)
+                                                            (AX
+                                                               (not
+                                                                  (EF
+                                                                     (expr_writes x_r)
+                                                                  )
                                                                )
                                                             )
                                                          )