From ede2ac510846d3f29c99095a6d0e771f0b0cd639 Mon Sep 17 00:00:00 2001
From: Joe Isaacs <joe.isaacs@live.co.uk>
Date: Wed, 15 Apr 2026 16:19:06 -0400
Subject: [PATCH 1/2] wip

Signed-off-by: Joe Isaacs <joe.isaacs@live.co.uk>
---
 .github/workflows/nightly-bench.yml  | 2 +-
 .github/workflows/sql-benchmarks.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/nightly-bench.yml b/.github/workflows/nightly-bench.yml
index fa8e46cb6b9..81578c685a2 100644
--- a/.github/workflows/nightly-bench.yml
+++ b/.github/workflows/nightly-bench.yml
@@ -48,4 +48,4 @@ jobs:
       matrix:
         machine_type:
           - id: x86
-            instance_name: c6id.8xlarge
+            instance_name: i7i.metal-24xl
diff --git a/.github/workflows/sql-benchmarks.yml b/.github/workflows/sql-benchmarks.yml
index 2492e3d35e4..b4e47710e58 100644
--- a/.github/workflows/sql-benchmarks.yml
+++ b/.github/workflows/sql-benchmarks.yml
@@ -9,7 +9,7 @@ on:
       machine_type:
         required: false
         type: string
-        default: c6id.8xlarge
+        default: i7i.metal-24xl
       benchmark_matrix:
         required: false
         type: string
@@ -109,7 +109,7 @@ jobs:
 
     runs-on: >-
       ${{ github.repository == 'vortex-data/vortex'
-          && format('runs-on={0}/runner=bench-dedicated/tag={1}{2}', github.run_id, matrix.id, (inputs.mode != 'pr' || github.event.pull_request.head.repo.fork == false) && '/extras=s3-cache' || '')
+          && format('runs-on={0}/runner=bench-dedicated/instance-type={1}/tag={2}{3}', github.run_id, inputs.machine_type, matrix.id, (inputs.mode != 'pr' || github.event.pull_request.head.repo.fork == false) && '/extras=s3-cache' || '')
           || 'ubuntu-latest' }}
     steps:
       - uses: runs-on/action@v2

From 824e3c485a468dda777b9abdb39cf5b3f06fac10 Mon Sep 17 00:00:00 2001
From: Joe Isaacs <joe.isaacs@live.co.uk>
Date: Wed, 15 Apr 2026 16:57:11 -0400
Subject: [PATCH 2/2] wip

Signed-off-by: Joe Isaacs <joe.isaacs@live.co.uk>
---
 scripts/bench-taskset.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/scripts/bench-taskset.sh b/scripts/bench-taskset.sh
index a86f6818ab3..4b8d362dd9c 100644
--- a/scripts/bench-taskset.sh
+++ b/scripts/bench-taskset.sh
@@ -18,12 +18,17 @@ fi
 
 
 if [[ -z "${BENCH_CPUS:-}" ]]; then
-    cpu_count="$(nproc)"
-    BENCH_CPUS="2-$((cpu_count - 1))"
+    if command -v numactl >/dev/null 2>&1; then
+        # All CPUs on NUMA node 0, skipping CPUs 0-1 to avoid OS interference
+        BENCH_CPUS=$(numactl --hardware | awk '/^node 0 cpus:/{sep=""; for(i=4;i<=NF;i++){if($i+0>1){printf "%s%s",sep,$i; sep=","}}}')
+    else
+        cpu_count="$(nproc)"
+        BENCH_CPUS="2-$((cpu_count - 1))"
+    fi
 fi
 
 if command -v numactl >/dev/null 2>&1; then
-    exec numactl --physcpubind="$BENCH_CPUS" --localalloc "$@"
+    exec numactl --physcpubind="$BENCH_CPUS" --membind=0 "$@"
 fi
 
 exec taskset -c "$BENCH_CPUS" "$@"