Add compare subcommand (#623)

* Move for better visibility

* Add compare subparser

* Add subcommand compare

* Fix test

* Add ticket

* add --files option and minor fix

* Fix tests

* Add unit tests

* Address feedback

* Fix minor error and add section header

src/c++/perf_analyzer/genai-perf/genai_perf/main.py

@@ -136,15 +136,19 @@ def finalize(profile_export_file: Path):
 # to assert correct errors and messages.
 def run():
     try:
+        # TMA-1900: refactor CLI handler
         init_logging()
         args, extra_args = parser.parse_args()
-        create_artifacts_dirs(args.generate_plots)
-        tokenizer = get_tokenizer(args.tokenizer)
-        generate_inputs(args, tokenizer)
-        args.func(args, extra_args)
-        data_parser = calculate_metrics(args, tokenizer)
-        report_output(data_parser, args)
-        finalize(args.profile_export_file)
+        if args.subcommand == "compare":
+            args.func(args)
+        else:
+            create_artifacts_dirs(args.generate_plots)
+            tokenizer = get_tokenizer(args.tokenizer)
+            generate_inputs(args, tokenizer)
+            args.func(args, extra_args)
+            data_parser = calculate_metrics(args, tokenizer)
+            report_output(data_parser, args)
+            finalize(args.profile_export_file)
     except Exception as e:
         raise GenAIPerfException(e)
 

src/c++/perf_analyzer/genai-perf/genai_perf/parser.py

@@ -41,6 +41,29 @@
 _endpoint_type_map = {"chat": "v1/chat/completions", "completions": "v1/completions"}
 
 
+def _check_model_args(
+    parser: argparse.ArgumentParser, args: argparse.Namespace
+) -> argparse.Namespace:
+    """
+    Check if model name is provided.
+    """
+    if not args.subcommand and not args.model:
+        parser.error("The -m/--model option is required and cannot be empty.")
+    return args
+
+
+def _check_compare_args(
+    parser: argparse.ArgumentParser, args: argparse.Namespace
+) -> argparse.Namespace:
+    """
+    Check compare subcommand args
+    """
+    if args.subcommand == "compare":
+        if not args.config and not args.files:
+            parser.error("Either the --config or --files option must be specified.")
+    return args
+
+
 def _check_conditional_args(
     parser: argparse.ArgumentParser, args: argparse.Namespace
 ) -> argparse.Namespace:
@@ -93,13 +116,6 @@ def _check_conditional_args(
     return args
 
 
-def _prune_args(args: argparse.Namespace) -> argparse.Namespace:
-    """
-    Prune the parsed arguments to remove args with None.
-    """
-    return argparse.Namespace(**{k: v for k, v in vars(args).items() if v is not None})
-
-
 def _update_load_manager_args(args: argparse.Namespace) -> argparse.Namespace:
     """
     Update genai-perf load manager attributes to PA format
@@ -126,15 +142,6 @@ def _convert_str_to_enum_entry(args, option, enum):
     return args
 
 
-### Handlers ###
-
-
-def handler(args, extra_args):
-    from genai_perf.wrapper import Profiler
-
-    Profiler.run(args=args, extra_args=extra_args)
-
-
 ### Parsers ###
 
 
@@ -280,7 +287,7 @@ def _add_endpoint_args(parser):
         "-m",
         "--model",
         type=str,
-        required=True,
+        default=None,
         help=f"The name of the model to benchmark.",
     )
 
@@ -393,7 +400,7 @@ def _add_other_args(parser):
 
 def get_extra_inputs_as_dict(args: argparse.Namespace) -> dict:
     request_inputs = {}
-    if hasattr(args, "extra_inputs"):
+    if args.extra_inputs:
         for input_str in args.extra_inputs:
             semicolon_count = input_str.count(":")
             if semicolon_count != 1:
@@ -431,6 +438,47 @@ def get_extra_inputs_as_dict(args: argparse.Namespace) -> dict:
     return request_inputs
 
 
+def _parse_compare_args(subparsers) -> argparse.ArgumentParser:
+    compare = subparsers.add_parser(
+        "compare",
+        description="Subcommand to generate plots that compare multiple profile runs.",
+    )
+    compare_group = compare.add_argument_group("Compare")
+    mx_group = compare_group.add_mutually_exclusive_group(required=False)
+    mx_group.add_argument(
+        "--config",
+        type=Path,
+        default=None,
+        help="The path to the YAML file that specifies plot configurations for "
+        "comparing multiple runs.",
+    )
+    mx_group.add_argument(
+        "-f",
+        "--files",
+        nargs="+",
+        default=[],
+        help="List of paths to the profile export JSON files. Users can specify "
+        "this option instead of the `--config` option if they would like "
+        "GenAI-Perf to generate default plots as well as initial YAML config file.",
+    )
+    compare.set_defaults(func=compare_handler)
+    return compare
+
+
+### Handlers ###
+
+
+def profile_handler(args, extra_args):
+    from genai_perf.wrapper import Profiler
+
+    Profiler.run(args=args, extra_args=extra_args)
+
+
+def compare_handler(args: argparse.Namespace):
+    # TMA-1893: parse yaml file
+    pass
+
+
 ### Entrypoint ###
 
 
@@ -442,7 +490,7 @@ def parse_args():
         description="CLI to profile LLMs and Generative AI models with Perf Analyzer",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,
     )
-    parser.set_defaults(func=handler)
+    parser.set_defaults(func=profile_handler)
 
     # Conceptually group args for easier visualization
     _add_endpoint_args(parser)
@@ -451,6 +499,12 @@ def parse_args():
     _add_output_args(parser)
     _add_other_args(parser)
 
+    # Add subcommands
+    subparsers = parser.add_subparsers(
+        help="List of subparser commands.", dest="subcommand"
+    )
+    compare_parser = _parse_compare_args(subparsers)
+
     # Check for passthrough args
     if "--" in argv:
         passthrough_index = argv.index("--")
@@ -459,9 +513,10 @@ def parse_args():
         passthrough_index = len(argv)
 
     args = parser.parse_args(argv[1:passthrough_index])
+    args = _check_model_args(parser, args)
     args = _check_conditional_args(parser, args)
+    args = _check_compare_args(compare_parser, args)
     args = _update_load_manager_args(args)
     args = _convert_str_to_enum_entry(args, "prompt_source", PromptSource)
-    args = _prune_args(args)
 
     return args, argv[passthrough_index + 1 :]

src/c++/perf_analyzer/genai-perf/genai_perf/wrapper.py

@@ -41,7 +41,7 @@ def add_protocol_args(args: Namespace):
         cmd = [""]
         if args.service_kind == "triton":
             cmd += ["-i", "grpc", "--streaming"]
-            if "u" not in vars(args).keys():
+            if not args.u:  # url
                 cmd += ["-u", f"{DEFAULT_GRPC_URL}"]
             if args.output_format == OutputFormat.TENSORRTLLM:
                 cmd += ["--shape", "max_tokens:1", "--shape", "text_input:1"]
@@ -75,6 +75,7 @@ def build_cmd(args: Namespace, extra_args: list[str] | None = None) -> list[str]
             "tokenizer",
             "endpoint_type",
             "generate_plots",
+            "subcommand",
         ]
 
         utils.remove_file(args.profile_export_file)
@@ -90,6 +91,8 @@ def build_cmd(args: Namespace, extra_args: list[str] | None = None) -> list[str]
         for arg, value in vars(args).items():
             if arg in skip_args:
                 pass
+            elif value is None:
+                pass
             elif value is False:
                 pass
             elif value is True:

src/c++/perf_analyzer/genai-perf/tests/test_cli.py

@@ -34,6 +34,9 @@
 
 
 class TestCLIArguments:
+    # ================================================
+    # GENAI-PERF COMMAND
+    # ================================================
     expected_help_output = (
         "CLI to profile LLMs and Generative AI models with Perf Analyzer"
     )
@@ -212,7 +215,7 @@ def test_load_level_mutually_exclusive(self, monkeypatch, capsys):
 
     def test_model_not_provided(self, monkeypatch, capsys):
         monkeypatch.setattr("sys.argv", ["genai-perf"])
-        expected_output = "the following arguments are required: -m/--model"
+        expected_output = "The -m/--model option is required and cannot be empty."
 
         with pytest.raises(SystemExit) as excinfo:
             parser.parse_args()
@@ -386,3 +389,56 @@ def test_repeated_extra_arg_warning(self, monkeypatch, args, expected_error):
             _ = parser.get_extra_inputs_as_dict(parsed_args)
 
         assert str(exc_info.value) == expected_error
+
+    # ================================================
+    # COMPARE SUBCOMMAND
+    # ================================================
+    expected_compare_help_output = (
+        "Subcommand to generate plots that compare multiple profile runs."
+    )
+
+    @pytest.mark.parametrize(
+        "args, expected_output",
+        [
+            (["-h"], expected_compare_help_output),
+            (["--help"], expected_compare_help_output),
+        ],
+    )
+    def test_compare_help_arguments_output_and_exit(
+        self, monkeypatch, args, expected_output, capsys
+    ):
+        monkeypatch.setattr("sys.argv", ["genai-perf", "compare"] + args)
+
+        with pytest.raises(SystemExit) as excinfo:
+            _ = parser.parse_args()
+
+        # Check that the exit was successful
+        assert excinfo.value.code == 0
+
+        # Capture that the correct message was displayed
+        captured = capsys.readouterr()
+        assert expected_output in captured.out
+
+    def test_compare_mutually_exclusive(self, monkeypatch, capsys):
+        args = ["genai-perf", "compare", "--config", "hello", "--files", "a", "b", "c"]
+        monkeypatch.setattr("sys.argv", args)
+        expected_output = "argument -f/--files: not allowed with argument --config"
+
+        with pytest.raises(SystemExit) as excinfo:
+            parser.parse_args()
+
+        assert excinfo.value.code != 0
+        captured = capsys.readouterr()
+        assert expected_output in captured.err
+
+    def test_compare_not_provided(self, monkeypatch, capsys):
+        args = ["genai-perf", "compare"]
+        monkeypatch.setattr("sys.argv", args)
+        expected_output = "Either the --config or --files option must be specified."
+
+        with pytest.raises(SystemExit) as excinfo:
+            parser.parse_args()
+
+        assert excinfo.value.code != 0
+        captured = capsys.readouterr()
+        assert expected_output in captured.err