diff --git a/compiler/ci_common/x52.hocon b/compiler/ci_common/x52.hocon
index ce204e58f5cf..75322339196b 100644
--- a/compiler/ci_common/x52.hocon
+++ b/compiler/ci_common/x52.hocon
@@ -48,52 +48,57 @@ x52.tmpfs10g-libgraal-g1gc: ${x52.tmpfs10g-libgraal} {
 }
 
 builds += [
-  ${x52.tmpfs10g} ${bench-dacapo-hwloc}                ${oraclejdk8} { name: "bench-compiler-dacapo-linux-x52" }
-  ${x52.tmpfs10g} ${bench-dacapo-timing-hwloc}         ${oraclejdk8} { name: "bench-compiler-dacapo-timing-linux-x52" }
-  ${x52.tmpfs10g} ${bench-scala-dacapo-hwloc}          ${oraclejdk8} { name: "bench-compiler-scala-dacapo-linux-x52" }
-  ${x52.tmpfs10g} ${bench-scala-dacapo-timing-hwloc}   ${oraclejdk8} { name: "bench-compiler-scala-dacapo-timing-linux-x52" }
-  ${x52.default} ${bench-specjvm2008-Single}           ${oraclejdk8} { name: "bench-compiler-specjvm2008-Single-linux-x52" }
-  ${x52.default} ${bench-specjvm2008-OneVM}            ${oraclejdk8} { name: "bench-compiler-specjvm2008-OneVM-linux-x52" }
-  ${x52.default} ${bench-specjbb2015}                  ${oraclejdk8} { name: "bench-compiler-specjbb2015-linux-x52" }
-  ${x52.default} ${bench-micros-graal-whitebox}        ${oraclejdk8} { name: "bench-compiler-jmh-micros-graal-whitebox-linux-x52" }
-  ${x52.default} ${bench-micros-graal-dist}            ${oraclejdk8} { name: "bench-compiler-jmh-micros-graal-dist-linux-x52" }
-
-  ${x52.tmpfs10g-g1gc} ${bench-dacapo-hwloc}       ${oraclejdk8} { targets : [weekly, bench], name: "bench-compiler-dacapo-g1gc-linux-x52" }
-  ${x52.tmpfs10g-g1gc} ${bench-scala-dacapo-hwloc} ${oraclejdk8} { targets : [weekly, bench], name: "bench-compiler-scala-dacapo-g1gc-linux-x52" }
-  ${x52.tmpfs10g-g1gc} ${bench-specjvm2008-Single} ${oraclejdk8} { targets : [weekly, bench], name: "bench-compiler-specjvm2008-g1gc-Single-linux-x52" }
-  ${x52.tmpfs10g-g1gc} ${bench-specjbb2015}        ${oraclejdk8} { targets : [weekly, bench], name: "bench-compiler-specjbb2015-g1gc-linux-x52" }
-
-  ${x52.default} ${bench-renaissance-hwloc}              ${oraclejdk8} { name: "bench-compiler-renaissance-linux-x52" }
-  ${x52.default-g1gc} ${bench-renaissance-hwloc}         ${oraclejdk8} { targets: [weekly, bench], name: "bench-compiler-renaissance-g1gc-linux-x52" }
-  ${x52.default} ${bench-renaissance-legacy-hwloc}       ${oraclejdk8} { name: "bench-compiler-renaissance-legacy-linux-x52" }
-  ${x52.default-g1gc} ${bench-renaissance-legacy-hwloc}  ${oraclejdk8} { targets: [weekly, bench], name: "bench-compiler-renaissance-legacy-g1gc-linux-x52" }
-  ${x52.default} ${bench-spark-sql-perf}                 ${oraclejdk8} { name: "bench-compiler-spark-sql-perf-linux-x52" }
+  # LibGraal
+  #  main benchmark suites
+  ${x52.tmpfs10g-libgraal} ${bench-dacapo-hwloc}                  ${oraclejdk8} { name: "bench-compiler-dacapo-libgraal-linux-x52" }
+  ${x52.tmpfs10g-libgraal} ${bench-dacapo-timing-hwloc}           ${oraclejdk8} { name: "bench-compiler-dacapo-timing-libgraal-linux-x52" }
+  ${x52.tmpfs10g-libgraal} ${bench-scala-dacapo-hwloc}            ${oraclejdk8} { name: "bench-compiler-scala-dacapo-libgraal-linux-x52" }
+  ${x52.tmpfs10g-libgraal} ${bench-scala-dacapo-timing-hwloc}     ${oraclejdk8} { name: "bench-compiler-scala-dacapo-timing-libgraal-linux-x52" }
+  ${x52.default-libgraal} ${bench-renaissance-hwloc}              ${oraclejdk8} { name: "bench-compiler-renaissance-libgraal-linux-x52" }
+  ${x52.default-libgraal} ${bench-specjvm2008-Single}             ${oraclejdk8} { name: "bench-compiler-specjvm2008-Single-libgraal-linux-x52" }
+  ${x52.default-libgraal} ${bench-specjbb2005}                    ${oraclejdk8} { name: "bench-compiler-specjbb2005-libgraal-linux-x52" }
+  ${x52.default-libgraal} ${bench-specjbb2015}                    ${oraclejdk8} { name: "bench-compiler-specjbb2015-libgraal-linux-x52" }
 
-  ${x52.default} ${bench-specjbb2005}             ${oraclejdk8} { targets : [daily, bench],  name: "bench-compiler-specjbb2005-linux-x52"}
-  ${x52.default-g1gc} ${bench-specjbb2005}        ${oraclejdk8} { targets : [weekly, bench], name: "bench-compiler-specjbb2005-g1gc-linux-x52"}
+  #  secondary benchmark suites
+  ${x52.default-libgraal} ${bench-renaissance-legacy-hwloc}       ${oraclejdk8} { name: "bench-compiler-renaissance-legacy-libgraal-linux-x52" }
+  ${x52.default-libgraal} ${bench-specjvm2008-OneVM}              ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-specjvm2008-OneVM-libgraal-linux-x52" }
+  ${x52.default-libgraal} ${bench-spark-sql-perf}                 ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-spark-sql-perf-libgraal-linux-x52" }
+  ${x52.default-libgraal} ${bench-micros-graal-whitebox}          ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-jmh-micros-graal-whitebox-libgraal-linux-x52" }
+  ${x52.default-libgraal} ${bench-micros-graal-dist}              ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-jmh-micros-graal-dist-libgraal-linux-x52" }
 
-  # LibGraal
-  ${x52.tmpfs10g-libgraal} ${bench-dacapo-hwloc}            ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-dacapo-libgraal-linux-x52" }
-  ${x52.tmpfs10g-libgraal} ${bench-dacapo-timing-hwloc}     ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-dacapo-timing-libgraal-linux-x52" }
-  ${x52.tmpfs10g-libgraal} ${bench-scala-dacapo-hwloc}      ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-scala-dacapo-libgraal-linux-x52" }
-  ${x52.tmpfs10g-libgraal} ${bench-scala-dacapo-timing-hwloc} ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-scala-dacapo-timing-libgraal-linux-x52" }
-  ${x52.default-libgraal} ${bench-specjvm2008-Single}       ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-specjvm2008-Single-libgraal-linux-x52" }
-  ${x52.default-libgraal} ${bench-specjvm2008-OneVM}        ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-specjvm2008-OneVM-libgraal-linux-x52" }
-  ${x52.default-libgraal} ${bench-specjbb2015}              ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-specjbb2015-libgraal-linux-x52" }
-  ${x52.default-libgraal} ${bench-micros-graal-whitebox}    ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-jmh-micros-graal-whitebox-libgraal-linux-x52" }
-  ${x52.default-libgraal} ${bench-micros-graal-dist}        ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-jmh-micros-graal-dist-libgraal-linux-x52" }
+  #  special configurations
+  ${x52.tmpfs10g-libgraal-g1gc} ${bench-dacapo-hwloc}             ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-dacapo-libgraal-g1gc-linux-x52" }
+  ${x52.tmpfs10g-libgraal-g1gc} ${bench-scala-dacapo-hwloc}       ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-scala-dacapo-libgraal-g1gc-linux-x52" }
+  ${x52.default-libgraal-g1gc} ${bench-renaissance-hwloc}         ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-renaissance-libgraal-g1gc-linux-x52" }
+  ${x52.tmpfs10g-libgraal-g1gc} ${bench-specjvm2008-Single}       ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-specjvm2008-libgraal-g1gc-Single-linux-x52" }
+  ${x52.default-libgraal-g1gc} ${bench-specjbb2005}               ${oraclejdk8} { targets: [weekly, bench], name: "bench-compiler-specjbb2005-libgraal-g1gc-linux-x52" }
+  ${x52.tmpfs10g-libgraal-g1gc} ${bench-specjbb2015}              ${oraclejdk8} { targets: [weekly, bench], name: "bench-compiler-specjbb2015-libgraal-g1gc-linux-x52" }
+  ${x52.default-libgraal-g1gc} ${bench-renaissance-legacy-hwloc}  ${oraclejdk8} { targets: [weekly, bench], name: "bench-compiler-renaissance-legacy-libgraal-g1gc-linux-x52" }
 
-  ${x52.tmpfs10g-libgraal-g1gc} ${bench-dacapo-hwloc}       ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-dacapo-libgraal-g1gc-linux-x52" }
-  ${x52.tmpfs10g-libgraal-g1gc} ${bench-scala-dacapo-hwloc} ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-scala-dacapo-libgraal-g1gc-linux-x52" }
-  ${x52.tmpfs10g-libgraal-g1gc} ${bench-specjvm2008-Single} ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-specjvm2008-libgraal-g1gc-Single-linux-x52" }
-  ${x52.tmpfs10g-libgraal-g1gc} ${bench-specjbb2015}        ${oraclejdk8} { targets: [weekly, bench], name: "bench-compiler-specjbb2015-libgraal-g1gc-linux-x52" }
+  # JarGraal
+  #  main benchmark suites
+  ${x52.tmpfs10g} ${bench-dacapo-hwloc}                  ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-dacapo-linux-x52" }
+  ${x52.tmpfs10g} ${bench-dacapo-timing-hwloc}           ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-dacapo-timing-linux-x52" }
+  ${x52.tmpfs10g} ${bench-scala-dacapo-hwloc}            ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-scala-dacapo-linux-x52" }
+  ${x52.tmpfs10g} ${bench-scala-dacapo-timing-hwloc}     ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-scala-dacapo-timing-linux-x52" }
+  ${x52.default} ${bench-renaissance-hwloc}              ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-renaissance-linux-x52" }
+  ${x52.default} ${bench-specjvm2008-Single}             ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-specjvm2008-Single-linux-x52" }
+  ${x52.default} ${bench-specjbb2005}                    ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-specjbb2005-linux-x52"}
+  ${x52.default} ${bench-specjbb2015}                    ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-specjbb2015-linux-x52" }
 
-  ${x52.default-libgraal} ${bench-renaissance-hwloc}              ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-renaissance-libgraal-linux-x52" }
-  ${x52.default-libgraal-g1gc} ${bench-renaissance-hwloc}        ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-renaissance-libgraal-g1gc-linux-x52" }
-  ${x52.default-libgraal} ${bench-renaissance-legacy-hwloc}       ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-renaissance-legacy-libgraal-linux-x52" }
-  ${x52.default-libgraal-g1gc} ${bench-renaissance-legacy-hwloc}  ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-renaissance-legacy-libgraal-g1gc-linux-x52" }
-  ${x52.default-libgraal} ${bench-spark-sql-perf}                 ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-spark-sql-perf-libgraal-linux-x52" }
+  #  secondary benchmark suites
+  ${x52.default} ${bench-renaissance-legacy-hwloc}       ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-renaissance-legacy-linux-x52" }
+  ${x52.default} ${bench-specjvm2008-OneVM}              ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-specjvm2008-OneVM-linux-x52" }
+  ${x52.default} ${bench-spark-sql-perf}                 ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-spark-sql-perf-linux-x52" }
+  ${x52.default} ${bench-micros-graal-whitebox}          ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-jmh-micros-graal-whitebox-linux-x52" }
+  ${x52.default} ${bench-micros-graal-dist}              ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-jmh-micros-graal-dist-linux-x52" }
 
-  ${x52.default-libgraal} ${bench-specjbb2005}             ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-specjbb2005-libgraal-linux-x52" }
-  ${x52.default-libgraal-g1gc} ${bench-specjbb2005}        ${oraclejdk8} { targets: [weekly, bench], name: "bench-compiler-specjbb2005-libgraal-g1gc-linux-x52" }
+  #  special configurations
+  ${x52.tmpfs10g-g1gc} ${bench-dacapo-hwloc}             ${oraclejdk8} { targets: [weekly, bench], name: "bench-compiler-dacapo-g1gc-linux-x52" }
+  ${x52.tmpfs10g-g1gc} ${bench-scala-dacapo-hwloc}       ${oraclejdk8} { targets: [weekly, bench], name: "bench-compiler-scala-dacapo-g1gc-linux-x52" }
+  ${x52.default-g1gc} ${bench-renaissance-hwloc}         ${oraclejdk8} { targets: [weekly, bench], name: "bench-compiler-renaissance-g1gc-linux-x52" }
+  ${x52.tmpfs10g-g1gc} ${bench-specjvm2008-Single}       ${oraclejdk8} { targets: [weekly, bench], name: "bench-compiler-specjvm2008-g1gc-Single-linux-x52" }
+  ${x52.default-g1gc} ${bench-specjbb2005}               ${oraclejdk8} { targets: [weekly, bench], name: "bench-compiler-specjbb2005-g1gc-linux-x52"}
+  ${x52.tmpfs10g-g1gc} ${bench-specjbb2015}              ${oraclejdk8} { targets: [weekly, bench], name: "bench-compiler-specjbb2015-g1gc-linux-x52" }
+  ${x52.default-g1gc} ${bench-renaissance-legacy-hwloc}  ${oraclejdk8} { targets: [weekly, bench], name: "bench-compiler-renaissance-legacy-g1gc-linux-x52" }
 ]