From 2650e4f3f47b211abab28745b11fac2219fa29a1 Mon Sep 17 00:00:00 2001 From: Andy Ayers Date: Mon, 1 Mar 2021 11:07:59 -0800 Subject: [PATCH 1/4] Make jitoption a common option in superpmi.py Also change from `--jitoption` to `-jitoption` per convention where options taking an arg have just one dash. Fixes #48919. --- src/coreclr/scripts/superpmi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/scripts/superpmi.py b/src/coreclr/scripts/superpmi.py index 8660dd27def889..f2787f74a5c1ae 100755 --- a/src/coreclr/scripts/superpmi.py +++ b/src/coreclr/scripts/superpmi.py @@ -233,6 +233,7 @@ superpmi_common_parser.add_argument("-spmi_log_file", help=spmi_log_file_help) superpmi_common_parser.add_argument("-jit_name", help="Specify the filename of the jit to use, e.g., 'clrjit_win_arm64_x64.dll'. Default is clrjit.dll/libclrjit.so") superpmi_common_parser.add_argument("--altjit", action="store_true", help="Set the altjit variables on replay.") +superpmi_common.parser.add_argument("-jitoption", action="append", help="Pass option through to the jit. Format is key=value, where key is the option name without leading COMPlus_") # subparser for collect collect_parser = subparsers.add_parser("collect", description=collect_description, parents=[core_root_parser, target_parser, superpmi_common_parser]) @@ -271,7 +272,6 @@ replay_common_parser.add_argument("-product_location", help=product_location_help) replay_common_parser.add_argument("--force_download", action="store_true", help=force_download_help) replay_common_parser.add_argument("-jit_ee_version", help=jit_ee_version_help) -replay_common_parser.add_argument("--jitoption", action="append", help="Pass option through to the jit. Format is key=value, where key is the option name without leading COMPlus_") # subparser for replay replay_parser = subparsers.add_parser("replay", description=replay_description, parents=[core_root_parser, target_parser, superpmi_common_parser, replay_common_parser]) From c6344a4bc228106080447ff08360093f7e168d8d Mon Sep 17 00:00:00 2001 From: Andy Ayers Date: Mon, 1 Mar 2021 12:19:55 -0800 Subject: [PATCH 2/4] fix typo --- src/coreclr/scripts/superpmi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/scripts/superpmi.py b/src/coreclr/scripts/superpmi.py index f2787f74a5c1ae..8714fb1b76a3b5 100755 --- a/src/coreclr/scripts/superpmi.py +++ b/src/coreclr/scripts/superpmi.py @@ -233,7 +233,7 @@ superpmi_common_parser.add_argument("-spmi_log_file", help=spmi_log_file_help) superpmi_common_parser.add_argument("-jit_name", help="Specify the filename of the jit to use, e.g., 'clrjit_win_arm64_x64.dll'. Default is clrjit.dll/libclrjit.so") superpmi_common_parser.add_argument("--altjit", action="store_true", help="Set the altjit variables on replay.") -superpmi_common.parser.add_argument("-jitoption", action="append", help="Pass option through to the jit. Format is key=value, where key is the option name without leading COMPlus_") +superpmi_common_parser.add_argument("-jitoption", action="append", help="Pass option through to the jit. Format is key=value, where key is the option name without leading COMPlus_") # subparser for collect collect_parser = subparsers.add_parser("collect", description=collect_description, parents=[core_root_parser, target_parser, superpmi_common_parser]) From d5442509dee7f58130f463f370b7488a54f7f40b Mon Sep 17 00:00:00 2001 From: Andy Ayers Date: Mon, 1 Mar 2021 15:05:19 -0800 Subject: [PATCH 3/4] fix where verification happens --- src/coreclr/scripts/superpmi.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/coreclr/scripts/superpmi.py b/src/coreclr/scripts/superpmi.py index 8714fb1b76a3b5..66beb3f1213d5c 100755 --- a/src/coreclr/scripts/superpmi.py +++ b/src/coreclr/scripts/superpmi.py @@ -2944,6 +2944,11 @@ def verify_superpmi_common_args(): lambda unused: True, "Unable to set spmi_log_file.") + coreclr_args.verify(args, + "jitoption", + lambda unused: True, + "Unable to set jitoption") + if coreclr_args.spmi_log_file is not None and not coreclr_args.sequential: print("-spmi_log_file requires --sequential") sys.exit(1) @@ -2977,11 +2982,6 @@ def verify_replay_common_args(): lambda unused: True, "Unable to set mch_files") - coreclr_args.verify(args, - "jitoption", - lambda unused: True, - "Unable to set jitoption") - if coreclr_args.mode == "collect": verify_target_args() From cb6e94c8abb4b30d8e0ad2c06dc508fc4df4251c Mon Sep 17 00:00:00 2001 From: Kunal Pathak Date: Mon, 1 Mar 2021 15:12:56 -0800 Subject: [PATCH 4/4] Add the missing _ --- eng/pipelines/coreclr/templates/superpmi-job.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/coreclr/templates/superpmi-job.yml b/eng/pipelines/coreclr/templates/superpmi-job.yml index 71b31ea2c151a0..e0c691844bc426 100644 --- a/eng/pipelines/coreclr/templates/superpmi-job.yml +++ b/eng/pipelines/coreclr/templates/superpmi-job.yml @@ -86,8 +86,8 @@ jobs: - template: /eng/pipelines/common/download-artifact-step.yml parameters: unpackFolder: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).x64.$(buildConfigUpper)' - artifactFileName: 'CoreCLRProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_x64_$(buildConfig)$(archiveExtension)' - artifactName: 'CoreCLRProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_x64_$(buildConfig)' + artifactFileName: 'CoreCLRProduct__${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_x64_$(buildConfig)$(archiveExtension)' + artifactName: 'CoreCLRProduct__${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_x64_$(buildConfig)' displayName: 'Coreclr product build (x64)' # # Download and unzip managed test artifacts