Skip to content

Commit 0f8be98

Browse files
authored
Merge branch 'main' into nightly-workflow-steer
2 parents 9050197 + 5a1dce6 commit 0f8be98

8 files changed

Lines changed: 290 additions & 206 deletions

File tree

test/packs/ARM/RteTest_DFP/0.2.0/ARM.RteTest_DFP.pdsc

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@
134134
<debug svd="Device/ARM/SVD/ARMCM0.svd"/> <!-- SVD files do not contain any peripheral -->
135135
<memory id="IROM1" start="0x00000000" size="0x00040000" startup="1" default="1"/>
136136
<memory id="IRAM1" start="0x20000000" size="0x00020000" uninit="1" default="1"/>
137-
137+
<environment name="VELA">
138+
<file name="Scripts/vela/vela_subfamilyLevel.ini" type="ini"/>
139+
</environment>
138140
<device Dname="RteTest_ARMCM0">
139141
<processor Dcore="Cortex-M0" DcoreVersion="r0p0" Dfpu="NO_FPU" Dmpu="NO_MPU" Dendian="Configurable" Dclock="10000000"/>
140142
<compile header="Device/ARM/ARMCM0/Include/ARMCM0.h" define="ARMCM0"/>
@@ -159,10 +161,17 @@
159161
<flashinfo name="Internal Flash 16KB" start="0x0000F000" blankval="0x0000000000000000" filler="0xCCCCCCCCCCCCCCCC" pagesize="0x00000040" ptime="100000" etime="1000000" Pname="cm0_core1">
160162
<block count="64" size="0x100" arg="0"/>
161163
</flashinfo>
164+
<feature type="NPU" n="Ethos-U55" m="128MACs" Pname="cm0_core0"/>
165+
<feature type="NPU" n="Ethos-U55" m="256MACs" Pname="cm0_core1"/>
166+
<feature type="NPU" n="Ethos-U85"/>
167+
<environment name="VELA">
168+
<file name="Scripts/vela/vela_deviceLevel.ini" type="ini"/>
169+
</environment>
162170
</device>
163171
<device Dname="RteTest_ARMCM0_Single">
164172
<processor Pname="cm0_core1" Dcore="Cortex-M0" DcoreVersion="r0p0" Dfpu="NO_FPU" Dmpu="NO_MPU" Dendian="Configurable" Dclock="10000000"/>
165173
<compile header="Device/ARM/ARMCM0/Include/ARMCM0.h" define="ARMCM0"/>
174+
<feature type="NPU" n="Ethos-U55" m="128MACs"/>
166175
</device>
167176
<device Dname="RteTest_ARMCM0_Test">
168177
<processor Pname="cm0_core2" Dcore="Cortex-M0" DcoreVersion="r0p0" Dfpu="NO_FPU" Dmpu="NO_MPU" Dendian="Configurable" Dclock="10000000"/>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// TEST File
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// TEST File

tools/projmgr/include/ProjMgr.h

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,24 @@ class ProjMgr {
103103
*/
104104
int ProcessCommands();
105105

106+
/**
107+
* @brief process requested list arguments specified in command line
108+
* @return program exit code as an integer, 0 for success
109+
*/
110+
int ProcessListCommand();
111+
112+
/**
113+
* @brief helper method to execute common list commands
114+
* @param pointer to ProjMgrWorker list method
115+
* @param error message to display on failure
116+
* @param true to always populate contexts
117+
* @return true if executed successfully
118+
*/
119+
bool RunListCommand(
120+
bool (ProjMgrWorker::* listMethod)(std::vector<std::string>&, const std::string&),
121+
const std::string& errorMessage,
122+
bool alwaysPopulate);
123+
106124
/**
107125
* @brief print usage
108126
* @param cmdOptionsDict map of command and options
@@ -209,6 +227,7 @@ class ProjMgr {
209227
bool RunListPacks();
210228
bool RunListBoards();
211229
bool RunListDevices();
230+
bool RunListNpus();
212231
bool RunListComponents();
213232
bool RunListConfigs();
214233
bool RunListDependencies();

tools/projmgr/include/ProjMgrWorker.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,14 @@ class ProjMgrWorker {
653653
*/
654654
bool ListDevices(std::vector<std::string>& devices, const std::string& filter = RteUtils::EMPTY_STRING);
655655

656+
/**
657+
* @brief list available NPUs
658+
* @param reference to list of NPUs
659+
* @param filter words to filter results
660+
* @return true if executed successfully
661+
*/
662+
bool ListNpus(std::vector<std::string>& npus, const std::string& filter = RteUtils::EMPTY_STRING);
663+
656664
/**
657665
* @brief list available components
658666
* @param reference to list of components

0 commit comments

Comments
 (0)