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

Fix inconsistent Intel hardware intrinsic APIs #19949

Merged
CarolEidt merged 2 commits into from
Sep 17, 2018
Merged

Fix inconsistent Intel hardware intrinsic APIs #19949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9afa99
Fix inconsistent Intel hardware intrinsic APIs
FeiPengIntel Sep 13, 2018
e618d43
temporarily disable some hw intrinsic tests
FeiPengIntel Sep 13, 2018
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 src/System.Private.CoreLib/shared/System/Runtime/Intrinsics/X86/Avx2.PlatformNotSupported.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1787,7 +1787,7 @@ internal Avx2() { }
/// __m256i _mm256_sad_epu8 (__m256i a, __m256i b)
/// VPSADBW ymm, ymm, ymm/m256
/// </summary>
public static Vector256<ulong> SumAbsoluteDifferences(Vector256<byte> left, Vector256<byte> right) { throw new PlatformNotSupportedException(); }
public static Vector256<ushort> SumAbsoluteDifferences(Vector256<byte> left, Vector256<byte> right) { throw new PlatformNotSupportedException(); }

/// <summary>
/// __m256i _mm256_unpackhi_epi8 (__m256i a, __m256i b)
Expand Down
2 changes: 1 addition & 1 deletion src/System.Private.CoreLib/shared/System/Runtime/Intrinsics/X86/Avx2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2513,7 +2513,7 @@ public static unsafe Vector256<double> GatherMaskVector256(Vector256<double> sou
/// __m256i _mm256_sad_epu8 (__m256i a, __m256i b)
/// VPSADBW ymm, ymm, ymm/m256
/// </summary>
public static Vector256<ulong> SumAbsoluteDifferences(Vector256<byte> left, Vector256<byte> right) => SumAbsoluteDifferences(left, right);
public static Vector256<ushort> SumAbsoluteDifferences(Vector256<byte> left, Vector256<byte> right) => SumAbsoluteDifferences(left, right);

/// <summary>
/// __m256i _mm256_unpackhi_epi8 (__m256i a, __m256i b)
Expand Down
4 changes: 2 additions & 2 deletions ...ystem.Private.CoreLib/shared/System/Runtime/Intrinsics/X86/Popcnt.PlatformNotSupported.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ internal Popcnt() { }
/// int _mm_popcnt_u32 (unsigned int a)
/// POPCNT reg, reg/m32
/// </summary>
public static int PopCount(uint value) { throw new PlatformNotSupportedException(); }
public static uint PopCount(uint value) { throw new PlatformNotSupportedException(); }
/// <summary>
/// __int64 _mm_popcnt_u64 (unsigned __int64 a)
/// POPCNT reg64, reg/m64
/// </summary>
public static long PopCount(ulong value) { throw new PlatformNotSupportedException(); }
public static ulong PopCount(ulong value) { throw new PlatformNotSupportedException(); }
}
}
4 changes: 2 additions & 2 deletions src/System.Private.CoreLib/shared/System/Runtime/Intrinsics/X86/Popcnt.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ internal Popcnt() { }
/// int _mm_popcnt_u32 (unsigned int a)
/// POPCNT reg, reg/m32
/// </summary>
public static int PopCount(uint value) => PopCount(value);
public static uint PopCount(uint value) => PopCount(value);
/// <summary>
/// __int64 _mm_popcnt_u64 (unsigned __int64 a)
/// POPCNT reg, reg/m64
/// </summary>
public static long PopCount(ulong value) => PopCount(value);
public static ulong PopCount(ulong value) => PopCount(value);
}
}
4 changes: 2 additions & 2 deletions src/System.Private.CoreLib/shared/System/Runtime/Intrinsics/X86/Sse2.PlatformNotSupported.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,7 @@ internal Sse2() { }
/// __m128i _mm_madd_epi16 (__m128i a, __m128i b)
/// PMADDWD xmm, xmm/m128
/// </summary>
public static Vector128<int> MultiplyHorizontalAdd(Vector128<short> left, Vector128<short> right) { throw new PlatformNotSupportedException(); }
public static Vector128<int> MultiplyAddAdjacent(Vector128<short> left, Vector128<short> right) { throw new PlatformNotSupportedException(); }

/// <summary>
/// __m128i _mm_mullo_epi16 (__m128i a, __m128i b)
Expand Down Expand Up @@ -1074,7 +1074,7 @@ internal Sse2() { }
/// __m128i _mm_sad_epu8 (__m128i a, __m128i b)
/// PSADBW xmm, xmm/m128
/// </summary>
public static Vector128<long> SumAbsoluteDifferences(Vector128<byte> left, Vector128<byte> right) { throw new PlatformNotSupportedException(); }
public static Vector128<ushort> SumAbsoluteDifferences(Vector128<byte> left, Vector128<byte> right) { throw new PlatformNotSupportedException(); }

/// <summary>
/// __m128i _mm_shuffle_epi32 (__m128i a, int immediate)
Expand Down
4 changes: 2 additions & 2 deletions src/System.Private.CoreLib/shared/System/Runtime/Intrinsics/X86/Sse2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@ internal Sse2() { }
/// __m128i _mm_madd_epi16 (__m128i a, __m128i b)
/// PMADDWD xmm, xmm/m128
/// </summary>
public static Vector128<int> MultiplyHorizontalAdd(Vector128<short> left, Vector128<short> right) => MultiplyHorizontalAdd(left, right);
public static Vector128<int> MultiplyAddAdjacent(Vector128<short> left, Vector128<short> right) => MultiplyAddAdjacent(left, right);

/// <summary>
/// __m128i _mm_mullo_epi16 (__m128i a, __m128i b)
Expand Down Expand Up @@ -1313,7 +1313,7 @@ public static Vector128<T> SetZeroVector128<T>() where T : struct
/// __m128i _mm_sad_epu8 (__m128i a, __m128i b)
/// PSADBW xmm, xmm/m128
/// </summary>
public static Vector128<long> SumAbsoluteDifferences(Vector128<byte> left, Vector128<byte> right) => SumAbsoluteDifferences(left, right);
Copy link
Copy Markdown
Member

@tannergooding tannergooding Sep 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be Vector128<ushort>?

Computes the absolute differences of the
packed unsigned byte integers from xmm2
/m128 and xmm1; the 8 low differences and 8
high differences are then summed separately
to produce two unsigned word integer results.

Copy link
Copy Markdown
Author

@fiigii fiigii Sep 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, right! Will fix.
Thank you!

Copy link
Copy Markdown
Author

@fiigii fiigii Sep 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Now they are correct and consistent with MultipleSumAbsoluteDifferences.

public static Vector128<ushort> SumAbsoluteDifferences(Vector128<byte> left, Vector128<byte> right) => SumAbsoluteDifferences(left, right);

/// <summary>
/// __m128i _mm_shuffle_epi32 (__m128i a, int immediate)
Expand Down
131 changes: 0 additions & 131 deletions tests/src/JIT/HardwareIntrinsics/X86/Popcnt/Popcnt.cs
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions tests/src/JIT/HardwareIntrinsics/X86/Popcnt/Popcnt_r.csproj
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions tests/src/JIT/HardwareIntrinsics/X86/Popcnt/Popcnt_ro.csproj
View file
Open in desktop

This file was deleted.

56 changes: 0 additions & 56 deletions tests/src/JIT/HardwareIntrinsics/X86/Sse2/MultiplyHorizontalAdd.cs
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions tests/src/JIT/HardwareIntrinsics/X86/Sse2/MultiplyHorizontalAdd_r.csproj
View file
Open in desktop

This file was deleted.

Loading