Improvements based on feedback

Author: Joy-less

BitFaster.Caching.Benchmarks/Lfu/CmSketchNoPin.cs

@@ -56,7 +56,7 @@ public CmSketchNoPin(long maximumSize, IEqualityComparer<T> comparer)
         /// <returns>The estimated frequency of the value.</returns>
         public int EstimateFrequency(T value)
         {
-#if NETSTANDARD
+#if NETFRAMEWORK
             return EstimateFrequencyStd(value);
 #else
 
@@ -85,7 +85,7 @@ public int EstimateFrequency(T value)
         /// <param name="value">The value.</param>
         public void Increment(T value)
         {
-#if NETSTANDARD
+#if NETFRAMEWORK
             IncrementStd(value);
 #else
 
@@ -266,11 +266,7 @@ private unsafe int EstimateFrequencyAvx(T value)
                     .AsUInt16();
 
                 // set the zeroed high parts of the long value to ushort.Max
-#if NET
                 count = Avx2.Blend(count, Vector128<ushort>.AllBitsSet, 0b10101010);
-#else
-                count = Avx2.Blend(count, Vector128.Create(ushort.MaxValue), 0b10101010);
-#endif
 
                 return Avx2.MinHorizontal(count).GetElement(0);
             }

BitFaster.Caching/Duration.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 using BitFaster.Caching.Lru;
 
 namespace BitFaster.Caching

BitFaster.Caching/IScopedCache.cs

@@ -61,7 +61,7 @@ public interface IScopedCache<K, V> : IEnumerable<KeyValuePair<K, Scoped<V>>> wh
         Lifetime<V> ScopedGetOrAdd(K key, Func<K, Scoped<V>> valueFactory);
 
 // backcompat: remove conditional compile
-#if !NETSTANDARD
+#if NET
         /// <summary>
         /// Adds a key/scoped value pair to the cache if the key does not already exist. Returns a lifetime for either 
         /// the new value, or the existing value if the key already exists.

BitFaster.Caching/Lfu/CmSketchCore.cs

@@ -300,25 +300,16 @@ private unsafe int EstimateFrequencyAvx(T value)
 
             Vector256<ulong> indexLong = Avx2.PermuteVar8x32(Vector256.Create(index, Vector128<int>.Zero), Vector256.Create(0, 4, 1, 5, 2, 5, 3, 7)).AsUInt64();
 
-#if NET
             long* tablePtr = tableAddr;
-#else
-            fixed (long* tablePtr = table)
-#endif
-            {
-                Vector128<ushort> count = Avx2.PermuteVar8x32(Avx2.And(Avx2.ShiftRightLogicalVariable(Avx2.GatherVector256(tablePtr, blockOffset, 8), indexLong), Vector256.Create(0xfL)).AsInt32(), Vector256.Create(0, 2, 4, 6, 1, 3, 5, 7))
-                    .GetLower()
-                    .AsUInt16();
 
-                // set the zeroed high parts of the long value to ushort.Max
-#if NET
-                count = Avx2.Blend(count, Vector128<ushort>.AllBitsSet, 0b10101010);
-#else
-                count = Avx2.Blend(count, Vector128.Create(ushort.MaxValue), 0b10101010);
-#endif
+            Vector128<ushort> count = Avx2.PermuteVar8x32(Avx2.And(Avx2.ShiftRightLogicalVariable(Avx2.GatherVector256(tablePtr, blockOffset, 8), indexLong), Vector256.Create(0xfL)).AsInt32(), Vector256.Create(0, 2, 4, 6, 1, 3, 5, 7))
+                .GetLower()
+                .AsUInt16();
 
-                return Avx2.MinHorizontal(count).GetElement(0);
-            }
+            // set the zeroed high parts of the long value to ushort.Max
+            count = Avx2.Blend(count, Vector128<ushort>.AllBitsSet, 0b10101010);
+
+            return Avx2.MinHorizontal(count).GetElement(0);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -335,29 +326,24 @@ private unsafe void IncrementAvx(T value)
             Vector256<ulong> offsetLong = Avx2.PermuteVar8x32(Vector256.Create(index, Vector128<int>.Zero), Vector256.Create(0, 4, 1, 5, 2, 5, 3, 7)).AsUInt64();
             Vector256<long> mask = Avx2.ShiftLeftLogicalVariable(Vector256.Create(0xfL), offsetLong);
 
-#if NET
             long* tablePtr = tableAddr;
-#else
-            fixed (long* tablePtr = table)
-#endif
-            {
-                // Note masked is 'equal' - therefore use AndNot below
-                Vector256<long> masked = Avx2.CompareEqual(Avx2.And(Avx2.GatherVector256(tablePtr, blockOffset, 8), mask), mask);
 
-                // Mask to zero out non matches (add zero below) - first operand is NOT then AND result (order matters)
-                Vector256<long> inc = Avx2.AndNot(masked, Avx2.ShiftLeftLogicalVariable(Vector256.Create(1L), offsetLong));
+            // Note masked is 'equal' - therefore use AndNot below
+            Vector256<long> masked = Avx2.CompareEqual(Avx2.And(Avx2.GatherVector256(tablePtr, blockOffset, 8), mask), mask);
 
-                bool wasInc = Avx2.MoveMask(Avx2.CompareEqual(masked.AsByte(), Vector256<byte>.Zero).AsByte()) == unchecked((int)(0b1111_1111_1111_1111_1111_1111_1111_1111));
+            // Mask to zero out non matches (add zero below) - first operand is NOT then AND result (order matters)
+            Vector256<long> inc = Avx2.AndNot(masked, Avx2.ShiftLeftLogicalVariable(Vector256.Create(1L), offsetLong));
 
-                tablePtr[blockOffset.GetElement(0)] += inc.GetElement(0);
-                tablePtr[blockOffset.GetElement(1)] += inc.GetElement(1);
-                tablePtr[blockOffset.GetElement(2)] += inc.GetElement(2);
-                tablePtr[blockOffset.GetElement(3)] += inc.GetElement(3);
+            bool wasInc = Avx2.MoveMask(Avx2.CompareEqual(masked.AsByte(), Vector256<byte>.Zero).AsByte()) == unchecked((int)0b1111_1111_1111_1111_1111_1111_1111_1111);
 
-                if (wasInc && (++size == sampleSize))
-                {
-                    Reset();
-                }
+            tablePtr[blockOffset.GetElement(0)] += inc.GetElement(0);
+            tablePtr[blockOffset.GetElement(1)] += inc.GetElement(1);
+            tablePtr[blockOffset.GetElement(2)] += inc.GetElement(2);
+            tablePtr[blockOffset.GetElement(3)] += inc.GetElement(3);
+
+            if (wasInc && (++size == sampleSize))
+            {
+                Reset();
             }
         }
 #endif