Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into liveILLink
Browse files Browse the repository at this point in the history
sbomer committed Oct 3, 2023
2 parents b442dbc + d2e24fa commit d18a62d
Showing 98 changed files with 3,305 additions and 1,415 deletions.
5 changes: 3 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -89,8 +89,9 @@

<!-- The previous supported .NET version. -->
<NetCoreAppPreviousVersion>8.0</NetCoreAppPreviousVersion>
<NetCoreAppPrevious>net$(NetCoreAppPreviousVersion)</NetCoreAppPrevious>
<NetCoreAppPrevious Condition="'$(DotNetBuildFromSource)' == 'true'">$(NetCoreAppCurrent)</NetCoreAppPrevious>
<!-- For the .NET 9 release, set NetCoreAppPrevious to empty as NuGet has issues
with duplicate TFMs (when using both NetCoreAppPrevious and NetCoreAppMinimum). -->
<NetCoreAppPrevious />

<!-- The minimum supported .NET version. -->
<NetCoreAppMinimum>net8.0</NetCoreAppMinimum>
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -100,9 +100,9 @@
<Sha>3af65e74c8be435668f328c2bf134270b33d4e3a</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.23475.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.23502.3">
<Uri>https://github.com/dotnet/source-build-externals</Uri>
<Sha>e45d334fa3fd29018b70c598eced1938c054884d</Sha>
<Sha>588fbcbc2a221bc6cea33f12eb73c9117994154e</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
</ProductDependencies>
@@ -398,9 +398,9 @@
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
<Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23479.5">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23502.7">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>d7ad055f7ff0f04ff95d54b5cd060a751cf0f14b</Sha>
<Sha>ee7ccfc83a91c0acc385a45d15460efd1c1f44c1</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
@@ -251,7 +251,7 @@
<MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
<!-- installer version, for testing workloads -->
<MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23479.5</MicrosoftDotnetSdkInternalVersion>
<MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23502.7</MicrosoftDotnetSdkInternalVersion>
<SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
</PropertyGroup>
</Project>
10 changes: 8 additions & 2 deletions eng/illink.targets
Original file line number Diff line number Diff line change
@@ -96,7 +96,10 @@
</ItemGroup>
</Target>

<UsingTask TaskName="CombineLinkerXmlFiles" AssemblyFile="$(ILLinkTasksAssembly)" Condition="'$(ILLinkTasksAssembly)' != ''" />
<UsingTask TaskName="CombineLinkerXmlFiles"
AssemblyFile="$(ILLinkTasksAssembly)"
TaskFactory="TaskHostFactory"
Condition="'$(ILLinkTasksAssembly)' != ''" />
<Target Name="_CombineILLinkDescriptorsXmls"
Condition="'@(ILLinkDescriptorsXmls)' != ''"
Inputs="@(ILLinkDescriptorsXmls)"
@@ -189,7 +192,10 @@

