Fixing path to image build stats when using bundles.

Author: Maja Skoko

vm/mx.vm/mx_vm_benchmark.py

@@ -181,6 +181,7 @@ def __init__(self, vm, bm_suite, args):
 
             self.base_image_build_args += self.system_properties
             self.bundle_path = self.get_bundle_path_if_present()
+            self.bundle_create_path = self.get_bundle_create_path_if_present()
             if not self.bundle_path:
                 self.base_image_build_args += self.classpath_arguments
                 self.base_image_build_args += self.executable
@@ -189,8 +190,12 @@ def __init__(self, vm, bm_suite, args):
             self.base_image_build_args += ['-H:+PrintAnalysisStatistics']
             self.base_image_build_args += ['-H:+PrintCallEdges']
             self.base_image_build_args += ['-H:+CollectImageBuildStatistics']
+
             self.image_build_reports_directory = os.path.join(self.output_dir, 'reports')
+            if self.bundle_create_path is not None:
+                self.image_build_reports_directory = os.path.join(self.output_dir, self.bundle_create_path)
             self.image_build_stats_file = os.path.join(self.image_build_reports_directory, 'image_build_statistics.json')
+
             if vm.is_quickbuild:
                 self.base_image_build_args += ['-Ob']
             if vm.use_string_inlining:
@@ -232,6 +237,16 @@ def get_bundle_path_if_present(self):
             if len(bundle_arg) == 1:
                 bp = bundle_arg[0][len(bundle_apply_arg):]
                 return bp
+
+            return None
+
+        def get_bundle_create_path_if_present(self):
+            bundle_create_arg = "--bundle-create"
+            bundle_arg_idx = [idx for idx, arg in enumerate(self.extra_image_build_arguments) if arg.startswith(bundle_create_arg)]
+            if len(bundle_arg_idx) == 1:
+                bp = join(self.extra_image_build_arguments[bundle_arg_idx[0] + 1] + ".output", "default", "reports")
+                return bp
+
             return None
 
     def __init__(self, name, config_name, extra_java_args=None, extra_launcher_args=None, **kwargs):