Skip to content

feat: Add support for M5 Pro chips #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DevHwan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: Add support for M5 Pro chips #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions fluidtop/parsers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import math


def parse_thermal_pressure(powermetrics_parse):
return powermetrics_parse["thermal_pressure"]

Expand All @@ -26,25 +27,44 @@ def parse_cpu_metrics(powermetrics_parse):
core = e_core if name[0] == 'E' else p_core
core.append(cpu["cpu"])
cpu_idle_ratio = cpu["idle_ratio"]

if math.isnan(cpu_idle_ratio):
cpu_idle_ratio = 0
cpu_metric_dict[name + str(cpu["cpu"]) + "_active"] = int((1 - cpu_idle_ratio) * 100)

cpu_metric_dict["e_core"] = e_core
cpu_metric_dict["p_core"] = p_core
if "E-Cluster_active" not in cpu_metric_dict:
# M1 Ultra
cpu_metric_dict["E-Cluster_active"] = int(
(cpu_metric_dict["E0-Cluster_active"] + cpu_metric_dict["E1-Cluster_active"])/2)
if (
"E0-Cluster_active" in cpu_metric_dict
and "E1-Cluster_active" in cpu_metric_dict
):
cpu_metric_dict["E-Cluster_active"] = int(
(
cpu_metric_dict["E0-Cluster_active"]
+ cpu_metric_dict["E1-Cluster_active"]
)
/ 2
)
if "P-Cluster_active" not in cpu_metric_dict:
if "P2-Cluster_active" in cpu_metric_dict:
# M1 Ultra
cpu_metric_dict["P-Cluster_active"] = int((cpu_metric_dict["P0-Cluster_active"] + cpu_metric_dict["P1-Cluster_active"] +
cpu_metric_dict["P2-Cluster_active"] + cpu_metric_dict["P3-Cluster_active"]) / 4)
else:
elif (
"P0-Cluster_active" in cpu_metric_dict
and "P1-Cluster_active" in cpu_metric_dict
):
cpu_metric_dict["P-Cluster_active"] = int(
(cpu_metric_dict["P0-Cluster_active"] + cpu_metric_dict["P1-Cluster_active"])/2)
# Handle M5 Pro and other newer chips with M0/M1 cluster naming
if (
"M0-Cluster_active" in cpu_metric_dict
and "M1-Cluster_active" in cpu_metric_dict
):
cpu_metric_dict["E-Cluster_active"] = int(
(cpu_metric_dict["M0-Cluster_active"] + cpu_metric_dict["M1-Cluster_active"]) / 2)
# power
cpu_metric_dict["ane_W"] = cpu_metrics["ane_energy"]/1000
#cpu_metric_dict["dram_W"] = cpu_metrics["dram_energy"]/1000
Expand Down
3 changes: 3 additions & 0 deletions fluidtop/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,9 @@ def get_soc_info():
elif soc_info["name"] == "Apple M4 Pro":
soc_info["cpu_max_power"] = 42
soc_info["gpu_max_power"] = 23
elif soc_info["name"] == "Apple M5 Pro": # Estimated
soc_info["cpu_max_power"] = 45
soc_info["gpu_max_power"] = 25
elif soc_info["name"] == "Apple M4 Max":
soc_info["cpu_max_power"] = 68
soc_info["gpu_max_power"] = 57
Expand Down