Avoid SSE4/AVX instructions on Windows

The __popcnt intrinsics expand to SSE4+ instructions.

Fixes: QTBUG-123811
Change-Id: If406bb88bd96263aefd23769bc779b49b9b4e72b
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/593284
Reviewed-by: Peter Varga <[email protected]>

Author: Allan Sandfeld Jensen

chromium/base/allocator/partition_allocator/src/partition_alloc/starscan/state_bitmap.h

@@ -235,11 +235,7 @@ StateBitmap<PageSize, PageAlignment, AllocationAlignment>::Quarantine(
   auto& cell = AsAtomicCell(cell_index);
   const CellType cell_before = cell.fetch_and(mask, std::memory_order_relaxed);
   // Check if the previous state was also quarantined.
-#if defined(_MSC_VER)
-  return __popcnt64(
-#else
-  return __builtin_popcount(
-#endif
+  return std::popcount(
               static_cast<unsigned>((cell_before >> object_bit) &
                                                   kStateMask)) != 1;
 }

chromium/third_party/blink/renderer/core/dom/element_rare_data_vector.cc

@@ -34,6 +34,8 @@
 #include "third_party/blink/renderer/platform/heap/collection_support/heap_hash_map.h"
 #include "third_party/blink/renderer/platform/heap/garbage_collected.h"
 
+#include <bit>
+
 namespace blink {
 
 ElementRareDataVector::ElementRareDataVector() = default;
@@ -45,13 +47,8 @@ ElementRareDataVector::~ElementRareDataVector() {
 unsigned ElementRareDataVector::GetFieldIndex(FieldId field_id) const {
   unsigned field_id_int = static_cast<unsigned>(field_id);
   DCHECK(fields_bitfield_ & (static_cast<BitfieldType>(1) << field_id_int));
-#ifdef _MSC_VER
-  return __popcnt(fields_bitfield_ &
-                            ~(~static_cast<BitfieldType>(0) << field_id_int));
-#else
-  return __builtin_popcount(fields_bitfield_ &
-                            ~(~static_cast<BitfieldType>(0) << field_id_int));
-#endif
+  return std::popcount(fields_bitfield_ &
+                       ~(~static_cast<BitfieldType>(0) << field_id_int));
 }
 
 ElementRareDataField* ElementRareDataVector::GetField(FieldId field_id) const {

chromium/third_party/blink/renderer/core/paint/sparse_vector.h

@@ -7,6 +7,7 @@
 
 #include <stdint.h>
 
+#include <bit>
 #include <limits>
 #include <type_traits>
 
@@ -113,11 +114,7 @@ class CORE_EXPORT SparseVector {
     // Then count the total population of field IDs lower than that one we
     // are looking for. The target field ID should be located at the index of
     // of the total population.
-#ifdef _MSC_VER
-    return __popcnt64(fields_bitfield_ & mask);
-#else
-    return __builtin_popcountll(fields_bitfield_ & mask);
-#endif
+    return std::popcount(fields_bitfield_ & mask);
   }
 
   Vector<FieldType> fields_;

chromium/third_party/pdfium/third_party/libopenjpeg/ht_dec.c

@@ -69,7 +69,7 @@ static OPJ_BOOL only_cleanup_pass_is_decoded = OPJ_FALSE;
 static INLINE
 OPJ_UINT32 population_count(OPJ_UINT32 val)
 {
-#if defined(OPJ_COMPILER_MSVC) && (defined(_M_IX86) || defined(_M_AMD64))
+#if defined(OPJ_COMPILER_MSVC) && (defined(_M_AMD64) || defined(_M_IX86)) && (defined(__AVX__) || defined(__SSE4_2__) || defined(__POPCNT__))
     return (OPJ_UINT32)__popcnt(val);
 #elif (defined OPJ_COMPILER_GNUC)
     return (OPJ_UINT32)__builtin_popcount(val);

chromium/third_party/perfetto/include/perfetto/base/compiler.h

@@ -76,9 +76,12 @@
 
 #if defined(__GNUC__) || defined(__clang__)
 #define PERFETTO_POPCOUNT(x) __builtin_popcountll(x)
-#else
+#elif defined(__AVX__) || defined(__SSE4_2__) || defined(__POPCNT__)
 #include <intrin.h>
 #define PERFETTO_POPCOUNT(x) __popcnt64(x)
+#else
+#include <bit>
+#define PERFETTO_POPCOUNT(x) std::popcount(x)
 #endif
 
 #if defined(__clang__)