8000 [main] Source code updates from dotnet/runtime (#395) · dotnet/dotnet@be704a3 · GitHub
[go: up one dir, main page]
Skip to content

Commit be704a3

Browse files
dotnet-maestro[bot]ViktorHofer
dotnet-maestro[bot]
and
ViktorHofer
authored
[main] Source code updates from dotnet/runtime (#395)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
1 parent 025e4e5 commit be704a3

File tree

6 files changed

+39
-25
lines changed

6 files changed

+39
-25
lines changed

‎prereqs/git-info/runtime.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<PropertyGroup>
4-
<GitCommitHash>43955cb086eb88dbe78f1764c21dd3362a2427ee</GitCommitHash>
5-
<OfficialBuildId>20250505.1</OfficialBuildId>
6-
<OutputPackageVersion>10.0.0-preview.5.25255.1</OutputPackageVersion>
4+
<GitCommitHash>efee748ff6f18f80154bc6b6e277bd51481c56e3</GitCommitHash>
5+
<OfficialBuildId>20250505.6</OfficialBuildId>
6+
<OutputPackageVersion>10.0.0-preview.5.25255.6</OutputPackageVersion>
77
</PropertyGroup>
88
</Project>

‎src/runtime/eng/testing/BrowserVersions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22
<PropertyGroup>
3-
<linux_ChromeVersion>135.0.7049.52</linux_ChromeVersion>
4-
<linux_ChromeRevision>1427262</linux_ChromeRevision>
5-
<linux_ChromeBaseSnapshotUrl>https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/1427282</linux_ChromeBaseSnapshotUrl>
6-
<linux_V8Version>13.5.212</linux_V8Version>
3+
<linux_ChromeVersion>136.0.7103.59</linux_ChromeVersion>
4+
<linux_ChromeRevision>1440670</linux_ChromeRevision>
5+
<linux_ChromeBaseSnapshotUrl>https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/1440672</linux_ChromeBaseSnapshotUrl>
6+
<linux_V8Version>13.6.233</linux_V8Version>
77
<win_ChromeVersion>136.0.7103.48</win_ChromeVersion>
88
<win_ChromeRevision>1440670</win_ChromeRevision>
99
<win_ChromeBaseSnapshotUrl>https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/1440684</win_ChromeBaseSnapshotUrl>

‎src/runtime/src/libraries/tests.proj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,11 @@
578578
<GrpcTestProject Include="$(RepoRoot)\src\tests\FunctionalTests\Android\Device_Emulator\gRPC\Android.Device_Emulator.gRPC.Test.csproj" />
579579
</ItemGroup>
580580

581+
<!-- browser smoke tests -->
582+
<ItemGroup Condition="'$(TargetOS)' == 'browser'">
583+
<SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime.Intrinsics\tests\System.Runtime.Intrinsics.Tests.csproj" />
584+
</ItemGroup>
585+
581586
<!-- wasi/interp smoke tests -->
582587
<ItemGroup Condition="'$(TargetOS)' == 'wasi' and '$(RunAOTCompilation)' != 'true'">
583588
<SmokeTestProject Include="$(MSBuildThisFileDirectory)Microsoft.XmlSerializer.Generator\tests\Microsoft.XmlSerializer.Generator.Tests.csproj" />

‎src/runtime/src/mono/mono/mini/mini-llvm.c

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10449,20 +10449,29 @@ MONO_RESTORE_WARNING
1044910449
break;
1045010450
}
1045110451
case OP_WASM_SIMD_SWIZZLE: {
10452+
LLVMValueRef bidx = LLVMBuildBitCast (builder, rhs, LLVMVectorType (i1_t, 16), "");
1045210453
int nelems = LLVMGetVectorSize (LLVMTypeOf (lhs));
10453-
if (nelems == 16) {
10454-
LLVMValueRef args [] = { lhs, rhs };
10455-
values [ins->dreg] = call_intrins (ctx, INTRINS_WASM_SWIZZLE, args, "");
10456-
break;
10457-
}
10458-
10459-
LLVMValueRef indexes [16];
10460-
for (int i = 0; i < nelems; ++i)
10461-
indexes [i] = LLVMBuildExtractElement (builder, rhs, const_int32 (i), "");
10462-
LLVMValueRef shuffle_val = LLVMConstNull (LLVMVectorType (i4_t, nelems));
10463-
for (int i = 0; i < nelems; ++i)
10464-
shuffle_val = LLVMBuildInsertElement (builder, shuffle_val, convert (ctx, indexes [i], i4_t), const_int32 (i), "");
10465-
values [ins->dreg] = LLVMBuildShuffleVector (builder, lhs, LLVMGetUndef (LLVMTypeOf (lhs)), shuffle_val, "");
10454+
if (nelems < 16) {
10455+
int shift = nelems == 8 ? 1 : (nelems == 4 ? 2 : 3);
10456+
LLVMValueRef fill = LLVMConstNull (LLVMVectorType (i1_t, 16));
10457+
LLVMValueRef offset = LLVMConstNull (LLVMVectorType (i1_t, 16));
10458+
int stride = 16 / nelems;
10459+
for (int i = 0; i < nelems; ++i) {
10460+
for (int j = 0; j < stride; ++j) {
10461+
offset = LLVMBuildInsertElement (builder, offset, const_int8 (j), const_int8 (i * stride + j), "");
10462+
fill = LLVMBuildInsertElement (builder, fill, const_int8 (i * stride), const_int8 (i * stride + j), "");
10463+
}
10464+
}
10465+
LLVMValueRef shiftv = create_shift_vector (ctx, bidx, const_int32 (shift));
10466+
bidx = LLVMBuildShl (builder, bidx, shiftv, "");
10467+
LLVMValueRef args [] = { bidx, fill };
10468+
bidx = call_intrins (ctx, INTRINS_WASM_SWIZZLE, args, "");
10469+
bidx = LLVMBuildAdd (builder, bidx, offset, "");
10470+
}
10471+
LLVMValueRef lhs_b = LLVMBuildBitCast (builder, lhs, LLVMVectorType (i1_t, 16), "");
10472+
LLVMValueRef args [] = { lhs_b, bidx };
10473+
LLVMValueRef result_b = call_intrins (ctx, INTRINS_WASM_SWIZZLE, args, "");
10474+
values [ins->dreg] = LLVMBuildBitCast (builder, result_b, LLVMTypeOf (lhs), "");
1046610475
break;
1046710476
}
1046810477
case OP_WASM_EXTRACT_NARROW: {

‎src/runtime/src/mono/mono/mini/simd-intrinsics.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6154,8 +6154,8 @@ static SimdIntrinsic packedsimd_methods [] = {
61546154
{SN_LoadScalarVector128},
61556155
{SN_LoadVector128, OP_LOADX_MEMBASE},
61566156
{SN_LoadWideningVector128, OP_WASM_SIMD_LOAD_WIDENING},
6157-
{SN_Max, OP_XBINOP, OP_IMIN, OP_XBINOP, OP_IMIN_UN, OP_XBINOP, OP_FMIN},
6158-
{SN_Min, OP_XBINOP, OP_IMAX, OP_XBINOP, OP_IMAX_UN, OP_XBINOP, OP_FMAX},
6157+
{SN_Max, OP_XBINOP, OP_IMAX, OP_XBINOP, OP_IMAX_UN, OP_XBINOP, OP_FMAX},
6158+
{SN_Min, OP_XBINOP, OP_IMIN, OP_XBINOP, OP_IMIN_UN, OP_XBINOP, OP_FMIN},
61596159
{SN_Multiply},
61606160
{SN_MultiplyRoundedSaturateQ15, OP_XOP_X_X_X, INTRINS_WASM_Q15MULR_SAT_SIGNED},
61616161
{SN_MultiplyWideningLower, OP_WASM_EXTMUL_LOWER, 0, OP_WASM_EXTMUL_LOWER_U},

‎src/source-manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@
106106
"commitSha": "ba7afc0f470c9b92b88c9468420942b2d1d57355"
107107
},
108108
{
109-
"packageVersion": "10.0.0-preview.5.25255.1",
110-
"barId": 266819,
109+
"packageVersion": "10.0.0-preview.5.25255.6",
110+
"barId": 266915,
111111
"path": "runtime",
112112
"remoteUri": "https://github.com/dotnet/runtime",
113-
"commitSha": "43955cb086eb88dbe78f1764c21dd3362a2427ee"
113+
"commitSha": "efee748ff6f18f80154bc6b6e277bd51481c56e3"
114114
},
115115
{
116116
"packageVersion": "10.0.0-preview.25221.1",

0 commit comments

Comments
 (0)
0