Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Crossgen2's -O option in Test Builds Wherever Possible #89223

Merged
merged 8 commits into from
Aug 1, 2023
Merged

Remove Crossgen2's -O option in Test Builds Wherever Possible #89223

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8ad3d89
Removed the Crossgen2 -O option from CLRTest.CrossGen.targets file.
ivdiazsa Jul 19, 2023
7abb8ab
Removed the remaining Crossgen2-related -O's I could find. Not sure if
ivdiazsa Jul 24, 2023
abb6af0
Restored the ReadyToRunCompiler -O option because some NativeAOT tests
ivdiazsa Jul 26, 2023
f38b764
Restored crossgen-corelib.proj's -O because extra-platforms is still …
ivdiazsa Jul 27, 2023
e006df2
Restored the -O in a python script to see if Mono stops being an
ivdiazsa Jul 28, 2023
e51bc9e
Restored even the original change just to see whether there is
ivdiazsa Jul 31, 2023
298fd4d
Merge branch 'main' into obsolete-optimization
ivdiazsa Jul 31, 2023
abd20ef
Removed the -O's from Crossgen2 again after discovering the
ivdiazsa Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/coreclr/crossgen-corelib.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@
<CrossGenDllCmd>$(CrossGenDllCmd) --targetarch:$(TargetArchitecture)</CrossGenDllCmd>
<CrossGenDllCmd>$(CrossGenDllCmd) --targetos:$(TargetOS)</CrossGenDllCmd>
<CrossGenDllCmd Condition="'$(UsingToolIbcOptimization)' != 'true' and '$(EnableNgenOptimization)' == 'true'">$(CrossGenDllCmd) -m:$(MergedMibcPath) --embed-pgo-data</CrossGenDllCmd>
<CrossGenDllCmd>$(CrossGenDllCmd) -O</CrossGenDllCmd>
<CrossGenDllCmd Condition="'$(Configuration)' == 'Debug' or '$(Configuration)' == 'Checked'">$(CrossGenDllCmd) --verify-type-and-field-layout</CrossGenDllCmd>
<CrossGenDllCmd>$(CrossGenDllCmd) @(CoreLib)</CrossGenDllCmd>
</PropertyGroup>
Expand Down
2 changes: 0 additions & 2 deletions src/tasks/Crossgen2Tasks/RunReadyToRunCompiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,6 @@ private string GenerateCrossgen2ResponseFile()
result.AppendLine($"--targetarch:{Crossgen2Tool.GetMetadata(MetadataKeys.TargetArch)}");
}

result.AppendLine("-O");

// 5.0 Crossgen2 doesn't support PDB generation.
if (!Crossgen2IsVersion5 && _emitSymbols)
{
Expand Down
4 changes: 1 addition & 3 deletions src/tests/Common/CLRTest.CrossGen.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
***********************************************************************************************
CLRTest.Execute.targets
CLRTest.CrossGen.targets

WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
created a backup copy. Incorrect changes to this file will make it
Expand Down Expand Up @@ -113,7 +113,6 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
fi
echo --targetarch:$(TargetArchitecture)>>$__ResponseFile
echo --targetos:$(TargetOS)>>$__ResponseFile
echo -O>>$__ResponseFile

echo "Response file: $__ResponseFile"
cat $__ResponseFile
Expand Down Expand Up @@ -263,7 +262,6 @@ if defined RunCrossGen2 (
echo -r:!CORE_ROOT!\xunit.*.dll>>!__ResponseFile!
echo -r:!CORE_ROOT!\mscorlib.dll>>!__ResponseFile!
echo -r:!CORE_ROOT!\netstandard.dll>>!__ResponseFile!
echo -O>>!__ResponseFile!

if not "$(__CreatePdb)" == "" (
echo --pdb>>!__ResponseFile!
Expand Down
1 change: 0 additions & 1 deletion src/tests/Common/scripts/crossgen2_comparison.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,6 @@ def _build_args_crossgen_il_file(self, il_filename, ni_filename, platform_assemb
args.append(self.crossgen_executable_filename)
args.append('-r')
args.append('"' + platform_assemblies_paths + self.platform_directory_sep + '*.dll"' )
args.append('-O')
args.append('--determinism-stress')
args.append('6')
args.append('--map')
Expand Down