Skip to content

Implement M3 (Max) in asitop #74

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
hughescr wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Implement M3 (Max) in asitop #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23e05b7
M3 Max power and bandwidth data (for the M3 Max 128GB version anyway …
hughescr Apr 18, 2024
2d4cc4a
Do a better job generically calculating E-core and P-core activity to…
hughescr Apr 18, 2024
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
34 changes: 20 additions & 14 deletions asitop/asitop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,21 @@ def main():
e_core_count = soc_info_dict["e_core_count"]
e_core_gauges = [VGauge(val=0, color=args.color, border_color=args.color) for _ in range(e_core_count)]
p_core_count = soc_info_dict["p_core_count"]
p_core_gauges = [VGauge(val=0, color=args.color, border_color=args.color) for _ in range(min(p_core_count, 8))]
p_core_split = [HSplit(
*p_core_gauges,
)]
if p_core_count > 8:
p_core_gauges_ext = [VGauge(val=0, color=args.color, border_color=args.color) for _ in range(p_core_count - 8)]
p_core_gauges = [VGauge(val=0, color=args.color, border_color=args.color) for _ in range(min(p_core_count, int(p_core_count/2)))]
p_core_split = [HSplit(
*p_core_gauges,
)]
p_core_gauges_ext = [VGauge(val=0, color=args.color, border_color=args.color) for _ in range(p_core_count - int(p_core_count/2))]
p_core_split.append(HSplit(
*p_core_gauges_ext,
))
else:
p_core_gauges = [VGauge(val=0, color=args.color, border_color=args.color) for _ in range(min(p_core_count, 8))]
p_core_split = [HSplit(
*p_core_gauges,
)]

processor_gauges = [cpu1_gauge,
HSplit(*e_core_gauges),
cpu2_gauge,
Expand Down Expand Up @@ -194,18 +200,18 @@ def get_avg(inlist):

cpu1_gauge.title = "".join([
"E-CPU Usage: ",
str(cpu_metrics_dict["E-Cluster_active"]),
'%0.2f' % cpu_metrics_dict["E-Cluster_active"],
"% @ ",
str(cpu_metrics_dict["E-Cluster_freq_Mhz"]),
'%d' % cpu_metrics_dict["E-Cluster_freq_Mhz"],
" MHz"
])
cpu1_gauge.value = cpu_metrics_dict["E-Cluster_active"]

cpu2_gauge.title = "".join([
"P-CPU Usage: ",
str(cpu_metrics_dict["P-Cluster_active"]),
'%0.2f' % cpu_metrics_dict["P-Cluster_active"],
"% @ ",
str(cpu_metrics_dict["P-Cluster_freq_Mhz"]),
'%d' % cpu_metrics_dict["P-Cluster_freq_Mhz"],
" MHz"
])
cpu2_gauge.value = cpu_metrics_dict["P-Cluster_active"]
Expand All @@ -215,20 +221,20 @@ def get_avg(inlist):
for i in cpu_metrics_dict["e_core"]:
e_core_gauges[core_count % 4].title = "".join([
"Core-" + str(i + 1) + " ",
str(cpu_metrics_dict["E-Cluster" + str(i) + "_active"]),
'%0.2f' % cpu_metrics_dict["E-Cluster" + str(i) + "_active"],
"%",
])
e_core_gauges[core_count % 4].value = cpu_metrics_dict["E-Cluster" + str(i) + "_active"]
core_count += 1
core_count = 0
for i in cpu_metrics_dict["p_core"]:
core_gauges = p_core_gauges if core_count < 8 else p_core_gauges_ext
core_gauges[core_count % 8].title = "".join([
core_gauges = p_core_gauges if core_count < int(p_core_count/2) else p_core_gauges_ext
core_gauges[core_count % int(p_core_count/2)].title = "".join([
("Core-" if p_core_count < 6 else 'C-') + str(i + 1) + " ",
str(cpu_metrics_dict["P-Cluster" + str(i) + "_active"]),
'%0.2f' % cpu_metrics_dict["P-Cluster" + str(i) + "_active"],
"%",
])
core_gauges[core_count % 8].value = cpu_metrics_dict["P-Cluster" + str(i) + "_active"]
core_gauges[core_count % int(p_core_count/2)].value = cpu_metrics_dict["P-Cluster" + str(i) + "_active"]
core_count += 1

gpu_gauge.title = "".join([
Expand Down
44 changes: 14 additions & 30 deletions asitop/parsers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ def parse_cpu_metrics(powermetrics_parse):
cpu_clusters = cpu_metrics["clusters"]
for cluster in cpu_clusters:
name = cluster["name"]
cpu_metric_dict[name+"_freq_Mhz"] = int(cluster["freq_hz"]/(1e6))
cpu_metric_dict[name+"_active"] = int((1 - cluster["idle_ratio"])*100)
for cpu in cluster["cpus"]:
name = 'E-Cluster' if name[0] == 'E' else 'P-Cluster'
core = e_core if name[0] == 'E' else p_core
Expand All @@ -94,34 +92,20 @@ def parse_cpu_metrics(powermetrics_parse):
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 "E-Cluster_freq_Mhz" not in cpu_metric_dict:
# M1 Ultra
cpu_metric_dict["E-Cluster_freq_Mhz"] = max(
cpu_metric_dict["E0-Cluster_freq_Mhz"], cpu_metric_dict["E1-Cluster_freq_Mhz"])
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:
cpu_metric_dict["P-Cluster_active"] = int(
(cpu_metric_dict["P0-Cluster_active"] + cpu_metric_dict["P1-Cluster_active"])/2)
if "P-Cluster_freq_Mhz" not in cpu_metric_dict:
if "P2-Cluster_freq_Mhz" in cpu_metric_dict:
# M1 Ultra
freqs = [
cpu_metric_dict["P0-Cluster_freq_Mhz"],
cpu_metric_dict["P1-Cluster_freq_Mhz"],
cpu_metric_dict["P2-Cluster_freq_Mhz"],
cpu_metric_dict["P3-Cluster_freq_Mhz"]]
cpu_metric_dict["P-Cluster_freq_Mhz"] = max(freqs)
else:
cpu_metric_dict["P-Cluster_freq_Mhz"] = max(
cpu_metric_dict["P0-Cluster_freq_Mhz"], cpu_metric_dict["P1-Cluster_freq_Mhz"])
freq_sum = 0
active_sum = 0
for cpu in e_core:
freq_sum += cpu_metric_dict['E-Cluster' + str(cpu) + '_freq_Mhz'] * cpu_metric_dict['E-Cluster' + str(cpu) + '_active']/100
active_sum += cpu_metric_dict['E-Cluster' + str(cpu) + '_active']
cpu_metric_dict['E-Cluster_freq_Mhz'] = freq_sum / (active_sum/100)
cpu_metric_dict['E-Cluster_active'] = active_sum / len(e_core)
freq_sum = 0
active_sum = 0
for cpu in p_core:
freq_sum += cpu_metric_dict['P-Cluster' + str(cpu) + '_freq_Mhz'] * cpu_metric_dict['P-Cluster' + str(cpu) + '_active']/100
active_sum += cpu_metric_dict['P-Cluster' + str(cpu) + '_active']
cpu_metric_dict['P-Cluster_freq_Mhz'] = freq_sum / (active_sum/100)
cpu_metric_dict['P-Cluster_active'] = active_sum / len(p_core)
# power
cpu_metric_dict["ane_W"] = cpu_metrics["ane_energy"]/1000
#cpu_metric_dict["dram_W"] = cpu_metrics["dram_energy"]/1000
Expand Down
6 changes: 6 additions & 0 deletions asitop/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@ def get_soc_info():
elif soc_info["name"] == "Apple M2":
soc_info["cpu_max_power"] = 25
soc_info["gpu_max_power"] = 15
elif soc_info["name"] == "Apple M3 Max":
soc_info["cpu_max_power"] = 54
soc_info["gpu_max_power"] = 47
else:
soc_info["cpu_max_power"] = 20
soc_info["gpu_max_power"] = 20
Expand All @@ -182,6 +185,9 @@ def get_soc_info():
elif soc_info["name"] == "Apple M2":
soc_info["cpu_max_bw"] = 100
soc_info["gpu_max_bw"] = 100
elif soc_info["name"] == "Apple M3 Max":
soc_info["cpu_max_bw"] = 400
soc_info["gpu_max_bw"] = 400
else:
soc_info["cpu_max_bw"] = 70
soc_info["gpu_max_bw"] = 70
Expand Down