r0.6

Author: trulyspinach

AMD Power Gadget/Base.lproj/Main.storyboard

@@ -1025,14 +1025,11 @@
                                                                             </connections>
                                                                         </button>
                                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="arp-oH-qjj">
-                                                                            <rect key="frame" x="24" y="43" width="520" height="192"/>
+                                                                            <rect key="frame" x="24" y="153" width="520" height="84"/>
                                                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                                             <textFieldCell key="cell" allowsUndo="NO" alignment="left" id="AIb-f9-EZB">
                                                                                 <font key="font" size="12" name="HelveticaNeue"/>
-                                                                                <string key="title">When enabled, your processor speed will be adjusted automatically based on a demand value calculated by AMDRyzenCPUPowerManagement. Switching down processor speed will lower its enegry consumption and reduce noise generated by cooling devices.
-
This options serves as a temporary solution to CPU power management due to no active solution are currently available. Comparing to a true active power managment implementation, this option works in a passive way which results in less sensitivity, accuracy and a slow down in performance. For safety reason, this options is disabled after every reboot and need to be enabled manually from this appliation. You don't need to keep this application open for PM to work.
-
-A better solution is still in development.</string>
+                                                                                <mutableString key="title">When enabled, your processor speed will increase automatically on demand, and decrease after a short period of low activity.  Lower amount of enegry will be consumed when processor running at a lower speed; SMCAMDProcessor will always optimze how your processor idle to save enegry.
This option is enabled by default since release version 0.6.</mutableString>
                                                                                 <color key="textColor" red="1" green="1" blue="1" alpha="0.54901960780000003" colorSpace="custom" customColorSpace="sRGB"/>
                                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                             </textFieldCell>
@@ -1049,6 +1046,26 @@ A better solution is still in development.</string>
                                                                                 <segue destination="arI-oH-4xY" kind="sheet" id="PaB-YQ-pfi"/>
                                                                             </connections>
                                                                         </button>
+                                                                        <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LSo-sk-viM">
+                                                                            <rect key="frame" x="24" y="129" width="167" height="18"/>
+                                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                                            <buttonCell key="cell" type="check" title="Enable Low Power State" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="zPp-Te-Sg9">
+                                                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                                                <font key="font" metaFont="system"/>
+                                                                            </buttonCell>
+                                                                            <connections>
+                                                                                <action selector="onLPM:" target="rDh-aT-nig" id="bR7-Os-YPD"/>
+                                                                            </connections>
+                                                                        </button>
+                                                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B1h-CU-8OF">
+                                                                            <rect key="frame" x="24" y="100" width="520" height="28"/>
+                                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                                            <textFieldCell key="cell" allowsUndo="NO" alignment="left" title="Allow automatically shifting down to a low power state that may introduce performance issue." id="uqh-lv-7ht">
+                                                                                <font key="font" size="12" name="HelveticaNeue"/>
+                                                                                <color key="textColor" red="1" green="1" blue="1" alpha="0.54901960780000003" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                            </textFieldCell>
+                                                                        </textField>
                                                                     </subviews>
                                                                 </view>
                                                             </tabViewItem>
@@ -1136,6 +1153,7 @@ A better solution is still in development.</string>
                         <outlet property="cpbEnabledBox" destination="hck-n7-ZB8" id="9Wm-qW-Otj"/>
                         <outlet property="cpbSupportedBox" destination="XVJ-1V-MPd" id="GbR-et-p38"/>
                         <outlet property="cpuFreqGraph" destination="5PL-lX-mWT" id="va5-5g-BLH"/>
+                        <outlet property="lpmBox" destination="LSo-sk-viM" id="Ru9-2s-WAS"/>
                         <outlet property="overviewSpeedShift" destination="LRK-w5-6Kx" id="sBA-SR-DsA"/>
                         <outlet property="topLabel1" destination="VGI-us-87W" id="OQ9-dq-3xk"/>
                         <outlet property="topLabel2" destination="f05-q5-Exd" id="QDN-jE-Rag"/>

AMD Power Gadget/Power Tool/CPUSpeedShiftView.swift

@@ -83,8 +83,10 @@ class CPUSpeedShiftView: NSControl {
         drawGrid(in: dirtyRect, ctx: context)
     }
 