<!-- Examines the "input assembly" for IL that is unreachable from public API and trims that,
rewriting the assembly to an "output assembly" -->
<UsingTask TaskName="ILLink" AssemblyFile="$(ILLinkTasksAssembly)" Condition="'$(ILLinkTasksAssembly)' != ''" />
<UsingTask TaskName="ILLink"
AssemblyFile="$(ILLinkTasksAssembly)"
TaskFactory="TaskHostFactory"
Condition="'$(ILLinkTasksAssembly)' != ''" />
<Target Name="ILLinkTrimAssembly"
Condition="'$(ILLinkTrimAssembly)' == 'true'"
DependsOnTargets="PrepareForAssembliesTrim">
21 changes: 21 additions & 0 deletions eng/pipelines/common/evaluate-default-paths.yml
Original file line number Diff line number Diff line change
@@ -52,6 +52,15 @@ parameters:
eng/testing/bump-chrome-version.proj
eng/testing/ChromeVersions.props
]
_perf_pipeline_specific_only: [
eng/pipelines/runtime-wasm-perf.yml
eng/pipelines/coreclr/perf*.yml
eng/pipelines/coreclr/templates/perf-job.yml
eng/pipelines/coreclr/templates/*-perf-*
eng/pipelines/coreclr/templates/run-perf*
eng/pipelines/coreclr/templates/run-scenarios-job.yml
eng/testing/performance/*
]

# src/workloads is only used in runtime-official builds
# where evaluate-paths is not used
@@ -90,6 +99,7 @@ jobs:
- ${{ parameters._const_paths._wasm_specific_only }}
- ${{ parameters._const_paths._wasm_pipelines }}
- ${{ parameters._const_paths._always_exclude }}
- ${{ parameters._const_paths._perf_pipeline_specific_only }}

- subset: mono_excluding_wasm
include:
@@ -101,6 +111,7 @@ jobs:
- ${{ parameters._const_paths._wasm_specific_only }}
- ${{ parameters._const_paths._wasm_pipelines }}
- ${{ parameters._const_paths._always_exclude }}
- ${{ parameters._const_paths._perf_pipeline_specific_only }}

- eng/Version.Details.xml
- docs/*
@@ -130,13 +141,15 @@ jobs:
- ${{ parameters._const_paths._wasm_specific_only }}
- ${{ parameters._const_paths._wasm_pipelines }}
- ${{ parameters._const_paths._always_exclude }}
- ${{ parameters._const_paths._perf_pipeline_specific_only }}

- subset: runtimetests
combined: true
include:
- src/tests/*
exclude:
- ${{ parameters._const_paths._wasm_specific_only }}
- ${{ parameters._const_paths._perf_pipeline_specific_only }}

- subset: tools_illink
include:
@@ -160,6 +173,7 @@ jobs:
- ${{ parameters._const_paths._wasm_specific_only }}
- ${{ parameters._const_paths._wasm_pipelines }}
- ${{ parameters._const_paths._always_exclude }}
- ${{ parameters._const_paths._perf_pipeline_specific_only }}

# We have limited Apple Silicon testing capacity
# We want PR testing on a narrower set of changes
@@ -219,6 +233,7 @@ jobs:
- ${{ parameters._const_paths._wasm_pipelines }}
exclude:
- ${{ parameters._const_paths._always_exclude }}
- ${{ parameters._const_paths._perf_pipeline_specific_only }}

- subset: wasmdebuggertests
combined: true
@@ -234,6 +249,7 @@ jobs:
exclude:
- src/mono/nuget/*
- ${{ parameters._const_paths._always_exclude }}
- ${{ parameters._const_paths._perf_pipeline_specific_only }}

# wasm/runtimetests need to be run
- subset: wasm_runtimetests
@@ -249,9 +265,11 @@ jobs:
- src/mono/tools/*
- src/mono/wasi/*
- src/mono/wasm/debugger/*
- src/mono/wasm/host/*
- src/mono/wasm/Wasm.Build.Tests/*
- ${{ parameters._const_paths._wasm_pipelines }}
- ${{ parameters._const_paths._always_exclude }}
- ${{ parameters._const_paths._perf_pipeline_specific_only }}

# Wasm except Wasm.build.Tests, and debugger
- subset: wasm_specific_except_wbt_dbg
@@ -266,12 +284,14 @@ jobs:
- eng/testing/workloads-testing.targets
- src/mono/mono/component/mini-wasm-debugger.c
- src/mono/wasm/debugger/*
- src/mono/wasm/host/*
- src/mono/wasm/Wasm.Build.Tests/*
- src/mono/nuget/Microsoft.NET.Runtime*
src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/*
- src/mono/nuget/Microsoft.NET.Workload*
- src/mono/nuget/Microsoft.NETCore.BrowserDebugHost.Transport/*
- ${{ parameters._const_paths._always_exclude }}
- ${{ parameters._const_paths._perf_pipeline_specific_only }}

- subset: wasm_chrome
include:
@@ -284,6 +304,7 @@ jobs:
- ${{ parameters._const_paths._wasm_specific_only }}
- ${{ parameters._const_paths._wasm_pipelines }}
- ${{ parameters._const_paths._always_exclude }}
- ${{ parameters._const_paths._perf_pipeline_specific_only }}
- eng/testing/tests.mobile.targets
- src/mono/*
- src/tasks/AndroidAppBuilder/*
5 changes: 5 additions & 0 deletions eng/pipelines/coreclr/superpmi-collect.yml
Original file line number Diff line number Diff line change
@@ -15,6 +15,11 @@ trigger:
# and should not be triggerable from a PR.
pr: none

variables:
# disable CodeQL here, we have a separate pipeline for it
- name: Codeql.Enabled
value: False

schedules:
- cron: "0 17 * * 0"
displayName: Sun at 9:00 AM (UTC-8:00)
7 changes: 4 additions & 3 deletions eng/pipelines/runtime-official.yml
Original file line number Diff line number Diff line change
@@ -452,9 +452,10 @@ extends:
buildArgs: -s clr.native+clr.corelib+clr.tools+clr.nativecorelib+libs+host+packs -c $(_BuildConfig) -pgoinstrument /p:SkipLibrariesNativeRuntimePackages=true
isOfficialBuild: ${{ variables.isOfficialBuild }}
nameSuffix: PGO
extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
extraStepsParameters:
name: PGO
postBuildSteps:
- template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
parameters:
name: PGO
timeoutInMinutes: 95

#
14 changes: 14 additions & 0 deletions eng/pipelines/runtime-wasm-perf.yml
Original file line number Diff line number Diff line change
@@ -4,6 +4,20 @@

trigger: none

pr:
branches:
include:
- main
paths:
include:
- eng/pipelines/runtime-wasm-perf.yml
- eng/pipelines/coreclr/perf*.yml
- eng/pipelines/coreclr/templates/perf-job.yml
- eng/pipelines/coreclr/templates/run-perf*
- eng/pipelines/coreclr/templates/run-scenarios-job.yml
- eng/testing/performance/*
- eng/testing/ChromeVersions.props

variables:
- template: /eng/pipelines/common/variables.yml

14 changes: 12 additions & 2 deletions src/coreclr/jit/hwintrinsicarm64.cpp
Original file line number Diff line number Diff line change
@@ -547,7 +547,12 @@ GenTree* Compiler::impSpecialIntrinsic(NamedIntrinsic intrinsic,
case NI_Vector128_Ceiling:
{
assert(sig->numArgs == 1);
assert(varTypeIsFloating(simdBaseType));

if (!varTypeIsFloating(simdBaseType))
{
retNode = impSIMDPopStack();
break;
}

op1 = impSIMDPopStack();
retNode = gtNewSimdCeilNode(retType, op1, simdBaseJitType, simdSize);
@@ -1098,7 +1103,12 @@ GenTree* Compiler::impSpecialIntrinsic(NamedIntrinsic intrinsic,
case NI_Vector128_Floor:
{
assert(sig->numArgs == 1);
assert(varTypeIsFloating(simdBaseType));

if (!varTypeIsFloating(simdBaseType))
{
retNode = impSIMDPopStack();
break;
}

op1 = impSIMDPopStack();
retNode = gtNewSimdFloorNode(retType, op1, simdBaseJitType, simdSize);
14 changes: 12 additions & 2 deletions src/coreclr/jit/hwintrinsicxarch.cpp
Original file line number Diff line number Diff line change
@@ -1371,7 +1371,12 @@ GenTree* Compiler::impSpecialIntrinsic(NamedIntrinsic intrinsic,
case NI_Vector512_Ceiling:
{
assert(sig->numArgs == 1);
assert(varTypeIsFloating(simdBaseType));

if (!varTypeIsFloating(simdBaseType))
{
retNode = impSIMDPopStack();
break;
}

if ((simdSize < 32) && !compOpportunisticallyDependsOn(InstructionSet_SSE41))
{
@@ -1986,7 +1991,12 @@ GenTree* Compiler::impSpecialIntrinsic(NamedIntrinsic intrinsic,
case NI_Vector512_Floor:
{
assert(sig->numArgs == 1);
assert(varTypeIsFloating(simdBaseType));

if (!varTypeIsFloating(simdBaseType))
{
retNode = impSIMDPopStack();
break;
}

if ((simdSize < 32) && !compOpportunisticallyDependsOn(InstructionSet_SSE41))
{
Loading

0 comments on commit d18a62d

Please sign in to comment.