Skip to content

Fix crossgen2 version resilience test #71357

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
davidwrighton merged 7 commits into from
Jul 1, 2022
Merged

Fix crossgen2 version resilience test #71357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5dd4a63
Fix crossgen2 version resilience test
davidwrighton Jun 27, 2022
7ab8518
Try to fix bash issue
davidwrighton Jun 28, 2022
6aa5ad8
Try to fix Linux again, and disable p/invoke inlining across version …
davidwrighton Jun 28, 2022
1b246a5
Address assertion around byte array load of R2R file on unix
davidwrighton Jun 28, 2022
28adc1b
Add progress messages to test to diagnose failure on MacOS
davidwrighton Jun 29, 2022
349d333
Break out R2R assembly load test into separate test so that the main …
davidwrighton Jun 29, 2022
fb2744b
Finish up, and make test
davidwrighton Jun 30, 2022
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
29 changes: 29 additions & 0 deletions src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2403,6 +2403,12 @@ private void EncodeFieldBaseOffset(FieldDesc field, CORINFO_FIELD_INFO* pResult,
}
// ENCODE_NONE
}
else if (TypeCannotUseBasePlusOffsetEncoding(pMT.BaseType as MetadataType))
{
// ENCODE_CHECK_FIELD_OFFSET
AddPrecodeFixup(_compilation.SymbolNodeFactory.CheckFieldOffset(field));
// No-op other than generating the check field offset fixup
}
else
{
PreventRecursiveFieldInlinesOutsideVersionBubble(field, callerMethod);
Expand All @@ -2422,6 +2428,22 @@ private void EncodeFieldBaseOffset(FieldDesc field, CORINFO_FIELD_INFO* pResult,
}
}

private bool TypeCannotUseBasePlusOffsetEncoding(MetadataType type)
{
if (type == null)
return true;

// Types which are encoded with sequential or explicit layout do not support an aligned base offset, and so we just encode with the exact offset
// of the field, and if that offset is incorrect, the method cannot be used.
if (type.IsSequentialLayout || type.IsExplicitLayout)
return true;
else if (type.BaseType is MetadataType metadataType)
{
return TypeCannotUseBasePlusOffsetEncoding(metadataType);
}
return false;
}