-    func setOptions(newOptions : [String], selection : Int){
-        options = newOptions
+    func setOptions(newOptions : [String]?, selection : Int){
+        if newOptions != nil{
+            options = newOptions!
+        }
         selectedItem = selection
         setNeedsDisplay(bounds)
     }

AMD Power Gadget/Power Tool/PowerToolViewController.swift

@@ -57,9 +57,17 @@ class PowerToolViewController: NSViewController, NSWindowDelegate {
     @IBOutlet weak var asaBox: NSButton!
     @IBAction func onASA(_ sender: Any) {
         ProcessorModel.shared.setPPM(enabled: asaBox.state == .on)
+
+        overviewSpeedShift.setOptions(newOptions: nil, selection: asaBox.state == .on ? -1 : 0)
+
         updateASA()
     }
 
+    @IBOutlet weak var lpmBox: NSButton!
+    @IBAction func onLPM(_ sender: Any) {
+        ProcessorModel.shared.setLPM(enabled: lpmBox.state == .on)
+        updateLPM()
+    }
 
     @IBOutlet weak var topLabel1: NSTextField!
     @IBOutlet weak var topLabel2: NSTextField!
@@ -131,6 +139,7 @@ class PowerToolViewController: NSViewController, NSWindowDelegate {
         instDelta += a.reduce(0, +)
 
         if sumCount >= Int(1 / updateTime) {
+            
             topLabel1.stringValue = String(format: "%.1f Ghz", freqMax * 0.001)
             topLabel2.stringValue = suffixNumber(number: NSNumber(value: instDelta))
 
@@ -144,7 +153,9 @@ class PowerToolViewController: NSViewController, NSWindowDelegate {
     }
 
     @IBAction func onOverviewSpeedStep(_ sender: Any) {
+        ProcessorModel.shared.setPPM(enabled: false)
         ProcessorModel.shared.setPState(state: overviewSpeedShift.selectedItem)
+        updateASA()
     }
 
     func setupOverview() {
@@ -171,7 +182,7 @@ class PowerToolViewController: NSViewController, NSWindowDelegate {
         macOS Version: \(ProcessorModel.shared.systemConfig["os"]!)
         AMDRyzenCPUPowerManagement:
           Version: \(ProcessorModel.shared.AMDRyzenCPUPowerManagementVersion), CPU Supported: \(supported)
-          
+        
         """
         if ProcessorModel.shared.boardValid {
             boardHelpButton.removeFromSuperview()
@@ -182,9 +193,9 @@ class PowerToolViewController: NSViewController, NSWindowDelegate {
         ProcessorModel.shared.refreshPStateDef()
         vaildStatesClock = ProcessorModel.shared.getVaildPStateClocks()
         let pstateCur = ProcessorModel.shared.getPState()
-        
+        let s = ProcessorModel.shared.getPPM()
         let pdt = vaildStatesClock.map{ "\(Int($0))Mhz" }
-        overviewSpeedShift.setOptions(newOptions: pdt, selection: pstateCur)
+        overviewSpeedShift.setOptions(newOptions: pdt, selection: s ? -1 : pstateCur)
     }
 
     func updateCPB() {
@@ -198,6 +209,15 @@ class PowerToolViewController: NSViewController, NSWindowDelegate {
         let s = ProcessorModel.shared.getPPM()
 
         asaBox.state = s ? NSControl.StateValue.on : NSControl.StateValue.off
+        updateLPM()
+    }
+    
+    func updateLPM() {
+        lpmBox.isEnabled = ProcessorModel.shared.getPPM()
+        
+        let s = ProcessorModel.shared.getLPM()
+        
+        lpmBox.state = s ? NSControl.StateValue.on : NSControl.StateValue.off
     }
 
     @IBAction func openGithub(_ sender: Any) {

AMD Power Gadget/ProcessorModel.swift

@@ -77,7 +77,7 @@ class ProcessorModel {
             NSApplication.shared.terminate(self)
         }
 
-//        fetchSupportedProcessor()
+        fetchSupportedProcessor()
     }
 
     func initDriver() -> Bool {
@@ -225,6 +225,11 @@ class ProcessorModel {
         loadPStateDefClock()
     }
 
+    func getHPCpus() -> Int{
+        let o = kernelGetUInt64(count: 1, selector: 17)
+        return Int(o[0])
+    }
+    
     func setPState(state : Int) {
         var input: [UInt64] = [UInt64(state)]
         let res = IOConnectCallMethod(connect, 10, &input, 1, nil, 0,
@@ -299,6 +304,23 @@ class ProcessorModel {
         }
     }
 
+    func getLPM() -> Bool {
+        let o = kernelGetUInt64(count: 1, selector: 18)
+        return o[0] == 0 ? false : true
+    }
+    
+    func setLPM(enabled : Bool){
+        var input: [UInt64] = [UInt64(enabled ? 1 : 0)]
+        let res = IOConnectCallMethod(connect, 19, &input, 1, nil, 0,
+                                      nil, nil,
+                                      nil, nil)
+        
+        if res != KERN_SUCCESS {
+            print(String(cString: mach_error_string(res)))
+            return
+        }
+    }
+    
     func getInstructionDelta() -> [UInt64]{
         let o = kernelGetUInt64(count: 1, selector: 5)
         return [o[0]]

AMDRyzenCPUPowerManagement/AMDRyzenCPUPMUserClient.cpp

@@ -303,7 +303,7 @@ IOReturn AMDRyzenCPUPMUserClient::externalMethod(uint32_t selector, IOExternalMe
 
             uint64_t *dataOut = (uint64_t*) arguments->structureOutput;
 
-            dataOut[0] = (uint64_t)fProvider->PPMEnabled;
+            dataOut[0] = (uint64_t)(fProvider->getPMPStateLimit() == 0 ? 0 : 1);
             break;
         }
 
@@ -315,12 +315,9 @@ IOReturn AMDRyzenCPUPMUserClient::externalMethod(uint32_t selector, IOExternalMe
             if(arguments->scalarInputCount != 1)
                 return kIOReturnBadArgument;
 
-            fProvider->PPMEnabled = arguments->scalarInput[0]==1?true:false;
+            boolean_t enabled = arguments->scalarInput[0]==1?true:false;
 
-            if(!fProvider->PPMEnabled){
-                fProvider->PStateCtl = 0;
-                fProvider->applyPowerControl();
-            }
+            fProvider->setPMPStateLimit(enabled ? 1 : 0);
 
             break;
         }
@@ -363,6 +360,44 @@ IOReturn AMDRyzenCPUPMUserClient::externalMethod(uint32_t selector, IOExternalMe
             break;
         }
 
+        case 17: {
+            arguments->scalarOutputCount = 0;
+                
+            arguments->structureOutputSize = 1 * sizeof(uint64_t);
+                
+            uint64_t *dataOut = (uint64_t*) arguments->structureOutput;
+
+            dataOut[0] = (uint64_t)(fProvider->getHPcpus());
+            break;
+        }
+        
+        //Get LPM
+        case 18: {
+            arguments->scalarOutputCount = 0;
+                
+            arguments->structureOutputSize = 1 * sizeof(uint64_t);
+                
+            uint64_t *dataOut = (uint64_t*) arguments->structureOutput;
+
+            dataOut[0] = (uint64_t)(fProvider->getPMPStateLimit() == 2 ? 1 : 0);
+            break;
+        }
+            
+        //Set LPM
+        case 19: {
+            arguments->scalarOutputCount = 0;
+            arguments->structureOutputSize = 0;
+                
+            if(arguments->scalarInputCount != 1)
+                return kIOReturnBadArgument;
+                
+            boolean_t enabled = arguments->scalarInput[0]==1?true:false;
+            
+            fProvider->setPMPStateLimit(enabled ? 2 : 1);
+            
+            break;
+        }
+            
         default: {
             IOLog("AMDCPUSupportUserClient::externalMethod: invalid method.\n");
             break;

AMDRyzenCPUPowerManagement/AMDRyzenCPUPowerManagement.cpp

@@ -293,8 +293,6 @@ bool AMDRyzenCPUPowerManagement::start(IOService *provider){
             provider->calculateEffectiveFrequency(physical);
 
         }, provider);
-
-        if(provider->PPMEnabled) provider->updatePowerControl();
 
         //Read stats from package.
         provider->updatePackageTemp();
@@ -314,7 +312,7 @@ bool AMDRyzenCPUPowerManagement::start(IOService *provider){
 
         provider->actualUpdateTimeInterval = now - provider->timeOfLastUpdate;
         provider->timeOfLastUpdate = now;
-        provider->updateTimeInterval = min(provider->PPMEnabled? 320 : 1200, max(50, newInt));
+        provider->updateTimeInterval = min(1200, max(50, newInt));
 
         provider->timerEventSource->setTimeoutMS(provider->updateTimeInterval);
 //        IOLog("est time: %d\n", provider->estimatedRequestTimeInterval);
@@ -485,7 +483,7 @@ void AMDRyzenCPUPowerManagement::updateInstructionDelta(uint8_t cpu_num){
     //Skip if overflowed
     if(lastInstructionDelta_perCore[cpu_num] > insCount) return;
 
-    uint64_t delta = insCount - lastInstructionDelta_perCore[cpu_num];
+//    uint64_t delta = insCount - lastInstructionDelta_perCore[cpu_num];
     instructionDelta_PerCore[cpu_num] = insCount - lastInstructionDelta_perCore[cpu_num];
 
     lastInstructionDelta_perCore[cpu_num] = insCount;
@@ -509,30 +507,6 @@ void AMDRyzenCPUPowerManagement::applyPowerControl(){
     }, nullptr, this);
 }
 
-void AMDRyzenCPUPowerManagement::updatePowerControl(){
-    //Passive PM
-    float loadMax = 0;
-    bool inc = false;
-    int shouldStep = PStateCtl;
-    for (int i = 0; i < totalNumberOfPhysicalCores; i++) {
-        if(loadIndex_PerCore[i] >= PStateStepUpRatio){
-            shouldStep = max(shouldStep - 1, 0);
-            inc = true;
-            break;
-        }
-        
-        loadMax = max(loadMax, loadIndex_PerCore[i]);
-    }
-    if(!inc && loadMax <= PStateStepDownRatio)
-        shouldStep = min(PStateCtl + 1, PStateEnabledLen-1);
-    
-    if(shouldStep == PStateCtl) return;
-    
-    PStateCtl = shouldStep;
-    
-    applyPowerControl();
-}
-
 void AMDRyzenCPUPowerManagement::setCPBState(bool enabled){
     if(!cpbSupported) return;
 
@@ -654,7 +628,6 @@ void AMDRyzenCPUPowerManagement::writePstate(const uint64_t *buf){
     //A bit hacky but at least works for now.
     void* args[] = {this, (void*)buf};
 
-
 
     mp_rendezvous(nullptr, [](void *obj) {
         auto v = static_cast<uint64_t*>(((uint64_t**)obj)[1]);
@@ -680,6 +653,21 @@ void AMDRyzenCPUPowerManagement::writePstate(const uint64_t *buf){
 
 }
 
+uint32_t AMDRyzenCPUPowerManagement::getPMPStateLimit(){
+    return pmRyzen_pstatelimit;
+}
+
+void AMDRyzenCPUPowerManagement::setPMPStateLimit(uint32_t state){
+    pmRyzen_pstatelimit = min(2, state);
+    if(state > 0){
+        pmRyzen_PState_reset();
+    }
+}
+
+uint32_t AMDRyzenCPUPowerManagement::getHPcpus(){
+    return pmRyzen_hpcpus;
+}
+
 EXPORT extern "C" kern_return_t ADDPR(kern_start)(kmod_info_t *, void *) {
     // Report success but actually do not start and let I/O Kit unload us.
     // This works better and increases boot speed in some cases.

AMDRyzenCPUPowerManagement/AMDRyzenCPUPowerManagement.hpp

@@ -134,7 +134,6 @@ class AMDRyzenCPUPowerManagement : public IOService {
     void calculateEffectiveFrequency(uint8_t physical);
     void updateInstructionDelta(uint8_t physical);
     void applyPowerControl();
-    void updatePowerControl();
 
     void setCPBState(bool enabled);
     bool getCPBState();
@@ -147,6 +146,11 @@ class AMDRyzenCPUPowerManagement : public IOService {
     void dumpPstate();
     void writePstate(const uint64_t *buf);
 
+    uint32_t getPMPStateLimit();
+    void setPMPStateLimit(uint32_t);
+    
+    uint32_t getHPcpus();
+    
     uint32_t totalNumberOfPhysicalCores;
     uint32_t totalNumberOfLogicalCores;
 
@@ -182,7 +186,6 @@ class AMDRyzenCPUPowerManagement : public IOService {
 
     float loadIndex_PerCore[CPUInfo::MaxCpus];
 
-    bool PPMEnabled = false;
     float PStateStepUpRatio = 0.36;
     float PStateStepDownRatio = 0.05;