[Lldb-commits] [lldb] [lldb] Combine disassembler gtest binaries for efficiency (PR #133539)

[Reid Kleckner via lldb-commits]

https://github.com/rnk updated https://github.com/llvm/llvm-project/pull/133539

>From 1c16745d1779d91bcc0b34e1a82cc98e70def316 Mon Sep 17 00:00:00 2001
From: Reid Kleckner <r...@google.com>
Date: Fri, 28 Mar 2025 15:37:49 -0700
Subject: [PATCH 1/2] [lldb] Combine disassembler gtest binaries for efficiency

Each of these executables is 642MB for me locally with split DWARF, and
we don't need 3 statically linked gtest binaries when one will do.
---
 .../unittests/Disassembler/ARM/CMakeLists.txt | 12 ---------
 lldb/unittests/Disassembler/CMakeLists.txt    | 27 ++++++++++++++++---
 .../Disassembler/RISCV/CMakeLists.txt         | 12 ---------
 .../unittests/Disassembler/x86/CMakeLists.txt | 12 ---------
 4 files changed, 24 insertions(+), 39 deletions(-)
 delete mode 100644 lldb/unittests/Disassembler/ARM/CMakeLists.txt
 delete mode 100644 lldb/unittests/Disassembler/RISCV/CMakeLists.txt
 delete mode 100644 lldb/unittests/Disassembler/x86/CMakeLists.txt

diff --git a/lldb/unittests/Disassembler/ARM/CMakeLists.txt 
b/lldb/unittests/Disassembler/ARM/CMakeLists.txt
deleted file mode 100644
index 91af06fa19d6f..0000000000000
--- a/lldb/unittests/Disassembler/ARM/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-add_lldb_unittest(DisassemblerTests
-  TestArm64Disassembly.cpp
-  TestArmv7Disassembly.cpp
-  LINK_LIBS
-    lldbCore
-    lldbSymbol
-    lldbTarget
-    lldbPluginDisassemblerLLVMC
-    lldbPluginProcessUtility
-  LINK_COMPONENTS
-    Support
-    ${LLVM_TARGETS_TO_BUILD})
diff --git a/lldb/unittests/Disassembler/CMakeLists.txt 
b/lldb/unittests/Disassembler/CMakeLists.txt
index 208f1807427f4..4d443b69f29b1 100644
--- a/lldb/unittests/Disassembler/CMakeLists.txt
+++ b/lldb/unittests/Disassembler/CMakeLists.txt
@@ -1,11 +1,32 @@
+set(disas_srcs "")
+
 if("ARM" IN_LIST LLVM_TARGETS_TO_BUILD)
-  add_subdirectory(ARM)
+  set(disas_srcs ${disas_srcs}
+    ARM/TestArm64Disassembly.cpp
+    ARM/TestArmv7Disassembly.cpp
+  )
 endif()
 
 if("X86" IN_LIST LLVM_TARGETS_TO_BUILD)
-  add_subdirectory(x86)
+  set(disas_srcs ${disas_srcs}
+    x86/TestGetControlFlowKindx86.cpp
+  )
 endif()
 
 if("RISCV" IN_LIST LLVM_TARGETS_TO_BUILD)
-       add_subdirectory(RISCV)
+  set(disas_srcs ${disas_srcs}
+    RISCV/TestMCDisasmInstanceRISCV.cpp
+  )
 endif()
+
+add_lldb_unittest(DisassemblerTests
+  ${disas_srcs}
+  LINK_LIBS
+    lldbCore
+    lldbSymbol
+    lldbTarget
+    lldbPluginDisassemblerLLVMC
+    lldbPluginProcessUtility
+  LINK_COMPONENTS
+    Support
+    ${LLVM_TARGETS_TO_BUILD})
diff --git a/lldb/unittests/Disassembler/RISCV/CMakeLists.txt 
b/lldb/unittests/Disassembler/RISCV/CMakeLists.txt
deleted file mode 100644
index 5bcc3e948335c..0000000000000
--- a/lldb/unittests/Disassembler/RISCV/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-add_lldb_unittest(MCDisasmInstanceRISCVTests
-       TestMCDisasmInstanceRISCV.cpp
-    LINK_LIBS
-      lldbCore
-      lldbSymbol
-      lldbTarget
-      lldbPluginDisassemblerLLVMC
-      lldbPluginProcessUtility
-    LINK_COMPONENTS
-      Support
-      ${LLVM_TARGETS_TO_BUILD}
-  )
diff --git a/lldb/unittests/Disassembler/x86/CMakeLists.txt 
b/lldb/unittests/Disassembler/x86/CMakeLists.txt
deleted file mode 100644
index 31d84cf5d8365..0000000000000
--- a/lldb/unittests/Disassembler/x86/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-add_lldb_unittest(GetControlFlowKindx86Tests
-    TestGetControlFlowKindx86.cpp
-    LINK_LIBS
-      lldbCore
-      lldbSymbol
-      lldbTarget
-      lldbPluginDisassemblerLLVMC
-      lldbPluginProcessUtility
-    LINK_COMPONENTS
-      Support
-      ${LLVM_TARGETS_TO_BUILD}
-  )

>From ea81332c53b326b5d70844692b9a55845b09c23c Mon Sep 17 00:00:00 2001
From: Reid Kleckner <r...@google.com>
Date: Sun, 30 Mar 2025 14:49:38 -0700
Subject: [PATCH 2/2] use list(APPEND)

---
 lldb/unittests/Disassembler/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lldb/unittests/Disassembler/CMakeLists.txt 
b/lldb/unittests/Disassembler/CMakeLists.txt
index 4d443b69f29b1..81aff5902db74 100644
--- a/lldb/unittests/Disassembler/CMakeLists.txt
+++ b/lldb/unittests/Disassembler/CMakeLists.txt
@@ -1,20 +1,20 @@
 set(disas_srcs "")
 
 if("ARM" IN_LIST LLVM_TARGETS_TO_BUILD)
-  set(disas_srcs ${disas_srcs}
+  list(APPEND
     ARM/TestArm64Disassembly.cpp
     ARM/TestArmv7Disassembly.cpp
   )
 endif()
 
 if("X86" IN_LIST LLVM_TARGETS_TO_BUILD)
-  set(disas_srcs ${disas_srcs}
+  list(APPEND disas_srcs
     x86/TestGetControlFlowKindx86.cpp
   )
 endif()
 
 if("RISCV" IN_LIST LLVM_TARGETS_TO_BUILD)
-  set(disas_srcs ${disas_srcs}
+  list(APPEND disas_srcs
     RISCV/TestMCDisasmInstanceRISCV.cpp
   )
 endif()

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits