[Silabs]Add option to use uart for logging in the build_example.py script for efr32 (#72261)

* Add option to use uart for logging in the build_example.py script for efr32. Remove unused/stale version mechanism from silabs scripts

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* update all_targets_linux_x64.txt

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: 2 people

scripts/build/BUILD.gn

@@ -24,7 +24,7 @@ pw_python_package("build_examples") {
     # Dependency for the unit test
     "testdata/all_targets_linux_x64.txt",
     "testdata/dry_run_android-arm64-chip-tool.txt",
-    "testdata/dry_run_efr32-brd4187c-light-rpc-no-version.txt",
+    "testdata/dry_run_efr32-brd4187c-light-rpc.txt",
     "testdata/dry_run_esp32-devkitc-light-rpc.txt",
     "testdata/dry_run_linux-arm64-chip-tool-ipv6only-clang.txt",
     "testdata/dry_run_linux-arm64-ota-requestor-nodeps-ipv6only.txt",

scripts/build/build/targets.py

@@ -376,8 +376,8 @@ def BuildEfr32Target():
         '-(wifi|use-ot-coap-lib)')
     target.AppendModifier('use-ot-coap-lib', enable_ot_coap_lib=True).ExceptIfRe(
         '-(wifi|use-ot-lib)')
-    target.AppendModifier('no-version', no_version=True)
     target.AppendModifier('skip-rps-generation', use_rps_extension=False)
+    target.AppendModifier('uart-log', uart_log=True)
 
     return target
 

scripts/build/builders/efr32.py

@@ -16,7 +16,6 @@
 import logging
 import os
 import shlex
-import subprocess
 from enum import Enum, auto
 
 from runner.runner import Runner
@@ -215,9 +214,9 @@ def __init__(self,
                  enable_additional_data_advertising: bool = False,
                  enable_ot_lib: bool = False,
                  enable_ot_coap_lib: bool = False,
-                 no_version: bool = False,
                  enable_917_soc: bool = False,
                  use_rps_extension: bool = True,
+                 uart_log: bool = False,
                  all_devices_enabled_devices=None
                  ):
         super().__init__(root=app.BuildRoot(root), runner=runner, output_dir_lock=output_dir_lock)
@@ -288,16 +287,12 @@ def __init__(self,
                 'use_silabs_thread_lib=true chip_openthread_target="../silabs:ot-efr32-cert" '
                 'use_thread_coap_lib=true openthread_external_platform=""')
 
-        if not no_version:
-            shortCommitSha = subprocess.check_output(
-                ['git', 'describe', '--always', '--dirty', '--exclude', '*']).decode('ascii').strip()
-            branchName = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']).decode('ascii').strip()
-            self.extra_gn_options.append(
-                'sl_matter_version_str="v1.3-%s-%s"' % (branchName, shortCommitSha))
-
         if use_rps_extension is False:
             self.extra_gn_options.append('use_rps_extension=false')
 
+        if uart_log is True:
+            self.extra_gn_options.append('sl_uart_log_output=true')
+
         if "GSDK_ROOT" in os.environ:
             # EFR32 SDK is very large. If the SDK path is already known (the
             # case for pre-installed images), use it directly.

scripts/build/test.py

@@ -109,7 +109,7 @@ def test_general_dry_runs(self):
             'esp32-devkitc-light-rpc',
             'android-arm64-chip-tool',
             'nrf-nrf52840dk-pump',
-            'efr32-brd4187c-light-rpc-no-version',
+            'efr32-brd4187c-light-rpc',
         ]
 
         for target in TARGETS:

scripts/build/testdata/all_targets_linux_x64.txt

