Merge pull request #550 from ckormanyos/cpp_regs_rp2350

Fix #548 via improved cpp-regs rp2350
ckormanyos · Sep 16, 2024 · 3c7c5e0 · 3c7c5e0
2 parents 2e1cbf1 + 759138d
commit 3c7c5e0
Show file tree

Hide file tree

Showing 24 changed files with 645 additions and 638 deletions.
diff --git a/ref_app/ref_app.vcxproj b/ref_app/ref_app.vcxproj
@@ -572,11 +572,11 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\mcal\rpi_pico2_rp2350\Mcal\Cpu\Cpu.cpp">
+    <ClCompile Include="src\mcal\rpi_pico2_rp2350\mcal_cpu.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\mcal\rpi_pico2_rp2350\mcal_cpu.cpp">
+    <ClCompile Include="src\mcal\rpi_pico2_rp2350\mcal_cpu_rp2350.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
@@ -1979,11 +1979,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="src\mcal\rpi_pico2_rp2350\Mcal\Cpu\Cpu.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClInclude>
-    <ClInclude Include="src\mcal\rpi_pico2_rp2350\Mcal\Gpio\Gpio.h" />
     <ClInclude Include="src\mcal\rpi_pico2_rp2350\Mcal\RP2350.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -1996,6 +1991,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="src\mcal\rpi_pico2_rp2350\mcal_cpu_rp2350.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="src\mcal\rpi_pico2_rp2350\mcal_eep.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>

diff --git a/ref_app/ref_app.vcxproj.filters b/ref_app/ref_app.vcxproj.filters
@@ -236,12 +236,6 @@
     <Filter Include="src\mcal\rpi_pico2_rp2350\Mcal\Cmsis\m-profile">
       <UniqueIdentifier>{4dec0385-4f5d-4129-81b5-da74716ebd79}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\mcal\rpi_pico2_rp2350\Mcal\Cpu">
-      <UniqueIdentifier>{5f7361ff-0d9a-4223-bcef-30455fe7d1ea}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\mcal\rpi_pico2_rp2350\Mcal\Gpio">
-      <UniqueIdentifier>{663bb776-7f47-4142-acd6-8da02d48d8fa}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\app\led\app_led.cpp">
@@ -1135,9 +1129,6 @@
     <ClCompile Include="src\mcal\stm32l432\mcal_eep.cpp">
       <Filter>src\mcal\stm32l432</Filter>
     </ClCompile>
-    <ClCompile Include="src\mcal\rpi_pico2_rp2350\Mcal\Cpu\Cpu.cpp">
-      <Filter>src\mcal\rpi_pico2_rp2350\Mcal\Cpu</Filter>
-    </ClCompile>
     <ClCompile Include="src\mcal\rpi_pico2_rp2350\mcal_irq.cpp">
       <Filter>src\mcal\rpi_pico2_rp2350</Filter>
     </ClCompile>
@@ -1168,6 +1159,9 @@
     <ClCompile Include="src\mcal\rpi_pico2_rp2350\mcal_gpt.cpp">
       <Filter>src\mcal\rpi_pico2_rp2350</Filter>
     </ClCompile>
+    <ClCompile Include="src\mcal\rpi_pico2_rp2350\mcal_cpu_rp2350.cpp">
+      <Filter>src\mcal\rpi_pico2_rp2350</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\math\calculus\derivative.h">
@@ -2709,12 +2703,6 @@
     <ClInclude Include="src\mcal\rpi_pico2_rp2350\Mcal\Cmsis\m-profile\armv7m_mpu.h">
       <Filter>src\mcal\rpi_pico2_rp2350\Mcal\Cmsis\m-profile</Filter>
     </ClInclude>
-    <ClInclude Include="src\mcal\rpi_pico2_rp2350\Mcal\Cpu\Cpu.h">
-      <Filter>src\mcal\rpi_pico2_rp2350\Mcal\Cpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\mcal\rpi_pico2_rp2350\Mcal\Gpio\Gpio.h">
-      <Filter>src\mcal\rpi_pico2_rp2350\Mcal\Gpio</Filter>
-    </ClInclude>
     <ClInclude Include="src\mcal\rpi_pico2_rp2350\mcal_irq.h">
       <Filter>src\mcal\rpi_pico2_rp2350</Filter>
     </ClInclude>
@@ -2757,6 +2745,9 @@
     <ClInclude Include="src\mcal\rpi_pico2_rp2350\mcal_gpt.h">
       <Filter>src\mcal\rpi_pico2_rp2350</Filter>
     </ClInclude>
+    <ClInclude Include="src\mcal\rpi_pico2_rp2350\mcal_cpu_rp2350.h">
+      <Filter>src\mcal\rpi_pico2_rp2350</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="src\util\STL\algorithm">

diff --git a/ref_app/src/app/benchmark/readme.md b/ref_app/src/app/benchmark/readme.md
@@ -85,6 +85,7 @@ The benchmark used is a ${\sim}100$ decimal digit AGM $\pi$ calculation.
 |--------------------|-----------------|------------|
 | `am335x`           |  1.5            |    1.0     |
 | `stm32f446`        |  5.1            |    3.4     |
+| `rpi_pico2_rp2350` |  6.2            |    4.1     |
 | `wch_ch32v307`     |  8.0            |    5.3     |
 | `rpi_pico_rp2040`  |  19             |    13      |
 | `avr`              |  420            |    280     |
@@ -108,4 +109,6 @@ time of $8.0~\text{ms}$.
 
 Using only one core (core 1) on the $32$-bit ARM(R) Cortex(R) M0+
 controller of the `rpi_pico_rp2040` board results in a calculation
-time of $19~\text{ms}$.
+time of $19~\text{ms}$. The next generation `rpi_pico2_rp2350`
+with ARM(R) Cortex(R) M33 cores beats the previous one
+with a time of $6.2~\text{ms}$, which is slightly more than $3~\text{ms}$ times faster.
diff --git a/ref_app/src/mcal/rpi_pico2_rp2350/Mcal/Cpu/Cpu.cpp b/ref_app/src/mcal/rpi_pico2_rp2350/Mcal/Cpu/Cpu.cpp
diff --git a/ref_app/src/mcal/rpi_pico2_rp2350/Mcal/Cpu/Cpu.h b/ref_app/src/mcal/rpi_pico2_rp2350/Mcal/Cpu/Cpu.h
diff --git a/ref_app/src/mcal/rpi_pico2_rp2350/Mcal/Gpio/Gpio.h b/ref_app/src/mcal/rpi_pico2_rp2350/Mcal/Gpio/Gpio.h