Merge 5ac6d438fa into 36fdfa2694

Optimized autoconfig for AMD CPUs with < 2 MB L3 cache per thread

src/backend/cpu/platform/HwlocCpuInfo.cpp

@@ -320,11 +320,16 @@ void xmrig::HwlocCpuInfo::processTopLevelCache(hwloc_obj_t cache, const Algorith
             L2 += l2->attr->cache.size;
             L2_associativity = l2->attr->cache.associativity;
 
-            if (L3_exclusive && l2->attr->cache.size >= scratchpad) {
+            if (L3_exclusive) {
+                if (vendor() == VENDOR_AMD) {
+                    extra += std::min<size_t>(l2->attr->cache.size, scratchpad);
+                }
+                else if (l2->attr->cache.size >= scratchpad) {
                     extra += scratchpad;
                 }
             }
         }
+    }
 
     // This code is supposed to run only on Intel CPUs
     if ((vendor() == VENDOR_INTEL) && (scratchpad == 2 * oneMiB)) {

src/base/kernel/Platform_unix.cpp

@@ -169,6 +169,12 @@ bool xmrig::Platform::isOnBatteryPower()
             return (status == "Discharging");
         }
     }
+    std::ifstream f("/sys/class/power_supply/macsmc-battery/status");
+    if (f.is_open()) {
+        std::string status;
+        f >> status;
+        return (status == "Discharging");
+    }
     return false;
 }