Rebase

Created using spr 1.3.6-beta.1

Author: pcc

compiler-rt/include/profile/MemProfData.inc

@@ -33,10 +33,11 @@
    (uint64_t)'o' << 24 | (uint64_t)'f' << 16 | (uint64_t)'r' << 8 | (uint64_t)129)
 
 // The version number of the raw binary format.
-#define MEMPROF_RAW_VERSION 5ULL
+#define MEMPROF_RAW_VERSION 4ULL
 
 // Currently supported versions.
-#define MEMPROF_RAW_SUPPORTED_VERSIONS {3ULL, 4ULL, 5ULL}
+#define MEMPROF_RAW_SUPPORTED_VERSIONS                                         \
+  { 3ULL, 4ULL }
 
 #define MEMPROF_V3_MIB_SIZE 132ULL;
 
@@ -228,41 +229,6 @@ void Merge(const MemInfoBlock &newMIB) {
 } __attribute__((__packed__));
 #endif
 
-constexpr int MantissaBits = 12;
-constexpr int ExponentBits = 4;
-constexpr uint16_t MaxMantissa = (1U << MantissaBits) - 1;
-constexpr uint16_t MaxExponent = (1U << ExponentBits) - 1;
-constexpr uint64_t MaxRepresentableValue = static_cast<uint64_t>(MaxMantissa)
-                                           << MaxExponent;
-
-// Encodes a 64-bit unsigned integer into a 16-bit scaled integer format.
-inline uint16_t encodeHistogramCount(uint64_t Count) {
-  if (Count == 0)
-    return 0;
-
-  if (Count > MaxRepresentableValue)
-    Count = MaxRepresentableValue;
-
-  if (Count <= MaxMantissa)
-    return Count;
-
-  uint64_t M = Count;
-  uint16_t E = 0;
-  while (M > MaxMantissa) {
-    M = (M + 1) >> 1;
-    E++;
-  }
-  return (E << MantissaBits) | static_cast<uint16_t>(M);
-}
-
-// Decodes a 16-bit scaled integer and returns the
-// decoded 64-bit unsigned integer.
-inline uint64_t decodeHistogramCount(uint16_t EncodedValue) {
-  const uint16_t E = EncodedValue >> MantissaBits;
-  const uint16_t M = EncodedValue & MaxMantissa;
-  return static_cast<uint64_t>(M) << E;
-}
-
 } // namespace memprof
 } // namespace llvm
 

compiler-rt/lib/memprof/memprof_rawprofile.cpp

@@ -19,7 +19,6 @@ using ::__sanitizer::Vector;
 using ::llvm::memprof::MemInfoBlock;
 using SegmentEntry = ::llvm::memprof::SegmentEntry;
 using Header = ::llvm::memprof::Header;
