diff --git a/ipynb/energy/EnergyModel_ClusterEnergy.ipynb b/ipynb/energy/EnergyModel_ClusterEnergy.ipynb index cd46046f0531a1fbf7384b41c00bd8a392e11b4c..9fdf82712aaeaf2abf866caaa0e75e2ece6c8abe 100644 --- a/ipynb/energy/EnergyModel_ClusterEnergy.ipynb +++ b/ipynb/energy/EnergyModel_ClusterEnergy.ipynb @@ -102,12 +102,12 @@ " \"emeter\" : {\n", " 'instrument' : 'hwmon',\n", " 'conf' : {\n", - " 'sites' : [ 'a53', 'a57' ],\n", + " 'sites' : [ 'BOARDLITTLE', 'BOARDBIG' ],\n", " 'kinds' : [ 'energy' ],\n", " },\n", " 'channel_map' : {\n", - " 'little' : 'a53',\n", - " 'big' : 'a57',\n", + " 'little' : 'BOARDLITTLE',\n", + " 'big' : 'BOARDBIG',\n", " }\n", " },\n", " \n", diff --git a/ipynb/tutorial/04_ExecutorUsage.ipynb b/ipynb/tutorial/04_ExecutorUsage.ipynb index 239f609c4a0f2cfd44b7a1be5f5ff7f8169f7ad5..1e93ce22614b5cdd76b74db2267c7295a7eac5f5 100644 --- a/ipynb/tutorial/04_ExecutorUsage.ipynb +++ b/ipynb/tutorial/04_ExecutorUsage.ipynb @@ -68,7 +68,7 @@ "text": [ "2016-11-17 17:00:31,811 INFO : Target - Using base path: /home/bjackman/sources/lisa\n", "2016-11-17 17:00:31,812 INFO : Target - Loading custom (inline) target configuration\n", - "2016-11-17 17:00:31,812 DEBUG : Target - Target configuration {'username': 'brendan', 'platform': 'linux', 'host': '192.168.0.1', 'ftrace': {'buffsize': 81920, 'events': ['sched_switch', 'sched_wakeup', 'sched_wakeup_new', 'cpu_frequency']}, 'board': 'juno2', 'modules': ['bl', 'cpufreq'], 'password': 'test0000', 'tools': ['trace-cmd', 'perf'], 'results_dir': 'ExecutorExample'}\n", + "2016-11-17 17:00:31,812 DEBUG : Target - Target configuration {'username': 'brendan', 'platform': 'linux', 'host': '192.168.0.1', 'ftrace': {'buffsize': 81920, 'events': ['sched_switch', 'sched_wakeup', 'sched_wakeup_new', 'cpu_frequency']}, 'board': 'juno', 'modules': ['bl', 'cpufreq'], 'password': 'test0000', 'tools': ['trace-cmd', 'perf'], 'results_dir': 'ExecutorExample'}\n", "2016-11-17 17:00:31,813 INFO : Target - Devlib modules to load: ['bl', 'cpufreq', 'hwmon']\n", "2016-11-17 17:00:31,814 INFO : Target - Connecting linux target:\n", "2016-11-17 17:00:31,815 INFO : Target - username : brendan\n", @@ -145,7 +145,7 @@ "2016-11-17 17:01:03,868 DEBUG : cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies\n", "2016-11-17 17:01:04,276 DEBUG : sudo -- sh -c 'cat '\\''/sys/devices/system/cpu/online'\\'''\n", "2016-11-17 17:01:05,181 DEBUG : cat /sys/devices/system/cpu/cpu1/cpufreq/scaling_available_frequencies\n", - "2016-11-17 17:01:05,490 DEBUG : Platform - Trying to load default EM from /home/bjackman/sources/lisa/libs/utils/platforms/juno2.json\n", + "2016-11-17 17:01:05,490 DEBUG : Platform - Trying to load default EM from /home/bjackman/sources/lisa/libs/utils/platforms/juno.json\n", "2016-11-17 17:01:05,491 DEBUG : Platform - Platform descriptor initialized\n", "{'nrg_model': None, 'clusters': {'big': [1, 2], 'little': [0, 3, 4, 5]}, 'cpus_count': 6, 'freqs': {'big': [450000, 625000, 800000, 950000, 1100000], 'little': [450000, 575000, 700000, 775000, 850000]}, 'topology': [[0, 3, 4, 5], [1, 2]]}\n", "2016-11-17 17:01:05,509 DEBUG : /usr/bin/scp -r /home/bjackman/sources/lisa/libs/devlib/devlib/bin/arm64/trace-cmd brendan@192.168.0.1:/home/brendan/devlib-target/bin/trace-cmd\n", @@ -159,7 +159,7 @@ "2016-11-17 17:01:07,177 DEBUG : No RT-App workloads, skipping calibration\n", "2016-11-17 17:01:07,178 WARNING : TestEnv - Wipe previous contents of the results folder:\n", "2016-11-17 17:01:07,179 WARNING : TestEnv - /home/bjackman/sources/lisa/results/ExecutorExample\n", - "2016-11-17 17:01:07,181 DEBUG : EnergyMeter - using default energy meter for [juno2]\n", + "2016-11-17 17:01:07,181 DEBUG : EnergyMeter - using default energy meter for [juno]\n", "2016-11-17 17:01:07,182 INFO : HWMon - Scanning for HWMON channels, may take some time...\n", "2016-11-17 17:01:07,184 DEBUG : Discovering available HWMON sensors...\n", "2016-11-17 17:01:07,185 DEBUG : \tAdding sensor scpi_sensors/energy1\n", @@ -203,7 +203,7 @@ " \n", " # Target platform and board\n", " \"platform\" : 'linux',\n", - " \"board\" : 'juno2',\n", + " \"board\" : 'juno',\n", " \n", " # Target board IP/MAC address\n", " \"host\" : '192.168.0.1',\n", diff --git a/libs/utils/energy.py b/libs/utils/energy.py index 7c508323b2520e597afba3ed9f528c5f3e701860..54d5c70158802853772f38eaffc3be00ed1ba7df 100644 --- a/libs/utils/energy.py +++ b/libs/utils/energy.py @@ -45,17 +45,6 @@ DEFAULT_ENERGY_METER = { # ARM Juno: by default use HWMON 'juno' : { - 'instrument' : 'hwmon', - 'conf' : { - 'sites' : [ 'a53', 'a57' ], - 'kinds' : [ 'energy' ], - }, - 'channel_map' : { - 'LITTLE' : 'a53', - 'big' : 'a57', - } - }, - 'juno2' : { 'instrument' : 'hwmon', 'conf' : { 'sites' : [ 'BOARDLITTLE', 'BOARDBIG' ], diff --git a/target.config b/target.config index 013db271d9fb82e14d5c84a7ac8cac314050856d..3b04932b8a0a5bffcc3aa31540fba2b7adae06b9 100644 --- a/target.config +++ b/target.config @@ -16,12 +16,7 @@ /* Board */ /* Currently supported boards are: */ /* juno : target is a JUNO board */ - /* juno2 : target is a JUNO board, with mainline Hwmon */ /* tc2 : target is a TC2 board */ - /* If your Juno board /sys/class/hwmon/hwmon0/energy?_name is */ - /* of the form BOARD_*_ENERGY, then you need 'juno2'. */ - /* Otherwise 'juno' is sufficient. In either case, lisa uses */ - /* devlib's 'juno' target definition to talk to the board. */ /* Leave commented if your board is not listed above */ "board" : "juno",