[pypy-commit] pypy optresult-unroll: uncomment the part that checks cpumodel, but leave the note

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: optresult-unroll
Changeset: r79525:d5442e2f791a
Date: 2015-09-08 10:39 +0200
http://bitbucket.org/pypy/pypy/changeset/d5442e2f791a/

Log:	uncomment the part that checks cpumodel, but leave the note

diff --git a/pypy/module/__pypy__/__init__.py b/pypy/module/__pypy__/__init__.py
--- a/pypy/module/__pypy__/__init__.py
+++ b/pypy/module/__pypy__/__init__.py
@@ -116,17 +116,17 @@
         # proper fix would be to use some llop that is only rendered by the
         # JIT
         #
-        #try:
-        #    from rpython.jit.backend import detect_cpu
-        #    model = detect_cpu.autodetect()
-        #    self.extra_interpdef('cpumodel', 'space.wrap(%r)' % model)
-        #except Exception:
-        #    if self.space.config.translation.jit:
-        #        raise
-        #    else:
-        #        pass   # ok fine to ignore in this case
-        #
-        #if self.space.config.translation.jit:
-        ##    features = detect_cpu.getcpufeatures(model)
-        #    self.extra_interpdef('jit_backend_features',
-        #                            'space.wrap(%r)' % features)
+        try:
+            from rpython.jit.backend import detect_cpu
+            model = detect_cpu.autodetect()
+            self.extra_interpdef('cpumodel', 'space.wrap(%r)' % model)
+        except Exception:
+            if self.space.config.translation.jit:
+                raise
+            else:
+                pass   # ok fine to ignore in this case
+        
+        if self.space.config.translation.jit:
+            features = detect_cpu.getcpufeatures(model)
+            self.extra_interpdef('jit_backend_features',
+                                    'space.wrap(%r)' % features)