-using ::llvm::memprof::encodeHistogramCount;
 
 namespace {
 template <class T> char *WriteBytes(const T &Pod, char *Buffer) {
@@ -170,15 +169,13 @@ void SerializeMIBInfoToBuffer(MIBMapTy &MIBMap, const Vector<u64> &StackIds,
     // FIXME: We unnecessarily serialize the AccessHistogram pointer. Adding a
     // serialization schema will fix this issue. See also FIXME in
     // deserialization.
-    auto &MIB = (*h)->mib;
-    Ptr = WriteBytes(MIB, Ptr);
-    for (u64 j = 0; j < MIB.AccessHistogramSize; ++j) {
-      u16 HistogramEntry =
-          encodeHistogramCount(((u64 *)(MIB.AccessHistogram))[j]);
+    Ptr = WriteBytes((*h)->mib, Ptr);
+    for (u64 j = 0; j < (*h)->mib.AccessHistogramSize; ++j) {
+      u64 HistogramEntry = ((u64 *)((*h)->mib.AccessHistogram))[j];
       Ptr = WriteBytes(HistogramEntry, Ptr);
     }
-    if (MIB.AccessHistogramSize > 0) {
-      InternalFree((void *)MIB.AccessHistogram);
+    if ((*h)->mib.AccessHistogramSize > 0) {
+      InternalFree((void *)((*h)->mib.AccessHistogram));
     }
   }
   CHECK(ExpectedNumBytes >= static_cast<u64>(Ptr - Buffer) &&
@@ -252,7 +249,7 @@ u64 SerializeToRawProfile(MIBMapTy &MIBMap, ArrayRef<LoadedModule> Modules,
       },
       reinterpret_cast<void *>(&TotalAccessHistogramEntries));
   const u64 NumHistogramBytes =
-      RoundUpTo(TotalAccessHistogramEntries * sizeof(uint16_t), 8);
+      RoundUpTo(TotalAccessHistogramEntries * sizeof(uint64_t), 8);
 
   const u64 NumStackBytes = RoundUpTo(StackSizeBytes(StackIds), 8);
 

compiler-rt/lib/memprof/tests/CMakeLists.txt

@@ -26,7 +26,6 @@ set(MEMPROF_SOURCES
   ../memprof_rawprofile.cpp)
 
 set(MEMPROF_UNITTESTS
-  histogram_encoding.cpp
   rawprofile.cpp
   driver.cpp)
 

compiler-rt/lib/memprof/tests/histogram_encoding.cpp

@@ -8,7 +8,15 @@
 
 def get_builder(platform):
     """Returns a Builder instance for the given platform."""
-    if platform == "darwin":
+    if platform in [
+        "bridgeos",
+        "darwin",
+        "ios",
+        "macosx",
+        "tvos",
+        "watchos",
+        "xros",
+    ]:
         from .darwin import BuilderDarwin
 
         return BuilderDarwin()

compiler-rt/test/memprof/TestCases/memprof_histogram_uint8.cpp

@@ -229,7 +229,8 @@ def hasChattyStderr(test_case):
 
 
 def builder_module():
-    return get_builder(sys.platform)
+    """Return the builder for the target platform."""
+    return get_builder(getPlatform())
 
 
 def getArchitecture():

lldb/packages/Python/lldbsuite/test/builders/__init__.py

@@ -1517,7 +1517,7 @@ def build(
         testname = self.getBuildDirBasename()
 
         module = builder_module()
-        command = builder_module().getBuildCommand(
+        command = module.getBuildCommand(
             debug_info,
             architecture,
             compiler,

lldb/packages/Python/lldbsuite/test/lldbplatformutil.py

@@ -546,11 +546,12 @@ class LTO {
   // resolutions used by a single input module. Functions return ranges refering
   // to the resolutions for the remaining modules in the InputFile.
   Expected<ArrayRef<SymbolResolution>>
-  addModule(InputFile &Input, unsigned ModI, ArrayRef<SymbolResolution> Res);
+  addModule(InputFile &Input, ArrayRef<SymbolResolution> InputRes,
+            unsigned ModI, ArrayRef<SymbolResolution> Res);
 
   Expected<std::pair<RegularLTOState::AddedModule, ArrayRef<SymbolResolution>>>
-  addRegularLTO(InputFile &Input, BitcodeModule BM,
-                ArrayRef<InputFile::Symbol> Syms,
+  addRegularLTO(InputFile &Input, ArrayRef<SymbolResolution> InputRes,
+                BitcodeModule BM, ArrayRef<InputFile::Symbol> Syms,
                 ArrayRef<SymbolResolution> Res);
   Error linkRegularLTO(RegularLTOState::AddedModule Mod,
                        bool LivenessFromIndex);

lldb/packages/Python/lldbsuite/test/lldbtest.py

@@ -33,10 +33,11 @@
    (uint64_t)'o' << 24 | (uint64_t)'f' << 16 | (uint64_t)'r' << 8 | (uint64_t)129)
 
 // The version number of the raw binary format.
-#define MEMPROF_RAW_VERSION 5ULL
+#define MEMPROF_RAW_VERSION 4ULL
 
 // Currently supported versions.
-#define MEMPROF_RAW_SUPPORTED_VERSIONS {3ULL, 4ULL, 5ULL}
+#define MEMPROF_RAW_SUPPORTED_VERSIONS                                         \
+  { 3ULL, 4ULL }
 
 #define MEMPROF_V3_MIB_SIZE 132ULL;
 
@@ -228,41 +229,6 @@ void Merge(const MemInfoBlock &newMIB) {
 } __attribute__((__packed__));
 #endif
 
-constexpr int MantissaBits = 12;
-constexpr int ExponentBits = 4;
-constexpr uint16_t MaxMantissa = (1U << MantissaBits) - 1;
-constexpr uint16_t MaxExponent = (1U << ExponentBits) - 1;
-constexpr uint64_t MaxRepresentableValue = static_cast<uint64_t>(MaxMantissa)
-                                           << MaxExponent;
-
-// Encodes a 64-bit unsigned integer into a 16-bit scaled integer format.
-inline uint16_t encodeHistogramCount(uint64_t Count) {
-  if (Count == 0)
-    return 0;
-
-  if (Count > MaxRepresentableValue)
-    Count = MaxRepresentableValue;
-
-  if (Count <= MaxMantissa)
-    return Count;
-
-  uint64_t M = Count;
-  uint16_t E = 0;
-  while (M > MaxMantissa) {
-    M = (M + 1) >> 1;
-    E++;
-  }
-  return (E << MantissaBits) | static_cast<uint16_t>(M);
-}
-
-// Decodes a 16-bit scaled integer and returns the
-// decoded 64-bit unsigned integer.
-inline uint64_t decodeHistogramCount(uint16_t EncodedValue) {
-  const uint16_t E = EncodedValue >> MantissaBits;
-  const uint16_t M = EncodedValue & MaxMantissa;
-  return static_cast<uint64_t>(M) << E;
-}
-
 } // namespace memprof
 } // namespace llvm