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

Units for BitOps.TrailingZeroCount #35193

Merged
merged 26 commits into from
Feb 18, 2019
Merged

Units for BitOps.TrailingZeroCount #35193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
d70ad60
TZCNT units
Feb 9, 2019
889b53a
Simplify
Feb 9, 2019
867e1b3
CR fixes
Feb 11, 2019
9516397
Merge branch 'grant-d.tzcnt.units'
Feb 11, 2019
8639422
CR fixes
Feb 11, 2019
6ec9212
Merge branch 'master' into grant-d.tzcnt.units
Feb 11, 2019
4b4dbc7
Bug
Feb 11, 2019
edddc9a
Sort csproj
Feb 11, 2019
f0332d0
Fix build break
Feb 11, 2019
05c2ce4
Removed redundant using
Feb 11, 2019
d8550eb
Test IntPtr fix
Feb 11, 2019
510b8c4
Revert test stub
Feb 11, 2019
31e7475
Remove tests
Feb 12, 2019
32b9a61
Add units
Feb 13, 2019
f2ec3a8
Merge remote-tracking branch 'upstream/master'
Feb 14, 2019
ba32757
Merge branch 'master' into grant-d.tzcnt.units
Feb 14, 2019
343b0f1
More units
Feb 14, 2019
9d26016
Merge remote-tracking branch 'upstream/master'
Feb 14, 2019
c06161b
Fix naming
Feb 15, 2019
690b09e
Merge remote-tracking branch 'upstream/master'
Feb 15, 2019
24929d1
Merge remote-tracking branch 'upstream/master'
Feb 15, 2019
fd848fb
Merge remote-tracking branch 'upstream/master' into grant-d.tzcnt.units
Feb 15, 2019
cfdeced
Merge remote-tracking branch 'upstream/master'
Feb 15, 2019
468b36b
Merge branch 'master' into grant-d.tzcnt.units
Feb 15, 2019
51559b0
Improve tests
Feb 15, 2019
f14614e
Force dotnetbot to re-test
Feb 15, 2019
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
6 changes: 5 additions & 1 deletion src/Common/tests/Common.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ProjectGuid>{C72FD34C-539A-4447-9796-62A229571199}</ProjectGuid>
<TestCategories>InnerLoop;OuterLoop</TestCategories>
Expand Down Expand Up @@ -67,10 +67,14 @@
<Compile Include="$(CommonPath)\System\Security\IdentityHelper.cs">
<Link>Common\System\Security\IdentityHelper.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\CoreLib\System\BitOps.cs">
Copy link
Author

Choose a reason for hiding this comment

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

We can remove this once BitOps is exposed

<Link>Common\CoreLib\System\BitOps.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\CoreLib\System\PasteArguments.cs">
<Link>Common\CoreLib\System\PasteArguments.cs</Link>
</Compile>
<Compile Include="Tests\Interop\procfsTests.cs" />
<Compile Include="Tests\System\BitOpsTests.cs" />
<Compile Include="Tests\System\CharArrayHelpersTests.cs" />
<Compile Include="Tests\System\IO\PathInternal.Tests.cs" />
<Compile Include="Tests\System\IO\StringParserTests.cs" />
Expand Down
312 changes: 312 additions & 0 deletions src/Common/tests/Tests/System/BitOpsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,312 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using Xunit;

namespace Internal.Runtime.CompilerServices
{
// Dummy namespace needed for compilation of BitOps
}
Copy link
Author

Choose a reason for hiding this comment

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

We can remove this once BitOps is exposed


