From 5277c1435bf81b2af6be7808b2a9a71e81fb5552 Mon Sep 17 00:00:00 2001
From: Dale Black <djblack@uci.edu>
Date: Fri, 27 Dec 2024 11:52:22 -0800
Subject: [PATCH] run full benchmark suite

---
 .buildkite/runbenchmarks.yml | 90 ++++++++++++++++++------------------
 benchmarks/setup.jl          |  7 +--
 2 files changed, 47 insertions(+), 50 deletions(-)

diff --git a/.buildkite/runbenchmarks.yml b/.buildkite/runbenchmarks.yml
index 38760d5..ffd498e 100644
--- a/.buildkite/runbenchmarks.yml
+++ b/.buildkite/runbenchmarks.yml
@@ -107,27 +107,27 @@ steps:
           BENCHMARK_GROUP: CUDA
         timeout_in_minutes: 12
 
-      # - label: "AMDGPU: Run Benchmarks"
-      #   key: "amdgpu-benchmarks"
-      #   plugins:
-      #     - JuliaCI/julia#v1:
-      #         version: "1.10"
-      #   command: |
-      #     julia --project=benchmarks -e '
-      #         using Pkg;
-      #         Pkg.instantiate();
-      #         Pkg.develop(path=pwd());
-      #         Pkg.add("AMDGPU");
-      #     '
-      #     julia --project=benchmarks benchmarks/runbenchmarks.jl
-      #   artifacts:
-      #     - "benchmarks/results/AMDGPUbenchmarks.json"
-      #   agents:
-      #     queue: "juliagpu"
-      #     rocm: "*"
-      #   env:
-      #     BENCHMARK_GROUP: AMDGPU
-      #   timeout_in_minutes: 12
+      - label: "AMDGPU: Run Benchmarks"
+        key: "amdgpu-benchmarks"
+        plugins:
+          - JuliaCI/julia#v1:
+              version: "1.10"
+        command: |
+          julia --project=benchmarks -e '
+              using Pkg;
+              Pkg.instantiate();
+              Pkg.develop(path=pwd());
+              Pkg.add("AMDGPU");
+          '
+          julia --project=benchmarks benchmarks/runbenchmarks.jl
+        artifacts:
+          - "benchmarks/results/AMDGPUbenchmarks.json"
+        agents:
+          queue: "juliagpu"
+          rocm: "*"
+        env:
+          BENCHMARK_GROUP: AMDGPU
+        timeout_in_minutes: 12
 
       - label: "oneAPI: Run Benchmarks"
         key: "oneapi-benchmarks"
@@ -151,28 +151,28 @@ steps:
           BENCHMARK_GROUP: oneAPI
         timeout_in_minutes: 12
 
-      # - label: "Metal: Run Benchmarks"
-      #   key: "metal-benchmarks"
-      #   plugins:
-      #     - JuliaCI/julia#v1:
-      #         version: "1.10"
-      #   command: |
-      #     julia --project=benchmarks -e '
-      #         using Pkg;
-      #         Pkg.instantiate();
-      #         Pkg.develop(path=pwd());
-      #         Pkg.add("Metal");
-      #     '
-      #     julia --project=benchmarks benchmarks/runbenchmarks.jl
-      #   artifacts:
-      #     - "benchmarks/results/Metalbenchmarks.json"
-      #   agents:
-      #     queue: "juliaecosystem"
-      #     os: "macos"
-      #     arch: "arm64"
-      #   env:
-      #     BENCHMARK_GROUP: Metal
-      #   timeout_in_minutes: 12
+      - label: "Metal: Run Benchmarks"
+        key: "metal-benchmarks"
+        plugins:
+          - JuliaCI/julia#v1:
+              version: "1.10"
+        command: |
+          julia --project=benchmarks -e '
+              using Pkg;
+              Pkg.instantiate();
+              Pkg.develop(path=pwd());
+              Pkg.add("Metal");
+          '
+          julia --project=benchmarks benchmarks/runbenchmarks.jl
+        artifacts:
+          - "benchmarks/results/Metalbenchmarks.json"
+        agents:
+          queue: "juliaecosystem"
+          os: "macos"
+          arch: "arm64"
+        env:
+          BENCHMARK_GROUP: Metal
+        timeout_in_minutes: 12
 
       - wait: ~ # Wait for all benchmarks to finish
 
@@ -185,8 +185,8 @@ steps:
           - "cpu-benchmarks-8"
           - "cuda-benchmarks"
           - "oneapi-benchmarks"
-          # - "amdgpu-benchmarks"
-          # - "metal-benchmarks"
+          - "amdgpu-benchmarks"
+          - "metal-benchmarks"
         plugins:
           - JuliaCI/julia#v1:
               version: "1.10"
diff --git a/benchmarks/setup.jl b/benchmarks/setup.jl
index f0b759f..b47e31b 100644
--- a/benchmarks/setup.jl
+++ b/benchmarks/setup.jl
@@ -25,11 +25,8 @@ elseif BENCHMARK_GROUP == "oneAPI"
 end
 
 function setup_benchmarks(suite::BenchmarkGroup, backend::String, num_cpu_threads::Int64)
-    # sizes_2D = [2^i for i in 3:12]
-    # sizes_3D = [2^i for i in 0:8]
-
-    sizes_2D = [2^i for i in 3:6]
-    sizes_3D = [2^i for i in 0:3]
+    sizes_2D = [2^i for i in 3:12]
+    sizes_3D = [2^i for i in 0:8]
 
     if backend == "CPU"
         # 2D benchmarks