Skip to content

Commit

Permalink
Preparation for JIT\Regression test merging - assembly/file renames (#…
Browse files Browse the repository at this point in the history
…79489)

This is a collection of renames that can be merged independently of actual test merging.  Automated changes were done with the ILTransform tool (started by @trylek, my version at https://github.com/markples/utils/tree/for-PR-dotnet-runtime-79489, commit 131b3764).

- ILTransform -p
    - Standardize project suffixes since _d, etc., are special cases for test merging but -dbg is not
    - Rename a few tests where the project and IL files had CaSiNg differences
- ILTransform -ilfile
    - Rename IL files to match the .ilproj root name (which excludes suffixes such as _d)
    - Update the project files to refer to the new filenames using $(MSBuildProjectName) except src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557 where the IL file doesn't have the suffix
- ILTransform -m
    - Remove all .module (including extern) lines from IL files
- ILTransform -a
    - Rename IL .assembly names to match their filenames
    - Some lines were `.assembly foo // as "foo"` - remove those comments too
- ILTransform -n -a -ilfile
    - Deduplicate project names across JIT/Regression
        - If a set of duplicates is simply one csproj and one ilproj, then add _il to the ilproj and leave the csproj alone
        - Otherwise append the difference in the closest different directory names.  For example:
            - V1-M11-Beta1/b40347/b40347.ilproj -> b40347_M11-Beta1.ilproj
            - V1-M12-Beta2/b40347/b40347.ilproj -> b40347_M12-Beta2.ilproj
        - However, avoid creating foo_foo.  For example:
            - V1-M12-Beta2/b51875/b51875.csproj -> <unchanged>
            - V1-M12-Beta2/b51875/Desktop/b51875.csproj -> b51875_Desktop.csproj
    - Also rename IL files and .assembly names to match the new project names
- Manual fixes for IL->C# assembly references in tests dev11_132534 and dev11_145295
  • Loading branch information
markples authored Dec 13, 2022
1 parent b2bebcb commit 4aae104
Show file tree
Hide file tree
Showing 341 changed files with 370 additions and 388 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x38e94b27 {}
.assembly 'b16935' {}
.class ILGEN_0x38e94b27 {

.method static int32 main() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly '7341'
.assembly 'b07341'
{}
.class ExceptionTest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_3109600104 {}
.assembly 'b14591' {}

.class ILGEN_3109600104 {
.method static int32 main() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly a1{}
.assembly 'b14927'{}
.class ILGEN_622380794 {


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly d094
.assembly 'b15222'
{
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly a1 {}
.assembly 'b16049' {}
.class ILGEN_622380794 {

.field static int32 field_0x2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly a1 {}
.assembly 'b16071' {}
.class ILGEN_622380794 {

.field static unsigned int8 field_0x0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly a1 {}
.assembly 'b16295' {}
.class ILGEN_622380794 {

.field static unsigned int16 field_0x1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x38e3ae39 {}
.assembly 'b16498' {}
.class ILGEN_0x38e3ae39 {
.field static unsigned int16 field_0x1
.method static int32 main() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x38e3b289 {}
.assembly 'b16499a' {}
.class ILGEN_0x38e3b289 {

.field static unsigned int16 field_0x1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x38e69edd {}
.assembly 'b16499b' {}
.class ILGEN_0x38e69edd {

//BEGIN STATIC FIELDS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly a1 {}
.assembly 'b16503' {}
.class ILGEN_622380794 {
.method static int32 main() {
.entrypoint
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly a1 {}
.assembly 'b16554' {}
.class ILGEN_622380794 {

.field static unsigned int16 field_0x5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x38e55e0d {}
.assembly 'b16881a' {}
.class ILGEN_0x38e55e0d {

//BEGIN STATIC FIELDS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x38e6c1a4 {}
.assembly 'b16881b' {}
.class ILGEN_0x38e6c1a4 {

//BEGIN STATIC FIELDS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly a1 {}
.assembly 'b16886' {}
.class ILGEN_622380794 {


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x38e6c42a {}
.assembly 'b16895' {}
.class ILGEN_0x38e6c42a {


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x38e6a02d {}
.assembly 'b16896' {}
.class ILGEN_0x38e6a02d {

.field static unsigned int64 field_0x3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x38e912e6 {}
.assembly 'b16922' {}
.class ILGEN_0x38e912e6 {

.field static unsigned int16 field_0x1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x38e56b77 {}
.assembly 'b16928' {}
.class ILGEN_0x38e56b77 {

//BEGIN STATIC FIELDS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x38e9694e {}
.assembly 'b18852' {}
.class ILGEN_0x38e9694e {

.method static int32 main() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x38ea91b6 {}
.assembly 'b20079' {}
.class ILGEN_0x38ea91b6 {

.field static unsigned int32 field_0x2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x38eb1044 {}
.assembly 'b20217' {}
.class ILGEN_0x38eb1044 {

.field static unsigned int8 field_0x0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x38e574ea {}
.assembly 'b20249' {}
.class ILGEN_0x38e574ea {

//BEGIN STATIC FIELDS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x24781474 {}
.assembly 'b25458' {}
.class ILGEN_0x24781474 {

.field static float32 field_0x8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x5034b2f4 {}
.assembly 'b25459' {}
.class ILGEN_0x5034b2f4 {

//BEGIN STATIC FIELDS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x7122ba20 {}
.assembly 'b25463' {}
.class ILGEN_0x7122ba20 {

.field static unsigned int64 field_0x3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x145288f8 {}
.assembly 'b25468' {}
.class ILGEN_0x145288f8 {

.method static int32 main() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<Optimize>True</Optimize>
</PropertyGroup>
<ItemGroup>
<Compile Include="b25468-ia64.il" />
<Compile Include="$(MSBuildProjectName).il" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x5dbf32e8 {}
.assembly 'b25474' {}
.class ILGEN_0x5dbf32e8 {

.field static unsigned int32 field_0x2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x8bf68a14 {}
.assembly 'b25491' {}
.class ILGEN_0x8bf68a14 {

.field static unsigned int64 field_0x3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x5b4498f4 {}
.assembly 'b25507' {}
.class ILGEN_0x5b4498f4 {

.field static unsigned int32 field_0x2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x86457e59 {}
.assembly 'b25701' {}
.class ILGEN_0x86457e59 {

//BEGIN STATIC FIELDS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<Optimize>True</Optimize>
</PropertyGroup>
<ItemGroup>
<Compile Include="b25701-ia64.il" />
<Compile Include="$(MSBuildProjectName).il" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0xee612700 {}
.assembly 'b25739' {}
.class ILGEN_0xee612700 {

.field static unsigned int16 field_0x1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0xe1f6df8c {}
.assembly 'b25813' {}
.class ILGEN_0xe1f6df8c {

.field static float64 field_0x9
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0xf07bd440 {}
.assembly 'b25815' {}
.class ILGEN_0xf07bd440 {

.method static int32 main() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x9f9bf0ac {}
.assembly 'b25833' {}
.class ILGEN_0x9f9bf0ac {

.field static unsigned int32 field_0x2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0xb1b96d2b {}
.assembly 'b25835' {}
.class ILGEN_0xb1b96d2b {
.method static int32 main() {
.entrypoint
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x203408cc {}
.assembly 'b26020' {}
.class ILGEN_0x203408cc {

//BEGIN STATIC FIELDS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0xf7c4ec97 {}
.assembly 'b26153' {}
.class ILGEN_0xf7c4ec97 {

.field static unsigned int32[] field_0xc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0xf7ec06dc {}
.assembly 'b26155' {}
.class ILGEN_0xf7ec06dc {

.method static int32 main() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0x38fd50b5 {}
.assembly 'b26332' {}
.class ILGEN_0x38fd50b5 {
.field static unsigned int16 field_0x1
.method static int32 main() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly ILGEN_0xeed686f5 {}
.assembly 'b26512' {}
.class ILGEN_0xeed686f5 {

.method static int32 main() {
Expand Down
Loading

0 comments on commit 4aae104

Please sign in to comment.