[NativeAOT-LLVM] Merge to Sep 24 #2688

yowl · 2024-09-17T22:29:42Z

This PR merges from upstream to Sep 2024.

I made acdHelper public so we can access it from llvm codegen

See the comments at the end re non-running tests and failure on linux to find libz

…es instead of aborting the trace (#107323) Better diagnostic output when jiterp hits an invalid opcode

* Fix getting SSP for threadabort in funceval Diagnostics test that test threadabort during funceval crashes on machines with CET enabled. The reason is that when a thread is redirected to the RedirectForThrowControl, the original instruction address from which we've redirected is not on the shadow stack. That causes the exception handling propagating the related thread abort to fail finding that instruction address on the shadow stack. It walks out of its range and then crashes with access violation. This change fixes it by storing the SSP in the FaultingExceptionFrame and copying it to the REGDISPLAY when UpdateRegDisplay is called on that frame. That way the correct SSP is already known in the SfiInit and we don't need to look it up. * Clear rax before rdsspq for proper behavior on non-cet devices --------- Co-authored-by: Jan Vorlicek <jan.vorlicek@volny,cz>

This was added in #101666 to address a point in time issue. It should not be needed anymore.

* Fix meter/instrument filtering in MetricsEventSource * Address the feedback

Due to an apparent typo, The CrossGen2SynthesizePgo test flag simply always skipped tests on Windows, instead of just skipping tests when synthesize pgo testing was enabled.

Co-authored-by: Jan Kotas <jkotas@microsoft.com>

…move separate allocate load level (#107224) There is no logical distinction between creating a `DomainAssembly` and an `Assembly` now. Making `DomainAssembly` create the `Assembly` as soon as it is constructed should make it so that we can switch assorted things that currently store/use `DomainAssembly` to `Assembly`, since they will be created at the same time.

* Provide System.Composition.AttributedModel package readme * Improve after feedback * Set correct PackageDescription

…local with the exact type and assigning to/from it (#107219)

- docs/ - test/ - arch/s390/self-hosted-builder/

…#107293)

This patch fixes System.Text.Json.Serialization.Tests.CacheTests on Debug build.

…equired (#107348)

…mbly during publish (#106696)

…ks` (#107350)

* ARM64-SVE: Delay free all ops within conditional select * Fix comment * Add test header * don't delay prefUseOpNum * Fix FMA * Add assert checks for delay free * Merge embedded op build code * fix formatting * simplify assert * simplify FMA code * Add tests for 106867 * ARM64-SVE: Allow op inside conditionselect to be non HWintrinsic TEST_IMG: ubuntu/dotnet-build TEST_CMD: safe ./projects/dotnet/build-runtime.sh Jira: ENTLLT-7634 Change-Id: I337a291be6661f104fe90c7cdc27150eede43647 * Add Sve.IsSupported to tests * Add Sve.IsSupported to test * fix formatting * Revert "ARM64-SVE: Allow op inside conditionselect to be non HWintrinsic" * Revert "ARM64-SVE: Allow op inside conditionselect to be non HWintrinsic" * Revert "ARM64-SVE: Allow op inside conditionselect to be non HWintrinsic"

Upgrade zlib-ng to 2.2.1

… (#107009) * Check CancellationToken before TimeSpan.Zero in TimeProviderTaskExtensions This makes the down-level behavior for Delay and WaitAsync match the behavior in .NET 8 and later, prefering to return a Canceled task over a Completed task or TimeoutException when the TimeSpan is Zero and the CancellationToken is already Canceled. Fixes #106996 * Test improvements based on feedback --------- Co-authored-by: Tarek Mahmoud Sayed <10833894+tarekgh@users.noreply.github.com>

…in ilc.exe for native aot (#106716) * Fix a case in MethodImpl overriding which wasn't handled as expected in ilc.exe for native aot - This was causing real C# applications to fail to behave correctly on NativeAOT builds - Enable testing for covariant byref returns on nativeaot (split testing up so that the tests do not expect TypeLoadException, which NativeAOT doesn't reliably generate) - Put copy of attributetesting.il test into the managed type system unit test suite - Add regression test of issue noted in #96175 into managed type system unit test suite - Update workflow documentation to include a better path to finding details on how to run CoreCLR and Libraries tests for Native AOT Fixes #96175

fix occurrences typo

Co-authored-by: Eirik Tsarpalis <eirik.tsarpalis@gmail.com>

…(#107366)

There is a problem with the variant of the stack overflow test that can overflow in a native function on ARM. The EHABI unwind info is not present for leaf functions and libunwind is unable to unwind from the failure location to the first managed frame. I've created an issue (#107184) for the underlying problem. This PR disables that test variant until the problem is fixed. Close #106742

* Fix stack overflow reporting with multiple PALs A recently reported issue in the stack overflow test running with superpmi collect has revealed that there is a problem when multiple shared libraries using coreclr PAL are loaded into the process. Each such library registers signal handlers, including the SIGSEGV one. The unexpected thing in the SIGSEGV handler in this scenario is the fact that the GetCurrentPalThread() returns NULL in the non-coreclr shared libraries in case the library didn't invoke any function that would create the thread object. That leads to the handler just writing "Stack overflow." to the console and then calling PROCAbort(). This abort causes the process to be torn down without reporting the stack overflow with full stack trace by the coreclr. This change fixes it by calling the previous registered handler instead aborting in this case. That gives the coreclr SIGSEGV handler a chance to do the reporting as expected. * Reflect PR feedback - move comment

revert to upstream.

…p-24

yowl · 2024-10-06T21:37:34Z

Got there finally. Can be reviewed again, thanks!

SingleAccretion · 2024-10-07T13:52:34Z

src/coreclr/jit/utils.cpp

                nonNullReturn = true;
                break;



Suggested change

nonNullReturn = true;

break;

noThrow = true;

nonNullReturn = true;

break;

case CORINFO_HELP_READYTORUN_GENERIC_HANDLE:

// Typically this is a no-throw call, but may become always-throw when fetching an unavailable handle.

isPure = true;

nonNullReturn = true;

break;

And take out case CORINFO_HELP_READYTORUN_GENERIC_HANDLE from above. There is no need to pessimize the other helpers.

Done, thanks.

SingleAccretion · 2024-10-07T13:57:49Z

src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpHandler.cs

-
        internal ClientCertificateOption ClientCertificateOptions;

-


Whitespace changes should be reverted.

SingleAccretion · 2024-10-07T13:58:03Z

src/libraries/System.Net.Http/src/System.Net.Http.csproj

  <ItemGroup>
-    <ILLinkSubstitutionsXmls Include="$(ILLinkDirectory)ILLink.Substitutions.xml" />
+    <ILLinkSubstitutionsXmls Include="$(ILLinkDirectory)ILLink.Substitutions.xml" Condition="'$(TargetPlatformIdentifier)' != 'wasi'"/>


Condition="'$(TargetPlatformIdentifier)' != 'wasi'" still needed?

no, removed. Thanks.

SingleAccretion · 2024-10-07T13:59:32Z

eng/pipelines/runtimelab/runtimelab-post-build-steps.yml

@@ -8,6 +8,7 @@ parameters:
  testFilter: tree nativeaot
  isOfficialBuild: false
  librariesConfiguration: Debug
+  crossArg: $(crossArg)


Why indirect through the parameters template arguments, instead of using $(crossArg) directly?

no reason, removed.

SingleAccretion · 2024-10-07T14:00:08Z

src/tests/Common/mergedrunnermobile.targets

+  <Target Name="GenerateExecutionScriptsInternal"
+    Condition="$(_CLRTestNeedsToRun) or $(_CLRTestBuildsExecutable)"
+    DependsOnTargets="FetchExternalProperties;Generate@(ExecutionScriptKind, 'ExecutionScript;Generate')ExecutionScript;" />
+
  <Target Name="GenerateLocalRunnerScript" DependsOnTargets="GenerateRunScript" AfterTargets="PublishTestAsSelfContained" />

  <Import Project="$(RepositoryEngineeringDir)testing\tests.targets" />


Revert this file?

yes, thanks.

src/tests/Directory.Build.targets

src/coreclr/inc/jithelpers.h

SingleAccretion · 2024-10-07T14:11:44Z

src/tests/nativeaot/nativeaot.csproj

    </ItemGroup>
-  
+


Suggested change

Reducing diffs.

thanks, spaes added.

Co-authored-by: SingleAccretion <62474226+SingleAccretion@users.noreply.github.com>

revert mergedrunnermobile.targets change

…o merge-sep-24

remoe wasi condition in System.System.Net.Http.csproj revert ws removal

yowl · 2024-10-08T10:48:34Z

Latest feedback addressed, thanks!

SingleAccretion

LGTM, thank you!

jkotas · 2024-10-08T11:31:20Z

Thank you all!

pavelsavara and others added 30 commits September 4, 2024 20:14

Revert XUNIT_HIDE_PASSING_OUTPUT_DIAGNOSTICS (#107349)

c7227c0

Generate an unconditional bailout for MINT_SWITCH in jiterpreter trac…

959c10e

…es instead of aborting the trace (#107323) Better diagnostic output when jiterp hits an invalid opcode

Stop referencing S.R.Metadata directly (#107343)

19942d9

This was added in #101666 to address a point in time issue. It should not be needed anymore.

Fix meter/instrument filtering in MetricsEventSource (#107267)

97f92a3

* Fix meter/instrument filtering in MetricsEventSource * Address the feedback

Fix CrossGen2SynthesizePgo on Windows (#107362)

eec40f1

Due to an apparent typo, The CrossGen2SynthesizePgo test flag simply always skipped tests on Windows, instead of just skipping tests when synthesize pgo testing was enabled.

JIT: Skip more covariance checks (#107116)

f8e9dd1

Co-authored-by: Jan Kotas <jkotas@microsoft.com>

Provide System.Composition.AttributedModel package readme (#106781)

8b1db37

* Provide System.Composition.AttributedModel package readme * Improve after feedback * Set correct PackageDescription

Remove PointerNativeTypeAssignmentRewriter by introducing a separate …

4ebb841

…local with the exact type and assigning to/from it (#107219)

Update to zlib-ng 2.2.1, excluding the folders:

dcd113e

- docs/ - test/ - arch/s390/self-hosted-builder/

Apply slide_hash and deflate patch with casts and asserts.

12bc7ed

Remove custom allocator.

c62bc5b

Update Compression unit tests.

e61a10e

cgmanifest.json, zlib-ng-version.txt, THIRD-PARTY-NOTICES.TXT updates.

e060e83

Include system environment variables when resolving ASPNETCORE_URLS (…

5b25f67

…#107293)

[RISC-V] Increase timeouts in CacheTests (#107278)

88f9aba

This patch fixes System.Text.Json.Serialization.Tests.CacheTests on Debug build.

[mono][ci] Include PDBs from runtime pack when building on Helix if r…

e5b9dbb

…equired (#107348)

[browser] Fix processing of satellite assemblies from referenced asse…

40cafd7

…mbly during publish (#106696)

JIT: Remove implicit fallthrough assumption in `fgExpandRarelyRunBloc…

0961328

…ks` (#107350)

Merge pull request #105771 from carlossanlop/UpgradeZlibNg

468362f

Upgrade zlib-ng to 2.2.1

[wasi] fix WasmTestRunnerDir (#107389)

dece778

docs: fix a typo (#106234)

0148ed5

fix occurrences typo

Fix some NRT on StringCollections (#106116)

66e45ef

Co-authored-by: Eirik Tsarpalis <eirik.tsarpalis@gmail.com>

Build NativeAOT-iOS runtime tests as standalone to restore test runs …

64e2421

…(#107366)

yowl added 5 commits October 4, 2024 16:04

revert StartupHook change

a07bc2b

remove some 2614 temp workarounds

18abaaf

revert to upstream.

remove some 2614 temp workarounds

b0c9afb

revert to upstream.

Revert merge mistake

6f81769

remove COreCLR condition

68972c7

yowl force-pushed the merge-sep-24 branch from 577ded0 to 68972c7 Compare October 5, 2024 20:00

yowl closed this Oct 5, 2024

yowl reopened this Oct 5, 2024

yowl added 7 commits October 5, 2024 16:06

Merge commit '59a096e8c25a7bec37bc1e9f716a9794d130b7d5' into merge-se…

053aa1b

…p-24

try updating wasmtime

6f92016

add htto suppoer for linux

c43b4d4

quote

d42a130

correct option

b84130d

remove unwanted --

01d62c7

revert wasmtime bump

6c20cce

pavelsavara requested a review from SingleAccretion October 7, 2024 13:44

SingleAccretion reviewed Oct 7, 2024

View reviewed changes

yowl and others added 8 commits October 7, 2024 14:09

Update src/tests/Directory.Build.targets

b6b7136

Co-authored-by: SingleAccretion <62474226+SingleAccretion@users.noreply.github.com>

Update src/coreclr/inc/jithelpers.h

b3379d0

Co-authored-by: SingleAccretion <62474226+SingleAccretion@users.noreply.github.com>

revert ws change

b1888a9

revert mergedrunnermobile.targets change

revert ws change

4b94322

revert mergedrunnermobile.targets change

Merge branch 'merge-sep-24' of https://github.com/yowl/runtimelab int…

813fb77

…o merge-sep-24

revert ws change

10faa68

use crossArg directly, no need for parameter

2df2857

dont pessimize other helpres

7c51ab4

remoe wasi condition in System.System.Net.Http.csproj revert ws removal

SingleAccretion approved these changes Oct 8, 2024

View reviewed changes

jkotas merged commit 21054eb into dotnet:feature/NativeAOT-LLVM Oct 8, 2024
15 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[NativeAOT-LLVM] Merge to Sep 24 #2688

[NativeAOT-LLVM] Merge to Sep 24 #2688

yowl commented Sep 17, 2024 •

edited

Loading

yowl commented Oct 6, 2024

SingleAccretion Oct 7, 2024

yowl Oct 8, 2024

SingleAccretion Oct 7, 2024

yowl Oct 8, 2024

SingleAccretion Oct 7, 2024

yowl Oct 8, 2024

SingleAccretion Oct 7, 2024

yowl Oct 8, 2024

SingleAccretion Oct 7, 2024

yowl Oct 7, 2024

SingleAccretion Oct 7, 2024

yowl Oct 8, 2024

yowl commented Oct 8, 2024

SingleAccretion left a comment

jkotas commented Oct 8, 2024

-                nonNullReturn = true;
-                break;
+                noThrow       = true;
+                nonNullReturn = true;
+                break;
+            case CORINFO_HELP_READYTORUN_GENERIC_HANDLE:
+                // Typically this is a no-throw call, but may become always-throw when fetching an unavailable handle.
+                isPure        = true;
+                nonNullReturn = true;
+                break;

[NativeAOT-LLVM] Merge to Sep 24 #2688

[NativeAOT-LLVM] Merge to Sep 24 #2688

Conversation

yowl commented Sep 17, 2024 • edited Loading

yowl commented Oct 6, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yowl commented Oct 8, 2024

SingleAccretion left a comment

Choose a reason for hiding this comment

jkotas commented Oct 8, 2024

yowl commented Sep 17, 2024 •

edited

Loading