[GR-32046] Fix microservice benchmark heap settings.

PullRequest: graal/9148

Author: christianhaeubl

compiler/ci_common/benchmark-suites.libsonnet

@@ -162,17 +162,17 @@
   },
 
   // Microservice benchmarks
-  microservice_benchmarks: cc.compiler_benchmark + c.heap.default + {
+  microservice_benchmarks: cc.compiler_benchmark + {
     suite:: "microservices",
     packages+: {
       "python3": "==3.6.5",
       "pip:psutil": "==5.8.0"
     },
     local upload = ["bench-uploader.py", "bench-results.json"],
     run+: [
-      self.benchmark_cmd + ["shopcart-jmeter:large", "--"] +      self.extra_vm_args,
+      self.benchmark_cmd + ["shopcart-jmeter:large", "--"] +      self.extra_vm_args + ["-Xms8g",    "-Xmx8g"],
       upload,
-      self.benchmark_cmd + ["petclinic-jmeter:tiny", "--"] +      self.extra_vm_args,
+      self.benchmark_cmd + ["petclinic-jmeter:tiny", "--"] +      self.extra_vm_args + ["-Xms8g",    "-Xmx8g"],
       upload,
       self.benchmark_cmd + ["shopcart-wrk:mixed-tiny", "--"] +    self.extra_vm_args + ["-Xms32m",   "-Xmx112m",  "-XX:ActiveProcessorCount=1",  "-XX:MaxDirectMemorySize=256m"],
       upload,
@@ -196,15 +196,15 @@
       upload,
       self.benchmark_cmd + ["tika-wrk:pdf-medium", "--"] +        self.extra_vm_args + ["-Xms80m",   "-Xmx500m",  "-XX:ActiveProcessorCount=4"],
       upload,
-      self.benchmark_cmd + ["petclinic-wrk:mixed-tiny", "--"] +   self.extra_vm_args + ["-Xms32m",  "-Xmx100m",  "-XX:ActiveProcessorCount=1"],
+      self.benchmark_cmd + ["petclinic-wrk:mixed-tiny", "--"] +   self.extra_vm_args + ["-Xms32m",   "-Xmx100m",  "-XX:ActiveProcessorCount=1"],
       upload,
-      self.benchmark_cmd + ["petclinic-wrk:mixed-small", "--"] +  self.extra_vm_args + ["-Xms40m",  "-Xmx128m",  "-XX:ActiveProcessorCount=2"],
+      self.benchmark_cmd + ["petclinic-wrk:mixed-small", "--"] +  self.extra_vm_args + ["-Xms40m",   "-Xmx128m",  "-XX:ActiveProcessorCount=2"],
       upload,
-      self.benchmark_cmd + ["petclinic-wrk:mixed-medium", "--"] + self.extra_vm_args + ["-Xms80m",  "-Xmx256m",  "-XX:ActiveProcessorCount=4"],
+      self.benchmark_cmd + ["petclinic-wrk:mixed-medium", "--"] + self.extra_vm_args + ["-Xms80m",   "-Xmx256m",  "-XX:ActiveProcessorCount=4"],
       upload,
-      self.benchmark_cmd + ["petclinic-wrk:mixed-large", "--"] +  self.extra_vm_args + ["-Xms320m", "-Xmx1280m", "-XX:ActiveProcessorCount=16"],
+      self.benchmark_cmd + ["petclinic-wrk:mixed-large", "--"] +  self.extra_vm_args + ["-Xms320m",  "-Xmx1280m", "-XX:ActiveProcessorCount=16"],
       upload,
-      self.benchmark_cmd + ["petclinic-wrk:mixed-huge", "--"] +   self.extra_vm_args + ["-Xms640m", "-Xmx3072m", "-XX:ActiveProcessorCount=32"],
+      self.benchmark_cmd + ["petclinic-wrk:mixed-huge", "--"] +   self.extra_vm_args + ["-Xms640m",  "-Xmx3072m", "-XX:ActiveProcessorCount=32"],
       upload
     ],
     timelimit: "7:00:00"

compiler/ci_common/compiler-common.libsonnet

@@ -26,7 +26,9 @@
     },
     plain_benchmark_cmd:: ["mx", "--kill-with-sigquit", "benchmark", "--fork-count-file=${FORK_COUNT_FILE}", "--extras=${BENCH_SERVER_EXTRAS}", "--results-file", "${BENCH_RESULTS_FILE_PATH}", "--machine-name=${MACHINE_NAME}", "--tracker=rss"],
     benchmark_cmd:: bench_common.hwlocIfNuma(self.should_use_hwloc, self.plain_benchmark_cmd, node=self.default_numa_node),
-    extra_vm_args:: ["--profiler=${MX_PROFILER}", "--jvm=${JVM}", "--jvm-config=${JVM_CONFIG}", "-Xmx${XMX}", "-Xms${XMS}", "-XX:+PrintConcurrentLocks", "-Dgraal.CompilationFailureAction=Diagnose"],
+    min_heap_size:: if std.objectHasAll(self.environment, 'XMS') then ["-Xms${XMS}"] else [],
+    max_heap_size:: if std.objectHasAll(self.environment, 'XMX') then ["-Xmx${XMX}"] else [],
+    extra_vm_args:: ["--profiler=${MX_PROFILER}", "--jvm=${JVM}", "--jvm-config=${JVM_CONFIG}", "-XX:+PrintConcurrentLocks", "-Dgraal.CompilationFailureAction=Diagnose"] + self.min_heap_size + self.max_heap_size,
     should_mx_build:: true,
     setup+: [
       ["cd", "./" + config.compiler.compiler_suite],