[GR-36794] Solving a problem with with netty library initialization on renaissance 14.

PullRequest: graal/10985

Author: jovanstevanovic

substratevm/mx.substratevm/mx_substratevm_benchmark.py

@@ -60,39 +60,61 @@ def list_jars(path):
     return jars
 
 
+force_buildtime_init_slf4j_1_7_73 = '--initialize-at-build-time=org.slf4j,org.apache.log4j'
+force_runtime_init_netty_4_1_72 = '--initialize-at-run-time=io.netty.channel.unix,io.netty.channel.epoll,io.netty.handler.codec.http2,io.netty.handler.ssl,io.netty.internal.tcnative,io.netty.util.internal.logging.Log4JLogger'
 _RENAISSANCE_EXTRA_IMAGE_BUILD_ARGS = {
     'als'               : [
-                           '--allow-incomplete-classpath',
                            '--report-unsupported-elements-at-runtime',
-                           '--initialize-at-build-time=org.slf4j,org.apache.log4j', # mis-initialized from netty
-                           '--initialize-at-run-time=io.netty.channel.unix.IovArray,io.netty.channel.epoll.EpollEventLoop,io.netty.channel.unix.Errors,io.netty.channel.unix.Socket,io.netty.channel.unix.Limits'
+                            force_buildtime_init_slf4j_1_7_73,
+                            force_runtime_init_netty_4_1_72
                           ],
     'chi-square'        : [
-                           '--allow-incomplete-classpath',
                            '--report-unsupported-elements-at-runtime',
+                           force_buildtime_init_slf4j_1_7_73,
+                           force_runtime_init_netty_4_1_72
+                          ],
+    'finagle-chirper'   : [
+                            force_buildtime_init_slf4j_1_7_73,
+                            force_runtime_init_netty_4_1_72
                           ],
     'finagle-http'      : [
-                           '--allow-incomplete-classpath'
+                            force_buildtime_init_slf4j_1_7_73,
+                            force_runtime_init_netty_4_1_72
                           ],
     'log-regression'    : [
-                           '--allow-incomplete-classpath',
                            '--report-unsupported-elements-at-runtime',
+                           force_buildtime_init_slf4j_1_7_73,
+                           force_runtime_init_netty_4_1_72
                           ],
     'movie-lens'        : [
-                           '--allow-incomplete-classpath',
                            '--report-unsupported-elements-at-runtime',
+                           force_buildtime_init_slf4j_1_7_73,
+                           force_runtime_init_netty_4_1_72
                           ],
     'dec-tree'          : [
-                           '--allow-incomplete-classpath',
                            '--report-unsupported-elements-at-runtime',
+                           force_buildtime_init_slf4j_1_7_73,
+                           force_runtime_init_netty_4_1_72
                           ],
     'page-rank'         : [
-                           '--allow-incomplete-classpath',
-                           '--report-unsupported-elements-at-runtime'
+                           '--report-unsupported-elements-at-runtime',
+                           force_buildtime_init_slf4j_1_7_73,
+                           force_runtime_init_netty_4_1_72
                           ],
     'naive-bayes'       : [
-                            '--allow-incomplete-classpath',
-                            '--report-unsupported-elements-at-runtime'
+                            '--report-unsupported-elements-at-runtime',
+                            force_buildtime_init_slf4j_1_7_73,
+                            force_runtime_init_netty_4_1_72
+                          ],
+    'gauss-mix'       :   [
+                            '--report-unsupported-elements-at-runtime',
+                            force_buildtime_init_slf4j_1_7_73,
+                            force_runtime_init_netty_4_1_72
+                          ],
+    'neo4j-analytics':    [
+                            '--report-unsupported-elements-at-runtime',
+                            force_buildtime_init_slf4j_1_7_73,
+                            force_runtime_init_netty_4_1_72
                           ],
     'dotty'             : [
                             '-H:+AllowJRTFileSystem'
@@ -260,9 +282,11 @@ def standalone_jar_path(self, benchmark_name):
     def extra_run_arg(self, benchmark, args, image_run_args):
         run_args = super(RenaissanceNativeImageBenchmarkSuite, self).extra_run_arg(benchmark, args, image_run_args)
         if benchmark == "dotty" and self.version() not in ["0.9.0", "0.10.0", "0.11.0", "0.12.0", "0.13.0"]:
-            # Before Renaissance 0.14.0, we had all dependencies on a classpath. As of Renaissance 0.14.0, we use
-            # the standalone mode which, requires building a classpath for a scala-dotty on a runtime. For that
-            # purpose, we are specifying a path to a fatjar.
+            # Before Renaissance 0.14.0, mx was manually placing all dependencies on the same classpath at build time
+            # and at run time. As of Renaissance 0.14.0, we use the standalone mode which uses the classpath defined
+            # in the manifest file at build time only. Dotty is a special benchmark since it also needs to know
+            # this classpath at runtime to be able to perform compilations. The location of the fatjar must then be
+            # explicitly passed also to the final image.
             return ["-Djava.class.path={}".format(self.standalone_jar_path(self.benchmarkName()))] + run_args
         else: