[pypy-commit] pypy ppc-vsx-support: use detect_vsx in ppc, not detect_simd_z

[plan_rich]

Author: Richard Plangger <planrichi at gmail.com>
Branch: ppc-vsx-support
Changeset: r87229:a19724e734a3
Date: 2016-09-19 15:30 +0200
http://bitbucket.org/pypy/pypy/changeset/a19724e734a3/

Log:	use detect_vsx in ppc, not detect_simd_z

diff --git a/rpython/jit/backend/ppc/vector_ext.py b/rpython/jit/backend/ppc/vector_ext.py
--- a/rpython/jit/backend/ppc/vector_ext.py
+++ b/rpython/jit/backend/ppc/vector_ext.py
@@ -20,7 +20,7 @@
 from rpython.jit.backend.llsupport.asmmemmgr import MachineDataBlockWrapper
 from rpython.rtyper.lltypesystem import lltype, rffi
 from rpython.jit.codewriter import longlong
-from rpython.jit.backend.zarch.detect_feature import detect_simd_z
+from rpython.jit.backend.ppc.detect_feature import detect_vsx
 from rpython.rlib.objectmodel import always_inline
 
 def not_implemented(msg):
@@ -85,7 +85,7 @@
 
 class AltiVectorExt(VectorExt):
     def setup_once(self, asm):
-        if detect_simd_z():
+        if detect_vsx():
             self.enable(16, accum=True)
             asm.setup_once_vector()
         self._setup = True
diff --git a/rpython/translator/platform/arch/s390x.py b/rpython/translator/platform/arch/s390x.py
--- a/rpython/translator/platform/arch/s390x.py
+++ b/rpython/translator/platform/arch/s390x.py
@@ -41,12 +41,7 @@
 def s390x_detect_vx():
     contentlist = []
     with open("/proc/cpuinfo", "rb") as fd:
-        while True:
-            snippet = fd.read(4096)
-            if not snippet:
-                break
-            contentlist.append(snippet)
-        content = ''.join(contentlist)
+        content = fd.read()
         start = content.find("features", 0)
         if start >= 0:
             after_colon = content.find(":", start)