Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Update CoreClr, CoreFx to preview2-26202-06, preview2-26202-01, respectively (master) #16169

Merged
merged 2 commits into from
Feb 2, 2018
Merged
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ILAsmVersion.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.0-preview2-26201-05
2.1.0-preview2-26202-06
10 changes: 5 additions & 5 deletions dependencies.props
Original file line number Diff line number Diff line change
@@ -23,18 +23,18 @@

<!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
<PropertyGroup>
<CoreFxCurrentRef>2dc3a4bd1718e1d75f4c3c00203c90e4e1dd0010</CoreFxCurrentRef>
<CoreClrCurrentRef>2dc3a4bd1718e1d75f4c3c00203c90e4e1dd0010</CoreClrCurrentRef>
<CoreFxCurrentRef>dcd082ee78d2da89c202f68a1592b951051834b0</CoreFxCurrentRef>
<CoreClrCurrentRef>dcd082ee78d2da89c202f68a1592b951051834b0</CoreClrCurrentRef>
<BuildToolsCurrentRef>fb8aaa87581eafdad52a1997540471169cf1b6bb</BuildToolsCurrentRef>
<PgoDataCurrentRef>fb8aaa87581eafdad52a1997540471169cf1b6bb</PgoDataCurrentRef>
</PropertyGroup>

<!-- Tests/infrastructure dependency versions. -->
<PropertyGroup>
<MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.5.0-preview2-26201-05</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>2.1.0-preview2-26201-05</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.5.0-preview2-26202-01</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>2.1.0-preview2-26202-01</MicrosoftNETCorePlatformsPackageVersion>
<PgoDataPackageVersion>99.99.99-master-20180131-0033</PgoDataPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.0-preview2-26201-05</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.0-preview2-26202-06</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion>
<XunitConsoleNetcorePackageVersion>1.0.2-prerelease-00177</XunitConsoleNetcorePackageVersion>
<XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
4 changes: 2 additions & 2 deletions src/jit/hwintrinsiccodegenxarch.cpp
Original file line number Diff line number Diff line change
@@ -439,7 +439,7 @@ void CodeGen::genSSEIntrinsic(GenTreeHWIntrinsic* node)

