Commit c6855044 authored by Jan Kiene's avatar Jan Kiene
Browse files

add argument to IvasBuildAndRunChecks to instrument mem only

parent 66a87859
Loading
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -95,6 +95,11 @@ class IvasBuildAndRunChecks(IvasScriptsCommon.IvasScript):
            help="suppression file for undef behaviour sanitizer",
            default=None,
        )
        self.parser.add_argument(
            "--wmc_tool_mem_only",
            help="pass the '-s' argument to the wmc tool to only measure memory",
            action="store_true",
        )

    def run(self):

@@ -159,6 +164,7 @@ class IvasBuildAndRunChecks(IvasScriptsCommon.IvasScript):
                    format_select_list=modes,
                    formats_fname=self.args["format_file"],
                    max_workers=self.args["max_workers"],
                    mem_only=self.args["wmc_tool_mem_only"],
                )
            else:
                br.add_check(
+10 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ class IvasBuilder(IvasBaseClass):
        defines_to_enable=[],
        defines_to_disable=[],
        instrumented=False,
        mem_only=False,
    ):
        """

@@ -272,6 +273,8 @@ class IvasBuilder(IvasBaseClass):
            instrument_cmd = [
                os.path.join(self.src_dir, "scripts", "prepare_instrumentation.sh")
            ]
            if mem_only:
                instrument_cmd.append("mem_only")
            build_log.write(" ".join(instrument_cmd))
            build_log.write("\n")
            build_result = subprocess.run(
@@ -640,6 +643,7 @@ class IvasSvnBuilder(IvasBuilder):
        defines_to_enable=[],
        defines_to_disable=[],
        instrumented=False,
        mem_only=False,
    ):
        """

@@ -668,6 +672,7 @@ class IvasSvnBuilder(IvasBuilder):
            defines_to_enable=defines_to_enable,
            defines_to_disable=defines_to_disable,
            instrumented=instrumented,
            mem_only=mem_only,
        )


@@ -775,6 +780,7 @@ class IvasBuilderAndRunner(IvasBaseClass):
        formats_fname="",
        max_workers=1,
        timeout=None,
        mem_only=False,
    ):
        """

@@ -818,6 +824,7 @@ class IvasBuilderAndRunner(IvasBaseClass):
            self.build_and_run_dict[cfg_name]["defines_to_enable"] = defines_to_enable
            self.build_and_run_dict[cfg_name]["defines_to_disable"] = defines_to_disable
            self.build_and_run_dict[cfg_name]["instrumented"] = instrumented
            self.build_and_run_dict[cfg_name]["mem_only"] = mem_only
            self.build_and_run_dict[cfg_name]["make_options"] = make_options
        else:
            self.logger.console("Adding config {}".format(cfg_name), logging.INFO)
@@ -1045,6 +1052,7 @@ class IvasBuilderAndRunner(IvasBaseClass):
                defines_to_enable=cfg["defines_to_enable"],
                defines_to_disable=cfg["defines_to_disable"],
                instrumented=cfg["instrumented"],
                mem_only=cfg["mem_only"],
            )
            self.build_and_run_dict[cfg_name]["runner"].encoder = self.builder.encoder
            self.build_and_run_dict[cfg_name]["runner"].decoder = self.builder.decoder
@@ -1245,6 +1253,7 @@ class IvasBuilderAndRunner(IvasBaseClass):
        defines_to_disable=None,
        formats_fname="",
        max_workers=1,
        mem_only=False,
    ):
        """

@@ -1277,6 +1286,7 @@ class IvasBuilderAndRunner(IvasBaseClass):
            defines_to_disable=defines_to_disable_check,
            formats_fname=formats_fname,
            max_workers=max_workers,
            mem_only=mem_only,
        )

    # TODO: this is used nowhere, is this still needed?