bring up wamr on esp32-s3 device #2348

dongsheng28849455 · 2023-07-06T08:08:52Z

esp32-s3's instruction memory and data memory can be accessed through mutual mirroring way, so we define a feature named as WASM_MEM_DUAL_BUS_MIRROR

first stage

1, define the iram checking function 2, define the ibus-dbus converting offset 3, modify address allocated by malloc 4, free the modified address allocated by malloc

into in_ibus_ext

add os_get_dbus_mirror(void *ibus) as system interface

only when ibus in its range, dbus has the offset

add compiler switch for os_mmap

format using clang-format

yamt · 2023-07-06T09:52:55Z

core/shared/platform/nuttx/nuttx_platform.c

+#if (WASM_MEM_DUAL_BUS_MIRROR != 0)
+    if ((prot & MMAP_PROT_EXEC) != 0) {
+        d_addr = malloc((uint32)size);
+        i_addr = d_addr + MEM_DUAL_BUS_OFFSET;


iirc, "NULL + x" is undefined in C

Had better not (void *) + offset, it may cause compiler error or warning.
Had better i_addr = (void *)((uint8 *)d_addr + MEM_DUAL_BUS_OFFSET);

use clang-format12 to format check NULL when malloc

donghengqaz · 2023-07-10T06:45:44Z

core/iwasm/aot/arch/aot_reloc_xtensa.c

@@ -219,6 +222,9 @@ apply_relocation(AOTModule *module, uint8 *target_section_addr,
            initial_addend = *(int32 *)insn_addr;
            *(uintptr_t *)insn_addr = (uintptr_t)symbol_addr + initial_addend
                                      + (intptr_t)reloc_addend;
+#if (WASM_MEM_DUAL_BUS_MIRROR != 0)
+            os_dcache_flush();


Don't need to flush cache in each relocation, when this done, load_from_sections will do this when loading sections is done.

How about adding some comments in this PR? developer may be confused about the code.

donghengqaz · 2023-07-10T06:46:08Z

core/iwasm/aot/arch/aot_reloc_xtensa.c

@@ -286,6 +296,9 @@ apply_relocation(AOTModule *module, uint8 *target_section_addr,
 #pragma GCC diagnostic pop
 #endif

+#if (WASM_MEM_DUAL_BUS_MIRROR != 0)
+            os_dcache_flush();


The same as upper comment.

donghengqaz · 2023-07-10T06:48:52Z

core/shared/platform/nuttx/nuttx_platform.c

+            return NULL;
+        }
+        i_addr = d_addr + MEM_DUAL_BUS_OFFSET;
+        return in_ibus_ext(i_addr) ? i_addr : d_addr;


By a way, not only external RAM(PSRAM) use mirror bus address, but also internal RAM(SRAM) is the same. So maybe you use this solution for internal RAM, too.

you mean we should indicate from where to allocate before we do it? and do they have different allocator?

Yes, to make nuttx platform easier to use, we could make it support to load AOT to sram and run.

and add some comments for the PR motivation esp32-s3 requires special steps for cache flush

align the void* into int8*

unit8 * not int8*

dongsheng28849455 · 2023-07-17T08:55:51Z

@donghengqaz @wenyongh @yamt any other comments?

wenyongh

LGTM, several minor comments

core/iwasm/aot/aot_loader.c

core/iwasm/aot/arch/aot_reloc_xtensa.c

no1wudi · 2023-07-20T01:19:53Z

core/shared/platform/nuttx/nuttx_platform.c

@@ -10,6 +10,46 @@
 #include <nuttx/arch.h>
 #endif

+#if defined(CONFIG_ARCH_CHIP_ESP32S3) && (CONFIG_ARCH_CHIP_ESP32S3 != 0)


"#ifdef CONFIG_ARCH_CHIP_ESP32S3" is enough

what about the case of "#define CONFIG_ARCH_CHIP_ESP32S3 0"?

This definition is generated from Kconfig automatically, if ARCH_CHIP_ESP32S3 not selected in Kconfig, it should delete this line instead of define it as 0, I guess.

…o-runtime into local_bringup-wamr-on-esp32-s3-device-001

Asserting the validity of memory address

donghengqaz · 2023-07-20T06:44:37Z

When this PR is merged, I plan to add WAMR to espressif official components management, this can help more people to use WAMR more easily.

Only check if the compilation switch exists on nuttx to determine the function on or off

shreeve · 2023-11-17T18:13:21Z

@donghengqaz - Phenomenal work on this! You mentioned you would be adding WAMR to espressif official components management. Do you have an update on that?

donghengqaz · 2023-11-20T05:58:11Z

@donghengqaz - Phenomenal work on this! You mentioned you would be adding WAMR to espressif official components management. Do you have an update on that?

Hi @shreeve I have been busy with some other development work, so have not started to do this. And after these things are done, I will start this.

yamt · 2024-05-08T07:01:34Z

@donghengqaz can you share nuttx kconfig you used for this?

yamt · 2024-05-08T07:08:34Z

@donghengqaz can you share nuttx kconfig you used for this?

well, i meant @dongsheng28849455 . wrong completion, sorry.

dongsheng28849455 · 2024-05-08T07:43:32Z

@donghengqaz can you share nuttx kconfig you used for this?

well, i meant @dongsheng28849455 . wrong completion, sorry.

it is CONFIG_INTERPRETERS_WAMR_MEM_DUAL_BUS_MIRROR

yamt · 2024-05-10T09:33:52Z

@donghengqaz can you share nuttx kconfig you used for this?

well, i meant @dongsheng28849455 . wrong completion, sorry.

it is CONFIG_INTERPRETERS_WAMR_MEM_DUAL_BUS_MIRROR

there is no such a config in https://github.com/apache/nuttx-apps.
i guess you are talking about your private fork?

also, i want to see the whole config.
(because i was struggling to find out a combination of memory configs which can work.)

dongsheng28849455 · 2024-05-11T01:08:13Z

i guess you are talking about your private fork?

It's defined in https://github.com/midokura/incubator-nuttx-apps fork

because i was struggling to find out a combination of memory configs which can work

What is whole config you mean? is that something could enable several hidden APIs in esp32-s3?

    extern void cache_writeback_all(void);
    extern uint32_t Cache_Disable_ICache(void);
    extern void Cache_Enable_ICache(uint32_t autoload);

yamt · 2024-05-11T06:07:49Z

i guess you are talking about your private fork?

It's defined in https://github.com/midokura/incubator-nuttx-apps fork

ok. it's a private fork.
do you have any plan to upstream necessary changes?

because i was struggling to find out a combination of memory configs which can work

What is whole config you mean? is that something could enable several hidden APIs in esp32-s3?
    extern void cache_writeback_all(void);
    extern uint32_t Cache_Disable_ICache(void);
    extern void Cache_Enable_ICache(uint32_t autoload);

i meant a complete working ".config" file.

specifically i wanted to know values for:
CONFIG_ARCH_USE_TEXT_HEAP
CONFIG_XTENSA_IMEM_USE_SEPARATE_HEAP
CONFIG_ESP32S3_RTC_HEAP
CONFIG_MM_KERNEL_HEAP
CONFIG_ESP32S3_SPIRAM
CONFIG_BUILD_FLAT
CONFIG_BUILD_PROTECTED
CONFIG_ESP32S3_SPIRAM_COMMON_HEAP
etc

but now i suspect this PR is not expected to work with upstream nuttx. is it the case?

dongsheng28849455 · 2024-05-11T06:42:09Z

the feature quite depends on esp32-s3's implementation, including the config. that might or not delivered into nuttx upstream. I don't have a plan to abstract an interface for Nuttx to use here.

The corresponding WAMR change: bytecodealliance/wasm-micro-runtime#2348

yamt · 2024-05-13T04:54:53Z

the feature quite depends on esp32-s3's implementation, including the config. that might or not delivered into nuttx upstream. I don't have a plan to abstract an interface for Nuttx to use here.

i needed the following changes to make it work on esp32s3-devkit.
#3421
apache/nuttx#12328
apache/nuttx-apps#2385

xiaoxiang781216 · 2024-05-13T10:10:06Z

the feature quite depends on esp32-s3's implementation, including the config. that might or not delivered into nuttx upstream. I don't have a plan to abstract an interface for Nuttx to use here.

why adding esp32s3 specific code to the common wamr runtime? @no1wudi please review the arch specific change carefully, we need ensure ALL chips on nuttx get the equal support.

The corresponding WAMR change: bytecodealliance/wasm-micro-runtime#2348

esp32-s3's instruction memory and data memory can be accessed through mutual mirroring way, so we define a new feature named as WASM_MEM_DUAL_BUS_MIRROR.

dongsheng28849455 added 7 commits July 6, 2023 16:35

first stage

dea8a90

first stage

limit the scope to a specific chip of esp32-s3

6bce421

1, define the iram checking function 2, define the ibus-dbus converting offset 3, modify address allocated by malloc 4, free the modified address allocated by malloc

rename the is_in_iram

dd65056

into in_ibus_ext

add WASM_MEM_DUAL_BUS_MIRROR options in wamr

0bc5d7c

add os_get_dbus_mirror(void *ibus) as system interface

only when ibus in its range, dbus has the offset

a8a9c0d

only when ibus in its range, dbus has the offset

add compiler switch for os_mmap

a353d46

add compiler switch for os_mmap

format using clang-format

6aba288

format using clang-format

dongsheng28849455 force-pushed the dev/bringup-wamr-on-esp32-s3-device branch from 5c5113c to 6aba288 Compare July 6, 2023 08:50

yamt reviewed Jul 6, 2023

View reviewed changes

use clang-format12 to format

8f19652

use clang-format12 to format check NULL when malloc

donghengqaz reviewed Jul 10, 2023

View reviewed changes

dongsheng28849455 added 3 commits July 17, 2023 11:28

remove the redundant dcache flush

b3c0ccf

and add some comments for the PR motivation esp32-s3 requires special steps for cache flush

align the void* into int8*

a6db8c4

align the void* into int8*

unit8 * not int8*

ac9d38d

unit8 * not int8*

dongsheng28849455 requested review from donghengqaz, wenyongh and yamt July 18, 2023 06:42

wenyongh reviewed Jul 18, 2023

View reviewed changes

core/iwasm/aot/aot_loader.c Show resolved Hide resolved

core/iwasm/aot/arch/aot_reloc_xtensa.c Show resolved Hide resolved

core/iwasm/aot/arch/aot_reloc_xtensa.c Show resolved Hide resolved

no1wudi reviewed Jul 20, 2023

View reviewed changes

dongsheng28849455 added 2 commits July 20, 2023 11:55

Merge branch 'main' of https://github.com/dongsheng28849455/wasm-micr…

d6ebcdc

…o-runtime into local_bringup-wamr-on-esp32-s3-device-001

Asserting the validity of memory address

9db220b

Asserting the validity of memory address

compilation switch check

5ec6715

Only check if the compilation switch exists on nuttx to determine the function on or off

wenyongh merged commit fbe072c into bytecodealliance:main Jul 20, 2023

yamt added a commit to yamt/incubator-nuttx-apps that referenced this pull request May 13, 2024

wamr: Add a few options for esp32s3

1a740d2

The corresponding WAMR change: bytecodealliance/wasm-micro-runtime#2348

yamt mentioned this pull request May 13, 2024

wamr: Add a few options for esp32s3 apache/nuttx-apps#2385

Merged

xiaoxiang781216 pushed a commit to apache/nuttx-apps that referenced this pull request May 14, 2024

wamr: Add a few options for esp32s3

f50fbe7

The corresponding WAMR change: bytecodealliance/wasm-micro-runtime#2348

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bring up wamr on esp32-s3 device #2348

bring up wamr on esp32-s3 device #2348

dongsheng28849455 commented Jul 6, 2023

yamt Jul 6, 2023

wenyongh Jul 10, 2023

donghengqaz Jul 10, 2023

wenyongh Jul 10, 2023

donghengqaz Jul 10, 2023

donghengqaz Jul 10, 2023

dongsheng28849455 Jul 10, 2023 •

edited

Loading

donghengqaz Jul 10, 2023

dongsheng28849455 commented Jul 17, 2023

wenyongh left a comment

no1wudi Jul 20, 2023

dongsheng28849455 Jul 20, 2023

no1wudi Jul 20, 2023

donghengqaz commented Jul 20, 2023

shreeve commented Nov 17, 2023

donghengqaz commented Nov 20, 2023

yamt commented May 8, 2024

yamt commented May 8, 2024

dongsheng28849455 commented May 8, 2024

yamt commented May 10, 2024

dongsheng28849455 commented May 11, 2024

yamt commented May 11, 2024

dongsheng28849455 commented May 11, 2024

yamt commented May 13, 2024

xiaoxiang781216 commented May 13, 2024

bring up wamr on esp32-s3 device #2348

bring up wamr on esp32-s3 device #2348

Conversation

dongsheng28849455 commented Jul 6, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dongsheng28849455 Jul 10, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dongsheng28849455 commented Jul 17, 2023

wenyongh left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

donghengqaz commented Jul 20, 2023

shreeve commented Nov 17, 2023

donghengqaz commented Nov 20, 2023

yamt commented May 8, 2024

yamt commented May 8, 2024

dongsheng28849455 commented May 8, 2024

yamt commented May 10, 2024

dongsheng28849455 commented May 11, 2024

yamt commented May 11, 2024

dongsheng28849455 commented May 11, 2024

yamt commented May 13, 2024

xiaoxiang781216 commented May 13, 2024

dongsheng28849455 Jul 10, 2023 •

edited

Loading