[hotfix] enable disabled micro-benchmarks

PullRequest: graalpython/162

Author: cosminbasca

mx.graalpython/mx_graalpython_bench_param.py

@@ -22,6 +22,7 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 import os
+
 import mx
 
 py = ".py"
@@ -101,13 +102,12 @@ def _compile_interop():
 # the python micro benchmarks
 #
 # ----------------------------------------------------------------------------------------------------------------------
-# TODO: commented out benchmarks are probably too slow atm, revisit this at a later time once performance picks up
 pythonMicroBenchmarks = {
     'arith-binop': [],
     'attribute-access': [],
     'attribute-access-polymorphic': [],
-    # 'attribute-bool': [],
-    # 'boolean-logic': [],
+    'attribute-bool': [],
+    'boolean-logic': [],
     'builtin-len': [],
     'builtin-len-tuple': [],
     'call-method-polymorphic': [],
@@ -121,11 +121,11 @@ def _compile_interop():
     'list-indexing': [],
     'list-iterating': [],
     'math-sqrt': [],
-    # 'object-allocate': [],
-    # 'object-layout-change': [],
-    # 'special-add': [],
-    # 'special-add-int': [],
-    # 'special-len': [],
+    'object-allocate': [],
+    'object-layout-change': [],
+    'special-add': [],
+    'special-add-int': [],
+    'special-len': [],
 }
 
 # XXX: testing

scripts/bench.sh

@@ -48,18 +48,18 @@ function info {
 
 function bench-py-hotspot {
     info "benchmarking GRAALPYTHON with HOTSPOT"
-    mx --dynamicimports /graal-enterprise benchmark micro-graalpython:*  --  --python-vm  graalpython  --python-vm-config default --jvm server --jvm-config default
+    mx --dynamicimports /compiler benchmark micro-graalpython:*  --  --python-vm  graalpython  --python-vm-config default --jvm server --jvm-config default
 }
 
 function bench-py-graal-core {
     info "benchmarking GRAALPYTHON with GRAAL-CORE"
-    mx --dynamicimports /graal-enterprise benchmark micro-graalpython:*  --  --python-vm  graalpython  --python-vm-config default --jvm server --jvm-config graal-core
+    mx --dynamicimports /compiler benchmark micro-graalpython:*  --  --python-vm  graalpython  --python-vm-config default --jvm server --jvm-config graal-core
 }
 
-function bench-py-graal-enterprise {
-    info "benchmarking GRAALPYTHON with GRAAL-ENTERPRISE"
-    mx --dynamicimports /graal-enterprise benchmark micro-graalpython:*  --  --python-vm  graalpython  --python-vm-config default --jvm server --jvm-config graal-enterprise
-}
+# function bench-py-graal-enterprise {
+#     info "benchmarking GRAALPYTHON with GRAAL-ENTERPRISE"
+#     mx --dynamicimports /compiler benchmark micro-graalpython:*  --  --python-vm  graalpython  --python-vm-config default --jvm server --jvm-config graal-enterprise
+# }
 
 function bench-cpython {
     info "benchmarking CPYTHON"
@@ -73,12 +73,11 @@ function bench-pypy {
 
 
 
-echo "If you are running this script for the first time, you may consider setting up your local env with <setup_bench_local.sh>"
-
-read -p "core, enterprise, hotspot, cpython, pypy? " vm
+# read -p "core, enterprise, hotspot, cpython, pypy? " vm
+read -p "core, hotspot, cpython, pypy? " vm
 case ${vm} in
     'core') bench-py-graal-core;;
-    'enterprise') bench-py-graal-enterprise;;
+    # 'enterprise') bench-py-graal-enterprise;;
     'hotspot') bench-py-hotspot;;
     'cpython') bench-cpython;;
     'pypy') bench-pypy;;