@@ -5,7 +5,7 @@ bouffalolab-{bl602-night-light,bl602dk,bl616dk,bl704ldk,bl706-night-light,bl706d
 cc32xx-{air-purifier,lock}
 ti-cc13x4_26x4-{lighting,lock,pump,pump-controller}[-ftd][-mtd]
 cyw30739-{cyw30739b2_p5_evk_01,cyw30739b2_p5_evk_02,cyw30739b2_p5_evk_03,cyw930739m2evb_01,cyw930739m2evb_02}-{light,light-switch,lock,thermostat}
-efr32-{brd2601b,brd2605a,brd2703a,brd2704b,brd2708a,brd2911a,brd4186a,brd4186c,brd4187a,brd4187c,brd4316a,brd4317a,brd4318a,brd4319a,brd4338a,brd4342a,brd4343a}-{air-quality-sensor-app,all-devices,all-devices-chime,all-devices-contact-sensor,all-devices-dimmable-light,all-devices-occupancy-sensor,all-devices-on-off-light,all-devices-proximity-ranger,all-devices-soil-sensor,all-devices-speaker,all-devices-temperature-sensor,all-devices-water-leak-detector,closure,evse,light,lock,pump,smoke-co-alarm,switch,thermostat,unit-test,water-heater,window-covering}[-additional-data-advertising][-heap-monitoring][-icd][-ipv4][-low-power][-no-logging][-no-openthread-cli][-no-version][-openthread-mtd][-rpc][-shell][-show-qr-code][-siwx917][-skip-rps-generation][-use-ot-coap-lib][-use-ot-lib][-wf200][-wifi][-with-ota-requestor]
+efr32-{brd2601b,brd2605a,brd2703a,brd2704b,brd2708a,brd2911a,brd4186a,brd4186c,brd4187a,brd4187c,brd4316a,brd4317a,brd4318a,brd4319a,brd4338a,brd4342a,brd4343a}-{air-quality-sensor-app,all-devices,all-devices-chime,all-devices-contact-sensor,all-devices-dimmable-light,all-devices-occupancy-sensor,all-devices-on-off-light,all-devices-proximity-ranger,all-devices-soil-sensor,all-devices-speaker,all-devices-temperature-sensor,all-devices-water-leak-detector,closure,evse,light,lock,pump,smoke-co-alarm,switch,thermostat,unit-test,water-heater,window-covering}[-additional-data-advertising][-heap-monitoring][-icd][-ipv4][-low-power][-no-logging][-no-openthread-cli][-openthread-mtd][-rpc][-shell][-show-qr-code][-siwx917][-skip-rps-generation][-uart-log][-use-ot-coap-lib][-use-ot-lib][-wf200][-wifi][-with-ota-requestor]
 esp32-{c3devkit,devkitc,m5stack,p4functionev,qemu}-{all-clusters,all-clusters-minimal,all-devices,all-devices-chime,all-devices-contact-sensor,all-devices-dimmable-light,all-devices-occupancy-sensor,all-devices-on-off-light,all-devices-proximity-ranger,all-devices-soil-sensor,all-devices-speaker,all-devices-temperature-sensor,all-devices-water-leak-detector,bridge,energy-gateway,evse,light,lock,ota-provider,ota-requestor,shell,temperature-measurement,tests,water-heater}[-ipv6only][-rpc][-tracing]
 genio-lighting-app
 linux-fake-tests[-asan][-boringssl][-clang][-coverage][-dmalloc][-libfuzzer][-mbedtls][-ossfuzz][-pw-fuzztest][-tsan][-ubsan]

…_efr32-brd4187c-light-rpc-no-version.txt …ata/dry_run_efr32-brd4187c-light-rpc.txtscripts/build/testdata/dry_run_efr32-brd4187c-light-rpc-no-version.txt renamed to scripts/build/testdata/dry_run_efr32-brd4187c-light-rpc.txt scripts/build/testdata/dry_run_efr32-brd4187c-light-rpc-no-version.txt renamed to scripts/build/testdata/dry_run_efr32-brd4187c-light-rpc.txt

@@ -1,8 +1,8 @@
 # Commands will be run in CHIP project root.
 cd "{root}"
 
-# Generating efr32-brd4187c-light-rpc-no-version
-gn gen --check --fail-on-unused-args '--add-export-compile-commands=*' --root={root}/examples/lighting-app/silabs '--args=silabs_board="BRD4187C" is_debug=false import("//with_pw_rpc.gni") efr32_sdk_root="TEST_GSDK_ROOT" openthread_root="TEST_GSDK_ROOT/openthread_stack/util/third_party/openthread" wifi_sdk_root="TEST_WIFI_SDK_ROOT"' {out}/efr32-brd4187c-light-rpc-no-version
+# Generating efr32-brd4187c-light-rpc
+gn gen --check --fail-on-unused-args '--add-export-compile-commands=*' --root={root}/examples/lighting-app/silabs '--args=silabs_board="BRD4187C" is_debug=false import("//with_pw_rpc.gni") efr32_sdk_root="TEST_GSDK_ROOT" openthread_root="TEST_GSDK_ROOT/openthread_stack/util/third_party/openthread" wifi_sdk_root="TEST_WIFI_SDK_ROOT"' {out}/efr32-brd4187c-light-rpc
 
-# Building efr32-brd4187c-light-rpc-no-version
-ninja -C {out}/efr32-brd4187c-light-rpc-no-version
+# Building efr32-brd4187c-light-rpc
+ninja -C {out}/efr32-brd4187c-light-rpc

scripts/examples/gn_silabs_example.sh

@@ -38,7 +38,6 @@ fi
 
 USE_WIFI=false
 USE_DOCKER=false
-USE_GIT_SHA_FOR_VERSION=true
 GN_PATH="$PW_PATH/gn"
 USE_BOOTLOADER=false
 DOTFILE=".gn"
@@ -282,11 +281,6 @@ else
                 shift
                 shift
                 ;;
-            *"sl_matter_version_str="*)
-                optArgs+="$1 "
-                USE_GIT_SHA_FOR_VERSION=false
-                shift
-                ;;
             *)
                 if [[ "$1" == *use_SiWx917=true* ]]; then
                     USE_WIFI=true
@@ -311,14 +305,6 @@ else
         USE_WIFI=true
     fi
 
-    if [ "$USE_GIT_SHA_FOR_VERSION" == true ]; then
-        {
-            ShortCommitSha=$(git describe --always --dirty --exclude '*')
-            branchName=$(git rev-parse --abbrev-ref HEAD)
-            optArgs+="sl_matter_version_str=\"v1.3-$branchName-$ShortCommitSha\" "
-        } &>/dev/null
-    fi
-
     # After a completed local install (.install-packages-done), run the Silabs package install step to check for updates. Docker never runs it (SDK is in the image).
     if [ -f "$CHIP_ROOT/scripts/setup/silabs/.install-packages-done" ]; then # INSTALL_EVERYTHING
         INSTALL_EVERYTHING=true