Merge remote-tracking branch 'upstream/master' into build-with-19-loom

Author: oraluben

compiler/ci_common/benchmark-builders.jsonnet

@@ -27,10 +27,8 @@
     c.weekly     + hw.x52 + jdk + cc.jargraal + bench.specjbb2015,
     c.weekly     + hw.x52 + jdk + cc.libgraal + bench.specjbb2015_full_machine,
     c.monthly    + hw.x52 + jdk + cc.jargraal + bench.specjbb2015_full_machine,
-    c.weekly     + hw.x52 + jdk + cc.libgraal + bench.renaissance_0_10,
-    c.monthly    + hw.x52 + jdk + cc.jargraal + bench.renaissance_0_10,
-    c.daily      + hw.x52 + jdk + cc.libgraal + bench.renaissance_0_13,
-    c.weekly     + hw.x52 + jdk + cc.jargraal + bench.renaissance_0_13,
+    c.weekly     + hw.x52 + jdk + cc.libgraal + bench.renaissance_0_11,
+    c.monthly    + hw.x52 + jdk + cc.jargraal + bench.renaissance_0_11,
     c.daily      + hw.x52 + jdk + cc.libgraal + bench.awfy,
     c.daily      + hw.x52 + jdk + cc.jargraal + bench.awfy,
     c.daily      + hw.x52 + jdk + cc.libgraal + bench.microservice_benchmarks,

compiler/ci_common/benchmark-suites.libsonnet

@@ -4,23 +4,25 @@
   local bc = (import '../../bench-common.libsonnet'),
   local cc = (import 'compiler-common.libsonnet'),
 
-  local uniq_key(o) = o['suite'],
+  local _suite_key(a) = a['suite'],
+  local unique_suites(arr) = std.set(arr, keyF=_suite_key),
+
   // convenient sets of benchmark suites for easy reuse
   groups:: {
-    open_suites:: std.set([$.awfy, $.dacapo, $.scala_dacapo, $.renaissance, $.renaissance_0_13], keyF=uniq_key),
-    spec_suites:: std.set([$.specjvm2008, $.specjbb2015], keyF=uniq_key),
-    legacy_and_secondary_suites:: std.set([$.renaissance_legacy], keyF=uniq_key),
-    jmh_micros_suites:: std.set([$.micros_graal_dist, $.micros_misc_graal_dist , $.micros_shootout_graal_dist], keyF=uniq_key),
-    graal_internals_suites:: std.set([$.micros_graal_whitebox], keyF=uniq_key),
-    special_suites:: std.set([$.renaissance_0_10, $.dacapo_size_variants, $.scala_dacapo_size_variants, $.specjbb2015_full_machine], keyF=uniq_key),
-    microservice_suites:: std.set([$.microservice_benchmarks], keyF=uniq_key),
+    open_suites:: unique_suites([$.awfy, $.dacapo, $.scala_dacapo, $.renaissance]),
+    spec_suites:: unique_suites([$.specjvm2008, $.specjbb2015]),
+    legacy_and_secondary_suites:: unique_suites([$.renaissance_0_11, $.renaissance_legacy]),
+    jmh_micros_suites:: unique_suites([$.micros_graal_dist, $.micros_misc_graal_dist , $.micros_shootout_graal_dist]),
+    graal_internals_suites:: unique_suites([$.micros_graal_whitebox]),
+    special_suites:: unique_suites([$.renaissance, $.dacapo_size_variants, $.scala_dacapo_size_variants, $.specjbb2015_full_machine]),
+    microservice_suites:: unique_suites([$.microservice_benchmarks]),
 
-    main_suites:: std.set([$.specjvm2008] + self.open_suites + self.legacy_and_secondary_suites, keyF=uniq_key),
-    all_suites:: std.set(self.main_suites + self.spec_suites + self.jmh_micros_suites + self.special_suites + self.microservice_suites, keyF=uniq_key),
+    main_suites:: unique_suites([$.specjvm2008] + self.open_suites + self.legacy_and_secondary_suites),
+    all_suites:: unique_suites(self.main_suites + self.spec_suites + self.jmh_micros_suites + self.special_suites + self.microservice_suites),
 
-    weekly_forks_suites:: std.set([$.renaissance_0_13] + self.main_suites, keyF=uniq_key),
-    profiled_suites::     std.setDiff(self.main_suites, [$.specjbb2015], keyF=uniq_key),
-    all_but_main_suites::     std.setDiff(self.all_suites, self.main_suites, keyF=uniq_key),
+    weekly_forks_suites:: self.main_suites,
+    profiled_suites::     std.setDiff(self.main_suites, [$.specjbb2015], keyF=_suite_key),
+    all_but_main_suites:: std.setDiff(self.all_suites, self.main_suites, keyF=_suite_key),
   },
 
   // suite definitions
