[pypy-commit] pypy vecopt-merge: Use .startswith() here, for the vecopt branch

arigo noreply at buildbot.pypy.org
Tue Aug 11 12:27:35 CEST 2015


Author: Armin Rigo <arigo at tunes.org>
Branch: vecopt-merge
Changeset: r78885:86e62bea7806
Date: 2015-08-11 11:14 +0100
http://bitbucket.org/pypy/pypy/changeset/86e62bea7806/

Log:	Use .startswith() here, for the vecopt branch

diff --git a/rpython/rlib/rvmprof/cintf.py b/rpython/rlib/rvmprof/cintf.py
--- a/rpython/rlib/rvmprof/cintf.py
+++ b/rpython/rlib/rvmprof/cintf.py
@@ -6,7 +6,7 @@
 from rpython.rtyper.tool import rffi_platform as platform
 
 from rpython.jit.backend import detect_cpu
-if detect_cpu.autodetect() != detect_cpu.MODEL_X86_64:
+if not detect_cpu.autodetect().startswith(detect_cpu.MODEL_X86_64):
     py.test.skip("rvmprof only supports x86-64 CPUs for now")
 
 
@@ -71,7 +71,7 @@
     func.c_name = cont_name
     func._dont_inline_ = True
 
-    assert detect_cpu.autodetect() == detect_cpu.MODEL_X86_64, (
+    assert detect_cpu.autodetect().startswith(detect_cpu.MODEL_X86_64), (
         "rvmprof only supports x86-64 CPUs for now")
 
     # mapping of argument count (not counting the final uid argument) to


More information about the pypy-commit mailing list