private void getGSCookie(IntPtr* pCookieVal, IntPtr** ppCookieVal)
{
*pCookieVal = IntPtr.Zero;
Expand Down Expand Up @@ -2547,6 +2569,13 @@ private bool pInvokeMarshalingRequired(CORINFO_METHOD_STRUCT_* handle, CORINFO_S
return false;
}

// If this method is in another versioning unit, then the compilation cannot inline the pinvoke (as we aren't currently
// able to construct a token correctly to refer to the pinvoke method.
if (!_compilation.CompilationModuleGroup.VersionsWithMethodBody(method))
{
return true;
}

MethodIL stubIL = null;
try
{
Expand Down
34 changes: 32 additions & 2 deletions src/tests/readytorun/tests/main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ public MyLoadContext() : base(AssemblyLoadContext.GetLoadContext(Assembly.GetExe

public void TestMultipleLoads()
{
Assembly a = LoadFromAssemblyPath(Path.Combine(Directory.GetCurrentDirectory(), "test.ni.dll"));
Assembly a = LoadFromAssemblyPath(Path.Combine(Directory.GetCurrentDirectory(), "test.dll"));
Assert.AreEqual(AssemblyLoadContext.GetLoadContext(a), this);
}

Expand Down Expand Up @@ -424,58 +424,88 @@ static void TestLoadR2RImageFromByteArray()

static void RunAllTests()
{
Console.WriteLine("TestVirtualMethodCalls");
TestVirtualMethodCalls();
Console.WriteLine("TestMovedVirtualMethod");
TestMovedVirtualMethods();

Console.WriteLine("TestConstrainedMethodCalls");
TestConstrainedMethodCalls();

Console.WriteLine("TestConstrainedMethodCalls_Unsupported");
TestConstrainedMethodCalls_Unsupported();

Console.WriteLine("TestInterop");
TestInterop();

Console.WriteLine("TestStaticFields");
TestStaticFields();

Console.WriteLine("TestPreInitializedArray");
TestPreInitializedArray();

Console.WriteLine("TestMultiDimmArray");
TestMultiDimmArray();

Console.WriteLine("TestGenericVirtualMethod");
TestGenericVirtualMethod();
Console.WriteLine("TestMovedGenericVirtualMethod");
TestMovedGenericVirtualMethod();
Console.WriteLine("TestGenericNonVirtualMethod");
TestGenericNonVirtualMethod();

Console.WriteLine("TestGenericOverStruct");
TestGenericOverStruct();

Console.WriteLine("TestInstanceFields");
TestInstanceFields();

Console.WriteLine("TestInstanceFieldsWithLayout");
TestInstanceFieldsWithLayout();

Console.WriteLine("TestInheritingFromGrowingBase");
TestInheritingFromGrowingBase();

Console.WriteLine("TestGrowingStruct");
TestGrowingStruct();
Console.WriteLine("TestChangingStruct");
TestChangingStruct();
Console.WriteLine("TestChangingHFAStruct");
TestChangingHFAStruct();

Console.WriteLine("TestGetType");
TestGetType();

Console.WriteLine("TestMultipleLoads");
TestMultipleLoads();

Console.WriteLine("TestFieldLayoutNGenMixAndMatch");
TestFieldLayoutNGenMixAndMatch();

Console.WriteLine("TestStaticBaseCSE");
TestStaticBaseCSE();

Console.WriteLine("TestIsInstCSE");
TestIsInstCSE();

Console.WriteLine("TestCastClassCSE");
TestCastClassCSE();

Console.WriteLine("TestRangeCheckElimination");
TestRangeCheckElimination();

Console.WriteLine("TestOpenClosedDelegate");
TestOpenClosedDelegate();

Console.WriteLine("GenericLdtokenFieldsTest");
GenericLdtokenFieldsTest();

Console.WriteLine("RVAFieldTest");
RVAFieldTest();

TestLoadR2RImageFromByteArray();
// Disable for https://github.com/dotnet/runtime/issues/71507
// Console.WriteLine("TestLoadR2RImageFromByteArray");
// TestLoadR2RImageFromByteArray();
}

static int Main()
Expand Down
75 changes: 45 additions & 30 deletions src/tests/readytorun/tests/mainv1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,50 +24,55 @@ set "COMPlus_GCStress="
set "COMPlus_HeapVerify="
set "COMPlus_ReadyToRun="

DEL test.dll
if exist test.dll (
echo FAILED to delete test.dll
md IL_DLLS
if not exist IL_DLLS\fieldgetter.dll (
copy /y fieldgetter.dll IL_DLLS\fieldgetter.dll
)
if not exist IL_DLLS\fieldgetter.dll (
echo FAILED to copy fieldgetter.dll to IL_DLLS
exit /b 1
)
COPY /Y ..\testv1\test\test.dll test.dll
if not exist test.dll (
echo FAILED to copy test.dll
if not exist IL_DLLS\mainv1.dll (
copy /y mainv1.dll IL_DLLS\mainv1.dll
)
if not exist IL_DLLS\mainv1.dll (
echo FAILED to copy mainv1.dll to IL_DLLS
exit /b 1
)

%Core_Root%\CoreRun.exe %Core_Root%\crossgen2\crossgen2.dll -r:%Core_Root%\*.dll -r:%25CD% -o:test.ni.dll test.dll
%Core_Root%\CoreRun.exe %Core_Root%\crossgen2\crossgen2.dll --map -r:%Core_Root%\*.dll -r:%25CD%\IL_DLLS\fieldgetter.dll -r:%25CD%\IL_DLLS\mainv1.dll -o:test.dll ..\testv1\test\test.dll

set CrossGenStatus=!ERRORLEVEL!
IF NOT !CrossGenStatus!==0 (
ECHO Crossgen failed with exitcode - !CrossGenStatus!
Exit /b 1
)
if not exist test.ni.dll (
echo FAILED to build test.ni.dll
if not exist test.map (
echo FAILED to build test.dll
exit /b 1
)

%Core_Root%\CoreRun.exe %Core_Root%\crossgen2\crossgen2.dll -r:%Core_Root%\*.dll -r:%25CD% -o:fieldgetter.ni.dll fieldgetter.dll
%Core_Root%\CoreRun.exe %Core_Root%\crossgen2\crossgen2.dll --map -r:%Core_Root%\*.dll -r:%25CD%\IL_DLLS\mainv1.dll -r:..\testv1\test\test.dll -o:fieldgetter.dll IL_DLLS\fieldgetter.dll

set CrossGenStatus=!ERRORLEVEL!
IF NOT !CrossGenStatus!==0 (
ECHO Crossgen failed with exitcode - !CrossGenStatus!
Exit /b 1
)
if not exist fieldgetter.ni.dll (
echo FAILED to build fieldgetter.ni.dll
if not exist fieldgetter.map (
echo FAILED to build fieldgetter.dll
exit /b 1
)

%Core_Root%\CoreRun.exe %Core_Root%\crossgen2\crossgen2.dll -r:%Core_Root%\*.dll -r:%25CD% -o:mainv1.ni.dll mainv1.dll
%Core_Root%\CoreRun.exe %Core_Root%\crossgen2\crossgen2.dll --map -r:%Core_Root%\*.dll -r:%25CD%\IL_DLLS\fieldgetter.dll -r:..\testv1\test\test.dll -o:mainv1.dll IL_DLLS\mainv1.dll

set CrossGenStatus=!ERRORLEVEL!
IF NOT !CrossGenStatus!==0 (
ECHO Crossgen failed with exitcode - !CrossGenStatus!
Exit /b 1
)
if not exist mainv1.ni.dll (
echo FAILED to build mainv1.ni.dll
if not exist mainv1.map (
echo FAILED to build mainv1.dll
exit /b 1
)

Expand All @@ -79,57 +84,67 @@ $(BashCLRTestPreCommands)
# Suppress some COMPlus variables for the duration of Crossgen2 execution
export -n COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun

rm -f test.dll
if [ -f test.dll ]
mkdir IL_DLLS

if [ ! -f IL_DLLS/fieldgetter.dll ]
then
cp fieldgetter.dll IL_DLLS/fieldgetter.dll
fi
if [ ! -f IL_DLLS/fieldgetter.dll ]
then
echo Failed to delete test.dll
echo Failed to copy fieldgetter.dll to IL_DLLS
exit 1
fi
cp ../testv1/test/test.dll test.dll
if [ ! -f test.dll ]

if [ ! -f IL_DLLS/mainv1.dll ]
then
cp mainv1.dll IL_DLLS/mainv1.dll
fi
if [ ! -f IL_DLLS/mainv1.dll ]
then
echo Failed to copy test.dll
echo Failed to copy mainv1.dll to IL_DLLS
exit 1
fi
$CORE_ROOT/corerun $CORE_ROOT/crossgen2/crossgen2.dll -r:$CORE_ROOT/*.dll -r:`pwd` -o:test.ni.dll test.dll

$CORE_ROOT/corerun $CORE_ROOT/crossgen2/crossgen2.dll --map -r:$CORE_ROOT/*.dll -r:IL_DLLS/fieldgetter.dll -r:IL_DLLS/mainv1.dll -o:test.dll ../testv1/test/test.dll

__cgExitCode=$?
if [ $__cgExitCode -ne 0 ]
then
echo Crossgen failed with exitcode: $__cgExitCode
exit 1
fi
if [ ! -f test.ni.dll ]
if [ ! -f test.map ]
then
echo Failed to build test.ni.dll
echo Failed to build test.dll
exit 1
fi

$CORE_ROOT/corerun $CORE_ROOT/crossgen2/crossgen2.dll -r:$CORE_ROOT/*.dll -r:`pwd` -o:fieldgetter.ni.dll fieldgetter.dll
$CORE_ROOT/corerun $CORE_ROOT/crossgen2/crossgen2.dll --map -r:$CORE_ROOT/*.dll -r:../testv1/test/test.dll -r:IL_DLLS/mainv1.dll -o:fieldgetter.dll IL_DLLS/fieldgetter.dll

__cgExitCode=$?
if [ $__cgExitCode -ne 0 ]
then
echo Crossgen failed with exitcode: $__cgExitCode
exit 1
fi
if [ ! -f fieldgetter.ni.dll ]
if [ ! -f fieldgetter.map ]
then
echo Failed to build fieldgetter.ni.dll
echo Failed to build fieldgetter.dll
exit 1
fi

$CORE_ROOT/corerun $CORE_ROOT/crossgen2/crossgen2.dll -r:$CORE_ROOT/*.dll -r:`pwd` -o:mainv1.ni.dll mainv1.dll
$CORE_ROOT/corerun $CORE_ROOT/crossgen2/crossgen2.dll --map -r:$CORE_ROOT/*.dll -r:../testv1/test/test.dll -r:IL_DLLS/fieldgetter.dll -o:mainv1.dll IL_DLLS/mainv1.dll

__cgExitCode=$?
if [ $__cgExitCode -ne 0 ]
then
echo Crossgen failed with exitcode: $__cgExitCode
exit 1
fi
if [ ! -f mainv1.ni.dll ]
if [ ! -f mainv1.map ]
then
echo Failed to build mainv1.ni.dll
echo Failed to build mainv1.dll
exit 1
fi

Expand Down
Loading