Skip to content

stdlib: Wattson: Add MT6858 support #5910

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

Draft
wusamuel6 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

stdlib: Wattson: Add MT6858 support #5910

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
2 changes: 2 additions & 0 deletions Android.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18216,6 +18216,7 @@ filegroup {
genrule {
name: "perfetto_src_trace_processor_plugins_wattson_gen_cpu_1d_curves",
srcs: [
"src/trace_processor/plugins/wattson/data/MT6858/cpu_1d.csv",
"src/trace_processor/plugins/wattson/data/MT6897/cpu_1d.csv",
"src/trace_processor/plugins/wattson/data/SM8750/cpu_1d.csv",
"src/trace_processor/plugins/wattson/data/SXR2230P/cpu_1d.csv",
Expand All @@ -18239,6 +18240,7 @@ genrule {
genrule {
name: "perfetto_src_trace_processor_plugins_wattson_gen_cpu_2d_curves",
srcs: [
"src/trace_processor/plugins/wattson/data/MT6858/cpu_2d.csv",
"src/trace_processor/plugins/wattson/data/MT6897/cpu_2d.csv",
"src/trace_processor/plugins/wattson/data/SXR2230P/cpu_2d.csv",
"src/trace_processor/plugins/wattson/data/Tensor/cpu_2d.csv",
Expand Down
2 changes: 2 additions & 0 deletions BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4902,6 +4902,7 @@ perfetto_cpp_blob_header(
name = "src_trace_processor_plugins_wattson_gen_cpu_1d_curves",
script = ":src_trace_processor_plugins_wattson_gen_wattson_curves_py",
deps = [
"src/trace_processor/plugins/wattson/data/MT6858/cpu_1d.csv",
"src/trace_processor/plugins/wattson/data/MT6897/cpu_1d.csv",
"src/trace_processor/plugins/wattson/data/SM8750/cpu_1d.csv",
"src/trace_processor/plugins/wattson/data/SXR2230P/cpu_1d.csv",
Expand All @@ -4928,6 +4929,7 @@ perfetto_cpp_blob_header(
name = "src_trace_processor_plugins_wattson_gen_cpu_2d_curves",
script = ":src_trace_processor_plugins_wattson_gen_wattson_curves_py",
deps = [
"src/trace_processor/plugins/wattson/data/MT6858/cpu_2d.csv",
"src/trace_processor/plugins/wattson/data/MT6897/cpu_2d.csv",
"src/trace_processor/plugins/wattson/data/SXR2230P/cpu_2d.csv",
"src/trace_processor/plugins/wattson/data/Tensor/cpu_2d.csv",
Expand Down
54 changes: 42 additions & 12 deletions src/trace_processor/perfetto_sql/stdlib/wattson/device_infos.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,17 @@ WITH
"SXR2230P",
3,
0
), ("SXR2230P", 4, 0), ("SXR2230P", 5, 0), ("MT6897", 0, 0),
), ("SXR2230P", 4, 0), ("SXR2230P", 5, 0), ("MT6858", 0, 0),
(
"MT6858",
2,
0
), ("MT6858", 3, 0), ("MT6858", 4, 0), ("MT6858", 0, 0),
(
"MT6858",
2,
0
), ("MT6858", 3, 0), ("MT6858", 4, 0), ("MT6897", 0, 0),
(
"MT6897",
1,
Expand Down Expand Up @@ -198,6 +208,16 @@ WITH
"SXR2230P",
5,
2
), ("MT6858", 0, 0), ("MT6858", 1, 0), ("MT6858", 2, 0),
(
"MT6858",
3,
0
), ("MT6858", 4, 4), ("MT6858", 5, 4), ("MT6858", 6, 4),
(
"MT6858",
7,
4
), ("MT6897", 0, 0), ("MT6897", 1, 0), ("MT6897", 2, 0),
(
"MT6897",
Expand Down Expand Up @@ -292,27 +312,37 @@ WITH
SELECT *
FROM (
VALUES
("MT6897", 4294967295, -1), ("MT6897", 0, 0), ("MT6897", 1, 1),
("MT6858", 4294967295, -1), ("MT6858", 0, 0), ("MT6858", 1, 1),
(
"MT6897",
"MT6858",
2,
1
), ("MT6897", 3, 1), ("MT6897", 4, 1), ("MT6897", 5, 1),
), ("MT6858", 3, 1), ("MT6858", 4, 1), ("MT6858", 5, 1),
(
"MT6897",
4294967295,
-1
), ("MT6897", 0, 0), ("MT6897", 1, 1), ("MT6897", 2, 1),
(
"MT6897",
3,
1
), ("MT6897", 4, 1), ("MT6897", 5, 1), ("MT6897", 6, 1),
(
"MT6897",
6,
7,
1
), ("MT6897", 7, 1), ("MT6897", 8, 1), ("neo", 4294967295, -1),
), ("MT6897", 8, 1), ("neo", 4294967295, -1), ("neo", 0, 0),
(
"neo",
0,
0
), ("neo", 1, 1), ("neo", 2, 1), ("SXR2230P", 4294967295, -1),
1,
1
), ("neo", 2, 1), ("SXR2230P", 4294967295, -1), ("SXR2230P", 0, 0),
(
"SXR2230P",
0,
0
), ("SXR2230P", 1, 1), ("SXR2230P", 2, 1)
1,
1
), ("SXR2230P", 2, 1)
) AS _values
)
SELECT * FROM data;
Expand Down
2 changes: 2 additions & 0 deletions src/trace_processor/plugins/wattson/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ assert(enable_perfetto_trace_processor_sqlite)
# Per (device, curve_type) CSVs. Each curve_type's compressed blob is the
# union of the rows in every device folder for that curve type.
_cpu_1d_csvs = [
"data/MT6858/cpu_1d.csv",
"data/MT6897/cpu_1d.csv",
"data/SM8750/cpu_1d.csv",
"data/SXR2230P/cpu_1d.csv",
Expand All @@ -31,6 +32,7 @@ _cpu_1d_csvs = [
]

_cpu_2d_csvs = [
"data/MT6858/cpu_2d.csv",
"data/MT6897/cpu_2d.csv",
"data/SXR2230P/cpu_2d.csv",
"data/Tensor/cpu_2d.csv",
Expand Down
22 changes: 22 additions & 0 deletions src/trace_processor/plugins/wattson/data/MT6858/cpu_1d.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
device,policy,freq_khz,static,active,idle0,idle1
MT6858,4,650000,1.1386,60.6556,7.5104,0
MT6858,4,750000,1.304,71.3334,7.8943,0
MT6858,4,850000,1.4655,84.812,8.1808,0
MT6858,4,950000,1.6391,93.6685,8.3934,0
MT6858,4,1050000,2.224,104.6398,8.8742,0
MT6858,4,1150000,2.6479,118.3516,9.3298,0
MT6858,4,1250000,3.0331,131.6322,9.8346,0
MT6858,4,1350000,3.268,148.311,10.7105,0
MT6858,4,1450000,3.3719,160.4505,11.2647,0
MT6858,4,1550000,3.8592,173.3761,11.6681,0
MT6858,4,1650000,3.9657,189.948,12.8093,0
MT6858,4,1750000,3.959,210.5521,13.8274,0
MT6858,4,1850000,5.1282,233.4979,14.8081,0
MT6858,4,1950000,5.6811,260.1345,15.7147,0
MT6858,4,2050000,5.8171,287.7143,17.7507,0
MT6858,4,2150000,6.2023,306.321,18.4799,0
MT6858,4,2200000,6.8567,328.0594,19.7865,0
MT6858,4,2250000,7.2829,339.8951,20.1197,0
MT6858,4,2300000,7.7004,358.6947,21.226,0
MT6858,4,2350000,7.8282,416.6683,22.299,0
MT6858,4,2400000,7.9761,429.4358,23.1189,0
Loading
Loading