From dd064a39549c99c40bfea5d1d317005c38df445f Mon Sep 17 00:00:00 2001 From: justiceadams Date: Wed, 26 Mar 2025 10:40:56 -0700 Subject: [PATCH 1/4] update lldb-matrix to run on apple SI --- zorg/jenkins/jobs/jobs/lldb-cmake-matrix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/zorg/jenkins/jobs/jobs/lldb-cmake-matrix b/zorg/jenkins/jobs/jobs/lldb-cmake-matrix index cecf560d3..abf8d34b1 100644 --- a/zorg/jenkins/jobs/jobs/lldb-cmake-matrix +++ b/zorg/jenkins/jobs/jobs/lldb-cmake-matrix @@ -6,7 +6,7 @@ pipeline { } parameters { - string(name: 'LABEL', defaultValue: params.LABEL ?: 'macos-x86_64', description: 'Node label to run on') + string(name: 'LABEL', defaultValue: params.LABEL ?: 'macos-arm64', description: 'Node label to run on') string(name: 'GIT_SHA', defaultValue: params.GIT_REVISION ?: '*/main', description: 'Git commit to build.') @@ -21,7 +21,7 @@ pipeline { } } environment { - MATRIX_COMMON_BUILD_PARAMETERS = '--cmake-flag=-DLLVM_TARGETS_TO_BUILD=X86' + MATRIX_COMMON_BUILD_PARAMETERS = '--cmake-flag=-DLLVM_TARGETS_TO_BUILD=AArch64' PATH="$PATH:/usr/bin:/usr/local/bin" } stages { @@ -102,7 +102,7 @@ pipeline { --runtimes="libcxx;libcxxabi;libunwind" \ --cmake-type=Release \ --dotest-flag="--skip-category gmodules" \ - --dotest-flag="--arch=x86_64" + --dotest-flag="--arch=aarch64" ''' script { def LLDB = new org.swift.LLDB() @@ -129,11 +129,11 @@ pipeline { --dotest-flag="gmodules" \ --dotest-flag="--skip-category" \ --dotest-flag="watchpoint" \ - --dotest-flag="--skip-category" \ - --dotest-flag="llgs" \ - --dotest-flag="--skip-category" \ - --dotest-flag="debugserver" \ - --dotest-flag="--arch=x86_64" \ + --dotest-flag="--skip-category" \ + --dotest-flag="llgs" \ + --dotest-flag="--skip-category" \ + --dotest-flag="debugserver" \ + --dotest-flag="--arch=aarch64" \ --dotest-flag="--dwarf-version=2" # Give the system some time to recover. @@ -165,7 +165,7 @@ pipeline { --dotest-flag="llgs" \ --dotest-flag="--skip-category" \ --dotest-flag="debugserver" \ - --dotest-flag="--arch=x86_64" \ + --dotest-flag="--arch=aarch64" \ --dotest-flag="--dwarf-version=4" # Give the system some time to recover. @@ -197,7 +197,7 @@ pipeline { --dotest-flag="llgs" \ --dotest-flag="--skip-category" \ --dotest-flag="debugserver" \ - --dotest-flag="--arch=x86_64" \ + --dotest-flag="--arch=aarch64" \ --dotest-flag="--dwarf-version=5" # Give the system some time to recover. @@ -266,7 +266,7 @@ pipeline { --dotest-flag="llgs" \ --dotest-flag="--skip-category" \ --dotest-flag="debugserver" \ - --dotest-flag="--arch=x86_64" + --dotest-flag="--arch=aarch64" # Give the system some time to recover. sleep 120 @@ -336,7 +336,7 @@ pipeline { --dotest-flag="llgs" \ --dotest-flag="--skip-category" \ --dotest-flag="debugserver" \ - --dotest-flag="--arch=x86_64" + --dotest-flag="--arch=aarch64" # Give the system some time to recover. sleep 120 From 03d4adcc307783286cb656e14bf254544cc1f30d Mon Sep 17 00:00:00 2001 From: justiceadams Date: Wed, 26 Mar 2025 10:41:03 -0700 Subject: [PATCH 2/4] update lldb-sanitized to run on apple SI --- zorg/jenkins/jobs/jobs/lldb-cmake-sanitized | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zorg/jenkins/jobs/jobs/lldb-cmake-sanitized b/zorg/jenkins/jobs/jobs/lldb-cmake-sanitized index 2152aca21..ed46692b3 100644 --- a/zorg/jenkins/jobs/jobs/lldb-cmake-sanitized +++ b/zorg/jenkins/jobs/jobs/lldb-cmake-sanitized @@ -5,7 +5,7 @@ pipeline { } parameters { - string(name: 'LABEL', defaultValue: params.LABEL ?: 'macos-x86_64', description: 'Node label to run on') + string(name: 'LABEL', defaultValue: params.LABEL ?: 'macos-arm64', description: 'Node label to run on') string(name: 'GIT_SHA', defaultValue: params.GIT_REVISION ?: '*/main', description: 'Git commit to build.') From 369c7180f9d55b65298ef51ea848021b4c9a6a41 Mon Sep 17 00:00:00 2001 From: justiceadams Date: Wed, 26 Mar 2025 10:51:57 -0700 Subject: [PATCH 3/4] update targets to include x86 and arm64 --- zorg/jenkins/jobs/jobs/lldb-cmake-matrix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zorg/jenkins/jobs/jobs/lldb-cmake-matrix b/zorg/jenkins/jobs/jobs/lldb-cmake-matrix index abf8d34b1..c0279fa38 100644 --- a/zorg/jenkins/jobs/jobs/lldb-cmake-matrix +++ b/zorg/jenkins/jobs/jobs/lldb-cmake-matrix @@ -21,7 +21,7 @@ pipeline { } } environment { - MATRIX_COMMON_BUILD_PARAMETERS = '--cmake-flag=-DLLVM_TARGETS_TO_BUILD=AArch64' + MATRIX_COMMON_BUILD_PARAMETERS = '--cmake-flag=-DLLVM_TARGETS_TO_BUILD=X86;AArch64' PATH="$PATH:/usr/bin:/usr/local/bin" } stages { From 68dc163cf06dbbcc616934cbd45fffb95e52b579 Mon Sep 17 00:00:00 2001 From: justiceadams Date: Wed, 26 Mar 2025 16:44:41 -0700 Subject: [PATCH 4/4] --arch=arm64 --- zorg/jenkins/jobs/jobs/lldb-cmake-matrix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zorg/jenkins/jobs/jobs/lldb-cmake-matrix b/zorg/jenkins/jobs/jobs/lldb-cmake-matrix index c0279fa38..f7d223800 100644 --- a/zorg/jenkins/jobs/jobs/lldb-cmake-matrix +++ b/zorg/jenkins/jobs/jobs/lldb-cmake-matrix @@ -102,7 +102,7 @@ pipeline { --runtimes="libcxx;libcxxabi;libunwind" \ --cmake-type=Release \ --dotest-flag="--skip-category gmodules" \ - --dotest-flag="--arch=aarch64" + --dotest-flag="--arch=arm64" ''' script { def LLDB = new org.swift.LLDB() @@ -133,7 +133,7 @@ pipeline { --dotest-flag="llgs" \ --dotest-flag="--skip-category" \ --dotest-flag="debugserver" \ - --dotest-flag="--arch=aarch64" \ + --dotest-flag="--arch=arm64" \ --dotest-flag="--dwarf-version=2" # Give the system some time to recover. @@ -165,7 +165,7 @@ pipeline { --dotest-flag="llgs" \ --dotest-flag="--skip-category" \ --dotest-flag="debugserver" \ - --dotest-flag="--arch=aarch64" \ + --dotest-flag="--arch=arm64" \ --dotest-flag="--dwarf-version=4" # Give the system some time to recover. @@ -197,7 +197,7 @@ pipeline { --dotest-flag="llgs" \ --dotest-flag="--skip-category" \ --dotest-flag="debugserver" \ - --dotest-flag="--arch=aarch64" \ + --dotest-flag="--arch=arm64" \ --dotest-flag="--dwarf-version=5" # Give the system some time to recover. @@ -266,7 +266,7 @@ pipeline { --dotest-flag="llgs" \ --dotest-flag="--skip-category" \ --dotest-flag="debugserver" \ - --dotest-flag="--arch=aarch64" + --dotest-flag="--arch=arm64" # Give the system some time to recover. sleep 120 @@ -336,7 +336,7 @@ pipeline { --dotest-flag="llgs" \ --dotest-flag="--skip-category" \ --dotest-flag="debugserver" \ - --dotest-flag="--arch=aarch64" + --dotest-flag="--arch=arm64" # Give the system some time to recover. sleep 120