scratch/elisp-benchmarks 9df4eede3a4 25/54: Revert "Make `comp-speed' explicit in each benchmark"

[Pip Cet]

branch: scratch/elisp-benchmarks
commit 9df4eede3a4828d0b9d44a725293345c67e46b63
Author: Andrea Corallo <akrl@sdf.org>
Commit: Andrea Corallo <akrl@sdf.org>

    Revert "Make `comp-speed' explicit in each benchmark"
    
    This reverts commit f5834702781b61ca4db2d008ade984cedd5d7ef7.
    
    Reason: we prefer to have comp-speed not explicit in benchmarks when
    possible.
---
 benchmarks/benchmarks/bubble-no-cons.el     | 4 ----
 benchmarks/benchmarks/bubble.el             | 4 ----
 benchmarks/benchmarks/dhrystone.el          | 4 ----
 benchmarks/benchmarks/fibn-rec.el           | 4 ----
 benchmarks/benchmarks/fibn-tc.el            | 4 ----
 benchmarks/benchmarks/fibn.el               | 4 ----
 benchmarks/benchmarks/flet.el               | 4 ----
 benchmarks/benchmarks/inclist-type-hints.el | 4 ----
 benchmarks/benchmarks/inclist.el            | 4 ----
 benchmarks/benchmarks/listlen-tc.el         | 4 ----
 benchmarks/benchmarks/map-closure.el        | 4 ----
 benchmarks/benchmarks/nbody.el              | 4 ----
 benchmarks/benchmarks/pcase.el              | 6 +-----
 benchmarks/benchmarks/pidigits.el           | 4 ----
 benchmarks/elisp-benchmarks.el              | 3 +++
 15 files changed, 4 insertions(+), 57 deletions(-)

diff --git a/benchmarks/benchmarks/bubble-no-cons.el 
b/benchmarks/benchmarks/bubble-no-cons.el
index 941b734f076..85bd8f59474 100644
--- a/benchmarks/benchmarks/bubble-no-cons.el
+++ b/benchmarks/benchmarks/bubble-no-cons.el
@@ -43,7 +43,3 @@
           do (elb-bubble-no-cons l)))
 
 (provide 'elb-bubble)
-
-;; Local Variables:
-;; comp-speed: 3
-;; End:
diff --git a/benchmarks/benchmarks/bubble.el b/benchmarks/benchmarks/bubble.el
index 5b7400a4b5a..d7101b1b99b 100644
--- a/benchmarks/benchmarks/bubble.el
+++ b/benchmarks/benchmarks/bubble.el
@@ -46,7 +46,3 @@
           do (elb-bubble l)))
 
 (provide 'elb-bubble)
-
-;; Local Variables:
-;; comp-speed: 3
-;; End:
diff --git a/benchmarks/benchmarks/dhrystone.el 
b/benchmarks/benchmarks/dhrystone.el
index 3cd09a85c9f..a3bce4b3905 100644
--- a/benchmarks/benchmarks/dhrystone.el
+++ b/benchmarks/benchmarks/dhrystone.el
@@ -303,7 +303,3 @@
   (dhrystone 1000000))
 
 (provide 'elb-dhrystone)
-
-;; Local Variables:
-;; comp-speed: 3
-;; End:
diff --git a/benchmarks/benchmarks/fibn-rec.el 
b/benchmarks/benchmarks/fibn-rec.el
index c61cadae7d4..a8e4b6c9681 100644
--- a/benchmarks/benchmarks/fibn-rec.el
+++ b/benchmarks/benchmarks/fibn-rec.el
@@ -31,7 +31,3 @@
   (elb-fib 37))
 
 (provide 'fibn-rec)
-
-;; Local Variables:
-;; comp-speed: 3
-;; End:
diff --git a/benchmarks/benchmarks/fibn-tc.el b/benchmarks/benchmarks/fibn-tc.el
index 4e97e79391b..83d571beee7 100644
--- a/benchmarks/benchmarks/fibn-tc.el
+++ b/benchmarks/benchmarks/fibn-tc.el
@@ -33,7 +33,3 @@
           do (elb-fibn-tc 1 0 80)))
 
 (provide 'fibn-tc)
-
-;; Local Variables:
-;; comp-speed: 3
-;; End:
diff --git a/benchmarks/benchmarks/fibn.el b/benchmarks/benchmarks/fibn.el
index 9a1449a785c..af53477600b 100644
--- a/benchmarks/benchmarks/fibn.el
+++ b/benchmarks/benchmarks/fibn.el
@@ -38,7 +38,3 @@
   (elb-fibn 3000000 80))
 
 (provide 'elb-fibn)
-
-;; Local Variables:
-;; comp-speed: 3
-;; End:
diff --git a/benchmarks/benchmarks/flet.el b/benchmarks/benchmarks/flet.el
index 6bd57437746..032980b8bf2 100644
--- a/benchmarks/benchmarks/flet.el
+++ b/benchmarks/benchmarks/flet.el
@@ -39,7 +39,3 @@
           do (elb-flet elb-flet-list)))
 
 (provide 'elb-flet)
-
-;; Local Variables:
-;; comp-speed: 3
-;; End:
diff --git a/benchmarks/benchmarks/inclist-type-hints.el 
b/benchmarks/benchmarks/inclist-type-hints.el
index 3f6d8db1359..660f4e44ecf 100644
--- a/benchmarks/benchmarks/inclist-type-hints.el
+++ b/benchmarks/benchmarks/inclist-type-hints.el
@@ -42,7 +42,3 @@
   (let ((l (copy-sequence elb-inclist-th-no-type-hints-list)))
     (cl-loop repeat 10000
             do (elb-inclist-th l))))
