From a76b54d228c48de75800ad893b0a9b1dcf1e8a81 Mon Sep 17 00:00:00 2001
From: Radu <radu.rentea@gmail.com>
Date: Mon, 12 Sep 2022 14:07:17 +0300
Subject: [PATCH 1/2] Add new destination file path for each cpu core

---
 src/espIdf/tracing/gdbHeapTraceManager.ts | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/espIdf/tracing/gdbHeapTraceManager.ts b/src/espIdf/tracing/gdbHeapTraceManager.ts
index f608b51d2..f95689b97 100644
--- a/src/espIdf/tracing/gdbHeapTraceManager.ts
+++ b/src/espIdf/tracing/gdbHeapTraceManager.ts
@@ -53,13 +53,20 @@ export class GdbHeapTraceManager {
       if (isOpenOcdLaunched) {
         this.showStopButton();
         ensureDir(join(workspace.fsPath, "trace"));
-        const fileName = `file://${join(workspace.fsPath, "trace").replace(
-          /\\/g,
-          "/"
-        )}/htrace_${new Date().getTime()}.svdat`;
-        await this.createGdbinitFile(fileName, workspace.fsPath);
         const modifiedEnv = appendIdfAndToolsToPath(workspace);
         const idfTarget = modifiedEnv.IDF_TARGET || "esp32";
+        let cpuCores = 1;
+        if (idfTarget === 'esp32' || idfTarget === 'esp32s3') {
+          cpuCores = 2;
+        }
+        let traceFilePath = '';
+        for(let i=1; i<=cpuCores; i++) {
+          traceFilePath +=`file://${join(workspace.fsPath, "trace").replace(
+            /\\/g,
+            "/"
+          )}/htrace_${new Date().getTime()}.cpu${i-1}.svdat `;
+        }
+        await this.createGdbinitFile(traceFilePath, workspace.fsPath);
         const gdbTool = getToolchainToolName(idfTarget, "gdb");
         const isGdbToolInPath = await isBinInPath(
           gdbTool,

From 68a4c5016e3231a12d5d482dbed30b06ebb27a6e Mon Sep 17 00:00:00 2001
From: Radu <radu.rentea@gmail.com>
Date: Tue, 13 Sep 2022 16:27:19 +0300
Subject: [PATCH 2/2] Fix description for S3 board option

---
 src/espIdf/openOcd/boardConfiguration.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/espIdf/openOcd/boardConfiguration.ts b/src/espIdf/openOcd/boardConfiguration.ts
index a90647537..b33a1c028 100644
--- a/src/espIdf/openOcd/boardConfiguration.ts
+++ b/src/espIdf/openOcd/boardConfiguration.ts
@@ -49,7 +49,7 @@ export const defaultBoards = [
   } as IdfBoard,
   {
     name: "ESP32-S3 chip (via builtin USB-JTAG)",
-    description: "ESP32-S3 used with ESP-PROG board",
+    description: "ESP32-S3 debugging via builtin USB-JTAG",
     target: "esp32s3",
     configFiles: ["board/esp32s3-builtin.cfg"],
   } as IdfBoard,