gh-124613: Don't run perf tests in JIT builds

pablogsal · pablogsal · commit 14e6f7975ee2 · 2024-09-30T18:06:53.000+01:00
diff --git a/Lib/_pyrepl/unix_console.py b/Lib/_pyrepl/unix_console.py
@@ -118,12 +118,13 @@ def __init__(self):
 
         def register(self, fd, flag):
             self.fd = fd
+
         # note: The 'timeout' argument is received as *milliseconds*
         def poll(self, timeout: float | None = None) -> list[int]:
             if timeout is None:
                 r, w, e = select.select([self.fd], [], [])
             else:
-                r, w, e = select.select([self.fd], [], [], timeout/1000)
+                r, w, e = select.select([self.fd], [], [], timeout / 1000)
             return r
 
     poll = MinimalPoll  # type: ignore[assignment]
@@ -201,8 +202,7 @@ def _my_getstr(cap: str, optional: bool = False) -> bytes | None:
 
     def more_in_buffer(self) -> bool:
         return bool(
-            self.input_buffer
-            and self.input_buffer_pos < len(self.input_buffer)
+            self.input_buffer and self.input_buffer_pos < len(self.input_buffer)
         )
 
     def __read(self, n: int) -> bytes:
@@ -216,7 +216,6 @@ def __read(self, n: int) -> bytes:
             self.input_buffer_pos = 0
         return ret
 
-
     def change_encoding(self, encoding: str) -> None:
         """
         Change the encoding used for I/O operations.
@@ -342,8 +341,11 @@ def prepare(self):
         tcsetattr(self.input_fd, termios.TCSADRAIN, raw)
 
         # In macOS terminal we need to deactivate line wrap via ANSI escape code
-        if platform.system() == "Darwin" and os.getenv("TERM_PROGRAM") == "Apple_Terminal":
-            os.write(self.output_fd, b"\033[?7l")
+        # if (
+        #     platform.system() == "Darwin"
+        #     and os.getenv("TERM_PROGRAM") == "Apple_Terminal"
+        # ):
+        #     os.write(self.output_fd, b"\033[?7l")
 
         self.screen = []
         self.height, self.width = self.getheightwidth()
@@ -373,8 +375,11 @@ def restore(self):
         self.flushoutput()
         tcsetattr(self.input_fd, termios.TCSADRAIN, self.__svtermstate)
 
-        if platform.system() == "Darwin" and os.getenv("TERM_PROGRAM") == "Apple_Terminal":
-            os.write(self.output_fd, b"\033[?7h")
+        # if (
+        #     platform.system() == "Darwin"
+        #     and os.getenv("TERM_PROGRAM") == "Apple_Terminal"
+        # ):
+        #     os.write(self.output_fd, b"\033[?7h")
 
         if hasattr(self, "old_sigwinch"):
             signal.signal(signal.SIGWINCH, self.old_sigwinch)
@@ -448,14 +453,14 @@ def getheightwidth(self):
             - tuple: Height and width of the console.
             """
             try:
-                return int(os.environ["LINES"]), int(os.environ["COLUMNS"])
+                return int(os.environ["LINES"]), int(os.environ["COLUMNS"]) - 1
             except KeyError:
                 height, width = struct.unpack(
                     "hhhh", ioctl(self.input_fd, TIOCGWINSZ, b"\000" * 8)
                 )[0:2]
                 if not height:
                     return 25, 80
-                return height, width
+                return height, width - 1
 
     else:
 
diff --git a/Lib/test/test_perf_profiler.py b/Lib/test/test_perf_profiler.py
@@ -23,6 +23,17 @@
     raise unittest.SkipTest("test crash randomly on ASAN/MSAN/UBSAN build")
 
 
+def is_jit_build():
+    cflags = sysconfig.get_config_var("PY_CORE_CFLAGS")
+    if not cflags:
+        return False
+    return "_Py_JIT" in cflags
+
+
+if is_jit_build():
+    raise unittest.SkipTest("Perf support is not available in jit builds")
+
+
 def supports_trampoline_profiling():
     perf_trampoline = sysconfig.get_config_var("PY_HAVE_PERF_TRAMPOLINE")
     if not perf_trampoline:
@@ -229,7 +240,7 @@ def is_unwinding_reliable_with_frame_pointers():
     cflags = sysconfig.get_config_var("PY_CORE_CFLAGS")
     if not cflags:
         return False
-    return "no-omit-frame-pointer" in cflags and "_Py_JIT" not in cflags
+    return "no-omit-frame-pointer" in cflags
 
 
 def perf_command_works():
@@ -382,6 +393,7 @@ def baz(n):
             self.assertNotIn(f"py::bar:{script}", stdout)
             self.assertNotIn(f"py::baz:{script}", stdout)
 
+
 @unittest.skipUnless(perf_command_works(), "perf command doesn't work")
 @unittest.skipUnless(
     is_unwinding_reliable_with_frame_pointers(),
@@ -494,7 +506,9 @@ def _is_perf_version_at_least(major, minor):
 
 
 @unittest.skipUnless(perf_command_works(), "perf command doesn't work")
-@unittest.skipUnless(_is_perf_version_at_least(6, 6), "perf command may not work due to a perf bug")
+@unittest.skipUnless(
+    _is_perf_version_at_least(6, 6), "perf command may not work due to a perf bug"
+)
 class TestPerfProfilerWithDwarf(unittest.TestCase, TestPerfProfilerMixin):
     def run_perf(self, script_dir, script, activate_trampoline=True):
         if activate_trampoline:
