8000 [main] Source code updates from dotnet/runtime by dotnet-maestro[bot] · Pull Request #395 · dotnet/dotnet · GitHub
[go: up one dir, main page]
Skip to content

[main] Source code updates from dotnet/runtime #395

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 3 commits into from
May 6, 2025
Merged

[main] Source code updates from dotnet/runtime #395

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ce00bd
[runtime] Source update 43955cb → efee748
dotnet-maestro[bot] May 6, 2025
9635e3b
Delete src/runtime/eng/DotNetBuild.props
ViktorHofer May 6, 2025
c2eee73
Merge branch 'main' into darc-main-07d99b08-487d-471c-a7d2-430c9e4e4aac
ViktorHofer May 6, 2025
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
Next Next commit
[runtime] Source update 43955cb → efee748 
Diff: https://github.com/dotnet/runtime/compare/43955cb086eb88dbe78f1764c21dd3362a2427ee..efee748ff6f18f80154bc6b6e277bd51481c56e3

From: dotnet/runtime@43955cb
To: dotnet/runtime@efee748

[[ commit created by automation ]]
  • Loading branch information
@dotnet-maestro
dotnet-maestro[bot] committed May 6, 2025
commit 0ce00bd4e31aefefb7b9a2ecabb200a350582929
6 changes: 3 additions & 3 deletions prereqs/git-info/runtime.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<GitCommitHash>43955cb086eb88dbe78f1764c21dd3362a2427ee</GitCommitHash>
<OfficialBuildId>20250505.1</OfficialBuildId>
<OutputPackageVersion>10.0.0-preview.5.25255.1</OutputPackageVersion>
<GitCommitHash>efee748ff6f18f80154bc6b6e277bd51481c56e3</GitCommitHash>
<OfficialBuildId>20250505.6</OfficialBuildId>
<OutputPackageVersion>10.0.0-preview.5.25255.6</OutputPackageVersion>
</PropertyGroup>
</Project>
34 changes: 0 additions & 34 deletions src/runtime/eng/DotNetBuild.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,38 +96,4 @@
</PropertyGroup>
</Target>

<Target Name="CategorizeRuntimeSupplementalArtifacts"
BeforeTargets="GetCategorizedIntermediateNupkgContents">
<PropertyGroup>
<!-- Symbols archive is too big for main intermediate package, add it to a different one. -->
<SymbolsIntermediateNupkgCategory>runtime</SymbolsIntermediateNupkgCategory>
</PropertyGroup>

<ItemGroup>
<!--
Runtime artifacts are too large to fit into a single package (Azure DevOps feeds 500 mb constraint).
Split large components into separate packages.
-->
<IntermediateNupkgArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-runtime-*$(ArchiveExtension)" Category="runtime" />
<IntermediateNupkgArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\*Microsoft.DotNet.ILCompiler.*.nupkg" Category="ILCompiler" />

<IntermediateNupkgArtifactFile
Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\Microsoft.NETCore.App.Crossgen2.*.nupkg"
Category="Crossgen2Pack" />

<IntermediateNupkgArtifactFile
Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-crossgen2-*$(ArchiveExtension)"
Category="Crossgen2Archive" />
</ItemGroup>

<ItemGroup Condition="'$(DotNetBuildOrchestrator)' == 'true'">
<!-- Include installers when in product VMR builds. These are not necessary when building the repo-only build as we don't
need them in downstream source-only PR legs. We could include them, but it may bump us over the package size limit. -->
<IntermediateNupkgArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\*.msi" />
<IntermediateNupkgArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\*.deb" />
<IntermediateNupkgArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\*.rpm" />
<IntermediateNupkgArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\*.pkg" />
</ItemGroup>
</Target>

</Project>
8 changes: 4 additions & 4 deletions src/runtime/eng/testing/BrowserVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>
<PropertyGroup>
<linux_ChromeVersion>135.0.7049.52</linux_ChromeVersion>
<linux_ChromeRevision>1427262</linux_ChromeRevision>
<linux_ChromeBaseSnapshotUrl>https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/1427282</linux_ChromeBaseSnapshotUrl>
<linux_V8Version>13.5.212</linux_V8Version>
<linux_ChromeVersion>136.0.7103.59</linux_ChromeVersion>
<linux_ChromeRevision>1440670</linux_ChromeRevision>
<linux_ChromeBaseSnapshotUrl>https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/1440672</linux_ChromeBaseSnapshotUrl>
<linux_V8Version>13.6.233</linux_V8Version>
<win_ChromeVersion>136.0.7103.48</win_ChromeVersion>
<win_ChromeRevision>1440670</win_ChromeRevision>
<win_ChromeBaseSnapshotUrl>https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/1440684</win_ChromeBaseSnapshotUrl>
Expand Down
5 changes: 5 additions & 0 deletions src/runtime/src/libraries/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,11 @@
<GrpcTestProject Include="$(RepoRoot)\src\tests\FunctionalTests\Android\Device_Emulator\gRPC\Android.Device_Emulator.gRPC.Test.csproj" />
</ItemGroup>

<!-- browser smoke tests -->
<ItemGroup Condition="'$(TargetOS)' == 'browser'">
<SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime.Intrinsics\tests\System.Runtime.Intrinsics.Tests.csproj" />
</ItemGroup>

<!-- wasi/interp smoke tests -->
<ItemGroup Condition="'$(TargetOS)' == 'wasi' and '$(RunAOTCompilation)' != 'true'">
<SmokeTestProject Include="$(MSBuildThisFileDirectory)Microsoft.XmlSerializer.Generator\tests\Microsoft.XmlSerializer.Generator.Tests.csproj" />
Expand Down
35 changes: 22 additions & 13 deletions src/runtime/src/mono/mono/mini/mini-llvm.c
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -10449,20 +10449,29 @@ MONO_RESTORE_WARNING
break;
}
case OP_WASM_SIMD_SWIZZLE: {
LLVMValueRef bidx = LLVMBuildBitCast (builder, rhs, LLVMVectorType (i1_t, 16), "");
int nelems = LLVMGetVectorSize (LLVMTypeOf (lhs));
if (nelems == 16) {
LLVMValueRef args [] = { lhs, rhs };
values [ins->dreg] = call_intrins (ctx, INTRINS_WASM_SWIZZLE, args, "");
break;
}

LLVMValueRef indexes [16];
for (int i = 0; i < nelems; ++i)
indexes [i] = LLVMBuildExtractElement (builder, rhs, const_int32 (i), "");
LLVMValueRef shuffle_val = LLVMConstNull (LLVMVectorType (i4_t, nelems));
for (int i = 0; i < nelems; ++i)
shuffle_val = LLVMBuildInsertElement (builder, shuffle_val, convert (ctx, indexes [i], i4_t), const_int32 (i), "");
values [ins->dreg] = LLVMBuildShuffleVector (builder, lhs, LLVMGetUndef (LLVMTypeOf (lhs)), shuffle_val, "");
if (nelems < 16) {
int shift = nelems == 8 ? 1 : (nelems == 4 ? 2 : 3);
LLVMValueRef fill = LLVMConstNull (LLVMVectorType (i1_t, 16));
LLVMValueRef offset = LLVMConstNull (LLVMVectorType (i1_t, 16));
int stride = 16 / nelems;
for (int i = 0; i < nelems; ++i) {
for (int j = 0; j < stride; ++j) {
offset = LLVMBuildInsertElement (builder, offset, const_int8 (j), const_int8 (i * stride + j), "");
fill = LLVMBuildInsertElement (builder, fill, const_int8 (i * stride), const_int8 (i * stride + j), "");
}
}
LLVMValueRef shiftv = create_shift_vector (ctx, bidx, const_int32 (shift));
bidx = LLVMBuildShl (builder, bidx, shiftv, "");
LLVMValueRef args [] = { bidx, fill };
bidx = call_intrins (ctx, INTRINS_WASM_SWIZZLE, args, "");
bidx = LLVMBuildAdd (builder, bidx, offset, "");
}
LLVMValueRef lhs_b = LLVMBuildBitCast (builder, lhs, LLVMVectorType (i1_t, 16), "");
LLVMValueRef args [] = { lhs_b, bidx };
LLVMValueRef result_b = call_intrins (ctx, INTRINS_WASM_SWIZZLE, args, "");
values [ins->dreg] = LLVMBuildBitCast (builder, result_b, LLVMTypeOf (lhs), "");
break;
}
case OP_WASM_EXTRACT_NARROW: {
Expand Down
4 changes: 2 additions & 2 deletions src/runtime/src/mono/mono/mini/simd-intrinsics.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6154,8 +6154,8 @@ static SimdIntrinsic packedsimd_methods [] = {
{SN_LoadScalarVector128},
{SN_LoadVector128, OP_LOADX_MEMBASE},
{SN_LoadWideningVector128, OP_WASM_SIMD_LOAD_WIDENING},
{SN_Max, OP_XBINOP, OP_IMIN, OP_XBINOP, OP_IMIN_UN, OP_XBINOP, OP_FMIN},
{SN_Min, OP_XBINOP, OP_IMAX, OP_XBINOP, OP_IMAX_UN, OP_XBINOP, OP_FMAX},
{SN_Max, OP_XBINOP, OP_IMAX, OP_XBINOP, OP_IMAX_UN, OP_XBINOP, OP_FMAX},
{SN_Min, OP_XBINOP, OP_IMIN, OP_XBINOP, OP_IMIN_UN, OP_XBINOP, OP_FMIN},
{SN_Multiply},
{SN_MultiplyRoundedSaturateQ15, OP_XOP_X_X_X, INTRINS_WASM_Q15MULR_SAT_SIGNED},
{SN_MultiplyWideningLower, OP_WASM_EXTMUL_LOWER, 0, OP_WASM_EXTMUL_LOWER_U},
Expand Down
6 changes: 3 additions & 3 deletions src/source-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@
"commitSha": "ba7afc0f470c9b92b88c9468420942b2d1d57355"
},
{
"packageVersion": "10.0.0-preview.5.25255.1",
"barId": 266819,
"packageVersion": "10.0.0-preview.5.25255.6",
"barId": 266915,
"path": "runtime",
"remoteUri": "https://github.com/dotnet/runtime",
"commitSha": "43955cb086eb88dbe78f1764c21dd3362a2427ee"
"commitSha": "efee748ff6f18f80154bc6b6e277bd51481c56e3"
},
{
"packageVersion": "10.0.0-preview.25221.1",
Expand Down
0