Backed out changeset 4b1409597101 (bug 1920718) for causing bp bustages on rapl.cpp.
This commit is contained in:
@@ -53,8 +53,7 @@ class MOZ_RAII AutoProfilerLabelData {
|
||||
static uint32_t sGeneration;
|
||||
};
|
||||
|
||||
MOZ_RUNINIT /* static */ AutoProfilerLabelData::Mutex
|
||||
AutoProfilerLabelData::sAPLMutex;
|
||||
/* static */ AutoProfilerLabelData::Mutex AutoProfilerLabelData::sAPLMutex;
|
||||
/* static */ ProfilerLabelEnter AutoProfilerLabelData::sEnter = nullptr;
|
||||
/* static */ ProfilerLabelExit AutoProfilerLabelData::sExit = nullptr;
|
||||
/* static */ uint32_t AutoProfilerLabelData::sGeneration = 0;
|
||||
|
||||
@@ -7,8 +7,6 @@
|
||||
|
||||
#include "SSE.h"
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
|
||||
#ifdef HAVE_CPUID_H
|
||||
// cpuid.h is available on gcc 4.3 and higher on i386 and x86_64
|
||||
# include <cpuid.h>
|
||||
@@ -171,39 +169,39 @@ namespace sse_private {
|
||||
#if defined(MOZILLA_SSE_HAVE_CPUID_DETECTION)
|
||||
|
||||
# if !defined(MOZILLA_PRESUME_MMX)
|
||||
MOZ_RUNINIT bool mmx_enabled = has_cpuid_bits(1u, edx, (1u << 23));
|
||||
bool mmx_enabled = has_cpuid_bits(1u, edx, (1u << 23));
|
||||
# endif
|
||||
|
||||
# if !defined(MOZILLA_PRESUME_SSE)
|
||||
MOZ_RUNINIT bool sse_enabled = has_cpuid_bits(1u, edx, (1u << 25));
|
||||
bool sse_enabled = has_cpuid_bits(1u, edx, (1u << 25));
|
||||
# endif
|
||||
|
||||
# if !defined(MOZILLA_PRESUME_SSE2)
|
||||
MOZ_RUNINIT bool sse2_enabled = has_cpuid_bits(1u, edx, (1u << 26));
|
||||
bool sse2_enabled = has_cpuid_bits(1u, edx, (1u << 26));
|
||||
# endif
|
||||
|
||||
# if !defined(MOZILLA_PRESUME_SSE3)
|
||||
MOZ_RUNINIT bool sse3_enabled = has_cpuid_bits(1u, ecx, (1u << 0));
|
||||
bool sse3_enabled = has_cpuid_bits(1u, ecx, (1u << 0));
|
||||
# endif
|
||||
|
||||
# if !defined(MOZILLA_PRESUME_SSSE3)
|
||||
MOZ_RUNINIT bool ssse3_enabled = has_cpuid_bits(1u, ecx, (1u << 9));
|
||||
bool ssse3_enabled = has_cpuid_bits(1u, ecx, (1u << 9));
|
||||
# endif
|
||||
|
||||
# if !defined(MOZILLA_PRESUME_SSE4A)
|
||||
MOZ_RUNINIT bool sse4a_enabled = has_cpuid_bits(0x80000001u, ecx, (1u << 6));
|
||||
bool sse4a_enabled = has_cpuid_bits(0x80000001u, ecx, (1u << 6));
|
||||
# endif
|
||||
|
||||
# if !defined(MOZILLA_PRESUME_SSE4_1)
|
||||
MOZ_RUNINIT bool sse4_1_enabled = has_cpuid_bits(1u, ecx, (1u << 19));
|
||||
bool sse4_1_enabled = has_cpuid_bits(1u, ecx, (1u << 19));
|
||||
# endif
|
||||
|
||||
# if !defined(MOZILLA_PRESUME_SSE4_2)
|
||||
MOZ_RUNINIT bool sse4_2_enabled = has_cpuid_bits(1u, ecx, (1u << 20));
|
||||
bool sse4_2_enabled = has_cpuid_bits(1u, ecx, (1u << 20));
|
||||
# endif
|
||||
|
||||
# if !defined(MOZILLA_PRESUME_FMA3)
|
||||
MOZ_RUNINIT bool fma3_enabled = has_cpuid_bits(1u, ecx, (1u << 12));
|
||||
bool fma3_enabled = has_cpuid_bits(1u, ecx, (1u << 12));
|
||||
# endif
|
||||
|
||||
# if !defined(MOZILLA_PRESUME_AVX) || !defined(MOZILLA_PRESUME_AVX2)
|
||||
@@ -227,22 +225,22 @@ static bool has_avx() {
|
||||
# endif // !MOZILLA_PRESUME_AVX || !MOZILLA_PRESUME_AVX2
|
||||
|
||||
# if !defined(MOZILLA_PRESUME_AVX)
|
||||
MOZ_RUNINIT bool avx_enabled = has_avx();
|
||||
bool avx_enabled = has_avx();
|
||||
# endif
|
||||
|
||||
# if !defined(MOZILLA_PRESUME_AVX2)
|
||||
MOZ_RUNINIT bool avx2_enabled = has_avx() && has_cpuid_bits(7u, ebx, (1u << 5));
|
||||
bool avx2_enabled = has_avx() && has_cpuid_bits(7u, ebx, (1u << 5));
|
||||
# endif
|
||||
|
||||
# if !defined(MOZILLA_PRESUME_AVXVNNI)
|
||||
MOZ_RUNINIT bool avxvnni_enabled = has_cpuid_bits_ex(7u, eax, (1u << 4));
|
||||
bool avxvnni_enabled = has_cpuid_bits_ex(7u, eax, (1u << 4));
|
||||
# endif
|
||||
|
||||
# if !defined(MOZILLA_PRESUME_AES)
|
||||
MOZ_RUNINIT bool aes_enabled = has_cpuid_bits(1u, ecx, (1u << 25));
|
||||
bool aes_enabled = has_cpuid_bits(1u, ecx, (1u << 25));
|
||||
# endif
|
||||
|
||||
MOZ_RUNINIT bool has_constant_tsc = has_cpuid_bits(0x80000007u, edx, (1u << 8));
|
||||
bool has_constant_tsc = has_cpuid_bits(0x80000007u, edx, (1u << 8));
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ struct TimeStampInitialization {
|
||||
~TimeStampInitialization() { TimeStamp::Shutdown(); }
|
||||
};
|
||||
|
||||
MOZ_RUNINIT static TimeStampInitialization sInitOnce;
|
||||
static TimeStampInitialization sInitOnce;
|
||||
|
||||
MFBT_API TimeStamp TimeStamp::ProcessCreation() {
|
||||
if (sInitOnce.mProcessCreation.IsNull()) {
|
||||
|
||||
Reference in New Issue
Block a user