Add fmod functions to wasm_libc_rt (#5375)

* Add fmod to wasm_libc_rt, add f128 functions as well

* Better triage for some failing tests

* Remove unnecessary math.h import from test_float_builtins.c

* Add comment, rename op->func

Author: jgravelle-google

emscripten.py

@@ -1979,7 +1979,8 @@ def wrapped():
   args += ['--global-base=%d' % shared.Settings.GLOBAL_BASE]
   args += ['--initial-memory=%d' % shared.Settings.TOTAL_MEMORY]
   args += ['--allow-memory-growth'] if shared.Settings.ALLOW_MEMORY_GROWTH else []
-  args += ['-l', compiler_rt_lib, '-l', libc_rt_lib]
+  args += ['-l', libc_rt_lib]
+  args += ['-l', compiler_rt_lib]
   return args
 
 

tests/core/test_float_builtins.c

@@ -1,17 +1,24 @@
 #include <stdio.h>
-#include <math.h>
+
+// Prints the float/double/long double versions of the given function
+// e.g.: TEST(fmax) prints fmaxf : fmax : fmaxl
+#define TEST(func)                    \
+    printf("%f : %f : %Lf\n",         \
+        __builtin_##func##f(f1, f2),  \
+        __builtin_##func(d1, d2),     \
+        __builtin_##func##l(l1, l2));
 
 int main() {
     float f1 = 0.1234f;
     float f2 = 0.5678f;
     double d1 = 1.0101;
     double d2 = 0.10101;
-    printf(
-        "%f\n%f\n%f\n%f\n",
-        __builtin_fmaxf(f1, f2),
-        __builtin_fminf(f1, f2),
-        __builtin_fmax(d1, d2),
-        __builtin_fmin(d1, d2)
-    );
+    long double l1 = 12.0123L;
+    long double l2 = 21.3201L;
+    puts("***start***");
+    TEST(fmax)
+    TEST(fmin)
+    TEST(fmod)
+    puts("***end***");
     return 0;
 }

tests/core/test_float_builtins.out

@@ -1,4 +1,5 @@
-0.567800
-0.123400
-1.010100
-0.101010
+***start***
+0.567800 : 1.010100 : 21.320100
+0.123400 : 0.101010 : 12.012300
+0.123400 : 0.101010 : 12.012300
+***end***

tests/test_core.py

@@ -198,7 +198,7 @@ def test_line_endings(self):
   def test_literal_negative_zero(self):
     self.do_run_in_out_file_test('tests', 'core', 'test_literal_negative_zero')
 
-  @no_wasm_backend('todo')
+  @no_wasm_backend('test uses calls to expected js imports, rather than using llvm intrinsics directly')
   def test_llvm_intrinsics(self):
     Settings.PRECISE_I64_MATH = 2 # for bswap64
 
@@ -6068,7 +6068,7 @@ def test_large_exported_response(self):
     assert '_exported_func_from_response_file_1' in open('src.cpp.o.js').read()
 
   @sync
-  @no_wasm_backend('RuntimeError: function signature mismatch')
+  @no_wasm_backend('no jsCall function pointers are created for wasm backend')
   def test_add_function(self):
     Settings.INVOKE_RUN = 0
     Settings.RESERVED_FUNCTION_POINTERS = 1

tools/system_libs.py

@@ -57,9 +57,14 @@ def read_symbols(path):
 
   # XXX we should disable EMCC_DEBUG when building libs, just like in the relooper
 
+  def musl_internal_includes():
+    return [
+      '-I', shared.path_from_root('system', 'lib', 'libc', 'musl', 'src', 'internal'),
+      '-I', shared.path_from_root('system', 'lib', 'libc', 'musl', 'arch', 'js'),
+    ]
+
   def build_libc(lib_filename, files, lib_opts):
     o_s = []
-    musl_internal_includes = ['-I', shared.path_from_root('system', 'lib', 'libc', 'musl', 'src', 'internal'), '-I', shared.path_from_root('system', 'lib', 'libc', 'musl', 'arch', 'js')]
     commands = []
     # Hide several musl warnings that produce a lot of spam to unit test build server logs.
     # TODO: When updating musl the next time, feel free to recheck which of their warnings might have been fixed, and which ones of these could be cleaned up.
@@ -68,7 +73,7 @@ def build_libc(lib_filename, files, lib_opts):
       c_opts.append('-Wno-error=absolute-value')
     for src in files:
       o = in_temp(os.path.basename(src) + '.o')
-      commands.append([shared.PYTHON, shared.EMCC, shared.path_from_root('system', 'lib', src), '-o', o] + musl_internal_includes + default_opts + c_opts + lib_opts)
+      commands.append([shared.PYTHON, shared.EMCC, shared.path_from_root('system', 'lib', src), '-o', o] + musl_internal_includes() + default_opts + c_opts + lib_opts)
       o_s.append(o)
     run_commands(commands)
     shared.Building.link(o_s, in_temp(lib_filename))
@@ -300,7 +305,10 @@ def create_wasm_rt_lib(libname, files):
       o = in_temp(os.path.basename(src) + '.o')
       # Use clang directly instead of emcc. Since emcc's intermediate format (produced by -S) is LLVM IR, there's no way to
       # get emcc to output wasm .s files, which is what we archive in compiler_rt.
-      commands.append([shared.CLANG_CC, '--target=wasm32', '-mthread-model', 'single', '-S', shared.path_from_root('system', 'lib', src), '-O2', '-o', o] + shared.EMSDK_OPTS)
+      commands.append([
+        shared.CLANG_CC, '--target=wasm32', '-mthread-model', 'single',
+        '-S', shared.path_from_root('system', 'lib', src),
+        '-O2', '-o', o] + musl_internal_includes() + shared.EMSDK_OPTS)
       o_s.append(o)
     run_commands(commands)
     lib = in_temp(libname)
@@ -332,7 +340,11 @@ def create_wasm_libc_rt(libname):
     # that gets included at the same time as compiler-rt.
     math_files = files_in_path(
       path_components=['system', 'lib', 'libc', 'musl', 'src', 'math'],
-      filenames=['fmaxf.c', 'fminf.c', 'fmax.c', 'fmin.c'])
+      filenames=[
+        'fmin.c', 'fminf.c', 'fminl.c',
+        'fmax.c', 'fmaxf.c', 'fmaxl.c',
+        'fmod.c', 'fmodf.c', 'fmodl.c',
+      ])
     string_files = files_in_path(
       path_components=['system', 'lib', 'libc', 'musl', 'src', 'string'],
       filenames=['memcpy.c', 'memset.c', 'memmove.c'])