switch (intrinsicID)
{
case NI_SSE_ConvertToVector128SingleScalar:
case NI_SSE_ConvertScalarToVector128Single:
{
assert(node->TypeGet() == TYP_SIMD16);
assert(node->gtSIMDBaseType == TYP_FLOAT);
@@ -550,7 +550,7 @@ void CodeGen::genSSEIntrinsic(GenTreeHWIntrinsic* node)
break;
}

case NI_SSE_SetScalar:
case NI_SSE_SetScalarVector128:
{
assert(baseType == TYP_FLOAT);
assert(op2 == nullptr);
6 changes: 3 additions & 3 deletions src/jit/hwintrinsiclistxarch.h
Original file line number Diff line number Diff line change
@@ -71,15 +71,15 @@ HARDWARE_INTRINSIC(SSE_CompareUnorderedScalar, "CompareUno
HARDWARE_INTRINSIC(SSE_ConvertToInt32, "ConvertToInt32", SSE, -1, 16, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_cvtss2si, INS_invalid}, HW_Category_SIMDScalar, HW_Flag_NoFlag)
HARDWARE_INTRINSIC(SSE_ConvertToInt64, "ConvertToInt64", SSE, -1, 16, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_cvtss2si, INS_invalid}, HW_Category_SIMDScalar, HW_Flag_NoFlag)
HARDWARE_INTRINSIC(SSE_ConvertToSingle, "ConvertToSingle", SSE, -1, 16, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_movss, INS_invalid}, HW_Category_Helper, HW_Flag_NoFlag)
HARDWARE_INTRINSIC(SSE_ConvertToVector128SingleScalar, "ConvertToVector128SingleScalar", SSE, -1, 16, 2, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_cvtsi2ss, INS_invalid}, HW_Category_Special, HW_Flag_NoFlag)
HARDWARE_INTRINSIC(SSE_ConvertScalarToVector128Single, "ConvertScalarToVector128Single", SSE, -1, 16, 2, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_cvtsi2ss, INS_invalid}, HW_Category_Special, HW_Flag_NoFlag)
HARDWARE_INTRINSIC(SSE_ConvertToInt32WithTruncation, "ConvertToInt32WithTruncation", SSE, -1, 16, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_cvttss2si, INS_invalid}, HW_Category_SIMDScalar, HW_Flag_NoFlag)
HARDWARE_INTRINSIC(SSE_ConvertToInt64WithTruncation, "ConvertToInt64WithTruncation", SSE, -1, 16, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_cvttss2si, INS_invalid}, HW_Category_SIMDScalar, HW_Flag_NoFlag)
HARDWARE_INTRINSIC(SSE_Divide, "Divide", SSE, -1, 16, 2, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_divps, INS_invalid}, HW_Category_SimpleSIMD, HW_Flag_NoFlag)
HARDWARE_INTRINSIC(SSE_DivideScalar, "DivideScalar", SSE, -1, 16, 2, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_divss, INS_invalid}, HW_Category_SIMDScalar, HW_Flag_CopyUpperBits)
HARDWARE_INTRINSIC(SSE_LoadAlignedVector128, "LoadAlignedVector128", SSE, -1, 16, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_movaps, INS_invalid}, HW_Category_MemoryLoad, HW_Flag_NoFlag)
HARDWARE_INTRINSIC(SSE_LoadHigh, "LoadHigh", SSE, -1, 16, 2, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_movhps, INS_invalid}, HW_Category_MemoryLoad, HW_Flag_NoFlag)
HARDWARE_INTRINSIC(SSE_LoadLow, "LoadLow", SSE, -1, 16, 2, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_movlps, INS_invalid}, HW_Category_MemoryLoad, HW_Flag_NoFlag)
HARDWARE_INTRINSIC(SSE_LoadScalar, "LoadScalar", SSE, -1, 16, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_movss, INS_invalid}, HW_Category_MemoryLoad, HW_Flag_NoFlag)
HARDWARE_INTRINSIC(SSE_LoadScalarVector128, "LoadScalarVector128", SSE, -1, 16, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_movss, INS_invalid}, HW_Category_MemoryLoad, HW_Flag_NoFlag)
HARDWARE_INTRINSIC(SSE_LoadVector128, "LoadVector128", SSE, -1, 16, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_movups, INS_invalid}, HW_Category_MemoryLoad, HW_Flag_NoFlag)
HARDWARE_INTRINSIC(SSE_Max, "Max", SSE, -1, 16, 2, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_maxps, INS_invalid}, HW_Category_SimpleSIMD, HW_Flag_Commutative)
HARDWARE_INTRINSIC(SSE_MaxScalar, "MaxScalar", SSE, -1, 16, 2, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_maxss, INS_invalid}, HW_Category_SIMDScalar, HW_Flag_CopyUpperBits)
@@ -97,7 +97,7 @@ HARDWARE_INTRINSIC(SSE_ReciprocalScalar, "Reciprocal
HARDWARE_INTRINSIC(SSE_ReciprocalSqrt, "ReciprocalSqrt", SSE, -1, 16, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_rsqrtps, INS_invalid}, HW_Category_SimpleSIMD, HW_Flag_NoFlag)
HARDWARE_INTRINSIC(SSE_ReciprocalSqrtScalar, "ReciprocalSqrtScalar", SSE, -1, 16, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_rsqrtss, INS_invalid}, HW_Category_SIMDScalar, HW_Flag_CopyUpperBits)
HARDWARE_INTRINSIC(SSE_SetAllVector128, "SetAllVector128", SSE, -1, 16, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid}, HW_Category_Helper, HW_Flag_NoCodeGen)
HARDWARE_INTRINSIC(SSE_SetScalar, "SetScalar", SSE, -1, 16, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_movss, INS_invalid}, HW_Category_Helper, HW_Flag_MultiIns)
HARDWARE_INTRINSIC(SSE_SetScalarVector128, "SetScalarVector128", SSE, -1, 16, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_movss, INS_invalid}, HW_Category_Helper, HW_Flag_MultiIns)
HARDWARE_INTRINSIC(SSE_SetVector128, "SetVector128", SSE, -1, 16, 4, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid}, HW_Category_Helper, HW_Flag_NoCodeGen)
HARDWARE_INTRINSIC(SSE_SetZeroVector128, "SetZeroVector128", SSE, -1, 16, 0, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_xorps, INS_invalid}, HW_Category_Helper, HW_Flag_NoFlag)
HARDWARE_INTRINSIC(SSE_Shuffle, "Shuffle", SSE, -1, 16, 3, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_shufps, INS_invalid}, HW_Category_IMM, HW_Flag_FullRangeIMM)
2 changes: 1 addition & 1 deletion src/jit/hwintrinsicxarch.cpp
Original file line number Diff line number Diff line change
@@ -630,7 +630,7 @@ GenTree* Compiler::impSSEIntrinsic(NamedIntrinsic intrinsic,
break;
}