@@ -118,37 +120,25 @@
     max_jdk_version:: null
   },
 
-  renaissance: cc.compiler_benchmark + c.heap.default + {
-    suite:: "renaissance",
-    environment+: {
-      "SPARK_LOCAL_IP": "127.0.0.1"
-    },
+  renaissance_template(suite_version=null, suite_name="renaissance", max_jdk_version=null):: cc.compiler_benchmark + c.heap.default + {
+    suite:: suite_name,
+    local suite_version_args = if suite_version != null then ["--bench-suite-version=" + suite_version] else [],
     run+: [
-      self.benchmark_cmd + ["renaissance:*", "--bench-suite-version=$RENAISSANCE_VERSION", "--"] + self.extra_vm_args
+      self.benchmark_cmd + ["renaissance:*"] + suite_version_args + ["--"] + self.extra_vm_args
     ],
-    timelimit: "3:00:00",
+    timelimit: "4:00:00",
     forks_batches:: 4,
     forks_timelimit:: "06:30:00",
     min_jdk_version:: 8,
-    max_jdk_version:: 11
+    max_jdk_version:: max_jdk_version
   },
 
-  renaissance_0_10: self.renaissance + {
-    suite:: "renaissance-0-10",
-    environment+: {
-      "RENAISSANCE_VERSION": "0.10.0"
-    },
-    min_jdk_version:: 8,
-    max_jdk_version:: 11
-  },
+  renaissance: self.renaissance_template(),
 
-  renaissance_0_13: self.renaissance + {
-    suite:: "renaissance-0-13",
+  renaissance_0_11: self.renaissance_template(suite_version="0.11.0", suite_name="renaissance-0-11", max_jdk_version=11) + {
     environment+: {
-      "RENAISSANCE_VERSION": "0.13.0"
-    },
-    min_jdk_version:: 8,
-    max_jdk_version:: null
+      "SPARK_LOCAL_IP": "127.0.0.1"
+    }
   },
 
   renaissance_legacy: cc.compiler_benchmark + c.heap.default + {

java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py

@@ -1904,11 +1904,10 @@ def completeBenchmarkList(self, bmSuiteArgs):
         return sorted(bench for bench in _renaissanceConfig)
 
     def defaultSuiteVersion(self):
-        #  return self.availableSuiteVersions()[-1]
-        return "0.11.0"  # stick to 0.11.0 for both JIT and AOT until Native Image is compatible with 0.13.0 (GR-34147)
+        return self.availableSuiteVersions()[-1]
 
     def availableSuiteVersions(self):
-        return ["0.9.0", "0.10.0", "0.11.0", "0.12.0", "0.13.0", "0.14.0"]
+        return ["0.9.0", "0.10.0", "0.11.0", "0.12.0", "0.13.0", "0.14.0", "0.14.1"]
 
     def renaissancePath(self):
         lib = mx.library(self.renaissanceLibraryName())

java-benchmarks/mx.java-benchmarks/suite.py

@@ -92,6 +92,11 @@
       "sha1" : "d83a508c593a2389880936cbf9aa034bc86e7ef2",
     },
 
+    "RENAISSANCE_0.14.1" : {
+      "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/renaissance/renaissance-gpl-0.14.1.jar"],
+      "sha1" : "69cd6017692fc477bf5007d1d67d912961d52d37",
+    },
+
     "UBENCH_AGENT_DIST" : {
       "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/java-ubench-agent-2e5becaf97afcf64fd8aef3ac84fc05a3157bff5.zip"],
       "sha1" : "19087a34b80be8845e9a3e7f927ceb592de83762",

