[cbuild-run] Implement multi-core support

brondani · web-flow · commit 3bdd6f499351 · 2025-02-06T11:24:02.000+01:00
diff --git a/tools/projmgr/include/ProjMgrRunDebug.h b/tools/projmgr/include/ProjMgrRunDebug.h
@@ -19,6 +19,7 @@ struct AlgorithmType {
   unsigned long long ramStart = 0;
   unsigned long long ramSize = 0;
   bool bDefault = false;
+  std::string pname;
 };
 
 /**
@@ -27,6 +28,7 @@ struct AlgorithmType {
 struct FilesType {
   std::string file;
   std::string type;
+  std::string pname;
 };
 
 /**
@@ -38,7 +40,7 @@ struct DebugSequencesBlockType {
   std::string control_if;
   std::string control_while;
   std::string timeout;
-  bool atomic;
+  bool atomic = false;
   std::vector<DebugSequencesBlockType> blocks;
 };
 
@@ -49,6 +51,7 @@ struct DebugSequencesType {
   std::string name;
   std::string info;
   std::vector<DebugSequencesBlockType> blocks;
+  std::string pname;
 };
 
  /**
@@ -99,6 +102,8 @@ class ProjMgrRunDebug {
 protected:
   RunDebugType m_runDebug;
   void GetDebugSequenceBlock(const RteItem* item, DebugSequencesBlockType& block);
+  void PushBackUniquely(std::vector<std::pair<const RteItem*, std::vector<std::string>>>& vec,
+    const RteItem* item, const std::string pname);
 };
 
 #endif  // PROJMGRRUNDEBUG_H
diff --git a/tools/projmgr/include/ProjMgrYamlParser.h b/tools/projmgr/include/ProjMgrYamlParser.h
@@ -151,6 +151,7 @@ static constexpr const char* YAML_PACKS = "packs";
 static constexpr const char* YAML_PACKS_MISSING = "packs-missing";
 static constexpr const char* YAML_PACKS_UNUSED = "packs-unused";
 static constexpr const char* YAML_PATH = "path";
+static constexpr const char* YAML_PNAME = "pname";
 static constexpr const char* YAML_PROCESSOR = "processor";
 static constexpr const char* YAML_PROGRAMMING = "programming";
 static constexpr const char* YAML_PROJECT = "project";
diff --git a/tools/projmgr/schemas/common.schema.json b/tools/projmgr/schemas/common.schema.json
@@ -1953,7 +1953,8 @@
         "size":     { "type": "number", "description": "Memory size." },
         "ram-start":{ "type": "number", "description": "RAM Memory start address." },
         "ram-size": { "type": "number", "description": "RAM Memory size." },
-        "default":  { "type": "boolean", "description": "Default memory." }
+        "default":  { "type": "boolean", "description": "Default memory." },
+        "pname":    { "type": "string", "description": "Processor name." }
       },
       "additionalProperties": false
     },
@@ -1965,8 +1966,9 @@
     "RunFileType": {
       "type": "object",
       "properties": {
-        "file": { "type": "string", "description": "File path." },
-        "type": { "type": "string", "description": "File type." }
+        "file":  { "type": "string", "description": "File path." },
+        "type":  { "type": "string", "description": "File type." },
+        "pname": { "type": "string", "description": "Processor name." }
       },
       "additionalProperties": false
     },
@@ -1981,7 +1983,8 @@
       "properties": {
         "name":    { "type": "string", "description": "Name of the sequence." },
         "info":    { "type": "string", "description": "Descriptive text to display for example for error diagnostics." },
-        "blocks":  { "$ref": "#/definitions/DebugBlocksType" }
+        "blocks":  { "$ref": "#/definitions/DebugBlocksType" },
+        "pname":   { "type": "string", "description": "Executes sequence only for connection to processor; Default is executed for all connections." }
       },
       "additionalProperties": false,
       "required": ["name"]
diff --git a/tools/projmgr/src/ProjMgrCbuildRun.cpp b/tools/projmgr/src/ProjMgrCbuildRun.cpp
@@ -56,6 +56,7 @@ void ProjMgrCbuildRun::SetProgrammingNode(YAML::Node node, const std::vector<Alg
     if (item.bDefault) {
       algorithmNode[YAML_DEFAULT] = true;
     }
+    SetNodeValue(algorithmNode[YAML_PNAME], item.pname);
     node.push_back(algorithmNode);
   }
 }
@@ -65,6 +66,7 @@ void ProjMgrCbuildRun::SetFilesNode(YAML::Node node, const std::vector<FilesType
     YAML::Node fileNode;
     SetNodeValue(fileNode[YAML_FILE], FormatPath(item.file, m_directory));
     SetNodeValue(fileNode[YAML_TYPE], item.type);
+    SetNodeValue(fileNode[YAML_PNAME], item.pname);
     node.push_back(fileNode);
   }
 }
@@ -75,6 +77,7 @@ void ProjMgrCbuildRun::SetDebugSequencesNode(YAML::Node node, const std::vector<
     SetNodeValue(sequenceNode[YAML_NAME], sequence.name);
     SetNodeValue(sequenceNode[YAML_INFO], sequence.info);
     SetDebugSequencesBlockNode(sequenceNode[YAML_BLOCKS], sequence.blocks);
+    SetNodeValue(sequenceNode[YAML_PNAME], sequence.pname);
     node.push_back(sequenceNode);
   }
 }
diff --git a/tools/projmgr/src/ProjMgrRunDebug.cpp b/tools/projmgr/src/ProjMgrRunDebug.cpp
@@ -29,53 +29,72 @@ bool ProjMgrRunDebug::CollectSettings(const vector<ContextItem*>& contexts) {
   m_runDebug.targetType = context->type.target;
   m_runDebug.compiler = context->compiler;
   if (!context->device.empty()) {
-    m_runDebug.device = context->deviceItem.vendor + "::" + context->deviceItem.name +
-      (context->deviceItem.pname.empty() ? "" : ":" + context->deviceItem.pname);
+    m_runDebug.device = context->deviceItem.vendor + "::" + context->deviceItem.name;
   }
   if (!context->board.empty()) {
     m_runDebug.board = context->boardItem.vendor + "::" + context->boardItem.name +
       (context->boardItem.revision.empty() ? "" : ":" + context->boardItem.revision);
   }
 
   // programming algorithms
-  Collection<RteItem*> algorithms;
+  vector<pair<const RteItem*, vector<string>>> algorithms;
   // debug infos
-  Collection<RteItem*> debugs;
+  vector<pair<const RteItem*, vector<string>>> debugs;
   // debug sequences
-  Collection<RteItem*> debugSequences;
+  vector<pair<const RteItem*, vector<string>>> debugSequences;
+
+  // processor names
+  map<string, ContextItem*> pnames;
+  for (const auto& context : contexts) {
+    pnames.emplace(context->deviceItem.pname, context);
+  }
 
   // device collections
-  if (context->devicePack) {
-    m_runDebug.devicePack = context->devicePack->GetPackageID(true);
-    const auto& deviceAlgorithms = context->rteDevice->GetEffectiveProperties("algorithm", context->deviceItem.pname);
-    for (const auto& deviceAlgorithm : deviceAlgorithms) {
-      algorithms.push_back(deviceAlgorithm);
-    }
-    const auto& deviceDebugs = context->rteDevice->GetEffectiveProperties("debug", context->deviceItem.pname);
-    for (const auto& deviceDebug : deviceDebugs) {
-      debugs.push_back(deviceDebug);
-    }
-    const auto& deviceDebugSequences = context->rteDevice->GetEffectiveProperties("sequence", context->deviceItem.pname);
-    for (const auto& deviceDebugSequence : deviceDebugSequences) {
-      debugSequences.push_back(deviceDebugSequence);
+  for (const auto& [pname, context] : pnames) {
+    if (context->devicePack) {
+      m_runDebug.devicePack = context->devicePack->GetPackageID(true);
+      const auto& deviceAlgorithms = context->rteDevice->GetEffectiveProperties("algorithm", pname);
+      for (const auto& deviceAlgorithm : deviceAlgorithms) {
+        PushBackUniquely(algorithms, deviceAlgorithm, pname);
+      }
+      const auto& deviceDebugs = context->rteDevice->GetEffectiveProperties("debug", pname);
+      for (const auto& deviceDebug : deviceDebugs) {
+        PushBackUniquely(debugs, deviceDebug, pname);
+      }
+      const auto& deviceDebugSequences = context->rteDevice->GetEffectiveProperties("sequence", pname);
+      for (const auto& deviceDebugSequence : deviceDebugSequences) {
+        PushBackUniquely(debugSequences, deviceDebugSequence, pname);
+      }
     }
   }
 
   // board collections
   if (context->boardPack) {
     m_runDebug.boardPack = context->boardPack->GetPackageID(true);
-    context->rteBoard->GetChildrenByTag("algorithm", algorithms);
+    Collection<RteItem*> boardAlgorithms;
+    context->rteBoard->GetChildrenByTag("algorithm", boardAlgorithms);
+    for (const auto& boardAlgorithm : boardAlgorithms) {
+      PushBackUniquely(algorithms, boardAlgorithm, boardAlgorithm->GetAttribute("Pname"));
+    }
+  }
+
+  // sort collections starting with specific pnames
+  for (auto vec : { &algorithms, &debugs, &debugSequences }) {
+    sort(vec->begin(), vec->end(), [](auto& left, auto& right) {
+      return left.second.size() < right.second.size();
+    });
   }
 
   // set device/board programming algorithms
-  for (const auto& algorithm : algorithms) {
+  for (const auto& [algorithm, pname] : algorithms) {
     AlgorithmType item;
     item.algorithm = algorithm->GetOriginalAbsolutePath();
     item.start = algorithm->GetAttributeAsULL("start");
     item.size = algorithm->GetAttributeAsULL("size");
     item.ramStart = algorithm->GetAttributeAsULL("RAMstart");
     item.ramSize = algorithm->GetAttributeAsULL("RAMsize");
     item.bDefault = algorithm->GetAttributeAsBool("default");
+    item.pname = pname.size() == 1 ? pname.front() : "";
     m_runDebug.algorithms.push_back(item);
   }
 
@@ -89,12 +108,13 @@ bool ProjMgrRunDebug::CollectSettings(const vector<ContextItem*>& contexts) {
   }
 
   // system descriptions
-  for (const auto& debug : debugs) {
+  for (const auto& [debug, pname] : debugs) {
     const auto& svd = debug->GetAttribute("svd");
     if (!svd.empty()) {
       FilesType item;
       item.file = debug->GetAbsolutePackagePath() + svd;
       item.type = "svd";
+      item.pname = pname.size() == 1 ? pname.front() : "";
       m_runDebug.systemDescriptions.push_back(item);
     }
   }
@@ -113,7 +133,7 @@ bool ProjMgrRunDebug::CollectSettings(const vector<ContextItem*>& contexts) {
   }
 
   // debug sequences
-  for (const auto& debugSequence : debugSequences) {
+  for (const auto& [debugSequence, pname] : debugSequences) {
     DebugSequencesType sequence;
     sequence.name = debugSequence->GetName();
     sequence.info = debugSequence->GetAttribute("info");
@@ -122,6 +142,7 @@ bool ProjMgrRunDebug::CollectSettings(const vector<ContextItem*>& contexts) {
       GetDebugSequenceBlock(debugSequenceBlock, block);
       sequence.blocks.push_back(block);
     }
+    sequence.pname = pname.size() == 1 ? pname.front() : "";
     m_runDebug.debugSequences.push_back(sequence);
   }
 
@@ -161,3 +182,13 @@ void ProjMgrRunDebug::GetDebugSequenceBlock(const RteItem* item, DebugSequencesB
     block.blocks.push_back(childBlock);
   }
 }
+
+void ProjMgrRunDebug::PushBackUniquely(vector<pair<const RteItem*, vector<string>>>& vec, const RteItem* item, const string pname) {
+  for (auto& [rteItem, pnames] : vec) {
+    if (rteItem == item) {
+      CollectionUtils::PushBackUniquely(pnames, pname);
+      return;
+    }
+  }
+  vec.push_back({ item, { pname } });
+}

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ void ProjMgrCbuildRun::SetProgrammingNode(YAML::Node node, const std::vector<Alg`
`56`	`56`	`if (item.bDefault) {`
`57`	`57`	`algorithmNode[YAML_DEFAULT] = true;`
`58`	`58`	`}`
	`59`	`+ SetNodeValue(algorithmNode[YAML_PNAME], item.pname);`
`59`	`60`	`node.push_back(algorithmNode);`
`60`	`61`	`}`
`61`	`62`	`}`
`@@ -65,6 +66,7 @@ void ProjMgrCbuildRun::SetFilesNode(YAML::Node node, const std::vector<FilesType`
`65`	`66`	`YAML::Node fileNode;`
`66`	`67`	`SetNodeValue(fileNode[YAML_FILE], FormatPath(item.file, m_directory));`
`67`	`68`	`SetNodeValue(fileNode[YAML_TYPE], item.type);`
	`69`	`+ SetNodeValue(fileNode[YAML_PNAME], item.pname);`
`68`	`70`	`node.push_back(fileNode);`
`69`	`71`	`}`
`70`	`72`	`}`
`@@ -75,6 +77,7 @@ void ProjMgrCbuildRun::SetDebugSequencesNode(YAML::Node node, const std::vector<`
`75`	`77`	`SetNodeValue(sequenceNode[YAML_NAME], sequence.name);`
`76`	`78`	`SetNodeValue(sequenceNode[YAML_INFO], sequence.info);`
`77`	`79`	`SetDebugSequencesBlockNode(sequenceNode[YAML_BLOCKS], sequence.blocks);`
	`80`	`+ SetNodeValue(sequenceNode[YAML_PNAME], sequence.pname);`
`78`	`81`	`node.push_back(sequenceNode);`
`79`	`82`	`}`
`80`	`83`	`}`