Skip to content

Move localloc/common library under JIT folder #63510

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

Merged
merged 1 commit into from
Jan 14, 2022
Merged

Move localloc/common library under JIT folder #63510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/localloc/call/call01_small.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="call01.cs" />
<ProjectReference Include="..\..\..\jit64\localloc\common\common.ilproj" />
<ProjectReference Include="..\..\..\common\localloc_common.ilproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b14324/b14324.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<Compile Include="repro.il" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\jit64\localloc\common\common.ilproj" />
<ProjectReference Include="..\..\..\..\common\localloc_common.ilproj" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b14324/repro.il
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Test localloc with tail call followed by jump
.assembly extern legacy library mscorlib {}
.assembly extern common{}
.assembly extern localloc_common{}
.assembly extern legacy library mscorlib {}
.assembly 'repro'{}
.assembly extern xunit.core {}
Expand Down Expand Up @@ -28,7 +28,7 @@
IL_0012: ldloc.0
IL_0013: ldsfld int32 LocallocTest::locallocSize
IL_0018: ldc.i4 1000
IL_001d: call void [common]LocallocTesting.Global::initializeStack(int32*,
IL_001d: call void [localloc_common]LocallocTesting.Global::initializeStack(int32*,
int32,
int32)
IL_0032: newobj instance void LocallocTest::.ctor()
Expand Down Expand Up @@ -72,7 +72,7 @@
IL_0021: ldarg.s ar1
IL_0023: ldsfld int32 LocallocTest::locallocSize
IL_0028: ldc.i4 1000
IL_002d: call bool [common]LocallocTesting.Global::verifyStack(string,
IL_002d: call bool [localloc_common]LocallocTesting.Global::verifyStack(string,
int32*,
int32,
int32)
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14355/b14355.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<Compile Include="call01.il" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\jit64\localloc\common\common.ilproj" />
<ProjectReference Include="..\..\..\..\common\localloc_common.ilproj" />
</ItemGroup>
</Project>
36 changes: 18 additions & 18 deletions src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14355/call01.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
.assembly extern mscorlib
{
}
.assembly extern common
.assembly extern localloc_common
{
.ver 0:0:0:0
}
Expand Down Expand Up @@ -56,27 +56,27 @@
IL_000d: add
IL_000e: stloc.1
IL_000f: ldc.i4.4
IL_0010: ldsfld int32 [common]LocallocTesting.Global::stackAllocSize
IL_0010: ldsfld int32 [localloc_common]LocallocTesting.Global::stackAllocSize
IL_0015: mul
IL_0016: localloc
IL_0018: stloc.2
IL_0019: ldc.i4.4
IL_001a: ldsfld int32 [common]LocallocTesting.Global::stackAllocSize
IL_001a: ldsfld int32 [localloc_common]LocallocTesting.Global::stackAllocSize
IL_001f: mul
IL_0020: localloc
IL_0022: stloc.3
IL_0023: ldsfld int32 [common]LocallocTesting.Global::stackAllocSize
IL_0023: ldsfld int32 [localloc_common]LocallocTesting.Global::stackAllocSize
IL_0028: stsfld int32 LocallocTest::locallocSize
IL_002d: ldloc.2
IL_002e: ldsfld int32 LocallocTest::locallocSize
IL_0033: ldc.i4 0x3e8
IL_0038: call void [common]LocallocTesting.Global::initializeStack(int32*,
IL_0038: call void [localloc_common]LocallocTesting.Global::initializeStack(int32*,
int32,
int32)
IL_003d: ldloc.3
IL_003e: ldsfld int32 LocallocTest::locallocSize
IL_0043: ldc.i4 0x7d0
IL_0048: call void [common]LocallocTesting.Global::initializeStack(int32*,
IL_0048: call void [localloc_common]LocallocTesting.Global::initializeStack(int32*,
int32,
int32)
IL_004d: ldc.i4.1
Expand Down Expand Up @@ -109,7 +109,7 @@
IL_0069: ldloc.2
IL_006a: ldsfld int32 LocallocTest::locallocSize
IL_006f: ldc.i4 0x3e8
IL_0074: call bool [common]LocallocTesting.Global::verifyStack(string,
IL_0074: call bool [localloc_common]LocallocTesting.Global::verifyStack(string,
int32*,
int32,
int32)
Expand All @@ -123,7 +123,7 @@
IL_0085: ldloc.3
IL_0086: ldsfld int32 LocallocTest::locallocSize
IL_008b: ldc.i4 0x7d0
IL_0090: call bool [common]LocallocTesting.Global::verifyStack(string,
IL_0090: call bool [localloc_common]LocallocTesting.Global::verifyStack(string,
int32*,
int32,
int32)
Expand All @@ -136,7 +136,7 @@
IL_009c: ldstr "local1"
IL_00a1: ldloc.0
IL_00a2: ldc.i8 0xfedcba9876543210
IL_00ab: call bool [common]LocallocTesting.Global::verifyLocal(string,
IL_00ab: call bool [localloc_common]LocallocTesting.Global::verifyLocal(string,
uint64,
uint64)
IL_00b0: brtrue.s IL_00b7
Expand All @@ -148,7 +148,7 @@
IL_00b7: ldstr "local2"
IL_00bc: ldloc.1
IL_00bd: ldc.i8 0xfedcba9876543211
IL_00c6: call bool [common]LocallocTesting.Global::verifyLocal(string,
IL_00c6: call bool [localloc_common]LocallocTesting.Global::verifyLocal(string,
uint64,
uint64)
IL_00cb: brtrue.s IL_00d2
Expand Down Expand Up @@ -217,32 +217,32 @@
IL_0020: ldstr "error\n"
IL_0025: call void [System.Console]System.Console::WriteLine(string)
IL_002a: ldc.i4.4
IL_002b: ldsfld int32 [common]LocallocTesting.Global::stackAllocSize
IL_002b: ldsfld int32 [localloc_common]LocallocTesting.Global::stackAllocSize
IL_0030: mul
IL_0031: localloc
IL_0033: stloc.0
IL_0034: ldc.i4.4
IL_0035: ldsfld int32 [common]LocallocTesting.Global::stackAllocSize
IL_0035: ldsfld int32 [localloc_common]LocallocTesting.Global::stackAllocSize
IL_003a: mul
IL_003b: localloc
IL_003d: stloc.1
IL_003e: ldloc.0
IL_003f: ldsfld int32 LocallocTest::locallocSize
IL_0044: ldc.i4 0xbb8
IL_0049: call void [common]LocallocTesting.Global::initializeStack(int32*,
IL_0049: call void [localloc_common]LocallocTesting.Global::initializeStack(int32*,
int32,
int32)
IL_004e: ldloc.1
IL_004f: ldsfld int32 LocallocTest::locallocSize
IL_0054: ldc.i4 0xfa0
IL_0059: call void [common]LocallocTesting.Global::initializeStack(int32*,
IL_0059: call void [localloc_common]LocallocTesting.Global::initializeStack(int32*,
int32,
int32)
IL_005e: ldstr "ar1"
IL_0063: ldarg.s ar1
IL_0065: ldsfld int32 LocallocTest::locallocSize
IL_006a: ldc.i4 0x3e8
IL_006f: call bool [common]LocallocTesting.Global::verifyStack(string,
IL_006f: call bool [localloc_common]LocallocTesting.Global::verifyStack(string,
int32*,
int32,
int32)
Expand All @@ -256,7 +256,7 @@
IL_007f: ldarg.s ar2
IL_0081: ldsfld int32 LocallocTest::locallocSize
IL_0086: ldc.i4 0x7d0
IL_008b: call bool [common]LocallocTesting.Global::verifyStack(string,
IL_008b: call bool [localloc_common]LocallocTesting.Global::verifyStack(string,
int32*,
int32,
int32)
Expand All @@ -270,7 +270,7 @@
IL_009b: ldloc.0
IL_009c: ldsfld int32 LocallocTest::locallocSize
IL_00a1: ldc.i4 0xbb8
IL_00a6: call bool [common]LocallocTesting.Global::verifyStack(string,
IL_00a6: call bool [localloc_common]LocallocTesting.Global::verifyStack(string,
int32*,
int32,
int32)
Expand All @@ -284,7 +284,7 @@
IL_00b6: ldloc.1
IL_00b7: ldsfld int32 LocallocTest::locallocSize
IL_00bc: ldc.i4 0xfa0
IL_00c1: call bool [common]LocallocTesting.Global::verifyStack(string,
IL_00c1: call bool [localloc_common]LocallocTesting.Global::verifyStack(string,
int32*,
int32,
int32)
Expand Down
3 changes: 1 addition & 2 deletions ...tests/JIT/jit64/localloc/common/common.il → src/tests/JIT/common/localloc_common.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
.assembly extern System.Console { auto }
.assembly extern mscorlib { auto }

.assembly common
.assembly localloc_common
{
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.module common.dll
.custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 )
.imagebase 0x00400000
.subsystem 0x00000003
Expand Down
0 ...s/JIT/jit64/localloc/common/common.ilproj → src/tests/JIT/common/localloc_common.ilproj
View file
Open in desktop
File renamed without changes.
28 changes: 14 additions & 14 deletions src/tests/JIT/jit64/localloc/call/call05_dynamic.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}
.assembly extern xunit.core {}
.assembly extern mscorlib{}
.assembly extern common{}
.assembly extern localloc_common{}
.assembly 'call05_dynamic'{}

.class private auto ansi beforefieldinit LocallocTest
Expand All @@ -28,29 +28,29 @@
class LocallocTest V_2,
int32 V_3)
IL_0000: ldc.i4.4
IL_0001: ldsfld int32 [common]LocallocTesting.Global::stackAllocSize
IL_0001: ldsfld int32 [localloc_common]LocallocTesting.Global::stackAllocSize
IL_0002: mul
IL_0003: localloc
IL_0005: stloc.0
IL_0006: ldc.i4.4
IL_0007: ldsfld int32 [common]LocallocTesting.Global::stackAllocSize
IL_0007: ldsfld int32 [localloc_common]LocallocTesting.Global::stackAllocSize
IL_0008: mul
IL_0009: localloc
IL_000b: stloc.1

IL_000c: ldsfld int32 [common]LocallocTesting.Global::stackAllocSize
IL_000c: ldsfld int32 [localloc_common]LocallocTesting.Global::stackAllocSize
IL_000d: stsfld int32 LocallocTest::locallocSize

IL_0012: ldloc.0
IL_0013: ldsfld int32 LocallocTest::locallocSize
IL_0018: ldc.i4 1000
IL_001d: call void [common]LocallocTesting.Global::initializeStack(int32*,
IL_001d: call void [localloc_common]LocallocTesting.Global::initializeStack(int32*,
int32,
int32)
IL_0022: ldloc.1
IL_0023: ldsfld int32 LocallocTest::locallocSize
IL_0028: ldc.i4 2000
IL_002d: call void [common]LocallocTesting.Global::initializeStack(int32*,
IL_002d: call void [localloc_common]LocallocTesting.Global::initializeStack(int32*,
int32,
int32)

Expand Down Expand Up @@ -138,32 +138,32 @@
int32* intArray2,
int32 V_2)
IL_0000: ldc.i4.4
IL_0001: ldsfld int32 [common]LocallocTesting.Global::stackAllocSize
IL_0001: ldsfld int32 [localloc_common]LocallocTesting.Global::stackAllocSize
IL_0002: mul
IL_0003: localloc
IL_0005: stloc.0
IL_0006: ldc.i4.4
IL_0007: ldsfld int32 [common]LocallocTesting.Global::stackAllocSize
IL_0007: ldsfld int32 [localloc_common]LocallocTesting.Global::stackAllocSize
IL_0008: mul
IL_0009: localloc
IL_000b: stloc.1
IL_000c: ldloc.0
IL_000d: ldsfld int32 LocallocTest::locallocSize
IL_0012: ldc.i4 0xbb8
IL_0017: call void [common]LocallocTesting.Global::initializeStack(int32*,
IL_0017: call void [localloc_common]LocallocTesting.Global::initializeStack(int32*,
int32,
int32)
IL_001c: ldloc.1
IL_001d: ldsfld int32 LocallocTest::locallocSize
IL_0022: ldc.i4 0xfa0
IL_0027: call void [common]LocallocTesting.Global::initializeStack(int32*,
IL_0027: call void [localloc_common]LocallocTesting.Global::initializeStack(int32*,
int32,
int32)
IL_002c: ldstr "ar1"
IL_0031: ldarg.s ar1
IL_0033: ldsfld int32 LocallocTest::locallocSize
IL_0038: ldc.i4 1000
IL_003d: call bool [common]LocallocTesting.Global::verifyStack(string,
IL_003d: call bool [localloc_common]LocallocTesting.Global::verifyStack(string,
int32*,
int32,
int32)
Expand All @@ -177,7 +177,7 @@
IL_004d: ldarg.s ar2
IL_004f: ldsfld int32 LocallocTest::locallocSize
IL_0054: ldc.i4 2000
IL_0059: call bool [common]LocallocTesting.Global::verifyStack(string,
IL_0059: call bool [localloc_common]LocallocTesting.Global::verifyStack(string,
int32*,
int32,
int32)
Expand All @@ -191,7 +191,7 @@
IL_0069: ldloc.0
IL_006a: ldsfld int32 LocallocTest::locallocSize
IL_006f: ldc.i4 3000
IL_0074: call bool [common]LocallocTesting.Global::verifyStack(string,
IL_0074: call bool [localloc_common]LocallocTesting.Global::verifyStack(string,
int32*,
int32,
int32)
Expand All @@ -205,7 +205,7 @@
IL_0084: ldloc.1
IL_0085: ldsfld int32 LocallocTest::locallocSize
IL_008a: ldc.i4 4000
IL_008f: call bool [common]LocallocTesting.Global::verifyStack(string,
IL_008f: call bool [localloc_common]LocallocTesting.Global::verifyStack(string,
int32*,
int32,
int32)
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/localloc/call/call05_dynamic.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
<Compile Include="call05_dynamic.il" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.ilproj" />
<ProjectReference Include="..\..\..\common\localloc_common.ilproj" />
</ItemGroup>
</Project>
Loading