Skip to content

Commit be539ee

Browse files
grendellogrendello
committed
Merge branch 'main' into dev/grendel/android-clr-host-local
* main: (22 commits) Clean up Stopwatch a bit (dotnet#111834) JIT: Fix embedded broadcast simd size (dotnet#111638) Revert potential UB due to aliasing + more WB removals (dotnet#111733) re-enable acceleration of Vector512<long>.op_Multiply (dotnet#111832) Handle OSSL 3.4 change to SAN:othername formatting JIT: Fix stack allocated arrays for NativeAOT (dotnet#111827) JIT: enhance RBO inference for similar compares to constants (dotnet#111766) JIT: Don't run optSetBlockWeights when we have PGO data (dotnet#111764) [Android] Make sure RuntimeFlavor=CoreCLR when clr subset is specified (dotnet#111821) Change empty subject test certificate to include a critical SAN. Fix reversed code offsets in GcInfo (dotnet#111792) Swap some libraries areas between leads (dotnet#111816) Add left-handed spherical and cylindrical billboards (dotnet#109605) JIT: revise `optRelopImpliesRelop` to always set `reverseSense` (dotnet#111803) Fix Zip64ExtraField handling (dotnet#111802) Add build support for Android+CoreCLR (dotnet#110471) arm64: Add bic(s) compact encoding (dotnet#111452) JIT: Ensure `BBF_PROF_WEIGHT` flag is set when we have PGO data (dotnet#111780) Add support for AVX10.2, Add AVX10.2 API surface and template tests (dotnet#111209) JIT: Preliminary for enabling inlining late devirted calls (dotnet#111782) ...
2 parents 3271297 + f41b65f commit be539ee

File tree

79 files changed

+3301
-602
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+3301
-602
lines changed

‎docs/area-owners.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Note: Editing this file doesn't update the mapping used by `@dotnet-policy-servi
3131
| area-Diagnostics-mono | @tommcdon | @tommcdon @mdh1418 @thaystg | |
3232
| area-EnC-mono | @tommcdon | @mikelle-rogers @thaystg | Hot Reload on WebAssembly, Android, iOS, etc . @lambdageek to consult |
3333
| area-ExceptionHandling-coreclr | @mangod9 | @janvorli | |
34-
| area-Extensions-Caching | @ericstj | @dotnet/area-extensions-caching | Consultants: @mgravell, @sebastienros |
34+
| area-Extensions-Caching | @jeffhandley | @dotnet/area-extensions-caching | Consultants: @mgravell, @sebastienros |
3535
| area-Extensions-Configuration | @ericstj | @dotnet/area-extensions-configuration | Consultants: @eerhardt |
3636
| area-Extensions-DependencyInjection | @ericstj | @dotnet/area-extensions-dependencyinjection | Consultants: @halter73, @benjaminpetit |
3737
| area-Extensions-FileSystem | @jeffhandley | @dotnet/area-extensions-filesystem | |
@@ -128,15 +128,15 @@ Note: Editing this file doesn't update the mapping used by `@dotnet-policy-servi
128128
| area-System.ServiceModel | @HongGit | @HongGit @mconnew | Repo: https://github.com/dotnet/WCF<br>Packages:<ul><li>System.ServiceModel.Primitives</li><li>System.ServiceModel.Http</li><li>System.ServiceModel.NetTcp</li><li>System.ServiceModel.Duplex</li><li>System.ServiceModel.Security</li></ul> |
129129
| area-System.ServiceModel.Syndication | @HongGit | @StephenMolloy @HongGit | |
130130
| area-System.ServiceProcess | @ericstj | @dotnet/area-system-serviceprocess | |
131-
| area-System.Speech | @jeffhandley | @ericstj @jeffhandley | |
132-
| area-System.Text.Encoding | @jeffhandley | @dotnet/area-system-text-encoding | |
133-
| area-System.Text.Encodings.Web | @jeffhandley | @dotnet/area-system-text-encodings-web | |
131+
| area-System.Speech | @ericstj | @dotnet/area-system-speech | |
132+
| area-System.Text.Encoding | @ericstj | @dotnet/area-system-text-encoding | |
133+
| area-System.Text.Encodings.Web | @ericstj | @dotnet/area-system-text-encodings-web | |
134134
| area-System.Text.Json | @jeffhandley | @dotnet/area-system-text-json | |
135135
| area-System.Text.RegularExpressions | @ericstj | @dotnet/area-system-text-regularexpressions | Consultants: @stephentoub |
136136
| area-System.Threading | @mangod9 | @kouvel | |
137-
| area-System.Threading.Channels | @ericstj | @dotnet/area-system-threading-channels | Consultants: @stephentoub |
137+
| area-System.Threading.Channels | @jeffhandley | @dotnet/area-system-threading-channels | Consultants: @stephentoub |
138138
| area-System.Threading.RateLimiting | @rafikiassumani-msft | @BrennanConroy @halter73 | |
139-
| area-System.Threading.Tasks | @ericstj | @dotnet/area-system-threading-tasks | Consultants: @stephentoub |
139+
| area-System.Threading.Tasks | @jeffhandley | @dotnet/area-system-threading-tasks | Consultants: @stephentoub |
140140
| area-System.Transactions | @sammonort | @roji | |
141141
| area-System.Xml | @jeffhandley | @dotnet/area-system-xml | |
142142
| area-TieredCompilation-coreclr | @mangod9 | @kouvel | |

‎eng/Subsets.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989

9090
<PropertyGroup Condition="'$(RuntimeFlavor)' == ''">
9191
<RuntimeFlavor Condition="('$(TargetsMobile)' == 'true' or '$(TargetsLinuxBionic)' == 'true') and ($(_subset.Contains('+clr.nativeaotlibs+')) or $(_subset.Contains('+clr.runtime+')))">CoreCLR</RuntimeFlavor>
92-
<RuntimeFlavor Condition="'$(TargetsAndroid)' == 'true' and $(_subset.Contains('+clr.'))">CoreCLR</RuntimeFlavor>
92+
<RuntimeFlavor Condition="'$(TargetsAndroid)' == 'true' and ($(_subset.Contains('+clr+')) or $(_subset.Contains('+clr.')))">CoreCLR</RuntimeFlavor>
9393
<RuntimeFlavor Condition="'$(RuntimeFlavor)' == '' and '$(TargetsMobile)' == 'true'">Mono</RuntimeFlavor>
9494
<RuntimeFlavor Condition="'$(RuntimeFlavor)' == '' and ($(_subset.Contains('+mono+')) or $(_subset.Contains('+mono.runtime+'))) and (!$(_subset.Contains('+clr+')) and !$(_subset.Contains('+clr.runtime+')) and !$(_subset.Contains('+clr.corelib+')))">Mono</RuntimeFlavor>
9595
<RuntimeFlavor Condition="'$(RuntimeFlavor)' == ''">$(PrimaryRuntimeFlavor)</RuntimeFlavor>

‎eng/testing/BrowserVersions.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project>
22
<PropertyGroup>
3-
<linux_ChromeVersion>131.0.6778.85</linux_ChromeVersion>
4-
<linux_ChromeRevision>1368529</linux_ChromeRevision>
5-
<linux_ChromeBaseSnapshotUrl>https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/1368532</linux_ChromeBaseSnapshotUrl>
6-
<linux_V8Version>13.1.201</linux_V8Version>
7-
<win_ChromeVersion>131.0.6778.33</win_ChromeVersion>
8-
<win_ChromeRevision>1368529</win_ChromeRevision>
9-
<win_ChromeBaseSnapshotUrl>https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/1368547</win_ChromeBaseSnapshotUrl>
10-
<win_V8Version>13.1.201</win_V8Version>
3+
<linux_ChromeVersion>132.0.6834.83</linux_ChromeVersion>
4+
<linux_ChromeRevision>1381561</linux_ChromeRevision>
5+
<linux_ChromeBaseSnapshotUrl>https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/1381561</linux_ChromeBaseSnapshotUrl>
6+
<linux_V8Version>13.2.152</linux_V8Version>
7+
<win_ChromeVersion>132.0.6834.84</win_ChromeVersion>
8+
<win_ChromeRevision>1381561</win_ChromeRevision>
9+
<win_ChromeBaseSnapshotUrl>https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/1381570</win_ChromeBaseSnapshotUrl>
10+
<win_V8Version>13.2.152</win_V8Version>
1111
<linux_FirefoxRevision>125.0.1</linux_FirefoxRevision>
1212
<linux_GeckoDriverRevision>0.34.0</linux_GeckoDriverRevision>
1313
<win_FirefoxRevision>125.0.1</win_FirefoxRevision>

‎src/coreclr/jit/assertionprop.cpp‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5258,30 +5258,6 @@ static GCInfo::WriteBarrierForm GetWriteBarrierForm(Compiler* comp, ValueNum vn)
52585258
return GetWriteBarrierForm(comp, funcApp.m_args[0]);
52595259
}
52605260
}
5261-
if (funcApp.m_func == VNF_InitVal)
5262-
{
5263-
unsigned lclNum = vnStore->CoercedConstantValue<unsigned>(funcApp.m_args[0]);
5264-
assert(lclNum != BAD_VAR_NUM);
5265-
CORINFO_CLASS_HANDLE srcCls = NO_CLASS_HANDLE;
5266-
5267-
if (comp->compMethodHasRetVal() && (lclNum == comp->info.compRetBuffArg))
5268-
{
5269-
// See if the address is in current method's return buffer
5270-
// while the return type is a byref-like type.
5271-
srcCls = comp->info.compMethodInfo->args.retTypeClass;
5272-
}
5273-
else if (lclNum == comp->info.compThisArg)
5274-
{
5275-
// Same for implicit "this" parameter
5276-
assert(!comp->info.compIsStatic);
5277-
srcCls = comp->info.compClassHnd;
5278-
}
5279-
5280-
if ((srcCls != NO_CLASS_HANDLE) && comp->eeIsByrefLike(srcCls))
5281-
{
5282-
return GCInfo::WriteBarrierForm::WBF_NoBarrier;
5283-
}
5284-
}
52855261
}
52865262
return GCInfo::WriteBarrierForm::WBF_BarrierUnknown;
52875263
}