case NI_SSE_ConvertToVector128SingleScalar:
case NI_SSE_ConvertScalarToVector128Single:
{
assert(sig->numArgs == 2);
assert(getBaseTypeOfSIMDType(sig->retTypeSigClass) == TYP_FLOAT);
2 changes: 1 addition & 1 deletion src/jit/lsraxarch.cpp
Original file line number Diff line number Diff line change
@@ -2290,7 +2290,7 @@ void LinearScan::BuildHWIntrinsic(GenTreeHWIntrinsic* intrinsicTree)
info->setInternalCandidates(this, RBM_BYTE_REGS);
break;

case NI_SSE_SetScalar:
case NI_SSE_SetScalarVector128:
// Need an internal register to stitch together all the values into a single vector in a SIMD reg.
info->internalFloatCount = 1;
info->setInternalCandidates(this, allSIMDRegs());
18 changes: 0 additions & 18 deletions tests/issues.targets
Original file line number Diff line number Diff line change
@@ -193,24 +193,6 @@
<ExcludeList Include="$(XunitTestBinBase)\tracing\eventpipetrace\**">
<Issue>15924</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)\JIT\HardwareIntrinsics\X86\Sse\ConvertToVector128SingleScalar_r\*">
<Issue>16094</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)\JIT\HardwareIntrinsics\X86\Sse\ConvertToVector128SingleScalar_ro\*">
<Issue>16094</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)\JIT\HardwareIntrinsics\X86\Sse\LoadScalar_r\*">
<Issue>16094</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)\JIT\HardwareIntrinsics\X86\Sse\LoadScalar_ro\*">
<Issue>16094</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)\JIT\HardwareIntrinsics\X86\Sse\SetScalar_r\*">
<Issue>16094</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)\JIT\HardwareIntrinsics\X86\Sse\SetScalar_ro\*">
<Issue>16094</Issue>
</ExcludeList>
</ItemGroup>

