Fix minor issue in uploading to r8-perf-results bucket

This also fixes an issue when gc data is not present on go/r8perf.

Change-Id: I0c1ad5438b222bb0d1dec9166149fa1d4cfcac4c

tools/perf.py

diff --git a/tools/perf.py b/tools/perf.py
index 3d8ff9a..36b36dc 100755
--- a/tools/perf.py
+++ b/tools/perf.py
@@ -145,6 +145,7 @@
     },
     'SystemUIAppGcNoLib': {
         'alias': 'SystemUIAppGc',
+        'targets': ['r8-full'],
         'variant': 'nolib'
     },
     'SystemUIAppPartial': {
@@ -415,10 +416,6 @@
         for benchmark in options.benchmarks:
             benchmark_info = ALL_BENCHMARKS[benchmark]
             benchmark_to_run = benchmark_info.get('alias', benchmark)
-            # If an alias is present, then include all properties from it.
-            if benchmark_to_run != benchmark:
-                benchmark_to_run_info = ALL_BENCHMARKS[benchmark_to_run]
-                benchmark_info = benchmark_to_run_info | benchmark_info
             targets = [options.target
                       ] if options.target else benchmark_info['targets']
             variant = benchmark_info.get('variant', 'lib')

tools/perf/r8.html

diff --git a/tools/perf/r8.html b/tools/perf/r8.html
index 26844ee..d20ae4f 100644
--- a/tools/perf/r8.html
+++ b/tools/perf/r8.html
@@ -106,7 +106,10 @@
               selectedBenchmark,
               filteredCommits[i],
               "gc_old_time",
-              (results) => dom.transformRuntimeData(results).ns_to_s(),
+              (results) => {
+                const result = dom.transformRuntimeData(results);
+                return isNaN(result) ? result : result.ns_to_s();
+              },
             ),
           );
           const gcYoungCountData = filteredCommits.map((c, i) =>
@@ -121,7 +124,10 @@
               selectedBenchmark,
               filteredCommits[i],
               "gc_young_time",
-              (results) => dom.transformRuntimeData(results).ns_to_s(),
+              (results) => {
+                const result = dom.transformRuntimeData(results);
+                return isNaN(result) ? result : result.ns_to_s();
+              },
             ),
           );
           const instructionCodeSizeData = filteredCommits.map((c, i) =>