RuntimeLibcalls: Remove __muloti4 from default libcall set

[arsenm]

The current logic says it's only available on wasm, so only
explicitly add it there. Also fix a misnomer in the compiler-rt
call list.

[arsenm]

• RuntimeLibcalls: Really move default libcall handling to tablegen #148780 : 2 dependent PRs (#148782 , #150869 )
• RuntimeLibcalls: Stop opting out of exp10 #148604
• RuntimeLibcalls: Mostly move x86 configuration into tablegen #148575
• RuntimeLibcalls: Invert handling of 64-bit only libcalls #148571
• RuntimeLibcalls: Remove __muloti4 from default libcall set #148562 👈 (View in Graphite)
• main

This stack of pull requests is managed by Graphite. Learn more about stacking.

[llvmbot]

@llvm/pr-subscribers-llvm-ir

Author: Matt Arsenault (arsenm)

Changes

The current logic says it's only available on wasm, so only
explicitly add it there. Also fix a misnomer in the compiler-rt
call list.

---

Full diff: https://github.com/llvm/llvm-project/pull/148562.diff

1 Files Affected:

• (modified) llvm/include/llvm/IR/RuntimeLibcalls.td (+9-4)

diff --git a/llvm/include/llvm/IR/RuntimeLibcalls.td b/llvm/include/llvm/IR/RuntimeLibcalls.td
index 9781bef8e37b6..53eea97bf1ea9 100644
--- a/llvm/include/llvm/IR/RuntimeLibcalls.td
+++ b/llvm/include/llvm/IR/RuntimeLibcalls.td
@@ -459,7 +459,6 @@ def __multi3 : RuntimeLibcallImpl<MUL_I128>;
 
 def __mulosi4 : RuntimeLibcallImpl<MULO_I32>;
 def __mulodi4 : RuntimeLibcallImpl<MULO_I64>;
-def __muloti4 : RuntimeLibcallImpl<MULO_I128>;
 
 def __divqi3 : RuntimeLibcallImpl<SDIV_I8>;
 def __divhi3 : RuntimeLibcallImpl<SDIV_I16>;
@@ -935,6 +934,12 @@ def calloc : RuntimeLibcallImpl<CALLOC>;
 
 } // End let IsDefault = true
 
+//--------------------------------------------------------------------
+// compiler-rt, not available for most architectures
+//--------------------------------------------------------------------
+
+def __muloti4 : RuntimeLibcallImpl<MULO_I128>;
+
 //--------------------------------------------------------------------
 // Define implementation other libcalls
 //--------------------------------------------------------------------
@@ -1036,7 +1041,7 @@ defvar Int128RTLibcalls = [
 ];
 
 // Only available in compiler-rt
-defvar CompilerRTOnlyInt128Libcalls = [
+defvar CompilerRTOnlyInt64Libcalls = [
   __mulodi4
 ];
 
@@ -1057,7 +1062,7 @@ defvar DefaultRuntimeLibcallImpls =
   !listremove(
     !listremove(
         !listremove(AllDefaultRuntimeLibcallImpls, Int128RTLibcalls),
-                    CompilerRTOnlyInt128Libcalls),
+                    CompilerRTOnlyInt64Libcalls),
                     DefaultRuntimeLibcallImpls_f80),
                     DefaultRuntimeLibcallImpls_ppcf128);
 
@@ -2130,5 +2135,5 @@ def isWasm : RuntimeLibcallPredicate<"TT.isWasm()">;
 def WasmSystemLibrary
     : SystemRuntimeLibrary<isWasm,
       (add DefaultRuntimeLibcallImpls, Int128RTLibcalls,
-           CompilerRTOnlyInt128Libcalls,
+           CompilerRTOnlyInt64Libcalls, __muloti4,
            emscripten_return_address)>;

[nikic]

Why the rename? This libcall works on 128 bit integers.

[arsenm]

It's for MULO_I64

[nikic]

Oh, duh. Shouldn't it get dropped from the Int128RTLibcalls list directly above?

[nikic]

LGTM

[arsenm]

Merge activity

• Jul 14, 3:51 PM UTC: A user started a stack merge that includes this pull request via Graphite.
• Jul 14, 3:53 PM UTC: Graphite rebased this pull request as part of a merge.
• Jul 14, 3:56 PM UTC: @arsenm merged this pull request with Graphite.