remove -p BASOP from getWmops.sh and IvasBuildAndRunChecks.py (ced54b57) · Commits · IVAS Codec Public Collaboration / IVAS Codec

ci/complexity_measurements/getWmops.sh

+3 −12

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@
		# the United Nations Convention on Contracts on the International Sales of Goods.

		function usage {
		echo "Usage: $0 \"ivas-format(s)\" \"output-format(s)\" \"mode{full(default)\|mem_only}\" \"repo{float(default)\|basop}\" [wmops_ref_logfile]"
		echo "Usage: $0 \"ivas-format(s)\" \"output-format(s)\" \"mode{full(default)\|mem_only}\" [wmops_ref_logfile]"
		exit 1
		}

		@@ -49,17 +49,8 @@ if [ $# -ge 3 ]; then
		fi
		fi

		repo_arg_script=""
		if [ $# -ge 4 ]; then
		if [ "$4" = "basop" ]; then
		repo_arg_script="--basop"
		elif [ "$4" != "float" ]; then
		usage
		fi
		fi

		wmops_ref_logfile=""
		if [ $# -eq 5 ]; then
		if [ $# -eq 4 ]; then
		wmops_ref_logfile=$5
		fi

		@@ -91,7 +82,7 @@ if [ "$ivas_format" == "OSBA" ]; then
		fi

		# instrument and build
		./scripts/IvasBuildAndRunChecks.py $mode_arg_script $repo_arg_script -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc} -C $ivas_format $mode_arg -f ${ep} --oc $output_format
		./scripts/IvasBuildAndRunChecks.py $mode_arg_script -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc} -C $ivas_format $mode_arg -f ${ep} --oc $output_format
		ret_val=$?

		# TODO: only split wmops and ram files

scripts/IvasBuildAndRunChecks.py

+0 −6

Original line number	Diff line number	Diff line
		@@ -114,11 +114,6 @@ class IvasBuildAndRunChecks(IvasScriptsCommon.IvasScript):
		help="pass the '-s' argument to the wmc tool to only measure memory",
		action="store_true",
		)
		self.parser.add_argument(
		"--basop",
		help="build the basop version for instrumentation",
		action="store_true",
		)
		self.parser.add_argument(
		"-e",
		"--enc",
		@@ -199,7 +194,6 @@ class IvasBuildAndRunChecks(IvasScriptsCommon.IvasScript):
		formats_fname=self.args["format_file"],
		max_workers=self.args["max_workers"],
		mem_only=self.args["wmc_tool_mem_only"],
		basop=self.args["basop"],
		)
		else:
		br.add_check(

scripts/pyivastest/IvasSvnBuilder.py

+0 −12

Original line number	Diff line number	Diff line
		@@ -227,7 +227,6 @@ class IvasBuilder(IvasBaseClass):
		defines_to_disable=[],
		instrumented=False,
		mem_only=False,
		basop=False,
		):
		"""

		@@ -277,9 +276,6 @@ class IvasBuilder(IvasBaseClass):
		if mem_only:
		instrument_cmd.append("-m")
		instrument_cmd.append("mem_only")
		if basop:
		instrument_cmd.append("-p")
		instrument_cmd.append("basop")
		build_log.write(" ".join(instrument_cmd))
		build_log.write("\n")
		build_result = subprocess.run(
		@@ -649,7 +645,6 @@ class IvasSvnBuilder(IvasBuilder):
		defines_to_disable=[],
		instrumented=False,
		mem_only=False,
		basop=False,
		):
		"""

		@@ -679,7 +674,6 @@ class IvasSvnBuilder(IvasBuilder):
		defines_to_disable=defines_to_disable,
		instrumented=instrumented,
		mem_only=mem_only,
		basop=basop,
		)


		@@ -792,7 +786,6 @@ class IvasBuilderAndRunner(IvasBaseClass):
		max_workers=1,
		timeout=None,
		mem_only=False,
		basop=False,
		):
		"""

		@@ -838,7 +831,6 @@ class IvasBuilderAndRunner(IvasBaseClass):
		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
		self.build_and_run_dict[cfg_name]["basop"] = basop
		else:
		self.logger.console("Adding config {}".format(cfg_name), logging.INFO)
		run_dir = os.path.join(self.builder.src_dir, cfg_name)
		@@ -884,7 +876,6 @@ class IvasBuilderAndRunner(IvasBaseClass):
		"mem_only": mem_only,
		"make_options": make_options,
		"analyzer": new_analyzer,
		"basop": basop,
		}
		}
		self.build_and_run_dict.update(cfg_dict)
		@@ -1068,7 +1059,6 @@ class IvasBuilderAndRunner(IvasBaseClass):
		defines_to_disable=cfg["defines_to_disable"],
		instrumented=cfg["instrumented"],
		mem_only=cfg["mem_only"],
		basop=cfg["basop"],
		)
		self.build_and_run_dict[cfg_name]["runner"].encoder = self.builder.encoder
		self.build_and_run_dict[cfg_name]["runner"].decoder = self.builder.decoder
		@@ -1295,7 +1285,6 @@ class IvasBuilderAndRunner(IvasBaseClass):
		formats_fname="",
		max_workers=1,
		mem_only=False,
		basop=False,
		):
		"""

		@@ -1329,7 +1318,6 @@ class IvasBuilderAndRunner(IvasBaseClass):
		formats_fname=formats_fname,
		max_workers=max_workers,
		mem_only=mem_only,
		basop=basop,
		)

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