diff --git a/eng/pipelines/runtime-perf-jobs.yml b/eng/pipelines/runtime-perf-jobs.yml index 0c40ee82157..b73b3fcf4a2 100644 --- a/eng/pipelines/runtime-perf-jobs.yml +++ b/eng/pipelines/runtime-perf-jobs.yml @@ -61,7 +61,6 @@ jobs: # Build and run iOS Mono and NativeAOT scenarios - template: /eng/pipelines/runtime-ios-scenarios-perf-jobs.yml parameters: - hybridGlobalization: True runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} performanceRepoAlias: ${{ parameters.performanceRepoAlias }} jobParameters: ${{ parameters.jobParameters }} diff --git a/eng/pipelines/templates/run-performance-job.yml b/eng/pipelines/templates/run-performance-job.yml index c56940fa5dd..b95698a7075 100644 --- a/eng/pipelines/templates/run-performance-job.yml +++ b/eng/pipelines/templates/run-performance-job.yml @@ -37,7 +37,6 @@ parameters: isScenario: false # optional -- Whether the job is a scenario job runEnvVars: [] # optional -- Environment variables to set for the benchmark runtimeFlavor: '' # optional -- Runtime flavor used for scenarios - hybridGlobalization: false # optional -- Globalization used for scenarios osVersion: '' # optional -- OS version to run on dotnetVersionLink: '' # optional -- Link to file containing .NET Versions (use dotnetVersionsLinks). Ignored if dotnetVersionsLinks or channels is non-empty projectFileName: 'helix.proj' # optional -- Name of Helix project file in /eng/performance directory @@ -185,8 +184,6 @@ jobs: - "--run-env-vars ${{ join(' ', parameters.runEnvVars)}}" - ${{ if and(in(parameters.runKind, 'maui_scenarios_ios', 'maui_scenarios_android'), ne(parameters.runtimeFlavor, '')) }}: - '--runtime-flavor ${{ parameters.runtimeFlavor }}' - - ${{ if eq(parameters.hybridGlobalization, true) }}: - - '--hybrid-globalization' - ${{ if ne(parameters.osVersion, '') }}: - '--os-version ${{ parameters.osVersion }}' - ${{ if ne(parameters.dotnetVersionLink, '') }}: diff --git a/eng/pipelines/templates/runtime-perf-job.yml b/eng/pipelines/templates/runtime-perf-job.yml index f9036c87354..f33599cc46e 100644 --- a/eng/pipelines/templates/runtime-perf-job.yml +++ b/eng/pipelines/templates/runtime-perf-job.yml @@ -13,7 +13,6 @@ parameters: linkingType: '' # dynamic is default iOSLlvmBuild: 'False' iOSStripSymbols: 'False' - hybridGlobalization: 'False' isScenario: false downloadSpecificBuild: null # buildId, pipeline, branchName, project crossBuild: false diff --git a/scripts/run_performance_job.py b/scripts/run_performance_job.py index 5885564f1b4..64d18b14c2f 100644 --- a/scripts/run_performance_job.py +++ b/scripts/run_performance_job.py @@ -100,7 +100,6 @@ class RunPerformanceJobArgs: only_sanity_check: bool = False ios_llvm_build: bool = False ios_strip_symbols: bool = False - hybrid_globalization: bool = False javascript_engine: str = "NoJS" send_to_helix: bool = False channel: Optional[str] = None @@ -426,7 +425,6 @@ def get_run_configurations( pgo_run_type: Optional[str] = None, physical_promotion_run_type: Optional[str] = None, r2r_run_type: Optional[str] = None, - hybrid_globalization: bool = False, experiment_name: Optional[str] = None, linking_type: Optional[str] = None, runtime_flavor: Optional[str] = None, @@ -460,9 +458,6 @@ def get_run_configurations( if r2r_run_type == "nor2r": configurations["R2RType"] = "nor2r" - if hybrid_globalization: - configurations["HybridGlobalization"] = "True" - if experiment_name is not None: configurations["ExperimentName"] = experiment_name @@ -653,7 +648,7 @@ def run_performance_job(args: RunPerformanceJobArgs): configurations = get_run_configurations( args.run_kind, args.runtime_type, args.codegen_type, args.pgo_run_type, args.physical_promotion_run_type, - args.r2r_run_type, args.hybrid_globalization, args.experiment_name, args.linking_type, + args.r2r_run_type, args.experiment_name, args.linking_type, args.runtime_flavor, args.ios_llvm_build, args.ios_strip_symbols, args.javascript_engine ) @@ -1004,7 +999,6 @@ def publish_dotnet_app_to_payload(payload_dir_name, csproj_path, self_contained= os.environ["Python"] = agent_python os.environ["RuntimeFlavor"] = args.runtime_flavor or '' os.environ["CodegenType"] = args.codegen_type or '' - os.environ["HybridGlobalization"] = str(args.hybrid_globalization) # TODO: See if these commands are needed for linux as they were being called before but were failing. if args.os_group == "windows" or args.os_group == "osx": @@ -1150,7 +1144,6 @@ def get_work_item_command_for_artifact_dir(artifact_dir: str): runtime_flavor=args.runtime_flavor or "", codegen_type=args.codegen_type or "", linking_type=args.linking_type or "", - hybrid_globalization=args.hybrid_globalization, target_csproj=args.target_csproj, work_item_command=work_item_command or None, baseline_work_item_command=baseline_work_item_command or None, @@ -1202,7 +1195,6 @@ def main(argv: List[str]): "--compare": "compare", "--ios-llvm-build": "ios_llvm_build", "--ios-strip-symbols": "ios_strip_symbols", - "--hybrid-globalization": "hybrid_globalization", "--send-to-helix": "send_to_helix", "--performance-repo-ci": "performance_repo_ci", "--only-sanity": "only_sanity_check", diff --git a/scripts/send_to_helix.py b/scripts/send_to_helix.py index 37c9bab4ed4..45b1f0a2068 100644 --- a/scripts/send_to_helix.py +++ b/scripts/send_to_helix.py @@ -69,7 +69,6 @@ class PerfSendToHelixArgs: runtime_flavor: Optional[str] = None codegen_type: Optional[str] = None linking_type: Optional[str] = None - hybrid_globalization: Optional[bool] = None python: Optional[str] = None affinity: Optional[str] = None ios_strip_symbols: Optional[bool] = None @@ -112,7 +111,6 @@ def set_env_var(name: str, value: Union[str, bool, List[str], timedelta, int, No set_env_var("RuntimeFlavor", self.runtime_flavor) set_env_var("CodegenType", self.codegen_type) set_env_var("LinkingType", self.linking_type) - set_env_var("HybridGlobalization", self.hybrid_globalization) set_env_var("iOSStripSymbols", self.ios_strip_symbols) set_env_var("iOSLlvmBuild", self.ios_llvm_build) set_env_var("TargetCsproj", self.target_csproj) diff --git a/src/scenarios/shared/precommands.py b/src/scenarios/shared/precommands.py index 1c39be65dfa..952a0e62cc3 100644 --- a/src/scenarios/shared/precommands.py +++ b/src/scenarios/shared/precommands.py @@ -93,7 +93,6 @@ def __init__(self): self.framework = args.framework self.runtime_identifier = args.runtime self.nativeaot = args.nativeaot - self.hybridglobalization = args.hybridglobalization self.msbuild = args.msbuild print(self.msbuild) self.msbuildstatic = args.msbuildstatic @@ -158,10 +157,6 @@ def add_common_arguments(self, parser: ArgumentParser): dest='nativeaot', metavar='nativeaot', help='use Native AOT runtime for build or publish') - parser.add_argument('-g', '--hybrid-globalization', - dest='hybridglobalization', - metavar='hybridglobalization', - help='use hybrid globalization for build or publish') parser.add_argument('--msbuild', dest='msbuild', metavar='msbuild', @@ -218,8 +213,6 @@ def execute(self, build_args: List[str] = []): if self.nativeaot: build_args.append('/p:PublishAot=true') build_args.append('/p:PublishAotUsingRuntimePack=true') - if self.hybridglobalization: - build_args.append('/p:HybridGlobalization=true') build_args.append("/p:EnableWindowsTargeting=true") self._publish(configuration=self.configuration, runtime_identifier=self.runtime_identifier, framework=self.framework, output=self.output, build_args=build_args) if self.operation == CROSSGEN: