From de9bea4a0023f7e3e9d487f37867e1976457b5da Mon Sep 17 00:00:00 2001 From: Kirill Podoprigora Date: Thu, 7 Mar 2024 20:32:59 +0200 Subject: [PATCH] gh-116000: Make optimizer_generator work without any arguments --- Tools/cases_generator/optimizer_generator.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Tools/cases_generator/optimizer_generator.py b/Tools/cases_generator/optimizer_generator.py index fca42b51fbd689..a0a2f10aa760b7 100644 --- a/Tools/cases_generator/optimizer_generator.py +++ b/Tools/cases_generator/optimizer_generator.py @@ -27,7 +27,7 @@ from stack import Stack, SizeMismatch, UNUSED DEFAULT_OUTPUT = ROOT / "Python/optimizer_cases.c.h" -DEFAULT_ABSTRACT_INPUT = ROOT / "Python/optimizer_bytecodes.c" +DEFAULT_ABSTRACT_INPUT = (ROOT / "Python/optimizer_bytecodes.c").absolute().as_posix() def validate_uop(override: Uop, uop: Uop) -> None: @@ -214,19 +214,22 @@ def generate_tier2_abstract_from_files( ) -arg_parser.add_argument("input", nargs=1, help="Abstract interpreter definition file") +arg_parser.add_argument("input", nargs='*', help="Abstract interpreter definition file") arg_parser.add_argument( - "base", nargs=argparse.REMAINDER, help="The base instruction definition file(s)" + "base", nargs="*", help="The base instruction definition file(s)" ) arg_parser.add_argument("-d", "--debug", help="Insert debug calls", action="store_true") if __name__ == "__main__": args = arg_parser.parse_args() - if len(args.base) == 0: - args.input.append(DEFAULT_INPUT) + if not args.input: + args.base.append(DEFAULT_INPUT) args.input.append(DEFAULT_ABSTRACT_INPUT) + else: + args.base.append(args.input[-1]) + args.input.pop() abstract = analyze_files(args.input) base = analyze_files(args.base) with open(args.output, "w") as outfile: