update frame pointer for backtrack debug

project-chip · Aug 31, 2023 · 25b03fe · 25b03fe
1 parent 78679ef
commit 25b03fe
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 22 deletions.
diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml
@@ -78,8 +78,8 @@ jobs:
           ./scripts/run_in_build_env.sh \
             "./scripts/build/build_examples.py \
               --target bouffalolab-bl706-night-light-light \
-              --target bouffalolab-bl706-eth-light \
-              --target bouffalolab-bl706-wifi-light \
+              --target bouffalolab-bl706dk-light-ethernet \
+              --target bouffalolab-bl706dk-light-wifi-fp \
               --target bouffalolab-xt-zb6-devkit-light-115200-rpc \
               build \
               --copy-artifacts-to out/artifacts \
@@ -92,11 +92,11 @@ jobs:
               /tmp/bloat_reports/
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
               bl702 bl706-eth lighting-app \
-              out/artifacts/bouffalolab-bl706-eth-light/chip-bl702-lighting-example.out \
+              out/artifacts/bouffalolab-bl706dk-light-ethernet/chip-bl702-lighting-example.out \
               /tmp/bloat_reports/
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
               bl702 bl706-wifi lighting-app \
-              out/artifacts/bouffalolab-bl706-wifi-light/chip-bl702-lighting-example.out \
+              out/artifacts/bouffalolab-bl706dk-light-wifi-fp/chip-bl702-lighting-example.out \
               /tmp/bloat_reports/
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
               bl702 bl702+rpc lighting-app \
@@ -110,15 +110,15 @@ jobs:
         run: |
           ./scripts/run_in_build_env.sh \
             "./scripts/build/build_examples.py \
-              --target bouffalolab-bl704l-dvk-light \
+              --target bouffalolab-bl704ldk-light \
               build \
               --copy-artifacts-to out/artifacts \
             "
       - name: Prepare some bloat report from the previous builds
         run: |
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
               bl702l bl702l lighting-app \
-              out/artifacts/bouffalolab-bl704l-dvk-light/chip-bl702l-lighting-example.out \
+              out/artifacts/bouffalolab-bl704ldk-light/chip-bl702l-lighting-example.out \
               /tmp/bloat_reports/
       - name: Clean out build output
         run: rm -rf ./out

diff --git a/examples/lighting-app/bouffalolab/bl602/BUILD.gn b/examples/lighting-app/bouffalolab/bl602/BUILD.gn
@@ -107,6 +107,10 @@ bouffalolab_executable("lighting_app") {
     "SYS_AOS_LOOP_ENABLE",
   ]
 
+  if (enable_debug_frame_ptr) {
+    defines += [ "CONF_ENABLE_FRAME_PTR=1" ]
+  }
+
   if (false == enable_reset_counter) {
     defines += [ "BOOT_PIN_RESET=8" ]
   }

diff --git a/examples/lighting-app/bouffalolab/bl702/BUILD.gn b/examples/lighting-app/bouffalolab/bl702/BUILD.gn
@@ -140,6 +140,10 @@ bouffalolab_executable("lighting_app") {
     "START_ENTRY=bl702_main",
   ]
 
+  if (enable_debug_frame_ptr) {
+    defines += [ "CONF_ENABLE_FRAME_PTR=1" ]
+  }
+
   if (chip_config_network_layer_ble) {
     defines += [
       "CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE=1"

diff --git a/examples/lighting-app/bouffalolab/bl702l/BUILD.gn b/examples/lighting-app/bouffalolab/bl702l/BUILD.gn
@@ -114,6 +114,10 @@ bouffalolab_executable("lighting_app") {
     "START_ENTRY=bl702_main",
   ]
 
+  if (enable_debug_frame_ptr) {
+    defines += [ "CONF_ENABLE_FRAME_PTR=1" ]
+  }
+
   if (chip_config_network_layer_ble) {
     defines += [
       "CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE=1"

diff --git a/examples/platform/bouffalolab/common/iot_sdk/platform_port.c b/examples/platform/bouffalolab/common/iot_sdk/platform_port.c
@@ -162,7 +162,10 @@ void vAssertCalled(void)
 {
     void * ra = (void *) __builtin_return_address(0);
 
+#if CONF_ENABLE_FRAME_PTR == 0
     taskDISABLE_INTERRUPTS();
+#endif
+
     if (xPortIsInsideInterrupt())
     {
         printf("vAssertCalled, ra = %p in ISR\r\n", (void *) ra);
@@ -172,8 +175,11 @@ void vAssertCalled(void)
         printf("vAssertCalled, ra = %p in task %s\r\n", (void *) ra, pcTaskGetName(NULL));
     }
 
-    while (true)
-        ;
+#if CONF_ENABLE_FRAME_PTR
+    portABORT();
+#endif
+
+    while (true);
 }
 #endif
 
@@ -183,6 +189,7 @@ void __attribute__((weak)) user_vAssertCalled(void)
     void * ra = (void *) __builtin_return_address(0);
 
     taskDISABLE_INTERRUPTS();
+
     if (xPortIsInsideInterrupt())
     {
         printf("vAssertCalled, ra = %p in ISR\r\n", (void *) ra);
@@ -192,8 +199,7 @@ void __attribute__((weak)) user_vAssertCalled(void)
         printf("vAssertCalled, ra = %p in task %s\r\n", (void *) ra, pcTaskGetName(NULL));
     }
 
-    while (true)
-        ;
+    while (true);
 }
 
 void __attribute__((weak)) user_vApplicationStackOverflowHook(TaskHandle_t xTask, char * pcTaskName)
@@ -221,8 +227,10 @@ void __attribute__((weak)) user_vApplicationMallocFailedHook(void)
     }
 }
 
+void bflb_assert(void) __attribute__ ((weak, alias ("user_vAssertCalled")));
 #else
 void user_vAssertCalled(void) __attribute__((weak, alias("vAssertCalled")));
+void bflb_assert(void) __attribute__ ((weak, alias ("vAssertCalled")));
 #endif
 
 // ================================================================================

diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml
@@ -35,7 +35,7 @@ steps:
               --target android-arm64-tv-server
               --target android-x64-chip-tool
               --target bouffalolab-bl602-iot-matter-v1-light
-              --target bouffalolab-bl704l-dvk-light
+              --target bouffalolab-bl704ldk-light
               --target bouffalolab-xt-zb6-devkit-light-rpc
               --target cc13x2x7_26x2x7-lighting
               --target cc13x2x7_26x2x7-lock-mtd

diff --git a/scripts/build/builders/bouffalolab.py b/scripts/build/builders/bouffalolab.py
@@ -18,13 +18,15 @@
 
 from .gn import GnBuilder
 
+
 def raise_exception(info):
     logging.fatal('*' * 80)
     logging.fatal('\t%s', info)
     logging.fatal('*' * 80)
 
     raise Exception(info)
 
+
 class BouffalolabApp(Enum):
     LIGHT = auto()
 
@@ -164,7 +166,7 @@ def __init__(self,
             self.argsOpt.append('chip_enable_wifi=true')
         else:
             self.argsOpt.append('chip_enable_wifi=false')
-            
+
         if enable_thread:
             self.argsOpt.append('chip_enable_openthread=true')
         else:
@@ -214,6 +216,8 @@ def __init__(self,
 
         if enable_frame_ptr:
             self.argsOpt.append("enable_debug_frame_ptr=true")
+        else:
+            self.argsOpt.append("enable_debug_frame_ptr=false")
 
         try:
             self.argsOpt.append('bouffalolab_sdk_root="%s"' % os.environ['BOUFFALOLAB_SDK_ROOT'])

diff --git a/scripts/build/testdata/all_targets_linux_x64.txt b/scripts/build/testdata/all_targets_linux_x64.txt
@@ -1,7 +1,7 @@
 ameba-amebad-{all-clusters,all-clusters-minimal,light,light-switch,pigweed}
 asr-{asr582x,asr595x,asr550x}-{all-clusters,all-clusters-minimal,lighting,light-switch,lock,bridge,temperature-measurement,thermostat,ota-requestor,dishwasher}[-ota][-shell][-no_logging][-factory][-rotating_id][-rio]
 android-{arm,arm64,x86,x64,androidstudio-arm,androidstudio-arm64,androidstudio-x86,androidstudio-x64}-{chip-tool,chip-test,tv-server,tv-casting-app,java-matter-controller,virtual-device-app}[-no-debug]
-bouffalolab-{bl602-iot-matter-v1,bl602-night-light,xt-zb6-devkit,bl706-night-light,bl706-eth,bl706-wifi,bl704l-dvk}-light[-shell][-115200][-rpc][-cdc][-resetcnt][-rotating_device_id][-mfd][-mfdtest]
+bouffalolab-{bl602-iot-matter-v1,bl602-night-light,xt-zb6-devkit,bl706-night-light,bl706dk,bl704ldk}-light[-shell][-115200][-rpc][-cdc][-resetcnt][-rotating_device_id][-mfd][-mfdtest][-ethernet][-wifi][-thread][-fp]
 cc32xx-lock
 ti-cc13x2x7_26x2x7-{lighting,lock,pump,pump-controller}[-mtd]
 ti-cc13x4_26x4-{all-clusters,lighting,lock,pump,pump-controller}[-mtd][-ftd]

diff --git a/src/platform/bouffalolab/common/CHIPPlatformConfig.h b/src/platform/bouffalolab/common/CHIPPlatformConfig.h
@@ -19,6 +19,9 @@
 
 #include <stdint.h>
 
+extern "C" void bflb_assert(void);
+#define CHIP_CONFIG_ABORT() bflb_assert()
+
 // ==================== General Platform Adaptations ====================
 #define CHIP_CONFIG_PERSISTED_STORAGE_KEY_TYPE const char *
 #define CHIP_CONFIG_PERSISTED_STORAGE_ENC_MSG_CNTR_ID 1

diff --git a/third_party/bouffalolab/bl602/bl_iot_sdk.gni b/third_party/bouffalolab/bl602/bl_iot_sdk.gni
@@ -20,7 +20,7 @@ import("${chip_root}/src/lib/lib.gni")
 declare_args() {
   bl_iot_sdk_root = "${chip_root}/third_party/bouffalolab/repo"
 
-  enable_debug_frame_ptr = true
+  enable_debug_frame_ptr = false
   debug_output_file = ""
 }
 
@@ -62,8 +62,8 @@ template("bl_iot_sdk") {
       rebase_path("${invoker.freertos_config}", root_build_dir),
     ]
 
-    if (defined(invoker.enable_frame_ptr) && invoker.enable_frame_ptr) {
-      cflags += [ "-fno-omit-frame-pointer" ]
+    if (defined(invoker.enable_debug_frame_ptr) && invoker.enable_debug_frame_ptr) {
+      cflags = [ "-fno-omit-frame-pointer" ]
     }
   }
 
@@ -154,7 +154,7 @@ template("bl_iot_sdk") {
   source_set("${sdk_target_name}_bl602_freertos") {
     defines = [ "portasmHANDLE_INTERRUPT=interrupt_entry" ]
 
-    if (defined(invoker.enable_frame_ptr) && invoker.enable_frame_ptr) {
+    if (defined(invoker.enable_debug_frame_ptr) && invoker.enable_debug_frame_ptr) {
       defines += [ 
         "CONF_ENABLE_FRAME_PTR=1",
         "CONF_ENABLE_FUNC_BACKTRACE_ELF=${invoker.debug_output_file}",

diff --git a/third_party/bouffalolab/bl702/bl_iot_sdk.gni b/third_party/bouffalolab/bl702/bl_iot_sdk.gni
@@ -22,6 +22,7 @@ declare_args() {
   bl_iot_sdk_root = "${chip_root}/third_party/bouffalolab/repo"
 
   enable_debug_frame_ptr = true
+  debug_output_file = ""
 }
 
 assert(bl_iot_sdk_root != "", "bl_iot_sdk_root must be specified")
@@ -61,8 +62,8 @@ template("bl_iot_sdk") {
       rebase_path("${invoker.freertos_config}", root_build_dir),
     ]
 
-    if (defined(invoker.enable_frame_ptr) && invoker.enable_frame_ptr) {
-      cflags += [ "-fno-omit-frame-pointer" ]
+    if (defined(invoker.enable_debug_frame_ptr) && invoker.enable_debug_frame_ptr) {
+      cflags = [ "-fno-omit-frame-pointer" ]
     }
   }
 
@@ -167,8 +168,11 @@ template("bl_iot_sdk") {
 
   source_set("${sdk_target_name}_bl702_freertos") {
     defines = [ "portasmHANDLE_INTERRUPT=interrupt_entry" ]
-    if (defined(invoker.enable_frame_ptr) && invoker.enable_frame_ptr) {
-      defines += [ "CONF_ENABLE_FRAME_PTR" ]
+    if (defined(invoker.enable_debug_frame_ptr) && invoker.enable_debug_frame_ptr) {
+      defines += [ 
+        "CONF_ENABLE_FRAME_PTR=1",
+        "CONF_ENABLE_FUNC_BACKTRACE_ELF=${invoker.debug_output_file}",
+      ]
     }
 
     include_dirs = [ "${bl_iot_sdk_root}/components/platform/soc/bl702/bl702_freertos/portable/GCC/RISC-V/chip_specific_extensions/RV32F_float_abi_single" ]
@@ -194,6 +198,13 @@ template("bl_iot_sdk") {
       "-Wno-old-style-declaration",
     ]
 
+    if (defined(invoker.enable_debug_frame_ptr) && invoker.enable_debug_frame_ptr) {
+      cflags_c += [ 
+        "-Wno-incompatible-pointer-types",
+        "-Wno-int-conversion",
+      ]
+    }
+
     public_configs = [
       ":${sdk_target_name}_config",
       ":${sdk_target_name}_config_freertos",

diff --git a/third_party/bouffalolab/bl702l/bl_iot_sdk.gni b/third_party/bouffalolab/bl702l/bl_iot_sdk.gni
@@ -22,6 +22,9 @@ import("${mbedtls_root}/mbedtls.gni")
 
 declare_args() {
   bl_iot_sdk_root = "${chip_root}/third_party/bouffalolab/repo"
+
+  enable_debug_frame_ptr = true
+  debug_output_file = ""
 }
 
 assert(bl_iot_sdk_root != "", "bl_iot_sdk_root must be specified")
@@ -60,6 +63,10 @@ template("bl_iot_sdk") {
       "-include",
       rebase_path("${invoker.freertos_config}", root_build_dir),
     ]
+
+    if (defined(invoker.enable_debug_frame_ptr) && invoker.enable_debug_frame_ptr) {
+      cflags = [ "-fno-omit-frame-pointer" ]
+    }
   }
 
   config("${sdk_target_name}_config_soc") {
@@ -137,6 +144,12 @@ template("bl_iot_sdk") {
   source_set("${sdk_target_name}_bl702l_rom_a0") {
     defines = [ "portasmHANDLE_INTERRUPT=interrupt_entry" ]
 
+    if (defined(invoker.enable_debug_frame_ptr) && invoker.enable_debug_frame_ptr) {
+      defines += [ 
+        "CONF_ENABLE_FRAME_PTR=1",
+      ]
+    }
+
     include_dirs = [ "${bl_iot_sdk_root}/components/platform/soc/bl702l/bl702l_std/BSP_Driver/regs" ]
 
     libs = [ "${bl_iot_sdk_root}/components/platform/soc/bl702l/bl702l_rom_a0/bl702l_rom_ext/lib/libbl702l_rom_ext.a" ]

diff --git a/third_party/bouffalolab/repo b/third_party/bouffalolab/repo