Merge branch 'change/sysview_test_config_v5.0' into 'release/v5.0'

change(sysview): run heap_log tracing tests on existing cores (v5.0)

See merge request espressif/esp-idf!35199

components/app_trace/sys_view/ext/heap_trace_module.c

@@ -21,7 +21,7 @@ const static char *TAG = "sysview_heap_trace";
 #endif
 
 static SEGGER_SYSVIEW_MODULE s_esp_sysview_heap_module = {
-    .sModule = "ESP32 SystemView Heap Tracing Module",
+    .sModule = "M=ESP32 SystemView Heap Tracing Module",
     .NumEvents = 2,
 };
 

examples/system/sysview_tracing_heap_log/example_test.py

@@ -1,9 +1,6 @@
-from __future__ import unicode_literals
-
 import os
 import re
 import tempfile
-from io import open
 
 import esp_debug_backend as debug_backend
 import ttfw_idf
@@ -48,7 +45,6 @@ def test_examples_sysview_tracing_heap_log(env, extra_data):
 
         with ttfw_idf.CustomProcess(' '.join([os.path.join(dut.app.idf_path, 'tools/esp_app_trace/sysviewtrace_proc.py'),
                                               '-p',
-                                              '-b', elf_path,
                                               tempfiles[1]]),
                                     logfile='sysviewtrace_proc.log') as sysviewtrace:
             sysviewtrace.pexpect_proc.expect(re.compile(r'Found \d+ leaked bytes in \d+ blocks.'), timeout=120)

tools/esp_app_trace/espytrace/sysview.py

