Use c2-standard-60

iree-org · Sep 25, 2023 · 62a5446 · 62a5446
1 parent 835c3a4
commit 62a5446
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 5 deletions.
diff --git a/.github/workflows/run_comparative_benchmark.yml b/.github/workflows/run_comparative_benchmark.yml
@@ -189,18 +189,18 @@ jobs:
 #              "${RESULTS_PATH}"
 #          gcloud storage cp "${RESULTS_PATH}" "${RESULTS_GCS_DIR}/"
 
-  benchmark_on_c2-standard-16:
+  benchmark_on_c2-standard-60:
     needs: [setup, build_xla_tools]
     timeout-minutes: 1440
     runs-on:
       - self-hosted  # must come first
       - runner-group=${{ needs.setup.outputs.runner-group }}
       - environment=prod
-      - machine-type=c2-standard-16
+      - machine-type=c2-standard-60
     env:
       BENCHMARK_GCS_DIR: ${{ needs.setup.outputs.benchmark-gcs-dir }}
       RESULTS_DIR: results-dir
-      TARGET_DEVICE: c2-standard-16
+      TARGET_DEVICE: c2-standard-60
       XLA_TOOLS_DIR: ${{ needs.build_xla_tools.outputs.xla-tools-dir }}
       XLA_TOOLS_DIR_ARCHIVE: ${{ needs.build_xla_tools.outputs.xla-tools-dir-archive }}
       XLA_TOOLS_DIR_GCS_ARTIFACT: ${{ needs.build_xla_tools.outputs.xla-tools-dir-gcs-artifact }}

diff --git a/common_benchmark_suite/openxla/benchmark/devices/gcp_devices.py b/common_benchmark_suite/openxla/benchmark/devices/gcp_devices.py
@@ -32,4 +32,18 @@
     },
 )
 
-ALL_DEVICES = [GCP_A2_HIGHGPU_1G, GCP_C2_STANDARD_16]
+GCP_C2_STANDARD_60 = def_types.DeviceSpec(
+    name="c2-standard-60",
+    host_type="gcp",
+    host_model="c2-standard-60",
+    host_environment="linux-x86_64",
+    accelerator_type="cpu",
+    accelerator_model="intel-cascadelake",
+    accelerator_architecture="x86_64-cascadelake",
+    accelerator_attributes={
+        "num_of_cores": 30,
+        "hyper-threading": False,
+    },
+)
+
+ALL_DEVICES = [GCP_A2_HIGHGPU_1G, GCP_C2_STANDARD_16, GCP_C2_STANDARD_60]
diff --git a/comparative_benchmark/jax/benchmark_iree.sh b/comparative_benchmark/jax/benchmark_iree.sh
@@ -92,7 +92,11 @@ if [ "${TARGET_DEVICE}" = "a2-highgpu-1g" ]; then
   JAX_PLATFORM="iree_cuda"
 elif [ "${TARGET_DEVICE}" = "c2-standard-16" ]; then
   BENCHMARK_NAMES=("${CPU_BENCHMARK_NAMES[@]}")
-  ITERATIONS=20
+  ITERATIONS=5
+  JAX_PLATFORM="iree_cpu"
+elif [ "${TARGET_DEVICE}" = "c2-standard-60" ]; then
+  BENCHMARK_NAMES=("${CPU_BENCHMARK_NAMES[@]}")
+  ITERATIONS=5
   JAX_PLATFORM="iree_cpu"
 else
   echo "Unsupported target device ${TARGET_DEVICE}."

diff --git a/comparative_benchmark/jax/benchmark_xla.sh b/comparative_benchmark/jax/benchmark_xla.sh
@@ -55,6 +55,9 @@ if [ "${TARGET_DEVICE}" = "a2-highgpu-1g" ]; then
 elif [ "${TARGET_DEVICE}" = "c2-standard-16" ]; then
   BENCHMARK_NAMES=("${CPU_BENCHMARK_NAMES[@]}")
   ITERATIONS=5
+elif [ "${TARGET_DEVICE}" = "c2-standard-60" ]; then
+  BENCHMARK_NAMES=("${CPU_BENCHMARK_NAMES[@]}")
+  ITERATIONS=5
 else
   echo "Unsupported target device ${TARGET_DEVICE}."
   exit 1

diff --git a/comparative_benchmark/pt_inductor/benchmark_all.sh b/comparative_benchmark/pt_inductor/benchmark_all.sh
@@ -50,6 +50,9 @@ if [ "${TARGET_DEVICE}" = "a2-highgpu-1g" ]; then
 elif [ "${TARGET_DEVICE}" = "c2-standard-16" ]; then
   BENCHMARK_NAMES=("${CPU_BENCHMARK_NAMES[@]}")
   ITERATIONS=20
+elif [ "${TARGET_DEVICE}" = "c2-standard-60" ]; then
+  BENCHMARK_NAMES=("${CPU_BENCHMARK_NAMES[@]}")
+  ITERATIONS=20
 else
   echo "Unsupported target device ${TARGET_DEVICE}."
   exit 1

diff --git a/comparative_benchmark/tf_xla/benchmark_all.sh b/comparative_benchmark/tf_xla/benchmark_all.sh
@@ -55,6 +55,9 @@ if [ "${TARGET_DEVICE}" = "a2-highgpu-1g" ]; then
 elif [ "${TARGET_DEVICE}" = "c2-standard-16" ]; then
   BENCHMARK_NAMES=("${CPU_BENCHMARK_NAMES[@]}")
   ITERATIONS=5
+elif [ "${TARGET_DEVICE}" = "c2-standard-60" ]; then
+  BENCHMARK_NAMES=("${CPU_BENCHMARK_NAMES[@]}")
+  ITERATIONS=5
 else
   echo "Unsupported target device ${TARGET_DEVICE}."
   exit 1

diff --git a/comparative_benchmark/xla_hlo/benchmark_all.sh b/comparative_benchmark/xla_hlo/benchmark_all.sh
@@ -54,6 +54,10 @@ elif [ "${TARGET_DEVICE}" = "c2-standard-16" ]; then
   BENCHMARK_NAMES=("${CPU_BENCHMARK_NAMES[@]}")
   HLO_TOOL="run_hlo_module"
   ITERATIONS=5
+elif [ "${TARGET_DEVICE}" = "c2-standard-60" ]; then
+  BENCHMARK_NAMES=("${CPU_BENCHMARK_NAMES[@]}")
+  HLO_TOOL="run_hlo_module"
+  ITERATIONS=5
 else
   echo "Unsupported target device ${TARGET_DEVICE}."
   exit 1