-
-;; Local Variables:
-;; comp-speed: 3
-;; End:
diff --git a/benchmarks/benchmarks/inclist.el b/benchmarks/benchmarks/inclist.el
index 1560d1e3bd1..63837cbfaeb 100644
--- a/benchmarks/benchmarks/inclist.el
+++ b/benchmarks/benchmarks/inclist.el
@@ -40,7 +40,3 @@
             do (elb-inclist l))))
 
 (provide 'elb-inclist)
-
-;; Local Variables:
-;; comp-speed: 3
-;; End:
diff --git a/benchmarks/benchmarks/listlen-tc.el 
b/benchmarks/benchmarks/listlen-tc.el
index 871f687719a..977605d5fe8 100644
--- a/benchmarks/benchmarks/listlen-tc.el
+++ b/benchmarks/benchmarks/listlen-tc.el
@@ -41,7 +41,3 @@
             do (elb-listlen-tc elb-listlen-tc-list 0))))
 
 (provide 'listlen-tc)
-
-;; Local Variables:
-;; comp-speed: 3
-;; End:
diff --git a/benchmarks/benchmarks/map-closure.el 
b/benchmarks/benchmarks/map-closure.el
index 84eb863894a..30fed05cc26 100644
--- a/benchmarks/benchmarks/map-closure.el
+++ b/benchmarks/benchmarks/map-closure.el
@@ -42,7 +42,3 @@
           do (elb-map-closure elb-map-closure-list)))
 
 (provide 'elb-map-closure)
-
-;; Local Variables:
-;; comp-speed: 3
-;; End:
diff --git a/benchmarks/benchmarks/nbody.el b/benchmarks/benchmarks/nbody.el
index 2beff229210..e53e50daca7 100644
--- a/benchmarks/benchmarks/nbody.el
+++ b/benchmarks/benchmarks/nbody.el
@@ -140,7 +140,3 @@
   (elb-nbody 300000))
 
 (provide 'elb-nbody)
-
-;; Local Variables:
-;; comp-speed: 3
-;; End:
diff --git a/benchmarks/benchmarks/pcase.el b/benchmarks/benchmarks/pcase.el
index 5bb0e36280e..110027accde 100644
--- a/benchmarks/benchmarks/pcase.el
+++ b/benchmarks/benchmarks/pcase.el
@@ -29,7 +29,7 @@
   ;;
   ;; We should probably change GNUmakefile instead so it doesn't forcefully
   ;; add the directory to `load-path', e.g. make this dependent on the
-  ;; presence of special file like `.dont-add-to-load-path'.
+  ;; presence of special file like `.dont-add-to-load-path'. 
   (when load-file-name
     (setq load-path (remove (file-name-directory load-file-name) load-path))))
 
@@ -66,7 +66,3 @@
           do (elb-pcase elb-pcase-list)))
 
 (provide 'elb-pcase)
-
-;; Local Variables:
-;; comp-speed: 3
-;; End:
diff --git a/benchmarks/benchmarks/pidigits.el 
b/benchmarks/benchmarks/pidigits.el
index 2e24c6241d3..1254dd93602 100644
--- a/benchmarks/benchmarks/pidigits.el
+++ b/benchmarks/benchmarks/pidigits.el
@@ -70,7 +70,3 @@
           do (elb-pidigits 500)))
 
 (provide 'elb-pidigits)
-
-;; Local Variables:
-;; comp-speed: 3
-;; End:
diff --git a/benchmarks/elisp-benchmarks.el b/benchmarks/elisp-benchmarks.el
index 66bb6f0fa9f..0d7eaaac944 100644
--- a/benchmarks/elisp-benchmarks.el
+++ b/benchmarks/elisp-benchmarks.el
@@ -97,6 +97,9 @@ RECOMPILE all the benchmark folder when non nil."
                                       collect (file-name-base f))
                          (mapcar #'file-name-base sources))
           initially
+          (when native-comp
+            (require 'comp)
+            (setf comp-speed 3))
           ;; Compile
           (when recompile
             (mapc (lambda (f)