Merge pull request #36576 from JuliaLang/tb/llvmcall

Redesign llvmcall for compatibility with stateless codegen.

base/docs/basedocs.jl

@@ -954,24 +954,23 @@ In most cases, this simply results in a call to `convert(argtype, argvalue)`.
 kw"ccall"
 
 """
- llvmcall(IR::String, ReturnType, (ArgumentType1, ...), ArgumentValue1, ...)
- llvmcall((declarations::String, IR::String), ReturnType, (ArgumentType1, ...), ArgumentValue1, ...)
-
-Call LLVM IR string in the first argument. Similar to an LLVM function `define` block,
-arguments are available as consecutive unnamed SSA variables (%0, %1, etc.).
-
-The optional declarations string contains external functions declarations that are
-necessary for llvm to compile the IR string. Multiple declarations can be passed in by
-separating them with line breaks.
-
-Note that the argument type tuple must be a literal tuple, and not a tuple-valued
-variable or expression.
-
-Each `ArgumentValue` to `llvmcall` will be converted to the corresponding
-`ArgumentType`, by automatic insertion of calls to `unsafe_convert(ArgumentType,
-cconvert(ArgumentType, ArgumentValue))`. (See also the documentation for
-[`unsafe_convert`](@ref Base.unsafe_convert) and [`cconvert`](@ref Base.cconvert) for further details.)
-In most cases, this simply results in a call to `convert(ArgumentType, ArgumentValue)`.
+ llvmcall(fun_ir::String, returntype, Tuple{argtype1, ...}, argvalue1, ...)
+ llvmcall((mod_ir::String, entry_fn::String), returntype, Tuple{argtype1, ...}, argvalue1, ...)
+ llvmcall((mod_bc::Vector{UInt8}, entry_fn::String), returntype, Tuple{argtype1, ...}, argvalue1, ...)
+
+Call the LLVM code provided in the first argument. There are several ways to specify this
+first argument:
+
+- as a literal string, representing function-level IR (similar to an LLVM `define` block),
+ with arguments are available as consecutive unnamed SSA variables (%0, %1, etc.);
+- as a 2-element tuple, containing a string of module IR and a string representing the name
+ of the entry-point function to call;
+- as a 2-element tuple, but with the module provided as an `Vector{UINt8}` with bitcode.
+
+Note that contrary to `ccall`, the argument types must be specified as a tuple type, and not
+a tuple of types. All types, as well as the LLVM code, should be specified as literals, and
+not as variables or expressions (it may be necessary to use `@eval` to generate these
+literals).
 
 See `test/llvmcall.jl` for usage examples.
 """

src/Makefile

@@ -235,7 +235,7 @@ $(BUILDDIR)/init.o $(BUILDDIR)/init.dbg.obj: $(SRCDIR)/builtin_proto.h
 $(BUILDDIR)/interpreter.o $(BUILDDIR)/interpreter.dbg.obj: $(SRCDIR)/builtin_proto.h
 $(BUILDDIR)/jitlayers.o $(BUILDDIR)/jitlayers.dbg.obj: $(SRCDIR)/jitlayers.h $(SRCDIR)/codegen_shared.h
 $(BUILDDIR)/jltypes.o $(BUILDDIR)/jltypes.dbg.obj: $(SRCDIR)/builtin_proto.h
-$(BUILDDIR)/libllvmcalltest.$(SHLIB_EXT): $(SRCDIR)/codegen_shared.h
+$(build_shlibdir)/libllvmcalltest.$(SHLIB_EXT): $(SRCDIR)/codegen_shared.h $(BUILDDIR)/julia_version.h
 $(BUILDDIR)/llvm-alloc-opt.o $(BUILDDIR)/llvm-alloc-opt.dbg.obj: $(SRCDIR)/codegen_shared.h
 $(BUILDDIR)/llvm-final-gc-lowering.o $(BUILDDIR)/llvm-final-gc-lowering.dbg.obj: $(SRCDIR)/llvm-pass-helpers.h
 $(BUILDDIR)/llvm-gc-invariant-verifier.o $(BUILDDIR)/llvm-gc-invariant-verifier.dbg.obj: $(SRCDIR)/codegen_shared.h