PopCount() => std::popcount() (#11669)

tborisow · web-flow · commit 78eb45ead832 · 2024-11-15T21:15:50.000+03:00
diff --git a/ydb/core/blobstorage/dsproxy/dsproxy_range.cpp b/ydb/core/blobstorage/dsproxy/dsproxy_range.cpp
@@ -5,8 +5,6 @@
 #include <ydb/core/blobstorage/vdisk/common/vdisk_events.h>
 #include <ydb/core/blobstorage/groupinfo/blobstorage_groupinfo.h>
 
-#include <library/cpp/pop_count/popcount.h>
-
 namespace NKikimr {
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/ydb/core/blobstorage/dsproxy/ut_ftol/dsproxy_fault_tolerance_ut_base.h b/ydb/core/blobstorage/dsproxy/ut_ftol/dsproxy_fault_tolerance_ut_base.h
@@ -6,6 +6,8 @@
 #include <ydb/library/actors/core/actor_coroutine.h>
 #include <library/cpp/testing/unittest/registar.h>
 
+#include <bit>
+
 namespace NKikimr {
 
 template<typename TDerived>
@@ -76,8 +78,8 @@ class TFaultToleranceTestBase : public TActorCoroImpl {
             auto layout = GetActualPartLayout(id);
             const ui32 disksWithData = layout.GetDisksWithPart(0) | layout.GetDisksWithPart(1);
             const ui32 disksWithMetadata = layout.GetDisksWithPart(2);
-            const ui32 numDisksWithData = PopCount(disksWithData);
-            const ui32 numDisksWithAny = PopCount(disksWithData | disksWithMetadata);
+            const ui32 numDisksWithData = std::popcount(disksWithData);
+            const ui32 numDisksWithAny = std::popcount(disksWithData | disksWithMetadata);
             UNIT_ASSERT(numDisksWithAny >= 5);
             auto printLayout = [&] {
                 TStringStream s;
diff --git a/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo.cpp b/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo.cpp
@@ -10,8 +10,6 @@
 
 #include <ydb/library/actors/core/interconnect.h>
 
-#include <library/cpp/pop_count/popcount.h>
-
 #include <library/cpp/digest/crc32c/crc32c.h>
 
 #include <util/string/printf.h>
@@ -23,6 +21,8 @@
 #include <util/string/type.h>
 #include <util/string/cast.h>
 
+#include <bit>
+
 namespace NKikimr {
 
 class TQuorumCheckerBase : public TBlobStorageGroupInfo::IQuorumChecker {
@@ -287,7 +287,7 @@ quitIter:   ;
             return 0; // we already have a part
         }
         // filter out only parts on their respective disks to filter out possibly incorrectly written parts
-        const ui32 numDisksWithPartInMyRing = PopCount((disksWithPart >> myRing) & 0x49); // binary stencil 001001001
+        const ui32 numDisksWithPartInMyRing = std::popcount((disksWithPart >> myRing) & 0x49); // binary stencil 001001001
         // resurrect matching part if there are less than 2 parts in our datacenter
         return numDisksWithPartInMyRing < 2 ? 1 << myRing : 0;
     }
diff --git a/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_partlayout.cpp b/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_partlayout.cpp
@@ -2,12 +2,14 @@
 #include "blobstorage_groupinfo_sets.h"
 #include <ydb/core/blobstorage/vdisk/ingress/blobstorage_ingress.h>
 
+#include <bit>
+
 namespace NKikimr {
 
     template<typename Iterator>
     ui32 CountEffectiveReplicasGeneric(Iterator begin, Iterator end, ui32 usedDiskMask = 0) {
         if (begin == end) {
-            return PopCount(usedDiskMask);
+            return std::popcount(usedDiskMask);
         }
         ui32 value = *begin++ & ~usedDiskMask;
         ui32 res = CountEffectiveReplicasGeneric(begin, end, usedDiskMask); // try skipping this disk
@@ -49,7 +51,7 @@ namespace NKikimr {
                 total &= mainMask;
 
                 // count them as effective replicas
-                ui32 res = PopCount(total);
+                ui32 res = std::popcount(total);
 
                 if (total != mainMask) {
                     // here we filter out handoff disks containing at least one of required parts (which are indicated
@@ -72,7 +74,7 @@ namespace NKikimr {
 
                         case 2: { // two handoff disks contain parts
                             const ui32 a = handoffDiskByPart[0], b = handoffDiskByPart[1];
-                            res += Min(2U, PopCount(a | b)); // if both disks contain the same part, we can use only one disk
+                            res += Min(2, std::popcount(a | b)); // if both disks contain the same part, we can use only one disk
                             break;
                         }
 
diff --git a/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_partlayout.h b/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_partlayout.h
@@ -3,6 +3,8 @@
 #include "defs.h"
 #include "blobstorage_groupinfo.h"
 
+#include <bit>
+
 namespace NKikimr {
 
     class TIngress;
@@ -84,7 +86,7 @@ namespace NKikimr {
         std::pair<ui32, ui32> GetMirror3of4State() const {
             const ui32 data = GetDisksWithPart(0) | GetDisksWithPart(1);
             const ui32 meta = GetDisksWithPart(2);
-            return std::make_tuple(PopCount(data), PopCount(data | meta));
+            return std::make_tuple<ui32, ui32>(std::popcount(data), std::popcount(data | meta));
         }
 
         template<typename F>
@@ -121,7 +123,7 @@ namespace NKikimr {
                             partMasks.push_back(1 << idxInSubgroup);
                         } else {
                             for (ui32 j = 1; j < 1 << gtype.TotalPartCount(); ++j) {
-                                if (PopCount(j) <= maxHandoffBits) {
+                                if (static_cast<ui32>(std::popcount(j)) <= maxHandoffBits) {
                                     partMasks.push_back(j);
                                 }
                             }
diff --git a/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_sets.h b/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_sets.h
@@ -3,7 +3,7 @@
 #include "defs.h"
 #include "blobstorage_groupinfo_iter.h"
 
-#include <library/cpp/pop_count/popcount.h>
+#include <bit>
 
 namespace NKikimr {
 
@@ -219,7 +219,7 @@ namespace NKikimr {
 
         // calculate number of set bits
         ui32 GetNumSetItems() const {
-            return PopCount(Mask);
+            return std::popcount(Mask);
         }
 
         const TBlobStorageGroupInfo::TTopology *GetTopology() const {
diff --git a/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_ut.cpp b/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_ut.cpp
@@ -5,6 +5,8 @@
 #include <ydb/core/blobstorage/vdisk/ingress/blobstorage_ingress.h>
 #include <library/cpp/testing/unittest/registar.h>
 
+#include <bit>
+
 namespace NKikimr {
 
 Y_UNIT_TEST_SUITE(TBlobStorageGroupInfoTest) {
@@ -147,7 +149,7 @@ Y_UNIT_TEST_SUITE(TBlobStorageGroupInfoTest) {
             // calculate sets of disks
             TVector<ui32> goodMask, badMask;
             for (ui32 mask = 0; mask < numMasks; ++mask) {
-                (PopCount(mask) <= numHandoff ? goodMask : badMask).push_back(mask);
+                (static_cast<ui32>(std::popcount(mask)) <= numHandoff ? goodMask : badMask).push_back(mask);
             }
 
             auto createGroupVDisks = [&](ui32 domainMask, ui32 vdiskMask) {
diff --git a/ydb/core/blobstorage/groupinfo/defs.h b/ydb/core/blobstorage/groupinfo/defs.h
@@ -1,5 +1,4 @@
 #pragma once
 // unique tag to fix pragma once gcc glueing: ./ydb/core/blobstorage/groupinfo/defs.h
 #include <ydb/core/blobstorage/defs.h>
-#include <library/cpp/pop_count/popcount.h>
 #include <util/string/escape.h>
diff --git a/ydb/core/blobstorage/groupinfo/ya.make b/ydb/core/blobstorage/groupinfo/ya.make
@@ -3,7 +3,6 @@ LIBRARY()
 PEERDIR(
     ydb/library/actors/core
     library/cpp/digest/crc32c
-    library/cpp/pop_count
     ydb/core/base
     ydb/core/base/services
     ydb/core/blobstorage/crypto
diff --git a/ydb/core/blobstorage/ut_blobstorage/osiris.cpp b/ydb/core/blobstorage/ut_blobstorage/osiris.cpp
@@ -4,6 +4,8 @@
 #include <util/system/condvar.h>
 #include <util/system/info.h>
 
+#include <bit>
+
 #define SINGLE_THREAD 1
 
 namespace {
@@ -241,7 +243,7 @@ void DoTest(TBlobStorageGroupType::EErasureSpecies erasure) {
                     v.push_back(1 << i); // main
                 } else {
                     for (ui32 j = 1; j < (1 << type.TotalPartCount()); ++j) {
-                        if (PopCount(j) <= 1) {
+                        if (std::popcount(j) <= 1) {
                             v.push_back(j); // handoff
                         }
                     }
diff --git a/ydb/core/blobstorage/vdisk/hullop/blobstorage_hullcompactdeferredqueue_ut.cpp b/ydb/core/blobstorage/vdisk/hullop/blobstorage_hullcompactdeferredqueue_ut.cpp
@@ -6,6 +6,8 @@
 
 #include <util/system/sanitizers.h>
 
+#include <bit>
+
 using namespace NKikimr;
 
 const TBlobStorageGroupType GType(TBlobStorageGroupType::Erasure4Plus2Block);
@@ -115,7 +117,7 @@ Y_UNIT_TEST_SUITE(TBlobStorageHullCompactDeferredQueueTest) {
 
         TVector<ui32> maskopts;
         for (ui32 mask = 0; mask < 64; ++mask) {
-            ui32 num = PopCount(mask);
+            ui32 num = std::popcount(mask);
             if (1 <= num && num <= 3) {
                 maskopts.push_back(mask);
             }
diff --git a/ydb/core/blobstorage/vdisk/ingress/blobstorage_ingress.cpp b/ydb/core/blobstorage/vdisk/ingress/blobstorage_ingress.cpp
@@ -3,8 +3,6 @@
 #include <ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_partlayout.h>
 #include <ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_sets.h>
 
-#include <library/cpp/pop_count/popcount.h>
-
 #include <util/generic/bitops.h>
 
 namespace NKikimr {
diff --git a/ydb/core/blobstorage/vdisk/ingress/blobstorage_ingress_matrix.h b/ydb/core/blobstorage/vdisk/ingress/blobstorage_ingress_matrix.h
@@ -2,11 +2,11 @@
 
 #include <ydb/core/util/bits.h>
 
-#include <library/cpp/pop_count/popcount.h>
-
 #include <util/stream/str.h>
 #include <util/string/cast.h>
 
+#include <bit>
+
 namespace NKikimr {
 
     namespace NMatrix {
@@ -81,7 +81,7 @@ namespace NKikimr {
                 ui8 shift = 8 - i;
                 ui8 mask = 0xFF >> shift << shift;
                 unsigned v = Vec & mask;
-                return ::PopCount(v);
+                return ::std::popcount(v);
             }
 
             ui8 FirstPosition() const {
@@ -97,7 +97,7 @@ namespace NKikimr {
             }
 
             ui8 CountBits() const {
-                return ::PopCount(Vec);
+                return ::std::popcount(Vec);
             }
 
             ui8 Raw() const {
diff --git a/ydb/core/blobstorage/vdisk/ingress/ya.make b/ydb/core/blobstorage/vdisk/ingress/ya.make
@@ -2,7 +2,6 @@ LIBRARY()
 
 PEERDIR(
     library/cpp/lwtrace
-    library/cpp/pop_count
     ydb/core/base
     ydb/core/protos
 )
diff --git a/ydb/core/blobstorage/vdisk/repl/blobstorage_replrecoverymachine.h b/ydb/core/blobstorage/vdisk/repl/blobstorage_replrecoverymachine.h
@@ -4,6 +4,8 @@
 #include "blobstorage_hullreplwritesst.h"
 #include "blobstorage_repl.h"
 
+#include <bit>
+
 namespace NKikimr {
 
     namespace NRepl {
@@ -158,7 +160,7 @@ namespace NKikimr {
                 }
 
                 Y_DEBUG_ABORT_UNLESS((item.PartsMask >> groupType.TotalPartCount()) == 0);
-                const ui32 presentParts = PopCount(item.PartsMask);
+                const ui32 presentParts = std::popcount(item.PartsMask);
                 bool canRestore = presentParts >= groupType.MinimalRestorablePartCount();
 
                 // first of all, count present parts and recover only if there are enough of these parts
diff --git a/ydb/core/blobstorage/vdisk/scrub/blob_recovery_process.cpp b/ydb/core/blobstorage/vdisk/scrub/blob_recovery_process.cpp
@@ -1,5 +1,7 @@
 #include "blob_recovery_impl.h"
 
+#include <bit>
+
 namespace NKikimr {
 
     void TBlobRecoveryActor::AddBlobQuery(const TLogoBlobID& id, NMatrix::TVectorType needed,
@@ -156,7 +158,7 @@ namespace NKikimr {
         if (item.GetAvailableParts().IsSupersetOf(item.Needed)) {
             return NKikimrProto::OK;
         }
-        const ui32 numParts = PopCount(item.PartsMask);
+        const ui32 numParts = std::popcount(item.PartsMask);
         if (numParts >= Info->Type.MinimalRestorablePartCount()) {
             Y_DEBUG_ABORT_UNLESS(item.Parts.size() == Info->Type.TotalPartCount());
 
diff --git a/ydb/core/erasure/erasure_restore.cpp b/ydb/core/erasure/erasure_restore.cpp
@@ -1,7 +1,8 @@
 #include "erasure.h"
-#include <library/cpp/pop_count/popcount.h>
 #include <util/string/printf.h>
 
+#include <bit>
+
 namespace NKikimr {
 
 #define RESTORE_BLOCK(RestoreMask) /* all other parts are assumed available */ \
@@ -407,7 +408,7 @@ namespace NKikimr {
             }
         }
 
-        Y_ABORT_UNLESS(PopCount(availableMask) >= 4);
+        Y_ABORT_UNLESS(std::popcount(availableMask) >= 4);
         Y_ABORT_UNLESS(size % 32 == 0);
 
         if (whole) {
@@ -416,7 +417,7 @@ namespace NKikimr {
 
         restoreMask &= ~availableMask;
 
-        Y_ABORT_UNLESS(PopCount(restoreMask) <= 2);
+        Y_ABORT_UNLESS(std::popcount(restoreMask) <= 2);
 
         for (ui32 part = 0; part < 6; ++part) {
             if (restoreMask >> part & 1) {
diff --git a/ydb/library/actors/util/cpu_load_log.h b/ydb/library/actors/util/cpu_load_log.h
@@ -1,7 +1,8 @@
 #pragma once
 
 #include "defs.h"
-#include <library/cpp/pop_count/popcount.h>
+
+#include <bit>
 
 static constexpr ui64 BitDurationNs = 131'072;  // A power of 2
 
@@ -173,7 +174,7 @@ class TMinusOneCpuEstimator {
             }
             if (!input) {
                 if (!bucket) {
-                    Idle += 64 - PopCount(all_busy);
+                    Idle += 64 - std::popcount(all_busy);
                     continue;
                 }
             }
diff --git a/ydb/library/actors/util/ya.make b/ydb/library/actors/util/ya.make
@@ -40,7 +40,6 @@ SRCS(
 PEERDIR(
     library/cpp/containers/absl_flat_hash
     library/cpp/deprecated/atomic
-    library/cpp/pop_count
 )
 
 END()
diff --git a/ydb/tools/blobsan/main.cpp b/ydb/tools/blobsan/main.cpp
@@ -5,7 +5,6 @@
 #include <ydb/core/blobstorage/vdisk/query/query_stream.h>
 #include <library/cpp/containers/absl_flat_hash/flat_hash_map.h>
 #include <library/cpp/streams/bzip2/bzip2.h>
-#include <library/cpp/pop_count/popcount.h>
 #include <util/generic/buffer.h>
 #include <util/generic/hash.h>
 #include <util/stream/buffer.h>
@@ -16,6 +15,7 @@
 #include <util/system/thread.h>
 #include <util/system/mutex.h>
 #include <util/system/condvar.h>
+#include <bit>
 #include <deque>
 #include <map>
 #include <unordered_map>
@@ -514,7 +514,7 @@ int main(int argc, char **argv) {
 
             const ui32 numParts = getNumParts(blob.Info.Layout);
             const ui32 numLocalParts = getNumParts(blob.Info.LocalLayout);
-            const ui32 numNodes = PopCount(blob.Info.Nodes);
+            const ui32 numNodes = std::popcount(blob.Info.Nodes);
 
             auto isFull = [&](const TSubgroupPartLayout& layout) {
                 return checker.GetBlobState(layout, failed) == TBlobStorageGroupInfo::EBS_FULL;
@@ -559,7 +559,7 @@ int main(int argc, char **argv) {
                 // looks like phantom blob -- count found parts as trash
                 for (ui32 partIdx = 0; partIdx < TotalPartCount; ++partIdx) {
                     if (const ui32 disks = blob.Info.LocalLayout.GetDisksWithPart(partIdx)) {
-                        trashSize += type.PartSize(blobId) * PopCount(disks);
+                        trashSize += type.PartSize(blobId) * std::popcount(disks);
                     }
                 }
                 continue;
@@ -585,9 +585,9 @@ int main(int argc, char **argv) {
                 << "\n\tNumNodes#           " << numNodes
                 << "\n\tNodes#              " << FormatBitMask(blob.Info.Nodes, BlobSubgroupSize)
                 << "\n\tSeenDisks#          " << FormatBitMask(seenDisks, BlobSubgroupSize)
-                << "\n\tNumUnderBarrier#    " << PopCount(blob.UnderBarrierMask)
+                << "\n\tNumUnderBarrier#    " << std::popcount(blob.UnderBarrierMask)
                 << "\n\tUnderBarrierMask#   " << FormatBitMask(blob.UnderBarrierMask, BlobSubgroupSize)
-                << "\n\tNumDiscard#         " << PopCount(blob.DiscardMask)
+                << "\n\tNumDiscard#         " << std::popcount(blob.DiscardMask)
                 << "\n\tDiscardMask#        " << FormatBitMask(blob.DiscardMask, BlobSubgroupSize)
                 << "\n\tKeepMask#           " << FormatBitMask(blob.KeepMask, BlobSubgroupSize)
                 << "\n\tDoNotKeepMask#      " << FormatBitMask(blob.DoNotKeepMask, BlobSubgroupSize)
diff --git a/ydb/tools/blobsan/ya.make b/ydb/tools/blobsan/ya.make
@@ -5,7 +5,6 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/pop_count
     library/cpp/streams/bzip2
     ydb/core/blobstorage
     ydb/core/blobstorage/groupinfo
