[Lldb-commits] [lldb] [lldb][test] Speed up TestGlobalModuleCache.py (PR #201561)
Raphael Isemann via lldb-commits
lldb-commits at lists.llvm.org
Mon Jun 8 01:51:22 PDT 2026
https://github.com/Teemperor updated https://github.com/llvm/llvm-project/pull/201561
>From 58c1ce27c6fae258ceadca50efb90a0f62e3b4c4 Mon Sep 17 00:00:00 2001
From: Raphael Isemann <rise at apple.com>
Date: Thu, 4 Jun 2026 13:12:12 +0100
Subject: [PATCH] [lldb][test] Speed up TestGlobalModuleCache.py
This patch reduces the runtime of TestGlobalModuleCache from 27s to
3-4s. There are three reasons for why the old test was slow:
* We did a sleep for 2s to ensure the source code file had a newer time
stamp and Make would rebuild the project. Instead, we now just age
all times on disk by 10s into the past to do the same thing. I'm not
sure how many other tests need to do this, but introducing a utility
method for forced in-place rebuild would be a good follow up.
* We additionally slept even for the first initial build, which wasn't
needed as there is nothing to rebuild.
* I removed some of the system includes in the source files which are
also not needed.
---
.../TestGlobalModuleCache.py | 52 ++++++++-----------
.../global_module_cache/one-print.c | 7 +--
.../global_module_cache/two-print.c | 8 +--
3 files changed, 27 insertions(+), 40 deletions(-)
diff --git a/lldb/test/API/python_api/global_module_cache/TestGlobalModuleCache.py b/lldb/test/API/python_api/global_module_cache/TestGlobalModuleCache.py
index 10f83a48b48d0..df11cbec716d6 100644
--- a/lldb/test/API/python_api/global_module_cache/TestGlobalModuleCache.py
+++ b/lldb/test/API/python_api/global_module_cache/TestGlobalModuleCache.py
@@ -9,7 +9,6 @@
from lldbsuite.test import lldbutil
import os
import shutil
-from pathlib import Path
import time
@@ -17,28 +16,29 @@ class GlobalModuleCacheTestCase(TestBase):
SHARED_BUILD_TESTCASE = False
# NO_DEBUG_INFO_TESTCASE = True
- def check_counter_var(self, thread, value):
- frame = thread.frames[0]
- var = frame.FindVariable("counter")
- self.assertTrue(var.GetError().Success(), "Got counter variable")
- self.assertEqual(var.GetValueAsUnsigned(), value, "This was one-print")
+ def check_counter_var(self, value):
+ self.expect_expr("counter", result_value=value)
def copy_to_main(self, src, dst):
- # We are relying on the source file being newer than the .o file from
- # a previous build, so sleep a bit here to ensure that the touch is later.
- time.sleep(2)
try:
- # Make sure dst is writeable before trying to write to it.
- subprocess.run(
- ["chmod", "777", dst],
- stdin=None,
- capture_output=False,
- encoding="utf-8",
- )
+ if os.path.exists(dst):
+ os.chmod(dst, 0o777)
shutil.copy(src, dst)
except:
self.fail(f"Could not copy {src} to {dst}")
- Path(dst).touch()
+ # Age all existing build artifacts in the build directory to 10 seconds
+ # in the past so that the just-copied dst and the objects produced from
+ # recompiling it are both seen as newer. This ensures a full recompile
+ # and relink of the project.
+ old_mtime = time.time() - 10
+ build_dir = self.getBuildDir()
+ for fname in os.listdir(build_dir):
+ fpath = os.path.join(build_dir, fname)
+ if fpath != dst:
+ try:
+ os.utime(fpath, (old_mtime, old_mtime))
+ except OSError:
+ pass
# The rerun tests indicate rerunning on Windows doesn't really work, so
# this one won't either.
@@ -87,11 +87,11 @@ def do_test(self, one_target, one_debugger):
self.build(dictionary={"C_SOURCES": main_c_path, "EXE": "a.out"})
(target, process, thread, bkpt) = lldbutil.run_to_source_breakpoint(
- self, "return counter;", main_filespec
+ self, "// break here", main_filespec
)
# Make sure we ran the version we intended here:
- self.check_counter_var(thread, 1)
+ self.check_counter_var("1")
process.Kill()
# Now copy two-print.c over main.c, rebuild, and rerun:
@@ -102,13 +102,9 @@ def do_test(self, one_target, one_debugger):
error = lldb.SBError()
if one_debugger:
if one_target:
- (_, process, thread, _) = lldbutil.run_to_breakpoint_do_run(
- self, target, bkpt
- )
+ lldbutil.run_to_breakpoint_do_run(self, target, bkpt)
else:
- (target2, process2, thread, bkpt) = lldbutil.run_to_source_breakpoint(
- self, "return counter;", main_filespec
- )
+ lldbutil.run_to_source_breakpoint(self, "// break here", main_filespec)
else:
if one_target:
new_debugger = lldb.SBDebugger().Create()
@@ -123,12 +119,10 @@ def cleanupDebugger(self):
self.old_debugger = None
self.addTearDownHook(cleanupDebugger)
- (target2, process2, thread, bkpt) = lldbutil.run_to_source_breakpoint(
- self, "return counter;", main_filespec
- )
+ lldbutil.run_to_source_breakpoint(self, "// break here", main_filespec)
# In two-print.c counter will be 2:
- self.check_counter_var(thread, 2)
+ self.check_counter_var("2")
# If we made two targets, destroy the first one, that should free up the
# unreachable Modules:
diff --git a/lldb/test/API/python_api/global_module_cache/one-print.c b/lldb/test/API/python_api/global_module_cache/one-print.c
index f008f36c2554e..e4641c1780d93 100644
--- a/lldb/test/API/python_api/global_module_cache/one-print.c
+++ b/lldb/test/API/python_api/global_module_cache/one-print.c
@@ -1,7 +1,4 @@
-#include <stdio.h>
-
+int counter = 1;
int main() {
- int counter = 0;
- printf("I only print one time: %d.\n", counter++);
- return counter;
+ return 0; // break here
}
diff --git a/lldb/test/API/python_api/global_module_cache/two-print.c b/lldb/test/API/python_api/global_module_cache/two-print.c
index 96f68cbed83c6..dfe61ceb28a1a 100644
--- a/lldb/test/API/python_api/global_module_cache/two-print.c
+++ b/lldb/test/API/python_api/global_module_cache/two-print.c
@@ -1,8 +1,4 @@
-#include <stdio.h>
-
+int counter = 2;
int main() {
- int counter = 0;
- printf("I print one time: %d.\n", counter++);
- printf("I print two times: %d.\n", counter++);
- return counter;
+ return 0; // break here
}
More information about the lldb-commits
mailing list