@@ -1263,7 +1263,7 @@ class SysViewHeapTraceDataParser(SysViewTraceDataExtEventParser):
         """
         if self.root_proc == self:
             SysViewTraceDataParser.on_new_event(self, event)
-        if event.id == SYSVIEW_EVTID_MODULEDESC and event.params['desc'].value == 'ESP32 SystemView Heap Tracing Module':
+        if event.id == SYSVIEW_EVTID_MODULEDESC and event.params['desc'].value == 'M=ESP32 SystemView Heap Tracing Module':
             self.events_off = event.params['evt_off'].value
 
 

tools/esp_app_trace/test/sysview/README.md

@@ -0,0 +1,66 @@
+# Steps to Generate Test Input Files
+
+1. `sysview_tracing_heap_log.elf`
+
+    Build example `sysview_tracing_heap_log` project.
+
+    ```
+    cd $IDF_PATH/examples/system/sysview_tracing_heap_log
+    idf.py set target esp32
+    idf.py build
+    cp build/sysview_tracing_heap_log.elf $IDF_PATH/tools/esp_app_trace/test/sysview/
+    cd $IDF_PATH/tools/esp_app_trace/test/sysview/
+    chmod -x sysview_tracing_heap_log.elf
+    ```
+
+2. `heap_log0.svdat` and `heap_log1.svdat`
+
+    Flash the example and run OpenOCD and GDB using the following command in a separate console
+
+    ```
+    cd $IDF_PATH/examples/system/sysview_tracing_heap_log
+    idf.py openocd
+    ```
+
+    ```
+    cd $IDF_PATH/examples/system/sysview_tracing_heap_log
+    xtensa-esp32-elf-gdb -x gdbinit build/sysview_tracing_heap_log.elf
+    ```
+    When program stops at `heap_trace_stop`  quit GDB and OpenOCD
+
+    Copy generated svdat files
+    ```
+    cp heap_log0.svdat $IDF_PATH/tools/esp_app_trace/test/sysview/
+    cp heap_log1.svdat $IDF_PATH/tools/esp_app_trace/test/sysview/
+    ```
+
+3. `heap_log_mcore.svdat`
+
+    Flash the example and run OpenOCD and GDB using the following command in a separate console
+
+    ```
+    cd $IDF_PATH/examples/system/sysview_tracing_heap_log
+    idf.py openocd
+    ```
+
+    ```
+    cd $IDF_PATH/examples/system/sysview_tracing_heap_log
+    xtensa-esp32-elf-gdb -x gdbinit-mcore build/sysview_tracing_heap_log.elf
+    ```
+    When program stops at `heap_trace_stop`  quit GDB and OpenOCD
+
+    Copy generated svdat file
+    ```
+    cp heap_log_mcore.svdat $IDF_PATH/tools/esp_app_trace/test/sysview/
+    ```
+
+4. `expected_output` and `expected_output_json` files
+
+    You can use the commands from the `test.sh` to generate expected result files
+
+    ```
+    $IDF_PATH/tools/esp_app_trace/sysviewtrace_proc.py -d -p -b sysview_tracing_heap_log.elf heap_log0.svdat heap_log1.svdat &> expected_output
+    $IDF_PATH/tools/esp_app_trace/sysviewtrace_proc.py -j -b sysview_tracing_heap_log.elf heap_log0.svdat heap_log1.svdat &> expected_output.json
+    $IDF_PATH/tools/esp_app_trace/sysviewtrace_proc.py -d -p -b sysview_tracing_heap_log.elf heap_log_mcore.svdat &> expected_output_mcore
+    $IDF_PATH/tools/esp_app_trace/sysviewtrace_proc.py -j -b sysview_tracing_heap_log.elf heap_log_mcore.svdat &> expected_output_mcore.json
+    ```

tools/esp_app_trace/test/sysview/blink.c

@@ -1,88 +0,0 @@
-/* Blink Example
-
-   This example code is in the Public Domain (or CC0 licensed, at your option.)
-
-   Unless required by applicable law or agreed to in writing, this
-   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-   CONDITIONS OF ANY KIND, either express or implied.
-*/
-#include <stdio.h>
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "driver/gpio.h"
-#include "sdkconfig.h"
-#include "esp_heap_trace.h"
-
-/* Can use project configuration menu (idf.py menuconfig) to choose the GPIO
-   to blink or you can edit the following line and set a number here.
-*/
-#define BLINK_GPIO CONFIG_BLINK_GPIO
-
-void blink_task2(void *pvParameter)
-{
-    TaskHandle_t task = (TaskHandle_t)pvParameter;
-
-    while(1) {
-        if (xTaskNotifyWait(0, 0, NULL, portMAX_DELAY) != pdPASS) {
-            printf("Failed to wait for main task!\n");
-            return;
-        }
-        void *a = malloc(65);
-        printf("Alloced 65 bytes @ %p\n", a);
-        void *b = malloc(97);
-        printf("Alloced 97 bytes @ %p\n", b);
-        free(a);
-        printf("Freed @ %p\n", a);
-        b = malloc(11);
-        printf("Alloced 11 bytes @ %p\n", b);
-        b = malloc(24);
-        printf("Alloced 24 bytes @ %p\n", b);
-        free(b);
-        printf("Freed @ %p\n", b);
-        if (xTaskNotify(task, 0, eNoAction) != pdPASS) {
-            printf("Failed to notify main task!\n");
-            return;
-        }
-    }
-}
-
-void blink_task(void *pvParameter)
-{
-    TaskHandle_t task = 0;
-
-    if(heap_trace_init_tohost() != ESP_OK) {
-        printf("Failed to init heap trace!\n");
-        return;
-    }
-    xTaskCreatePinnedToCore(&blink_task2, "blink_task2", 2048, xTaskGetCurrentTaskHandle(), 5, &task, 1);
-
-    while(1) {
-        heap_trace_start(HEAP_TRACE_ALL);
-        if (xTaskNotify(task, 0, eNoAction) != pdPASS) {
-            printf("Failed to notify slave task!\n");
-            return;
-        }
-        void *a = malloc(64);
-        printf("Alloced 64 bytes @ %p\n", a);
-        void *b = malloc(96);
-        printf("Alloced 96 bytes @ %p\n", b);
-        free(a);
-        printf("Freed @ %p\n", a);
-        b = malloc(10);
-        printf("Alloced 10 bytes @ %p\n", b);
-        b = malloc(23);
-        printf("Alloced 23 bytes @ %p\n", b);
-        free(b);
-        printf("Freed @ %p\n", b);
-        if (xTaskNotifyWait(0, 0, NULL, portMAX_DELAY) != pdPASS) {
-            printf("Failed to wait for slave task!\n");
-            return;
-        }
-        heap_trace_stop();
-    }
-}
-
-void app_main(void)
-{
-    xTaskCreatePinnedToCore(&blink_task, "blink_task", 2048, NULL, 5, NULL, 0);
-}

tools/esp_app_trace/test/sysview/gdbinit

@@ -6,14 +6,14 @@ flushregs
 b heap_trace_start
 commands
 clear heap_trace_start
-mon esp32 sysview start file://cpu0.svdat file://cpu1.svdat
+mon esp sysview start file://heap_log0.svdat file://heap_log1.svdat
 c
 end
 
 b heap_trace_stop
 commands
 clear heap_trace_stop
-mon esp32 sysview stop
+mon esp sysview stop
 end
 
 c

tools/esp_app_trace/test/sysview/gdbinit-mcore

@@ -0,0 +1,19 @@
+target remote :3333
+
+mon reset halt
+maintenance flush register-cache
+
+b heap_trace_start
+commands
+clear heap_trace_start
+mon esp sysview_mcore start file://heap_log_mcore.svdat
+c
+end
+
+b heap_trace_stop
+commands
+clear heap_trace_stop
+mon esp sysview_mcore stop
+end
+
+c

tools/esp_app_trace/test/sysview/test.sh

@@ -2,14 +2,14 @@
 
 { python -m coverage debug sys \
     && python -m coverage erase &> output \
-    && python -m coverage run -a $IDF_PATH/tools/esp_app_trace/sysviewtrace_proc.py -d -p -b test.elf cpu0.svdat cpu1.svdat &>> output \
+    && python -m coverage run -a $IDF_PATH/tools/esp_app_trace/sysviewtrace_proc.py -d -p -b sysview_tracing_heap_log.elf heap_log0.svdat heap_log1.svdat &>> output \
     && diff output expected_output \
     && python -m coverage report \
 ; } || { echo 'The test for sysviewtrace_proc has failed. Please examine the artifacts.' ; exit 1; }
 
 { python -m coverage debug sys \
     && python -m coverage erase &> output.json \
-    && python -m coverage run -a $IDF_PATH/tools/esp_app_trace/sysviewtrace_proc.py -j -b test.elf cpu0.svdat cpu1.svdat &>> output.json \
+    && python -m coverage run -a $IDF_PATH/tools/esp_app_trace/sysviewtrace_proc.py -j -b sysview_tracing_heap_log.elf heap_log0.svdat heap_log1.svdat &>> output.json \
     && diff output.json expected_output.json \
     && python -m coverage report \
 ; } || { echo 'The test for sysviewtrace_proc JSON functionality has failed. Please examine the artifacts.' ; exit 1; }