christoph/wamr
1
Fork 0
Code Releases Activity

Update sample workload wasm-av1 and add workload XNNPACK (#443)

Browse Source
This commit is contained in:
Wenyong Huang
2020-11-13 17:53:23 +08:00
committed by GitHub
parent a2641e174a
commit 892af84161
17 changed files with 1474 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/iwasm/aot/aot_reloc.h
View File

@ -36,6 +36,8 @@ typedef struct {
REG_SYM(aot_call_indirect), \
REG_SYM(wasm_runtime_enlarge_memory), \
REG_SYM(wasm_runtime_set_exception), \
REG_SYM(memset), \
REG_SYM(memmove), \
REG_BULK_MEMORY_SYM() \
REG_ATOMIC_WAIT_SYM()
#else /* else of (defined(_WIN32) || defined(_WIN32_)) && defined(NDEBUG) */
@ -45,6 +47,8 @@ typedef struct {
REG_SYM(aot_call_indirect), \
REG_SYM(wasm_runtime_enlarge_memory), \
REG_SYM(wasm_runtime_set_exception), \
REG_SYM(memset), \
REG_SYM(memmove), \
REG_SYM(fmin), \
REG_SYM(fminf), \
REG_SYM(fmax), \

19
core/iwasm/libraries/libc-builtin/libc_builtin_wrapper.c
View File

@ -1007,6 +1007,21 @@ __cxa_throw_wrapper(wasm_exec_env_t exec_env,
wasm_runtime_set_exception(module_inst, buf);
}
static int
setjmp_wrapper(wasm_exec_env_t exec_env,
void *jmp_buf)
{
os_printf("in setjmp()\n");
return 0;
}
static void
longjmp_wrapper(wasm_exec_env_t exec_env,
void *jmp_buf, int val)
{
os_printf("in longjmp()\n");
}
#if WASM_ENABLE_SPEC_TEST != 0
static void
print_wrapper(wasm_exec_env_t exec_env)
@ -1104,7 +1119,9 @@ static NativeSymbol native_symbols_libc_builtin[] = {
REG_NATIVE_FUNC(nullFunc_X, "(i)"),
REG_NATIVE_FUNC(__cxa_allocate_exception, "(i)i"),
REG_NATIVE_FUNC(__cxa_begin_catch, "(*)"),
REG_NATIVE_FUNC(__cxa_throw, "(**i)")
REG_NATIVE_FUNC(__cxa_throw, "(**i)"),
REG_NATIVE_FUNC(setjmp, "(*)i"),
REG_NATIVE_FUNC(longjmp, "(*i)"),
};
#if WASM_ENABLE_SPEC_TEST != 0

152
core/iwasm/libraries/libc-emcc/libc_emcc_wrapper.c
View File

@ -11,18 +11,27 @@
#define get_module_inst(exec_env) \
wasm_runtime_get_module_inst(exec_env)
#define validate_app_addr(offset, size) \
wasm_runtime_validate_app_addr(module_inst, offset, size)
#define validate_app_str_addr(offset) \
wasm_runtime_validate_app_str_addr(module_inst, offset)
#define validate_native_addr(addr, size) \
wasm_runtime_validate_native_addr(module_inst, addr, size)
#define addr_app_to_native(offset) \
wasm_runtime_addr_app_to_native(module_inst, offset)
#define addr_native_to_app(ptr) \
wasm_runtime_addr_native_to_app(module_inst, ptr)
#define module_malloc(size, p_native_addr) \
wasm_runtime_module_malloc(module_inst, size, p_native_addr)
#define module_free(offset) \
wasm_runtime_module_free(module_inst, offset)
#define REG_NATIVE_FUNC(func_name, signature) \
{ #func_name, func_name##_wrapper, signature, NULL }
extern bool
wasm_runtime_call_indirect(wasm_exec_env_t exec_env,
uint32 element_idx,
@ -282,12 +291,15 @@ fopen_wrapper(wasm_exec_env_t exec_env,
int file_id;
if (pathname == NULL || mode == NULL)
return -1;
return 0;
if ((file_id = get_free_file_slot()) == -1)
return -1;
return 0;
file = fopen(pathname, mode);
if (!file)
return 0;
file_list[file_id] = file;
return file_id + 1;
}
@ -308,6 +320,22 @@ fread_wrapper(wasm_exec_env_t exec_env,
return (uint32)fread(ptr, size, nmemb, file);
}
static int
fseeko_wrapper(wasm_exec_env_t exec_env,
int file_id, int64 offset, int whence)
{
FILE *file;
file_id = file_id - 1;
if ((unsigned)file_id >= sizeof(file_list) / sizeof(FILE *)) {
return -1;
}
if ((file = file_list[file_id]) == NULL) {
return -1;
}
return (uint32)fseek(file, offset, whence);
}
static uint32
emcc_fwrite_wrapper(wasm_exec_env_t exec_env,
const void *ptr, uint32 size, uint32 nmemb,
@ -351,6 +379,113 @@ fclose_wrapper(wasm_exec_env_t exec_env, int file_id)
file_list[file_id] = NULL;
return fclose(file);
}
static int
__sys_mkdir_wrapper(wasm_exec_env_t exec_env,
const char *pathname, int mode)
{
if (!pathname)
return -1;
return mkdir(pathname, mode);
}
static int
__sys_rmdir_wrapper(wasm_exec_env_t exec_env, const char *pathname)
{
if (!pathname)
return -1;
return rmdir(pathname);
}
static int
__sys_unlink_wrapper(wasm_exec_env_t exec_env, const char *pathname)
{
if (!pathname)
return -1;
return unlink(pathname);
}
static uint32
__sys_getcwd_wrapper(wasm_exec_env_t exec_env, char *buf, uint32 size)
{
wasm_module_inst_t module_inst = get_module_inst(exec_env);
char *ret;
if (!buf)
return -1;
ret = getcwd(buf, size);
return ret ? addr_native_to_app(ret) : 0;
}
#include <sys/utsname.h>
struct utsname_app {
char sysname[64];
char nodename[64];
char release[64];
char version[64];
char machine[64];
char domainname[64];
};
static int
__sys_uname_wrapper(wasm_exec_env_t exec_env, struct utsname_app *uname_app)
{
wasm_module_inst_t module_inst = get_module_inst(exec_env);
struct utsname uname_native = { 0 };
uint32 length;
if (!validate_native_addr(uname_app, sizeof(struct utsname_app)))
return -1;
if (uname(&uname_native) != 0) {
return -1;
}
memset(uname_app, 0, sizeof(struct utsname_app));
length = strlen(uname_native.sysname);
if (length > sizeof(uname_app->sysname) - 1)
length = sizeof(uname_app->sysname) - 1;
bh_memcpy_s(uname_app->sysname, sizeof(uname_app->sysname),
uname_native.sysname, length);
length = strlen(uname_native.nodename);
if (length > sizeof(uname_app->nodename) - 1)
length = sizeof(uname_app->nodename) - 1;
bh_memcpy_s(uname_app->nodename, sizeof(uname_app->nodename),
uname_native.nodename, length);
length = strlen(uname_native.release);
if (length > sizeof(uname_app->release) - 1)
length = sizeof(uname_app->release) - 1;
bh_memcpy_s(uname_app->release, sizeof(uname_app->release),
uname_native.release, length);
length = strlen(uname_native.version);
if (length > sizeof(uname_app->version) - 1)
length = sizeof(uname_app->version) - 1;
bh_memcpy_s(uname_app->version, sizeof(uname_app->version),
uname_native.version, length);
#ifdef _GNU_SOURCE
length = strlen(uname_native.domainname);
if (length > sizeof(uname_app->domainname) - 1)
length = sizeof(uname_app->domainname) - 1;
bh_memcpy_s(uname_app->domainname, sizeof(uname_app->domainname),
uname_native.domainname, length);
#endif
return 0;
}
static void
emscripten_notify_memory_growth_wrapper(wasm_exec_env_t exec_env, int i)
{
(void)i;
}
#endif /* end of BH_PLATFORM_LINUX_SGX */
#define REG_NATIVE_FUNC(func_name, signature) \
@ -374,9 +509,16 @@ static NativeSymbol native_symbols_libc_emcc[] = {
#if !defined(BH_PLATFORM_LINUX_SGX)
REG_NATIVE_FUNC(fopen, "($$)i"),
REG_NATIVE_FUNC(fread, "(*iii)i"),
REG_NATIVE_FUNC(fseeko, "(iIi)i"),
REG_NATIVE_FUNC(emcc_fwrite, "(*iii)i"),
REG_NATIVE_FUNC(feof, "(i)i"),
REG_NATIVE_FUNC(fclose, "(i)i"),
REG_NATIVE_FUNC(__sys_mkdir, "($i)i"),
REG_NATIVE_FUNC(__sys_rmdir, "($)i"),
REG_NATIVE_FUNC(__sys_unlink, "($)i"),
REG_NATIVE_FUNC(__sys_getcwd, "(*~)i"),
REG_NATIVE_FUNC(__sys_uname, "(*)i"),
REG_NATIVE_FUNC(emscripten_notify_memory_growth, "(i)"),
#endif /* end of BH_PLATFORM_LINUX_SGX */
};