Changes after review

Author: espzav

.github/workflows/build-run-applications.yml

@@ -171,6 +171,7 @@ jobs:
       TEST_RESULT_NAME: test_results_${{ matrix.runner.target }}_${{ matrix.runner.marker }}_${{ matrix.idf_ver }}
       BENCHMARK_RESULT_NAME: benchmark_${{ matrix.runner.target }}_${{ matrix.runner.marker }}_${{ matrix.idf_ver }}
       TEST_RESULT_FILE: test_results_${{ matrix.runner.target }}_${{ matrix.runner.marker }}_${{ matrix.idf_ver }}.xml
+      PYTEST_BENCHMARK_IGNORE: ${{ (contains(github.event.pull_request.labels.*.name, 'Run benchmark') || contains(inputs.WFType, 'Build + Tests + Benchmark') || github.ref_name == 'master') && format(' ') || format('--ignore=examples/display_lvgl_benchmark') }}
     runs-on: [self-hosted, Linux, bspwall]
     container:
       image: python:3.11-bookworm
@@ -185,24 +186,15 @@ jobs:
         env:
           PIP_EXTRA_INDEX_URL: "https://dl.espressif.com/pypi/"
         run: |
-          echo "PYTEST_BENCHMARK_IGNORE=--ignore='examples/display_lvgl_benchmark'" >> $GITHUB_ENV
           pip install --prefer-binary cryptography pytest-embedded pytest-embedded-serial-esp pytest-embedded-idf pytest-custom_exit_code
       - name: Download latest results
         uses: actions/download-artifact@v4
         with:
           pattern: benchmark_*
           path: benchmark/
-      - name: Set ignores
-        if: contains(github.event.pull_request.labels.*.name, 'Run benchmark') || contains(inputs.WFType, 'Build + Tests + Benchmark') || github.ref_name == 'master'
-        id: set_ignores
-        run: |
-          echo "PYTEST_BENCHMARK_IGNORE=" >> $GITHUB_ENV
-      - name: Pull
-        run: |
-          git pull --rebase origin ${{ github.head_ref }} || echo "No remote changes to rebase"
       - name: Run apps
         run: |
-          pytest --suppress-no-test-exit-code --ignore-glob '*/managed_components/*' --ignore=.github ${{ env.PYTEST_BENCHMARK_IGNORE }} --junit-xml=${{ env.TEST_RESULT_FILE }} --target=${{ matrix.runner.target }} -m ${{ matrix.runner.marker }} --build-dir=build_${{ matrix.runner.runs-on }}
+          pytest --suppress-no-test-exit-code --ignore-glob '*/managed_components/*' --ignore=.github --junit-xml=${{ env.TEST_RESULT_FILE }} --target=${{ matrix.runner.target }} -m ${{ matrix.runner.marker }} --build-dir=build_${{ matrix.runner.runs-on }} ${{ env.PYTEST_BENCHMARK_IGNORE }}
       - name: Upload test results
         uses: actions/upload-artifact@v4
         if: always()
@@ -247,7 +239,8 @@ jobs:
         uses: EnricoMi/publish-unit-test-result-action@v2
         with:
           files: test_results/**/*.xml
-      - name: Find test result files
+      - name: Find benchmark result files
+        if: (contains(github.event.pull_request.labels.*.name, 'Run benchmark') || contains(inputs.WFType, 'Build + Tests + Benchmark') || github.ref_name == 'master')
         id: find_files
         run: |
           OUTPUT_FILE="combined_benchmarks.md"
@@ -269,6 +262,7 @@ jobs:
 
           echo "output_file=$OUTPUT_FILE" >> "$GITHUB_ENV"
       - name: Comment PR
+        if: (contains(github.event.pull_request.labels.*.name, 'Run benchmark') || contains(inputs.WFType, 'Build + Tests + Benchmark') || github.ref_name == 'master')
         uses: thollander/actions-comment-pull-request@v3
         with:
           comment-tag: benchmark_results

examples/display_lvgl_benchmark/README.md

@@ -1,9 +1,16 @@
 # Display LVGL Benchmark
 
-This example shows LVGL internal benchmark demo.
+This example runs the LVGL benchmark demo to measure graphical performance on Espressif and M5Stack boards. It is used in CI for selected pull requests (based on labels) and after merging changes into the master branch.
+
+## Main Features
+- Can be triggered by adding the "Run benchmark" label to a PR.
+- The measured values in a PR are compared against the master branch and posted as a comment, highlighting any differences.
+- Benchmark results for the master branch are stored in BSP releases.
 
 ## How to use the example
 
+This example can be used as standalone example too.
+
 ### Hardware Required
 
 * ESP32-S3-LCD-EV-Board or ESP32-S3-LCD-EV-Board-2

examples/display_lvgl_benchmark/main/CMakeLists.txt

@@ -1,17 +1,3 @@
-set(LV_DEMO_DIR "")
-set(LV_DEMOS_SOURCES "")
-if(CONFIG_LV_USE_DEMO_BENCHMARK)
-    list(APPEND LV_DEMO_DIR ../managed_components/lvgl__lvgl/demos)
-    file(GLOB_RECURSE LV_DEMOS_SOURCES ${LV_DEMO_DIR}/*.c)
-endif()
-
 idf_component_register(
-    SRCS "main.c" ${LV_DEMOS_SOURCES}
-    INCLUDE_DIRS "." ${LV_DEMO_DIR})
-
-if(CONFIG_LV_USE_DEMO_BENCHMARK)
-set_source_files_properties(
-    ${LV_DEMOS_SOURCES}
-    PROPERTIES COMPILE_OPTIONS
-    -DLV_LVGL_H_INCLUDE_SIMPLE)
-endif()
+    SRCS "main.c"
+    INCLUDE_DIRS ".")

examples/display_lvgl_benchmark/pytest_display_lvgl_benchmark.py

@@ -1,7 +1,6 @@
 # SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: CC0-1.0
 
-import os
 import datetime
 import json
 from pathlib import Path
@@ -28,22 +27,6 @@ def read_json_file(board):
         return []
 
 
-def write_json_file(board, data):
-    repo_root = Path(__file__).resolve().parent
-    while repo_root.name != "esp-bsp" and repo_root.parent != repo_root:
-        repo_root = repo_root.parent
-    file_path = f"{repo_root}/bsp/{board}/benchmark.json"
-    try:
-        os.remove(file_path)
-    except OSError:
-        pass
-    try:
-        with open(file_path, "a") as file:
-            file.write(data)
-    except OSError:
-        pass
-
-
 def find_test_results(json_obj, test):
     if json_obj:
         for t in json_obj["tests"]:
@@ -84,11 +67,10 @@ def test_example(dut: Dut, request) -> None:
     dut.expect_exact('app_main: Display LVGL demo')
     dut.expect_exact('main_task: Returned from app_main()')
 
-    try:
-        os.remove("benchmark_" + board + ".md")
-        os.remove("benchmark_" + board + ".json")
-    except OSError:
-        pass
+    file_path = Path(f"benchmark_" + board + ".md")
+    file_path.unlink(missing_ok=True)
+    file_path = Path(f"benchmark_" + board + ".json")
+    file_path.unlink(missing_ok=True)
 
     output = {
         "date": date.strftime('%d.%m.%Y %H:%M'),
@@ -138,4 +120,3 @@ def test_example(dut: Dut, request) -> None:
     # Save JSON to file
     json_output = json.dumps(output, indent=4)
     write_to_file(board, ".json", json_output)
-    write_json_file(board, json_output)