[GR-61979] Espresso: harmonize style regarding empty line after license header.

PullRequest: graal/19995

Author: gilles-duboscq

espresso/ci/ci.jsonnet

@@ -37,16 +37,6 @@
     common.jdk21_weekly_bench_linux    + common.espresso_interpreter_benchmark('jvm-ce-llvm', 'awfy:*')                                                                              + {name: 'weekly-bench-espresso-jvm-ce-awfy_interpreter-jdk21-linux-amd64'},
     common.jdk21_weekly_bench_linux    + common.espresso_interpreter_benchmark('native-ce-llvm', 'awfy:*')                                                                           + {name: 'weekly-bench-espresso-native-ce-awfy_interpreter-jdk21-linux-amd64'},
 
-    // Scala DaCapo warmup benchmarks
-    common.jdk21_weekly_bench_linux    + common.scala_dacapo_warmup_benchmark('jvm-ce-llvm'   , guest_jvm_config='single-tier'    , extra_args=['--vm.XX:ReservedCodeCacheSize=1g']) + {name: 'weekly-bench-espresso-jvm-ce-scala_dacapo_warmup-single_tier-jdk21-linux-amd64'},
-    common.jdk21_weekly_bench_linux    + common.scala_dacapo_warmup_benchmark('native-ce-llvm', guest_jvm_config='single-tier')                                                      + {name: 'weekly-bench-espresso-native-ce-scala_dacapo_warmup-single_tier-jdk21-linux-amd64'},
-    common.jdk21_weekly_bench_linux    + common.scala_dacapo_warmup_benchmark('jvm-ce-llvm'   , guest_jvm_config='multi-tier'     , extra_args=['--vm.XX:ReservedCodeCacheSize=1g']) + {name: 'weekly-bench-espresso-jvm-ce-scala_dacapo_warmup-multi_tier-jdk21-linux-amd64'},
-    common.jdk21_weekly_bench_linux    + common.scala_dacapo_warmup_benchmark('native-ce-llvm', guest_jvm_config='multi-tier')                                                       + {name: 'weekly-bench-espresso-native-ce-scala_dacapo_warmup-multi_tier-jdk21-linux-amd64'},
-    common.jdk21_weekly_bench_linux    + common.graal_benchmark('jvm-ce-llvm', common.scala_dacapo_jvm_warmup)                                                                       + {name: 'weekly-bench-espresso-jvm-ce-scala_dacapo_warmup-reference-jdk21-linux-amd64'},
-
-    common.jdk21_weekly_bench_linux    + common.scala_dacapo_warmup_benchmark('jvm-ce-llvm'   , guest_jvm_config='3-compiler-threads', extra_args=['--vm.XX:ReservedCodeCacheSize=1g']) + {name: 'weekly-bench-espresso-jvm-ce-scala_dacapo_warmup-3threads-jdk21-linux-amd64'},
-    common.jdk21_weekly_bench_linux    + common.scala_dacapo_warmup_benchmark('native-ce-llvm', guest_jvm_config='3-compiler-threads')                                                  + {name: 'weekly-bench-espresso-native-ce-scala_dacapo_warmup-3threads-jdk21-linux-amd64'},
-
     // Scala DaCapo benchmarks
     common.jdk21_on_demand_bench_linux + common.scala_dacapo_benchmark('jvm-ce-llvm'          , guest_jvm_config='single-tier'    , extra_args=['--vm.XX:ReservedCodeCacheSize=1g']) + {name: 'ondemand-bench-espresso-jvm-ce-scala_dacapo-single_tier-jdk21-linux-amd64'},
     common.jdk21_on_demand_bench_linux + common.scala_dacapo_benchmark('native-ce-llvm'       , guest_jvm_config='single-tier')                                                      + {name: 'ondemand-bench-espresso-native-ce-scala_dacapo-single_tier-jdk21-linux-amd64'},

espresso/ci/ci_common/common.jsonnet

@@ -221,15 +221,6 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
   espresso_interpreter_benchmark(env, suite, host_jvm=null):
     self.espresso_benchmark(env, suite, host_jvm=host_jvm, guest_jvm_config='interpreter', extra_args=['--', '--iterations', '10']),
 
-  scala_dacapo_warmup_benchmark(env, guest_jvm_config='default', extra_args=[]):
-    self.espresso_benchmark(
-      env,
-      self.scala_dacapo_jvm_warmup,
-      guest_jvm_config=guest_jvm_config,
-      extra_args=extra_args,
-      timelimit='5:00:00'
-    ),
-
   scala_dacapo_benchmark(env, guest_jvm_config, extra_args=[]):
     self.espresso_benchmark(
       env,
@@ -266,10 +257,6 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
     }
     + self.bench_upload,
 
-  # Scala DaCapo benchmarks that run in both JVM and native modes,
-  # Excluding factorie (too slow). kiama and scalariform have transient issues with compilation enabled.
-  scala_dacapo_jvm_warmup: 'scala-dacapo-warmup:*[scalap,scalac,scaladoc,scalaxb]',
-
   dacapo_stable(env): 'dacapo:*[fop,lusearch,luindex,sunflow,xalan]',
 
   # exclude scalatest, which goes into deopt loop and becomes slower on every subsequent operation