<!-- The following are x86 failures -->
Original file line number Diff line number Diff line change
@@ -25,13 +25,13 @@ static unsafe int Main(string[] args)
using (TestTable<float> floatTable = new TestTable<float>(new float[4] { 1, -5, 100, 0 }, new float[4]))
{
var vf1 = Unsafe.Read<Vector128<float>>(floatTable.inArrayPtr);
var vf2 = Sse.ConvertToVector128SingleScalar(vf1, 5);
var vf2 = Sse.ConvertScalarToVector128Single(vf1, 5);
Unsafe.Write(floatTable.outArrayPtr, vf2);

if (!floatTable.CheckResult((x, y) => (y[0] == 5)
&& (y[1] == x[1]) && (y[2] == x[2]) && (y[3] == x[3])))
{
Console.WriteLine("SSE ConvertToVector128SingleScalar failed on float:");
Console.WriteLine("SSE ConvertScalarToVector128Single failed on float:");
foreach (var item in floatTable.outArray)
{
Console.Write(item + ", ");
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<Compile Include="ConvertToVector128SingleScalar.cs" />
<Compile Include="ConvertScalarToVector128Single.cs" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<Compile Include="ConvertToVector128SingleScalar.cs" />
<Compile Include="ConvertScalarToVector128Single.cs" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
Original file line number Diff line number Diff line change
@@ -24,15 +24,15 @@ static unsafe int Main(string[] args)
{
using (TestTable<float> floatTable = new TestTable<float>(new float[4] { 1, -5, 100, 3 }, new float[4]))
{
var vf = Sse.LoadScalar((float*)(floatTable.inArrayPtr));
var vf = Sse.LoadScalarVector128((float*)(floatTable.inArrayPtr));
Unsafe.Write(floatTable.outArrayPtr, vf);

if (!floatTable.CheckResult((x, y) => BitConverter.SingleToInt32Bits(x[0]) == BitConverter.SingleToInt32Bits(y[0])
&& BitConverter.SingleToInt32Bits(y[1]) == 0
&& BitConverter.SingleToInt32Bits(y[2]) == 0
&& BitConverter.SingleToInt32Bits(y[3]) == 0))
{
Console.WriteLine("SSE LoadScalar failed on float:");
Console.WriteLine("SSE LoadScalarVector128 failed on float:");
foreach (var item in floatTable.outArray)
{
Console.Write(item + ", ");
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<Compile Include="LoadScalar.cs" />
<Compile Include="LoadScalarVector128.cs" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<Compile Include="SetScalar.cs" />
<Compile Include="LoadScalarVector128.cs" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
Original file line number Diff line number Diff line change
@@ -24,15 +24,15 @@ static unsafe int Main(string[] args)
{
using (TestTable<float> floatTable = new TestTable<float>(new float[4] { float.NaN, float.NaN, float.NaN, float.NaN }))
{
var vf1 = Sse.SetScalar(3);
var vf1 = Sse.SetScalarVector128(3);
Unsafe.Write(floatTable.outArrayPtr, vf1);

if (!floatTable.CheckResult((x) => (x[0] == 3)
&& (BitConverter.SingleToInt32Bits(x[1]) == 0)
&& (BitConverter.SingleToInt32Bits(x[2]) == 0)
&& (BitConverter.SingleToInt32Bits(x[3]) == 0)))
{
Console.WriteLine("SSE SetScalar failed on float:");
Console.WriteLine("SSE SetScalarVector128 failed on float:");
foreach (var item in floatTable.outArray)
{
Console.Write(item + ", ");
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<Compile Include="SetScalar.cs" />
<Compile Include="SetScalarVector128.cs" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<Compile Include="LoadScalar.cs" />
<Compile Include="SetScalarVector128.cs" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
6 changes: 0 additions & 6 deletions tests/testsFailingOutsideWindows.txt
Original file line number Diff line number Diff line change
@@ -78,9 +78,3 @@ Loader/classloader/TypeGeneratorTests/TypeGeneratorTest614/Generated614/Generate
Loader/classloader/TypeGeneratorTests/TypeGeneratorTest681/Generated681/Generated681.sh
Loader/classloader/TypeGeneratorTests/TypeGeneratorTest682/Generated682/Generated682.sh
Loader/classloader/TypeGeneratorTests/TypeGeneratorTest683/Generated683/Generated683.sh
JIT/HardwareIntrinsics/X86/Sse/ConvertToVector128SingleScalar_r/ConvertToVector128SingleScalar_r.sh
JIT/HardwareIntrinsics/X86/Sse/ConvertToVector128SingleScalar_ro/ConvertToVector128SingleScalar_ro.sh
JIT/HardwareIntrinsics/X86/Sse/LoadScalar_r/LoadScalar_r.sh
JIT/HardwareIntrinsics/X86/Sse/LoadScalar_ro/LoadScalar_ro.sh
JIT/HardwareIntrinsics/X86/Sse/SetScalar_r/SetScalar_r.sh
JIT/HardwareIntrinsics/X86/Sse/SetScalar_ro/SetScalar_ro.sh