namespace Tests.System
{
public static class BitOpsTests
{
[Theory]
[InlineData(0u, 32)]
[InlineData(0b1u, 31)]
[InlineData(0b10u, 30)]
[InlineData(0b100u, 29)]
[InlineData(0b1000u, 28)]
[InlineData(0b10000u, 27)]
[InlineData(0b100000u, 26)]
[InlineData(0b1000000u, 25)]
[InlineData(byte.MaxValue << 17, 32 - 8 - 17)]
[InlineData(byte.MaxValue << 9, 32 - 8 - 9)]
[InlineData(ushort.MaxValue << 11, 32 - 16 - 11)]
[InlineData(ushort.MaxValue << 2, 32 - 16 - 2)]
[InlineData(5 << 7, 32 - 3 - 7)]
[InlineData(uint.MaxValue, 0)]
public static void BitOps_LeadingZeroCount_uint(uint n, int expected)
{
int actual = BitOps.LeadingZeroCount(n);
Assert.Equal(expected, actual);
}

[Theory]
[InlineData(0ul, 64)]
[InlineData(0b1ul, 63)]
[InlineData(0b10ul, 62)]
[InlineData(0b100ul, 61)]
[InlineData(0b1000ul, 60)]
[InlineData(0b10000ul, 59)]
[InlineData(0b100000ul, 58)]
[InlineData(0b1000000ul, 57)]
[InlineData((ulong)byte.MaxValue << 41, 64 - 8 - 41)]
[InlineData((ulong)byte.MaxValue << 53, 64 - 8 - 53)]
[InlineData((ulong)ushort.MaxValue << 31, 64 - 16 - 31)]
[InlineData((ulong)ushort.MaxValue << 15, 64 - 16 - 15)]
[InlineData(ulong.MaxValue >> 5, 5)]
[InlineData(1ul << 63, 0)]
[InlineData(1ul << 62, 1)]
[InlineData(ulong.MaxValue, 0)]
public static void BitOps_LeadingZeroCount_ulong(ulong n, int expected)
{
int actual = BitOps.LeadingZeroCount(n);
Assert.Equal(expected, actual);
}

[Theory]
[InlineData(0u, 32)]
[InlineData(0b1u, 0)]
[InlineData(0b10u, 1)]
[InlineData(0b100u, 2)]
[InlineData(0b1000u, 3)]
[InlineData(0b10000u, 4)]
[InlineData(0b100000u, 5)]
[InlineData(0b1000000u, 6)]
[InlineData((uint)byte.MaxValue << 24, 24)]
[InlineData((uint)byte.MaxValue << 22, 22)]
[InlineData((uint)ushort.MaxValue << 16, 16)]
[InlineData((uint)ushort.MaxValue << 19, 19)]
[InlineData(uint.MaxValue << 5, 5)]
[InlineData(3u << 27, 27)]
[InlineData(uint.MaxValue, 0)]
public static void BitOps_TrailingZeroCount_uint(uint n, int expected)
{
int actual = BitOps.TrailingZeroCount(n);
Assert.Equal(expected, actual);
}

[Theory]
[InlineData(0, 32)]
[InlineData(0b1, 0)]
[InlineData(0b10, 1)]
[InlineData(0b100, 2)]
[InlineData(0b1000, 3)]
[InlineData(0b10000, 4)]
[InlineData(0b100000, 5)]
[InlineData(0b1000000, 6)]
[InlineData(byte.MaxValue << 24, 24)]
[InlineData(byte.MaxValue << 22, 22)]
[InlineData(ushort.MaxValue << 16, 16)]
[InlineData(ushort.MaxValue << 19, 19)]
[InlineData(int.MaxValue << 5, 5)]
[InlineData(3 << 27, 27)]
[InlineData(int.MaxValue, 0)]
public static void BitOps_TrailingZeroCount_int(int n, int expected)
{
int actual = BitOps.TrailingZeroCount(n);
Assert.Equal(expected, actual);
}

[Theory]
[InlineData(0ul, 64)]
[InlineData(0b1ul, 0)]
[InlineData(0b10ul, 1)]
[InlineData(0b100ul, 2)]
[InlineData(0b1000ul, 3)]
[InlineData(0b10000ul, 4)]
[InlineData(0b100000ul, 5)]
[InlineData(0b1000000ul, 6)]
[InlineData((ulong)byte.MaxValue << 40, 40)]
[InlineData((ulong)byte.MaxValue << 57, 57)]
[InlineData((ulong)ushort.MaxValue << 31, 31)]
[InlineData((ulong)ushort.MaxValue << 15, 15)]
[InlineData(ulong.MaxValue << 5, 5)]
[InlineData(3ul << 59, 59)]
[InlineData(5ul << 63, 63)]
[InlineData(ulong.MaxValue, 0)]
public static void BitOps_TrailingZeroCount_ulong(ulong n, int expected)
{
int actual = BitOps.TrailingZeroCount(n);
Assert.Equal(expected, actual);
}

[Theory]
[InlineData(0L, 64)]
[InlineData(0b1L, 0)]
[InlineData(0b10L, 1)]
[InlineData(0b100L, 2)]
[InlineData(0b1000L, 3)]
[InlineData(0b10000L, 4)]
[InlineData(0b100000L, 5)]
[InlineData(0b1000000L, 6)]
[InlineData((long)byte.MaxValue << 40, 40)]
[InlineData((long)byte.MaxValue << 57, 57)]
[InlineData((long)ushort.MaxValue << 31, 31)]
[InlineData((long)ushort.MaxValue << 15, 15)]
[InlineData(long.MaxValue << 5, 5)]
[InlineData(3L << 59, 59)]
[InlineData(5L << 63, 63)]
[InlineData(long.MaxValue, 0)]
public static void BitOps_TrailingZeroCount_long(long n, int expected)
{
int actual = BitOps.TrailingZeroCount(n);
Assert.Equal(expected, actual);
}

[Theory]
[InlineData(0, 0)]
[InlineData(1, 0)]
[InlineData(2, 1)]
[InlineData(3, 2 - 1)]
[InlineData(4, 2)]
[InlineData(5, 3 - 1)]
[InlineData(6, 3 - 1)]
[InlineData(7, 3 - 1)]
[InlineData(8, 3)]
[InlineData(9, 4 - 1)]
[InlineData(byte.MaxValue, 8 - 1)]
[InlineData(ushort.MaxValue, 16 - 1)]
[InlineData(uint.MaxValue, 32 - 1)]
public static void BitOps_Log2_uint(uint n, int expected)
{
int actual = BitOps.Log2(n);
Assert.Equal(expected, actual);
}

[Theory]
[InlineData(0, 0)]
[InlineData(1, 0)]
[InlineData(2, 1)]
[InlineData(3, 2 - 1)]
[InlineData(4, 2)]
[InlineData(5, 3 - 1)]
[InlineData(6, 3 - 1)]
[InlineData(7, 3 - 1)]
[InlineData(8, 3)]
[InlineData(9, 4 - 1)]
[InlineData(byte.MaxValue, 8 - 1)]
[InlineData(ushort.MaxValue, 16 - 1)]
[InlineData(uint.MaxValue, 32 - 1)]
[InlineData(ulong.MaxValue, 64 - 1)]
public static void BitOps_Log2_ulong(ulong n, int expected)
{
int actual = BitOps.Log2(n);
Assert.Equal(expected, actual);
}

[Theory]
[InlineData(0b001, 1)]
[InlineData(0b010, 1)]
[InlineData(0b011, 2)]
[InlineData(0b100, 1)]
[InlineData(0b101, 2)]
[InlineData(0b110, 2)]
[InlineData(0b111, 3)]
[InlineData(0b1101, 3)]
[InlineData(0b1111, 4)]
[InlineData(0b10111, 4)]
[InlineData(0b11111, 5)]
[InlineData(0b110111, 5)]
[InlineData(0b111111, 6)]
[InlineData(0b1111110, 6)]
[InlineData(byte.MinValue, 0)] // 0
[InlineData(byte.MaxValue, 8)] // 255
[InlineData(unchecked((uint)sbyte.MinValue), 25)] // 4294967168
[InlineData(sbyte.MaxValue, 7)] // 127
[InlineData(ushort.MaxValue >> 3, 16 - 3)] // 8191
[InlineData(ushort.MaxValue, 16)] // 65535
[InlineData(unchecked((uint)short.MinValue), 32 - 15)] // 4294934528
[InlineData(short.MaxValue, 15)] // 32767
[InlineData(unchecked((uint)int.MinValue), 1)] // 2147483648
[InlineData(unchecked((uint)int.MaxValue), 31)] // 4294967168
[InlineData(uint.MaxValue >> 5, 32 - 5)] // 134217727
[InlineData(uint.MaxValue << 11, 32 - 11)] // 4294965248
[InlineData(uint.MaxValue, 32)] // 4294967295
public static void BitOps_PopCount_uint(uint n, int expected)
{
int actual = BitOps.PopCount(n);
Assert.Equal(expected, actual);
}

[Theory]
[InlineData(0b001, 1)]
[InlineData(0b010, 1)]
[InlineData(0b011, 2)]
[InlineData(0b100, 1)]
[InlineData(0b101, 2)]
[InlineData(0b110, 2)]
[InlineData(0b111, 3)]
[InlineData(0b1101, 3)]
[InlineData(0b1111, 4)]
[InlineData(0b10111, 4)]
[InlineData(0b11111, 5)]
[InlineData(0b110111, 5)]
[InlineData(0b111111, 6)]
[InlineData(0b1111110, 6)]
[InlineData(0b1111111, 7)]
[InlineData(byte.MinValue, 0)] // 0
[InlineData(byte.MaxValue, 8)] // 255
[InlineData(unchecked((ulong)sbyte.MinValue), 57)] // 18446744073709551488
[InlineData(sbyte.MaxValue, 7)] // 127
[InlineData(ushort.MaxValue, 16)] // 65535
[InlineData(unchecked((ulong)short.MinValue), 49)] // 18446744073709518848
[InlineData(short.MaxValue, 15)] // 32767
[InlineData(unchecked((ulong)int.MinValue), 64 - 31)] // 18446744071562067968
[InlineData(int.MaxValue, 31)] // 2147483647
[InlineData(ulong.MaxValue >> 9, 64 - 9)] // 36028797018963967
[InlineData(ulong.MaxValue << 11, 64 - 11)] // 18446744073709549568
[InlineData(ulong.MaxValue, 64)]
public static void BitOps_PopCount_ulong(ulong n, int expected)
{
int actual = BitOps.PopCount(n);
Assert.Equal(expected, actual);
}

[Theory]
[InlineData(0b00000000_00000000_00000000_00000001u, int.MaxValue, 0b10000000_00000000_00000000_00000000u)] // % 32 = 31
[InlineData(0b01000000_00000001_00000000_00000001u, 3, 0b00000000_00001000_00000000_00001010u)]
[InlineData(0b01000000_00000001_00000000_00000001u, 2, 0b00000000_00000100_00000000_00000101u)]
[InlineData(0b01010101_01010101_01010101_01010101u, 1, 0b10101010_10101010_10101010_10101010u)]
[InlineData(0b01010101_11111111_01010101_01010101u, 0, 0b01010101_11111111_01010101_01010101u)]
[InlineData(0b00000000_00000000_00000000_00000001u, -1, 0b10000000_00000000_00000000_00000000u)]
[InlineData(0b00000000_00000000_00000000_00000001u, -2, 0b01000000_00000000_00000000_00000000u)]
[InlineData(0b00000000_00000000_00000000_00000001u, -3, 0b00100000_00000000_00000000_00000000u)]
[InlineData(0b01010101_11111111_01010101_01010101u, int.MinValue, 0b01010101_11111111_01010101_01010101u)] // % 32 = 0
public static void BitOps_RotateLeft_uint(uint n, int offset, uint expected)
{
Assert.Equal(expected, BitOps.RotateLeft(n, offset));
}

[Fact]
public static void BitOps_RotateLeft_ulong()
{
ulong value = 0b01010101_01010101_01010101_01010101_01010101_01010101_01010101_01010101ul;
Assert.Equal(0b10101010_10101010_10101010_10101010_10101010_10101010_10101010_10101010ul, BitOps.RotateLeft(value, 1));
Assert.Equal(0b01010101_01010101_01010101_01010101_01010101_01010101_01010101_01010101ul, BitOps.RotateLeft(value, 2));
Assert.Equal(0b10101010_10101010_10101010_10101010_10101010_10101010_10101010_10101010ul, BitOps.RotateLeft(value, 3));
Assert.Equal(value, BitOps.RotateLeft(value, int.MinValue)); // % 64 = 0
Assert.Equal(BitOps.RotateLeft(value, 63), BitOps.RotateLeft(value, int.MaxValue)); // % 64 = 63
}

[Theory]
[InlineData(0b10000000_00000000_00000000_00000000u, int.MaxValue, 0b00000000_00000000_00000000_00000001u)] // % 32 = 31
[InlineData(0b00000000_00001000_00000000_00001010u, 3, 0b01000000_00000001_00000000_00000001u)]
[InlineData(0b00000000_00000100_00000000_00000101u, 2, 0b01000000_00000001_00000000_00000001u)]
[InlineData(0b01010101_01010101_01010101_01010101u, 1, 0b10101010_10101010_10101010_10101010u)]
[InlineData(0b01010101_11111111_01010101_01010101u, 0, 0b01010101_11111111_01010101_01010101u)]
[InlineData(0b10000000_00000000_00000000_00000000u, -1, 0b00000000_00000000_00000000_00000001u)]
[InlineData(0b00000000_00000000_00000000_00000001u, -2, 0b00000000_00000000_00000000_00000100u)]
[InlineData(0b01000000_00000000_00000000_00000000u, -3, 0b00000000_00000000_00000000_00000010u)]
[InlineData(0b01010101_11111111_01010101_01010101u, int.MinValue, 0b01010101_11111111_01010101_01010101u)] // % 32 = 0
public static void BitOps_RotateRight_uint(uint n, int offset, uint expected)
{
Assert.Equal(expected, BitOps.RotateRight(n, offset));
}

[Fact]
public static void BitOps_RotateRight_ulong()
{
ulong value = 0b01010101_01010101_01010101_01010101_01010101_01010101_01010101_01010101ul;
Assert.Equal(0b10101010_10101010_10101010_10101010_10101010_10101010_10101010_10101010ul, BitOps.RotateRight(value, 1));
Assert.Equal(0b01010101_01010101_01010101_01010101_01010101_01010101_01010101_01010101ul, BitOps.RotateRight(value, 2));
Assert.Equal(0b10101010_10101010_10101010_10101010_10101010_10101010_10101010_10101010ul, BitOps.RotateRight(value, 3));
Assert.Equal(value, BitOps.RotateRight(value, int.MinValue)); // % 64 = 0
Assert.Equal(BitOps.RotateLeft(value, 63), BitOps.RotateRight(value, int.MaxValue)); // % 64 = 63
}
}
}