espresso/mx.espresso/mx_espresso_benchmarks.py

@@ -20,15 +20,11 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-
-import argparse
-
 import mx
 import mx_benchmark
 import mx_espresso
 
 from mx_benchmark import GuestVm, JavaVm
-from mx_sdk_benchmark import ScalaDaCapoBenchmarkSuite
 from mx_sdk_benchmark import _daCapoScalaConfig
 
 
@@ -187,71 +183,3 @@ def warmupIterations(startup=None, earlyWarmup=None, lateWarmup=None):
     "specs"       : warmupIterations(1, 1 + _daCapoScalaConfig["specs"]       // 3, _daCapoScalaConfig["specs"]),
     "tmt"         : warmupIterations(1, 1 + _daCapoScalaConfig["tmt"]         // 3, _daCapoScalaConfig["tmt"]),
 }
-
-class ScalaDaCapoWarmupBenchmarkSuite(ScalaDaCapoBenchmarkSuite): #pylint: disable=too-many-ancestors
-    """Scala DaCapo (warmup) benchmark suite implementation."""
-
-    def daCapoPath(self):
-        return mx.distribution("DACAPO_SCALA_WARMUP").path
-
-    def name(self):
-        return "scala-dacapo-warmup"
-
-    def warmupResults(self, results, warmupIterations, metricName="cumulative-warmup"):
-        """
-        Postprocess results to add new entries for specific iterations.
-        """
-        benchmarkNames = {r["benchmark"] for r in results}
-        for benchmark in benchmarkNames:
-            if benchmark in warmupIterations:
-                entries = [result for result in results if result["metric.name"] == metricName and result["benchmark"] == benchmark]
-                if entries:
-                    for entry in entries:
-                        for key, iteration in warmupIterations[benchmark].items():
-                            if entry["metric.iteration"] == iteration - 1: # scala_dacapo_warmup_iterations is 1-based, JSON output is 0-based
-                                newEntry = entry.copy()
-                                newEntry["metric.name"] = key
-                                results.append(newEntry)
-
-    def rules(self, out, benchmarks, bmSuiteArgs):
-        super_rules = super(ScalaDaCapoWarmupBenchmarkSuite, self).rules(out, benchmarks, bmSuiteArgs)
-        return super_rules + [
-            mx_benchmark.StdOutRule(
-                r"===== DaCapo (?P<version>\S+) (?P<benchmark>[a-zA-Z0-9_]+) walltime [0-9]+ : (?P<time>[0-9]+) msec =====", # pylint: disable=line-too-long
-                {
-                    "benchmark": ("<benchmark>", str),
-                    "bench-suite": self.benchSuiteName(),
-                    "vm": "jvmci",
-                    "config.name": "default",
-                    "config.vm-flags": self.shorten_vm_flags(self.vmArgs(bmSuiteArgs)),
-                    "metric.name": "walltime",
-                    "metric.value": ("<time>", int),
-                    "metric.unit": "ms",
-                    "metric.type": "numeric",
-                    "metric.score-function": "id",
-                    "metric.better": "lower",
-                    "metric.iteration": ("$iteration", int)
-                }
-            )
-        ]
-
-    def postprocessRunArgs(self, benchname, runArgs):
-        parser = argparse.ArgumentParser(add_help=False)
-        parser.add_argument("-n", default=None)
-        args, remaining = parser.parse_known_args(runArgs)
-        result = ['-c', 'WallTimeCallback'] + remaining
-        if args.n:
-            if args.n.isdigit():
-                result = ["-n", args.n] + result
-        else:
-            iterations = scala_dacapo_warmup_iterations[benchname]["late-warmup"]
-            result = ["-n", str(iterations)] + result
-        return result
-
-    def run(self, benchmarks, bmSuiteArgs):
-        results = super(ScalaDaCapoWarmupBenchmarkSuite, self).run(benchmarks, bmSuiteArgs)
-        self.warmupResults(results, scala_dacapo_warmup_iterations, 'walltime')
-        # walltime entries are not accepted by the bench server
-        return [e for e in results if e["metric.name"] != "walltime"]
-
-mx_benchmark.add_bm_suite(ScalaDaCapoWarmupBenchmarkSuite())

espresso/mx.espresso/suite.py

@@ -363,17 +363,6 @@
             },
         },
 
-        "com.oracle.truffle.espresso.dacapo": {
-            "subDir": "src",
-            "sourceDirs": ["src"],
-            "dependencies": [
-                "sdk:DACAPO_SCALA",
-            ],
-            "javaCompliance": "8+",
-            "checkstyle": "com.oracle.truffle.espresso",
-            "testProject" : True,
-        },
-
         "com.oracle.truffle.espresso.shadowed.asm" : {
             # Shadowed ASM library (org.ow2.asm:asm)
             "subDir" : "src",
@@ -706,33 +695,5 @@
             "description": "JVMCI implementation for Espresso",
             "maven": False,
         },
