[GR-32846] Update to C1Visualizer 1.10.

PullRequest: graal/10780

Author: dougxc

compiler/mx.compiler/mx_graal_tools.py

@@ -82,10 +82,11 @@ def igv(args):
 def c1visualizer(args):
     """run the C1 Compiler Visualizer"""
     v8u40 = mx.VersionSpec("1.8.0_40")
+    v12 = mx.VersionSpec("12")
     def _c1vJdkVersionCheck(version):
-        return version >= v8u40 and str(version).startswith('1.8.0')
+        return version >= v8u40 and version < v12
     env = dict(os.environ)
-    env['jdkhome'] = mx.get_jdk(_c1vJdkVersionCheck, versionDescription='(1.8 JDK that is >= 1.8.0u40 )', purpose="running C1 Visualizer").home
+    env['jdkhome'] = mx.get_jdk(_c1vJdkVersionCheck, versionDescription='(JDK that is >= 1.8.0u40 and <= 11)', purpose="running C1 Visualizer").home
     run_netbeans_app('C1Visualizer', env, args() if callable(args) else args)
 
 def hsdis(args, copyToDir=None):

compiler/mx.compiler/suite.py

@@ -96,8 +96,8 @@
     },
 
     "C1VISUALIZER_DIST" : {
-      "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/c1visualizer/c1visualizer-1.7.zip"],
-      "sha1" : "305a772ccbdc0e42dfa233b0ce6762d0dd1de6de",
+      "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/c1visualizer/c1visualizer-1.10.zip"],
+      "sha1" : "548e383a732944a84456c2caf36b163b9a8db495",
       "packedResource": True,
     },
 

compiler/src/org.graalvm.compiler.options/src/org/graalvm/compiler/options/Option.java

@@ -37,7 +37,7 @@
  *
  * @see OptionDescriptor
  */
-@Retention(RetentionPolicy.CLASS)
+@Retention(RetentionPolicy.SOURCE)
 @Target(ElementType.FIELD)
 public @interface Option {
 

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

@@ -591,7 +591,7 @@ def validateReturnCode(self, retcode):
 
     def postprocessRunArgs(self, benchname, runArgs):
         parser = argparse.ArgumentParser(add_help=False)
-        parser.add_argument("-n", default=None)
+        parser.add_argument("-n", "--iterations", default=None)
         parser.add_argument("-s", "--size", default=None)
         args, remaining = parser.parse_known_args(runArgs)
 
@@ -606,10 +606,10 @@ def postprocessRunArgs(self, benchname, runArgs):
 
         otherArgs = ["-s", self.workloadSize()] + remaining
 
-        if args.n:
-            if args.n.isdigit():
-                return ["-n", args.n] + otherArgs
-            if args.n == "-1":
+        if args.iterations:
+            if args.iterations.isdigit():
+                return ["-n", args.iterations] + otherArgs
+            if args.iterations == "-1":
                 return None
         else:
             iterations = self.daCapoIterations()[benchname]
@@ -635,10 +635,10 @@ def createCommandLineArgs(self, benchmarks, bmSuiteArgs):
 
     def repairDatapoints(self, benchmarks, bmSuiteArgs, partialResults):
         parser = argparse.ArgumentParser(add_help=False)
-        parser.add_argument("-n", default=None)
+        parser.add_argument("-n", "--iterations", default=None)
         args, _ = parser.parse_known_args(self.runArgs(bmSuiteArgs))
-        if args.n and args.n.isdigit():
-            iterations = int(args.n)
+        if args.iterations and args.iterations.isdigit():
+            iterations = int(args.iterations)
         else:
             iterations = self.daCapoIterations()[benchmarks[0]]
             iterations = iterations + self.getExtraIterationCount(iterations)