substratevm/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 This changelog summarizes major changes to GraalVM Native Image.
 
+## Version 22.3.0
+* (GR-35721) Remove old build output style and the `-H:±BuildOutputUseNewStyle` option.
+
 ## Version 22.2.0
 * (GR-20653) Re-enable the usage of all CPU features for JIT compilation on AMD64.
 * (GR-38413) Add support for `-XX:+ExitOnOutOfMemoryError`.

substratevm/mx.substratevm/mx_substratevm_benchmark.py

@@ -269,9 +269,6 @@ def harness_path(self):
                 return lib.get_path(True)
         return None
 
-    def availableSuiteVersions(self):
-        return ["0.9.0", "0.10.0", "0.11.0", "0.12.0", "0.13.0", "0.14.0"]
-
     def renaissance_unpacked(self):
         return extract_archive(self.renaissancePath(), 'renaissance.extracted')
 

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AbstractAnalysisEngine.java

@@ -98,7 +98,7 @@ public AbstractAnalysisEngine(OptionValues options, AnalysisUniverse universe, H
 
         this.processFeaturesTimer = timerCollection.get(TimerCollection.Registry.FEATURES);
         this.verifyHeapTimer = timerCollection.get(TimerCollection.Registry.VERIFY_HEAP);
-        this.reachabilityTimer = timerCollection.createTimer("(reachability)", false);
+        this.reachabilityTimer = timerCollection.createTimer("(reachability)");
         this.analysisTimer = timerCollection.get(TimerCollection.Registry.ANALYSIS);
 
         this.extendedAsserts = PointstoOptions.ExtendedAsserts.getValue(options);
@@ -182,13 +182,6 @@ public void cleanupAfterAnalysis() {
         universe.getHeapVerifier().cleanupAfterAnalysis();
     }
 
-    @Override
-    public void printTimers() {
-        reachabilityTimer.print();
-        verifyHeapTimer.print();
-        processFeaturesTimer.print();
-    }
-
     @Override
     public void printTimerStatistics(PrintWriter out) {
         // todo print reachability here

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/BigBang.java

@@ -51,7 +51,7 @@
  * Central static analysis interface that groups together the functionality of reachability analysis
  * and heap scanning and adds utility methods and lifecycle hooks that should be used to query and
  * change the state of the analysis.
- * 
+ *
  * In long term, all mutable accesses that change the state of the analysis should go through this
  * interface.
  *
@@ -73,11 +73,6 @@ public interface BigBang extends ReachabilityAnalysis, HeapScanning {
 
     List<DebugHandlersFactory> getDebugHandlerFactories();
 
-    /**
-     * Prints all analysis timers.
-     */
-    void printTimers();
-
     /**
      * Prints more detailed information about all analysis timers.
      */

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java

@@ -142,8 +142,7 @@ public PointsToAnalysis(OptionValues options, AnalysisUniverse universe, HostedP
         this.debugHandlerFactories = Collections.singletonList(new GraalDebugHandlersFactory(providers.getSnippetReflection()));
         this.debug = new Builder(options, debugHandlerFactories).build();
         this.hostVM = hostVM;
-        String imageName = hostVM.getImageName();
-        this.typeFlowTimer = timerCollection.createTimer(imageName, "(typeflow)", false);
+        this.typeFlowTimer = timerCollection.createTimer("(typeflow)");
         this.verifyHeapTimer = timerCollection.get(TimerCollection.Registry.VERIFY_HEAP);
         this.processFeaturesTimer = timerCollection.get(TimerCollection.Registry.FEATURES);
         this.analysisTimer = timerCollection.get(TimerCollection.Registry.ANALYSIS);
@@ -184,13 +183,6 @@ public PointsToAnalysis(OptionValues options, AnalysisUniverse universe, HostedP
                         : HeapScanningPolicy.skipTypes(skippedHeapTypes());
     }
 
-    @Override
-    public void printTimers() {
-        typeFlowTimer.print();
-        verifyHeapTimer.print();
-        processFeaturesTimer.print();
-    }
-
     @Override
     public void printTimerStatistics(PrintWriter out) {
         StatisticsPrinter.print(out, "typeflow_time_ms", typeFlowTimer.getTotalTime());
@@ -465,7 +457,7 @@ public AnalysisMethod addRootMethod(AnalysisMethod aMethod, boolean invokeSpecia
                  * virtual invoke type flow. Since the virtual invoke observes the receiver flow
                  * state it will get notified for any future reachable subtypes and will resolve the
                  * method in each subtype.
-                 * 
+                 *
                  * In both cases the context-insensitive invoke parameters are initialized with the
                  * corresponding declared type state. When a callee is resolved the method is parsed
                  * and the actual parameter type state is propagated to the formal parameters. Then
@@ -483,7 +475,7 @@ public AnalysisMethod addRootMethod(AnalysisMethod aMethod, boolean invokeSpecia
                      * Initialize the type flow of the invoke's actual parameters with the
                      * corresponding parameter declared type. Thus, when the invoke links callees it
                      * will propagate the parameter types too.
-                     * 
+                     *
                      * The parameter iteration skips the primitive parameters, as these are not
                      * modeled. The type flow of the receiver is set to the receiver type already
                      * when the invoke is created.

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/Timer.java

@@ -24,15 +24,8 @@
  */
 package com.oracle.graal.pointsto.util;
 
-import org.graalvm.compiler.serviceprovider.GraalServices;
-
 public class Timer {
-    private static boolean disablePrinting = false;
-
-    private String prefix;
-
     private final String name;
-    private final boolean autoPrint;
     /** Timer start time in nanoseconds. */
     private long startTime;
     /** Timer total time in nanoseconds. */
@@ -42,25 +35,11 @@ public class Timer {
 
     /**
      * Timers should only be instantiated via factory methods in TimerCollection.
-     * 
+     *
      * @see TimerCollection
      */
-    Timer(String prefix, String name, boolean autoPrint) {
-        this.prefix = prefix;
+    Timer(String name) {
         this.name = name;
-        this.autoPrint = autoPrint;
-    }
-
-    public static void disablePrinting() {
-        disablePrinting = true;
-    }
-
-    /**
-     * Registers the prefix to be used when {@linkplain Timer#print(long) printing} a timer. This
-     * allows the output of interlaced native image executions to be disambiguated.
-     */
-    public void setPrefix(String value) {
-        this.prefix = value;
     }
 
     public StopTimer start() {
@@ -72,30 +51,6 @@ public void stop() {
         long addTime = System.nanoTime() - startTime;
         totalTime += addTime;
         totalMemory = Runtime.getRuntime().totalMemory();
-        if (autoPrint) {
-            print(addTime);
-        }
-    }
-
-    private void print(long time) {
-        // TODO GR-35721
-        if (disablePrinting) {
-            return;
-        }
-        final String concurrentPrefix;
-        if (prefix != null) {
-            // Add the PID to further disambiguate concurrent builds of images with the same name
-            String pid = GraalServices.getExecutionID();
-            concurrentPrefix = String.format("[%s:%s] ", prefix, pid);
-        } else {
-            concurrentPrefix = "";
-        }
-        double totalMemoryGB = totalMemory / 1024.0 / 1024.0 / 1024.0;
-        System.out.format("%s%12s: %,10.2f ms, %,5.2f GB%n", concurrentPrefix, name, time / 1000000d, totalMemoryGB);
-    }
-
-    public void print() {
-        print(totalTime);
     }
 
     /** Get timer total time in milliseconds. */