-
-        "DACAPO_SCALA_WARMUP": {
-            "subDir": "src",
-            "dependencies": [
-                "com.oracle.truffle.espresso.dacapo",
-                "sdk:DACAPO_SCALA",
-            ],
-            "testDistribution": True,
-            "manifestEntries" : {
-                    "Manifest-Version": "1.0",
-                    "Build-Timestamp": "2012-02-16T11:12:52",
-                    "Implementation-Title": "Scala Benchmark Suite",
-                    "Implementation-Version": "0.1.0-SNAPSHOT",
-                    "Built-By": "sewe",
-                    "Specification-Vendor": "Technische Universitat Darmstadt",
-                    "Created-By": "Apache Maven 3.0.4",
-                    "Implementation-Vendor": "Technische Universitat Darmstadt",
-                    "Build-Number": "02fbc0d55f60",
-                    "Implementation-Vendor-Id": "org.scalabench.benchmarks",
-                    "Build-Jdk": "1.6.0_26",
-                    "Specification-Title": "Scala Benchmark Suite",
-                    "Specification-Version": "0.1.0-SNAPSHOT",
-                    "Main-Class": "Harness",
-                    "Archiver-Version": "Plexus Archiver",
-            },
-            "description": "Scala DaCapo with WallTime callback",
-            "maven": False,
-        },
     }
 }

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/JavaVersion.java

@@ -20,7 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.oracle.truffle.espresso.classfile;
 
 /**

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/attributes/EnclosingMethodAttribute.java

@@ -20,7 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.oracle.truffle.espresso.classfile.attributes;
 
 import com.oracle.truffle.espresso.classfile.descriptors.Name;

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/attributes/InnerClassesAttribute.java

@@ -20,7 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.oracle.truffle.espresso.classfile.attributes;
 
 import com.oracle.truffle.espresso.classfile.descriptors.Name;

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/attributes/NestHostAttribute.java

@@ -20,7 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.oracle.truffle.espresso.classfile.attributes;
 
 import com.oracle.truffle.espresso.classfile.descriptors.Name;

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/attributes/NestMembersAttribute.java

@@ -20,7 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.oracle.truffle.espresso.classfile.attributes;
 
 import com.oracle.truffle.api.CompilerDirectives;

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/attributes/PermittedSubclassesAttribute.java

@@ -20,7 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.oracle.truffle.espresso.classfile.attributes;
 
 import com.oracle.truffle.api.CompilerDirectives;

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/attributes/RecordAttribute.java

@@ -20,7 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.oracle.truffle.espresso.classfile.attributes;
 
 import com.oracle.truffle.api.CompilerDirectives;

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/attributes/StackMapTableAttribute.java

@@ -20,7 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.oracle.truffle.espresso.classfile.attributes;
 
 import com.oracle.truffle.espresso.classfile.descriptors.Name;

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/bytecode/Bytecodes.java

@@ -20,7 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.oracle.truffle.espresso.classfile.bytecode;
 
 import static com.oracle.truffle.espresso.classfile.bytecode.Bytecodes.Flags.ASSOCIATIVE;

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/bytecode/VolatileArrayAccess.java

@@ -20,7 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.oracle.truffle.espresso.classfile.bytecode;
 
 import java.lang.invoke.MethodHandles;

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/perf/DebugCloseable.java

@@ -20,7 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.oracle.truffle.espresso.classfile.perf;
 
 /**

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/perf/DebugCounter.java

@@ -20,7 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.oracle.truffle.espresso.classfile.perf;
 
 import java.io.PrintStream;

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/perf/DebugTimer.java

@@ -20,7 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.oracle.truffle.espresso.classfile.perf;
 
 import java.util.ArrayList;

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/perf/TimerCollection.java

@@ -20,7 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.oracle.truffle.espresso.classfile.perf;
 
 import com.oracle.truffle.api.TruffleLogger;

espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/perf/TimerCollectionImpl.java

@@ -20,7 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.oracle.truffle.espresso.classfile.perf;
 
 import java.util.HashSet;

espresso/src/com.oracle.truffle.espresso.dacapo/src/WallTimeCallback.java

@@ -20,7 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.oracle.truffle.espresso.libjavavm.arghelper;
 
 import static com.oracle.truffle.espresso.libjavavm.Arguments.abort;

espresso/src/com.oracle.truffle.espresso.libjavavm/src/com/oracle/truffle/espresso/libjavavm/arghelper/ArgumentsHandler.java

@@ -20,7 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.oracle.truffle.espresso.libjavavm.arghelper;
 
 import static com.oracle.truffle.espresso.libjavavm.Arguments.abort;

espresso/src/com.oracle.truffle.espresso.libjavavm/src/com/oracle/truffle/espresso/libjavavm/arghelper/Native.java

@@ -20,7 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.oracle.truffle.espresso.libjavavm.arghelper;
 
 import static com.oracle.truffle.espresso.libjavavm.Arguments.abort;