Skip to content

Commit 01251c9

Browse files
ckormanyosckormanyos
committed
Adapt esp32s3 to the standard startup form
1 parent 8ccff3f commit 01251c9

22 files changed

Lines changed: 353 additions & 382 deletions

‎ref_app/src/app/benchmark/app_benchmark.h‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -64,51 +64,51 @@
6464

6565
namespace app { namespace benchmark {
6666

67-
#if (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_NONE))
67+
#if (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_NONE)
6868
auto run_none() -> bool;
69-
#elif (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_COMPLEX))
69+
#elif (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_COMPLEX)
7070
auto run_complex() -> bool;
71-
#elif (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_CRC))
71+
#elif (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_CRC)
7272
auto run_crc() -> bool;
73-
#elif (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_FAST_MATH))
73+
#elif (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_FAST_MATH)
7474
auto run_fast_math() -> bool;
75-
#elif (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_FILTER))
75+
#elif (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_FILTER)
7676
auto run_filter() -> bool;
77-
#elif (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_FIXED_POINT))
77+
#elif (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_FIXED_POINT)
7878
auto run_fixed_point() -> bool;
79-
#elif (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_FLOAT))
79+
#elif (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_FLOAT)
8080
auto run_float() -> bool;
81-
#elif (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_WIDE_INTEGER))
81+
#elif (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_WIDE_INTEGER)
8282
auto run_wide_integer() -> bool;
83-
#elif (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_PI_SPIGOT))
83+
#elif (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_PI_SPIGOT)
8484
auto run_pi_spigot() -> bool;
85-
#elif (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_PI_SPIGOT_SINGLE))
85+
#elif (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_PI_SPIGOT_SINGLE)
8686
auto run_pi_spigot_single() -> bool;
87-
#elif (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_HASH))
87+
#elif (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_HASH)
8888
auto run_hash() -> bool;
89-
#elif (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_WIDE_DECIMAL))
89+
#elif (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_WIDE_DECIMAL)
9090
auto run_wide_decimal() -> bool;
91-
#elif (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_TRAPEZOID_INTEGRAL))
91+
#elif (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_TRAPEZOID_INTEGRAL)
9292
auto run_trapezoid_integral() -> bool;
93-
#elif (defined(APP_BENCHMARK_TYPE) && ((APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_PI_AGM) || (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_PI_AGM_100)))
93+
#elif ((APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_PI_AGM) || (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_PI_AGM_100))
9494
auto run_pi_agm() -> bool;
95-
#elif (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_BOOST_MATH_CBRT_TGAMMA))
95+
#elif (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_BOOST_MATH_CBRT_TGAMMA)
9696
auto run_boost_math_cbrt_tgamma() -> bool;
97-
#elif (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_CNL_SCALED_INTEGER))
97+
#elif (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_CNL_SCALED_INTEGER)
9898
auto run_cnl_scaled_integer() -> bool;
99-
#elif (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_SOFT_DOUBLE_H2F1))
99+
#elif (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_SOFT_DOUBLE_H2F1)
100100
auto run_soft_double_h2f1() -> bool;
101-
#elif (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_BOOST_MULTIPRECISION_CBRT))
101+
#elif (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_BOOST_MULTIPRECISION_CBRT)
102102
auto run_boost_multiprecision_cbrt() -> bool;
103-
#elif (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_BOOST_MATH_CYL_BESSEL_J))
103+
#elif (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_BOOST_MATH_CYL_BESSEL_J)
104104
auto run_boost_math_cbrt_cyl_bessel_j() -> bool;
105-
#elif (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_HASH_SHA256))
105+
#elif (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_HASH_SHA256)
106106
auto run_hash_sha256() -> bool;
107-
#elif (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_ECC_GENERIC_ECC))
107+
#elif (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_ECC_GENERIC_ECC)
108108
auto run_ecc_generic_ecc() -> bool;
109-
#elif (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_NON_STD_DECIMAL))
109+
#elif (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_NON_STD_DECIMAL)
110110
auto run_non_std_decimal() -> bool;
111-
#elif (defined(APP_BENCHMARK_TYPE) && (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_BOOST_CRYPT_HASHER))
111+
#elif (APP_BENCHMARK_TYPE == APP_BENCHMARK_TYPE_BOOST_CRYPT_HASHER)
112112
auto run_boost_crypt_hasher() -> bool;
113113
#else
114114
#error APP_BENCHMARK_TYPE is undefined.

‎ref_app/target.vcxproj‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,14 +1002,13 @@
10021002
<None Include="target\micros\xtensa32\startup\boot_app0.bin" />
10031003
<None Include="target\micros\xtensa32\startup\partitions.bin" />
10041004
<None Include="target\micros\xtensa32\startup\partitions.csv" />
1005-
<None Include="target\micros\xtensa_esp32_s3\make\from_no_sdk\Memory_Map.ld" />
10061005
<None Include="target\micros\xtensa_esp32_s3\make\xtensa_esp32_s3.ld" />
10071006
<None Include="target\micros\xtensa_esp32_s3\make\xtensa_esp32_s3_files.gmk" />
10081007
<None Include="target\micros\xtensa_esp32_s3\make\xtensa_esp32_s3_flags.gmk" />
1009-
<None Include="target\micros\xtensa_esp32_s3\startup\from_no_sdk\Startup\boot.s" />
1010-
<None Include="target\micros\xtensa_esp32_s3\startup\from_no_sdk\Startup\IntVectTable.s" />
1011-
<None Include="target\micros\xtensa_esp32_s3\startup\from_no_sdk\Std\ieee754-sf.S" />
1012-
<None Include="target\micros\xtensa_esp32_s3\startup\from_no_sdk\Std\lib1funcs.S" />
1008+
<None Include="target\micros\xtensa_esp32_s3\startup\boot.s" />
1009+
<None Include="target\micros\xtensa_esp32_s3\startup\IntVectTable.s" />
1010+
<None Include="target\micros\xtensa_esp32_s3\startup\Std\ieee754-sf.S" />
1011+
<None Include="target\micros\xtensa_esp32_s3\startup\Std\lib1funcs.S" />
10131012
</ItemGroup>
10141013
<ItemGroup>
10151014
<ClCompile Include="target\micros\am335x\startup\crt0.cpp" />
@@ -1110,14 +1109,22 @@
11101109
<ClCompile Include="target\micros\wch_ch32v307_llvm\startup\int_vect.cpp" />
11111110
<ClCompile Include="target\micros\xtensa32\startup\app_main.cpp" />
11121111
<ClCompile Include="target\micros\xtensa32\startup\esp_stubs.cpp" />
1113-
<ClCompile Include="target\micros\xtensa_esp32_s3\startup\from_no_sdk\Startup\Startup.cpp" />
1114-
<ClCompile Include="target\micros\xtensa_esp32_s3\startup\from_no_sdk\Std\StdLib.cpp" />
1112+
<ClCompile Include="target\micros\xtensa_esp32_s3\startup\crt0.cpp" />
1113+
<ClCompile Include="target\micros\xtensa_esp32_s3\startup\crt0_init_ram.cpp" />
1114+
<ClCompile Include="target\micros\xtensa_esp32_s3\startup\crt1.cpp" />
1115+
<ClCompile Include="target\micros\xtensa_esp32_s3\startup\Std\StdLib.cpp" />
11151116
</ItemGroup>
11161117
<ItemGroup>
11171118
<Text Include="target\micros\bcm2835_raspi_b\startup\SD_CARD\PiZero\config.txt" />
11181119
</ItemGroup>
11191120
<ItemGroup>
1120-
<ClInclude Include="target\micros\xtensa_esp32_s3\startup\from_no_sdk\Std\core-isa.h" />
1121+
<ClInclude Include="target\micros\xtensa_esp32_s3\startup\Std\core-isa.h" />
1122+
</ItemGroup>
1123+
<ItemGroup>
1124+
<Library Include="target\micros\xtensa_esp32_s3\startup\Std\lib_call0_abi\libc_call0_abi.a" />
1125+
<Library Include="target\micros\xtensa_esp32_s3\startup\Std\lib_call0_abi\libgcc_call0_abi.a" />
1126+
<Library Include="target\micros\xtensa_esp32_s3\startup\Std\lib_call0_abi\libg_call0_abi.a" />
1127+
<Library Include="target\micros\xtensa_esp32_s3\startup\Std\lib_call0_abi\libm_call0_abi.a" />
11211128
</ItemGroup>
11221129
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
11231130
<ImportGroup Label="ExtensionTargets">

‎ref_app/target.vcxproj.filters‎

Lines changed: 38 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -274,17 +274,11 @@
274274
<Filter Include="micros\xtensa_esp32_s3\startup">
275275
<UniqueIdentifier>{994eddc5-98b8-4dc2-90a0-063c58d87ca5}</UniqueIdentifier>
276276
</Filter>
277-
<Filter Include="micros\xtensa_esp32_s3\startup\from_no_sdk">
278-
<UniqueIdentifier>{93e83c04-3422-4379-aa96-ff361f0a1182}</UniqueIdentifier>
277+
<Filter Include="micros\xtensa_esp32_s3\startup\Std">
278+
<UniqueIdentifier>{2d73e943-130e-4430-8685-2e5d4159cd42}</UniqueIdentifier>
279279
</Filter>
280-
<Filter Include="micros\xtensa_esp32_s3\startup\from_no_sdk\Startup">
281-
<UniqueIdentifier>{a6fbc775-11bf-4616-9222-dfc71407f4d1}</UniqueIdentifier>
282-
</Filter>
283-
<Filter Include="micros\xtensa_esp32_s3\make\from_no_sdk">
284-
<UniqueIdentifier>{a879067c-46c2-422e-95fd-d14bca6182f5}</UniqueIdentifier>
285-
</Filter>
286-
<Filter Include="micros\xtensa_esp32_s3\startup\from_no_sdk\Std">
287-
<UniqueIdentifier>{bb3630a3-8596-4a16-86a5-b33a7f4eaf52}</UniqueIdentifier>
280+
<Filter Include="micros\xtensa_esp32_s3\startup\Std\lib_call0_abi">
281+
<UniqueIdentifier>{72fe792d-0dc8-46d7-bb65-4dab74184cf7}</UniqueIdentifier>
288282
</Filter>
289283
</ItemGroup>
290284
<ItemGroup>
@@ -642,20 +636,17 @@
642636
<None Include="target\micros\xtensa_esp32_s3\make\xtensa_esp32_s3_flags.gmk">
643637
<Filter>micros\xtensa_esp32_s3\make</Filter>
644638
</None>
645-
<None Include="target\micros\xtensa_esp32_s3\startup\from_no_sdk\Startup\IntVectTable.s">
646-
<Filter>micros\xtensa_esp32_s3\startup\from_no_sdk\Startup</Filter>
639+
<None Include="target\micros\xtensa_esp32_s3\startup\boot.s">
640+
<Filter>micros\xtensa_esp32_s3\startup</Filter>
647641
</None>
648-
<None Include="target\micros\xtensa_esp32_s3\startup\from_no_sdk\Startup\boot.s">
649-
<Filter>micros\xtensa_esp32_s3\startup\from_no_sdk\Startup</Filter>
642+
<None Include="target\micros\xtensa_esp32_s3\startup\IntVectTable.s">
643+
<Filter>micros\xtensa_esp32_s3\startup</Filter>
650644
</None>
651-
<None Include="target\micros\xtensa_esp32_s3\make\from_no_sdk\Memory_Map.ld">
652-
<Filter>micros\xtensa_esp32_s3\make\from_no_sdk</Filter>
645+
<None Include="target\micros\xtensa_esp32_s3\startup\Std\ieee754-sf.S">
646+
<Filter>micros\xtensa_esp32_s3\startup\Std</Filter>
653647
</None>
654-
<None Include="target\micros\xtensa_esp32_s3\startup\from_no_sdk\Std\ieee754-sf.S">
655-
<Filter>micros\xtensa_esp32_s3\startup\from_no_sdk\Std</Filter>
656-
</None>
657-
<None Include="target\micros\xtensa_esp32_s3\startup\from_no_sdk\Std\lib1funcs.S">
658-
<Filter>micros\xtensa_esp32_s3\startup\from_no_sdk\Std</Filter>
648+
<None Include="target\micros\xtensa_esp32_s3\startup\Std\lib1funcs.S">
649+
<Filter>micros\xtensa_esp32_s3\startup\Std</Filter>
659650
</None>
660651
</ItemGroup>
661652
<ItemGroup>
@@ -953,11 +944,17 @@
953944
<ClCompile Include="target\micros\xtensa32\startup\esp_stubs.cpp">
954945
<Filter>micros\xtensa32\startup</Filter>
955946
</ClCompile>
956-
<ClCompile Include="target\micros\xtensa_esp32_s3\startup\from_no_sdk\Startup\Startup.cpp">
957-
<Filter>micros\xtensa_esp32_s3\startup\from_no_sdk\Startup</Filter>
947+
<ClCompile Include="target\micros\xtensa_esp32_s3\startup\crt1.cpp">
948+
<Filter>micros\xtensa_esp32_s3\startup</Filter>
949+
</ClCompile>
950+
<ClCompile Include="target\micros\xtensa_esp32_s3\startup\crt0.cpp">
951+
<Filter>micros\xtensa_esp32_s3\startup</Filter>
958952
</ClCompile>
959-
<ClCompile Include="target\micros\xtensa_esp32_s3\startup\from_no_sdk\Std\StdLib.cpp">
960-
<Filter>micros\xtensa_esp32_s3\startup\from_no_sdk\Std</Filter>
953+
<ClCompile Include="target\micros\xtensa_esp32_s3\startup\crt0_init_ram.cpp">
954+
<Filter>micros\xtensa_esp32_s3\startup</Filter>
955+
</ClCompile>
956+
<ClCompile Include="target\micros\xtensa_esp32_s3\startup\Std\StdLib.cpp">
957+
<Filter>micros\xtensa_esp32_s3\startup\Std</Filter>
961958
</ClCompile>
962959
</ItemGroup>
963960
<ItemGroup>
@@ -966,8 +963,22 @@
966963
</Text>
967964
</ItemGroup>
968965
<ItemGroup>
969-
<ClInclude Include="target\micros\xtensa_esp32_s3\startup\from_no_sdk\Std\core-isa.h">
970-
<Filter>micros\xtensa_esp32_s3\startup\from_no_sdk\Std</Filter>
966+
<ClInclude Include="target\micros\xtensa_esp32_s3\startup\Std\core-isa.h">
967+
<Filter>micros\xtensa_esp32_s3\startup\Std</Filter>
971968
</ClInclude>
972969
</ItemGroup>
970+
<ItemGroup>
971+
<Library Include="target\micros\xtensa_esp32_s3\startup\Std\lib_call0_abi\libc_call0_abi.a">
972+
<Filter>micros\xtensa_esp32_s3\startup\Std\lib_call0_abi</Filter>
973+
</Library>
974+
<Library Include="target\micros\xtensa_esp32_s3\startup\Std\lib_call0_abi\libg_call0_abi.a">
975+
<Filter>micros\xtensa_esp32_s3\startup\Std\lib_call0_abi</Filter>
976+
</Library>
977+
<Library Include="target\micros\xtensa_esp32_s3\startup\Std\lib_call0_abi\libgcc_call0_abi.a">
978+
<Filter>micros\xtensa_esp32_s3\startup\Std\lib_call0_abi</Filter>
979+
</Library>
980+
<Library Include="target\micros\xtensa_esp32_s3\startup\Std\lib_call0_abi\libm_call0_abi.a">
981+
<Filter>micros\xtensa_esp32_s3\startup\Std\lib_call0_abi</Filter>
982+
</Library>
983+
</ItemGroup>
973984
</Project>

‎ref_app/target/micros/xtensa_esp32_s3/make/from_no_sdk/Memory_Map.ld‎

Lines changed: 0 additions & 144 deletions
This file was deleted.

‎ref_app/target/micros/xtensa_esp32_s3/make/from_no_sdk/libgcc.a‎

-816 KB
Binary file not shown.

0 commit comments

Comments
 (0)