From d6eb7969a375af5fee411c5faa121220cb6885cc Mon Sep 17 00:00:00 2001
From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com>
Date: Thu, 2 Jan 2025 21:55:27 +0000
Subject: [PATCH 1/4] fix: earthfile

---
 barretenberg/acir_tests/Earthfile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/barretenberg/acir_tests/Earthfile b/barretenberg/acir_tests/Earthfile
index 37858e05097..6bf730639d3 100644
--- a/barretenberg/acir_tests/Earthfile
+++ b/barretenberg/acir_tests/Earthfile
@@ -5,10 +5,6 @@ test:
   WORKDIR /usr/src/barretenberg/acir_tests
   RUN ./bootstrap.sh ci
 
-benches-bb:
-  FROM ../../+bootstrap-noir-bb
-  WORKDIR /usr/src/barretenberg/acir_tests
-
 bench:
   # This target is used for debugging the benchmarking target.
   # For precise benchmarks in CI use `bench-publish`
@@ -17,7 +13,7 @@ bench:
 
 export-bench-acir-bb:
   ARG EARTHLY_GIT_HASH
-  FROM +benches-bb
+  FROM +test
   SAVE IMAGE aztecprotocol/barretenberg-acir-benches:$EARTHLY_GIT_HASH
 
 bench-publish:

From ead6eeab22926534c0edfcef893a480831350b05 Mon Sep 17 00:00:00 2001
From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com>
Date: Thu, 2 Jan 2025 22:23:42 +0000
Subject: [PATCH 2/4] chore: less building

---
 barretenberg/acir_tests/Earthfile    |  7 ++++++-
 barretenberg/acir_tests/bootstrap.sh | 17 +++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/barretenberg/acir_tests/Earthfile b/barretenberg/acir_tests/Earthfile
index 6bf730639d3..eff9239ae55 100644
--- a/barretenberg/acir_tests/Earthfile
+++ b/barretenberg/acir_tests/Earthfile
@@ -5,6 +5,11 @@ test:
   WORKDIR /usr/src/barretenberg/acir_tests
   RUN ./bootstrap.sh ci
 
+benches-bb:
+  FROM ../../+bootstrap-noir-bb
+  WORKDIR /usr/src/barretenberg/acir_tests
+  RUN ./bootstrap.sh prepare-benches
+
 bench:
   # This target is used for debugging the benchmarking target.
   # For precise benchmarks in CI use `bench-publish`
@@ -13,7 +18,7 @@ bench:
 
 export-bench-acir-bb:
   ARG EARTHLY_GIT_HASH
-  FROM +test
+  FROM +benches-bb
   SAVE IMAGE aztecprotocol/barretenberg-acir-benches:$EARTHLY_GIT_HASH
 
 bench-publish:
diff --git a/barretenberg/acir_tests/bootstrap.sh b/barretenberg/acir_tests/bootstrap.sh
index d51634cfeb8..6c56795ba72 100755
--- a/barretenberg/acir_tests/bootstrap.sh
+++ b/barretenberg/acir_tests/bootstrap.sh
@@ -4,10 +4,10 @@ source $(git rev-parse --show-toplevel)/ci3/source_bootstrap
 cmd=${1:-}
 export CRS_PATH=$HOME/.bb-crs
 
-function build_tests {
+function prepare_tests {
   set -eu
 
-  github_group "acir_tests build"
+  github_group "acir_tests copy tests"
 
   rm -rf acir_tests
   cp -R ../../noir/noir-repo/test_programs/execution_success acir_tests
@@ -16,6 +16,16 @@ function build_tests {
   # TODO(https://github.com/AztecProtocol/barretenberg/issues/1108): problem regardless the proof system used
   rm -rf acir_tests/regression_5045
 
+  github_endgroup
+}
+
+function build_tests {
+  set -eu
+
+  github_group "acir_tests build"
+
+  prepare_tests
+
   # COMPILE=2 only compiles the test.
   denoise "parallel --joblog joblog.txt --line-buffered 'COMPILE=2 ./run_test.sh \$(basename {})' ::: ./acir_tests/*"
 
@@ -154,6 +164,9 @@ case "$cmd" in
   "test")
     test
     ;;
+  "prepare-benches")
+    prepare_tests
+    ;;
   "test-cmds")
     test_cmds
     ;;

From e3fba63368e0e13ef6535b3a270f98ff58542cdd Mon Sep 17 00:00:00 2001
From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com>
Date: Thu, 2 Jan 2025 22:33:13 +0000
Subject: [PATCH 3/4] fix: add rebuild patterns for acir_tests

---
 barretenberg/acir_tests/.rebuild_patterns | 1 +
 barretenberg/acir_tests/bootstrap.sh      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 barretenberg/acir_tests/.rebuild_patterns

diff --git a/barretenberg/acir_tests/.rebuild_patterns b/barretenberg/acir_tests/.rebuild_patterns
new file mode 100644
index 00000000000..0a2c4767ab6
--- /dev/null
+++ b/barretenberg/acir_tests/.rebuild_patterns
@@ -0,0 +1 @@
+^barretenberg/acir_tests/
\ No newline at end of file
diff --git a/barretenberg/acir_tests/bootstrap.sh b/barretenberg/acir_tests/bootstrap.sh
index 6c56795ba72..676abc5e40c 100755
--- a/barretenberg/acir_tests/bootstrap.sh
+++ b/barretenberg/acir_tests/bootstrap.sh
@@ -54,7 +54,8 @@ function hash {
     ../../noir/.rebuild_patterns \
     ../../noir/.rebuild_patterns_tests \
     ../../barretenberg/cpp/.rebuild_patterns \
-    ../../barretenberg/ts/.rebuild_patterns
+    ../../barretenberg/ts/.rebuild_patterns \
+    ../../barretenberg/acir_tests/.rebuild_patterns
 }
 
 function test {

From 478afcb79e885aa6e022e1d36d7ffbb4c54196e0 Mon Sep 17 00:00:00 2001
From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com>
Date: Thu, 2 Jan 2025 22:49:01 +0000
Subject: [PATCH 4/4] fix

---
 barretenberg/acir_tests/bootstrap.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/barretenberg/acir_tests/bootstrap.sh b/barretenberg/acir_tests/bootstrap.sh
index 676abc5e40c..3c125b620c3 100755
--- a/barretenberg/acir_tests/bootstrap.sh
+++ b/barretenberg/acir_tests/bootstrap.sh
@@ -16,6 +16,9 @@ function prepare_tests {
   # TODO(https://github.com/AztecProtocol/barretenberg/issues/1108): problem regardless the proof system used
   rm -rf acir_tests/regression_5045
 
+  # COMPILE=2 only compiles the test.
+  denoise "parallel --joblog joblog.txt --line-buffered 'COMPILE=2 ./run_test.sh \$(basename {})' ::: ./acir_tests/*"
+
   github_endgroup
 }
 
@@ -26,8 +29,6 @@ function build_tests {
 
   prepare_tests
 
-  # COMPILE=2 only compiles the test.
-  denoise "parallel --joblog joblog.txt --line-buffered 'COMPILE=2 ./run_test.sh \$(basename {})' ::: ./acir_tests/*"
 
   # TODO: This actually breaks things, but shouldn't. We want to do it here and not maintain manually.
   # Regenerate verify_honk_proof recursive input.