‎src/coreclr/jit/codegen.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,7 @@ class CodeGen final : public CodeGenInterface
650650
#if defined(TARGET_AMD64)
651651
void genAmd64EmitterUnitTestsSse2();
652652
void genAmd64EmitterUnitTestsApx();
653+
void genAmd64EmitterUnitTestsAvx10v2();
653654
#endif
654655

655656
#endif // defined(DEBUG)

‎src/coreclr/jit/codegenarm64.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2675,6 +2675,12 @@ void CodeGen::genCodeForBinary(GenTreeOp* tree)
26752675
break;
26762676
}
26772677

2678+
case GT_AND_NOT:
2679+
{
2680+
ins = INS_bics;
2681+
break;
2682+
}
2683+
26782684
default:
26792685
{
26802686
noway_assert(!"Unexpected BinaryOp with GTF_SET_FLAGS set");

‎src/coreclr/jit/codegencommon.cpp‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1832,15 +1832,26 @@ void CodeGen::genGenerateMachineCode()
18321832
#if defined(TARGET_X86)
18331833
if (compiler->canUseEvexEncoding())
18341834
{
1835-
if (compiler->compOpportunisticallyDependsOn(InstructionSet_AVX10v1))
1835+
if (compiler->compOpportunisticallyDependsOn(InstructionSet_AVX10v2))
1836+
{
1837+
if (compiler->compOpportunisticallyDependsOn(InstructionSet_AVX10v2_V512))
1838+
{
1839+
printf("X86 with AVX10.2/512");
1840+
}
1841+
else
1842+
{
1843+
printf("X86 with AVX10.2/256");
1844+
}
1845+
}
1846+
else if (compiler->compOpportunisticallyDependsOn(InstructionSet_AVX10v1))
18361847
{
18371848
if (compiler->compOpportunisticallyDependsOn(InstructionSet_AVX10v1_V512))
18381849
{
1839-
printf("X86 with AVX10/512");
1850+
printf("X86 with AVX10.1/512");
18401851
}
18411852
else
18421853
{
1843-
printf("X86 with AVX10/256");
1854+
printf("X86 with AVX10.1/256");
18441855
}
18451856
}
18461857
else
@@ -1860,15 +1871,26 @@ void CodeGen::genGenerateMachineCode()
18601871
#elif defined(TARGET_AMD64)
18611872
if (compiler->canUseEvexEncoding())
18621873
{
1863-
if (compiler->compOpportunisticallyDependsOn(InstructionSet_AVX10v1))
1874+
if (compiler->compOpportunisticallyDependsOn(InstructionSet_AVX10v2))
1875+
{
1876+
if (compiler->compOpportunisticallyDependsOn(InstructionSet_AVX10v2_V512))
1877+
{
1878+
printf("X64 with AVX10.2/512");
1879+
}
1880+
else
1881+
{
1882+
printf("X64 with AVX10.2/256");
1883+
}
1884+
}
1885+
else if (compiler->compOpportunisticallyDependsOn(InstructionSet_AVX10v1))
18641886
{
18651887
if (compiler->compOpportunisticallyDependsOn(InstructionSet_AVX10v1_V512))
18661888
{
1867-
printf("X64 with AVX10/512");
1889+
printf("X64 with AVX10.1/512");
18681890
}
18691891
else
18701892
{
1871-
printf("X64 with AVX10/256");
1893+
printf("X64 with AVX10.1/256");
18721894
}
18731895
}
18741896
else

‎src/coreclr/jit/codegenlinear.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2712,6 +2712,10 @@ void CodeGen::genEmitterUnitTests()
27122712
{
27132713
genAmd64EmitterUnitTestsApx();
27142714
}
2715+
if (unitTestSectionAll || (strstr(unitTestSection, "avx10v2") != nullptr))
2716+
{
2717+
genAmd64EmitterUnitTestsAvx10v2();
2718+
}
27152719

27162720
#elif defined(TARGET_ARM64)
27172721
if (unitTestSectionAll || (strstr(unitTestSection, "general") != nullptr))

0 commit comments

Comments
 (0)