https://github.com/medismailben updated https://github.com/llvm/llvm-project/pull/94553
>From 46eb924da3dcee4b43f22f0002cc21d3c01fb2f3 Mon Sep 17 00:00:00 2001 From: Med Ismail Bennani <ism...@bennani.ma> Date: Tue, 4 Jun 2024 20:36:53 -0700 Subject: [PATCH 1/2] [lldb/crashlog] Remove aarch64 requirement on crashlog tests This patch removes the `target-aarch64` requirement on the crashlog tests. Signed-off-by: Med Ismail Bennani <ism...@bennani.ma> --- .../Python/Crashlog/app_specific_backtrace_crashlog.test | 2 +- .../Python/Crashlog/interactive_crashlog_invalid_target.test | 2 +- .../Python/Crashlog/interactive_crashlog_json.test | 2 +- .../Python/Crashlog/interactive_crashlog_legacy.test | 2 +- .../Python/Crashlog/last_exception_backtrace_crashlog.test | 2 +- .../Python/Crashlog/skipped_status_interactive_crashlog.test | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/app_specific_backtrace_crashlog.test b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/app_specific_backtrace_crashlog.test index 430febb096252..9c0510c34ccae 100644 --- a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/app_specific_backtrace_crashlog.test +++ b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/app_specific_backtrace_crashlog.test @@ -1,4 +1,4 @@ -# REQUIRES: python, native && target-aarch64 && system-darwin +# REQUIRES: python, native && system-darwin # RUN: mkdir -p %t.dir # RUN: yaml2obj %S/Inputs/application_specific_info/asi.yaml > %t.dir/asi diff --git a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/interactive_crashlog_invalid_target.test b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/interactive_crashlog_invalid_target.test index abd1e7c3da53d..eb1f5f456a2dc 100644 --- a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/interactive_crashlog_invalid_target.test +++ b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/interactive_crashlog_invalid_target.test @@ -1,4 +1,4 @@ -# REQUIRES: python, native && target-aarch64 && system-darwin +# REQUIRES: python, native && system-darwin # RUN: %lldb -o 'command script import lldb.macosx.crashlog' \ # RUN: -o 'crashlog -V' \ diff --git a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/interactive_crashlog_json.test b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/interactive_crashlog_json.test index fccd71ce31f73..684be2846f78d 100644 --- a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/interactive_crashlog_json.test +++ b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/interactive_crashlog_json.test @@ -1,4 +1,4 @@ -# REQUIRES: python, native && target-aarch64 && system-darwin +# REQUIRES: python, native && system-darwin # RUN: mkdir -p %t.dir # RUN: yaml2obj %S/Inputs/interactive_crashlog/multithread-test.yaml > %t.dir/multithread-test diff --git a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/interactive_crashlog_legacy.test b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/interactive_crashlog_legacy.test index 6e2826e88aedf..271a4c2aa90f4 100644 --- a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/interactive_crashlog_legacy.test +++ b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/interactive_crashlog_legacy.test @@ -1,4 +1,4 @@ -# REQUIRES: python, native && target-aarch64 && system-darwin +# REQUIRES: python, native && system-darwin # RUN: mkdir -p %t.dir # RUN: yaml2obj %S/Inputs/interactive_crashlog/multithread-test.yaml > %t.dir/multithread-test diff --git a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/last_exception_backtrace_crashlog.test b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/last_exception_backtrace_crashlog.test index fa857ac0e84f1..a17b7ac18a620 100644 --- a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/last_exception_backtrace_crashlog.test +++ b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/last_exception_backtrace_crashlog.test @@ -1,4 +1,4 @@ -# REQUIRES: python, native && target-aarch64 && system-darwin +# REQUIRES: python, native && system-darwin # RUN: mkdir -p %t.dir # RUN: yaml2obj %S/Inputs/application_specific_info/asi.yaml > %t.dir/asi diff --git a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/skipped_status_interactive_crashlog.test b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/skipped_status_interactive_crashlog.test index 81e06868eaee7..64cd0904371aa 100644 --- a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/skipped_status_interactive_crashlog.test +++ b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/skipped_status_interactive_crashlog.test @@ -1,4 +1,4 @@ -# REQUIRES: python, native && target-aarch64 && system-darwin +# REQUIRES: python, native && system-darwin # RUN: mkdir -p %t.dir # RUN: yaml2obj %S/Inputs/interactive_crashlog/multithread-test.yaml > %t.dir/multithread-test >From dd9c8265fa320443e0a9db332118193ed2aa4cf4 Mon Sep 17 00:00:00 2001 From: Med Ismail Bennani <ism...@bennani.ma> Date: Thu, 6 Jun 2024 09:58:24 -0700 Subject: [PATCH 2/2] [lldb/crashlog] Make image loading in tests single-threaded This patch has a temporary fix for a non-deterministic deadlock when loading crashlog images in parallel, by making it single-threaded. Also given that dSYMForUUID is disabled on the CI (following f8afa763c619), this shouldn't cause any noticeable slowdown while running the test suite. Signed-off-by: Med Ismail Bennani <ism...@bennani.ma> --- lldb/examples/python/crashlog.py | 3 +++ .../test/Shell/ScriptInterpreter/Python/Crashlog/lit.local.cfg | 3 +++ 2 files changed, 6 insertions(+) diff --git a/lldb/examples/python/crashlog.py b/lldb/examples/python/crashlog.py index 5281d6d949baf..1c0d717ce455c 100755 --- a/lldb/examples/python/crashlog.py +++ b/lldb/examples/python/crashlog.py @@ -1814,6 +1814,9 @@ def SymbolicateCrashLogs(debugger, command_args, result, is_command): ) ) + if "NO_PARALLEL_IMG_LOADING" in os.environ: + options.no_parallel_image_loading = True + if options.version: print(debugger.GetVersionString()) return diff --git a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/lit.local.cfg b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/lit.local.cfg index 3da9265b3553d..b72b294198931 100644 --- a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/lit.local.cfg +++ b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/lit.local.cfg @@ -5,3 +5,6 @@ if 'lldb-repro' in config.available_features: config.unsupported = True config.environment["LLDB_APPLE_DSYMFORUUID_EXECUTABLE"] = "" + +# Temporary parallel image loading deadlock workaround +config.environment["NO_PARALLEL_IMG_LOADING"] = "" _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits