Merge pull request python#37 from tiran/perf-test

Author: pablogsal

Lib/test/test_perf_profiler.py

@@ -7,40 +7,35 @@
 from test import support
 from test.support.script_helper import make_script
 from test.support.os_helper import temp_dir
-from test.support import check_sanitizer
 
 
-def get_perf_version():
-    try:
-        cmd = ["perf", "version"]
-        proc = subprocess.run(
-            cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True
-        )
-    except (subprocess.SubprocessError, OSError):
-        raise unittest.SkipTest("Couldn't find perf on the path")
-    
-    version = proc.stdout
-
-    match = re.search(r"^perf version\s+(.*)", version)
-    if match is None:
-        raise Exception("unable to parse perf version: %r" % version)
-    return (version, match.group(1))
-
 if not support.has_subprocess_support:
     raise unittest.SkipTest("test module requires subprocess")
 
-
-_, version = get_perf_version()
-
-if not version:
-    raise unittest.SkipTest("Could not find valid perf tool")
-
-if "no-omit-frame-pointer" not in sysconfig.get_config_var("CFLAGS"):
+if "no-omit-frame-pointer" not in sysconfig.get_config_var("PY_CORE_CFLAGS"):
     raise unittest.SkipTest("Unwinding without frame pointer is unreliable")
 
-if check_sanitizer(address=True, memory=True, ub=True):
+if support.check_sanitizer(address=True, memory=True, ub=True):
     raise unittest.SkipTest("Perf unwinding doesn't work with sanitizers")
 
+def check_perf_command():
+    try:
+        cmd = ["perf", "--help"]
+        stdout = subprocess.check_output(
+            cmd, universal_newlines=True
+        )
+    except (subprocess.SubprocessError, OSError):
+        raise unittest.SkipTest("Couldn't find perf on the path")
+
+    # perf version does not return a version number on Fedora. Use presence
+    # of "perf.data" in help as indicator that it's perf from Linux tools.
+    if "perf.data" not in stdout:
+        raise unittest.SkipTest(
+            "perf command does not look like Linux tool perf"
+        )
+    
+check_perf_command()
+
 
 def run_perf(cwd, *args, **env_vars):
     if env_vars:

configure

@@ -3438,6 +3438,11 @@ AC_MSG_RESULT([$perf_trampoline])
 AS_VAR_IF([perf_trampoline], [yes], [
   AC_DEFINE([_PY_HAVE_PERF_TRAMPOLINE], [1], [Define to 1 if you have the perf trampoline.])
   PERF_TRAMPOLINE_OBJ=Objects/asm_trampoline.o
+
+  dnl perf needs frame pointers for unwinding, include compiler option in debug builds
+  AS_VAR_IF([Py_DEBUG], [true], [
+    AS_VAR_APPEND([BASECFLAGS], [" -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"])
+  ])
 ])
 AC_SUBST([PERF_TRAMPOLINE_OBJ])