Int8Ty, J * kValSize));\n- }\n+ SetFuncAttributes(F);\n+\n+ if (!DeclarationsOnly) {\n+ LLVM::Builder Builder(Context->LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n+\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\n+ CompType.getFuncType());\n+ auto RTy = FTy.getReturnType();\n+ std::vector<LLVM::Type> FPTy(FTy.getNumParams());\n+ FTy.getParamTypes(FPTy);\n+\n+ const size_t ArgCount = FPTy.size() - 1;\n+ auto ExecCtxPtr = F.getFirstParam();\n+ auto RawFunc = LLVM::FunctionCallee{\n+ FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\n+ FTy.getPointerTo())};\n+ auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\n+ auto RawRets = RawArgs.getNextParam();\n+\n+ std::vector<LLVM::Value> Args;\n+ Args.reserve(FTy.getNumParams());\n+ Args.push_back(ExecCtxPtr);\n+ for (size_t J = 0; J < ArgCount; ++J) {\n+ Args.push_back(Builder.createValuePtrLoad(\n+ FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\n+ }\n \n- auto Ret = Builder.createCall(RawFunc, Args);\n- if (RTy.isVoidTy()) {\n- // nothing to do\n- } else if (RTy.isStructTy()) {\n- auto Rets = unpackStruct(Builder, Ret);\n- Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty, kValSize);\n- } else {\n- Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\n+ auto Ret = Builder.createCall(RawFunc, Args);\n+ if (RTy.isVoidTy()) {\n+ // nothing to do\n+ } else if (RTy.isStructTy()) {\n+ auto Rets = unpackStruct(Builder, Ret);\n+ Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty,\n+ kValSize);\n+ } else {\n+ Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\n+ }\n+ Builder.createRetVoid();\n }\n- Builder.createRetVoid();\n }\n // Copy wrapper, param and return lists to module instance.\n Context->FunctionWrappers.push_back(F);\n } else {\n // Non function type case. Create empty wrapper.\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\n- Name.c_str());\n+ auto F = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n {\n- F.setVisibility(LLVMProtectedVisibility);\n- F.setDSOLocal(true);\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\n- F.addFnAttr(Context->NoStackArgProbe);\n- F.addFnAttr(Context->StrictFP);\n- F.addFnAttr(Context->UWTable);\n- F.addParamAttr(0, Context->ReadOnly);\n- F.addParamAttr(0, Context->NoAlias);\n- F.addParamAttr(1, Context->NoAlias);\n- F.addParamAttr(2, Context->NoAlias);\n- F.addParamAttr(3, Context->NoAlias);\n-\n- LLVM::Builder Builder(Context->LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n- Builder.createRetVoid();\n+ SetFuncAttributes(F);\n+\n+ if (!DeclarationsOnly) {\n+ LLVM::Builder Builder(Context->LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n+ Builder.createRetVoid();\n+ }\n }\n Context->FunctionWrappers.push_back(F);\n }\n@@ -6184,9 +6321,9 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\n toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n auto RTy = FTy.getReturnType();\n auto F = LLVM::FunctionCallee{\n- FTy,\n- Context->LLModule.addFunction(FTy, LLVMInternalLinkage,\n- fmt::format(\"f{}\"sv, FuncID).c_str())};\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMInternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n F.Fn.setDSOLocal(true);\n F.Fn.addFnAttr(Context->NoStackArgProbe);\n F.Fn.addFnAttr(Context->StrictFP);\n@@ -6231,6 +6368,7 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\n }\n \n Context->Functions.emplace_back(TypeIdx, F, nullptr);\n+ Context->ImportCount++;\n break;\n }\n case ExternalType::Table: // Table type\n@@ -6313,9 +6451,10 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n const auto FuncID = Context->Functions.size();\n auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n- LLVM::FunctionCallee F = {FTy, Context->LLModule.addFunction(\n- FTy, LLVMExternalLinkage,\n- fmt::format(\"f{}\"sv, FuncID).c_str())};\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n F.Fn.setVisibility(LLVMProtectedVisibility);\n F.Fn.setDSOLocal(true);\n F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n@@ -6339,10 +6478,11 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n Locals.push_back(Local.second);\n }\n }\n- FunctionCompiler FC(*Context, F, Locals,\n- Conf.getCompilerConfigure().isInterruptible(),\n- Conf.getStatisticsConfigure().isInstructionCounting(),\n- Conf.getStatisticsConfigure().isCostMeasuring());\n+ FunctionCompiler FC(\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\n auto Type = Context->resolveBlockType(T);\n EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n F.Fn.eliminateUnreachableBlocks();\n@@ -6350,5 +6490,235 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n return {};\n }\n \n+void Compiler::compileFunctionDeclarations(\n+ const AST::FunctionSection &FunctionSec,\n+ const AST::CodeSection &CodeSec) noexcept {\n+ const auto &TypeIdxs = FunctionSec.getContent();\n+ const auto &CodeSegs = CodeSec.getContent();\n+ assuming(TypeIdxs.size() == CodeSegs.size());\n+\n+ for (size_t I = 0; I < CodeSegs.size(); ++I) {\n+ const auto &TypeIdx = TypeIdxs[I];\n+ const auto &Code = CodeSegs[I];\n+ assuming(TypeIdx < Context->CompositeTypes.size());\n+ assuming(Context->CompositeTypes[TypeIdx]->isFunc());\n+ const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n+ const auto FuncID = Context->Functions.size();\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n+ F.Fn.setVisibility(LLVMProtectedVisibility);\n+ F.Fn.setDSOLocal(true);\n+ F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ F.Fn.addFnAttr(Context->NoStackArgProbe);\n+ F.Fn.addFnAttr(Context->StrictFP);\n+ F.Fn.addFnAttr(Context->UWTable);\n+ F.Fn.addParamAttr(0, Context->ReadOnly);\n+ F.Fn.addParamAttr(0, Context->NoAlias);\n+\n+ Context->Functions.emplace_back(TypeIdx, F, &Code);\n+ }\n+}\n+\n+Expect<void> Compiler::compileFunctionBody(uint32_t LocalFuncIndex) noexcept {\n+ // Find the function in the Functions list\n+ // LocalFuncIndex is relative to the defined functions (not imports)\n+ uint32_t GlobalFuncIndex = Context->ImportCount + LocalFuncIndex;\n+ if (GlobalFuncIndex >= Context->Functions.size()) {\n+ spdlog::error(\"[lazy-jit]: function index {} out of range\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ auto &[T, F, Code] = Context->Functions[GlobalFuncIndex];\n+ if (!Code) {\n+ spdlog::error(\"[lazy-jit]: cannot compile import function {}\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ // Check if already compiled (function has basic blocks)\n+ if (F.Fn.countBasicBlocks() > 0) {\n+ spdlog::debug(\"[lazy-jit]: function {} already compiled\"sv, LocalFuncIndex);\n+ return {};\n+ }\n+\n+ spdlog::debug(\"[lazy-jit]: compiling function {}\"sv, LocalFuncIndex);\n+\n+ std::vector<ValType> Locals;\n+ for (const auto &Local : Code->getLocals()) {\n+ for (unsigned I = 0; I < Local.first; ++I) {\n+ Locals.push_back(Local.second);\n+ }\n+ }\n+\n+ FunctionCompiler FC(\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\n+ auto Type = Context->resolveBlockType(T);\n+ EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n+ F.Fn.eliminateUnreachableBlocks();\n+\n+ return {};\n+}\n+\n+Expect<std::pair<LLVM::Data,\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter>>>\n+LLVM::Compiler::compileInfrastructure(const AST::Module &Module,\n+ std::string Prefix) noexcept {\n+ Data D;\n+ D.setPrefix(Prefix);\n+ // Check the module is validated.\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ spdlog::info(\"[lazy-jit]: compile infrastructure start\"sv);\n+\n+ auto LLContext = D.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = D.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ std::unique_ptr<CompileContext, CompileContextDeleter> NewContext(\n+ new CompileContext(LLContext, LLModule,\n+ Conf.getCompilerConfigure().isGenericBinary(),\n+ D.getPrefix()));\n+ RAIICleanup Cleanup(this->Context, NewContext.get());\n+\n+ // Compile Function Types\n+ compile(Module.getTypeSection());\n+ // Compile ImportSection\n+ compile(Module.getImportSection());\n+ // Compile GlobalSection\n+ compile(Module.getGlobalSection());\n+ // Compile MemorySection (MemorySec, DataSec)\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ // Compile TableSection (TableSec, ElemSec)\n+ compile(Module.getTableSection(), Module.getElementSection());\n+ // Create function declarations without compiling bodies\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+ // Compile ExportSection\n+ compile(Module.getExportSection());\n+\n+ // Set initializer for constant value\n+ auto IntrinsicsName = fmt::format(\"{}intrinsics\"sv, D.getPrefix());\n+ if (auto IntrinsicsTable = LLModule.getNamedGlobal(IntrinsicsName.c_str())) {\n+ IntrinsicsTable.setInitializer(\n+ LLVM::Value::getConstNull(IntrinsicsTable.getType()));\n+ IntrinsicsTable.setGlobalConstant(false);\n+ } else {\n+ auto IntrinsicsTableTy = LLVM::Type::getArrayType(\n+ LLContext.getInt8Ty().getPointerTo(),\n+ static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax));\n+ LLModule.addGlobal(\n+ IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n+ LLVM::Value::getConstNull(IntrinsicsTableTy), IntrinsicsName.c_str());\n+ }\n+ LLModule.verify(LLVMPrintMessageAction);\n+\n+ spdlog::info(\"[lazy-jit]: infrastructure compilation done\"sv);\n+\n+ return Expect<\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>>{\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>{\n+ std::move(D), std::move(NewContext)}};\n+}\n+\n+Expect<LLVM::Data>\n+Compiler::compileFunctions(Data &&LLData, CompileContext *NewContext,\n+ const AST::Module &Module,\n+ Span<const uint32_t> LocalFuncIndices) noexcept {\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+ if (unlikely(LocalFuncIndices.empty())) {\n+ spdlog::error(\"[lazy-jit]: compileFunctions with empty index list\"sv);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ std::vector<uint32_t> Sorted(LocalFuncIndices.begin(),\n+ LocalFuncIndices.end());\n+ std::sort(Sorted.begin(), Sorted.end());\n+ Sorted.erase(std::unique(Sorted.begin(), Sorted.end()), Sorted.end());\n+\n+ spdlog::debug(\"[lazy-jit]: compile functions batch ({}) start\"sv,\n+ Sorted.size());\n+\n+ auto LLContext = LLData.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = LLData.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ RAIICleanup Cleanup(this->Context, NewContext);\n+ Context->LLModule = LLModule;\n+\n+ Context->CompositeTypes.clear();\n+ Context->FunctionWrappers.clear();\n+ Context->Functions.clear();\n+ Context->LazyJITCacheVars.clear();\n+ Context->ImportCount = 0;\n+ Context->MemoryAddrTypes.clear();\n+ Context->TableAddrTypes.clear();\n+ Context->Globals.clear();\n+\n+ Context->IntrinsicsTable = LLModule.addGlobal(\n+ Context->IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\n+ fmt::format(\"{}intrinsics\"sv, Context->Prefix).c_str());\n+ Context->IntrinsicsTable.setInitializer(LLVM::Value());\n+ Context->Trap.Ty =\n+ LLVM::Type::getFunctionType(Context->VoidTy, {Context->Int32Ty});\n+ Context->Trap.Fn =\n+ LLModule.addFunction(Context->Trap.Ty, LLVMPrivateLinkage, \"trap\");\n+ Context->Trap.Fn.setDSOLocal(true);\n+ Context->Trap.Fn.addFnAttr(Context->NoStackArgProbe);\n+ Context->Trap.Fn.addFnAttr(Context->StrictFP);\n+ Context->Trap.Fn.addFnAttr(Context->UWTable);\n+ Context->Trap.Fn.addFnAttr(Context->NoReturn);\n+ Context->Trap.Fn.addFnAttr(Context->Cold);\n+ Context->Trap.Fn.addFnAttr(Context->NoInline);\n+ Context->compileTrap();\n+\n+ compile(Module.getTypeSection(), true);\n+ compile(Module.getImportSection());\n+ compile(Module.getGlobalSection());\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ compile(Module.getTableSection(), Module.getElementSection());\n+\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+\n+ for (uint32_t FuncIndex : Sorted) {\n+ EXPECTED_TRY(compileFunctionBody(FuncIndex));\n+ }\n+\n+ spdlog::info(\"[lazy-jit]: verify batch ({} funcs) start\"sv, Sorted.size());\n+ LLModule.verify(LLVMPrintMessageAction);\n+ spdlog::info(\"[lazy-jit]: verify batch ({} funcs) done\"sv, Sorted.size());\n+\n+ auto &TM = LLData.extract().TM;\n+ EXPECTED_TRY(optimize(LLModule, TM));\n+\n+ spdlog::debug(\"[lazy-jit]: compile functions batch ({}) done\"sv,\n+ Sorted.size());\n+ return Expect<Data>{std::move(LLData)};\n+}\n+\n+void LLVM::Compiler::CompileContextDeleter::operator()(\n+ CompileContext *Context) const noexcept {\n+ delete Context;\n+}\n } // namespace LLVM\n } // namespace WasmEdge\n"},"changed_files":{"kind":"list like","value":["lib/llvm/compiler.cpp"],"string":"[\n \"lib/llvm/compiler.cpp\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"These sections should be static after the first compilation. What is the reason that we have to recompile all of them each time?","path":"lib/llvm/compiler.cpp","hunk":"@@ -6325,13 +6383,310 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n FunctionCompiler FC(*Context, F, Locals,\n Conf.getCompilerConfigure().isInterruptible(),\n Conf.getStatisticsConfigure().isInstructionCounting(),\n- Conf.getStatisticsConfigure().isCostMeasuring());\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().isEnableLazyJIT());\n auto Type = Context->resolveBlockType(T);\n EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n F.Fn.eliminateUnreachableBlocks();\n }\n return {};\n }\n \n+void Compiler::compileFunctionDeclarations(\n+ const AST::FunctionSection &FunctionSec,\n+ const AST::CodeSection &CodeSec) noexcept {\n+ const auto &TypeIdxs = FunctionSec.getContent();\n+ const auto &CodeSegs = CodeSec.getContent();\n+ assuming(TypeIdxs.size() == CodeSegs.size());\n+\n+ for (size_t I = 0; I < CodeSegs.size(); ++I) {\n+ const auto &TypeIdx = TypeIdxs[I];\n+ const auto &Code = CodeSegs[I];\n+ assuming(TypeIdx < Context->CompositeTypes.size());\n+ assuming(Context->CompositeTypes[TypeIdx]->isFunc());\n+ const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n+ const auto FuncID = Context->Functions.size();\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n+ F.Fn.setVisibility(LLVMProtectedVisibility);\n+ F.Fn.setDSOLocal(true);\n+ F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ F.Fn.addFnAttr(Context->NoStackArgProbe);\n+ F.Fn.addFnAttr(Context->StrictFP);\n+ F.Fn.addFnAttr(Context->UWTable);\n+ F.Fn.addParamAttr(0, Context->ReadOnly);\n+ F.Fn.addParamAttr(0, Context->NoAlias);\n+\n+ Context->Functions.emplace_back(TypeIdx, F, &Code);\n+ }\n+}\n+\n+Expect<void> Compiler::compileFunctionBody(uint32_t LocalFuncIndex) noexcept {\n+ // Find the function in the Functions list\n+ // LocalFuncIndex is relative to the defined functions (not imports)\n+ uint32_t ImportCount = 0;\n+ for (const auto &[T, F, Code] : Context->Functions) {\n+ if (!Code) {\n+ ImportCount++;\n+ }\n+ }\n+\n+ uint32_t GlobalFuncIndex = ImportCount + LocalFuncIndex;\n+ if (GlobalFuncIndex >= Context->Functions.size()) {\n+ spdlog::error(\"[lazy-jit]: function index {} out of range\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ auto &[T, F, Code] = Context->Functions[GlobalFuncIndex];\n+ if (!Code) {\n+ spdlog::error(\"[lazy-jit]: cannot compile import function {}\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ // Check if already compiled (function has basic blocks)\n+ if (F.Fn.countBasicBlocks() > 0) {\n+ spdlog::debug(\"[lazy-jit]: function {} already compiled\"sv, LocalFuncIndex);\n+ return {};\n+ }\n+\n+ spdlog::debug(\"[lazy-jit]: compiling function {}\"sv, LocalFuncIndex);\n+\n+ std::vector<ValType> Locals;\n+ for (const auto &Local : Code->getLocals()) {\n+ for (unsigned I = 0; I < Local.first; ++I) {\n+ Locals.push_back(Local.second);\n+ }\n+ }\n+\n+ FunctionCompiler FC(*Context, F, Locals,\n+ Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().isEnableLazyJIT());\n+ auto Type = Context->resolveBlockType(T);\n+ EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n+ F.Fn.eliminateUnreachableBlocks();\n+\n+ return {};\n+}\n+\n+Expect<std::pair<LLVM::Data,\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter>>>\n+LLVM::Compiler::compileInfrastructure(const AST::Module &Module,\n+ std::string Prefix) noexcept {\n+ Data D;\n+ D.setPrefix(Prefix);\n+ // Check the module is validated.\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ spdlog::info(\"[lazyjit]: compile infrastructure start\"sv);\n+\n+ auto LLContext = D.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = D.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ std::unique_ptr<CompileContext, CompileContextDeleter> NewContext(\n+ new CompileContext(LLContext, LLModule,\n+ Conf.getCompilerConfigure().isGenericBinary(),\n+ D.getPrefix()));\n+ this->Context = NewContext.get();\n+\n+ // Compile Function Types\n+ compile(Module.getTypeSection());\n+ // Compile ImportSection\n+ compile(Module.getImportSection());\n+ // Compile GlobalSection\n+ compile(Module.getGlobalSection());\n+ // Compile MemorySection (MemorySec, DataSec)\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ // Compile TableSection (TableSec, ElemSec)\n+ compile(Module.getTableSection(), Module.getElementSection());\n+ // Create function declarations without compiling bodies\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+ // Compile ExportSection\n+ compile(Module.getExportSection());\n+\n+ // Set initializer for constant value\n+ auto IntrinsicsName = fmt::format(\"{}intrinsics\"sv, D.getPrefix());\n+ if (auto IntrinsicsTable = LLModule.getNamedGlobal(IntrinsicsName.c_str())) {\n+ IntrinsicsTable.setInitializer(\n+ LLVM::Value::getConstNull(IntrinsicsTable.getType()));\n+ IntrinsicsTable.setGlobalConstant(false);\n+ } else {\n+ auto IntrinsicsTableTy = LLVM::Type::getArrayType(\n+ LLContext.getInt8Ty().getPointerTo(),\n+ static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax));\n+ LLModule.addGlobal(\n+ IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n+ LLVM::Value::getConstNull(IntrinsicsTableTy), IntrinsicsName.c_str());\n+ }\n+\n+ spdlog::info(\"[lazyjit]: infrastructure compilation done\"sv);\n+\n+ this->Context = nullptr;\n+ return Expect<\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>>{\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>{\n+ std::move(D), std::move(NewContext)}};\n+}\n+\n+Expect<LLVM::Data> Compiler::compileFunction(Data &&LLData,\n+ CompileContext *NewContext,\n+ const AST::Module &Module,\n+ uint32_t FuncIndex) noexcept {\n+ // Check the module is validated.\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ spdlog::debug(\"[lazyjit]: compile function {} start\"sv, FuncIndex);\n+\n+ auto LLContext = LLData.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = LLData.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ this->Context = NewContext;\n+ Context->LLModule = LLModule;\n+\n+ // Clear module-bound state if reusing the context\n+ Context->CompositeTypes.clear();\n+ Context->FunctionWrappers.clear();\n+ Context->Functions.clear();\n+ Context->MemoryAddrTypes.clear();\n+ Context->TableAddrTypes.clear();\n+ Context->Globals.clear();\n+\n+ Context->IntrinsicsTable = LLModule.addGlobal(\n+ Context->IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\n+ fmt::format(\"{}intrinsics\"sv, Context->Prefix).c_str());\n+ Context->Trap.Ty =\n+ LLVM::Type::getFunctionType(Context->VoidTy, {Context->Int32Ty});\n+ Context->Trap.Fn =\n+ LLModule.addFunction(Context->Trap.Ty, LLVMPrivateLinkage, \"trap\");\n+ Context->Trap.Fn.setDSOLocal(true);\n+ Context->Trap.Fn.addFnAttr(Context->NoStackArgProbe);\n+ Context->Trap.Fn.addFnAttr(Context->StrictFP);\n+ Context->Trap.Fn.addFnAttr(Context->UWTable);\n+ Context->Trap.Fn.addFnAttr(Context->NoReturn);\n+ Context->Trap.Fn.addFnAttr(Context->Cold);\n+ Context->Trap.Fn.addFnAttr(Context->NoInline);\n+ Context->compileTrap();\n+\n+ // Re-compile infrastructure for the fresh module\n+ // compile types first (needed for function type lookup)\n+ compile(Module.getTypeSection());\n+ // compile imports to get the correct function offset\n+ compile(Module.getImportSection());\n+ // compile globals (may be needed by function body)\n+ compile(Module.getGlobalSection());\n+ // compile memory\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ // compile table\n+ compile(Module.getTableSection(), Module.getElementSection());\n+\n+ // create all function declarations\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp\nindex 39da94d9a9ac..330e245f51c3 100644\n--- a/lib/llvm/compiler.cpp\n+++ b/lib/llvm/compiler.cpp\n@@ -9,6 +9,7 @@\n #include \"common/spdlog.h\"\n #include \"data.h\"\n #include \"llvm.h\"\n+#include \"spdlog/spdlog.h\"\n #include \"system/allocator.h\"\n \n #include <algorithm>\n@@ -16,6 +17,7 @@\n #include <cinttypes>\n #include <cstdint>\n #include <cstdlib>\n+#include <functional>\n #include <limits>\n #include <memory>\n #include <numeric>\n@@ -28,6 +30,16 @@ using namespace std::literals;\n \n namespace {\n \n+struct RAIICleanup {\n+ RAIICleanup(LLVM::Compiler::CompileContext *&Context,\n+ LLVM::Compiler::CompileContext *NewContext)\n+ : Context(Context) {\n+ Context = NewContext;\n+ }\n+ ~RAIICleanup() { Context = nullptr; }\n+ LLVM::Compiler::CompileContext *&Context;\n+};\n+\n static bool\n isVoidReturn(WasmEdge::Span<const WasmEdge::ValType> ValTypes) noexcept;\n static LLVM::Type toLLVMType(LLVM::Context LLContext,\n@@ -128,7 +140,7 @@ static inline LLVMCodeGenOptLevel toLLVMCodeGenLevel(\n \n struct LLVM::Compiler::CompileContext {\n LLVM::Context LLContext;\n- LLVM::Module &LLModule;\n+ std::reference_wrapper<LLVM::Module> LLModule;\n LLVM::Attribute Cold;\n LLVM::Attribute NoAlias;\n LLVM::Attribute NoInline;\n@@ -202,13 +214,16 @@ struct LLVM::Compiler::CompileContext {\n std::vector<std::tuple<uint32_t, LLVM::FunctionCallee,\n const WasmEdge::AST::CodeSegment *>>\n Functions;\n+ std::vector<LLVM::Value> LazyJITCacheVars;\n+ uint32_t ImportCount = 0;\n std::vector<LLVM::Type> MemoryAddrTypes;\n std::vector<LLVM::Type> TableAddrTypes;\n std::vector<LLVM::Type> Globals;\n+ std::string Prefix;\n LLVM::Value IntrinsicsTable;\n LLVM::FunctionCallee Trap;\n- CompileContext(LLVM::Context C, LLVM::Module &M,\n- bool IsGenericBinary) noexcept\n+ CompileContext(LLVM::Context C, LLVM::Module &M, bool IsGenericBinary,\n+ std::string_view P = \"\"sv) noexcept\n : LLContext(C), LLModule(M),\n Cold(LLVM::Attribute::createEnum(C, LLVM::Core::Cold, 0)),\n NoAlias(LLVM::Attribute::createEnum(C, LLVM::Core::NoAlias, 0)),\n@@ -256,14 +271,14 @@ struct LLVM::Compiler::CompileContext {\n })),\n ExecCtxPtrTy(ExecCtxTy.getPointerTo()),\n IntrinsicsTableTy(LLVM::Type::getArrayType(\n- Int8PtrTy,\n+ Int8Ty.getPointerTo(),\n static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax))),\n- IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()),\n- IntrinsicsTable(LLModule.addGlobal(IntrinsicsTablePtrTy, true,\n- LLVMExternalLinkage, LLVM::Value(),\n- \"intrinsics\")) {\n+ IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()), Prefix(P),\n+ IntrinsicsTable(LLModule.get().addGlobal(\n+ IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\n+ fmt::format(\"{}intrinsics\"sv, Prefix).c_str())) {\n Trap.Ty = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n- Trap.Fn = LLModule.addFunction(Trap.Ty, LLVMPrivateLinkage, \"trap\");\n+ Trap.Fn = LLModule.get().addFunction(Trap.Ty, LLVMPrivateLinkage, \"trap\");\n Trap.Fn.setDSOLocal(true);\n Trap.Fn.addFnAttr(NoStackArgProbe);\n Trap.Fn.addFnAttr(StrictFP);\n@@ -272,9 +287,10 @@ struct LLVM::Compiler::CompileContext {\n Trap.Fn.addFnAttr(Cold);\n Trap.Fn.addFnAttr(NoInline);\n \n- LLModule.addGlobal(Int32Ty, true, LLVMExternalLinkage,\n- LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\n- \"version\");\n+ LLModule.get().addGlobal(\n+ Int32Ty, true, LLVMExternalLinkage,\n+ LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\n+ fmt::format(\"{}version\"sv, Prefix).c_str());\n \n if (!IsGenericBinary) {\n SubtargetFeatures = LLVM::getHostCPUFeatures();\n@@ -313,18 +329,7 @@ struct LLVM::Compiler::CompileContext {\n }\n }\n \n- {\n- // create trap\n- LLVM::Builder Builder(LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(LLContext, Trap.Fn, \"entry\"));\n- auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n- auto CallTrap = Builder.createCall(\n- getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\n- {Trap.Fn.getFirstParam()});\n- CallTrap.addCallSiteAttribute(NoReturn);\n- Builder.createUnreachable();\n- }\n+ compileTrap();\n }\n LLVM::Value getMemory(LLVM::Builder &Builder, LLVM::Value ExecCtx,\n uint32_t Index) noexcept {\n@@ -394,6 +399,17 @@ struct LLVM::Compiler::CompileContext {\n auto Ptr = Builder.createBitCast(VPtr, PtrPtrTy);\n return {Ty, Builder.createLoad(PtrTy, Ptr)};\n }\n+ void compileTrap() noexcept {\n+ LLVM::Builder Builder(LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(LLContext, Trap.Fn, \"entry\"));\n+ auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n+ auto CallTrap = Builder.createCall(\n+ getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\n+ {Trap.Fn.getFirstParam()});\n+ CallTrap.addCallSiteAttribute(NoReturn);\n+ Builder.createUnreachable();\n+ }\n std::pair<std::vector<ValType>, std::vector<ValType>>\n resolveBlockType(const BlockType &BType) const noexcept {\n using VecT = std::vector<ValType>;\n@@ -544,9 +560,10 @@ class FunctionCompiler {\n FunctionCompiler(LLVM::Compiler::CompileContext &Context,\n LLVM::FunctionCallee F, Span<const ValType> Locals,\n bool Interruptible, bool InstructionCounting,\n- bool GasMeasuring) noexcept\n+ bool GasMeasuring, bool IsLazyJIT) noexcept\n : Context(Context), LLContext(Context.LLContext),\n- Interruptible(Interruptible), F(F), Builder(LLContext) {\n+ Interruptible(Interruptible), IsLazyJIT(IsLazyJIT), F(F),\n+ Builder(LLContext) {\n if (F.Fn) {\n Builder.positionAtEnd(LLVM::BasicBlock::create(LLContext, F.Fn, \"entry\"));\n ExecCtx = Builder.createLoad(Context.ExecCtxTy, F.Fn.getFirstParam());\n@@ -4267,7 +4284,63 @@ class FunctionCompiler {\n Args[J + 1] = stackPop();\n }\n \n- auto Ret = Builder.createCall(Function, Args);\n+ LLVM::Value Ret;\n+ if (IsLazyJIT) {\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\n+ if (IsImport) {\n+ Ret = Builder.createCall(Function, Args);\n+ } else {\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\n+\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\n+ }\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\n+ if (!CacheVar) {\n+ CacheVar = Context.LLModule.get().addGlobal(\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \"\");\n+ }\n+\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.check\");\n+ auto ResolveBB =\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.resolve\");\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.call\");\n+\n+ Builder.createBr(CheckBB);\n+ Builder.positionAtEnd(CheckBB);\n+\n+ auto CachedPtr =\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\n+ CachedPtr.setAlignment(8);\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\n+ auto IsNull = Builder.createIsNull(CachedPtr);\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\n+\n+ Builder.positionAtEnd(ResolveBB);\n+ auto FPtr = Builder.createCall(\n+ Context.getIntrinsic(\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\n+ {Context.Int32Ty}, false)),\n+ {LLContext.getInt32(FuncIndex)});\n+ auto Store = Builder.createStore(FPtr, CacheVar);\n+ Store.setAlignment(8);\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\n+ Builder.createBr(CallBB);\n+\n+ Builder.positionAtEnd(CallBB);\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\n+\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\n+ }\n+ } else {\n+ Ret = Builder.createCall(Function, Args);\n+ }\n+\n auto Ty = Ret.getType();\n if (Ty.isVoidTy()) {\n // nothing to do\n@@ -4387,7 +4460,64 @@ class FunctionCompiler {\n Args[J + 1] = stackPop();\n }\n \n- auto Ret = Builder.createCall(Function, Args);\n+ LLVM::Value Ret;\n+ if (IsLazyJIT) {\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\n+ if (IsImport) {\n+ Ret = Builder.createCall(Function, Args);\n+ } else {\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\n+\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\n+ }\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\n+ if (!CacheVar) {\n+ CacheVar = Context.LLModule.get().addGlobal(\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \"\");\n+ }\n+\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.check\");\n+ auto ResolveBB =\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.resolve\");\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.call\");\n+\n+ Builder.createBr(CheckBB);\n+ Builder.positionAtEnd(CheckBB);\n+\n+ auto CachedPtr =\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\n+ CachedPtr.setAlignment(8);\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\n+ auto IsNull = Builder.createIsNull(CachedPtr);\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\n+\n+ Builder.positionAtEnd(ResolveBB);\n+ auto FPtr = Builder.createCall(\n+ Context.getIntrinsic(\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\n+ {Context.Int32Ty}, false)),\n+ {LLContext.getInt32(FuncIndex)});\n+ auto Store = Builder.createStore(FPtr, CacheVar);\n+ Store.setAlignment(8);\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\n+ Builder.createBr(CallBB);\n+\n+ Builder.positionAtEnd(CallBB);\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\n+\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\n+ }\n+ } else {\n+ Ret = Builder.createCall(Function, Args);\n+ }\n+\n+ Ret.setMustTailCall();\n auto Ty = Ret.getType();\n if (Ty.isVoidTy()) {\n Builder.createRetVoid();\n@@ -4432,6 +4562,7 @@ class FunctionCompiler {\n \n auto FPtrRet =\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\n+ FPtrRet.setMustTailCall();\n if (RetSize == 0) {\n Builder.createRetVoid();\n } else {\n@@ -4608,6 +4739,7 @@ class FunctionCompiler {\n \n auto FPtrRet =\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\n+ FPtrRet.setMustTailCall();\n if (RetSize == 0) {\n Builder.createRetVoid();\n } else {\n@@ -5854,6 +5986,7 @@ class FunctionCompiler {\n Control &operator=(const Control &) = default;\n Control &operator=(Control &&) = default;\n };\n+ bool IsLazyJIT;\n std::vector<Control> ControlStack;\n LLVM::FunctionCallee F;\n LLVM::Value ExecCtx;\n@@ -5894,6 +6027,84 @@ Expect<void> Compiler::checkConfigure() noexcept {\n return {};\n }\n \n+Expect<void> Compiler::optimize(LLVM::Module &LLModule,\n+ LLVM::TargetMachine &TM) noexcept {\n+ spdlog::info(\"optimize start\"sv);\n+ auto Triple = LLModule.getTarget();\n+ auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\n+ if (ErrorMessage) {\n+ spdlog::error(\"getFromTriple failed:{}\"sv, ErrorMessage.string_view());\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ std::string CPUName;\n+#if defined(__riscv) && __riscv_xlen == 64\n+ CPUName = \"generic-rv64\"s;\n+#else\n+ if (!Conf.getCompilerConfigure().isGenericBinary()) {\n+ CPUName = LLVM::getHostCPUName().string_view();\n+ } else {\n+ CPUName = \"generic\"s;\n+ }\n+#endif\n+\n+ // On RISC-V we use generic-rv64 as the CPU, so also use default\n+ // features; host features under QEMU can be inconsistent (e.g.\n+ // zvl*b without v) which LLVM >= 20 rejects.\n+ TM = LLVM::TargetMachine::create(\n+ TheTarget, Triple, CPUName.c_str(),\n+#if defined(__riscv) && __riscv_xlen == 64\n+ \"\",\n+#else\n+ LLVM::getHostCPUFeatures().unwrap(),\n+#endif\n+ toLLVMCodeGenLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n+ LLVMRelocPIC, LLVMCodeModelDefault);\n+\n+#if LLVM_VERSION_MAJOR >= 13\n+ auto PBO = LLVM::PassBuilderOptions::create();\n+ if (auto Error = PBO.runPasses(\n+ LLModule,\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n+ TM)) {\n+ spdlog::error(\"{}\"sv, Error.message().string_view());\n+ }\n+#else\n+ auto FP = LLVM::PassManager::createForModule(LLModule);\n+ auto MP = LLVM::PassManager::create();\n+\n+ TM.addAnalysisPasses(MP);\n+ TM.addAnalysisPasses(FP);\n+ {\n+ auto PMB = LLVM::PassManagerBuilder::create();\n+ auto [OptLevel, SizeLevel] =\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\n+ PMB.setOptLevel(OptLevel);\n+ PMB.setSizeLevel(SizeLevel);\n+ PMB.populateFunctionPassManager(FP);\n+ PMB.populateModulePassManager(MP);\n+ }\n+ switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\n+ case CompilerConfigure::OptimizationLevel::O0:\n+ case CompilerConfigure::OptimizationLevel::O1:\n+ FP.addTailCallEliminationPass();\n+ break;\n+ default:\n+ break;\n+ }\n+\n+ FP.initializeFunctionPassManager();\n+ for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\n+ FP.runFunctionPassManager(Fn);\n+ }\n+ FP.finalizeFunctionPassManager();\n+ MP.runPassManager(LLModule);\n+#endif\n+\n+ spdlog::info(\"optimize done\"sv);\n+ return {};\n+}\n+\n Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n // Check that the module is validated.\n if (unlikely(!Module.getIsValidated())) {\n@@ -5913,15 +6124,7 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n \n CompileContext NewContext(LLContext, LLModule,\n Conf.getCompilerConfigure().isGenericBinary());\n- struct RAIICleanup {\n- RAIICleanup(CompileContext *&Context, CompileContext &NewContext)\n- : Context(Context) {\n- Context = &NewContext;\n- }\n- ~RAIICleanup() { Context = nullptr; }\n- CompileContext *&Context;\n- };\n- RAIICleanup Cleanup(Context, NewContext);\n+ RAIICleanup Cleanup(Context, &NewContext);\n \n // Compile Function Types\n compile(Module.getTypeSection());\n@@ -5942,81 +6145,8 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n spdlog::info(\"verify start\"sv);\n LLModule.verify(LLVMPrintMessageAction);\n \n- spdlog::info(\"optimize start\"sv);\n auto &TM = D.extract().TM;\n- {\n- auto Triple = LLModule.getTarget();\n- auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\n- if (ErrorMessage) {\n- spdlog::error(\"getFromTriple failed:{}\"sv, ErrorMessage.string_view());\n- return Unexpect(ErrCode::Value::IllegalPath);\n- } else {\n- std::string CPUName;\n-#if defined(__riscv) && __riscv_xlen == 64\n- CPUName = \"generic-rv64\"s;\n-#else\n- if (!Conf.getCompilerConfigure().isGenericBinary()) {\n- CPUName = LLVM::getHostCPUName().string_view();\n- } else {\n- CPUName = \"generic\"s;\n- }\n-#endif\n-\n- // On RISC-V we use generic-rv64 as the CPU, so also use default\n- // features; host features under QEMU can be inconsistent (e.g.\n- // zvl*b without v) which LLVM >= 20 rejects.\n- TM = LLVM::TargetMachine::create(\n- TheTarget, Triple, CPUName.c_str(),\n-#if defined(__riscv) && __riscv_xlen == 64\n- \"\",\n-#else\n- LLVM::getHostCPUFeatures().unwrap(),\n-#endif\n- toLLVMCodeGenLevel(\n- Conf.getCompilerConfigure().getOptimizationLevel()),\n- LLVMRelocPIC, LLVMCodeModelDefault);\n- }\n-\n-#if LLVM_VERSION_MAJOR >= 13\n- auto PBO = LLVM::PassBuilderOptions::create();\n- if (auto Error = PBO.runPasses(\n- LLModule,\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n- TM)) {\n- spdlog::error(\"{}\"sv, Error.message().string_view());\n- }\n-#else\n- auto FP = LLVM::PassManager::createForModule(LLModule);\n- auto MP = LLVM::PassManager::create();\n-\n- TM.addAnalysisPasses(MP);\n- TM.addAnalysisPasses(FP);\n- {\n- auto PMB = LLVM::PassManagerBuilder::create();\n- auto [OptLevel, SizeLevel] =\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\n- PMB.setOptLevel(OptLevel);\n- PMB.setSizeLevel(SizeLevel);\n- PMB.populateFunctionPassManager(FP);\n- PMB.populateModulePassManager(MP);\n- }\n- switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\n- case CompilerConfigure::OptimizationLevel::O0:\n- case CompilerConfigure::OptimizationLevel::O1:\n- FP.addTailCallEliminationPass();\n- break;\n- default:\n- break;\n- }\n-\n- FP.initializeFunctionPassManager();\n- for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\n- FP.runFunctionPassManager(Fn);\n- }\n- FP.finalizeFunctionPassManager();\n- MP.runPassManager(LLModule);\n-#endif\n- }\n+ EXPECTED_TRY(optimize(LLModule, TM));\n \n // Set initializer for constant value\n if (auto IntrinsicsTable = LLModule.getNamedGlobal(\"intrinsics\")) {\n@@ -6031,12 +6161,11 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n LLVM::Value::getConstNull(IntrinsicsTableTy), \"intrinsics\");\n }\n-\n- spdlog::info(\"optimize done\"sv);\n return Expect<Data>{std::move(D)};\n }\n \n-void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n+void Compiler::compile(const AST::TypeSection &TypeSec,\n+ bool DeclarationsOnly) noexcept {\n auto WrapperTy =\n LLVM::Type::getFunctionType(Context->VoidTy,\n {Context->ExecCtxPtrTy, Context->Int8PtrTy,\n@@ -6050,10 +6179,25 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n Context->CompositeTypes.reserve(Size);\n Context->FunctionWrappers.reserve(Size);\n \n+ auto SetFuncAttributes = [&](auto FDecl) {\n+ FDecl.setVisibility(LLVMProtectedVisibility);\n+ FDecl.setDSOLocal(true);\n+ FDecl.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ FDecl.addFnAttr(Context->NoStackArgProbe);\n+ FDecl.addFnAttr(Context->StrictFP);\n+ FDecl.addFnAttr(Context->UWTable);\n+ FDecl.addParamAttr(0, Context->ReadOnly);\n+ FDecl.addParamAttr(0, Context->NoAlias);\n+ FDecl.addParamAttr(1, Context->NoAlias);\n+ FDecl.addParamAttr(2, Context->NoAlias);\n+ FDecl.addParamAttr(3, Context->NoAlias);\n+ };\n+\n // Iterate and compile types.\n for (size_t I = 0; I < Size; ++I) {\n const auto &CompType = SubTypes[I].getCompositeType();\n- const auto Name = fmt::format(\"t{}\"sv, Context->CompositeTypes.size());\n+ const auto Name =\n+ fmt::format(\"{}t{}\"sv, Context->Prefix, Context->CompositeTypes.size());\n if (CompType.isFunc()) {\n // Check that the function type is unique.\n {\n@@ -6065,13 +6209,21 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n if (OldFuncType == CompType.getFuncType()) {\n Unique = false;\n Context->CompositeTypes.push_back(Context->CompositeTypes[J]);\n- auto F = Context->FunctionWrappers[J];\n- Context->FunctionWrappers.push_back(F);\n- auto A = Context->LLModule.addAlias(WrapperTy, F, Name.c_str());\n- A.setLinkage(LLVMExternalLinkage);\n- A.setVisibility(LLVMProtectedVisibility);\n- A.setDSOLocal(true);\n- A.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ if (DeclarationsOnly) {\n+ auto FDecl = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n+ SetFuncAttributes(FDecl);\n+ Context->FunctionWrappers.push_back(FDecl);\n+ } else {\n+ auto F = Context->FunctionWrappers[J];\n+ Context->FunctionWrappers.push_back(F);\n+ auto A = Context->LLModule.get().addAlias(WrapperTy, F,\n+ Name.c_str());\n+ A.setLinkage(LLVMExternalLinkage);\n+ A.setVisibility(LLVMProtectedVisibility);\n+ A.setDSOLocal(true);\n+ A.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ }\n break;\n }\n }\n@@ -6082,81 +6234,66 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n }\n \n // Create Wrapper\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\n- Name.c_str());\n+ auto F = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n {\n- F.setVisibility(LLVMProtectedVisibility);\n- F.setDSOLocal(true);\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\n- F.addFnAttr(Context->NoStackArgProbe);\n- F.addFnAttr(Context->StrictFP);\n- F.addFnAttr(Context->UWTable);\n- F.addParamAttr(0, Context->ReadOnly);\n- F.addParamAttr(0, Context->NoAlias);\n- F.addParamAttr(1, Context->NoAlias);\n- F.addParamAttr(2, Context->NoAlias);\n- F.addParamAttr(3, Context->NoAlias);\n-\n- LLVM::Builder Builder(Context->LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n-\n- auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\n- CompType.getFuncType());\n- auto RTy = FTy.getReturnType();\n- std::vector<LLVM::Type> FPTy(FTy.getNumParams());\n- FTy.getParamTypes(FPTy);\n-\n- const size_t ArgCount = FPTy.size() - 1;\n- auto ExecCtxPtr = F.getFirstParam();\n- auto RawFunc = LLVM::FunctionCallee{\n- FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\n- FTy.getPointerTo())};\n- auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\n- auto RawRets = RawArgs.getNextParam();\n-\n- std::vector<LLVM::Value> Args;\n- Args.reserve(FTy.getNumParams());\n- Args.push_back(ExecCtxPtr);\n- for (size_t J = 0; J < ArgCount; ++J) {\n- Args.push_back(Builder.createValuePtrLoad(\n- FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\n- }\n+ SetFuncAttributes(F);\n+\n+ if (!DeclarationsOnly) {\n+ LLVM::Builder Builder(Context->LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n+\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\n+ CompType.getFuncType());\n+ auto RTy = FTy.getReturnType();\n+ std::vector<LLVM::Type> FPTy(FTy.getNumParams());\n+ FTy.getParamTypes(FPTy);\n+\n+ const size_t ArgCount = FPTy.size() - 1;\n+ auto ExecCtxPtr = F.getFirstParam();\n+ auto RawFunc = LLVM::FunctionCallee{\n+ FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\n+ FTy.getPointerTo())};\n+ auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\n+ auto RawRets = RawArgs.getNextParam();\n+\n+ std::vector<LLVM::Value> Args;\n+ Args.reserve(FTy.getNumParams());\n+ Args.push_back(ExecCtxPtr);\n+ for (size_t J = 0; J < ArgCount; ++J) {\n+ Args.push_back(Builder.createValuePtrLoad(\n+ FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\n+ }\n \n- auto Ret = Builder.createCall(RawFunc, Args);\n- if (RTy.isVoidTy()) {\n- // nothing to do\n- } else if (RTy.isStructTy()) {\n- auto Rets = unpackStruct(Builder, Ret);\n- Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty, kValSize);\n- } else {\n- Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\n+ auto Ret = Builder.createCall(RawFunc, Args);\n+ if (RTy.isVoidTy()) {\n+ // nothing to do\n+ } else if (RTy.isStructTy()) {\n+ auto Rets = unpackStruct(Builder, Ret);\n+ Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty,\n+ kValSize);\n+ } else {\n+ Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\n+ }\n+ Builder.createRetVoid();\n }\n- Builder.createRetVoid();\n }\n // Copy wrapper, param and return lists to module instance.\n Context->FunctionWrappers.push_back(F);\n } else {\n // Non function type case. Create empty wrapper.\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\n- Name.c_str());\n+ auto F = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n {\n- F.setVisibility(LLVMProtectedVisibility);\n- F.setDSOLocal(true);\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\n- F.addFnAttr(Context->NoStackArgProbe);\n- F.addFnAttr(Context->StrictFP);\n- F.addFnAttr(Context->UWTable);\n- F.addParamAttr(0, Context->ReadOnly);\n- F.addParamAttr(0, Context->NoAlias);\n- F.addParamAttr(1, Context->NoAlias);\n- F.addParamAttr(2, Context->NoAlias);\n- F.addParamAttr(3, Context->NoAlias);\n-\n- LLVM::Builder Builder(Context->LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n- Builder.createRetVoid();\n+ SetFuncAttributes(F);\n+\n+ if (!DeclarationsOnly) {\n+ LLVM::Builder Builder(Context->LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n+ Builder.createRetVoid();\n+ }\n }\n Context->FunctionWrappers.push_back(F);\n }\n@@ -6184,9 +6321,9 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\n toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n auto RTy = FTy.getReturnType();\n auto F = LLVM::FunctionCallee{\n- FTy,\n- Context->LLModule.addFunction(FTy, LLVMInternalLinkage,\n- fmt::format(\"f{}\"sv, FuncID).c_str())};\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMInternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n F.Fn.setDSOLocal(true);\n F.Fn.addFnAttr(Context->NoStackArgProbe);\n F.Fn.addFnAttr(Context->StrictFP);\n@@ -6231,6 +6368,7 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\n }\n \n Context->Functions.emplace_back(TypeIdx, F, nullptr);\n+ Context->ImportCount++;\n break;\n }\n case ExternalType::Table: // Table type\n@@ -6313,9 +6451,10 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n const auto FuncID = Context->Functions.size();\n auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n- LLVM::FunctionCallee F = {FTy, Context->LLModule.addFunction(\n- FTy, LLVMExternalLinkage,\n- fmt::format(\"f{}\"sv, FuncID).c_str())};\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n F.Fn.setVisibility(LLVMProtectedVisibility);\n F.Fn.setDSOLocal(true);\n F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n@@ -6339,10 +6478,11 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n Locals.push_back(Local.second);\n }\n }\n- FunctionCompiler FC(*Context, F, Locals,\n- Conf.getCompilerConfigure().isInterruptible(),\n- Conf.getStatisticsConfigure().isInstructionCounting(),\n- Conf.getStatisticsConfigure().isCostMeasuring());\n+ FunctionCompiler FC(\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\n auto Type = Context->resolveBlockType(T);\n EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n F.Fn.eliminateUnreachableBlocks();\n@@ -6350,5 +6490,235 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n return {};\n }\n \n+void Compiler::compileFunctionDeclarations(\n+ const AST::FunctionSection &FunctionSec,\n+ const AST::CodeSection &CodeSec) noexcept {\n+ const auto &TypeIdxs = FunctionSec.getContent();\n+ const auto &CodeSegs = CodeSec.getContent();\n+ assuming(TypeIdxs.size() == CodeSegs.size());\n+\n+ for (size_t I = 0; I < CodeSegs.size(); ++I) {\n+ const auto &TypeIdx = TypeIdxs[I];\n+ const auto &Code = CodeSegs[I];\n+ assuming(TypeIdx < Context->CompositeTypes.size());\n+ assuming(Context->CompositeTypes[TypeIdx]->isFunc());\n+ const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n+ const auto FuncID = Context->Functions.size();\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n+ F.Fn.setVisibility(LLVMProtectedVisibility);\n+ F.Fn.setDSOLocal(true);\n+ F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ F.Fn.addFnAttr(Context->NoStackArgProbe);\n+ F.Fn.addFnAttr(Context->StrictFP);\n+ F.Fn.addFnAttr(Context->UWTable);\n+ F.Fn.addParamAttr(0, Context->ReadOnly);\n+ F.Fn.addParamAttr(0, Context->NoAlias);\n+\n+ Context->Functions.emplace_back(TypeIdx, F, &Code);\n+ }\n+}\n+\n+Expect<void> Compiler::compileFunctionBody(uint32_t LocalFuncIndex) noexcept {\n+ // Find the function in the Functions list\n+ // LocalFuncIndex is relative to the defined functions (not imports)\n+ uint32_t GlobalFuncIndex = Context->ImportCount + LocalFuncIndex;\n+ if (GlobalFuncIndex >= Context->Functions.size()) {\n+ spdlog::error(\"[lazy-jit]: function index {} out of range\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ auto &[T, F, Code] = Context->Functions[GlobalFuncIndex];\n+ if (!Code) {\n+ spdlog::error(\"[lazy-jit]: cannot compile import function {}\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ // Check if already compiled (function has basic blocks)\n+ if (F.Fn.countBasicBlocks() > 0) {\n+ spdlog::debug(\"[lazy-jit]: function {} already compiled\"sv, LocalFuncIndex);\n+ return {};\n+ }\n+\n+ spdlog::debug(\"[lazy-jit]: compiling function {}\"sv, LocalFuncIndex);\n+\n+ std::vector<ValType> Locals;\n+ for (const auto &Local : Code->getLocals()) {\n+ for (unsigned I = 0; I < Local.first; ++I) {\n+ Locals.push_back(Local.second);\n+ }\n+ }\n+\n+ FunctionCompiler FC(\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\n+ auto Type = Context->resolveBlockType(T);\n+ EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n+ F.Fn.eliminateUnreachableBlocks();\n+\n+ return {};\n+}\n+\n+Expect<std::pair<LLVM::Data,\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter>>>\n+LLVM::Compiler::compileInfrastructure(const AST::Module &Module,\n+ std::string Prefix) noexcept {\n+ Data D;\n+ D.setPrefix(Prefix);\n+ // Check the module is validated.\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ spdlog::info(\"[lazy-jit]: compile infrastructure start\"sv);\n+\n+ auto LLContext = D.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = D.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ std::unique_ptr<CompileContext, CompileContextDeleter> NewContext(\n+ new CompileContext(LLContext, LLModule,\n+ Conf.getCompilerConfigure().isGenericBinary(),\n+ D.getPrefix()));\n+ RAIICleanup Cleanup(this->Context, NewContext.get());\n+\n+ // Compile Function Types\n+ compile(Module.getTypeSection());\n+ // Compile ImportSection\n+ compile(Module.getImportSection());\n+ // Compile GlobalSection\n+ compile(Module.getGlobalSection());\n+ // Compile MemorySection (MemorySec, DataSec)\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ // Compile TableSection (TableSec, ElemSec)\n+ compile(Module.getTableSection(), Module.getElementSection());\n+ // Create function declarations without compiling bodies\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+ // Compile ExportSection\n+ compile(Module.getExportSection());\n+\n+ // Set initializer for constant value\n+ auto IntrinsicsName = fmt::format(\"{}intrinsics\"sv, D.getPrefix());\n+ if (auto IntrinsicsTable = LLModule.getNamedGlobal(IntrinsicsName.c_str())) {\n+ IntrinsicsTable.setInitializer(\n+ LLVM::Value::getConstNull(IntrinsicsTable.getType()));\n+ IntrinsicsTable.setGlobalConstant(false);\n+ } else {\n+ auto IntrinsicsTableTy = LLVM::Type::getArrayType(\n+ LLContext.getInt8Ty().getPointerTo(),\n+ static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax));\n+ LLModule.addGlobal(\n+ IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n+ LLVM::Value::getConstNull(IntrinsicsTableTy), IntrinsicsName.c_str());\n+ }\n+ LLModule.verify(LLVMPrintMessageAction);\n+\n+ spdlog::info(\"[lazy-jit]: infrastructure compilation done\"sv);\n+\n+ return Expect<\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>>{\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>{\n+ std::move(D), std::move(NewContext)}};\n+}\n+\n+Expect<LLVM::Data>\n+Compiler::compileFunctions(Data &&LLData, CompileContext *NewContext,\n+ const AST::Module &Module,\n+ Span<const uint32_t> LocalFuncIndices) noexcept {\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+ if (unlikely(LocalFuncIndices.empty())) {\n+ spdlog::error(\"[lazy-jit]: compileFunctions with empty index list\"sv);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ std::vector<uint32_t> Sorted(LocalFuncIndices.begin(),\n+ LocalFuncIndices.end());\n+ std::sort(Sorted.begin(), Sorted.end());\n+ Sorted.erase(std::unique(Sorted.begin(), Sorted.end()), Sorted.end());\n+\n+ spdlog::debug(\"[lazy-jit]: compile functions batch ({}) start\"sv,\n+ Sorted.size());\n+\n+ auto LLContext = LLData.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = LLData.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ RAIICleanup Cleanup(this->Context, NewContext);\n+ Context->LLModule = LLModule;\n+\n+ Context->CompositeTypes.clear();\n+ Context->FunctionWrappers.clear();\n+ Context->Functions.clear();\n+ Context->LazyJITCacheVars.clear();\n+ Context->ImportCount = 0;\n+ Context->MemoryAddrTypes.clear();\n+ Context->TableAddrTypes.clear();\n+ Context->Globals.clear();\n+\n+ Context->IntrinsicsTable = LLModule.addGlobal(\n+ Context->IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\n+ fmt::format(\"{}intrinsics\"sv, Context->Prefix).c_str());\n+ Context->IntrinsicsTable.setInitializer(LLVM::Value());\n+ Context->Trap.Ty =\n+ LLVM::Type::getFunctionType(Context->VoidTy, {Context->Int32Ty});\n+ Context->Trap.Fn =\n+ LLModule.addFunction(Context->Trap.Ty, LLVMPrivateLinkage, \"trap\");\n+ Context->Trap.Fn.setDSOLocal(true);\n+ Context->Trap.Fn.addFnAttr(Context->NoStackArgProbe);\n+ Context->Trap.Fn.addFnAttr(Context->StrictFP);\n+ Context->Trap.Fn.addFnAttr(Context->UWTable);\n+ Context->Trap.Fn.addFnAttr(Context->NoReturn);\n+ Context->Trap.Fn.addFnAttr(Context->Cold);\n+ Context->Trap.Fn.addFnAttr(Context->NoInline);\n+ Context->compileTrap();\n+\n+ compile(Module.getTypeSection(), true);\n+ compile(Module.getImportSection());\n+ compile(Module.getGlobalSection());\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ compile(Module.getTableSection(), Module.getElementSection());\n+\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+\n+ for (uint32_t FuncIndex : Sorted) {\n+ EXPECTED_TRY(compileFunctionBody(FuncIndex));\n+ }\n+\n+ spdlog::info(\"[lazy-jit]: verify batch ({} funcs) start\"sv, Sorted.size());\n+ LLModule.verify(LLVMPrintMessageAction);\n+ spdlog::info(\"[lazy-jit]: verify batch ({} funcs) done\"sv, Sorted.size());\n+\n+ auto &TM = LLData.extract().TM;\n+ EXPECTED_TRY(optimize(LLModule, TM));\n+\n+ spdlog::debug(\"[lazy-jit]: compile functions batch ({}) done\"sv,\n+ Sorted.size());\n+ return Expect<Data>{std::move(LLData)};\n+}\n+\n+void LLVM::Compiler::CompileContextDeleter::operator()(\n+ CompileContext *Context) const noexcept {\n+ delete Context;\n+}\n } // namespace LLVM\n } // namespace WasmEdge\n"}],"string":"[\n {\n \"comment\": \"These sections should be static after the first compilation. What is the reason that we have to recompile all of them each time?\",\n \"path\": \"lib/llvm/compiler.cpp\",\n \"hunk\": \"@@ -6325,13 +6383,310 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\\n FunctionCompiler FC(*Context, F, Locals,\\n Conf.getCompilerConfigure().isInterruptible(),\\n Conf.getStatisticsConfigure().isInstructionCounting(),\\n- Conf.getStatisticsConfigure().isCostMeasuring());\\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\\n+ Conf.getRuntimeConfigure().isEnableLazyJIT());\\n auto Type = Context->resolveBlockType(T);\\n EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\\n F.Fn.eliminateUnreachableBlocks();\\n }\\n return {};\\n }\\n \\n+void Compiler::compileFunctionDeclarations(\\n+ const AST::FunctionSection &FunctionSec,\\n+ const AST::CodeSection &CodeSec) noexcept {\\n+ const auto &TypeIdxs = FunctionSec.getContent();\\n+ const auto &CodeSegs = CodeSec.getContent();\\n+ assuming(TypeIdxs.size() == CodeSegs.size());\\n+\\n+ for (size_t I = 0; I < CodeSegs.size(); ++I) {\\n+ const auto &TypeIdx = TypeIdxs[I];\\n+ const auto &Code = CodeSegs[I];\\n+ assuming(TypeIdx < Context->CompositeTypes.size());\\n+ assuming(Context->CompositeTypes[TypeIdx]->isFunc());\\n+ const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\\n+ const auto FuncID = Context->Functions.size();\\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\\n+ LLVM::FunctionCallee F = {\\n+ FTy, Context->LLModule.get().addFunction(\\n+ FTy, LLVMExternalLinkage,\\n+ fmt::format(\\\"{}f{}\\\"sv, Context->Prefix, FuncID).c_str())};\\n+ F.Fn.setVisibility(LLVMProtectedVisibility);\\n+ F.Fn.setDSOLocal(true);\\n+ F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ F.Fn.addFnAttr(Context->NoStackArgProbe);\\n+ F.Fn.addFnAttr(Context->StrictFP);\\n+ F.Fn.addFnAttr(Context->UWTable);\\n+ F.Fn.addParamAttr(0, Context->ReadOnly);\\n+ F.Fn.addParamAttr(0, Context->NoAlias);\\n+\\n+ Context->Functions.emplace_back(TypeIdx, F, &Code);\\n+ }\\n+}\\n+\\n+Expect<void> Compiler::compileFunctionBody(uint32_t LocalFuncIndex) noexcept {\\n+ // Find the function in the Functions list\\n+ // LocalFuncIndex is relative to the defined functions (not imports)\\n+ uint32_t ImportCount = 0;\\n+ for (const auto &[T, F, Code] : Context->Functions) {\\n+ if (!Code) {\\n+ ImportCount++;\\n+ }\\n+ }\\n+\\n+ uint32_t GlobalFuncIndex = ImportCount + LocalFuncIndex;\\n+ if (GlobalFuncIndex >= Context->Functions.size()) {\\n+ spdlog::error(\\\"[lazy-jit]: function index {} out of range\\\"sv,\\n+ LocalFuncIndex);\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ auto &[T, F, Code] = Context->Functions[GlobalFuncIndex];\\n+ if (!Code) {\\n+ spdlog::error(\\\"[lazy-jit]: cannot compile import function {}\\\"sv,\\n+ LocalFuncIndex);\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ // Check if already compiled (function has basic blocks)\\n+ if (F.Fn.countBasicBlocks() > 0) {\\n+ spdlog::debug(\\\"[lazy-jit]: function {} already compiled\\\"sv, LocalFuncIndex);\\n+ return {};\\n+ }\\n+\\n+ spdlog::debug(\\\"[lazy-jit]: compiling function {}\\\"sv, LocalFuncIndex);\\n+\\n+ std::vector<ValType> Locals;\\n+ for (const auto &Local : Code->getLocals()) {\\n+ for (unsigned I = 0; I < Local.first; ++I) {\\n+ Locals.push_back(Local.second);\\n+ }\\n+ }\\n+\\n+ FunctionCompiler FC(*Context, F, Locals,\\n+ Conf.getCompilerConfigure().isInterruptible(),\\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\\n+ Conf.getRuntimeConfigure().isEnableLazyJIT());\\n+ auto Type = Context->resolveBlockType(T);\\n+ EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\\n+ F.Fn.eliminateUnreachableBlocks();\\n+\\n+ return {};\\n+}\\n+\\n+Expect<std::pair<LLVM::Data,\\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\\n+ LLVM::Compiler::CompileContextDeleter>>>\\n+LLVM::Compiler::compileInfrastructure(const AST::Module &Module,\\n+ std::string Prefix) noexcept {\\n+ Data D;\\n+ D.setPrefix(Prefix);\\n+ // Check the module is validated.\\n+ if (unlikely(!Module.getIsValidated())) {\\n+ spdlog::error(ErrCode::Value::NotValidated);\\n+ return Unexpect(ErrCode::Value::NotValidated);\\n+ }\\n+\\n+ std::unique_lock Lock(Mutex);\\n+ spdlog::info(\\\"[lazyjit]: compile infrastructure start\\\"sv);\\n+\\n+ auto LLContext = D.extract().getLLContext();\\n+ LLVM::Core::init(LLContext.unwrap());\\n+ auto &LLModule = D.extract().LLModule;\\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \\\"PIC Level\\\"sv, 2);\\n+\\n+ std::unique_ptr<CompileContext, CompileContextDeleter> NewContext(\\n+ new CompileContext(LLContext, LLModule,\\n+ Conf.getCompilerConfigure().isGenericBinary(),\\n+ D.getPrefix()));\\n+ this->Context = NewContext.get();\\n+\\n+ // Compile Function Types\\n+ compile(Module.getTypeSection());\\n+ // Compile ImportSection\\n+ compile(Module.getImportSection());\\n+ // Compile GlobalSection\\n+ compile(Module.getGlobalSection());\\n+ // Compile MemorySection (MemorySec, DataSec)\\n+ compile(Module.getMemorySection(), Module.getDataSection());\\n+ // Compile TableSection (TableSec, ElemSec)\\n+ compile(Module.getTableSection(), Module.getElementSection());\\n+ // Create function declarations without compiling bodies\\n+ compileFunctionDeclarations(Module.getFunctionSection(),\\n+ Module.getCodeSection());\\n+ // Compile ExportSection\\n+ compile(Module.getExportSection());\\n+\\n+ // Set initializer for constant value\\n+ auto IntrinsicsName = fmt::format(\\\"{}intrinsics\\\"sv, D.getPrefix());\\n+ if (auto IntrinsicsTable = LLModule.getNamedGlobal(IntrinsicsName.c_str())) {\\n+ IntrinsicsTable.setInitializer(\\n+ LLVM::Value::getConstNull(IntrinsicsTable.getType()));\\n+ IntrinsicsTable.setGlobalConstant(false);\\n+ } else {\\n+ auto IntrinsicsTableTy = LLVM::Type::getArrayType(\\n+ LLContext.getInt8Ty().getPointerTo(),\\n+ static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax));\\n+ LLModule.addGlobal(\\n+ IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\\n+ LLVM::Value::getConstNull(IntrinsicsTableTy), IntrinsicsName.c_str());\\n+ }\\n+\\n+ spdlog::info(\\\"[lazyjit]: infrastructure compilation done\\\"sv);\\n+\\n+ this->Context = nullptr;\\n+ return Expect<\\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>>{\\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>{\\n+ std::move(D), std::move(NewContext)}};\\n+}\\n+\\n+Expect<LLVM::Data> Compiler::compileFunction(Data &&LLData,\\n+ CompileContext *NewContext,\\n+ const AST::Module &Module,\\n+ uint32_t FuncIndex) noexcept {\\n+ // Check the module is validated.\\n+ if (unlikely(!Module.getIsValidated())) {\\n+ spdlog::error(ErrCode::Value::NotValidated);\\n+ return Unexpect(ErrCode::Value::NotValidated);\\n+ }\\n+\\n+ std::unique_lock Lock(Mutex);\\n+ spdlog::debug(\\\"[lazyjit]: compile function {} start\\\"sv, FuncIndex);\\n+\\n+ auto LLContext = LLData.extract().getLLContext();\\n+ LLVM::Core::init(LLContext.unwrap());\\n+ auto &LLModule = LLData.extract().LLModule;\\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \\\"PIC Level\\\"sv, 2);\\n+\\n+ this->Context = NewContext;\\n+ Context->LLModule = LLModule;\\n+\\n+ // Clear module-bound state if reusing the context\\n+ Context->CompositeTypes.clear();\\n+ Context->FunctionWrappers.clear();\\n+ Context->Functions.clear();\\n+ Context->MemoryAddrTypes.clear();\\n+ Context->TableAddrTypes.clear();\\n+ Context->Globals.clear();\\n+\\n+ Context->IntrinsicsTable = LLModule.addGlobal(\\n+ Context->IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\\n+ fmt::format(\\\"{}intrinsics\\\"sv, Context->Prefix).c_str());\\n+ Context->Trap.Ty =\\n+ LLVM::Type::getFunctionType(Context->VoidTy, {Context->Int32Ty});\\n+ Context->Trap.Fn =\\n+ LLModule.addFunction(Context->Trap.Ty, LLVMPrivateLinkage, \\\"trap\\\");\\n+ Context->Trap.Fn.setDSOLocal(true);\\n+ Context->Trap.Fn.addFnAttr(Context->NoStackArgProbe);\\n+ Context->Trap.Fn.addFnAttr(Context->StrictFP);\\n+ Context->Trap.Fn.addFnAttr(Context->UWTable);\\n+ Context->Trap.Fn.addFnAttr(Context->NoReturn);\\n+ Context->Trap.Fn.addFnAttr(Context->Cold);\\n+ Context->Trap.Fn.addFnAttr(Context->NoInline);\\n+ Context->compileTrap();\\n+\\n+ // Re-compile infrastructure for the fresh module\\n+ // compile types first (needed for function type lookup)\\n+ compile(Module.getTypeSection());\\n+ // compile imports to get the correct function offset\\n+ compile(Module.getImportSection());\\n+ // compile globals (may be needed by function body)\\n+ compile(Module.getGlobalSection());\\n+ // compile memory\\n+ compile(Module.getMemorySection(), Module.getDataSection());\\n+ // compile table\\n+ compile(Module.getTableSection(), Module.getElementSection());\\n+\\n+ // create all function declarations\\n+ compileFunctionDeclarations(Module.getFunctionSection(),\\n+ Module.getCodeSection());\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp\\nindex 39da94d9a9ac..330e245f51c3 100644\\n--- a/lib/llvm/compiler.cpp\\n+++ b/lib/llvm/compiler.cpp\\n@@ -9,6 +9,7 @@\\n #include \\\"common/spdlog.h\\\"\\n #include \\\"data.h\\\"\\n #include \\\"llvm.h\\\"\\n+#include \\\"spdlog/spdlog.h\\\"\\n #include \\\"system/allocator.h\\\"\\n \\n #include <algorithm>\\n@@ -16,6 +17,7 @@\\n #include <cinttypes>\\n #include <cstdint>\\n #include <cstdlib>\\n+#include <functional>\\n #include <limits>\\n #include <memory>\\n #include <numeric>\\n@@ -28,6 +30,16 @@ using namespace std::literals;\\n \\n namespace {\\n \\n+struct RAIICleanup {\\n+ RAIICleanup(LLVM::Compiler::CompileContext *&Context,\\n+ LLVM::Compiler::CompileContext *NewContext)\\n+ : Context(Context) {\\n+ Context = NewContext;\\n+ }\\n+ ~RAIICleanup() { Context = nullptr; }\\n+ LLVM::Compiler::CompileContext *&Context;\\n+};\\n+\\n static bool\\n isVoidReturn(WasmEdge::Span<const WasmEdge::ValType> ValTypes) noexcept;\\n static LLVM::Type toLLVMType(LLVM::Context LLContext,\\n@@ -128,7 +140,7 @@ static inline LLVMCodeGenOptLevel toLLVMCodeGenLevel(\\n \\n struct LLVM::Compiler::CompileContext {\\n LLVM::Context LLContext;\\n- LLVM::Module &LLModule;\\n+ std::reference_wrapper<LLVM::Module> LLModule;\\n LLVM::Attribute Cold;\\n LLVM::Attribute NoAlias;\\n LLVM::Attribute NoInline;\\n@@ -202,13 +214,16 @@ struct LLVM::Compiler::CompileContext {\\n std::vector<std::tuple<uint32_t, LLVM::FunctionCallee,\\n const WasmEdge::AST::CodeSegment *>>\\n Functions;\\n+ std::vector<LLVM::Value> LazyJITCacheVars;\\n+ uint32_t ImportCount = 0;\\n std::vector<LLVM::Type> MemoryAddrTypes;\\n std::vector<LLVM::Type> TableAddrTypes;\\n std::vector<LLVM::Type> Globals;\\n+ std::string Prefix;\\n LLVM::Value IntrinsicsTable;\\n LLVM::FunctionCallee Trap;\\n- CompileContext(LLVM::Context C, LLVM::Module &M,\\n- bool IsGenericBinary) noexcept\\n+ CompileContext(LLVM::Context C, LLVM::Module &M, bool IsGenericBinary,\\n+ std::string_view P = \\\"\\\"sv) noexcept\\n : LLContext(C), LLModule(M),\\n Cold(LLVM::Attribute::createEnum(C, LLVM::Core::Cold, 0)),\\n NoAlias(LLVM::Attribute::createEnum(C, LLVM::Core::NoAlias, 0)),\\n@@ -256,14 +271,14 @@ struct LLVM::Compiler::CompileContext {\\n })),\\n ExecCtxPtrTy(ExecCtxTy.getPointerTo()),\\n IntrinsicsTableTy(LLVM::Type::getArrayType(\\n- Int8PtrTy,\\n+ Int8Ty.getPointerTo(),\\n static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax))),\\n- IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()),\\n- IntrinsicsTable(LLModule.addGlobal(IntrinsicsTablePtrTy, true,\\n- LLVMExternalLinkage, LLVM::Value(),\\n- \\\"intrinsics\\\")) {\\n+ IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()), Prefix(P),\\n+ IntrinsicsTable(LLModule.get().addGlobal(\\n+ IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\\n+ fmt::format(\\\"{}intrinsics\\\"sv, Prefix).c_str())) {\\n Trap.Ty = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\\n- Trap.Fn = LLModule.addFunction(Trap.Ty, LLVMPrivateLinkage, \\\"trap\\\");\\n+ Trap.Fn = LLModule.get().addFunction(Trap.Ty, LLVMPrivateLinkage, \\\"trap\\\");\\n Trap.Fn.setDSOLocal(true);\\n Trap.Fn.addFnAttr(NoStackArgProbe);\\n Trap.Fn.addFnAttr(StrictFP);\\n@@ -272,9 +287,10 @@ struct LLVM::Compiler::CompileContext {\\n Trap.Fn.addFnAttr(Cold);\\n Trap.Fn.addFnAttr(NoInline);\\n \\n- LLModule.addGlobal(Int32Ty, true, LLVMExternalLinkage,\\n- LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\\n- \\\"version\\\");\\n+ LLModule.get().addGlobal(\\n+ Int32Ty, true, LLVMExternalLinkage,\\n+ LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\\n+ fmt::format(\\\"{}version\\\"sv, Prefix).c_str());\\n \\n if (!IsGenericBinary) {\\n SubtargetFeatures = LLVM::getHostCPUFeatures();\\n@@ -313,18 +329,7 @@ struct LLVM::Compiler::CompileContext {\\n }\\n }\\n \\n- {\\n- // create trap\\n- LLVM::Builder Builder(LLContext);\\n- Builder.positionAtEnd(\\n- LLVM::BasicBlock::create(LLContext, Trap.Fn, \\\"entry\\\"));\\n- auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\\n- auto CallTrap = Builder.createCall(\\n- getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\\n- {Trap.Fn.getFirstParam()});\\n- CallTrap.addCallSiteAttribute(NoReturn);\\n- Builder.createUnreachable();\\n- }\\n+ compileTrap();\\n }\\n LLVM::Value getMemory(LLVM::Builder &Builder, LLVM::Value ExecCtx,\\n uint32_t Index) noexcept {\\n@@ -394,6 +399,17 @@ struct LLVM::Compiler::CompileContext {\\n auto Ptr = Builder.createBitCast(VPtr, PtrPtrTy);\\n return {Ty, Builder.createLoad(PtrTy, Ptr)};\\n }\\n+ void compileTrap() noexcept {\\n+ LLVM::Builder Builder(LLContext);\\n+ Builder.positionAtEnd(\\n+ LLVM::BasicBlock::create(LLContext, Trap.Fn, \\\"entry\\\"));\\n+ auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\\n+ auto CallTrap = Builder.createCall(\\n+ getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\\n+ {Trap.Fn.getFirstParam()});\\n+ CallTrap.addCallSiteAttribute(NoReturn);\\n+ Builder.createUnreachable();\\n+ }\\n std::pair<std::vector<ValType>, std::vector<ValType>>\\n resolveBlockType(const BlockType &BType) const noexcept {\\n using VecT = std::vector<ValType>;\\n@@ -544,9 +560,10 @@ class FunctionCompiler {\\n FunctionCompiler(LLVM::Compiler::CompileContext &Context,\\n LLVM::FunctionCallee F, Span<const ValType> Locals,\\n bool Interruptible, bool InstructionCounting,\\n- bool GasMeasuring) noexcept\\n+ bool GasMeasuring, bool IsLazyJIT) noexcept\\n : Context(Context), LLContext(Context.LLContext),\\n- Interruptible(Interruptible), F(F), Builder(LLContext) {\\n+ Interruptible(Interruptible), IsLazyJIT(IsLazyJIT), F(F),\\n+ Builder(LLContext) {\\n if (F.Fn) {\\n Builder.positionAtEnd(LLVM::BasicBlock::create(LLContext, F.Fn, \\\"entry\\\"));\\n ExecCtx = Builder.createLoad(Context.ExecCtxTy, F.Fn.getFirstParam());\\n@@ -4267,7 +4284,63 @@ class FunctionCompiler {\\n Args[J + 1] = stackPop();\\n }\\n \\n- auto Ret = Builder.createCall(Function, Args);\\n+ LLVM::Value Ret;\\n+ if (IsLazyJIT) {\\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\\n+ if (IsImport) {\\n+ Ret = Builder.createCall(Function, Args);\\n+ } else {\\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\\n+\\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\\n+ }\\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\\n+ if (!CacheVar) {\\n+ CacheVar = Context.LLModule.get().addGlobal(\\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \\\"\\\");\\n+ }\\n+\\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \\\"ic.check\\\");\\n+ auto ResolveBB =\\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \\\"ic.resolve\\\");\\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \\\"ic.call\\\");\\n+\\n+ Builder.createBr(CheckBB);\\n+ Builder.positionAtEnd(CheckBB);\\n+\\n+ auto CachedPtr =\\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\\n+ CachedPtr.setAlignment(8);\\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\\n+ auto IsNull = Builder.createIsNull(CachedPtr);\\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\\n+\\n+ Builder.positionAtEnd(ResolveBB);\\n+ auto FPtr = Builder.createCall(\\n+ Context.getIntrinsic(\\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\\n+ {Context.Int32Ty}, false)),\\n+ {LLContext.getInt32(FuncIndex)});\\n+ auto Store = Builder.createStore(FPtr, CacheVar);\\n+ Store.setAlignment(8);\\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\\n+ Builder.createBr(CallBB);\\n+\\n+ Builder.positionAtEnd(CallBB);\\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\\n+\\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\\n+ }\\n+ } else {\\n+ Ret = Builder.createCall(Function, Args);\\n+ }\\n+\\n auto Ty = Ret.getType();\\n if (Ty.isVoidTy()) {\\n // nothing to do\\n@@ -4387,7 +4460,64 @@ class FunctionCompiler {\\n Args[J + 1] = stackPop();\\n }\\n \\n- auto Ret = Builder.createCall(Function, Args);\\n+ LLVM::Value Ret;\\n+ if (IsLazyJIT) {\\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\\n+ if (IsImport) {\\n+ Ret = Builder.createCall(Function, Args);\\n+ } else {\\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\\n+\\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\\n+ }\\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\\n+ if (!CacheVar) {\\n+ CacheVar = Context.LLModule.get().addGlobal(\\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \\\"\\\");\\n+ }\\n+\\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \\\"rc.check\\\");\\n+ auto ResolveBB =\\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \\\"rc.resolve\\\");\\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \\\"rc.call\\\");\\n+\\n+ Builder.createBr(CheckBB);\\n+ Builder.positionAtEnd(CheckBB);\\n+\\n+ auto CachedPtr =\\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\\n+ CachedPtr.setAlignment(8);\\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\\n+ auto IsNull = Builder.createIsNull(CachedPtr);\\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\\n+\\n+ Builder.positionAtEnd(ResolveBB);\\n+ auto FPtr = Builder.createCall(\\n+ Context.getIntrinsic(\\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\\n+ {Context.Int32Ty}, false)),\\n+ {LLContext.getInt32(FuncIndex)});\\n+ auto Store = Builder.createStore(FPtr, CacheVar);\\n+ Store.setAlignment(8);\\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\\n+ Builder.createBr(CallBB);\\n+\\n+ Builder.positionAtEnd(CallBB);\\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\\n+\\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\\n+ }\\n+ } else {\\n+ Ret = Builder.createCall(Function, Args);\\n+ }\\n+\\n+ Ret.setMustTailCall();\\n auto Ty = Ret.getType();\\n if (Ty.isVoidTy()) {\\n Builder.createRetVoid();\\n@@ -4432,6 +4562,7 @@ class FunctionCompiler {\\n \\n auto FPtrRet =\\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\\n+ FPtrRet.setMustTailCall();\\n if (RetSize == 0) {\\n Builder.createRetVoid();\\n } else {\\n@@ -4608,6 +4739,7 @@ class FunctionCompiler {\\n \\n auto FPtrRet =\\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\\n+ FPtrRet.setMustTailCall();\\n if (RetSize == 0) {\\n Builder.createRetVoid();\\n } else {\\n@@ -5854,6 +5986,7 @@ class FunctionCompiler {\\n Control &operator=(const Control &) = default;\\n Control &operator=(Control &&) = default;\\n };\\n+ bool IsLazyJIT;\\n std::vector<Control> ControlStack;\\n LLVM::FunctionCallee F;\\n LLVM::Value ExecCtx;\\n@@ -5894,6 +6027,84 @@ Expect<void> Compiler::checkConfigure() noexcept {\\n return {};\\n }\\n \\n+Expect<void> Compiler::optimize(LLVM::Module &LLModule,\\n+ LLVM::TargetMachine &TM) noexcept {\\n+ spdlog::info(\\\"optimize start\\\"sv);\\n+ auto Triple = LLModule.getTarget();\\n+ auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\\n+ if (ErrorMessage) {\\n+ spdlog::error(\\\"getFromTriple failed:{}\\\"sv, ErrorMessage.string_view());\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ std::string CPUName;\\n+#if defined(__riscv) && __riscv_xlen == 64\\n+ CPUName = \\\"generic-rv64\\\"s;\\n+#else\\n+ if (!Conf.getCompilerConfigure().isGenericBinary()) {\\n+ CPUName = LLVM::getHostCPUName().string_view();\\n+ } else {\\n+ CPUName = \\\"generic\\\"s;\\n+ }\\n+#endif\\n+\\n+ // On RISC-V we use generic-rv64 as the CPU, so also use default\\n+ // features; host features under QEMU can be inconsistent (e.g.\\n+ // zvl*b without v) which LLVM >= 20 rejects.\\n+ TM = LLVM::TargetMachine::create(\\n+ TheTarget, Triple, CPUName.c_str(),\\n+#if defined(__riscv) && __riscv_xlen == 64\\n+ \\\"\\\",\\n+#else\\n+ LLVM::getHostCPUFeatures().unwrap(),\\n+#endif\\n+ toLLVMCodeGenLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\\n+ LLVMRelocPIC, LLVMCodeModelDefault);\\n+\\n+#if LLVM_VERSION_MAJOR >= 13\\n+ auto PBO = LLVM::PassBuilderOptions::create();\\n+ if (auto Error = PBO.runPasses(\\n+ LLModule,\\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\\n+ TM)) {\\n+ spdlog::error(\\\"{}\\\"sv, Error.message().string_view());\\n+ }\\n+#else\\n+ auto FP = LLVM::PassManager::createForModule(LLModule);\\n+ auto MP = LLVM::PassManager::create();\\n+\\n+ TM.addAnalysisPasses(MP);\\n+ TM.addAnalysisPasses(FP);\\n+ {\\n+ auto PMB = LLVM::PassManagerBuilder::create();\\n+ auto [OptLevel, SizeLevel] =\\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\\n+ PMB.setOptLevel(OptLevel);\\n+ PMB.setSizeLevel(SizeLevel);\\n+ PMB.populateFunctionPassManager(FP);\\n+ PMB.populateModulePassManager(MP);\\n+ }\\n+ switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\\n+ case CompilerConfigure::OptimizationLevel::O0:\\n+ case CompilerConfigure::OptimizationLevel::O1:\\n+ FP.addTailCallEliminationPass();\\n+ break;\\n+ default:\\n+ break;\\n+ }\\n+\\n+ FP.initializeFunctionPassManager();\\n+ for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\\n+ FP.runFunctionPassManager(Fn);\\n+ }\\n+ FP.finalizeFunctionPassManager();\\n+ MP.runPassManager(LLModule);\\n+#endif\\n+\\n+ spdlog::info(\\\"optimize done\\\"sv);\\n+ return {};\\n+}\\n+\\n Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\\n // Check that the module is validated.\\n if (unlikely(!Module.getIsValidated())) {\\n@@ -5913,15 +6124,7 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\\n \\n CompileContext NewContext(LLContext, LLModule,\\n Conf.getCompilerConfigure().isGenericBinary());\\n- struct RAIICleanup {\\n- RAIICleanup(CompileContext *&Context, CompileContext &NewContext)\\n- : Context(Context) {\\n- Context = &NewContext;\\n- }\\n- ~RAIICleanup() { Context = nullptr; }\\n- CompileContext *&Context;\\n- };\\n- RAIICleanup Cleanup(Context, NewContext);\\n+ RAIICleanup Cleanup(Context, &NewContext);\\n \\n // Compile Function Types\\n compile(Module.getTypeSection());\\n@@ -5942,81 +6145,8 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\\n spdlog::info(\\\"verify start\\\"sv);\\n LLModule.verify(LLVMPrintMessageAction);\\n \\n- spdlog::info(\\\"optimize start\\\"sv);\\n auto &TM = D.extract().TM;\\n- {\\n- auto Triple = LLModule.getTarget();\\n- auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\\n- if (ErrorMessage) {\\n- spdlog::error(\\\"getFromTriple failed:{}\\\"sv, ErrorMessage.string_view());\\n- return Unexpect(ErrCode::Value::IllegalPath);\\n- } else {\\n- std::string CPUName;\\n-#if defined(__riscv) && __riscv_xlen == 64\\n- CPUName = \\\"generic-rv64\\\"s;\\n-#else\\n- if (!Conf.getCompilerConfigure().isGenericBinary()) {\\n- CPUName = LLVM::getHostCPUName().string_view();\\n- } else {\\n- CPUName = \\\"generic\\\"s;\\n- }\\n-#endif\\n-\\n- // On RISC-V we use generic-rv64 as the CPU, so also use default\\n- // features; host features under QEMU can be inconsistent (e.g.\\n- // zvl*b without v) which LLVM >= 20 rejects.\\n- TM = LLVM::TargetMachine::create(\\n- TheTarget, Triple, CPUName.c_str(),\\n-#if defined(__riscv) && __riscv_xlen == 64\\n- \\\"\\\",\\n-#else\\n- LLVM::getHostCPUFeatures().unwrap(),\\n-#endif\\n- toLLVMCodeGenLevel(\\n- Conf.getCompilerConfigure().getOptimizationLevel()),\\n- LLVMRelocPIC, LLVMCodeModelDefault);\\n- }\\n-\\n-#if LLVM_VERSION_MAJOR >= 13\\n- auto PBO = LLVM::PassBuilderOptions::create();\\n- if (auto Error = PBO.runPasses(\\n- LLModule,\\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\\n- TM)) {\\n- spdlog::error(\\\"{}\\\"sv, Error.message().string_view());\\n- }\\n-#else\\n- auto FP = LLVM::PassManager::createForModule(LLModule);\\n- auto MP = LLVM::PassManager::create();\\n-\\n- TM.addAnalysisPasses(MP);\\n- TM.addAnalysisPasses(FP);\\n- {\\n- auto PMB = LLVM::PassManagerBuilder::create();\\n- auto [OptLevel, SizeLevel] =\\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\\n- PMB.setOptLevel(OptLevel);\\n- PMB.setSizeLevel(SizeLevel);\\n- PMB.populateFunctionPassManager(FP);\\n- PMB.populateModulePassManager(MP);\\n- }\\n- switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\\n- case CompilerConfigure::OptimizationLevel::O0:\\n- case CompilerConfigure::OptimizationLevel::O1:\\n- FP.addTailCallEliminationPass();\\n- break;\\n- default:\\n- break;\\n- }\\n-\\n- FP.initializeFunctionPassManager();\\n- for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\\n- FP.runFunctionPassManager(Fn);\\n- }\\n- FP.finalizeFunctionPassManager();\\n- MP.runPassManager(LLModule);\\n-#endif\\n- }\\n+ EXPECTED_TRY(optimize(LLModule, TM));\\n \\n // Set initializer for constant value\\n if (auto IntrinsicsTable = LLModule.getNamedGlobal(\\\"intrinsics\\\")) {\\n@@ -6031,12 +6161,11 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\\n IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\\n LLVM::Value::getConstNull(IntrinsicsTableTy), \\\"intrinsics\\\");\\n }\\n-\\n- spdlog::info(\\\"optimize done\\\"sv);\\n return Expect<Data>{std::move(D)};\\n }\\n \\n-void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\\n+void Compiler::compile(const AST::TypeSection &TypeSec,\\n+ bool DeclarationsOnly) noexcept {\\n auto WrapperTy =\\n LLVM::Type::getFunctionType(Context->VoidTy,\\n {Context->ExecCtxPtrTy, Context->Int8PtrTy,\\n@@ -6050,10 +6179,25 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\\n Context->CompositeTypes.reserve(Size);\\n Context->FunctionWrappers.reserve(Size);\\n \\n+ auto SetFuncAttributes = [&](auto FDecl) {\\n+ FDecl.setVisibility(LLVMProtectedVisibility);\\n+ FDecl.setDSOLocal(true);\\n+ FDecl.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ FDecl.addFnAttr(Context->NoStackArgProbe);\\n+ FDecl.addFnAttr(Context->StrictFP);\\n+ FDecl.addFnAttr(Context->UWTable);\\n+ FDecl.addParamAttr(0, Context->ReadOnly);\\n+ FDecl.addParamAttr(0, Context->NoAlias);\\n+ FDecl.addParamAttr(1, Context->NoAlias);\\n+ FDecl.addParamAttr(2, Context->NoAlias);\\n+ FDecl.addParamAttr(3, Context->NoAlias);\\n+ };\\n+\\n // Iterate and compile types.\\n for (size_t I = 0; I < Size; ++I) {\\n const auto &CompType = SubTypes[I].getCompositeType();\\n- const auto Name = fmt::format(\\\"t{}\\\"sv, Context->CompositeTypes.size());\\n+ const auto Name =\\n+ fmt::format(\\\"{}t{}\\\"sv, Context->Prefix, Context->CompositeTypes.size());\\n if (CompType.isFunc()) {\\n // Check that the function type is unique.\\n {\\n@@ -6065,13 +6209,21 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\\n if (OldFuncType == CompType.getFuncType()) {\\n Unique = false;\\n Context->CompositeTypes.push_back(Context->CompositeTypes[J]);\\n- auto F = Context->FunctionWrappers[J];\\n- Context->FunctionWrappers.push_back(F);\\n- auto A = Context->LLModule.addAlias(WrapperTy, F, Name.c_str());\\n- A.setLinkage(LLVMExternalLinkage);\\n- A.setVisibility(LLVMProtectedVisibility);\\n- A.setDSOLocal(true);\\n- A.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ if (DeclarationsOnly) {\\n+ auto FDecl = Context->LLModule.get().addFunction(\\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\\n+ SetFuncAttributes(FDecl);\\n+ Context->FunctionWrappers.push_back(FDecl);\\n+ } else {\\n+ auto F = Context->FunctionWrappers[J];\\n+ Context->FunctionWrappers.push_back(F);\\n+ auto A = Context->LLModule.get().addAlias(WrapperTy, F,\\n+ Name.c_str());\\n+ A.setLinkage(LLVMExternalLinkage);\\n+ A.setVisibility(LLVMProtectedVisibility);\\n+ A.setDSOLocal(true);\\n+ A.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ }\\n break;\\n }\\n }\\n@@ -6082,81 +6234,66 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\\n }\\n \\n // Create Wrapper\\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\\n- Name.c_str());\\n+ auto F = Context->LLModule.get().addFunction(\\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\\n {\\n- F.setVisibility(LLVMProtectedVisibility);\\n- F.setDSOLocal(true);\\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\\n- F.addFnAttr(Context->NoStackArgProbe);\\n- F.addFnAttr(Context->StrictFP);\\n- F.addFnAttr(Context->UWTable);\\n- F.addParamAttr(0, Context->ReadOnly);\\n- F.addParamAttr(0, Context->NoAlias);\\n- F.addParamAttr(1, Context->NoAlias);\\n- F.addParamAttr(2, Context->NoAlias);\\n- F.addParamAttr(3, Context->NoAlias);\\n-\\n- LLVM::Builder Builder(Context->LLContext);\\n- Builder.positionAtEnd(\\n- LLVM::BasicBlock::create(Context->LLContext, F, \\\"entry\\\"));\\n-\\n- auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\\n- CompType.getFuncType());\\n- auto RTy = FTy.getReturnType();\\n- std::vector<LLVM::Type> FPTy(FTy.getNumParams());\\n- FTy.getParamTypes(FPTy);\\n-\\n- const size_t ArgCount = FPTy.size() - 1;\\n- auto ExecCtxPtr = F.getFirstParam();\\n- auto RawFunc = LLVM::FunctionCallee{\\n- FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\\n- FTy.getPointerTo())};\\n- auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\\n- auto RawRets = RawArgs.getNextParam();\\n-\\n- std::vector<LLVM::Value> Args;\\n- Args.reserve(FTy.getNumParams());\\n- Args.push_back(ExecCtxPtr);\\n- for (size_t J = 0; J < ArgCount; ++J) {\\n- Args.push_back(Builder.createValuePtrLoad(\\n- FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\\n- }\\n+ SetFuncAttributes(F);\\n+\\n+ if (!DeclarationsOnly) {\\n+ LLVM::Builder Builder(Context->LLContext);\\n+ Builder.positionAtEnd(\\n+ LLVM::BasicBlock::create(Context->LLContext, F, \\\"entry\\\"));\\n+\\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\\n+ CompType.getFuncType());\\n+ auto RTy = FTy.getReturnType();\\n+ std::vector<LLVM::Type> FPTy(FTy.getNumParams());\\n+ FTy.getParamTypes(FPTy);\\n+\\n+ const size_t ArgCount = FPTy.size() - 1;\\n+ auto ExecCtxPtr = F.getFirstParam();\\n+ auto RawFunc = LLVM::FunctionCallee{\\n+ FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\\n+ FTy.getPointerTo())};\\n+ auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\\n+ auto RawRets = RawArgs.getNextParam();\\n+\\n+ std::vector<LLVM::Value> Args;\\n+ Args.reserve(FTy.getNumParams());\\n+ Args.push_back(ExecCtxPtr);\\n+ for (size_t J = 0; J < ArgCount; ++J) {\\n+ Args.push_back(Builder.createValuePtrLoad(\\n+ FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\\n+ }\\n \\n- auto Ret = Builder.createCall(RawFunc, Args);\\n- if (RTy.isVoidTy()) {\\n- // nothing to do\\n- } else if (RTy.isStructTy()) {\\n- auto Rets = unpackStruct(Builder, Ret);\\n- Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty, kValSize);\\n- } else {\\n- Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\\n+ auto Ret = Builder.createCall(RawFunc, Args);\\n+ if (RTy.isVoidTy()) {\\n+ // nothing to do\\n+ } else if (RTy.isStructTy()) {\\n+ auto Rets = unpackStruct(Builder, Ret);\\n+ Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty,\\n+ kValSize);\\n+ } else {\\n+ Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\\n+ }\\n+ Builder.createRetVoid();\\n }\\n- Builder.createRetVoid();\\n }\\n // Copy wrapper, param and return lists to module instance.\\n Context->FunctionWrappers.push_back(F);\\n } else {\\n // Non function type case. Create empty wrapper.\\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\\n- Name.c_str());\\n+ auto F = Context->LLModule.get().addFunction(\\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\\n {\\n- F.setVisibility(LLVMProtectedVisibility);\\n- F.setDSOLocal(true);\\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\\n- F.addFnAttr(Context->NoStackArgProbe);\\n- F.addFnAttr(Context->StrictFP);\\n- F.addFnAttr(Context->UWTable);\\n- F.addParamAttr(0, Context->ReadOnly);\\n- F.addParamAttr(0, Context->NoAlias);\\n- F.addParamAttr(1, Context->NoAlias);\\n- F.addParamAttr(2, Context->NoAlias);\\n- F.addParamAttr(3, Context->NoAlias);\\n-\\n- LLVM::Builder Builder(Context->LLContext);\\n- Builder.positionAtEnd(\\n- LLVM::BasicBlock::create(Context->LLContext, F, \\\"entry\\\"));\\n- Builder.createRetVoid();\\n+ SetFuncAttributes(F);\\n+\\n+ if (!DeclarationsOnly) {\\n+ LLVM::Builder Builder(Context->LLContext);\\n+ Builder.positionAtEnd(\\n+ LLVM::BasicBlock::create(Context->LLContext, F, \\\"entry\\\"));\\n+ Builder.createRetVoid();\\n+ }\\n }\\n Context->FunctionWrappers.push_back(F);\\n }\\n@@ -6184,9 +6321,9 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\\n toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\\n auto RTy = FTy.getReturnType();\\n auto F = LLVM::FunctionCallee{\\n- FTy,\\n- Context->LLModule.addFunction(FTy, LLVMInternalLinkage,\\n- fmt::format(\\\"f{}\\\"sv, FuncID).c_str())};\\n+ FTy, Context->LLModule.get().addFunction(\\n+ FTy, LLVMInternalLinkage,\\n+ fmt::format(\\\"{}f{}\\\"sv, Context->Prefix, FuncID).c_str())};\\n F.Fn.setDSOLocal(true);\\n F.Fn.addFnAttr(Context->NoStackArgProbe);\\n F.Fn.addFnAttr(Context->StrictFP);\\n@@ -6231,6 +6368,7 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\\n }\\n \\n Context->Functions.emplace_back(TypeIdx, F, nullptr);\\n+ Context->ImportCount++;\\n break;\\n }\\n case ExternalType::Table: // Table type\\n@@ -6313,9 +6451,10 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\\n const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\\n const auto FuncID = Context->Functions.size();\\n auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\\n- LLVM::FunctionCallee F = {FTy, Context->LLModule.addFunction(\\n- FTy, LLVMExternalLinkage,\\n- fmt::format(\\\"f{}\\\"sv, FuncID).c_str())};\\n+ LLVM::FunctionCallee F = {\\n+ FTy, Context->LLModule.get().addFunction(\\n+ FTy, LLVMExternalLinkage,\\n+ fmt::format(\\\"{}f{}\\\"sv, Context->Prefix, FuncID).c_str())};\\n F.Fn.setVisibility(LLVMProtectedVisibility);\\n F.Fn.setDSOLocal(true);\\n F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\\n@@ -6339,10 +6478,11 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\\n Locals.push_back(Local.second);\\n }\\n }\\n- FunctionCompiler FC(*Context, F, Locals,\\n- Conf.getCompilerConfigure().isInterruptible(),\\n- Conf.getStatisticsConfigure().isInstructionCounting(),\\n- Conf.getStatisticsConfigure().isCostMeasuring());\\n+ FunctionCompiler FC(\\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\\n auto Type = Context->resolveBlockType(T);\\n EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\\n F.Fn.eliminateUnreachableBlocks();\\n@@ -6350,5 +6490,235 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\\n return {};\\n }\\n \\n+void Compiler::compileFunctionDeclarations(\\n+ const AST::FunctionSection &FunctionSec,\\n+ const AST::CodeSection &CodeSec) noexcept {\\n+ const auto &TypeIdxs = FunctionSec.getContent();\\n+ const auto &CodeSegs = CodeSec.getContent();\\n+ assuming(TypeIdxs.size() == CodeSegs.size());\\n+\\n+ for (size_t I = 0; I < CodeSegs.size(); ++I) {\\n+ const auto &TypeIdx = TypeIdxs[I];\\n+ const auto &Code = CodeSegs[I];\\n+ assuming(TypeIdx < Context->CompositeTypes.size());\\n+ assuming(Context->CompositeTypes[TypeIdx]->isFunc());\\n+ const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\\n+ const auto FuncID = Context->Functions.size();\\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\\n+ LLVM::FunctionCallee F = {\\n+ FTy, Context->LLModule.get().addFunction(\\n+ FTy, LLVMExternalLinkage,\\n+ fmt::format(\\\"{}f{}\\\"sv, Context->Prefix, FuncID).c_str())};\\n+ F.Fn.setVisibility(LLVMProtectedVisibility);\\n+ F.Fn.setDSOLocal(true);\\n+ F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ F.Fn.addFnAttr(Context->NoStackArgProbe);\\n+ F.Fn.addFnAttr(Context->StrictFP);\\n+ F.Fn.addFnAttr(Context->UWTable);\\n+ F.Fn.addParamAttr(0, Context->ReadOnly);\\n+ F.Fn.addParamAttr(0, Context->NoAlias);\\n+\\n+ Context->Functions.emplace_back(TypeIdx, F, &Code);\\n+ }\\n+}\\n+\\n+Expect<void> Compiler::compileFunctionBody(uint32_t LocalFuncIndex) noexcept {\\n+ // Find the function in the Functions list\\n+ // LocalFuncIndex is relative to the defined functions (not imports)\\n+ uint32_t GlobalFuncIndex = Context->ImportCount + LocalFuncIndex;\\n+ if (GlobalFuncIndex >= Context->Functions.size()) {\\n+ spdlog::error(\\\"[lazy-jit]: function index {} out of range\\\"sv,\\n+ LocalFuncIndex);\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ auto &[T, F, Code] = Context->Functions[GlobalFuncIndex];\\n+ if (!Code) {\\n+ spdlog::error(\\\"[lazy-jit]: cannot compile import function {}\\\"sv,\\n+ LocalFuncIndex);\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ // Check if already compiled (function has basic blocks)\\n+ if (F.Fn.countBasicBlocks() > 0) {\\n+ spdlog::debug(\\\"[lazy-jit]: function {} already compiled\\\"sv, LocalFuncIndex);\\n+ return {};\\n+ }\\n+\\n+ spdlog::debug(\\\"[lazy-jit]: compiling function {}\\\"sv, LocalFuncIndex);\\n+\\n+ std::vector<ValType> Locals;\\n+ for (const auto &Local : Code->getLocals()) {\\n+ for (unsigned I = 0; I < Local.first; ++I) {\\n+ Locals.push_back(Local.second);\\n+ }\\n+ }\\n+\\n+ FunctionCompiler FC(\\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\\n+ auto Type = Context->resolveBlockType(T);\\n+ EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\\n+ F.Fn.eliminateUnreachableBlocks();\\n+\\n+ return {};\\n+}\\n+\\n+Expect<std::pair<LLVM::Data,\\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\\n+ LLVM::Compiler::CompileContextDeleter>>>\\n+LLVM::Compiler::compileInfrastructure(const AST::Module &Module,\\n+ std::string Prefix) noexcept {\\n+ Data D;\\n+ D.setPrefix(Prefix);\\n+ // Check the module is validated.\\n+ if (unlikely(!Module.getIsValidated())) {\\n+ spdlog::error(ErrCode::Value::NotValidated);\\n+ return Unexpect(ErrCode::Value::NotValidated);\\n+ }\\n+\\n+ std::unique_lock Lock(Mutex);\\n+ spdlog::info(\\\"[lazy-jit]: compile infrastructure start\\\"sv);\\n+\\n+ auto LLContext = D.extract().getLLContext();\\n+ LLVM::Core::init(LLContext.unwrap());\\n+ auto &LLModule = D.extract().LLModule;\\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \\\"PIC Level\\\"sv, 2);\\n+\\n+ std::unique_ptr<CompileContext, CompileContextDeleter> NewContext(\\n+ new CompileContext(LLContext, LLModule,\\n+ Conf.getCompilerConfigure().isGenericBinary(),\\n+ D.getPrefix()));\\n+ RAIICleanup Cleanup(this->Context, NewContext.get());\\n+\\n+ // Compile Function Types\\n+ compile(Module.getTypeSection());\\n+ // Compile ImportSection\\n+ compile(Module.getImportSection());\\n+ // Compile GlobalSection\\n+ compile(Module.getGlobalSection());\\n+ // Compile MemorySection (MemorySec, DataSec)\\n+ compile(Module.getMemorySection(), Module.getDataSection());\\n+ // Compile TableSection (TableSec, ElemSec)\\n+ compile(Module.getTableSection(), Module.getElementSection());\\n+ // Create function declarations without compiling bodies\\n+ compileFunctionDeclarations(Module.getFunctionSection(),\\n+ Module.getCodeSection());\\n+ // Compile ExportSection\\n+ compile(Module.getExportSection());\\n+\\n+ // Set initializer for constant value\\n+ auto IntrinsicsName = fmt::format(\\\"{}intrinsics\\\"sv, D.getPrefix());\\n+ if (auto IntrinsicsTable = LLModule.getNamedGlobal(IntrinsicsName.c_str())) {\\n+ IntrinsicsTable.setInitializer(\\n+ LLVM::Value::getConstNull(IntrinsicsTable.getType()));\\n+ IntrinsicsTable.setGlobalConstant(false);\\n+ } else {\\n+ auto IntrinsicsTableTy = LLVM::Type::getArrayType(\\n+ LLContext.getInt8Ty().getPointerTo(),\\n+ static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax));\\n+ LLModule.addGlobal(\\n+ IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\\n+ LLVM::Value::getConstNull(IntrinsicsTableTy), IntrinsicsName.c_str());\\n+ }\\n+ LLModule.verify(LLVMPrintMessageAction);\\n+\\n+ spdlog::info(\\\"[lazy-jit]: infrastructure compilation done\\\"sv);\\n+\\n+ return Expect<\\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>>{\\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>{\\n+ std::move(D), std::move(NewContext)}};\\n+}\\n+\\n+Expect<LLVM::Data>\\n+Compiler::compileFunctions(Data &&LLData, CompileContext *NewContext,\\n+ const AST::Module &Module,\\n+ Span<const uint32_t> LocalFuncIndices) noexcept {\\n+ if (unlikely(!Module.getIsValidated())) {\\n+ spdlog::error(ErrCode::Value::NotValidated);\\n+ return Unexpect(ErrCode::Value::NotValidated);\\n+ }\\n+ if (unlikely(LocalFuncIndices.empty())) {\\n+ spdlog::error(\\\"[lazy-jit]: compileFunctions with empty index list\\\"sv);\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ std::unique_lock Lock(Mutex);\\n+ std::vector<uint32_t> Sorted(LocalFuncIndices.begin(),\\n+ LocalFuncIndices.end());\\n+ std::sort(Sorted.begin(), Sorted.end());\\n+ Sorted.erase(std::unique(Sorted.begin(), Sorted.end()), Sorted.end());\\n+\\n+ spdlog::debug(\\\"[lazy-jit]: compile functions batch ({}) start\\\"sv,\\n+ Sorted.size());\\n+\\n+ auto LLContext = LLData.extract().getLLContext();\\n+ LLVM::Core::init(LLContext.unwrap());\\n+ auto &LLModule = LLData.extract().LLModule;\\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \\\"PIC Level\\\"sv, 2);\\n+\\n+ RAIICleanup Cleanup(this->Context, NewContext);\\n+ Context->LLModule = LLModule;\\n+\\n+ Context->CompositeTypes.clear();\\n+ Context->FunctionWrappers.clear();\\n+ Context->Functions.clear();\\n+ Context->LazyJITCacheVars.clear();\\n+ Context->ImportCount = 0;\\n+ Context->MemoryAddrTypes.clear();\\n+ Context->TableAddrTypes.clear();\\n+ Context->Globals.clear();\\n+\\n+ Context->IntrinsicsTable = LLModule.addGlobal(\\n+ Context->IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\\n+ fmt::format(\\\"{}intrinsics\\\"sv, Context->Prefix).c_str());\\n+ Context->IntrinsicsTable.setInitializer(LLVM::Value());\\n+ Context->Trap.Ty =\\n+ LLVM::Type::getFunctionType(Context->VoidTy, {Context->Int32Ty});\\n+ Context->Trap.Fn =\\n+ LLModule.addFunction(Context->Trap.Ty, LLVMPrivateLinkage, \\\"trap\\\");\\n+ Context->Trap.Fn.setDSOLocal(true);\\n+ Context->Trap.Fn.addFnAttr(Context->NoStackArgProbe);\\n+ Context->Trap.Fn.addFnAttr(Context->StrictFP);\\n+ Context->Trap.Fn.addFnAttr(Context->UWTable);\\n+ Context->Trap.Fn.addFnAttr(Context->NoReturn);\\n+ Context->Trap.Fn.addFnAttr(Context->Cold);\\n+ Context->Trap.Fn.addFnAttr(Context->NoInline);\\n+ Context->compileTrap();\\n+\\n+ compile(Module.getTypeSection(), true);\\n+ compile(Module.getImportSection());\\n+ compile(Module.getGlobalSection());\\n+ compile(Module.getMemorySection(), Module.getDataSection());\\n+ compile(Module.getTableSection(), Module.getElementSection());\\n+\\n+ compileFunctionDeclarations(Module.getFunctionSection(),\\n+ Module.getCodeSection());\\n+\\n+ for (uint32_t FuncIndex : Sorted) {\\n+ EXPECTED_TRY(compileFunctionBody(FuncIndex));\\n+ }\\n+\\n+ spdlog::info(\\\"[lazy-jit]: verify batch ({} funcs) start\\\"sv, Sorted.size());\\n+ LLModule.verify(LLVMPrintMessageAction);\\n+ spdlog::info(\\\"[lazy-jit]: verify batch ({} funcs) done\\\"sv, Sorted.size());\\n+\\n+ auto &TM = LLData.extract().TM;\\n+ EXPECTED_TRY(optimize(LLModule, TM));\\n+\\n+ spdlog::debug(\\\"[lazy-jit]: compile functions batch ({}) done\\\"sv,\\n+ Sorted.size());\\n+ return Expect<Data>{std::move(LLData)};\\n+}\\n+\\n+void LLVM::Compiler::CompileContextDeleter::operator()(\\n+ CompileContext *Context) const noexcept {\\n+ delete Context;\\n+}\\n } // namespace LLVM\\n } // namespace WasmEdge\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13277,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"You will call this `checkLazyCompilation` somewhere, and your `LazyCompilationHandler` is using an `unsafe` function, `unsafeLazyCompileFunction`. How do you ensure the state is correctly managed during a multi-threading execution model?"},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/include/executor/executor.h b/include/executor/executor.h\nindex c68eb2d8d81f..0002cff2f68c 100644\n--- a/include/executor/executor.h\n+++ b/include/executor/executor.h\n@@ -202,6 +202,13 @@ class Executor {\n Expect<void> registerPostHostFunction(void *HostData,\n std::function<void(void *)> HostFunc);\n \n+ /// Register a callback for lazy function compilation\n+ void registerLazyCompilationCallback(\n+ std::function<Expect<void>(const std::string &, const uint32_t)>\n+ Callback) {\n+ LazyCompilationHandler = std::move(Callback);\n+ }\n+\n /// Invoke a WASM function by function instance.\n Expect<std::vector<std::pair<ValVariant, ValType>>>\n invoke(const Runtime::Instance::FunctionInstance *FuncInst,\n@@ -1081,6 +1088,8 @@ class Executor {\n const uint32_t FuncIdx) noexcept;\n Expect<void *> proxyRefGetFuncSymbol(Runtime::StackManager &StackMgr,\n const RefVariant Ref) noexcept;\n+ Expect<void *> proxyFuncGetFuncSymbol(Runtime::StackManager &StackMgr,\n+ const uint32_t FuncIdx) noexcept;\n /// @}\n \n /// Callbacks for compiled modules\n@@ -1139,6 +1148,32 @@ class Executor {\n std::atomic<Runtime::Instance::MemoryInstance *> WaitingMemory = nullptr;\n /// Executor Host Function Handler\n HostFuncHandler HostFuncHelper = {};\n+ /// Callback for lazy function compilation\n+ std::function<Expect<void>(const std::string &, const uint32_t)>\n+ LazyCompilationHandler;\n+\n+ /// Helper function for triggering lazy compilation.\n+ /// XXX: Calling checkLazyCompilation in one thread while another thread calls\n+ /// unsafeUpgradeToCompiled on the same FuncInst could result in a race\n+ /// condition if checking FuncInst->isCompiledFunction() directly here. As a\n+ /// temporary workaround, checks for compilation state are deferred to the\n+ /// LazyCompilationHandler (VM::lazyCompileFunctions), which executes\n+ /// under a global JIT compilation lock.\n+ Expect<void> checkLazyCompilation(\n+ const Runtime::Instance::FunctionInstance *FuncInst) const noexcept {\n+ if (LazyCompilationHandler) {\n+ if (const auto *TargetModInst = FuncInst->getModule()) {\n+ if (auto Res = TargetModInst->getFuncIdx(FuncInst)) {\n+ uint32_t TargetFuncIdx = *Res;\n+ const std::string ID = TargetModInst->getID();\n+ if (!ID.empty()) {\n+ return LazyCompilationHandler(ID, TargetFuncIdx);\n+ }\n+ }\n+ }\n+ }\n+ return {};\n+ }\n };\n \n } // namespace Executor\n"},"changed_files":{"kind":"list like","value":["include/executor/executor.h"],"string":"[\n \"include/executor/executor.h\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"You will call this `checkLazyCompilation` somewhere, and your `LazyCompilationHandler` is using an `unsafe` function, `unsafeLazyCompileFunction`. How do you ensure the state is correctly managed during a multi-threading execution model?","path":"include/executor/executor.h","hunk":"@@ -1137,6 +1145,25 @@ class Executor {\n std::atomic<Runtime::Instance::MemoryInstance *> WaitingMemory = nullptr;\n /// Executor Host Function Handler\n HostFuncHandler HostFuncHelper = {};\n+ /// Callback for lazy function compilation\n+ std::function<Expect<void>(const Runtime::Instance::ModuleInstance *,\n+ const uint32_t)>\n+ LazyCompilationHandler;\n+\n+ /// Helper function for checking lazy compilation.\n+ Expect<void> checkLazyCompilation(\n+ const Runtime::Instance::FunctionInstance *FuncInst) const noexcept {\n+ if (FuncInst->isWasmFunction() && !FuncInst->isCompiledFunction() &&\n+ LazyCompilationHandler) {\n+ if (const auto *TargetModInst = FuncInst->getModule()) {\n+ uint32_t TargetFuncIdx = TargetModInst->getFuncIdx(FuncInst);\n+ if (TargetFuncIdx != UINT32_MAX) {\n+ return LazyCompilationHandler(TargetModInst, TargetFuncIdx);","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/include/executor/executor.h b/include/executor/executor.h\nindex c68eb2d8d81f..0002cff2f68c 100644\n--- a/include/executor/executor.h\n+++ b/include/executor/executor.h\n@@ -202,6 +202,13 @@ class Executor {\n Expect<void> registerPostHostFunction(void *HostData,\n std::function<void(void *)> HostFunc);\n \n+ /// Register a callback for lazy function compilation\n+ void registerLazyCompilationCallback(\n+ std::function<Expect<void>(const std::string &, const uint32_t)>\n+ Callback) {\n+ LazyCompilationHandler = std::move(Callback);\n+ }\n+\n /// Invoke a WASM function by function instance.\n Expect<std::vector<std::pair<ValVariant, ValType>>>\n invoke(const Runtime::Instance::FunctionInstance *FuncInst,\n@@ -1081,6 +1088,8 @@ class Executor {\n const uint32_t FuncIdx) noexcept;\n Expect<void *> proxyRefGetFuncSymbol(Runtime::StackManager &StackMgr,\n const RefVariant Ref) noexcept;\n+ Expect<void *> proxyFuncGetFuncSymbol(Runtime::StackManager &StackMgr,\n+ const uint32_t FuncIdx) noexcept;\n /// @}\n \n /// Callbacks for compiled modules\n@@ -1139,6 +1148,32 @@ class Executor {\n std::atomic<Runtime::Instance::MemoryInstance *> WaitingMemory = nullptr;\n /// Executor Host Function Handler\n HostFuncHandler HostFuncHelper = {};\n+ /// Callback for lazy function compilation\n+ std::function<Expect<void>(const std::string &, const uint32_t)>\n+ LazyCompilationHandler;\n+\n+ /// Helper function for triggering lazy compilation.\n+ /// XXX: Calling checkLazyCompilation in one thread while another thread calls\n+ /// unsafeUpgradeToCompiled on the same FuncInst could result in a race\n+ /// condition if checking FuncInst->isCompiledFunction() directly here. As a\n+ /// temporary workaround, checks for compilation state are deferred to the\n+ /// LazyCompilationHandler (VM::lazyCompileFunctions), which executes\n+ /// under a global JIT compilation lock.\n+ Expect<void> checkLazyCompilation(\n+ const Runtime::Instance::FunctionInstance *FuncInst) const noexcept {\n+ if (LazyCompilationHandler) {\n+ if (const auto *TargetModInst = FuncInst->getModule()) {\n+ if (auto Res = TargetModInst->getFuncIdx(FuncInst)) {\n+ uint32_t TargetFuncIdx = *Res;\n+ const std::string ID = TargetModInst->getID();\n+ if (!ID.empty()) {\n+ return LazyCompilationHandler(ID, TargetFuncIdx);\n+ }\n+ }\n+ }\n+ }\n+ return {};\n+ }\n };\n \n } // namespace Executor\n"}],"string":"[\n {\n \"comment\": \"You will call this `checkLazyCompilation` somewhere, and your `LazyCompilationHandler` is using an `unsafe` function, `unsafeLazyCompileFunction`. How do you ensure the state is correctly managed during a multi-threading execution model?\",\n \"path\": \"include/executor/executor.h\",\n \"hunk\": \"@@ -1137,6 +1145,25 @@ class Executor {\\n std::atomic<Runtime::Instance::MemoryInstance *> WaitingMemory = nullptr;\\n /// Executor Host Function Handler\\n HostFuncHandler HostFuncHelper = {};\\n+ /// Callback for lazy function compilation\\n+ std::function<Expect<void>(const Runtime::Instance::ModuleInstance *,\\n+ const uint32_t)>\\n+ LazyCompilationHandler;\\n+\\n+ /// Helper function for checking lazy compilation.\\n+ Expect<void> checkLazyCompilation(\\n+ const Runtime::Instance::FunctionInstance *FuncInst) const noexcept {\\n+ if (FuncInst->isWasmFunction() && !FuncInst->isCompiledFunction() &&\\n+ LazyCompilationHandler) {\\n+ if (const auto *TargetModInst = FuncInst->getModule()) {\\n+ uint32_t TargetFuncIdx = TargetModInst->getFuncIdx(FuncInst);\\n+ if (TargetFuncIdx != UINT32_MAX) {\\n+ return LazyCompilationHandler(TargetModInst, TargetFuncIdx);\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/include/executor/executor.h b/include/executor/executor.h\\nindex c68eb2d8d81f..0002cff2f68c 100644\\n--- a/include/executor/executor.h\\n+++ b/include/executor/executor.h\\n@@ -202,6 +202,13 @@ class Executor {\\n Expect<void> registerPostHostFunction(void *HostData,\\n std::function<void(void *)> HostFunc);\\n \\n+ /// Register a callback for lazy function compilation\\n+ void registerLazyCompilationCallback(\\n+ std::function<Expect<void>(const std::string &, const uint32_t)>\\n+ Callback) {\\n+ LazyCompilationHandler = std::move(Callback);\\n+ }\\n+\\n /// Invoke a WASM function by function instance.\\n Expect<std::vector<std::pair<ValVariant, ValType>>>\\n invoke(const Runtime::Instance::FunctionInstance *FuncInst,\\n@@ -1081,6 +1088,8 @@ class Executor {\\n const uint32_t FuncIdx) noexcept;\\n Expect<void *> proxyRefGetFuncSymbol(Runtime::StackManager &StackMgr,\\n const RefVariant Ref) noexcept;\\n+ Expect<void *> proxyFuncGetFuncSymbol(Runtime::StackManager &StackMgr,\\n+ const uint32_t FuncIdx) noexcept;\\n /// @}\\n \\n /// Callbacks for compiled modules\\n@@ -1139,6 +1148,32 @@ class Executor {\\n std::atomic<Runtime::Instance::MemoryInstance *> WaitingMemory = nullptr;\\n /// Executor Host Function Handler\\n HostFuncHandler HostFuncHelper = {};\\n+ /// Callback for lazy function compilation\\n+ std::function<Expect<void>(const std::string &, const uint32_t)>\\n+ LazyCompilationHandler;\\n+\\n+ /// Helper function for triggering lazy compilation.\\n+ /// XXX: Calling checkLazyCompilation in one thread while another thread calls\\n+ /// unsafeUpgradeToCompiled on the same FuncInst could result in a race\\n+ /// condition if checking FuncInst->isCompiledFunction() directly here. As a\\n+ /// temporary workaround, checks for compilation state are deferred to the\\n+ /// LazyCompilationHandler (VM::lazyCompileFunctions), which executes\\n+ /// under a global JIT compilation lock.\\n+ Expect<void> checkLazyCompilation(\\n+ const Runtime::Instance::FunctionInstance *FuncInst) const noexcept {\\n+ if (LazyCompilationHandler) {\\n+ if (const auto *TargetModInst = FuncInst->getModule()) {\\n+ if (auto Res = TargetModInst->getFuncIdx(FuncInst)) {\\n+ uint32_t TargetFuncIdx = *Res;\\n+ const std::string ID = TargetModInst->getID();\\n+ if (!ID.empty()) {\\n+ return LazyCompilationHandler(ID, TargetFuncIdx);\\n+ }\\n+ }\\n+ }\\n+ }\\n+ return {};\\n+ }\\n };\\n \\n } // namespace Executor\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13278,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"Please explain why we will have a non-owning module and a series of owned modules."},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/include/llvm/jit.h b/include/llvm/jit.h\nindex 480fa4e2a745..c15eb4a8dc82 100644\n--- a/include/llvm/jit.h\n+++ b/include/llvm/jit.h\n@@ -1,5 +1,5 @@\n // SPDX-License-Identifier: Apache-2.0\n-// SPDX-FileCopyrightText: 2019-2024 Second State INC\n+// SPDX-FileCopyrightText: 2019-2026 Second State INC\n \n //===-- wasmedge/llvm/jit.h - JIT Engine class definition -----------------===//\n //\n@@ -16,15 +16,34 @@\n #include \"ast/module.h\"\n #include \"common/configure.h\"\n #include \"common/errcode.h\"\n+#include \"common/span.h\"\n+#include \"llvm/compiler.h\"\n #include \"llvm/data.h\"\n+#include <memory>\n+#include <mutex>\n+#include <string_view>\n+#include <unordered_set>\n #include <vector>\n \n+namespace llvm {\n+class Module;\n+}\n+\n namespace WasmEdge::LLVM {\n+\n+class Module;\n+\n+/// Address of JIT- or AOT-generated machine code for a wasm function. Not a\n+/// typed C++ function pointer; wasm signatures vary and calls go through the\n+/// executor.\n+using WasmFunctionCodeAddress = void *;\n+\n class OrcLLJIT;\n \n class JITLibrary : public Executable {\n public:\n- JITLibrary(OrcLLJIT JIT) noexcept;\n+ JITLibrary(std::shared_ptr<OrcLLJIT> JIT, std::string Prefix = \"\",\n+ bool IsLazy = false) noexcept;\n ~JITLibrary() noexcept override;\n \n Symbol<const IntrinsicsTable *> getIntrinsics() noexcept override;\n@@ -33,18 +52,48 @@ class JITLibrary : public Executable {\n \n std::vector<Symbol<void>> getCodes(size_t Offset,\n size_t Size) noexcept override;\n+ bool isLazy() const noexcept override { return IsLazy; }\n \n private:\n- OrcLLJIT *J;\n+ std::shared_ptr<OrcLLJIT> J;\n+ std::string Prefix;\n+ bool IsLazy;\n+ friend class JIT;\n };\n \n class JIT {\n public:\n JIT(const Configure &Conf) noexcept : Conf(Conf) {}\n- Expect<std::shared_ptr<Executable>> load(Data D) noexcept;\n+ Expect<std::shared_ptr<Executable>> load(Data &D,\n+ bool IsLazy = false) noexcept;\n+\n+ /// Adds one LLVM IR module and resolves many wasm function symbols.\n+ Expect<std::vector<WasmFunctionCodeAddress>>\n+ add(JITLibrary &Lib, Data &D,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept;\n+\n+ /// Look up already-loaded symbols (no IR add). Same index convention as\n+ /// \\c add .\n+ Expect<std::vector<WasmFunctionCodeAddress>>\n+ lookupWasmFunctionSymbols(JITLibrary &Lib, std::string_view Prefix,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept;\n \n private:\n const Configure Conf;\n };\n \n+struct LazyJITState {\n+ /// Track which functions have been lazy-compiled.\n+ std::unordered_set<uint32_t> LazyCompiledFuncs;\n+ /// Number of import functions (offset for local function indices).\n+ uint32_t ImportFuncCount = 0;\n+ /// Store compiled JIT library to keep it alive\n+ std::shared_ptr<JITLibrary> JITLib;\n+ /// Per-module JIT data and context\n+ Data LLData;\n+ /// Pointer to the LLVM context.\n+ std::unique_ptr<Compiler::CompileContext, Compiler::CompileContextDeleter>\n+ LLContext;\n+};\n+\n } // namespace WasmEdge::LLVM\n"},"changed_files":{"kind":"list like","value":["include/llvm/jit.h"],"string":"[\n \"include/llvm/jit.h\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"Please explain why we will have a non-owning module and a series of owned modules.","path":"include/llvm/jit.h","hunk":"@@ -33,18 +37,44 @@ class JITLibrary : public Executable {\n \n std::vector<Symbol<void>> getCodes(size_t Offset,\n size_t Size) noexcept override;\n+ bool isLazy() const noexcept override { return IsLazy; }\n \n private:\n- OrcLLJIT *J;\n+ std::shared_ptr<OrcLLJIT> J;\n+ std::string Prefix;\n+ bool IsLazy;\n+ friend class JIT;\n };\n \n class JIT {\n public:\n JIT(const Configure &Conf) noexcept : Conf(Conf) {}\n- Expect<std::shared_ptr<Executable>> load(Data D) noexcept;\n+ Expect<std::shared_ptr<Executable>> load(Data &D,\n+ bool IsLazy = false) noexcept;\n+ Expect<void> add(Executable &Exec, Data &D) noexcept;\n \n private:\n const Configure Conf;\n };\n \n+struct LazyJITState {\n+ /// Track which functions have been lazy-compiled.\n+ std::unordered_set<uint32_t> LazyCompiledFuncs;\n+ /// Number of import functions (offset for local function indices).\n+ uint32_t ImportFuncCount = 0;\n+ /// Number of total functions\n+ uint32_t TotalFuncCount = 0;\n+ /// Pointer to the AST module (non-owning pointer, lifetime managed by caller)\n+ const AST::Module *ModulePtr = nullptr;\n+ /// Optional owned module (used when VM takes ownership)\n+ std::unique_ptr<AST::Module> OwnedModule;","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/include/llvm/jit.h b/include/llvm/jit.h\nindex 480fa4e2a745..c15eb4a8dc82 100644\n--- a/include/llvm/jit.h\n+++ b/include/llvm/jit.h\n@@ -1,5 +1,5 @@\n // SPDX-License-Identifier: Apache-2.0\n-// SPDX-FileCopyrightText: 2019-2024 Second State INC\n+// SPDX-FileCopyrightText: 2019-2026 Second State INC\n \n //===-- wasmedge/llvm/jit.h - JIT Engine class definition -----------------===//\n //\n@@ -16,15 +16,34 @@\n #include \"ast/module.h\"\n #include \"common/configure.h\"\n #include \"common/errcode.h\"\n+#include \"common/span.h\"\n+#include \"llvm/compiler.h\"\n #include \"llvm/data.h\"\n+#include <memory>\n+#include <mutex>\n+#include <string_view>\n+#include <unordered_set>\n #include <vector>\n \n+namespace llvm {\n+class Module;\n+}\n+\n namespace WasmEdge::LLVM {\n+\n+class Module;\n+\n+/// Address of JIT- or AOT-generated machine code for a wasm function. Not a\n+/// typed C++ function pointer; wasm signatures vary and calls go through the\n+/// executor.\n+using WasmFunctionCodeAddress = void *;\n+\n class OrcLLJIT;\n \n class JITLibrary : public Executable {\n public:\n- JITLibrary(OrcLLJIT JIT) noexcept;\n+ JITLibrary(std::shared_ptr<OrcLLJIT> JIT, std::string Prefix = \"\",\n+ bool IsLazy = false) noexcept;\n ~JITLibrary() noexcept override;\n \n Symbol<const IntrinsicsTable *> getIntrinsics() noexcept override;\n@@ -33,18 +52,48 @@ class JITLibrary : public Executable {\n \n std::vector<Symbol<void>> getCodes(size_t Offset,\n size_t Size) noexcept override;\n+ bool isLazy() const noexcept override { return IsLazy; }\n \n private:\n- OrcLLJIT *J;\n+ std::shared_ptr<OrcLLJIT> J;\n+ std::string Prefix;\n+ bool IsLazy;\n+ friend class JIT;\n };\n \n class JIT {\n public:\n JIT(const Configure &Conf) noexcept : Conf(Conf) {}\n- Expect<std::shared_ptr<Executable>> load(Data D) noexcept;\n+ Expect<std::shared_ptr<Executable>> load(Data &D,\n+ bool IsLazy = false) noexcept;\n+\n+ /// Adds one LLVM IR module and resolves many wasm function symbols.\n+ Expect<std::vector<WasmFunctionCodeAddress>>\n+ add(JITLibrary &Lib, Data &D,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept;\n+\n+ /// Look up already-loaded symbols (no IR add). Same index convention as\n+ /// \\c add .\n+ Expect<std::vector<WasmFunctionCodeAddress>>\n+ lookupWasmFunctionSymbols(JITLibrary &Lib, std::string_view Prefix,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept;\n \n private:\n const Configure Conf;\n };\n \n+struct LazyJITState {\n+ /// Track which functions have been lazy-compiled.\n+ std::unordered_set<uint32_t> LazyCompiledFuncs;\n+ /// Number of import functions (offset for local function indices).\n+ uint32_t ImportFuncCount = 0;\n+ /// Store compiled JIT library to keep it alive\n+ std::shared_ptr<JITLibrary> JITLib;\n+ /// Per-module JIT data and context\n+ Data LLData;\n+ /// Pointer to the LLVM context.\n+ std::unique_ptr<Compiler::CompileContext, Compiler::CompileContextDeleter>\n+ LLContext;\n+};\n+\n } // namespace WasmEdge::LLVM\n"}],"string":"[\n {\n \"comment\": \"Please explain why we will have a non-owning module and a series of owned modules.\",\n \"path\": \"include/llvm/jit.h\",\n \"hunk\": \"@@ -33,18 +37,44 @@ class JITLibrary : public Executable {\\n \\n std::vector<Symbol<void>> getCodes(size_t Offset,\\n size_t Size) noexcept override;\\n+ bool isLazy() const noexcept override { return IsLazy; }\\n \\n private:\\n- OrcLLJIT *J;\\n+ std::shared_ptr<OrcLLJIT> J;\\n+ std::string Prefix;\\n+ bool IsLazy;\\n+ friend class JIT;\\n };\\n \\n class JIT {\\n public:\\n JIT(const Configure &Conf) noexcept : Conf(Conf) {}\\n- Expect<std::shared_ptr<Executable>> load(Data D) noexcept;\\n+ Expect<std::shared_ptr<Executable>> load(Data &D,\\n+ bool IsLazy = false) noexcept;\\n+ Expect<void> add(Executable &Exec, Data &D) noexcept;\\n \\n private:\\n const Configure Conf;\\n };\\n \\n+struct LazyJITState {\\n+ /// Track which functions have been lazy-compiled.\\n+ std::unordered_set<uint32_t> LazyCompiledFuncs;\\n+ /// Number of import functions (offset for local function indices).\\n+ uint32_t ImportFuncCount = 0;\\n+ /// Number of total functions\\n+ uint32_t TotalFuncCount = 0;\\n+ /// Pointer to the AST module (non-owning pointer, lifetime managed by caller)\\n+ const AST::Module *ModulePtr = nullptr;\\n+ /// Optional owned module (used when VM takes ownership)\\n+ std::unique_ptr<AST::Module> OwnedModule;\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/include/llvm/jit.h b/include/llvm/jit.h\\nindex 480fa4e2a745..c15eb4a8dc82 100644\\n--- a/include/llvm/jit.h\\n+++ b/include/llvm/jit.h\\n@@ -1,5 +1,5 @@\\n // SPDX-License-Identifier: Apache-2.0\\n-// SPDX-FileCopyrightText: 2019-2024 Second State INC\\n+// SPDX-FileCopyrightText: 2019-2026 Second State INC\\n \\n //===-- wasmedge/llvm/jit.h - JIT Engine class definition -----------------===//\\n //\\n@@ -16,15 +16,34 @@\\n #include \\\"ast/module.h\\\"\\n #include \\\"common/configure.h\\\"\\n #include \\\"common/errcode.h\\\"\\n+#include \\\"common/span.h\\\"\\n+#include \\\"llvm/compiler.h\\\"\\n #include \\\"llvm/data.h\\\"\\n+#include <memory>\\n+#include <mutex>\\n+#include <string_view>\\n+#include <unordered_set>\\n #include <vector>\\n \\n+namespace llvm {\\n+class Module;\\n+}\\n+\\n namespace WasmEdge::LLVM {\\n+\\n+class Module;\\n+\\n+/// Address of JIT- or AOT-generated machine code for a wasm function. Not a\\n+/// typed C++ function pointer; wasm signatures vary and calls go through the\\n+/// executor.\\n+using WasmFunctionCodeAddress = void *;\\n+\\n class OrcLLJIT;\\n \\n class JITLibrary : public Executable {\\n public:\\n- JITLibrary(OrcLLJIT JIT) noexcept;\\n+ JITLibrary(std::shared_ptr<OrcLLJIT> JIT, std::string Prefix = \\\"\\\",\\n+ bool IsLazy = false) noexcept;\\n ~JITLibrary() noexcept override;\\n \\n Symbol<const IntrinsicsTable *> getIntrinsics() noexcept override;\\n@@ -33,18 +52,48 @@ class JITLibrary : public Executable {\\n \\n std::vector<Symbol<void>> getCodes(size_t Offset,\\n size_t Size) noexcept override;\\n+ bool isLazy() const noexcept override { return IsLazy; }\\n \\n private:\\n- OrcLLJIT *J;\\n+ std::shared_ptr<OrcLLJIT> J;\\n+ std::string Prefix;\\n+ bool IsLazy;\\n+ friend class JIT;\\n };\\n \\n class JIT {\\n public:\\n JIT(const Configure &Conf) noexcept : Conf(Conf) {}\\n- Expect<std::shared_ptr<Executable>> load(Data D) noexcept;\\n+ Expect<std::shared_ptr<Executable>> load(Data &D,\\n+ bool IsLazy = false) noexcept;\\n+\\n+ /// Adds one LLVM IR module and resolves many wasm function symbols.\\n+ Expect<std::vector<WasmFunctionCodeAddress>>\\n+ add(JITLibrary &Lib, Data &D,\\n+ Span<const uint32_t> GlobalFuncIndices) noexcept;\\n+\\n+ /// Look up already-loaded symbols (no IR add). Same index convention as\\n+ /// \\\\c add .\\n+ Expect<std::vector<WasmFunctionCodeAddress>>\\n+ lookupWasmFunctionSymbols(JITLibrary &Lib, std::string_view Prefix,\\n+ Span<const uint32_t> GlobalFuncIndices) noexcept;\\n \\n private:\\n const Configure Conf;\\n };\\n \\n+struct LazyJITState {\\n+ /// Track which functions have been lazy-compiled.\\n+ std::unordered_set<uint32_t> LazyCompiledFuncs;\\n+ /// Number of import functions (offset for local function indices).\\n+ uint32_t ImportFuncCount = 0;\\n+ /// Store compiled JIT library to keep it alive\\n+ std::shared_ptr<JITLibrary> JITLib;\\n+ /// Per-module JIT data and context\\n+ Data LLData;\\n+ /// Pointer to the LLVM context.\\n+ std::unique_ptr<Compiler::CompileContext, Compiler::CompileContextDeleter>\\n+ LLContext;\\n+};\\n+\\n } // namespace WasmEdge::LLVM\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13279,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"Could you explain the design and logic inside the `unsafeLazyCompileFunction` function? \nIt's strange that we check whether `ModuleInstance` is `nullptr` or `ModInst`, and then we set `ModuleInstance` to `ModInst` directly."},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\nindex 680d35094656..cf594a8be374 100644\n--- a/lib/vm/vm.cpp\n+++ b/lib/vm/vm.cpp\n@@ -3,7 +3,9 @@\n \n #include \"vm/vm.h\"\n \n+#include \"ast/instruction.h\"\n #include \"ast/module.h\"\n+#include \"common/enum_errcode.hpp\"\n #include \"common/errcode.h\"\n #include \"common/types.h\"\n #include \"host/wasi/wasimodule.h\"\n@@ -20,14 +22,71 @@\n #include \"host/mock/wasmedge_tensorflow_module.h\"\n #include \"host/mock/wasmedge_tensorflowlite_module.h\"\n #include \"validator/validator.h\"\n+#include <algorithm>\n+#include <cstddef>\n #include <memory>\n #include <variant>\n+#include <vector>\n+\n+#ifdef WASMEDGE_USE_LLVM\n+#include <llvm/IR/Module.h>\n+#endif\n \n namespace WasmEdge {\n namespace VM {\n \n namespace {\n \n+#ifdef WASMEDGE_USE_LLVM\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\n+ uint32_t ImportFuncCount,\n+ const std::unordered_set<uint32_t> &LazyCompiled,\n+ std::vector<uint32_t> &OutSortedLocals) {\n+ OutSortedLocals.clear();\n+ if (!ModulePtr) {\n+ return;\n+ }\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\n+\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\n+ return;\n+ }\n+\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\n+ std::vector<uint32_t> Stack;\n+ Stack.reserve(64);\n+\n+ Visited[LocalSeed] = 1;\n+ Stack.push_back(LocalSeed);\n+ OutSortedLocals.push_back(LocalSeed);\n+\n+ while (!Stack.empty()) {\n+ const uint32_t L = Stack.back();\n+ Stack.pop_back();\n+\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\n+ const auto Op = Instr.getOpCode();\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\n+ Op == OpCode::Ref__func) {\n+ const uint32_t Target = Instr.getTargetIndex();\n+ if (Target >= ImportFuncCount) {\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\n+ !LazyCompiled.count(LocalIdx)) {\n+ Visited[LocalIdx] = 1;\n+ Stack.push_back(LocalIdx);\n+ OutSortedLocals.push_back(LocalIdx);\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\n+}\n+#endif\n+\n template <typename T> struct VisitUnit {\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n \n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ spdlog::warn(\n+ \"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\"sv);\n+ ExecutorEngine.registerLazyCompilationCallback(\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\n+ return lazyCompileFunctions(ID, FuncIdx);\n+ });\n+ }\n+#endif\n+\n // Register all module instances.\n unsafeRegisterBuiltInHosts();\n unsafeRegisterPlugInHosts();\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Path));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Code));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+\n+ std::string ID = Module.getID();\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\n+ !Module.getSymbol()) {\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\n+ }\n+#endif\n+\n // Instantiate and register module.\n EXPECTED_TRY(auto ModInst,\n ExecutorEngine.registerModule(StoreRef, Module, Name));\n RegModInsts.push_back(std::move(ModInst));\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (State) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates.insert({ID, std::move(*State)});\n+ }\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ size_t InstIdx = RegModInsts.size() - 1;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ auto It = RegModMap.find(ID);\n+ if (It != RegModMap.end()) {\n+ It->second[1] = InstIdx;\n+ } else {\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\n+ }\n+ }\n+#endif\n+\n return {};\n }\n \n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\n }\n-\n if (Mod) {\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\n+ std::string ID = Mod->getID();\n+\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\n !Mod->getSymbol()) {\n #ifdef WASMEDGE_USE_LLVM\n- LLVM::Compiler Compiler(Conf);\n- Compiler.checkConfigure()\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&]() { return Compiler.compile(*Mod); })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compilation failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto LLModule) {\n- LLVM::JIT JIT(Conf);\n- return JIT.load(std::move(LLModule));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\n- \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto Module) {\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n- \"mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- });\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates[ID] = std::move(State);\n+ } else {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() { return Compiler.compile(*Mod); })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(LLModule);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Module) {\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n+ \"mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ });\n+ }\n #else\n spdlog::warn(\"JIT was requested but WasmEdge was built without LLVM, \"\n \"falling back to interpreter.\"sv);\n #endif\n }\n \n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ auto StateIt = LazyJITStates.find(ID);\n+ if (StateIt != LazyJITStates.end()) {\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ StateIt->second.ImportFuncCount =\n+ static_cast<uint32_t>(ImportFuncCount);\n+ StateIt->second.LazyCompiledFuncs.clear();\n+ }\n+ }\n+#endif\n+\n EXPECTED_TRY(ActiveModInst,\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\n+\n Stage = VMStage::Instantiated;\n return {};\n } else if (Comp) {\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\n Runtime::Instance::FunctionInstance *FuncInst =\n ModInst->findFuncExports(Func);\n \n+#ifdef WASMEDGE_USE_LLVM\n+ // lazy JIT: compile function on-demand if needed.\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\n+ bool NeedsCompile = false;\n+ uint32_t FuncIdx = UINT32_MAX;\n+ {\n+ std::shared_lock Lock(LazyJITMutex);\n+ if (FuncInst->isWasmFunction()) {\n+ NeedsCompile = true;\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\n+ FuncIdx = *Res;\n+ }\n+ }\n+ }\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\n+ !Result) {\n+ return Unexpect(Result.error());\n+ }\n+ }\n+ }\n+#endif\n+\n // Execute function.\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\n .map_error([&ModInst, &Func](auto E) {\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\n }\n StoreRef.reset();\n RegModInsts.clear();\n+ RegASTModules.clear();\n+ RegModMap.clear();\n Stat.clear();\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\n unsafeRegisterPlugInHosts();\n LoaderEngine.reset();\n Stage = VMStage::Inited;\n+#ifdef WASMEDGE_USE_LLVM\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\n+ // LLContexts.\n+ LazyJITStates.clear();\n+#endif\n }\n \n std::vector<std::pair<std::string, const AST::FunctionType &>>\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\n return nullptr;\n };\n \n+#ifdef WASMEDGE_USE_LLVM\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ uint32_t ImportFuncCount = 0;\n+ const AST::Module *ModulePtr = nullptr;\n+ LLVM::Data *LLDataPtr = nullptr;\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\n+ nullptr;\n+ LLVM::LazyJITState *StatePtr = nullptr;\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\n+\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\n+ ModInst = ActiveModInst.get();\n+ ModulePtr = Mod.get();\n+ } else {\n+ auto ItMap = RegModMap.find(ID);\n+ if (ItMap != RegModMap.end()) {\n+ ModInst = RegModInsts[ItMap->second[1]].get();\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\n+ }\n+ }\n+\n+ if (!ModInst || !ModulePtr) {\n+ return {};\n+ }\n+\n+ auto It = LazyJITStates.find(ID);\n+ if (It != LazyJITStates.end()) {\n+ StatePtr = &It->second;\n+ ImportFuncCount = StatePtr->ImportFuncCount;\n+ LLDataPtr = &StatePtr->LLData;\n+ LLContextPtr = &StatePtr->LLContext;\n+ } else {\n+ spdlog::error(\"[lazy-jit]: failed to find JIT state for ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ if (FuncIdx < ImportFuncCount) {\n+ return {};\n+ }\n+\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\n+\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\n+ if (!FuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ FuncIdx, ID);\n+ return Unexpect(FuncResult.error());\n+ }\n+ auto *FuncInst = *FuncResult;\n+\n+ // If already compiled or not a Wasm function, nothing to do.\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\n+ return {};\n+ }\n+\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\n+ return {};\n+ }\n+\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\n+ const std::unordered_set<uint32_t> &CompiledSet =\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\n+\n+ std::vector<uint32_t> BatchLocals;\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\n+ CompiledSet, BatchLocals);\n+ if (BatchLocals.empty()) {\n+ return {};\n+ }\n+\n+ spdlog::debug(\n+ \"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(), LocalFuncIdx, ID);\n+\n+ LLVM::Compiler Compiler(Conf);\n+ auto ConfigResult = Compiler.checkConfigure();\n+ if (!ConfigResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\"sv,\n+ ConfigResult.error(), ID);\n+ return Unexpect(ConfigResult.error());\n+ }\n+\n+ if (!LLDataPtr->hasModule()) {\n+ LLDataPtr->resetModule();\n+ }\n+ auto CompileResult = Compiler.compileFunctions(\n+ std::move(*LLDataPtr),\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\n+ *ModulePtr,\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\n+ if (!CompileResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\"sv,\n+ CompileResult.error(), ID);\n+ return Unexpect(CompileResult.error());\n+ }\n+\n+ *LLDataPtr = std::move(*CompileResult);\n+ LLVM::JIT JIT(Conf);\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\n+ if (StatePtr && StatePtr->JITLib) {\n+ JITLib = StatePtr->JITLib;\n+ }\n+\n+ std::vector<uint32_t> BatchGlobal;\n+ BatchGlobal.reserve(BatchLocals.size());\n+ for (uint32_t L : BatchLocals) {\n+ BatchGlobal.push_back(ImportFuncCount + L);\n+ }\n+\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\n+ if (JITLib) {\n+ auto AddrRes = JIT.add(\n+ *JITLib, *LLDataPtr,\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!AddrRes) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\"sv,\n+ AddrRes.error(), ID);\n+ return Unexpect(AddrRes.error());\n+ }\n+ ResolvedAddresses = std::move(*AddrRes);\n+ } else {\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\n+ if (!LoadResult) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\"sv,\n+ LoadResult.error(), ID);\n+ return Unexpect(LoadResult.error());\n+ }\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\n+ if (StatePtr) {\n+ StatePtr->JITLib = JITLib;\n+ }\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\n+ *JITLib, LLDataPtr->getPrefix(),\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!LkRes) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\"sv,\n+ LkRes.error(), ID);\n+ return Unexpect(LkRes.error());\n+ }\n+ ResolvedAddresses = std::move(*LkRes);\n+ }\n+\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\n+ } else {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\n+ const uint32_t L = BatchLocals[I];\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\n+ if (!BatchFuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ WasmFuncIdx, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ auto *BatchFuncInst = *BatchFuncResult;\n+ if (BatchFuncInst->isWasmFunction()) {\n+ auto CompiledSym = JITLib->createSymbol(\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\n+ *>(CompiledCodePtr));\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\n+ }\n+ }\n+\n+ if (StatePtr) {\n+ for (uint32_t L : BatchLocals) {\n+ StatePtr->LazyCompiledFuncs.insert(L);\n+ }\n+ }\n+\n+ spdlog::debug(\n+ \"Lazy compilation completed for batch of {} functions, total compiled: \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(),\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\n+\n+ return {};\n+}\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\n+ WasmEdge::LLVM::LazyJITState State;\n+ LLVM::Compiler Compiler(Conf);\n+ EXPECTED_TRY(\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\n+\n+ auto Prefix = fmt::format(\"m{}_\"sv, Module.getID());\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\n+\n+ State.LLData = std::move(LLModule.first);\n+ State.LLContext = std::move(LLModule.second);\n+\n+ LLVM::JIT JIT(Conf);\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\n+\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\n+\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\n+\n+ return State;\n+}\n+#endif\n+\n } // namespace VM\n } // namespace WasmEdge\n"},"changed_files":{"kind":"list like","value":["lib/vm/vm.cpp"],"string":"[\n \"lib/vm/vm.cpp\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"Could you explain the design and logic inside the `unsafeLazyCompileFunction` function? \nIt's strange that we check whether `ModuleInstance` is `nullptr` or `ModInst`, and then we set `ModuleInstance` to `ModInst` directly.","path":"lib/vm/vm.cpp","hunk":"@@ -714,5 +949,150 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\n return nullptr;\n };\n \n+#ifdef WASMEDGE_USE_LLVM\n+LLVM::LazyJITState &\n+VM::getLazyJITStateForModule(const Runtime::Instance::ModuleInstance *ModInst) {\n+ return LazyJITStates[ModInst];\n+}\n+\n+Expect<void>\n+VM::unsafeLazyCompileFunction(const Runtime::Instance::ModuleInstance *ModInst,\n+ uint32_t FuncIdx) {\n+ if (!ModInst) {\n+ spdlog::error(\"Lazy JIT: null module instance\"sv);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ uint32_t ImportFuncCount = 0;\n+ const AST::Module *ModulePtr = nullptr;\n+ LLVM::Data *LLDataPtr = nullptr;\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\n+ nullptr;\n+ LLVM::LazyJITState *StatePtr = nullptr;\n+\n+ auto It = LazyJITStates.find(ModInst);\n+ if (It != LazyJITStates.end() && It->second.ModulePtr) {\n+ StatePtr = &It->second;\n+ ImportFuncCount = StatePtr->ImportFuncCount;\n+ ModulePtr = StatePtr->ModulePtr;\n+ LLDataPtr = &StatePtr->LLData;\n+ LLContextPtr = &StatePtr->LLContext;\n+ } else if (Pending.Module && (Pending.ModuleInstance == nullptr ||\n+ Pending.ModuleInstance == ModInst)) {\n+ Pending.ModuleInstance = ModInst;\n+ ImportFuncCount = Pending.ImportFuncCount;\n+ ModulePtr = Pending.Module;\n+ LLDataPtr = &Pending.LLData;\n+ LLContextPtr = &Pending.LLContext;","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\nindex 680d35094656..cf594a8be374 100644\n--- a/lib/vm/vm.cpp\n+++ b/lib/vm/vm.cpp\n@@ -3,7 +3,9 @@\n \n #include \"vm/vm.h\"\n \n+#include \"ast/instruction.h\"\n #include \"ast/module.h\"\n+#include \"common/enum_errcode.hpp\"\n #include \"common/errcode.h\"\n #include \"common/types.h\"\n #include \"host/wasi/wasimodule.h\"\n@@ -20,14 +22,71 @@\n #include \"host/mock/wasmedge_tensorflow_module.h\"\n #include \"host/mock/wasmedge_tensorflowlite_module.h\"\n #include \"validator/validator.h\"\n+#include <algorithm>\n+#include <cstddef>\n #include <memory>\n #include <variant>\n+#include <vector>\n+\n+#ifdef WASMEDGE_USE_LLVM\n+#include <llvm/IR/Module.h>\n+#endif\n \n namespace WasmEdge {\n namespace VM {\n \n namespace {\n \n+#ifdef WASMEDGE_USE_LLVM\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\n+ uint32_t ImportFuncCount,\n+ const std::unordered_set<uint32_t> &LazyCompiled,\n+ std::vector<uint32_t> &OutSortedLocals) {\n+ OutSortedLocals.clear();\n+ if (!ModulePtr) {\n+ return;\n+ }\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\n+\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\n+ return;\n+ }\n+\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\n+ std::vector<uint32_t> Stack;\n+ Stack.reserve(64);\n+\n+ Visited[LocalSeed] = 1;\n+ Stack.push_back(LocalSeed);\n+ OutSortedLocals.push_back(LocalSeed);\n+\n+ while (!Stack.empty()) {\n+ const uint32_t L = Stack.back();\n+ Stack.pop_back();\n+\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\n+ const auto Op = Instr.getOpCode();\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\n+ Op == OpCode::Ref__func) {\n+ const uint32_t Target = Instr.getTargetIndex();\n+ if (Target >= ImportFuncCount) {\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\n+ !LazyCompiled.count(LocalIdx)) {\n+ Visited[LocalIdx] = 1;\n+ Stack.push_back(LocalIdx);\n+ OutSortedLocals.push_back(LocalIdx);\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\n+}\n+#endif\n+\n template <typename T> struct VisitUnit {\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n \n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ spdlog::warn(\n+ \"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\"sv);\n+ ExecutorEngine.registerLazyCompilationCallback(\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\n+ return lazyCompileFunctions(ID, FuncIdx);\n+ });\n+ }\n+#endif\n+\n // Register all module instances.\n unsafeRegisterBuiltInHosts();\n unsafeRegisterPlugInHosts();\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Path));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Code));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+\n+ std::string ID = Module.getID();\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\n+ !Module.getSymbol()) {\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\n+ }\n+#endif\n+\n // Instantiate and register module.\n EXPECTED_TRY(auto ModInst,\n ExecutorEngine.registerModule(StoreRef, Module, Name));\n RegModInsts.push_back(std::move(ModInst));\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (State) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates.insert({ID, std::move(*State)});\n+ }\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ size_t InstIdx = RegModInsts.size() - 1;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ auto It = RegModMap.find(ID);\n+ if (It != RegModMap.end()) {\n+ It->second[1] = InstIdx;\n+ } else {\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\n+ }\n+ }\n+#endif\n+\n return {};\n }\n \n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\n }\n-\n if (Mod) {\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\n+ std::string ID = Mod->getID();\n+\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\n !Mod->getSymbol()) {\n #ifdef WASMEDGE_USE_LLVM\n- LLVM::Compiler Compiler(Conf);\n- Compiler.checkConfigure()\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&]() { return Compiler.compile(*Mod); })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compilation failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto LLModule) {\n- LLVM::JIT JIT(Conf);\n- return JIT.load(std::move(LLModule));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\n- \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto Module) {\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n- \"mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- });\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates[ID] = std::move(State);\n+ } else {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() { return Compiler.compile(*Mod); })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(LLModule);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Module) {\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n+ \"mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ });\n+ }\n #else\n spdlog::warn(\"JIT was requested but WasmEdge was built without LLVM, \"\n \"falling back to interpreter.\"sv);\n #endif\n }\n \n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ auto StateIt = LazyJITStates.find(ID);\n+ if (StateIt != LazyJITStates.end()) {\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ StateIt->second.ImportFuncCount =\n+ static_cast<uint32_t>(ImportFuncCount);\n+ StateIt->second.LazyCompiledFuncs.clear();\n+ }\n+ }\n+#endif\n+\n EXPECTED_TRY(ActiveModInst,\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\n+\n Stage = VMStage::Instantiated;\n return {};\n } else if (Comp) {\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\n Runtime::Instance::FunctionInstance *FuncInst =\n ModInst->findFuncExports(Func);\n \n+#ifdef WASMEDGE_USE_LLVM\n+ // lazy JIT: compile function on-demand if needed.\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\n+ bool NeedsCompile = false;\n+ uint32_t FuncIdx = UINT32_MAX;\n+ {\n+ std::shared_lock Lock(LazyJITMutex);\n+ if (FuncInst->isWasmFunction()) {\n+ NeedsCompile = true;\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\n+ FuncIdx = *Res;\n+ }\n+ }\n+ }\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\n+ !Result) {\n+ return Unexpect(Result.error());\n+ }\n+ }\n+ }\n+#endif\n+\n // Execute function.\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\n .map_error([&ModInst, &Func](auto E) {\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\n }\n StoreRef.reset();\n RegModInsts.clear();\n+ RegASTModules.clear();\n+ RegModMap.clear();\n Stat.clear();\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\n unsafeRegisterPlugInHosts();\n LoaderEngine.reset();\n Stage = VMStage::Inited;\n+#ifdef WASMEDGE_USE_LLVM\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\n+ // LLContexts.\n+ LazyJITStates.clear();\n+#endif\n }\n \n std::vector<std::pair<std::string, const AST::FunctionType &>>\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\n return nullptr;\n };\n \n+#ifdef WASMEDGE_USE_LLVM\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ uint32_t ImportFuncCount = 0;\n+ const AST::Module *ModulePtr = nullptr;\n+ LLVM::Data *LLDataPtr = nullptr;\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\n+ nullptr;\n+ LLVM::LazyJITState *StatePtr = nullptr;\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\n+\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\n+ ModInst = ActiveModInst.get();\n+ ModulePtr = Mod.get();\n+ } else {\n+ auto ItMap = RegModMap.find(ID);\n+ if (ItMap != RegModMap.end()) {\n+ ModInst = RegModInsts[ItMap->second[1]].get();\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\n+ }\n+ }\n+\n+ if (!ModInst || !ModulePtr) {\n+ return {};\n+ }\n+\n+ auto It = LazyJITStates.find(ID);\n+ if (It != LazyJITStates.end()) {\n+ StatePtr = &It->second;\n+ ImportFuncCount = StatePtr->ImportFuncCount;\n+ LLDataPtr = &StatePtr->LLData;\n+ LLContextPtr = &StatePtr->LLContext;\n+ } else {\n+ spdlog::error(\"[lazy-jit]: failed to find JIT state for ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ if (FuncIdx < ImportFuncCount) {\n+ return {};\n+ }\n+\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\n+\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\n+ if (!FuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ FuncIdx, ID);\n+ return Unexpect(FuncResult.error());\n+ }\n+ auto *FuncInst = *FuncResult;\n+\n+ // If already compiled or not a Wasm function, nothing to do.\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\n+ return {};\n+ }\n+\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\n+ return {};\n+ }\n+\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\n+ const std::unordered_set<uint32_t> &CompiledSet =\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\n+\n+ std::vector<uint32_t> BatchLocals;\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\n+ CompiledSet, BatchLocals);\n+ if (BatchLocals.empty()) {\n+ return {};\n+ }\n+\n+ spdlog::debug(\n+ \"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(), LocalFuncIdx, ID);\n+\n+ LLVM::Compiler Compiler(Conf);\n+ auto ConfigResult = Compiler.checkConfigure();\n+ if (!ConfigResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\"sv,\n+ ConfigResult.error(), ID);\n+ return Unexpect(ConfigResult.error());\n+ }\n+\n+ if (!LLDataPtr->hasModule()) {\n+ LLDataPtr->resetModule();\n+ }\n+ auto CompileResult = Compiler.compileFunctions(\n+ std::move(*LLDataPtr),\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\n+ *ModulePtr,\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\n+ if (!CompileResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\"sv,\n+ CompileResult.error(), ID);\n+ return Unexpect(CompileResult.error());\n+ }\n+\n+ *LLDataPtr = std::move(*CompileResult);\n+ LLVM::JIT JIT(Conf);\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\n+ if (StatePtr && StatePtr->JITLib) {\n+ JITLib = StatePtr->JITLib;\n+ }\n+\n+ std::vector<uint32_t> BatchGlobal;\n+ BatchGlobal.reserve(BatchLocals.size());\n+ for (uint32_t L : BatchLocals) {\n+ BatchGlobal.push_back(ImportFuncCount + L);\n+ }\n+\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\n+ if (JITLib) {\n+ auto AddrRes = JIT.add(\n+ *JITLib, *LLDataPtr,\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!AddrRes) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\"sv,\n+ AddrRes.error(), ID);\n+ return Unexpect(AddrRes.error());\n+ }\n+ ResolvedAddresses = std::move(*AddrRes);\n+ } else {\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\n+ if (!LoadResult) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\"sv,\n+ LoadResult.error(), ID);\n+ return Unexpect(LoadResult.error());\n+ }\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\n+ if (StatePtr) {\n+ StatePtr->JITLib = JITLib;\n+ }\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\n+ *JITLib, LLDataPtr->getPrefix(),\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!LkRes) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\"sv,\n+ LkRes.error(), ID);\n+ return Unexpect(LkRes.error());\n+ }\n+ ResolvedAddresses = std::move(*LkRes);\n+ }\n+\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\n+ } else {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\n+ const uint32_t L = BatchLocals[I];\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\n+ if (!BatchFuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ WasmFuncIdx, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ auto *BatchFuncInst = *BatchFuncResult;\n+ if (BatchFuncInst->isWasmFunction()) {\n+ auto CompiledSym = JITLib->createSymbol(\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\n+ *>(CompiledCodePtr));\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\n+ }\n+ }\n+\n+ if (StatePtr) {\n+ for (uint32_t L : BatchLocals) {\n+ StatePtr->LazyCompiledFuncs.insert(L);\n+ }\n+ }\n+\n+ spdlog::debug(\n+ \"Lazy compilation completed for batch of {} functions, total compiled: \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(),\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\n+\n+ return {};\n+}\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\n+ WasmEdge::LLVM::LazyJITState State;\n+ LLVM::Compiler Compiler(Conf);\n+ EXPECTED_TRY(\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\n+\n+ auto Prefix = fmt::format(\"m{}_\"sv, Module.getID());\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\n+\n+ State.LLData = std::move(LLModule.first);\n+ State.LLContext = std::move(LLModule.second);\n+\n+ LLVM::JIT JIT(Conf);\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\n+\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\n+\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\n+\n+ return State;\n+}\n+#endif\n+\n } // namespace VM\n } // namespace WasmEdge\n"}],"string":"[\n {\n \"comment\": \"Could you explain the design and logic inside the `unsafeLazyCompileFunction` function? \\nIt's strange that we check whether `ModuleInstance` is `nullptr` or `ModInst`, and then we set `ModuleInstance` to `ModInst` directly.\",\n \"path\": \"lib/vm/vm.cpp\",\n \"hunk\": \"@@ -714,5 +949,150 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\\n return nullptr;\\n };\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+LLVM::LazyJITState &\\n+VM::getLazyJITStateForModule(const Runtime::Instance::ModuleInstance *ModInst) {\\n+ return LazyJITStates[ModInst];\\n+}\\n+\\n+Expect<void>\\n+VM::unsafeLazyCompileFunction(const Runtime::Instance::ModuleInstance *ModInst,\\n+ uint32_t FuncIdx) {\\n+ if (!ModInst) {\\n+ spdlog::error(\\\"Lazy JIT: null module instance\\\"sv);\\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\\n+ }\\n+\\n+ uint32_t ImportFuncCount = 0;\\n+ const AST::Module *ModulePtr = nullptr;\\n+ LLVM::Data *LLDataPtr = nullptr;\\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\\n+ nullptr;\\n+ LLVM::LazyJITState *StatePtr = nullptr;\\n+\\n+ auto It = LazyJITStates.find(ModInst);\\n+ if (It != LazyJITStates.end() && It->second.ModulePtr) {\\n+ StatePtr = &It->second;\\n+ ImportFuncCount = StatePtr->ImportFuncCount;\\n+ ModulePtr = StatePtr->ModulePtr;\\n+ LLDataPtr = &StatePtr->LLData;\\n+ LLContextPtr = &StatePtr->LLContext;\\n+ } else if (Pending.Module && (Pending.ModuleInstance == nullptr ||\\n+ Pending.ModuleInstance == ModInst)) {\\n+ Pending.ModuleInstance = ModInst;\\n+ ImportFuncCount = Pending.ImportFuncCount;\\n+ ModulePtr = Pending.Module;\\n+ LLDataPtr = &Pending.LLData;\\n+ LLContextPtr = &Pending.LLContext;\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\\nindex 680d35094656..cf594a8be374 100644\\n--- a/lib/vm/vm.cpp\\n+++ b/lib/vm/vm.cpp\\n@@ -3,7 +3,9 @@\\n \\n #include \\\"vm/vm.h\\\"\\n \\n+#include \\\"ast/instruction.h\\\"\\n #include \\\"ast/module.h\\\"\\n+#include \\\"common/enum_errcode.hpp\\\"\\n #include \\\"common/errcode.h\\\"\\n #include \\\"common/types.h\\\"\\n #include \\\"host/wasi/wasimodule.h\\\"\\n@@ -20,14 +22,71 @@\\n #include \\\"host/mock/wasmedge_tensorflow_module.h\\\"\\n #include \\\"host/mock/wasmedge_tensorflowlite_module.h\\\"\\n #include \\\"validator/validator.h\\\"\\n+#include <algorithm>\\n+#include <cstddef>\\n #include <memory>\\n #include <variant>\\n+#include <vector>\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+#include <llvm/IR/Module.h>\\n+#endif\\n \\n namespace WasmEdge {\\n namespace VM {\\n \\n namespace {\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\\n+ uint32_t ImportFuncCount,\\n+ const std::unordered_set<uint32_t> &LazyCompiled,\\n+ std::vector<uint32_t> &OutSortedLocals) {\\n+ OutSortedLocals.clear();\\n+ if (!ModulePtr) {\\n+ return;\\n+ }\\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\\n+\\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\\n+ return;\\n+ }\\n+\\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\\n+ std::vector<uint32_t> Stack;\\n+ Stack.reserve(64);\\n+\\n+ Visited[LocalSeed] = 1;\\n+ Stack.push_back(LocalSeed);\\n+ OutSortedLocals.push_back(LocalSeed);\\n+\\n+ while (!Stack.empty()) {\\n+ const uint32_t L = Stack.back();\\n+ Stack.pop_back();\\n+\\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\\n+ const auto Op = Instr.getOpCode();\\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\\n+ Op == OpCode::Ref__func) {\\n+ const uint32_t Target = Instr.getTargetIndex();\\n+ if (Target >= ImportFuncCount) {\\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\\n+ !LazyCompiled.count(LocalIdx)) {\\n+ Visited[LocalIdx] = 1;\\n+ Stack.push_back(LocalIdx);\\n+ OutSortedLocals.push_back(LocalIdx);\\n+ }\\n+ }\\n+ }\\n+ }\\n+ }\\n+\\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\\n+}\\n+#endif\\n+\\n template <typename T> struct VisitUnit {\\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\\n unsafeLoadBuiltInHosts();\\n unsafeLoadPlugInHosts();\\n \\n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ spdlog::warn(\\n+ \\\"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\\\"sv);\\n+ ExecutorEngine.registerLazyCompilationCallback(\\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\\n+ return lazyCompileFunctions(ID, FuncIdx);\\n+ });\\n+ }\\n+#endif\\n+\\n // Register all module instances.\\n unsafeRegisterBuiltInHosts();\\n unsafeRegisterPlugInHosts();\\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n Stage = VMStage::Validated;\\n }\\n // Load module.\\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\\n- return unsafeRegisterModule(Name, *Module.get());\\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\\n+ LoaderEngine.parseModule(Path));\\n+\\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\\n+\\n+ if (!RegASTModules.empty()) {\\n+ RegASTModules.back() = Module;\\n+ }\\n+\\n+ return {};\\n }\\n \\n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n Stage = VMStage::Validated;\\n }\\n // Load module.\\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\\n- return unsafeRegisterModule(Name, *Module.get());\\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\\n+ LoaderEngine.parseModule(Code));\\n+\\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\\n+\\n+ if (!RegASTModules.empty()) {\\n+ RegASTModules.back() = Module;\\n+ }\\n+\\n+ return {};\\n }\\n \\n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n }\\n // Validate module.\\n EXPECTED_TRY(ValidatorEngine.validate(Module));\\n+\\n+ std::string ID = Module.getID();\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\\n+ !Module.getSymbol()) {\\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\\n+ }\\n+#endif\\n+\\n // Instantiate and register module.\\n EXPECTED_TRY(auto ModInst,\\n ExecutorEngine.registerModule(StoreRef, Module, Name));\\n RegModInsts.push_back(std::move(ModInst));\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (State) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ LazyJITStates.insert({ID, std::move(*State)});\\n+ }\\n+#endif\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ size_t InstIdx = RegModInsts.size() - 1;\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ auto It = RegModMap.find(ID);\\n+ if (It != RegModMap.end()) {\\n+ It->second[1] = InstIdx;\\n+ } else {\\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\\n+ }\\n+ }\\n+#endif\\n+\\n return {};\\n }\\n \\n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\\n }\\n-\\n if (Mod) {\\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\\n+ std::string ID = Mod->getID();\\n+\\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\\n !Mod->getSymbol()) {\\n #ifdef WASMEDGE_USE_LLVM\\n- LLVM::Compiler Compiler(Conf);\\n- Compiler.checkConfigure()\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n- \\\"interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&]() { return Compiler.compile(*Mod); })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n- \\\"interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&](auto LLModule) {\\n- LLVM::JIT JIT(Conf);\\n- return JIT.load(std::move(LLModule));\\n- })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::warn(\\n- \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&](auto Module) {\\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\\n- })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n- \\\"mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- });\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ LazyJITStates[ID] = std::move(State);\\n+ } else {\\n+ LLVM::Compiler Compiler(Conf);\\n+ Compiler.checkConfigure()\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&]() { return Compiler.compile(*Mod); })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto LLModule) {\\n+ LLVM::JIT JIT(Conf);\\n+ return JIT.load(LLModule);\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\n+ \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto Module) {\\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n+ \\\"mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ });\\n+ }\\n #else\\n spdlog::warn(\\\"JIT was requested but WasmEdge was built without LLVM, \\\"\\n \\\"falling back to interpreter.\\\"sv);\\n #endif\\n }\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ auto StateIt = LazyJITStates.find(ID);\\n+ if (StateIt != LazyJITStates.end()) {\\n+ size_t ImportFuncCount = 0;\\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\\n+ ++ImportFuncCount;\\n+ }\\n+ }\\n+ StateIt->second.ImportFuncCount =\\n+ static_cast<uint32_t>(ImportFuncCount);\\n+ StateIt->second.LazyCompiledFuncs.clear();\\n+ }\\n+ }\\n+#endif\\n+\\n EXPECTED_TRY(ActiveModInst,\\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\\n+\\n Stage = VMStage::Instantiated;\\n return {};\\n } else if (Comp) {\\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\\n Runtime::Instance::FunctionInstance *FuncInst =\\n ModInst->findFuncExports(Func);\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+ // lazy JIT: compile function on-demand if needed.\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\\n+ bool NeedsCompile = false;\\n+ uint32_t FuncIdx = UINT32_MAX;\\n+ {\\n+ std::shared_lock Lock(LazyJITMutex);\\n+ if (FuncInst->isWasmFunction()) {\\n+ NeedsCompile = true;\\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\\n+ FuncIdx = *Res;\\n+ }\\n+ }\\n+ }\\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\\n+ !Result) {\\n+ return Unexpect(Result.error());\\n+ }\\n+ }\\n+ }\\n+#endif\\n+\\n // Execute function.\\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\\n .map_error([&ModInst, &Func](auto E) {\\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\\n }\\n StoreRef.reset();\\n RegModInsts.clear();\\n+ RegASTModules.clear();\\n+ RegModMap.clear();\\n Stat.clear();\\n unsafeLoadBuiltInHosts();\\n unsafeLoadPlugInHosts();\\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\\n unsafeRegisterPlugInHosts();\\n LoaderEngine.reset();\\n Stage = VMStage::Inited;\\n+#ifdef WASMEDGE_USE_LLVM\\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\\n+ // LLContexts.\\n+ LazyJITStates.clear();\\n+#endif\\n }\\n \\n std::vector<std::pair<std::string, const AST::FunctionType &>>\\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\\n return nullptr;\\n };\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ uint32_t ImportFuncCount = 0;\\n+ const AST::Module *ModulePtr = nullptr;\\n+ LLVM::Data *LLDataPtr = nullptr;\\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\\n+ nullptr;\\n+ LLVM::LazyJITState *StatePtr = nullptr;\\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\\n+\\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\\n+ ModInst = ActiveModInst.get();\\n+ ModulePtr = Mod.get();\\n+ } else {\\n+ auto ItMap = RegModMap.find(ID);\\n+ if (ItMap != RegModMap.end()) {\\n+ ModInst = RegModInsts[ItMap->second[1]].get();\\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\\n+ }\\n+ }\\n+\\n+ if (!ModInst || !ModulePtr) {\\n+ return {};\\n+ }\\n+\\n+ auto It = LazyJITStates.find(ID);\\n+ if (It != LazyJITStates.end()) {\\n+ StatePtr = &It->second;\\n+ ImportFuncCount = StatePtr->ImportFuncCount;\\n+ LLDataPtr = &StatePtr->LLData;\\n+ LLContextPtr = &StatePtr->LLContext;\\n+ } else {\\n+ spdlog::error(\\\"[lazy-jit]: failed to find JIT state for ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\\n+ }\\n+\\n+ if (FuncIdx < ImportFuncCount) {\\n+ return {};\\n+ }\\n+\\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\\n+\\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\\n+ if (!FuncResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get function instance for index {}, module ID: {}\\\"sv,\\n+ FuncIdx, ID);\\n+ return Unexpect(FuncResult.error());\\n+ }\\n+ auto *FuncInst = *FuncResult;\\n+\\n+ // If already compiled or not a Wasm function, nothing to do.\\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\\n+ return {};\\n+ }\\n+\\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\\n+ return {};\\n+ }\\n+\\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\\n+ const std::unordered_set<uint32_t> &CompiledSet =\\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\\n+\\n+ std::vector<uint32_t> BatchLocals;\\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\\n+ CompiledSet, BatchLocals);\\n+ if (BatchLocals.empty()) {\\n+ return {};\\n+ }\\n+\\n+ spdlog::debug(\\n+ \\\"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \\\"\\n+ \\\"{}, module ID: {}\\\"sv,\\n+ BatchLocals.size(), LocalFuncIdx, ID);\\n+\\n+ LLVM::Compiler Compiler(Conf);\\n+ auto ConfigResult = Compiler.checkConfigure();\\n+ if (!ConfigResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\\\"sv,\\n+ ConfigResult.error(), ID);\\n+ return Unexpect(ConfigResult.error());\\n+ }\\n+\\n+ if (!LLDataPtr->hasModule()) {\\n+ LLDataPtr->resetModule();\\n+ }\\n+ auto CompileResult = Compiler.compileFunctions(\\n+ std::move(*LLDataPtr),\\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\\n+ *ModulePtr,\\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\\n+ if (!CompileResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\\\"sv,\\n+ CompileResult.error(), ID);\\n+ return Unexpect(CompileResult.error());\\n+ }\\n+\\n+ *LLDataPtr = std::move(*CompileResult);\\n+ LLVM::JIT JIT(Conf);\\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\\n+ if (StatePtr && StatePtr->JITLib) {\\n+ JITLib = StatePtr->JITLib;\\n+ }\\n+\\n+ std::vector<uint32_t> BatchGlobal;\\n+ BatchGlobal.reserve(BatchLocals.size());\\n+ for (uint32_t L : BatchLocals) {\\n+ BatchGlobal.push_back(ImportFuncCount + L);\\n+ }\\n+\\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\\n+ if (JITLib) {\\n+ auto AddrRes = JIT.add(\\n+ *JITLib, *LLDataPtr,\\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\\n+ if (!AddrRes) {\\n+ spdlog::error(\\\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\\\"sv,\\n+ AddrRes.error(), ID);\\n+ return Unexpect(AddrRes.error());\\n+ }\\n+ ResolvedAddresses = std::move(*AddrRes);\\n+ } else {\\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\\n+ if (!LoadResult) {\\n+ spdlog::error(\\\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\\\"sv,\\n+ LoadResult.error(), ID);\\n+ return Unexpect(LoadResult.error());\\n+ }\\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\\n+ if (StatePtr) {\\n+ StatePtr->JITLib = JITLib;\\n+ }\\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\\n+ *JITLib, LLDataPtr->getPrefix(),\\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\\n+ if (!LkRes) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\\\"sv,\\n+ LkRes.error(), ID);\\n+ return Unexpect(LkRes.error());\\n+ }\\n+ ResolvedAddresses = std::move(*LkRes);\\n+ }\\n+\\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\\n+ } else {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\\n+ const uint32_t L = BatchLocals[I];\\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\\n+ if (!BatchFuncResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get function instance for index {}, module ID: {}\\\"sv,\\n+ WasmFuncIdx, ID);\\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\\n+ }\\n+\\n+ auto *BatchFuncInst = *BatchFuncResult;\\n+ if (BatchFuncInst->isWasmFunction()) {\\n+ auto CompiledSym = JITLib->createSymbol(\\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\\n+ *>(CompiledCodePtr));\\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\\n+ }\\n+ }\\n+\\n+ if (StatePtr) {\\n+ for (uint32_t L : BatchLocals) {\\n+ StatePtr->LazyCompiledFuncs.insert(L);\\n+ }\\n+ }\\n+\\n+ spdlog::debug(\\n+ \\\"Lazy compilation completed for batch of {} functions, total compiled: \\\"\\n+ \\\"{}, module ID: {}\\\"sv,\\n+ BatchLocals.size(),\\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\\n+\\n+ return {};\\n+}\\n+#endif\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\\n+ WasmEdge::LLVM::LazyJITState State;\\n+ LLVM::Compiler Compiler(Conf);\\n+ EXPECTED_TRY(\\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\\n+\\n+ auto Prefix = fmt::format(\\\"m{}_\\\"sv, Module.getID());\\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\\n+\\n+ State.LLData = std::move(LLModule.first);\\n+ State.LLContext = std::move(LLModule.second);\\n+\\n+ LLVM::JIT JIT(Conf);\\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\\n+\\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\\n+\\n+ size_t ImportFuncCount = 0;\\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\\n+ ++ImportFuncCount;\\n+ }\\n+ }\\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\\n+\\n+ return State;\\n+}\\n+#endif\\n+\\n } // namespace VM\\n } // namespace WasmEdge\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13280,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"Why is the `const_cast` required?"},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\nindex 680d35094656..cf594a8be374 100644\n--- a/lib/vm/vm.cpp\n+++ b/lib/vm/vm.cpp\n@@ -3,7 +3,9 @@\n \n #include \"vm/vm.h\"\n \n+#include \"ast/instruction.h\"\n #include \"ast/module.h\"\n+#include \"common/enum_errcode.hpp\"\n #include \"common/errcode.h\"\n #include \"common/types.h\"\n #include \"host/wasi/wasimodule.h\"\n@@ -20,14 +22,71 @@\n #include \"host/mock/wasmedge_tensorflow_module.h\"\n #include \"host/mock/wasmedge_tensorflowlite_module.h\"\n #include \"validator/validator.h\"\n+#include <algorithm>\n+#include <cstddef>\n #include <memory>\n #include <variant>\n+#include <vector>\n+\n+#ifdef WASMEDGE_USE_LLVM\n+#include <llvm/IR/Module.h>\n+#endif\n \n namespace WasmEdge {\n namespace VM {\n \n namespace {\n \n+#ifdef WASMEDGE_USE_LLVM\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\n+ uint32_t ImportFuncCount,\n+ const std::unordered_set<uint32_t> &LazyCompiled,\n+ std::vector<uint32_t> &OutSortedLocals) {\n+ OutSortedLocals.clear();\n+ if (!ModulePtr) {\n+ return;\n+ }\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\n+\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\n+ return;\n+ }\n+\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\n+ std::vector<uint32_t> Stack;\n+ Stack.reserve(64);\n+\n+ Visited[LocalSeed] = 1;\n+ Stack.push_back(LocalSeed);\n+ OutSortedLocals.push_back(LocalSeed);\n+\n+ while (!Stack.empty()) {\n+ const uint32_t L = Stack.back();\n+ Stack.pop_back();\n+\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\n+ const auto Op = Instr.getOpCode();\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\n+ Op == OpCode::Ref__func) {\n+ const uint32_t Target = Instr.getTargetIndex();\n+ if (Target >= ImportFuncCount) {\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\n+ !LazyCompiled.count(LocalIdx)) {\n+ Visited[LocalIdx] = 1;\n+ Stack.push_back(LocalIdx);\n+ OutSortedLocals.push_back(LocalIdx);\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\n+}\n+#endif\n+\n template <typename T> struct VisitUnit {\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n \n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ spdlog::warn(\n+ \"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\"sv);\n+ ExecutorEngine.registerLazyCompilationCallback(\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\n+ return lazyCompileFunctions(ID, FuncIdx);\n+ });\n+ }\n+#endif\n+\n // Register all module instances.\n unsafeRegisterBuiltInHosts();\n unsafeRegisterPlugInHosts();\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Path));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Code));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+\n+ std::string ID = Module.getID();\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\n+ !Module.getSymbol()) {\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\n+ }\n+#endif\n+\n // Instantiate and register module.\n EXPECTED_TRY(auto ModInst,\n ExecutorEngine.registerModule(StoreRef, Module, Name));\n RegModInsts.push_back(std::move(ModInst));\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (State) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates.insert({ID, std::move(*State)});\n+ }\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ size_t InstIdx = RegModInsts.size() - 1;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ auto It = RegModMap.find(ID);\n+ if (It != RegModMap.end()) {\n+ It->second[1] = InstIdx;\n+ } else {\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\n+ }\n+ }\n+#endif\n+\n return {};\n }\n \n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\n }\n-\n if (Mod) {\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\n+ std::string ID = Mod->getID();\n+\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\n !Mod->getSymbol()) {\n #ifdef WASMEDGE_USE_LLVM\n- LLVM::Compiler Compiler(Conf);\n- Compiler.checkConfigure()\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&]() { return Compiler.compile(*Mod); })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compilation failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto LLModule) {\n- LLVM::JIT JIT(Conf);\n- return JIT.load(std::move(LLModule));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\n- \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto Module) {\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n- \"mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- });\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates[ID] = std::move(State);\n+ } else {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() { return Compiler.compile(*Mod); })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(LLModule);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Module) {\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n+ \"mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ });\n+ }\n #else\n spdlog::warn(\"JIT was requested but WasmEdge was built without LLVM, \"\n \"falling back to interpreter.\"sv);\n #endif\n }\n \n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ auto StateIt = LazyJITStates.find(ID);\n+ if (StateIt != LazyJITStates.end()) {\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ StateIt->second.ImportFuncCount =\n+ static_cast<uint32_t>(ImportFuncCount);\n+ StateIt->second.LazyCompiledFuncs.clear();\n+ }\n+ }\n+#endif\n+\n EXPECTED_TRY(ActiveModInst,\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\n+\n Stage = VMStage::Instantiated;\n return {};\n } else if (Comp) {\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\n Runtime::Instance::FunctionInstance *FuncInst =\n ModInst->findFuncExports(Func);\n \n+#ifdef WASMEDGE_USE_LLVM\n+ // lazy JIT: compile function on-demand if needed.\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\n+ bool NeedsCompile = false;\n+ uint32_t FuncIdx = UINT32_MAX;\n+ {\n+ std::shared_lock Lock(LazyJITMutex);\n+ if (FuncInst->isWasmFunction()) {\n+ NeedsCompile = true;\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\n+ FuncIdx = *Res;\n+ }\n+ }\n+ }\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\n+ !Result) {\n+ return Unexpect(Result.error());\n+ }\n+ }\n+ }\n+#endif\n+\n // Execute function.\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\n .map_error([&ModInst, &Func](auto E) {\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\n }\n StoreRef.reset();\n RegModInsts.clear();\n+ RegASTModules.clear();\n+ RegModMap.clear();\n Stat.clear();\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\n unsafeRegisterPlugInHosts();\n LoaderEngine.reset();\n Stage = VMStage::Inited;\n+#ifdef WASMEDGE_USE_LLVM\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\n+ // LLContexts.\n+ LazyJITStates.clear();\n+#endif\n }\n \n std::vector<std::pair<std::string, const AST::FunctionType &>>\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\n return nullptr;\n };\n \n+#ifdef WASMEDGE_USE_LLVM\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ uint32_t ImportFuncCount = 0;\n+ const AST::Module *ModulePtr = nullptr;\n+ LLVM::Data *LLDataPtr = nullptr;\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\n+ nullptr;\n+ LLVM::LazyJITState *StatePtr = nullptr;\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\n+\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\n+ ModInst = ActiveModInst.get();\n+ ModulePtr = Mod.get();\n+ } else {\n+ auto ItMap = RegModMap.find(ID);\n+ if (ItMap != RegModMap.end()) {\n+ ModInst = RegModInsts[ItMap->second[1]].get();\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\n+ }\n+ }\n+\n+ if (!ModInst || !ModulePtr) {\n+ return {};\n+ }\n+\n+ auto It = LazyJITStates.find(ID);\n+ if (It != LazyJITStates.end()) {\n+ StatePtr = &It->second;\n+ ImportFuncCount = StatePtr->ImportFuncCount;\n+ LLDataPtr = &StatePtr->LLData;\n+ LLContextPtr = &StatePtr->LLContext;\n+ } else {\n+ spdlog::error(\"[lazy-jit]: failed to find JIT state for ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ if (FuncIdx < ImportFuncCount) {\n+ return {};\n+ }\n+\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\n+\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\n+ if (!FuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ FuncIdx, ID);\n+ return Unexpect(FuncResult.error());\n+ }\n+ auto *FuncInst = *FuncResult;\n+\n+ // If already compiled or not a Wasm function, nothing to do.\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\n+ return {};\n+ }\n+\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\n+ return {};\n+ }\n+\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\n+ const std::unordered_set<uint32_t> &CompiledSet =\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\n+\n+ std::vector<uint32_t> BatchLocals;\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\n+ CompiledSet, BatchLocals);\n+ if (BatchLocals.empty()) {\n+ return {};\n+ }\n+\n+ spdlog::debug(\n+ \"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(), LocalFuncIdx, ID);\n+\n+ LLVM::Compiler Compiler(Conf);\n+ auto ConfigResult = Compiler.checkConfigure();\n+ if (!ConfigResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\"sv,\n+ ConfigResult.error(), ID);\n+ return Unexpect(ConfigResult.error());\n+ }\n+\n+ if (!LLDataPtr->hasModule()) {\n+ LLDataPtr->resetModule();\n+ }\n+ auto CompileResult = Compiler.compileFunctions(\n+ std::move(*LLDataPtr),\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\n+ *ModulePtr,\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\n+ if (!CompileResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\"sv,\n+ CompileResult.error(), ID);\n+ return Unexpect(CompileResult.error());\n+ }\n+\n+ *LLDataPtr = std::move(*CompileResult);\n+ LLVM::JIT JIT(Conf);\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\n+ if (StatePtr && StatePtr->JITLib) {\n+ JITLib = StatePtr->JITLib;\n+ }\n+\n+ std::vector<uint32_t> BatchGlobal;\n+ BatchGlobal.reserve(BatchLocals.size());\n+ for (uint32_t L : BatchLocals) {\n+ BatchGlobal.push_back(ImportFuncCount + L);\n+ }\n+\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\n+ if (JITLib) {\n+ auto AddrRes = JIT.add(\n+ *JITLib, *LLDataPtr,\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!AddrRes) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\"sv,\n+ AddrRes.error(), ID);\n+ return Unexpect(AddrRes.error());\n+ }\n+ ResolvedAddresses = std::move(*AddrRes);\n+ } else {\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\n+ if (!LoadResult) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\"sv,\n+ LoadResult.error(), ID);\n+ return Unexpect(LoadResult.error());\n+ }\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\n+ if (StatePtr) {\n+ StatePtr->JITLib = JITLib;\n+ }\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\n+ *JITLib, LLDataPtr->getPrefix(),\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!LkRes) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\"sv,\n+ LkRes.error(), ID);\n+ return Unexpect(LkRes.error());\n+ }\n+ ResolvedAddresses = std::move(*LkRes);\n+ }\n+\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\n+ } else {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\n+ const uint32_t L = BatchLocals[I];\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\n+ if (!BatchFuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ WasmFuncIdx, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ auto *BatchFuncInst = *BatchFuncResult;\n+ if (BatchFuncInst->isWasmFunction()) {\n+ auto CompiledSym = JITLib->createSymbol(\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\n+ *>(CompiledCodePtr));\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\n+ }\n+ }\n+\n+ if (StatePtr) {\n+ for (uint32_t L : BatchLocals) {\n+ StatePtr->LazyCompiledFuncs.insert(L);\n+ }\n+ }\n+\n+ spdlog::debug(\n+ \"Lazy compilation completed for batch of {} functions, total compiled: \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(),\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\n+\n+ return {};\n+}\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\n+ WasmEdge::LLVM::LazyJITState State;\n+ LLVM::Compiler Compiler(Conf);\n+ EXPECTED_TRY(\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\n+\n+ auto Prefix = fmt::format(\"m{}_\"sv, Module.getID());\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\n+\n+ State.LLData = std::move(LLModule.first);\n+ State.LLContext = std::move(LLModule.second);\n+\n+ LLVM::JIT JIT(Conf);\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\n+\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\n+\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\n+\n+ return State;\n+}\n+#endif\n+\n } // namespace VM\n } // namespace WasmEdge\n"},"changed_files":{"kind":"list like","value":["lib/vm/vm.cpp"],"string":"[\n \"lib/vm/vm.cpp\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"Why is the `const_cast` required?","path":"lib/vm/vm.cpp","hunk":"@@ -207,10 +243,101 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+ spdlog::info(\"Module validated: {}\"sv, Module.getIsValidated());\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().isEnableLazyJIT() &&\n+ Conf.getRuntimeConfigure().isEnableJIT() && !Module.getSymbol()) {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() {\n+ auto Prefix =\n+ fmt::format(\"m{:p}_\"sv, reinterpret_cast<const void *>(&Module));\n+ return Compiler.compileInfrastructure(Module, Prefix);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ Pending.LLData = std::move(LLModule.first);\n+ Pending.LLContext = std::move(LLModule.second);\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(Pending.LLData, true);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Exec) {\n+ Pending.Exec = Exec;\n+ return LoaderEngine.loadExecutable(const_cast<AST::Module &>(Module),\n+ std::move(Exec));","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\nindex 680d35094656..cf594a8be374 100644\n--- a/lib/vm/vm.cpp\n+++ b/lib/vm/vm.cpp\n@@ -3,7 +3,9 @@\n \n #include \"vm/vm.h\"\n \n+#include \"ast/instruction.h\"\n #include \"ast/module.h\"\n+#include \"common/enum_errcode.hpp\"\n #include \"common/errcode.h\"\n #include \"common/types.h\"\n #include \"host/wasi/wasimodule.h\"\n@@ -20,14 +22,71 @@\n #include \"host/mock/wasmedge_tensorflow_module.h\"\n #include \"host/mock/wasmedge_tensorflowlite_module.h\"\n #include \"validator/validator.h\"\n+#include <algorithm>\n+#include <cstddef>\n #include <memory>\n #include <variant>\n+#include <vector>\n+\n+#ifdef WASMEDGE_USE_LLVM\n+#include <llvm/IR/Module.h>\n+#endif\n \n namespace WasmEdge {\n namespace VM {\n \n namespace {\n \n+#ifdef WASMEDGE_USE_LLVM\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\n+ uint32_t ImportFuncCount,\n+ const std::unordered_set<uint32_t> &LazyCompiled,\n+ std::vector<uint32_t> &OutSortedLocals) {\n+ OutSortedLocals.clear();\n+ if (!ModulePtr) {\n+ return;\n+ }\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\n+\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\n+ return;\n+ }\n+\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\n+ std::vector<uint32_t> Stack;\n+ Stack.reserve(64);\n+\n+ Visited[LocalSeed] = 1;\n+ Stack.push_back(LocalSeed);\n+ OutSortedLocals.push_back(LocalSeed);\n+\n+ while (!Stack.empty()) {\n+ const uint32_t L = Stack.back();\n+ Stack.pop_back();\n+\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\n+ const auto Op = Instr.getOpCode();\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\n+ Op == OpCode::Ref__func) {\n+ const uint32_t Target = Instr.getTargetIndex();\n+ if (Target >= ImportFuncCount) {\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\n+ !LazyCompiled.count(LocalIdx)) {\n+ Visited[LocalIdx] = 1;\n+ Stack.push_back(LocalIdx);\n+ OutSortedLocals.push_back(LocalIdx);\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\n+}\n+#endif\n+\n template <typename T> struct VisitUnit {\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n \n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ spdlog::warn(\n+ \"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\"sv);\n+ ExecutorEngine.registerLazyCompilationCallback(\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\n+ return lazyCompileFunctions(ID, FuncIdx);\n+ });\n+ }\n+#endif\n+\n // Register all module instances.\n unsafeRegisterBuiltInHosts();\n unsafeRegisterPlugInHosts();\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Path));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Code));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+\n+ std::string ID = Module.getID();\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\n+ !Module.getSymbol()) {\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\n+ }\n+#endif\n+\n // Instantiate and register module.\n EXPECTED_TRY(auto ModInst,\n ExecutorEngine.registerModule(StoreRef, Module, Name));\n RegModInsts.push_back(std::move(ModInst));\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (State) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates.insert({ID, std::move(*State)});\n+ }\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ size_t InstIdx = RegModInsts.size() - 1;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ auto It = RegModMap.find(ID);\n+ if (It != RegModMap.end()) {\n+ It->second[1] = InstIdx;\n+ } else {\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\n+ }\n+ }\n+#endif\n+\n return {};\n }\n \n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\n }\n-\n if (Mod) {\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\n+ std::string ID = Mod->getID();\n+\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\n !Mod->getSymbol()) {\n #ifdef WASMEDGE_USE_LLVM\n- LLVM::Compiler Compiler(Conf);\n- Compiler.checkConfigure()\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&]() { return Compiler.compile(*Mod); })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compilation failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto LLModule) {\n- LLVM::JIT JIT(Conf);\n- return JIT.load(std::move(LLModule));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\n- \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto Module) {\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n- \"mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- });\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates[ID] = std::move(State);\n+ } else {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() { return Compiler.compile(*Mod); })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(LLModule);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Module) {\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n+ \"mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ });\n+ }\n #else\n spdlog::warn(\"JIT was requested but WasmEdge was built without LLVM, \"\n \"falling back to interpreter.\"sv);\n #endif\n }\n \n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ auto StateIt = LazyJITStates.find(ID);\n+ if (StateIt != LazyJITStates.end()) {\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ StateIt->second.ImportFuncCount =\n+ static_cast<uint32_t>(ImportFuncCount);\n+ StateIt->second.LazyCompiledFuncs.clear();\n+ }\n+ }\n+#endif\n+\n EXPECTED_TRY(ActiveModInst,\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\n+\n Stage = VMStage::Instantiated;\n return {};\n } else if (Comp) {\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\n Runtime::Instance::FunctionInstance *FuncInst =\n ModInst->findFuncExports(Func);\n \n+#ifdef WASMEDGE_USE_LLVM\n+ // lazy JIT: compile function on-demand if needed.\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\n+ bool NeedsCompile = false;\n+ uint32_t FuncIdx = UINT32_MAX;\n+ {\n+ std::shared_lock Lock(LazyJITMutex);\n+ if (FuncInst->isWasmFunction()) {\n+ NeedsCompile = true;\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\n+ FuncIdx = *Res;\n+ }\n+ }\n+ }\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\n+ !Result) {\n+ return Unexpect(Result.error());\n+ }\n+ }\n+ }\n+#endif\n+\n // Execute function.\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\n .map_error([&ModInst, &Func](auto E) {\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\n }\n StoreRef.reset();\n RegModInsts.clear();\n+ RegASTModules.clear();\n+ RegModMap.clear();\n Stat.clear();\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\n unsafeRegisterPlugInHosts();\n LoaderEngine.reset();\n Stage = VMStage::Inited;\n+#ifdef WASMEDGE_USE_LLVM\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\n+ // LLContexts.\n+ LazyJITStates.clear();\n+#endif\n }\n \n std::vector<std::pair<std::string, const AST::FunctionType &>>\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\n return nullptr;\n };\n \n+#ifdef WASMEDGE_USE_LLVM\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ uint32_t ImportFuncCount = 0;\n+ const AST::Module *ModulePtr = nullptr;\n+ LLVM::Data *LLDataPtr = nullptr;\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\n+ nullptr;\n+ LLVM::LazyJITState *StatePtr = nullptr;\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\n+\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\n+ ModInst = ActiveModInst.get();\n+ ModulePtr = Mod.get();\n+ } else {\n+ auto ItMap = RegModMap.find(ID);\n+ if (ItMap != RegModMap.end()) {\n+ ModInst = RegModInsts[ItMap->second[1]].get();\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\n+ }\n+ }\n+\n+ if (!ModInst || !ModulePtr) {\n+ return {};\n+ }\n+\n+ auto It = LazyJITStates.find(ID);\n+ if (It != LazyJITStates.end()) {\n+ StatePtr = &It->second;\n+ ImportFuncCount = StatePtr->ImportFuncCount;\n+ LLDataPtr = &StatePtr->LLData;\n+ LLContextPtr = &StatePtr->LLContext;\n+ } else {\n+ spdlog::error(\"[lazy-jit]: failed to find JIT state for ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ if (FuncIdx < ImportFuncCount) {\n+ return {};\n+ }\n+\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\n+\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\n+ if (!FuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ FuncIdx, ID);\n+ return Unexpect(FuncResult.error());\n+ }\n+ auto *FuncInst = *FuncResult;\n+\n+ // If already compiled or not a Wasm function, nothing to do.\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\n+ return {};\n+ }\n+\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\n+ return {};\n+ }\n+\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\n+ const std::unordered_set<uint32_t> &CompiledSet =\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\n+\n+ std::vector<uint32_t> BatchLocals;\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\n+ CompiledSet, BatchLocals);\n+ if (BatchLocals.empty()) {\n+ return {};\n+ }\n+\n+ spdlog::debug(\n+ \"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(), LocalFuncIdx, ID);\n+\n+ LLVM::Compiler Compiler(Conf);\n+ auto ConfigResult = Compiler.checkConfigure();\n+ if (!ConfigResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\"sv,\n+ ConfigResult.error(), ID);\n+ return Unexpect(ConfigResult.error());\n+ }\n+\n+ if (!LLDataPtr->hasModule()) {\n+ LLDataPtr->resetModule();\n+ }\n+ auto CompileResult = Compiler.compileFunctions(\n+ std::move(*LLDataPtr),\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\n+ *ModulePtr,\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\n+ if (!CompileResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\"sv,\n+ CompileResult.error(), ID);\n+ return Unexpect(CompileResult.error());\n+ }\n+\n+ *LLDataPtr = std::move(*CompileResult);\n+ LLVM::JIT JIT(Conf);\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\n+ if (StatePtr && StatePtr->JITLib) {\n+ JITLib = StatePtr->JITLib;\n+ }\n+\n+ std::vector<uint32_t> BatchGlobal;\n+ BatchGlobal.reserve(BatchLocals.size());\n+ for (uint32_t L : BatchLocals) {\n+ BatchGlobal.push_back(ImportFuncCount + L);\n+ }\n+\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\n+ if (JITLib) {\n+ auto AddrRes = JIT.add(\n+ *JITLib, *LLDataPtr,\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!AddrRes) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\"sv,\n+ AddrRes.error(), ID);\n+ return Unexpect(AddrRes.error());\n+ }\n+ ResolvedAddresses = std::move(*AddrRes);\n+ } else {\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\n+ if (!LoadResult) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\"sv,\n+ LoadResult.error(), ID);\n+ return Unexpect(LoadResult.error());\n+ }\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\n+ if (StatePtr) {\n+ StatePtr->JITLib = JITLib;\n+ }\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\n+ *JITLib, LLDataPtr->getPrefix(),\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!LkRes) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\"sv,\n+ LkRes.error(), ID);\n+ return Unexpect(LkRes.error());\n+ }\n+ ResolvedAddresses = std::move(*LkRes);\n+ }\n+\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\n+ } else {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\n+ const uint32_t L = BatchLocals[I];\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\n+ if (!BatchFuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ WasmFuncIdx, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ auto *BatchFuncInst = *BatchFuncResult;\n+ if (BatchFuncInst->isWasmFunction()) {\n+ auto CompiledSym = JITLib->createSymbol(\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\n+ *>(CompiledCodePtr));\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\n+ }\n+ }\n+\n+ if (StatePtr) {\n+ for (uint32_t L : BatchLocals) {\n+ StatePtr->LazyCompiledFuncs.insert(L);\n+ }\n+ }\n+\n+ spdlog::debug(\n+ \"Lazy compilation completed for batch of {} functions, total compiled: \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(),\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\n+\n+ return {};\n+}\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\n+ WasmEdge::LLVM::LazyJITState State;\n+ LLVM::Compiler Compiler(Conf);\n+ EXPECTED_TRY(\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\n+\n+ auto Prefix = fmt::format(\"m{}_\"sv, Module.getID());\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\n+\n+ State.LLData = std::move(LLModule.first);\n+ State.LLContext = std::move(LLModule.second);\n+\n+ LLVM::JIT JIT(Conf);\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\n+\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\n+\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\n+\n+ return State;\n+}\n+#endif\n+\n } // namespace VM\n } // namespace WasmEdge\n"}],"string":"[\n {\n \"comment\": \"Why is the `const_cast` required?\",\n \"path\": \"lib/vm/vm.cpp\",\n \"hunk\": \"@@ -207,10 +243,101 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n }\\n // Validate module.\\n EXPECTED_TRY(ValidatorEngine.validate(Module));\\n+ spdlog::info(\\\"Module validated: {}\\\"sv, Module.getIsValidated());\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().isEnableLazyJIT() &&\\n+ Conf.getRuntimeConfigure().isEnableJIT() && !Module.getSymbol()) {\\n+ LLVM::Compiler Compiler(Conf);\\n+ Compiler.checkConfigure()\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&]() {\\n+ auto Prefix =\\n+ fmt::format(\\\"m{:p}_\\\"sv, reinterpret_cast<const void *>(&Module));\\n+ return Compiler.compileInfrastructure(Module, Prefix);\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto LLModule) {\\n+ Pending.LLData = std::move(LLModule.first);\\n+ Pending.LLContext = std::move(LLModule.second);\\n+ LLVM::JIT JIT(Conf);\\n+ return JIT.load(Pending.LLData, true);\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\n+ \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto Exec) {\\n+ Pending.Exec = Exec;\\n+ return LoaderEngine.loadExecutable(const_cast<AST::Module &>(Module),\\n+ std::move(Exec));\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\\nindex 680d35094656..cf594a8be374 100644\\n--- a/lib/vm/vm.cpp\\n+++ b/lib/vm/vm.cpp\\n@@ -3,7 +3,9 @@\\n \\n #include \\\"vm/vm.h\\\"\\n \\n+#include \\\"ast/instruction.h\\\"\\n #include \\\"ast/module.h\\\"\\n+#include \\\"common/enum_errcode.hpp\\\"\\n #include \\\"common/errcode.h\\\"\\n #include \\\"common/types.h\\\"\\n #include \\\"host/wasi/wasimodule.h\\\"\\n@@ -20,14 +22,71 @@\\n #include \\\"host/mock/wasmedge_tensorflow_module.h\\\"\\n #include \\\"host/mock/wasmedge_tensorflowlite_module.h\\\"\\n #include \\\"validator/validator.h\\\"\\n+#include <algorithm>\\n+#include <cstddef>\\n #include <memory>\\n #include <variant>\\n+#include <vector>\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+#include <llvm/IR/Module.h>\\n+#endif\\n \\n namespace WasmEdge {\\n namespace VM {\\n \\n namespace {\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\\n+ uint32_t ImportFuncCount,\\n+ const std::unordered_set<uint32_t> &LazyCompiled,\\n+ std::vector<uint32_t> &OutSortedLocals) {\\n+ OutSortedLocals.clear();\\n+ if (!ModulePtr) {\\n+ return;\\n+ }\\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\\n+\\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\\n+ return;\\n+ }\\n+\\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\\n+ std::vector<uint32_t> Stack;\\n+ Stack.reserve(64);\\n+\\n+ Visited[LocalSeed] = 1;\\n+ Stack.push_back(LocalSeed);\\n+ OutSortedLocals.push_back(LocalSeed);\\n+\\n+ while (!Stack.empty()) {\\n+ const uint32_t L = Stack.back();\\n+ Stack.pop_back();\\n+\\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\\n+ const auto Op = Instr.getOpCode();\\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\\n+ Op == OpCode::Ref__func) {\\n+ const uint32_t Target = Instr.getTargetIndex();\\n+ if (Target >= ImportFuncCount) {\\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\\n+ !LazyCompiled.count(LocalIdx)) {\\n+ Visited[LocalIdx] = 1;\\n+ Stack.push_back(LocalIdx);\\n+ OutSortedLocals.push_back(LocalIdx);\\n+ }\\n+ }\\n+ }\\n+ }\\n+ }\\n+\\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\\n+}\\n+#endif\\n+\\n template <typename T> struct VisitUnit {\\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\\n unsafeLoadBuiltInHosts();\\n unsafeLoadPlugInHosts();\\n \\n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ spdlog::warn(\\n+ \\\"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\\\"sv);\\n+ ExecutorEngine.registerLazyCompilationCallback(\\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\\n+ return lazyCompileFunctions(ID, FuncIdx);\\n+ });\\n+ }\\n+#endif\\n+\\n // Register all module instances.\\n unsafeRegisterBuiltInHosts();\\n unsafeRegisterPlugInHosts();\\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n Stage = VMStage::Validated;\\n }\\n // Load module.\\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\\n- return unsafeRegisterModule(Name, *Module.get());\\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\\n+ LoaderEngine.parseModule(Path));\\n+\\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\\n+\\n+ if (!RegASTModules.empty()) {\\n+ RegASTModules.back() = Module;\\n+ }\\n+\\n+ return {};\\n }\\n \\n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n Stage = VMStage::Validated;\\n }\\n // Load module.\\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\\n- return unsafeRegisterModule(Name, *Module.get());\\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\\n+ LoaderEngine.parseModule(Code));\\n+\\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\\n+\\n+ if (!RegASTModules.empty()) {\\n+ RegASTModules.back() = Module;\\n+ }\\n+\\n+ return {};\\n }\\n \\n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n }\\n // Validate module.\\n EXPECTED_TRY(ValidatorEngine.validate(Module));\\n+\\n+ std::string ID = Module.getID();\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\\n+ !Module.getSymbol()) {\\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\\n+ }\\n+#endif\\n+\\n // Instantiate and register module.\\n EXPECTED_TRY(auto ModInst,\\n ExecutorEngine.registerModule(StoreRef, Module, Name));\\n RegModInsts.push_back(std::move(ModInst));\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (State) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ LazyJITStates.insert({ID, std::move(*State)});\\n+ }\\n+#endif\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ size_t InstIdx = RegModInsts.size() - 1;\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ auto It = RegModMap.find(ID);\\n+ if (It != RegModMap.end()) {\\n+ It->second[1] = InstIdx;\\n+ } else {\\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\\n+ }\\n+ }\\n+#endif\\n+\\n return {};\\n }\\n \\n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\\n }\\n-\\n if (Mod) {\\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\\n+ std::string ID = Mod->getID();\\n+\\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\\n !Mod->getSymbol()) {\\n #ifdef WASMEDGE_USE_LLVM\\n- LLVM::Compiler Compiler(Conf);\\n- Compiler.checkConfigure()\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n- \\\"interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&]() { return Compiler.compile(*Mod); })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n- \\\"interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&](auto LLModule) {\\n- LLVM::JIT JIT(Conf);\\n- return JIT.load(std::move(LLModule));\\n- })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::warn(\\n- \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&](auto Module) {\\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\\n- })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n- \\\"mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- });\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ LazyJITStates[ID] = std::move(State);\\n+ } else {\\n+ LLVM::Compiler Compiler(Conf);\\n+ Compiler.checkConfigure()\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&]() { return Compiler.compile(*Mod); })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto LLModule) {\\n+ LLVM::JIT JIT(Conf);\\n+ return JIT.load(LLModule);\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\n+ \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto Module) {\\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n+ \\\"mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ });\\n+ }\\n #else\\n spdlog::warn(\\\"JIT was requested but WasmEdge was built without LLVM, \\\"\\n \\\"falling back to interpreter.\\\"sv);\\n #endif\\n }\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ auto StateIt = LazyJITStates.find(ID);\\n+ if (StateIt != LazyJITStates.end()) {\\n+ size_t ImportFuncCount = 0;\\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\\n+ ++ImportFuncCount;\\n+ }\\n+ }\\n+ StateIt->second.ImportFuncCount =\\n+ static_cast<uint32_t>(ImportFuncCount);\\n+ StateIt->second.LazyCompiledFuncs.clear();\\n+ }\\n+ }\\n+#endif\\n+\\n EXPECTED_TRY(ActiveModInst,\\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\\n+\\n Stage = VMStage::Instantiated;\\n return {};\\n } else if (Comp) {\\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\\n Runtime::Instance::FunctionInstance *FuncInst =\\n ModInst->findFuncExports(Func);\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+ // lazy JIT: compile function on-demand if needed.\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\\n+ bool NeedsCompile = false;\\n+ uint32_t FuncIdx = UINT32_MAX;\\n+ {\\n+ std::shared_lock Lock(LazyJITMutex);\\n+ if (FuncInst->isWasmFunction()) {\\n+ NeedsCompile = true;\\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\\n+ FuncIdx = *Res;\\n+ }\\n+ }\\n+ }\\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\\n+ !Result) {\\n+ return Unexpect(Result.error());\\n+ }\\n+ }\\n+ }\\n+#endif\\n+\\n // Execute function.\\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\\n .map_error([&ModInst, &Func](auto E) {\\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\\n }\\n StoreRef.reset();\\n RegModInsts.clear();\\n+ RegASTModules.clear();\\n+ RegModMap.clear();\\n Stat.clear();\\n unsafeLoadBuiltInHosts();\\n unsafeLoadPlugInHosts();\\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\\n unsafeRegisterPlugInHosts();\\n LoaderEngine.reset();\\n Stage = VMStage::Inited;\\n+#ifdef WASMEDGE_USE_LLVM\\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\\n+ // LLContexts.\\n+ LazyJITStates.clear();\\n+#endif\\n }\\n \\n std::vector<std::pair<std::string, const AST::FunctionType &>>\\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\\n return nullptr;\\n };\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ uint32_t ImportFuncCount = 0;\\n+ const AST::Module *ModulePtr = nullptr;\\n+ LLVM::Data *LLDataPtr = nullptr;\\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\\n+ nullptr;\\n+ LLVM::LazyJITState *StatePtr = nullptr;\\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\\n+\\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\\n+ ModInst = ActiveModInst.get();\\n+ ModulePtr = Mod.get();\\n+ } else {\\n+ auto ItMap = RegModMap.find(ID);\\n+ if (ItMap != RegModMap.end()) {\\n+ ModInst = RegModInsts[ItMap->second[1]].get();\\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\\n+ }\\n+ }\\n+\\n+ if (!ModInst || !ModulePtr) {\\n+ return {};\\n+ }\\n+\\n+ auto It = LazyJITStates.find(ID);\\n+ if (It != LazyJITStates.end()) {\\n+ StatePtr = &It->second;\\n+ ImportFuncCount = StatePtr->ImportFuncCount;\\n+ LLDataPtr = &StatePtr->LLData;\\n+ LLContextPtr = &StatePtr->LLContext;\\n+ } else {\\n+ spdlog::error(\\\"[lazy-jit]: failed to find JIT state for ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\\n+ }\\n+\\n+ if (FuncIdx < ImportFuncCount) {\\n+ return {};\\n+ }\\n+\\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\\n+\\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\\n+ if (!FuncResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get function instance for index {}, module ID: {}\\\"sv,\\n+ FuncIdx, ID);\\n+ return Unexpect(FuncResult.error());\\n+ }\\n+ auto *FuncInst = *FuncResult;\\n+\\n+ // If already compiled or not a Wasm function, nothing to do.\\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\\n+ return {};\\n+ }\\n+\\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\\n+ return {};\\n+ }\\n+\\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\\n+ const std::unordered_set<uint32_t> &CompiledSet =\\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\\n+\\n+ std::vector<uint32_t> BatchLocals;\\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\\n+ CompiledSet, BatchLocals);\\n+ if (BatchLocals.empty()) {\\n+ return {};\\n+ }\\n+\\n+ spdlog::debug(\\n+ \\\"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \\\"\\n+ \\\"{}, module ID: {}\\\"sv,\\n+ BatchLocals.size(), LocalFuncIdx, ID);\\n+\\n+ LLVM::Compiler Compiler(Conf);\\n+ auto ConfigResult = Compiler.checkConfigure();\\n+ if (!ConfigResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\\\"sv,\\n+ ConfigResult.error(), ID);\\n+ return Unexpect(ConfigResult.error());\\n+ }\\n+\\n+ if (!LLDataPtr->hasModule()) {\\n+ LLDataPtr->resetModule();\\n+ }\\n+ auto CompileResult = Compiler.compileFunctions(\\n+ std::move(*LLDataPtr),\\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\\n+ *ModulePtr,\\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\\n+ if (!CompileResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\\\"sv,\\n+ CompileResult.error(), ID);\\n+ return Unexpect(CompileResult.error());\\n+ }\\n+\\n+ *LLDataPtr = std::move(*CompileResult);\\n+ LLVM::JIT JIT(Conf);\\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\\n+ if (StatePtr && StatePtr->JITLib) {\\n+ JITLib = StatePtr->JITLib;\\n+ }\\n+\\n+ std::vector<uint32_t> BatchGlobal;\\n+ BatchGlobal.reserve(BatchLocals.size());\\n+ for (uint32_t L : BatchLocals) {\\n+ BatchGlobal.push_back(ImportFuncCount + L);\\n+ }\\n+\\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\\n+ if (JITLib) {\\n+ auto AddrRes = JIT.add(\\n+ *JITLib, *LLDataPtr,\\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\\n+ if (!AddrRes) {\\n+ spdlog::error(\\\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\\\"sv,\\n+ AddrRes.error(), ID);\\n+ return Unexpect(AddrRes.error());\\n+ }\\n+ ResolvedAddresses = std::move(*AddrRes);\\n+ } else {\\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\\n+ if (!LoadResult) {\\n+ spdlog::error(\\\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\\\"sv,\\n+ LoadResult.error(), ID);\\n+ return Unexpect(LoadResult.error());\\n+ }\\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\\n+ if (StatePtr) {\\n+ StatePtr->JITLib = JITLib;\\n+ }\\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\\n+ *JITLib, LLDataPtr->getPrefix(),\\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\\n+ if (!LkRes) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\\\"sv,\\n+ LkRes.error(), ID);\\n+ return Unexpect(LkRes.error());\\n+ }\\n+ ResolvedAddresses = std::move(*LkRes);\\n+ }\\n+\\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\\n+ } else {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\\n+ const uint32_t L = BatchLocals[I];\\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\\n+ if (!BatchFuncResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get function instance for index {}, module ID: {}\\\"sv,\\n+ WasmFuncIdx, ID);\\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\\n+ }\\n+\\n+ auto *BatchFuncInst = *BatchFuncResult;\\n+ if (BatchFuncInst->isWasmFunction()) {\\n+ auto CompiledSym = JITLib->createSymbol(\\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\\n+ *>(CompiledCodePtr));\\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\\n+ }\\n+ }\\n+\\n+ if (StatePtr) {\\n+ for (uint32_t L : BatchLocals) {\\n+ StatePtr->LazyCompiledFuncs.insert(L);\\n+ }\\n+ }\\n+\\n+ spdlog::debug(\\n+ \\\"Lazy compilation completed for batch of {} functions, total compiled: \\\"\\n+ \\\"{}, module ID: {}\\\"sv,\\n+ BatchLocals.size(),\\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\\n+\\n+ return {};\\n+}\\n+#endif\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\\n+ WasmEdge::LLVM::LazyJITState State;\\n+ LLVM::Compiler Compiler(Conf);\\n+ EXPECTED_TRY(\\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\\n+\\n+ auto Prefix = fmt::format(\\\"m{}_\\\"sv, Module.getID());\\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\\n+\\n+ State.LLData = std::move(LLModule.first);\\n+ State.LLContext = std::move(LLModule.second);\\n+\\n+ LLVM::JIT JIT(Conf);\\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\\n+\\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\\n+\\n+ size_t ImportFuncCount = 0;\\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\\n+ ++ImportFuncCount;\\n+ }\\n+ }\\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\\n+\\n+ return State;\\n+}\\n+#endif\\n+\\n } // namespace VM\\n } // namespace WasmEdge\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13281,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"I don't think this is valid; if the pointer returned by `Mod.get()` changes and some other module uses the same address, this `Prefix` will no longer be `unique`."},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\nindex 680d35094656..cf594a8be374 100644\n--- a/lib/vm/vm.cpp\n+++ b/lib/vm/vm.cpp\n@@ -3,7 +3,9 @@\n \n #include \"vm/vm.h\"\n \n+#include \"ast/instruction.h\"\n #include \"ast/module.h\"\n+#include \"common/enum_errcode.hpp\"\n #include \"common/errcode.h\"\n #include \"common/types.h\"\n #include \"host/wasi/wasimodule.h\"\n@@ -20,14 +22,71 @@\n #include \"host/mock/wasmedge_tensorflow_module.h\"\n #include \"host/mock/wasmedge_tensorflowlite_module.h\"\n #include \"validator/validator.h\"\n+#include <algorithm>\n+#include <cstddef>\n #include <memory>\n #include <variant>\n+#include <vector>\n+\n+#ifdef WASMEDGE_USE_LLVM\n+#include <llvm/IR/Module.h>\n+#endif\n \n namespace WasmEdge {\n namespace VM {\n \n namespace {\n \n+#ifdef WASMEDGE_USE_LLVM\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\n+ uint32_t ImportFuncCount,\n+ const std::unordered_set<uint32_t> &LazyCompiled,\n+ std::vector<uint32_t> &OutSortedLocals) {\n+ OutSortedLocals.clear();\n+ if (!ModulePtr) {\n+ return;\n+ }\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\n+\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\n+ return;\n+ }\n+\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\n+ std::vector<uint32_t> Stack;\n+ Stack.reserve(64);\n+\n+ Visited[LocalSeed] = 1;\n+ Stack.push_back(LocalSeed);\n+ OutSortedLocals.push_back(LocalSeed);\n+\n+ while (!Stack.empty()) {\n+ const uint32_t L = Stack.back();\n+ Stack.pop_back();\n+\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\n+ const auto Op = Instr.getOpCode();\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\n+ Op == OpCode::Ref__func) {\n+ const uint32_t Target = Instr.getTargetIndex();\n+ if (Target >= ImportFuncCount) {\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\n+ !LazyCompiled.count(LocalIdx)) {\n+ Visited[LocalIdx] = 1;\n+ Stack.push_back(LocalIdx);\n+ OutSortedLocals.push_back(LocalIdx);\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\n+}\n+#endif\n+\n template <typename T> struct VisitUnit {\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n \n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ spdlog::warn(\n+ \"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\"sv);\n+ ExecutorEngine.registerLazyCompilationCallback(\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\n+ return lazyCompileFunctions(ID, FuncIdx);\n+ });\n+ }\n+#endif\n+\n // Register all module instances.\n unsafeRegisterBuiltInHosts();\n unsafeRegisterPlugInHosts();\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Path));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Code));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+\n+ std::string ID = Module.getID();\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\n+ !Module.getSymbol()) {\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\n+ }\n+#endif\n+\n // Instantiate and register module.\n EXPECTED_TRY(auto ModInst,\n ExecutorEngine.registerModule(StoreRef, Module, Name));\n RegModInsts.push_back(std::move(ModInst));\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (State) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates.insert({ID, std::move(*State)});\n+ }\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ size_t InstIdx = RegModInsts.size() - 1;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ auto It = RegModMap.find(ID);\n+ if (It != RegModMap.end()) {\n+ It->second[1] = InstIdx;\n+ } else {\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\n+ }\n+ }\n+#endif\n+\n return {};\n }\n \n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\n }\n-\n if (Mod) {\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\n+ std::string ID = Mod->getID();\n+\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\n !Mod->getSymbol()) {\n #ifdef WASMEDGE_USE_LLVM\n- LLVM::Compiler Compiler(Conf);\n- Compiler.checkConfigure()\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&]() { return Compiler.compile(*Mod); })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compilation failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto LLModule) {\n- LLVM::JIT JIT(Conf);\n- return JIT.load(std::move(LLModule));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\n- \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto Module) {\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n- \"mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- });\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates[ID] = std::move(State);\n+ } else {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() { return Compiler.compile(*Mod); })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(LLModule);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Module) {\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n+ \"mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ });\n+ }\n #else\n spdlog::warn(\"JIT was requested but WasmEdge was built without LLVM, \"\n \"falling back to interpreter.\"sv);\n #endif\n }\n \n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ auto StateIt = LazyJITStates.find(ID);\n+ if (StateIt != LazyJITStates.end()) {\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ StateIt->second.ImportFuncCount =\n+ static_cast<uint32_t>(ImportFuncCount);\n+ StateIt->second.LazyCompiledFuncs.clear();\n+ }\n+ }\n+#endif\n+\n EXPECTED_TRY(ActiveModInst,\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\n+\n Stage = VMStage::Instantiated;\n return {};\n } else if (Comp) {\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\n Runtime::Instance::FunctionInstance *FuncInst =\n ModInst->findFuncExports(Func);\n \n+#ifdef WASMEDGE_USE_LLVM\n+ // lazy JIT: compile function on-demand if needed.\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\n+ bool NeedsCompile = false;\n+ uint32_t FuncIdx = UINT32_MAX;\n+ {\n+ std::shared_lock Lock(LazyJITMutex);\n+ if (FuncInst->isWasmFunction()) {\n+ NeedsCompile = true;\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\n+ FuncIdx = *Res;\n+ }\n+ }\n+ }\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\n+ !Result) {\n+ return Unexpect(Result.error());\n+ }\n+ }\n+ }\n+#endif\n+\n // Execute function.\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\n .map_error([&ModInst, &Func](auto E) {\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\n }\n StoreRef.reset();\n RegModInsts.clear();\n+ RegASTModules.clear();\n+ RegModMap.clear();\n Stat.clear();\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\n unsafeRegisterPlugInHosts();\n LoaderEngine.reset();\n Stage = VMStage::Inited;\n+#ifdef WASMEDGE_USE_LLVM\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\n+ // LLContexts.\n+ LazyJITStates.clear();\n+#endif\n }\n \n std::vector<std::pair<std::string, const AST::FunctionType &>>\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\n return nullptr;\n };\n \n+#ifdef WASMEDGE_USE_LLVM\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ uint32_t ImportFuncCount = 0;\n+ const AST::Module *ModulePtr = nullptr;\n+ LLVM::Data *LLDataPtr = nullptr;\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\n+ nullptr;\n+ LLVM::LazyJITState *StatePtr = nullptr;\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\n+\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\n+ ModInst = ActiveModInst.get();\n+ ModulePtr = Mod.get();\n+ } else {\n+ auto ItMap = RegModMap.find(ID);\n+ if (ItMap != RegModMap.end()) {\n+ ModInst = RegModInsts[ItMap->second[1]].get();\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\n+ }\n+ }\n+\n+ if (!ModInst || !ModulePtr) {\n+ return {};\n+ }\n+\n+ auto It = LazyJITStates.find(ID);\n+ if (It != LazyJITStates.end()) {\n+ StatePtr = &It->second;\n+ ImportFuncCount = StatePtr->ImportFuncCount;\n+ LLDataPtr = &StatePtr->LLData;\n+ LLContextPtr = &StatePtr->LLContext;\n+ } else {\n+ spdlog::error(\"[lazy-jit]: failed to find JIT state for ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ if (FuncIdx < ImportFuncCount) {\n+ return {};\n+ }\n+\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\n+\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\n+ if (!FuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ FuncIdx, ID);\n+ return Unexpect(FuncResult.error());\n+ }\n+ auto *FuncInst = *FuncResult;\n+\n+ // If already compiled or not a Wasm function, nothing to do.\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\n+ return {};\n+ }\n+\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\n+ return {};\n+ }\n+\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\n+ const std::unordered_set<uint32_t> &CompiledSet =\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\n+\n+ std::vector<uint32_t> BatchLocals;\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\n+ CompiledSet, BatchLocals);\n+ if (BatchLocals.empty()) {\n+ return {};\n+ }\n+\n+ spdlog::debug(\n+ \"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(), LocalFuncIdx, ID);\n+\n+ LLVM::Compiler Compiler(Conf);\n+ auto ConfigResult = Compiler.checkConfigure();\n+ if (!ConfigResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\"sv,\n+ ConfigResult.error(), ID);\n+ return Unexpect(ConfigResult.error());\n+ }\n+\n+ if (!LLDataPtr->hasModule()) {\n+ LLDataPtr->resetModule();\n+ }\n+ auto CompileResult = Compiler.compileFunctions(\n+ std::move(*LLDataPtr),\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\n+ *ModulePtr,\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\n+ if (!CompileResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\"sv,\n+ CompileResult.error(), ID);\n+ return Unexpect(CompileResult.error());\n+ }\n+\n+ *LLDataPtr = std::move(*CompileResult);\n+ LLVM::JIT JIT(Conf);\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\n+ if (StatePtr && StatePtr->JITLib) {\n+ JITLib = StatePtr->JITLib;\n+ }\n+\n+ std::vector<uint32_t> BatchGlobal;\n+ BatchGlobal.reserve(BatchLocals.size());\n+ for (uint32_t L : BatchLocals) {\n+ BatchGlobal.push_back(ImportFuncCount + L);\n+ }\n+\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\n+ if (JITLib) {\n+ auto AddrRes = JIT.add(\n+ *JITLib, *LLDataPtr,\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!AddrRes) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\"sv,\n+ AddrRes.error(), ID);\n+ return Unexpect(AddrRes.error());\n+ }\n+ ResolvedAddresses = std::move(*AddrRes);\n+ } else {\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\n+ if (!LoadResult) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\"sv,\n+ LoadResult.error(), ID);\n+ return Unexpect(LoadResult.error());\n+ }\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\n+ if (StatePtr) {\n+ StatePtr->JITLib = JITLib;\n+ }\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\n+ *JITLib, LLDataPtr->getPrefix(),\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!LkRes) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\"sv,\n+ LkRes.error(), ID);\n+ return Unexpect(LkRes.error());\n+ }\n+ ResolvedAddresses = std::move(*LkRes);\n+ }\n+\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\n+ } else {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\n+ const uint32_t L = BatchLocals[I];\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\n+ if (!BatchFuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ WasmFuncIdx, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ auto *BatchFuncInst = *BatchFuncResult;\n+ if (BatchFuncInst->isWasmFunction()) {\n+ auto CompiledSym = JITLib->createSymbol(\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\n+ *>(CompiledCodePtr));\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\n+ }\n+ }\n+\n+ if (StatePtr) {\n+ for (uint32_t L : BatchLocals) {\n+ StatePtr->LazyCompiledFuncs.insert(L);\n+ }\n+ }\n+\n+ spdlog::debug(\n+ \"Lazy compilation completed for batch of {} functions, total compiled: \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(),\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\n+\n+ return {};\n+}\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\n+ WasmEdge::LLVM::LazyJITState State;\n+ LLVM::Compiler Compiler(Conf);\n+ EXPECTED_TRY(\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\n+\n+ auto Prefix = fmt::format(\"m{}_\"sv, Module.getID());\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\n+\n+ State.LLData = std::move(LLModule.first);\n+ State.LLContext = std::move(LLModule.second);\n+\n+ LLVM::JIT JIT(Conf);\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\n+\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\n+\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\n+\n+ return State;\n+}\n+#endif\n+\n } // namespace VM\n } // namespace WasmEdge\n"},"changed_files":{"kind":"list like","value":["lib/vm/vm.cpp"],"string":"[\n \"lib/vm/vm.cpp\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"I don't think this is valid; if the pointer returned by `Mod.get()` changes and some other module uses the same address, this `Prefix` will no longer be `unique`.","path":"lib/vm/vm.cpp","hunk":"@@ -433,59 +560,147 @@ Expect<void> VM::unsafeInstantiate() {\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\n }\n-\n if (Mod) {\n if (Conf.getRuntimeConfigure().isEnableJIT() && !Mod->getSymbol()) {\n #ifdef WASMEDGE_USE_LLVM\n- LLVM::Compiler Compiler(Conf);\n- Compiler.checkConfigure()\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&]() { return Compiler.compile(*Mod); })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compilation failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto LLModule) {\n- LLVM::JIT JIT(Conf);\n- return JIT.load(std::move(LLModule));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\n- \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto Module) {\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n- \"mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- });\n+ if (Conf.getRuntimeConfigure().isEnableLazyJIT()) {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() {\n+ auto Prefix = fmt::format(\n+ \"m{:p}_\"sv, reinterpret_cast<const void *>(Mod.get()));","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\nindex 680d35094656..cf594a8be374 100644\n--- a/lib/vm/vm.cpp\n+++ b/lib/vm/vm.cpp\n@@ -3,7 +3,9 @@\n \n #include \"vm/vm.h\"\n \n+#include \"ast/instruction.h\"\n #include \"ast/module.h\"\n+#include \"common/enum_errcode.hpp\"\n #include \"common/errcode.h\"\n #include \"common/types.h\"\n #include \"host/wasi/wasimodule.h\"\n@@ -20,14 +22,71 @@\n #include \"host/mock/wasmedge_tensorflow_module.h\"\n #include \"host/mock/wasmedge_tensorflowlite_module.h\"\n #include \"validator/validator.h\"\n+#include <algorithm>\n+#include <cstddef>\n #include <memory>\n #include <variant>\n+#include <vector>\n+\n+#ifdef WASMEDGE_USE_LLVM\n+#include <llvm/IR/Module.h>\n+#endif\n \n namespace WasmEdge {\n namespace VM {\n \n namespace {\n \n+#ifdef WASMEDGE_USE_LLVM\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\n+ uint32_t ImportFuncCount,\n+ const std::unordered_set<uint32_t> &LazyCompiled,\n+ std::vector<uint32_t> &OutSortedLocals) {\n+ OutSortedLocals.clear();\n+ if (!ModulePtr) {\n+ return;\n+ }\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\n+\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\n+ return;\n+ }\n+\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\n+ std::vector<uint32_t> Stack;\n+ Stack.reserve(64);\n+\n+ Visited[LocalSeed] = 1;\n+ Stack.push_back(LocalSeed);\n+ OutSortedLocals.push_back(LocalSeed);\n+\n+ while (!Stack.empty()) {\n+ const uint32_t L = Stack.back();\n+ Stack.pop_back();\n+\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\n+ const auto Op = Instr.getOpCode();\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\n+ Op == OpCode::Ref__func) {\n+ const uint32_t Target = Instr.getTargetIndex();\n+ if (Target >= ImportFuncCount) {\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\n+ !LazyCompiled.count(LocalIdx)) {\n+ Visited[LocalIdx] = 1;\n+ Stack.push_back(LocalIdx);\n+ OutSortedLocals.push_back(LocalIdx);\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\n+}\n+#endif\n+\n template <typename T> struct VisitUnit {\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n \n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ spdlog::warn(\n+ \"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\"sv);\n+ ExecutorEngine.registerLazyCompilationCallback(\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\n+ return lazyCompileFunctions(ID, FuncIdx);\n+ });\n+ }\n+#endif\n+\n // Register all module instances.\n unsafeRegisterBuiltInHosts();\n unsafeRegisterPlugInHosts();\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Path));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Code));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+\n+ std::string ID = Module.getID();\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\n+ !Module.getSymbol()) {\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\n+ }\n+#endif\n+\n // Instantiate and register module.\n EXPECTED_TRY(auto ModInst,\n ExecutorEngine.registerModule(StoreRef, Module, Name));\n RegModInsts.push_back(std::move(ModInst));\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (State) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates.insert({ID, std::move(*State)});\n+ }\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ size_t InstIdx = RegModInsts.size() - 1;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ auto It = RegModMap.find(ID);\n+ if (It != RegModMap.end()) {\n+ It->second[1] = InstIdx;\n+ } else {\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\n+ }\n+ }\n+#endif\n+\n return {};\n }\n \n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\n }\n-\n if (Mod) {\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\n+ std::string ID = Mod->getID();\n+\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\n !Mod->getSymbol()) {\n #ifdef WASMEDGE_USE_LLVM\n- LLVM::Compiler Compiler(Conf);\n- Compiler.checkConfigure()\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&]() { return Compiler.compile(*Mod); })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compilation failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto LLModule) {\n- LLVM::JIT JIT(Conf);\n- return JIT.load(std::move(LLModule));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\n- \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto Module) {\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n- \"mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- });\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates[ID] = std::move(State);\n+ } else {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() { return Compiler.compile(*Mod); })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(LLModule);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Module) {\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n+ \"mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ });\n+ }\n #else\n spdlog::warn(\"JIT was requested but WasmEdge was built without LLVM, \"\n \"falling back to interpreter.\"sv);\n #endif\n }\n \n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ auto StateIt = LazyJITStates.find(ID);\n+ if (StateIt != LazyJITStates.end()) {\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ StateIt->second.ImportFuncCount =\n+ static_cast<uint32_t>(ImportFuncCount);\n+ StateIt->second.LazyCompiledFuncs.clear();\n+ }\n+ }\n+#endif\n+\n EXPECTED_TRY(ActiveModInst,\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\n+\n Stage = VMStage::Instantiated;\n return {};\n } else if (Comp) {\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\n Runtime::Instance::FunctionInstance *FuncInst =\n ModInst->findFuncExports(Func);\n \n+#ifdef WASMEDGE_USE_LLVM\n+ // lazy JIT: compile function on-demand if needed.\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\n+ bool NeedsCompile = false;\n+ uint32_t FuncIdx = UINT32_MAX;\n+ {\n+ std::shared_lock Lock(LazyJITMutex);\n+ if (FuncInst->isWasmFunction()) {\n+ NeedsCompile = true;\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\n+ FuncIdx = *Res;\n+ }\n+ }\n+ }\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\n+ !Result) {\n+ return Unexpect(Result.error());\n+ }\n+ }\n+ }\n+#endif\n+\n // Execute function.\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\n .map_error([&ModInst, &Func](auto E) {\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\n }\n StoreRef.reset();\n RegModInsts.clear();\n+ RegASTModules.clear();\n+ RegModMap.clear();\n Stat.clear();\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\n unsafeRegisterPlugInHosts();\n LoaderEngine.reset();\n Stage = VMStage::Inited;\n+#ifdef WASMEDGE_USE_LLVM\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\n+ // LLContexts.\n+ LazyJITStates.clear();\n+#endif\n }\n \n std::vector<std::pair<std::string, const AST::FunctionType &>>\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\n return nullptr;\n };\n \n+#ifdef WASMEDGE_USE_LLVM\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ uint32_t ImportFuncCount = 0;\n+ const AST::Module *ModulePtr = nullptr;\n+ LLVM::Data *LLDataPtr = nullptr;\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\n+ nullptr;\n+ LLVM::LazyJITState *StatePtr = nullptr;\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\n+\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\n+ ModInst = ActiveModInst.get();\n+ ModulePtr = Mod.get();\n+ } else {\n+ auto ItMap = RegModMap.find(ID);\n+ if (ItMap != RegModMap.end()) {\n+ ModInst = RegModInsts[ItMap->second[1]].get();\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\n+ }\n+ }\n+\n+ if (!ModInst || !ModulePtr) {\n+ return {};\n+ }\n+\n+ auto It = LazyJITStates.find(ID);\n+ if (It != LazyJITStates.end()) {\n+ StatePtr = &It->second;\n+ ImportFuncCount = StatePtr->ImportFuncCount;\n+ LLDataPtr = &StatePtr->LLData;\n+ LLContextPtr = &StatePtr->LLContext;\n+ } else {\n+ spdlog::error(\"[lazy-jit]: failed to find JIT state for ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ if (FuncIdx < ImportFuncCount) {\n+ return {};\n+ }\n+\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\n+\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\n+ if (!FuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ FuncIdx, ID);\n+ return Unexpect(FuncResult.error());\n+ }\n+ auto *FuncInst = *FuncResult;\n+\n+ // If already compiled or not a Wasm function, nothing to do.\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\n+ return {};\n+ }\n+\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\n+ return {};\n+ }\n+\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\n+ const std::unordered_set<uint32_t> &CompiledSet =\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\n+\n+ std::vector<uint32_t> BatchLocals;\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\n+ CompiledSet, BatchLocals);\n+ if (BatchLocals.empty()) {\n+ return {};\n+ }\n+\n+ spdlog::debug(\n+ \"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(), LocalFuncIdx, ID);\n+\n+ LLVM::Compiler Compiler(Conf);\n+ auto ConfigResult = Compiler.checkConfigure();\n+ if (!ConfigResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\"sv,\n+ ConfigResult.error(), ID);\n+ return Unexpect(ConfigResult.error());\n+ }\n+\n+ if (!LLDataPtr->hasModule()) {\n+ LLDataPtr->resetModule();\n+ }\n+ auto CompileResult = Compiler.compileFunctions(\n+ std::move(*LLDataPtr),\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\n+ *ModulePtr,\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\n+ if (!CompileResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\"sv,\n+ CompileResult.error(), ID);\n+ return Unexpect(CompileResult.error());\n+ }\n+\n+ *LLDataPtr = std::move(*CompileResult);\n+ LLVM::JIT JIT(Conf);\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\n+ if (StatePtr && StatePtr->JITLib) {\n+ JITLib = StatePtr->JITLib;\n+ }\n+\n+ std::vector<uint32_t> BatchGlobal;\n+ BatchGlobal.reserve(BatchLocals.size());\n+ for (uint32_t L : BatchLocals) {\n+ BatchGlobal.push_back(ImportFuncCount + L);\n+ }\n+\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\n+ if (JITLib) {\n+ auto AddrRes = JIT.add(\n+ *JITLib, *LLDataPtr,\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!AddrRes) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\"sv,\n+ AddrRes.error(), ID);\n+ return Unexpect(AddrRes.error());\n+ }\n+ ResolvedAddresses = std::move(*AddrRes);\n+ } else {\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\n+ if (!LoadResult) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\"sv,\n+ LoadResult.error(), ID);\n+ return Unexpect(LoadResult.error());\n+ }\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\n+ if (StatePtr) {\n+ StatePtr->JITLib = JITLib;\n+ }\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\n+ *JITLib, LLDataPtr->getPrefix(),\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!LkRes) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\"sv,\n+ LkRes.error(), ID);\n+ return Unexpect(LkRes.error());\n+ }\n+ ResolvedAddresses = std::move(*LkRes);\n+ }\n+\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\n+ } else {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\n+ const uint32_t L = BatchLocals[I];\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\n+ if (!BatchFuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ WasmFuncIdx, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ auto *BatchFuncInst = *BatchFuncResult;\n+ if (BatchFuncInst->isWasmFunction()) {\n+ auto CompiledSym = JITLib->createSymbol(\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\n+ *>(CompiledCodePtr));\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\n+ }\n+ }\n+\n+ if (StatePtr) {\n+ for (uint32_t L : BatchLocals) {\n+ StatePtr->LazyCompiledFuncs.insert(L);\n+ }\n+ }\n+\n+ spdlog::debug(\n+ \"Lazy compilation completed for batch of {} functions, total compiled: \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(),\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\n+\n+ return {};\n+}\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\n+ WasmEdge::LLVM::LazyJITState State;\n+ LLVM::Compiler Compiler(Conf);\n+ EXPECTED_TRY(\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\n+\n+ auto Prefix = fmt::format(\"m{}_\"sv, Module.getID());\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\n+\n+ State.LLData = std::move(LLModule.first);\n+ State.LLContext = std::move(LLModule.second);\n+\n+ LLVM::JIT JIT(Conf);\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\n+\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\n+\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\n+\n+ return State;\n+}\n+#endif\n+\n } // namespace VM\n } // namespace WasmEdge\n"}],"string":"[\n {\n \"comment\": \"I don't think this is valid; if the pointer returned by `Mod.get()` changes and some other module uses the same address, this `Prefix` will no longer be `unique`.\",\n \"path\": \"lib/vm/vm.cpp\",\n \"hunk\": \"@@ -433,59 +560,147 @@ Expect<void> VM::unsafeInstantiate() {\\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\\n }\\n-\\n if (Mod) {\\n if (Conf.getRuntimeConfigure().isEnableJIT() && !Mod->getSymbol()) {\\n #ifdef WASMEDGE_USE_LLVM\\n- LLVM::Compiler Compiler(Conf);\\n- Compiler.checkConfigure()\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n- \\\"interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&]() { return Compiler.compile(*Mod); })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n- \\\"interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&](auto LLModule) {\\n- LLVM::JIT JIT(Conf);\\n- return JIT.load(std::move(LLModule));\\n- })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::warn(\\n- \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&](auto Module) {\\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\\n- })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n- \\\"mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- });\\n+ if (Conf.getRuntimeConfigure().isEnableLazyJIT()) {\\n+ LLVM::Compiler Compiler(Conf);\\n+ Compiler.checkConfigure()\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&]() {\\n+ auto Prefix = fmt::format(\\n+ \\\"m{:p}_\\\"sv, reinterpret_cast<const void *>(Mod.get()));\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\\nindex 680d35094656..cf594a8be374 100644\\n--- a/lib/vm/vm.cpp\\n+++ b/lib/vm/vm.cpp\\n@@ -3,7 +3,9 @@\\n \\n #include \\\"vm/vm.h\\\"\\n \\n+#include \\\"ast/instruction.h\\\"\\n #include \\\"ast/module.h\\\"\\n+#include \\\"common/enum_errcode.hpp\\\"\\n #include \\\"common/errcode.h\\\"\\n #include \\\"common/types.h\\\"\\n #include \\\"host/wasi/wasimodule.h\\\"\\n@@ -20,14 +22,71 @@\\n #include \\\"host/mock/wasmedge_tensorflow_module.h\\\"\\n #include \\\"host/mock/wasmedge_tensorflowlite_module.h\\\"\\n #include \\\"validator/validator.h\\\"\\n+#include <algorithm>\\n+#include <cstddef>\\n #include <memory>\\n #include <variant>\\n+#include <vector>\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+#include <llvm/IR/Module.h>\\n+#endif\\n \\n namespace WasmEdge {\\n namespace VM {\\n \\n namespace {\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\\n+ uint32_t ImportFuncCount,\\n+ const std::unordered_set<uint32_t> &LazyCompiled,\\n+ std::vector<uint32_t> &OutSortedLocals) {\\n+ OutSortedLocals.clear();\\n+ if (!ModulePtr) {\\n+ return;\\n+ }\\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\\n+\\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\\n+ return;\\n+ }\\n+\\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\\n+ std::vector<uint32_t> Stack;\\n+ Stack.reserve(64);\\n+\\n+ Visited[LocalSeed] = 1;\\n+ Stack.push_back(LocalSeed);\\n+ OutSortedLocals.push_back(LocalSeed);\\n+\\n+ while (!Stack.empty()) {\\n+ const uint32_t L = Stack.back();\\n+ Stack.pop_back();\\n+\\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\\n+ const auto Op = Instr.getOpCode();\\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\\n+ Op == OpCode::Ref__func) {\\n+ const uint32_t Target = Instr.getTargetIndex();\\n+ if (Target >= ImportFuncCount) {\\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\\n+ !LazyCompiled.count(LocalIdx)) {\\n+ Visited[LocalIdx] = 1;\\n+ Stack.push_back(LocalIdx);\\n+ OutSortedLocals.push_back(LocalIdx);\\n+ }\\n+ }\\n+ }\\n+ }\\n+ }\\n+\\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\\n+}\\n+#endif\\n+\\n template <typename T> struct VisitUnit {\\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\\n unsafeLoadBuiltInHosts();\\n unsafeLoadPlugInHosts();\\n \\n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ spdlog::warn(\\n+ \\\"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\\\"sv);\\n+ ExecutorEngine.registerLazyCompilationCallback(\\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\\n+ return lazyCompileFunctions(ID, FuncIdx);\\n+ });\\n+ }\\n+#endif\\n+\\n // Register all module instances.\\n unsafeRegisterBuiltInHosts();\\n unsafeRegisterPlugInHosts();\\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n Stage = VMStage::Validated;\\n }\\n // Load module.\\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\\n- return unsafeRegisterModule(Name, *Module.get());\\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\\n+ LoaderEngine.parseModule(Path));\\n+\\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\\n+\\n+ if (!RegASTModules.empty()) {\\n+ RegASTModules.back() = Module;\\n+ }\\n+\\n+ return {};\\n }\\n \\n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n Stage = VMStage::Validated;\\n }\\n // Load module.\\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\\n- return unsafeRegisterModule(Name, *Module.get());\\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\\n+ LoaderEngine.parseModule(Code));\\n+\\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\\n+\\n+ if (!RegASTModules.empty()) {\\n+ RegASTModules.back() = Module;\\n+ }\\n+\\n+ return {};\\n }\\n \\n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n }\\n // Validate module.\\n EXPECTED_TRY(ValidatorEngine.validate(Module));\\n+\\n+ std::string ID = Module.getID();\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\\n+ !Module.getSymbol()) {\\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\\n+ }\\n+#endif\\n+\\n // Instantiate and register module.\\n EXPECTED_TRY(auto ModInst,\\n ExecutorEngine.registerModule(StoreRef, Module, Name));\\n RegModInsts.push_back(std::move(ModInst));\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (State) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ LazyJITStates.insert({ID, std::move(*State)});\\n+ }\\n+#endif\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ size_t InstIdx = RegModInsts.size() - 1;\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ auto It = RegModMap.find(ID);\\n+ if (It != RegModMap.end()) {\\n+ It->second[1] = InstIdx;\\n+ } else {\\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\\n+ }\\n+ }\\n+#endif\\n+\\n return {};\\n }\\n \\n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\\n }\\n-\\n if (Mod) {\\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\\n+ std::string ID = Mod->getID();\\n+\\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\\n !Mod->getSymbol()) {\\n #ifdef WASMEDGE_USE_LLVM\\n- LLVM::Compiler Compiler(Conf);\\n- Compiler.checkConfigure()\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n- \\\"interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&]() { return Compiler.compile(*Mod); })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n- \\\"interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&](auto LLModule) {\\n- LLVM::JIT JIT(Conf);\\n- return JIT.load(std::move(LLModule));\\n- })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::warn(\\n- \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&](auto Module) {\\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\\n- })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n- \\\"mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- });\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ LazyJITStates[ID] = std::move(State);\\n+ } else {\\n+ LLVM::Compiler Compiler(Conf);\\n+ Compiler.checkConfigure()\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&]() { return Compiler.compile(*Mod); })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto LLModule) {\\n+ LLVM::JIT JIT(Conf);\\n+ return JIT.load(LLModule);\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\n+ \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto Module) {\\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n+ \\\"mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ });\\n+ }\\n #else\\n spdlog::warn(\\\"JIT was requested but WasmEdge was built without LLVM, \\\"\\n \\\"falling back to interpreter.\\\"sv);\\n #endif\\n }\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ auto StateIt = LazyJITStates.find(ID);\\n+ if (StateIt != LazyJITStates.end()) {\\n+ size_t ImportFuncCount = 0;\\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\\n+ ++ImportFuncCount;\\n+ }\\n+ }\\n+ StateIt->second.ImportFuncCount =\\n+ static_cast<uint32_t>(ImportFuncCount);\\n+ StateIt->second.LazyCompiledFuncs.clear();\\n+ }\\n+ }\\n+#endif\\n+\\n EXPECTED_TRY(ActiveModInst,\\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\\n+\\n Stage = VMStage::Instantiated;\\n return {};\\n } else if (Comp) {\\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\\n Runtime::Instance::FunctionInstance *FuncInst =\\n ModInst->findFuncExports(Func);\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+ // lazy JIT: compile function on-demand if needed.\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\\n+ bool NeedsCompile = false;\\n+ uint32_t FuncIdx = UINT32_MAX;\\n+ {\\n+ std::shared_lock Lock(LazyJITMutex);\\n+ if (FuncInst->isWasmFunction()) {\\n+ NeedsCompile = true;\\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\\n+ FuncIdx = *Res;\\n+ }\\n+ }\\n+ }\\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\\n+ !Result) {\\n+ return Unexpect(Result.error());\\n+ }\\n+ }\\n+ }\\n+#endif\\n+\\n // Execute function.\\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\\n .map_error([&ModInst, &Func](auto E) {\\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\\n }\\n StoreRef.reset();\\n RegModInsts.clear();\\n+ RegASTModules.clear();\\n+ RegModMap.clear();\\n Stat.clear();\\n unsafeLoadBuiltInHosts();\\n unsafeLoadPlugInHosts();\\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\\n unsafeRegisterPlugInHosts();\\n LoaderEngine.reset();\\n Stage = VMStage::Inited;\\n+#ifdef WASMEDGE_USE_LLVM\\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\\n+ // LLContexts.\\n+ LazyJITStates.clear();\\n+#endif\\n }\\n \\n std::vector<std::pair<std::string, const AST::FunctionType &>>\\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\\n return nullptr;\\n };\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ uint32_t ImportFuncCount = 0;\\n+ const AST::Module *ModulePtr = nullptr;\\n+ LLVM::Data *LLDataPtr = nullptr;\\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\\n+ nullptr;\\n+ LLVM::LazyJITState *StatePtr = nullptr;\\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\\n+\\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\\n+ ModInst = ActiveModInst.get();\\n+ ModulePtr = Mod.get();\\n+ } else {\\n+ auto ItMap = RegModMap.find(ID);\\n+ if (ItMap != RegModMap.end()) {\\n+ ModInst = RegModInsts[ItMap->second[1]].get();\\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\\n+ }\\n+ }\\n+\\n+ if (!ModInst || !ModulePtr) {\\n+ return {};\\n+ }\\n+\\n+ auto It = LazyJITStates.find(ID);\\n+ if (It != LazyJITStates.end()) {\\n+ StatePtr = &It->second;\\n+ ImportFuncCount = StatePtr->ImportFuncCount;\\n+ LLDataPtr = &StatePtr->LLData;\\n+ LLContextPtr = &StatePtr->LLContext;\\n+ } else {\\n+ spdlog::error(\\\"[lazy-jit]: failed to find JIT state for ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\\n+ }\\n+\\n+ if (FuncIdx < ImportFuncCount) {\\n+ return {};\\n+ }\\n+\\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\\n+\\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\\n+ if (!FuncResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get function instance for index {}, module ID: {}\\\"sv,\\n+ FuncIdx, ID);\\n+ return Unexpect(FuncResult.error());\\n+ }\\n+ auto *FuncInst = *FuncResult;\\n+\\n+ // If already compiled or not a Wasm function, nothing to do.\\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\\n+ return {};\\n+ }\\n+\\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\\n+ return {};\\n+ }\\n+\\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\\n+ const std::unordered_set<uint32_t> &CompiledSet =\\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\\n+\\n+ std::vector<uint32_t> BatchLocals;\\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\\n+ CompiledSet, BatchLocals);\\n+ if (BatchLocals.empty()) {\\n+ return {};\\n+ }\\n+\\n+ spdlog::debug(\\n+ \\\"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \\\"\\n+ \\\"{}, module ID: {}\\\"sv,\\n+ BatchLocals.size(), LocalFuncIdx, ID);\\n+\\n+ LLVM::Compiler Compiler(Conf);\\n+ auto ConfigResult = Compiler.checkConfigure();\\n+ if (!ConfigResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\\\"sv,\\n+ ConfigResult.error(), ID);\\n+ return Unexpect(ConfigResult.error());\\n+ }\\n+\\n+ if (!LLDataPtr->hasModule()) {\\n+ LLDataPtr->resetModule();\\n+ }\\n+ auto CompileResult = Compiler.compileFunctions(\\n+ std::move(*LLDataPtr),\\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\\n+ *ModulePtr,\\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\\n+ if (!CompileResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\\\"sv,\\n+ CompileResult.error(), ID);\\n+ return Unexpect(CompileResult.error());\\n+ }\\n+\\n+ *LLDataPtr = std::move(*CompileResult);\\n+ LLVM::JIT JIT(Conf);\\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\\n+ if (StatePtr && StatePtr->JITLib) {\\n+ JITLib = StatePtr->JITLib;\\n+ }\\n+\\n+ std::vector<uint32_t> BatchGlobal;\\n+ BatchGlobal.reserve(BatchLocals.size());\\n+ for (uint32_t L : BatchLocals) {\\n+ BatchGlobal.push_back(ImportFuncCount + L);\\n+ }\\n+\\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\\n+ if (JITLib) {\\n+ auto AddrRes = JIT.add(\\n+ *JITLib, *LLDataPtr,\\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\\n+ if (!AddrRes) {\\n+ spdlog::error(\\\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\\\"sv,\\n+ AddrRes.error(), ID);\\n+ return Unexpect(AddrRes.error());\\n+ }\\n+ ResolvedAddresses = std::move(*AddrRes);\\n+ } else {\\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\\n+ if (!LoadResult) {\\n+ spdlog::error(\\\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\\\"sv,\\n+ LoadResult.error(), ID);\\n+ return Unexpect(LoadResult.error());\\n+ }\\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\\n+ if (StatePtr) {\\n+ StatePtr->JITLib = JITLib;\\n+ }\\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\\n+ *JITLib, LLDataPtr->getPrefix(),\\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\\n+ if (!LkRes) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\\\"sv,\\n+ LkRes.error(), ID);\\n+ return Unexpect(LkRes.error());\\n+ }\\n+ ResolvedAddresses = std::move(*LkRes);\\n+ }\\n+\\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\\n+ } else {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\\n+ const uint32_t L = BatchLocals[I];\\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\\n+ if (!BatchFuncResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get function instance for index {}, module ID: {}\\\"sv,\\n+ WasmFuncIdx, ID);\\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\\n+ }\\n+\\n+ auto *BatchFuncInst = *BatchFuncResult;\\n+ if (BatchFuncInst->isWasmFunction()) {\\n+ auto CompiledSym = JITLib->createSymbol(\\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\\n+ *>(CompiledCodePtr));\\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\\n+ }\\n+ }\\n+\\n+ if (StatePtr) {\\n+ for (uint32_t L : BatchLocals) {\\n+ StatePtr->LazyCompiledFuncs.insert(L);\\n+ }\\n+ }\\n+\\n+ spdlog::debug(\\n+ \\\"Lazy compilation completed for batch of {} functions, total compiled: \\\"\\n+ \\\"{}, module ID: {}\\\"sv,\\n+ BatchLocals.size(),\\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\\n+\\n+ return {};\\n+}\\n+#endif\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\\n+ WasmEdge::LLVM::LazyJITState State;\\n+ LLVM::Compiler Compiler(Conf);\\n+ EXPECTED_TRY(\\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\\n+\\n+ auto Prefix = fmt::format(\\\"m{}_\\\"sv, Module.getID());\\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\\n+\\n+ State.LLData = std::move(LLModule.first);\\n+ State.LLContext = std::move(LLModule.second);\\n+\\n+ LLVM::JIT JIT(Conf);\\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\\n+\\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\\n+\\n+ size_t ImportFuncCount = 0;\\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\\n+ ++ImportFuncCount;\\n+ }\\n+ }\\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\\n+\\n+ return State;\\n+}\\n+#endif\\n+\\n } // namespace VM\\n } // namespace WasmEdge\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13282,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"This proxy of `return_call` eliminates the benefits of tail calls, which avoid growing the program stack."},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/lib/executor/engine/proxy.cpp b/lib/executor/engine/proxy.cpp\nindex 8fba0a4f08db..819b78494515 100644\n--- a/lib/executor/engine/proxy.cpp\n+++ b/lib/executor/engine/proxy.cpp\n@@ -107,6 +107,7 @@ const Executable::IntrinsicsTable Executor::Intrinsics = {\n ENTRY(kMemAtomicWait, proxyMemAtomicWait),\n ENTRY(kTableGetFuncSymbol, proxyTableGetFuncSymbol),\n ENTRY(kRefGetFuncSymbol, proxyRefGetFuncSymbol),\n+ ENTRY(kFuncGetFuncSymbol, proxyFuncGetFuncSymbol),\n #undef ENTRY\n };\n \n@@ -123,6 +124,8 @@ Expect<void> Executor::proxyCall(Runtime::StackManager &StackMgr,\n const uint32_t FuncIdx, const ValVariant *Args,\n ValVariant *Rets) noexcept {\n const auto *FuncInst = getFuncInstByIdx(StackMgr, FuncIdx);\n+ assuming(FuncInst);\n+ EXPECTED_TRY(checkLazyCompilation(FuncInst));\n const auto &FuncType = FuncInst->getFuncType();\n const uint32_t ParamsSize =\n static_cast<uint32_t>(FuncType.getParamTypes().size());\n@@ -167,6 +170,9 @@ Expect<void> Executor::proxyCallIndirect(Runtime::StackManager &StackMgr,\n const auto &ExpDefType = **ModInst->getType(FuncTypeIdx);\n const auto *FuncInst = retrieveFuncRef(*Ref);\n assuming(FuncInst);\n+\n+ EXPECTED_TRY(checkLazyCompilation(FuncInst));\n+\n bool IsMatch = false;\n if (FuncInst->getModule()) {\n IsMatch = AST::TypeMatcher::matchType(\n@@ -208,6 +214,12 @@ Expect<void> Executor::proxyCallRef(Runtime::StackManager &StackMgr,\n const ValVariant *Args,\n ValVariant *Rets) noexcept {\n const auto *FuncInst = retrieveFuncRef(Ref);\n+ if (unlikely(!FuncInst)) {\n+ return Unexpect(ErrCode::Value::AccessNullFunc);\n+ }\n+\n+ EXPECTED_TRY(checkLazyCompilation(FuncInst));\n+\n const auto &FuncType = FuncInst->getFuncType();\n const uint32_t ParamsSize =\n static_cast<uint32_t>(FuncType.getParamTypes().size());\n@@ -641,6 +653,8 @@ Expect<void *> Executor::proxyTableGetFuncSymbol(\n return Unexpect(ErrCode::Value::IndirectCallTypeMismatch);\n }\n \n+ EXPECTED_TRY(checkLazyCompilation(FuncInst));\n+\n if (unlikely(!FuncInst->isCompiledFunction())) {\n return nullptr;\n }\n@@ -651,6 +665,27 @@ Expect<void *> Executor::proxyRefGetFuncSymbol(Runtime::StackManager &,\n const RefVariant Ref) noexcept {\n const auto *FuncInst = retrieveFuncRef(Ref);\n assuming(FuncInst);\n+ if (likely(FuncInst->isCompiledFunction())) {\n+ return FuncInst->getSymbol().get();\n+ }\n+ EXPECTED_TRY(checkLazyCompilation(FuncInst));\n+\n+ if (unlikely(!FuncInst->isCompiledFunction())) {\n+ return nullptr;\n+ }\n+ return FuncInst->getSymbol().get();\n+}\n+\n+Expect<void *>\n+Executor::proxyFuncGetFuncSymbol(Runtime::StackManager &StackMgr,\n+ const uint32_t FuncIdx) noexcept {\n+ const auto *FuncInst = getFuncInstByIdx(StackMgr, FuncIdx);\n+ assuming(FuncInst);\n+ if (likely(FuncInst->isCompiledFunction())) {\n+ return FuncInst->getSymbol().get();\n+ }\n+ EXPECTED_TRY(checkLazyCompilation(FuncInst));\n+\n if (unlikely(!FuncInst->isCompiledFunction())) {\n return nullptr;\n }\n"},"changed_files":{"kind":"list like","value":["lib/executor/engine/proxy.cpp"],"string":"[\n \"lib/executor/engine/proxy.cpp\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"This proxy of `return_call` eliminates the benefits of tail calls, which avoid growing the program stack.","path":"lib/executor/engine/proxy.cpp","hunk":"@@ -143,6 +148,128 @@ Expect<void> Executor::proxyCall(Runtime::StackManager &StackMgr,\n return {};\n }\n \n+Expect<void> Executor::proxyReturnCall(Runtime::StackManager &StackMgr,","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/lib/executor/engine/proxy.cpp b/lib/executor/engine/proxy.cpp\nindex 8fba0a4f08db..819b78494515 100644\n--- a/lib/executor/engine/proxy.cpp\n+++ b/lib/executor/engine/proxy.cpp\n@@ -107,6 +107,7 @@ const Executable::IntrinsicsTable Executor::Intrinsics = {\n ENTRY(kMemAtomicWait, proxyMemAtomicWait),\n ENTRY(kTableGetFuncSymbol, proxyTableGetFuncSymbol),\n ENTRY(kRefGetFuncSymbol, proxyRefGetFuncSymbol),\n+ ENTRY(kFuncGetFuncSymbol, proxyFuncGetFuncSymbol),\n #undef ENTRY\n };\n \n@@ -123,6 +124,8 @@ Expect<void> Executor::proxyCall(Runtime::StackManager &StackMgr,\n const uint32_t FuncIdx, const ValVariant *Args,\n ValVariant *Rets) noexcept {\n const auto *FuncInst = getFuncInstByIdx(StackMgr, FuncIdx);\n+ assuming(FuncInst);\n+ EXPECTED_TRY(checkLazyCompilation(FuncInst));\n const auto &FuncType = FuncInst->getFuncType();\n const uint32_t ParamsSize =\n static_cast<uint32_t>(FuncType.getParamTypes().size());\n@@ -167,6 +170,9 @@ Expect<void> Executor::proxyCallIndirect(Runtime::StackManager &StackMgr,\n const auto &ExpDefType = **ModInst->getType(FuncTypeIdx);\n const auto *FuncInst = retrieveFuncRef(*Ref);\n assuming(FuncInst);\n+\n+ EXPECTED_TRY(checkLazyCompilation(FuncInst));\n+\n bool IsMatch = false;\n if (FuncInst->getModule()) {\n IsMatch = AST::TypeMatcher::matchType(\n@@ -208,6 +214,12 @@ Expect<void> Executor::proxyCallRef(Runtime::StackManager &StackMgr,\n const ValVariant *Args,\n ValVariant *Rets) noexcept {\n const auto *FuncInst = retrieveFuncRef(Ref);\n+ if (unlikely(!FuncInst)) {\n+ return Unexpect(ErrCode::Value::AccessNullFunc);\n+ }\n+\n+ EXPECTED_TRY(checkLazyCompilation(FuncInst));\n+\n const auto &FuncType = FuncInst->getFuncType();\n const uint32_t ParamsSize =\n static_cast<uint32_t>(FuncType.getParamTypes().size());\n@@ -641,6 +653,8 @@ Expect<void *> Executor::proxyTableGetFuncSymbol(\n return Unexpect(ErrCode::Value::IndirectCallTypeMismatch);\n }\n \n+ EXPECTED_TRY(checkLazyCompilation(FuncInst));\n+\n if (unlikely(!FuncInst->isCompiledFunction())) {\n return nullptr;\n }\n@@ -651,6 +665,27 @@ Expect<void *> Executor::proxyRefGetFuncSymbol(Runtime::StackManager &,\n const RefVariant Ref) noexcept {\n const auto *FuncInst = retrieveFuncRef(Ref);\n assuming(FuncInst);\n+ if (likely(FuncInst->isCompiledFunction())) {\n+ return FuncInst->getSymbol().get();\n+ }\n+ EXPECTED_TRY(checkLazyCompilation(FuncInst));\n+\n+ if (unlikely(!FuncInst->isCompiledFunction())) {\n+ return nullptr;\n+ }\n+ return FuncInst->getSymbol().get();\n+}\n+\n+Expect<void *>\n+Executor::proxyFuncGetFuncSymbol(Runtime::StackManager &StackMgr,\n+ const uint32_t FuncIdx) noexcept {\n+ const auto *FuncInst = getFuncInstByIdx(StackMgr, FuncIdx);\n+ assuming(FuncInst);\n+ if (likely(FuncInst->isCompiledFunction())) {\n+ return FuncInst->getSymbol().get();\n+ }\n+ EXPECTED_TRY(checkLazyCompilation(FuncInst));\n+\n if (unlikely(!FuncInst->isCompiledFunction())) {\n return nullptr;\n }\n"}],"string":"[\n {\n \"comment\": \"This proxy of `return_call` eliminates the benefits of tail calls, which avoid growing the program stack.\",\n \"path\": \"lib/executor/engine/proxy.cpp\",\n \"hunk\": \"@@ -143,6 +148,128 @@ Expect<void> Executor::proxyCall(Runtime::StackManager &StackMgr,\\n return {};\\n }\\n \\n+Expect<void> Executor::proxyReturnCall(Runtime::StackManager &StackMgr,\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/lib/executor/engine/proxy.cpp b/lib/executor/engine/proxy.cpp\\nindex 8fba0a4f08db..819b78494515 100644\\n--- a/lib/executor/engine/proxy.cpp\\n+++ b/lib/executor/engine/proxy.cpp\\n@@ -107,6 +107,7 @@ const Executable::IntrinsicsTable Executor::Intrinsics = {\\n ENTRY(kMemAtomicWait, proxyMemAtomicWait),\\n ENTRY(kTableGetFuncSymbol, proxyTableGetFuncSymbol),\\n ENTRY(kRefGetFuncSymbol, proxyRefGetFuncSymbol),\\n+ ENTRY(kFuncGetFuncSymbol, proxyFuncGetFuncSymbol),\\n #undef ENTRY\\n };\\n \\n@@ -123,6 +124,8 @@ Expect<void> Executor::proxyCall(Runtime::StackManager &StackMgr,\\n const uint32_t FuncIdx, const ValVariant *Args,\\n ValVariant *Rets) noexcept {\\n const auto *FuncInst = getFuncInstByIdx(StackMgr, FuncIdx);\\n+ assuming(FuncInst);\\n+ EXPECTED_TRY(checkLazyCompilation(FuncInst));\\n const auto &FuncType = FuncInst->getFuncType();\\n const uint32_t ParamsSize =\\n static_cast<uint32_t>(FuncType.getParamTypes().size());\\n@@ -167,6 +170,9 @@ Expect<void> Executor::proxyCallIndirect(Runtime::StackManager &StackMgr,\\n const auto &ExpDefType = **ModInst->getType(FuncTypeIdx);\\n const auto *FuncInst = retrieveFuncRef(*Ref);\\n assuming(FuncInst);\\n+\\n+ EXPECTED_TRY(checkLazyCompilation(FuncInst));\\n+\\n bool IsMatch = false;\\n if (FuncInst->getModule()) {\\n IsMatch = AST::TypeMatcher::matchType(\\n@@ -208,6 +214,12 @@ Expect<void> Executor::proxyCallRef(Runtime::StackManager &StackMgr,\\n const ValVariant *Args,\\n ValVariant *Rets) noexcept {\\n const auto *FuncInst = retrieveFuncRef(Ref);\\n+ if (unlikely(!FuncInst)) {\\n+ return Unexpect(ErrCode::Value::AccessNullFunc);\\n+ }\\n+\\n+ EXPECTED_TRY(checkLazyCompilation(FuncInst));\\n+\\n const auto &FuncType = FuncInst->getFuncType();\\n const uint32_t ParamsSize =\\n static_cast<uint32_t>(FuncType.getParamTypes().size());\\n@@ -641,6 +653,8 @@ Expect<void *> Executor::proxyTableGetFuncSymbol(\\n return Unexpect(ErrCode::Value::IndirectCallTypeMismatch);\\n }\\n \\n+ EXPECTED_TRY(checkLazyCompilation(FuncInst));\\n+\\n if (unlikely(!FuncInst->isCompiledFunction())) {\\n return nullptr;\\n }\\n@@ -651,6 +665,27 @@ Expect<void *> Executor::proxyRefGetFuncSymbol(Runtime::StackManager &,\\n const RefVariant Ref) noexcept {\\n const auto *FuncInst = retrieveFuncRef(Ref);\\n assuming(FuncInst);\\n+ if (likely(FuncInst->isCompiledFunction())) {\\n+ return FuncInst->getSymbol().get();\\n+ }\\n+ EXPECTED_TRY(checkLazyCompilation(FuncInst));\\n+\\n+ if (unlikely(!FuncInst->isCompiledFunction())) {\\n+ return nullptr;\\n+ }\\n+ return FuncInst->getSymbol().get();\\n+}\\n+\\n+Expect<void *>\\n+Executor::proxyFuncGetFuncSymbol(Runtime::StackManager &StackMgr,\\n+ const uint32_t FuncIdx) noexcept {\\n+ const auto *FuncInst = getFuncInstByIdx(StackMgr, FuncIdx);\\n+ assuming(FuncInst);\\n+ if (likely(FuncInst->isCompiledFunction())) {\\n+ return FuncInst->getSymbol().get();\\n+ }\\n+ EXPECTED_TRY(checkLazyCompilation(FuncInst));\\n+\\n if (unlikely(!FuncInst->isCompiledFunction())) {\\n return nullptr;\\n }\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13283,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"Why do we need this?"},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/cmake/Helper.cmake b/cmake/Helper.cmake\nindex cf2df52c54eb..26c6e8fb6f3d 100644\n--- a/cmake/Helper.cmake\n+++ b/cmake/Helper.cmake\n@@ -33,6 +33,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES \"MSVC\")\n /wd4819 # file contains a character not in current code page\n /wd4127 # conditional expression is constant\n /wd4611 # interaction between '_setjmp' and C++ object destruction is non-portable\n+ /bigobj # for large object files\n )\n else()\n list(APPEND WASMEDGE_CFLAGS\n@@ -225,7 +226,7 @@ if((WASMEDGE_LINK_LLVM_STATIC OR WASMEDGE_BUILD_STATIC_LIB) AND WASMEDGE_USE_LLV\n endif()\n execute_process(\n COMMAND ${LLVM_BINARY_DIR}/bin/llvm-config --libs --link-static\n- core lto native nativecodegen option passes support orcjit transformutils all-targets\n+ core linker lto native nativecodegen option passes support orcjit transformutils all-targets\n OUTPUT_VARIABLE WASMEDGE_LLVM_LINK_LIBS_NAME\n )\n string(REPLACE \"-l\" \"\" WASMEDGE_LLVM_LINK_LIBS_NAME \"${WASMEDGE_LLVM_LINK_LIBS_NAME}\")\n"},"changed_files":{"kind":"list like","value":["cmake/Helper.cmake"],"string":"[\n \"cmake/Helper.cmake\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"Why do we need this?","path":"cmake/Helper.cmake","hunk":"@@ -33,6 +33,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES \"MSVC\")\n /wd4819 # file contains a character not in current code page\n /wd4127 # conditional expression is constant\n /wd4611 # interaction between '_setjmp' and C++ object destruction is non-portable\n+ /bigobj # for large object files","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/cmake/Helper.cmake b/cmake/Helper.cmake\nindex cf2df52c54eb..26c6e8fb6f3d 100644\n--- a/cmake/Helper.cmake\n+++ b/cmake/Helper.cmake\n@@ -33,6 +33,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES \"MSVC\")\n /wd4819 # file contains a character not in current code page\n /wd4127 # conditional expression is constant\n /wd4611 # interaction between '_setjmp' and C++ object destruction is non-portable\n+ /bigobj # for large object files\n )\n else()\n list(APPEND WASMEDGE_CFLAGS\n@@ -225,7 +226,7 @@ if((WASMEDGE_LINK_LLVM_STATIC OR WASMEDGE_BUILD_STATIC_LIB) AND WASMEDGE_USE_LLV\n endif()\n execute_process(\n COMMAND ${LLVM_BINARY_DIR}/bin/llvm-config --libs --link-static\n- core lto native nativecodegen option passes support orcjit transformutils all-targets\n+ core linker lto native nativecodegen option passes support orcjit transformutils all-targets\n OUTPUT_VARIABLE WASMEDGE_LLVM_LINK_LIBS_NAME\n )\n string(REPLACE \"-l\" \"\" WASMEDGE_LLVM_LINK_LIBS_NAME \"${WASMEDGE_LLVM_LINK_LIBS_NAME}\")\n"}],"string":"[\n {\n \"comment\": \"Why do we need this?\",\n \"path\": \"cmake/Helper.cmake\",\n \"hunk\": \"@@ -33,6 +33,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES \\\"MSVC\\\")\\n /wd4819 # file contains a character not in current code page\\n /wd4127 # conditional expression is constant\\n /wd4611 # interaction between '_setjmp' and C++ object destruction is non-portable\\n+ /bigobj # for large object files\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/cmake/Helper.cmake b/cmake/Helper.cmake\\nindex cf2df52c54eb..26c6e8fb6f3d 100644\\n--- a/cmake/Helper.cmake\\n+++ b/cmake/Helper.cmake\\n@@ -33,6 +33,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES \\\"MSVC\\\")\\n /wd4819 # file contains a character not in current code page\\n /wd4127 # conditional expression is constant\\n /wd4611 # interaction between '_setjmp' and C++ object destruction is non-portable\\n+ /bigobj # for large object files\\n )\\n else()\\n list(APPEND WASMEDGE_CFLAGS\\n@@ -225,7 +226,7 @@ if((WASMEDGE_LINK_LLVM_STATIC OR WASMEDGE_BUILD_STATIC_LIB) AND WASMEDGE_USE_LLV\\n endif()\\n execute_process(\\n COMMAND ${LLVM_BINARY_DIR}/bin/llvm-config --libs --link-static\\n- core lto native nativecodegen option passes support orcjit transformutils all-targets\\n+ core linker lto native nativecodegen option passes support orcjit transformutils all-targets\\n OUTPUT_VARIABLE WASMEDGE_LLVM_LINK_LIBS_NAME\\n )\\n string(REPLACE \\\"-l\\\" \\\"\\\" WASMEDGE_LLVM_LINK_LIBS_NAME \\\"${WASMEDGE_LLVM_LINK_LIBS_NAME}\\\")\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13284,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"This appears to be debug information. Remove it if it is no longer needed."},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp\nindex 39da94d9a9ac..330e245f51c3 100644\n--- a/lib/llvm/compiler.cpp\n+++ b/lib/llvm/compiler.cpp\n@@ -9,6 +9,7 @@\n #include \"common/spdlog.h\"\n #include \"data.h\"\n #include \"llvm.h\"\n+#include \"spdlog/spdlog.h\"\n #include \"system/allocator.h\"\n \n #include <algorithm>\n@@ -16,6 +17,7 @@\n #include <cinttypes>\n #include <cstdint>\n #include <cstdlib>\n+#include <functional>\n #include <limits>\n #include <memory>\n #include <numeric>\n@@ -28,6 +30,16 @@ using namespace std::literals;\n \n namespace {\n \n+struct RAIICleanup {\n+ RAIICleanup(LLVM::Compiler::CompileContext *&Context,\n+ LLVM::Compiler::CompileContext *NewContext)\n+ : Context(Context) {\n+ Context = NewContext;\n+ }\n+ ~RAIICleanup() { Context = nullptr; }\n+ LLVM::Compiler::CompileContext *&Context;\n+};\n+\n static bool\n isVoidReturn(WasmEdge::Span<const WasmEdge::ValType> ValTypes) noexcept;\n static LLVM::Type toLLVMType(LLVM::Context LLContext,\n@@ -128,7 +140,7 @@ static inline LLVMCodeGenOptLevel toLLVMCodeGenLevel(\n \n struct LLVM::Compiler::CompileContext {\n LLVM::Context LLContext;\n- LLVM::Module &LLModule;\n+ std::reference_wrapper<LLVM::Module> LLModule;\n LLVM::Attribute Cold;\n LLVM::Attribute NoAlias;\n LLVM::Attribute NoInline;\n@@ -202,13 +214,16 @@ struct LLVM::Compiler::CompileContext {\n std::vector<std::tuple<uint32_t, LLVM::FunctionCallee,\n const WasmEdge::AST::CodeSegment *>>\n Functions;\n+ std::vector<LLVM::Value> LazyJITCacheVars;\n+ uint32_t ImportCount = 0;\n std::vector<LLVM::Type> MemoryAddrTypes;\n std::vector<LLVM::Type> TableAddrTypes;\n std::vector<LLVM::Type> Globals;\n+ std::string Prefix;\n LLVM::Value IntrinsicsTable;\n LLVM::FunctionCallee Trap;\n- CompileContext(LLVM::Context C, LLVM::Module &M,\n- bool IsGenericBinary) noexcept\n+ CompileContext(LLVM::Context C, LLVM::Module &M, bool IsGenericBinary,\n+ std::string_view P = \"\"sv) noexcept\n : LLContext(C), LLModule(M),\n Cold(LLVM::Attribute::createEnum(C, LLVM::Core::Cold, 0)),\n NoAlias(LLVM::Attribute::createEnum(C, LLVM::Core::NoAlias, 0)),\n@@ -256,14 +271,14 @@ struct LLVM::Compiler::CompileContext {\n })),\n ExecCtxPtrTy(ExecCtxTy.getPointerTo()),\n IntrinsicsTableTy(LLVM::Type::getArrayType(\n- Int8PtrTy,\n+ Int8Ty.getPointerTo(),\n static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax))),\n- IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()),\n- IntrinsicsTable(LLModule.addGlobal(IntrinsicsTablePtrTy, true,\n- LLVMExternalLinkage, LLVM::Value(),\n- \"intrinsics\")) {\n+ IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()), Prefix(P),\n+ IntrinsicsTable(LLModule.get().addGlobal(\n+ IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\n+ fmt::format(\"{}intrinsics\"sv, Prefix).c_str())) {\n Trap.Ty = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n- Trap.Fn = LLModule.addFunction(Trap.Ty, LLVMPrivateLinkage, \"trap\");\n+ Trap.Fn = LLModule.get().addFunction(Trap.Ty, LLVMPrivateLinkage, \"trap\");\n Trap.Fn.setDSOLocal(true);\n Trap.Fn.addFnAttr(NoStackArgProbe);\n Trap.Fn.addFnAttr(StrictFP);\n@@ -272,9 +287,10 @@ struct LLVM::Compiler::CompileContext {\n Trap.Fn.addFnAttr(Cold);\n Trap.Fn.addFnAttr(NoInline);\n \n- LLModule.addGlobal(Int32Ty, true, LLVMExternalLinkage,\n- LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\n- \"version\");\n+ LLModule.get().addGlobal(\n+ Int32Ty, true, LLVMExternalLinkage,\n+ LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\n+ fmt::format(\"{}version\"sv, Prefix).c_str());\n \n if (!IsGenericBinary) {\n SubtargetFeatures = LLVM::getHostCPUFeatures();\n@@ -313,18 +329,7 @@ struct LLVM::Compiler::CompileContext {\n }\n }\n \n- {\n- // create trap\n- LLVM::Builder Builder(LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(LLContext, Trap.Fn, \"entry\"));\n- auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n- auto CallTrap = Builder.createCall(\n- getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\n- {Trap.Fn.getFirstParam()});\n- CallTrap.addCallSiteAttribute(NoReturn);\n- Builder.createUnreachable();\n- }\n+ compileTrap();\n }\n LLVM::Value getMemory(LLVM::Builder &Builder, LLVM::Value ExecCtx,\n uint32_t Index) noexcept {\n@@ -394,6 +399,17 @@ struct LLVM::Compiler::CompileContext {\n auto Ptr = Builder.createBitCast(VPtr, PtrPtrTy);\n return {Ty, Builder.createLoad(PtrTy, Ptr)};\n }\n+ void compileTrap() noexcept {\n+ LLVM::Builder Builder(LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(LLContext, Trap.Fn, \"entry\"));\n+ auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n+ auto CallTrap = Builder.createCall(\n+ getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\n+ {Trap.Fn.getFirstParam()});\n+ CallTrap.addCallSiteAttribute(NoReturn);\n+ Builder.createUnreachable();\n+ }\n std::pair<std::vector<ValType>, std::vector<ValType>>\n resolveBlockType(const BlockType &BType) const noexcept {\n using VecT = std::vector<ValType>;\n@@ -544,9 +560,10 @@ class FunctionCompiler {\n FunctionCompiler(LLVM::Compiler::CompileContext &Context,\n LLVM::FunctionCallee F, Span<const ValType> Locals,\n bool Interruptible, bool InstructionCounting,\n- bool GasMeasuring) noexcept\n+ bool GasMeasuring, bool IsLazyJIT) noexcept\n : Context(Context), LLContext(Context.LLContext),\n- Interruptible(Interruptible), F(F), Builder(LLContext) {\n+ Interruptible(Interruptible), IsLazyJIT(IsLazyJIT), F(F),\n+ Builder(LLContext) {\n if (F.Fn) {\n Builder.positionAtEnd(LLVM::BasicBlock::create(LLContext, F.Fn, \"entry\"));\n ExecCtx = Builder.createLoad(Context.ExecCtxTy, F.Fn.getFirstParam());\n@@ -4267,7 +4284,63 @@ class FunctionCompiler {\n Args[J + 1] = stackPop();\n }\n \n- auto Ret = Builder.createCall(Function, Args);\n+ LLVM::Value Ret;\n+ if (IsLazyJIT) {\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\n+ if (IsImport) {\n+ Ret = Builder.createCall(Function, Args);\n+ } else {\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\n+\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\n+ }\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\n+ if (!CacheVar) {\n+ CacheVar = Context.LLModule.get().addGlobal(\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \"\");\n+ }\n+\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.check\");\n+ auto ResolveBB =\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.resolve\");\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.call\");\n+\n+ Builder.createBr(CheckBB);\n+ Builder.positionAtEnd(CheckBB);\n+\n+ auto CachedPtr =\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\n+ CachedPtr.setAlignment(8);\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\n+ auto IsNull = Builder.createIsNull(CachedPtr);\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\n+\n+ Builder.positionAtEnd(ResolveBB);\n+ auto FPtr = Builder.createCall(\n+ Context.getIntrinsic(\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\n+ {Context.Int32Ty}, false)),\n+ {LLContext.getInt32(FuncIndex)});\n+ auto Store = Builder.createStore(FPtr, CacheVar);\n+ Store.setAlignment(8);\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\n+ Builder.createBr(CallBB);\n+\n+ Builder.positionAtEnd(CallBB);\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\n+\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\n+ }\n+ } else {\n+ Ret = Builder.createCall(Function, Args);\n+ }\n+\n auto Ty = Ret.getType();\n if (Ty.isVoidTy()) {\n // nothing to do\n@@ -4387,7 +4460,64 @@ class FunctionCompiler {\n Args[J + 1] = stackPop();\n }\n \n- auto Ret = Builder.createCall(Function, Args);\n+ LLVM::Value Ret;\n+ if (IsLazyJIT) {\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\n+ if (IsImport) {\n+ Ret = Builder.createCall(Function, Args);\n+ } else {\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\n+\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\n+ }\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\n+ if (!CacheVar) {\n+ CacheVar = Context.LLModule.get().addGlobal(\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \"\");\n+ }\n+\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.check\");\n+ auto ResolveBB =\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.resolve\");\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.call\");\n+\n+ Builder.createBr(CheckBB);\n+ Builder.positionAtEnd(CheckBB);\n+\n+ auto CachedPtr =\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\n+ CachedPtr.setAlignment(8);\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\n+ auto IsNull = Builder.createIsNull(CachedPtr);\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\n+\n+ Builder.positionAtEnd(ResolveBB);\n+ auto FPtr = Builder.createCall(\n+ Context.getIntrinsic(\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\n+ {Context.Int32Ty}, false)),\n+ {LLContext.getInt32(FuncIndex)});\n+ auto Store = Builder.createStore(FPtr, CacheVar);\n+ Store.setAlignment(8);\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\n+ Builder.createBr(CallBB);\n+\n+ Builder.positionAtEnd(CallBB);\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\n+\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\n+ }\n+ } else {\n+ Ret = Builder.createCall(Function, Args);\n+ }\n+\n+ Ret.setMustTailCall();\n auto Ty = Ret.getType();\n if (Ty.isVoidTy()) {\n Builder.createRetVoid();\n@@ -4432,6 +4562,7 @@ class FunctionCompiler {\n \n auto FPtrRet =\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\n+ FPtrRet.setMustTailCall();\n if (RetSize == 0) {\n Builder.createRetVoid();\n } else {\n@@ -4608,6 +4739,7 @@ class FunctionCompiler {\n \n auto FPtrRet =\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\n+ FPtrRet.setMustTailCall();\n if (RetSize == 0) {\n Builder.createRetVoid();\n } else {\n@@ -5854,6 +5986,7 @@ class FunctionCompiler {\n Control &operator=(const Control &) = default;\n Control &operator=(Control &&) = default;\n };\n+ bool IsLazyJIT;\n std::vector<Control> ControlStack;\n LLVM::FunctionCallee F;\n LLVM::Value ExecCtx;\n@@ -5894,6 +6027,84 @@ Expect<void> Compiler::checkConfigure() noexcept {\n return {};\n }\n \n+Expect<void> Compiler::optimize(LLVM::Module &LLModule,\n+ LLVM::TargetMachine &TM) noexcept {\n+ spdlog::info(\"optimize start\"sv);\n+ auto Triple = LLModule.getTarget();\n+ auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\n+ if (ErrorMessage) {\n+ spdlog::error(\"getFromTriple failed:{}\"sv, ErrorMessage.string_view());\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ std::string CPUName;\n+#if defined(__riscv) && __riscv_xlen == 64\n+ CPUName = \"generic-rv64\"s;\n+#else\n+ if (!Conf.getCompilerConfigure().isGenericBinary()) {\n+ CPUName = LLVM::getHostCPUName().string_view();\n+ } else {\n+ CPUName = \"generic\"s;\n+ }\n+#endif\n+\n+ // On RISC-V we use generic-rv64 as the CPU, so also use default\n+ // features; host features under QEMU can be inconsistent (e.g.\n+ // zvl*b without v) which LLVM >= 20 rejects.\n+ TM = LLVM::TargetMachine::create(\n+ TheTarget, Triple, CPUName.c_str(),\n+#if defined(__riscv) && __riscv_xlen == 64\n+ \"\",\n+#else\n+ LLVM::getHostCPUFeatures().unwrap(),\n+#endif\n+ toLLVMCodeGenLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n+ LLVMRelocPIC, LLVMCodeModelDefault);\n+\n+#if LLVM_VERSION_MAJOR >= 13\n+ auto PBO = LLVM::PassBuilderOptions::create();\n+ if (auto Error = PBO.runPasses(\n+ LLModule,\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n+ TM)) {\n+ spdlog::error(\"{}\"sv, Error.message().string_view());\n+ }\n+#else\n+ auto FP = LLVM::PassManager::createForModule(LLModule);\n+ auto MP = LLVM::PassManager::create();\n+\n+ TM.addAnalysisPasses(MP);\n+ TM.addAnalysisPasses(FP);\n+ {\n+ auto PMB = LLVM::PassManagerBuilder::create();\n+ auto [OptLevel, SizeLevel] =\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\n+ PMB.setOptLevel(OptLevel);\n+ PMB.setSizeLevel(SizeLevel);\n+ PMB.populateFunctionPassManager(FP);\n+ PMB.populateModulePassManager(MP);\n+ }\n+ switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\n+ case CompilerConfigure::OptimizationLevel::O0:\n+ case CompilerConfigure::OptimizationLevel::O1:\n+ FP.addTailCallEliminationPass();\n+ break;\n+ default:\n+ break;\n+ }\n+\n+ FP.initializeFunctionPassManager();\n+ for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\n+ FP.runFunctionPassManager(Fn);\n+ }\n+ FP.finalizeFunctionPassManager();\n+ MP.runPassManager(LLModule);\n+#endif\n+\n+ spdlog::info(\"optimize done\"sv);\n+ return {};\n+}\n+\n Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n // Check that the module is validated.\n if (unlikely(!Module.getIsValidated())) {\n@@ -5913,15 +6124,7 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n \n CompileContext NewContext(LLContext, LLModule,\n Conf.getCompilerConfigure().isGenericBinary());\n- struct RAIICleanup {\n- RAIICleanup(CompileContext *&Context, CompileContext &NewContext)\n- : Context(Context) {\n- Context = &NewContext;\n- }\n- ~RAIICleanup() { Context = nullptr; }\n- CompileContext *&Context;\n- };\n- RAIICleanup Cleanup(Context, NewContext);\n+ RAIICleanup Cleanup(Context, &NewContext);\n \n // Compile Function Types\n compile(Module.getTypeSection());\n@@ -5942,81 +6145,8 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n spdlog::info(\"verify start\"sv);\n LLModule.verify(LLVMPrintMessageAction);\n \n- spdlog::info(\"optimize start\"sv);\n auto &TM = D.extract().TM;\n- {\n- auto Triple = LLModule.getTarget();\n- auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\n- if (ErrorMessage) {\n- spdlog::error(\"getFromTriple failed:{}\"sv, ErrorMessage.string_view());\n- return Unexpect(ErrCode::Value::IllegalPath);\n- } else {\n- std::string CPUName;\n-#if defined(__riscv) && __riscv_xlen == 64\n- CPUName = \"generic-rv64\"s;\n-#else\n- if (!Conf.getCompilerConfigure().isGenericBinary()) {\n- CPUName = LLVM::getHostCPUName().string_view();\n- } else {\n- CPUName = \"generic\"s;\n- }\n-#endif\n-\n- // On RISC-V we use generic-rv64 as the CPU, so also use default\n- // features; host features under QEMU can be inconsistent (e.g.\n- // zvl*b without v) which LLVM >= 20 rejects.\n- TM = LLVM::TargetMachine::create(\n- TheTarget, Triple, CPUName.c_str(),\n-#if defined(__riscv) && __riscv_xlen == 64\n- \"\",\n-#else\n- LLVM::getHostCPUFeatures().unwrap(),\n-#endif\n- toLLVMCodeGenLevel(\n- Conf.getCompilerConfigure().getOptimizationLevel()),\n- LLVMRelocPIC, LLVMCodeModelDefault);\n- }\n-\n-#if LLVM_VERSION_MAJOR >= 13\n- auto PBO = LLVM::PassBuilderOptions::create();\n- if (auto Error = PBO.runPasses(\n- LLModule,\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n- TM)) {\n- spdlog::error(\"{}\"sv, Error.message().string_view());\n- }\n-#else\n- auto FP = LLVM::PassManager::createForModule(LLModule);\n- auto MP = LLVM::PassManager::create();\n-\n- TM.addAnalysisPasses(MP);\n- TM.addAnalysisPasses(FP);\n- {\n- auto PMB = LLVM::PassManagerBuilder::create();\n- auto [OptLevel, SizeLevel] =\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\n- PMB.setOptLevel(OptLevel);\n- PMB.setSizeLevel(SizeLevel);\n- PMB.populateFunctionPassManager(FP);\n- PMB.populateModulePassManager(MP);\n- }\n- switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\n- case CompilerConfigure::OptimizationLevel::O0:\n- case CompilerConfigure::OptimizationLevel::O1:\n- FP.addTailCallEliminationPass();\n- break;\n- default:\n- break;\n- }\n-\n- FP.initializeFunctionPassManager();\n- for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\n- FP.runFunctionPassManager(Fn);\n- }\n- FP.finalizeFunctionPassManager();\n- MP.runPassManager(LLModule);\n-#endif\n- }\n+ EXPECTED_TRY(optimize(LLModule, TM));\n \n // Set initializer for constant value\n if (auto IntrinsicsTable = LLModule.getNamedGlobal(\"intrinsics\")) {\n@@ -6031,12 +6161,11 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n LLVM::Value::getConstNull(IntrinsicsTableTy), \"intrinsics\");\n }\n-\n- spdlog::info(\"optimize done\"sv);\n return Expect<Data>{std::move(D)};\n }\n \n-void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n+void Compiler::compile(const AST::TypeSection &TypeSec,\n+ bool DeclarationsOnly) noexcept {\n auto WrapperTy =\n LLVM::Type::getFunctionType(Context->VoidTy,\n {Context->ExecCtxPtrTy, Context->Int8PtrTy,\n@@ -6050,10 +6179,25 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n Context->CompositeTypes.reserve(Size);\n Context->FunctionWrappers.reserve(Size);\n \n+ auto SetFuncAttributes = [&](auto FDecl) {\n+ FDecl.setVisibility(LLVMProtectedVisibility);\n+ FDecl.setDSOLocal(true);\n+ FDecl.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ FDecl.addFnAttr(Context->NoStackArgProbe);\n+ FDecl.addFnAttr(Context->StrictFP);\n+ FDecl.addFnAttr(Context->UWTable);\n+ FDecl.addParamAttr(0, Context->ReadOnly);\n+ FDecl.addParamAttr(0, Context->NoAlias);\n+ FDecl.addParamAttr(1, Context->NoAlias);\n+ FDecl.addParamAttr(2, Context->NoAlias);\n+ FDecl.addParamAttr(3, Context->NoAlias);\n+ };\n+\n // Iterate and compile types.\n for (size_t I = 0; I < Size; ++I) {\n const auto &CompType = SubTypes[I].getCompositeType();\n- const auto Name = fmt::format(\"t{}\"sv, Context->CompositeTypes.size());\n+ const auto Name =\n+ fmt::format(\"{}t{}\"sv, Context->Prefix, Context->CompositeTypes.size());\n if (CompType.isFunc()) {\n // Check that the function type is unique.\n {\n@@ -6065,13 +6209,21 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n if (OldFuncType == CompType.getFuncType()) {\n Unique = false;\n Context->CompositeTypes.push_back(Context->CompositeTypes[J]);\n- auto F = Context->FunctionWrappers[J];\n- Context->FunctionWrappers.push_back(F);\n- auto A = Context->LLModule.addAlias(WrapperTy, F, Name.c_str());\n- A.setLinkage(LLVMExternalLinkage);\n- A.setVisibility(LLVMProtectedVisibility);\n- A.setDSOLocal(true);\n- A.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ if (DeclarationsOnly) {\n+ auto FDecl = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n+ SetFuncAttributes(FDecl);\n+ Context->FunctionWrappers.push_back(FDecl);\n+ } else {\n+ auto F = Context->FunctionWrappers[J];\n+ Context->FunctionWrappers.push_back(F);\n+ auto A = Context->LLModule.get().addAlias(WrapperTy, F,\n+ Name.c_str());\n+ A.setLinkage(LLVMExternalLinkage);\n+ A.setVisibility(LLVMProtectedVisibility);\n+ A.setDSOLocal(true);\n+ A.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ }\n break;\n }\n }\n@@ -6082,81 +6234,66 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n }\n \n // Create Wrapper\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\n- Name.c_str());\n+ auto F = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n {\n- F.setVisibility(LLVMProtectedVisibility);\n- F.setDSOLocal(true);\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\n- F.addFnAttr(Context->NoStackArgProbe);\n- F.addFnAttr(Context->StrictFP);\n- F.addFnAttr(Context->UWTable);\n- F.addParamAttr(0, Context->ReadOnly);\n- F.addParamAttr(0, Context->NoAlias);\n- F.addParamAttr(1, Context->NoAlias);\n- F.addParamAttr(2, Context->NoAlias);\n- F.addParamAttr(3, Context->NoAlias);\n-\n- LLVM::Builder Builder(Context->LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n-\n- auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\n- CompType.getFuncType());\n- auto RTy = FTy.getReturnType();\n- std::vector<LLVM::Type> FPTy(FTy.getNumParams());\n- FTy.getParamTypes(FPTy);\n-\n- const size_t ArgCount = FPTy.size() - 1;\n- auto ExecCtxPtr = F.getFirstParam();\n- auto RawFunc = LLVM::FunctionCallee{\n- FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\n- FTy.getPointerTo())};\n- auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\n- auto RawRets = RawArgs.getNextParam();\n-\n- std::vector<LLVM::Value> Args;\n- Args.reserve(FTy.getNumParams());\n- Args.push_back(ExecCtxPtr);\n- for (size_t J = 0; J < ArgCount; ++J) {\n- Args.push_back(Builder.createValuePtrLoad(\n- FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\n- }\n+ SetFuncAttributes(F);\n+\n+ if (!DeclarationsOnly) {\n+ LLVM::Builder Builder(Context->LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n+\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\n+ CompType.getFuncType());\n+ auto RTy = FTy.getReturnType();\n+ std::vector<LLVM::Type> FPTy(FTy.getNumParams());\n+ FTy.getParamTypes(FPTy);\n+\n+ const size_t ArgCount = FPTy.size() - 1;\n+ auto ExecCtxPtr = F.getFirstParam();\n+ auto RawFunc = LLVM::FunctionCallee{\n+ FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\n+ FTy.getPointerTo())};\n+ auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\n+ auto RawRets = RawArgs.getNextParam();\n+\n+ std::vector<LLVM::Value> Args;\n+ Args.reserve(FTy.getNumParams());\n+ Args.push_back(ExecCtxPtr);\n+ for (size_t J = 0; J < ArgCount; ++J) {\n+ Args.push_back(Builder.createValuePtrLoad(\n+ FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\n+ }\n \n- auto Ret = Builder.createCall(RawFunc, Args);\n- if (RTy.isVoidTy()) {\n- // nothing to do\n- } else if (RTy.isStructTy()) {\n- auto Rets = unpackStruct(Builder, Ret);\n- Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty, kValSize);\n- } else {\n- Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\n+ auto Ret = Builder.createCall(RawFunc, Args);\n+ if (RTy.isVoidTy()) {\n+ // nothing to do\n+ } else if (RTy.isStructTy()) {\n+ auto Rets = unpackStruct(Builder, Ret);\n+ Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty,\n+ kValSize);\n+ } else {\n+ Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\n+ }\n+ Builder.createRetVoid();\n }\n- Builder.createRetVoid();\n }\n // Copy wrapper, param and return lists to module instance.\n Context->FunctionWrappers.push_back(F);\n } else {\n // Non function type case. Create empty wrapper.\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\n- Name.c_str());\n+ auto F = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n {\n- F.setVisibility(LLVMProtectedVisibility);\n- F.setDSOLocal(true);\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\n- F.addFnAttr(Context->NoStackArgProbe);\n- F.addFnAttr(Context->StrictFP);\n- F.addFnAttr(Context->UWTable);\n- F.addParamAttr(0, Context->ReadOnly);\n- F.addParamAttr(0, Context->NoAlias);\n- F.addParamAttr(1, Context->NoAlias);\n- F.addParamAttr(2, Context->NoAlias);\n- F.addParamAttr(3, Context->NoAlias);\n-\n- LLVM::Builder Builder(Context->LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n- Builder.createRetVoid();\n+ SetFuncAttributes(F);\n+\n+ if (!DeclarationsOnly) {\n+ LLVM::Builder Builder(Context->LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n+ Builder.createRetVoid();\n+ }\n }\n Context->FunctionWrappers.push_back(F);\n }\n@@ -6184,9 +6321,9 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\n toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n auto RTy = FTy.getReturnType();\n auto F = LLVM::FunctionCallee{\n- FTy,\n- Context->LLModule.addFunction(FTy, LLVMInternalLinkage,\n- fmt::format(\"f{}\"sv, FuncID).c_str())};\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMInternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n F.Fn.setDSOLocal(true);\n F.Fn.addFnAttr(Context->NoStackArgProbe);\n F.Fn.addFnAttr(Context->StrictFP);\n@@ -6231,6 +6368,7 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\n }\n \n Context->Functions.emplace_back(TypeIdx, F, nullptr);\n+ Context->ImportCount++;\n break;\n }\n case ExternalType::Table: // Table type\n@@ -6313,9 +6451,10 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n const auto FuncID = Context->Functions.size();\n auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n- LLVM::FunctionCallee F = {FTy, Context->LLModule.addFunction(\n- FTy, LLVMExternalLinkage,\n- fmt::format(\"f{}\"sv, FuncID).c_str())};\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n F.Fn.setVisibility(LLVMProtectedVisibility);\n F.Fn.setDSOLocal(true);\n F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n@@ -6339,10 +6478,11 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n Locals.push_back(Local.second);\n }\n }\n- FunctionCompiler FC(*Context, F, Locals,\n- Conf.getCompilerConfigure().isInterruptible(),\n- Conf.getStatisticsConfigure().isInstructionCounting(),\n- Conf.getStatisticsConfigure().isCostMeasuring());\n+ FunctionCompiler FC(\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\n auto Type = Context->resolveBlockType(T);\n EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n F.Fn.eliminateUnreachableBlocks();\n@@ -6350,5 +6490,235 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n return {};\n }\n \n+void Compiler::compileFunctionDeclarations(\n+ const AST::FunctionSection &FunctionSec,\n+ const AST::CodeSection &CodeSec) noexcept {\n+ const auto &TypeIdxs = FunctionSec.getContent();\n+ const auto &CodeSegs = CodeSec.getContent();\n+ assuming(TypeIdxs.size() == CodeSegs.size());\n+\n+ for (size_t I = 0; I < CodeSegs.size(); ++I) {\n+ const auto &TypeIdx = TypeIdxs[I];\n+ const auto &Code = CodeSegs[I];\n+ assuming(TypeIdx < Context->CompositeTypes.size());\n+ assuming(Context->CompositeTypes[TypeIdx]->isFunc());\n+ const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n+ const auto FuncID = Context->Functions.size();\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n+ F.Fn.setVisibility(LLVMProtectedVisibility);\n+ F.Fn.setDSOLocal(true);\n+ F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ F.Fn.addFnAttr(Context->NoStackArgProbe);\n+ F.Fn.addFnAttr(Context->StrictFP);\n+ F.Fn.addFnAttr(Context->UWTable);\n+ F.Fn.addParamAttr(0, Context->ReadOnly);\n+ F.Fn.addParamAttr(0, Context->NoAlias);\n+\n+ Context->Functions.emplace_back(TypeIdx, F, &Code);\n+ }\n+}\n+\n+Expect<void> Compiler::compileFunctionBody(uint32_t LocalFuncIndex) noexcept {\n+ // Find the function in the Functions list\n+ // LocalFuncIndex is relative to the defined functions (not imports)\n+ uint32_t GlobalFuncIndex = Context->ImportCount + LocalFuncIndex;\n+ if (GlobalFuncIndex >= Context->Functions.size()) {\n+ spdlog::error(\"[lazy-jit]: function index {} out of range\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ auto &[T, F, Code] = Context->Functions[GlobalFuncIndex];\n+ if (!Code) {\n+ spdlog::error(\"[lazy-jit]: cannot compile import function {}\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ // Check if already compiled (function has basic blocks)\n+ if (F.Fn.countBasicBlocks() > 0) {\n+ spdlog::debug(\"[lazy-jit]: function {} already compiled\"sv, LocalFuncIndex);\n+ return {};\n+ }\n+\n+ spdlog::debug(\"[lazy-jit]: compiling function {}\"sv, LocalFuncIndex);\n+\n+ std::vector<ValType> Locals;\n+ for (const auto &Local : Code->getLocals()) {\n+ for (unsigned I = 0; I < Local.first; ++I) {\n+ Locals.push_back(Local.second);\n+ }\n+ }\n+\n+ FunctionCompiler FC(\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\n+ auto Type = Context->resolveBlockType(T);\n+ EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n+ F.Fn.eliminateUnreachableBlocks();\n+\n+ return {};\n+}\n+\n+Expect<std::pair<LLVM::Data,\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter>>>\n+LLVM::Compiler::compileInfrastructure(const AST::Module &Module,\n+ std::string Prefix) noexcept {\n+ Data D;\n+ D.setPrefix(Prefix);\n+ // Check the module is validated.\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ spdlog::info(\"[lazy-jit]: compile infrastructure start\"sv);\n+\n+ auto LLContext = D.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = D.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ std::unique_ptr<CompileContext, CompileContextDeleter> NewContext(\n+ new CompileContext(LLContext, LLModule,\n+ Conf.getCompilerConfigure().isGenericBinary(),\n+ D.getPrefix()));\n+ RAIICleanup Cleanup(this->Context, NewContext.get());\n+\n+ // Compile Function Types\n+ compile(Module.getTypeSection());\n+ // Compile ImportSection\n+ compile(Module.getImportSection());\n+ // Compile GlobalSection\n+ compile(Module.getGlobalSection());\n+ // Compile MemorySection (MemorySec, DataSec)\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ // Compile TableSection (TableSec, ElemSec)\n+ compile(Module.getTableSection(), Module.getElementSection());\n+ // Create function declarations without compiling bodies\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+ // Compile ExportSection\n+ compile(Module.getExportSection());\n+\n+ // Set initializer for constant value\n+ auto IntrinsicsName = fmt::format(\"{}intrinsics\"sv, D.getPrefix());\n+ if (auto IntrinsicsTable = LLModule.getNamedGlobal(IntrinsicsName.c_str())) {\n+ IntrinsicsTable.setInitializer(\n+ LLVM::Value::getConstNull(IntrinsicsTable.getType()));\n+ IntrinsicsTable.setGlobalConstant(false);\n+ } else {\n+ auto IntrinsicsTableTy = LLVM::Type::getArrayType(\n+ LLContext.getInt8Ty().getPointerTo(),\n+ static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax));\n+ LLModule.addGlobal(\n+ IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n+ LLVM::Value::getConstNull(IntrinsicsTableTy), IntrinsicsName.c_str());\n+ }\n+ LLModule.verify(LLVMPrintMessageAction);\n+\n+ spdlog::info(\"[lazy-jit]: infrastructure compilation done\"sv);\n+\n+ return Expect<\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>>{\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>{\n+ std::move(D), std::move(NewContext)}};\n+}\n+\n+Expect<LLVM::Data>\n+Compiler::compileFunctions(Data &&LLData, CompileContext *NewContext,\n+ const AST::Module &Module,\n+ Span<const uint32_t> LocalFuncIndices) noexcept {\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+ if (unlikely(LocalFuncIndices.empty())) {\n+ spdlog::error(\"[lazy-jit]: compileFunctions with empty index list\"sv);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ std::vector<uint32_t> Sorted(LocalFuncIndices.begin(),\n+ LocalFuncIndices.end());\n+ std::sort(Sorted.begin(), Sorted.end());\n+ Sorted.erase(std::unique(Sorted.begin(), Sorted.end()), Sorted.end());\n+\n+ spdlog::debug(\"[lazy-jit]: compile functions batch ({}) start\"sv,\n+ Sorted.size());\n+\n+ auto LLContext = LLData.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = LLData.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ RAIICleanup Cleanup(this->Context, NewContext);\n+ Context->LLModule = LLModule;\n+\n+ Context->CompositeTypes.clear();\n+ Context->FunctionWrappers.clear();\n+ Context->Functions.clear();\n+ Context->LazyJITCacheVars.clear();\n+ Context->ImportCount = 0;\n+ Context->MemoryAddrTypes.clear();\n+ Context->TableAddrTypes.clear();\n+ Context->Globals.clear();\n+\n+ Context->IntrinsicsTable = LLModule.addGlobal(\n+ Context->IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\n+ fmt::format(\"{}intrinsics\"sv, Context->Prefix).c_str());\n+ Context->IntrinsicsTable.setInitializer(LLVM::Value());\n+ Context->Trap.Ty =\n+ LLVM::Type::getFunctionType(Context->VoidTy, {Context->Int32Ty});\n+ Context->Trap.Fn =\n+ LLModule.addFunction(Context->Trap.Ty, LLVMPrivateLinkage, \"trap\");\n+ Context->Trap.Fn.setDSOLocal(true);\n+ Context->Trap.Fn.addFnAttr(Context->NoStackArgProbe);\n+ Context->Trap.Fn.addFnAttr(Context->StrictFP);\n+ Context->Trap.Fn.addFnAttr(Context->UWTable);\n+ Context->Trap.Fn.addFnAttr(Context->NoReturn);\n+ Context->Trap.Fn.addFnAttr(Context->Cold);\n+ Context->Trap.Fn.addFnAttr(Context->NoInline);\n+ Context->compileTrap();\n+\n+ compile(Module.getTypeSection(), true);\n+ compile(Module.getImportSection());\n+ compile(Module.getGlobalSection());\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ compile(Module.getTableSection(), Module.getElementSection());\n+\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+\n+ for (uint32_t FuncIndex : Sorted) {\n+ EXPECTED_TRY(compileFunctionBody(FuncIndex));\n+ }\n+\n+ spdlog::info(\"[lazy-jit]: verify batch ({} funcs) start\"sv, Sorted.size());\n+ LLModule.verify(LLVMPrintMessageAction);\n+ spdlog::info(\"[lazy-jit]: verify batch ({} funcs) done\"sv, Sorted.size());\n+\n+ auto &TM = LLData.extract().TM;\n+ EXPECTED_TRY(optimize(LLModule, TM));\n+\n+ spdlog::debug(\"[lazy-jit]: compile functions batch ({}) done\"sv,\n+ Sorted.size());\n+ return Expect<Data>{std::move(LLData)};\n+}\n+\n+void LLVM::Compiler::CompileContextDeleter::operator()(\n+ CompileContext *Context) const noexcept {\n+ delete Context;\n+}\n } // namespace LLVM\n } // namespace WasmEdge\n"},"changed_files":{"kind":"list like","value":["lib/llvm/compiler.cpp"],"string":"[\n \"lib/llvm/compiler.cpp\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"This appears to be debug information. Remove it if it is no longer needed.","path":"lib/llvm/compiler.cpp","hunk":"@@ -3998,12 +4003,15 @@ class FunctionCompiler {\n }\n void compileAtomicWait(unsigned MemoryIndex, uint64_t MemoryOffset,\n LLVM::Type TargetType, uint32_t BitWidth) noexcept {\n+ spdlog::error(\"[lazyjit] memory_index: {}\", MemoryIndex);","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp\nindex 39da94d9a9ac..330e245f51c3 100644\n--- a/lib/llvm/compiler.cpp\n+++ b/lib/llvm/compiler.cpp\n@@ -9,6 +9,7 @@\n #include \"common/spdlog.h\"\n #include \"data.h\"\n #include \"llvm.h\"\n+#include \"spdlog/spdlog.h\"\n #include \"system/allocator.h\"\n \n #include <algorithm>\n@@ -16,6 +17,7 @@\n #include <cinttypes>\n #include <cstdint>\n #include <cstdlib>\n+#include <functional>\n #include <limits>\n #include <memory>\n #include <numeric>\n@@ -28,6 +30,16 @@ using namespace std::literals;\n \n namespace {\n \n+struct RAIICleanup {\n+ RAIICleanup(LLVM::Compiler::CompileContext *&Context,\n+ LLVM::Compiler::CompileContext *NewContext)\n+ : Context(Context) {\n+ Context = NewContext;\n+ }\n+ ~RAIICleanup() { Context = nullptr; }\n+ LLVM::Compiler::CompileContext *&Context;\n+};\n+\n static bool\n isVoidReturn(WasmEdge::Span<const WasmEdge::ValType> ValTypes) noexcept;\n static LLVM::Type toLLVMType(LLVM::Context LLContext,\n@@ -128,7 +140,7 @@ static inline LLVMCodeGenOptLevel toLLVMCodeGenLevel(\n \n struct LLVM::Compiler::CompileContext {\n LLVM::Context LLContext;\n- LLVM::Module &LLModule;\n+ std::reference_wrapper<LLVM::Module> LLModule;\n LLVM::Attribute Cold;\n LLVM::Attribute NoAlias;\n LLVM::Attribute NoInline;\n@@ -202,13 +214,16 @@ struct LLVM::Compiler::CompileContext {\n std::vector<std::tuple<uint32_t, LLVM::FunctionCallee,\n const WasmEdge::AST::CodeSegment *>>\n Functions;\n+ std::vector<LLVM::Value> LazyJITCacheVars;\n+ uint32_t ImportCount = 0;\n std::vector<LLVM::Type> MemoryAddrTypes;\n std::vector<LLVM::Type> TableAddrTypes;\n std::vector<LLVM::Type> Globals;\n+ std::string Prefix;\n LLVM::Value IntrinsicsTable;\n LLVM::FunctionCallee Trap;\n- CompileContext(LLVM::Context C, LLVM::Module &M,\n- bool IsGenericBinary) noexcept\n+ CompileContext(LLVM::Context C, LLVM::Module &M, bool IsGenericBinary,\n+ std::string_view P = \"\"sv) noexcept\n : LLContext(C), LLModule(M),\n Cold(LLVM::Attribute::createEnum(C, LLVM::Core::Cold, 0)),\n NoAlias(LLVM::Attribute::createEnum(C, LLVM::Core::NoAlias, 0)),\n@@ -256,14 +271,14 @@ struct LLVM::Compiler::CompileContext {\n })),\n ExecCtxPtrTy(ExecCtxTy.getPointerTo()),\n IntrinsicsTableTy(LLVM::Type::getArrayType(\n- Int8PtrTy,\n+ Int8Ty.getPointerTo(),\n static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax))),\n- IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()),\n- IntrinsicsTable(LLModule.addGlobal(IntrinsicsTablePtrTy, true,\n- LLVMExternalLinkage, LLVM::Value(),\n- \"intrinsics\")) {\n+ IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()), Prefix(P),\n+ IntrinsicsTable(LLModule.get().addGlobal(\n+ IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\n+ fmt::format(\"{}intrinsics\"sv, Prefix).c_str())) {\n Trap.Ty = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n- Trap.Fn = LLModule.addFunction(Trap.Ty, LLVMPrivateLinkage, \"trap\");\n+ Trap.Fn = LLModule.get().addFunction(Trap.Ty, LLVMPrivateLinkage, \"trap\");\n Trap.Fn.setDSOLocal(true);\n Trap.Fn.addFnAttr(NoStackArgProbe);\n Trap.Fn.addFnAttr(StrictFP);\n@@ -272,9 +287,10 @@ struct LLVM::Compiler::CompileContext {\n Trap.Fn.addFnAttr(Cold);\n Trap.Fn.addFnAttr(NoInline);\n \n- LLModule.addGlobal(Int32Ty, true, LLVMExternalLinkage,\n- LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\n- \"version\");\n+ LLModule.get().addGlobal(\n+ Int32Ty, true, LLVMExternalLinkage,\n+ LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\n+ fmt::format(\"{}version\"sv, Prefix).c_str());\n \n if (!IsGenericBinary) {\n SubtargetFeatures = LLVM::getHostCPUFeatures();\n@@ -313,18 +329,7 @@ struct LLVM::Compiler::CompileContext {\n }\n }\n \n- {\n- // create trap\n- LLVM::Builder Builder(LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(LLContext, Trap.Fn, \"entry\"));\n- auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n- auto CallTrap = Builder.createCall(\n- getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\n- {Trap.Fn.getFirstParam()});\n- CallTrap.addCallSiteAttribute(NoReturn);\n- Builder.createUnreachable();\n- }\n+ compileTrap();\n }\n LLVM::Value getMemory(LLVM::Builder &Builder, LLVM::Value ExecCtx,\n uint32_t Index) noexcept {\n@@ -394,6 +399,17 @@ struct LLVM::Compiler::CompileContext {\n auto Ptr = Builder.createBitCast(VPtr, PtrPtrTy);\n return {Ty, Builder.createLoad(PtrTy, Ptr)};\n }\n+ void compileTrap() noexcept {\n+ LLVM::Builder Builder(LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(LLContext, Trap.Fn, \"entry\"));\n+ auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n+ auto CallTrap = Builder.createCall(\n+ getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\n+ {Trap.Fn.getFirstParam()});\n+ CallTrap.addCallSiteAttribute(NoReturn);\n+ Builder.createUnreachable();\n+ }\n std::pair<std::vector<ValType>, std::vector<ValType>>\n resolveBlockType(const BlockType &BType) const noexcept {\n using VecT = std::vector<ValType>;\n@@ -544,9 +560,10 @@ class FunctionCompiler {\n FunctionCompiler(LLVM::Compiler::CompileContext &Context,\n LLVM::FunctionCallee F, Span<const ValType> Locals,\n bool Interruptible, bool InstructionCounting,\n- bool GasMeasuring) noexcept\n+ bool GasMeasuring, bool IsLazyJIT) noexcept\n : Context(Context), LLContext(Context.LLContext),\n- Interruptible(Interruptible), F(F), Builder(LLContext) {\n+ Interruptible(Interruptible), IsLazyJIT(IsLazyJIT), F(F),\n+ Builder(LLContext) {\n if (F.Fn) {\n Builder.positionAtEnd(LLVM::BasicBlock::create(LLContext, F.Fn, \"entry\"));\n ExecCtx = Builder.createLoad(Context.ExecCtxTy, F.Fn.getFirstParam());\n@@ -4267,7 +4284,63 @@ class FunctionCompiler {\n Args[J + 1] = stackPop();\n }\n \n- auto Ret = Builder.createCall(Function, Args);\n+ LLVM::Value Ret;\n+ if (IsLazyJIT) {\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\n+ if (IsImport) {\n+ Ret = Builder.createCall(Function, Args);\n+ } else {\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\n+\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\n+ }\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\n+ if (!CacheVar) {\n+ CacheVar = Context.LLModule.get().addGlobal(\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \"\");\n+ }\n+\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.check\");\n+ auto ResolveBB =\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.resolve\");\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.call\");\n+\n+ Builder.createBr(CheckBB);\n+ Builder.positionAtEnd(CheckBB);\n+\n+ auto CachedPtr =\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\n+ CachedPtr.setAlignment(8);\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\n+ auto IsNull = Builder.createIsNull(CachedPtr);\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\n+\n+ Builder.positionAtEnd(ResolveBB);\n+ auto FPtr = Builder.createCall(\n+ Context.getIntrinsic(\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\n+ {Context.Int32Ty}, false)),\n+ {LLContext.getInt32(FuncIndex)});\n+ auto Store = Builder.createStore(FPtr, CacheVar);\n+ Store.setAlignment(8);\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\n+ Builder.createBr(CallBB);\n+\n+ Builder.positionAtEnd(CallBB);\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\n+\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\n+ }\n+ } else {\n+ Ret = Builder.createCall(Function, Args);\n+ }\n+\n auto Ty = Ret.getType();\n if (Ty.isVoidTy()) {\n // nothing to do\n@@ -4387,7 +4460,64 @@ class FunctionCompiler {\n Args[J + 1] = stackPop();\n }\n \n- auto Ret = Builder.createCall(Function, Args);\n+ LLVM::Value Ret;\n+ if (IsLazyJIT) {\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\n+ if (IsImport) {\n+ Ret = Builder.createCall(Function, Args);\n+ } else {\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\n+\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\n+ }\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\n+ if (!CacheVar) {\n+ CacheVar = Context.LLModule.get().addGlobal(\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \"\");\n+ }\n+\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.check\");\n+ auto ResolveBB =\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.resolve\");\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.call\");\n+\n+ Builder.createBr(CheckBB);\n+ Builder.positionAtEnd(CheckBB);\n+\n+ auto CachedPtr =\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\n+ CachedPtr.setAlignment(8);\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\n+ auto IsNull = Builder.createIsNull(CachedPtr);\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\n+\n+ Builder.positionAtEnd(ResolveBB);\n+ auto FPtr = Builder.createCall(\n+ Context.getIntrinsic(\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\n+ {Context.Int32Ty}, false)),\n+ {LLContext.getInt32(FuncIndex)});\n+ auto Store = Builder.createStore(FPtr, CacheVar);\n+ Store.setAlignment(8);\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\n+ Builder.createBr(CallBB);\n+\n+ Builder.positionAtEnd(CallBB);\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\n+\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\n+ }\n+ } else {\n+ Ret = Builder.createCall(Function, Args);\n+ }\n+\n+ Ret.setMustTailCall();\n auto Ty = Ret.getType();\n if (Ty.isVoidTy()) {\n Builder.createRetVoid();\n@@ -4432,6 +4562,7 @@ class FunctionCompiler {\n \n auto FPtrRet =\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\n+ FPtrRet.setMustTailCall();\n if (RetSize == 0) {\n Builder.createRetVoid();\n } else {\n@@ -4608,6 +4739,7 @@ class FunctionCompiler {\n \n auto FPtrRet =\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\n+ FPtrRet.setMustTailCall();\n if (RetSize == 0) {\n Builder.createRetVoid();\n } else {\n@@ -5854,6 +5986,7 @@ class FunctionCompiler {\n Control &operator=(const Control &) = default;\n Control &operator=(Control &&) = default;\n };\n+ bool IsLazyJIT;\n std::vector<Control> ControlStack;\n LLVM::FunctionCallee F;\n LLVM::Value ExecCtx;\n@@ -5894,6 +6027,84 @@ Expect<void> Compiler::checkConfigure() noexcept {\n return {};\n }\n \n+Expect<void> Compiler::optimize(LLVM::Module &LLModule,\n+ LLVM::TargetMachine &TM) noexcept {\n+ spdlog::info(\"optimize start\"sv);\n+ auto Triple = LLModule.getTarget();\n+ auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\n+ if (ErrorMessage) {\n+ spdlog::error(\"getFromTriple failed:{}\"sv, ErrorMessage.string_view());\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ std::string CPUName;\n+#if defined(__riscv) && __riscv_xlen == 64\n+ CPUName = \"generic-rv64\"s;\n+#else\n+ if (!Conf.getCompilerConfigure().isGenericBinary()) {\n+ CPUName = LLVM::getHostCPUName().string_view();\n+ } else {\n+ CPUName = \"generic\"s;\n+ }\n+#endif\n+\n+ // On RISC-V we use generic-rv64 as the CPU, so also use default\n+ // features; host features under QEMU can be inconsistent (e.g.\n+ // zvl*b without v) which LLVM >= 20 rejects.\n+ TM = LLVM::TargetMachine::create(\n+ TheTarget, Triple, CPUName.c_str(),\n+#if defined(__riscv) && __riscv_xlen == 64\n+ \"\",\n+#else\n+ LLVM::getHostCPUFeatures().unwrap(),\n+#endif\n+ toLLVMCodeGenLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n+ LLVMRelocPIC, LLVMCodeModelDefault);\n+\n+#if LLVM_VERSION_MAJOR >= 13\n+ auto PBO = LLVM::PassBuilderOptions::create();\n+ if (auto Error = PBO.runPasses(\n+ LLModule,\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n+ TM)) {\n+ spdlog::error(\"{}\"sv, Error.message().string_view());\n+ }\n+#else\n+ auto FP = LLVM::PassManager::createForModule(LLModule);\n+ auto MP = LLVM::PassManager::create();\n+\n+ TM.addAnalysisPasses(MP);\n+ TM.addAnalysisPasses(FP);\n+ {\n+ auto PMB = LLVM::PassManagerBuilder::create();\n+ auto [OptLevel, SizeLevel] =\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\n+ PMB.setOptLevel(OptLevel);\n+ PMB.setSizeLevel(SizeLevel);\n+ PMB.populateFunctionPassManager(FP);\n+ PMB.populateModulePassManager(MP);\n+ }\n+ switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\n+ case CompilerConfigure::OptimizationLevel::O0:\n+ case CompilerConfigure::OptimizationLevel::O1:\n+ FP.addTailCallEliminationPass();\n+ break;\n+ default:\n+ break;\n+ }\n+\n+ FP.initializeFunctionPassManager();\n+ for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\n+ FP.runFunctionPassManager(Fn);\n+ }\n+ FP.finalizeFunctionPassManager();\n+ MP.runPassManager(LLModule);\n+#endif\n+\n+ spdlog::info(\"optimize done\"sv);\n+ return {};\n+}\n+\n Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n // Check that the module is validated.\n if (unlikely(!Module.getIsValidated())) {\n@@ -5913,15 +6124,7 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n \n CompileContext NewContext(LLContext, LLModule,\n Conf.getCompilerConfigure().isGenericBinary());\n- struct RAIICleanup {\n- RAIICleanup(CompileContext *&Context, CompileContext &NewContext)\n- : Context(Context) {\n- Context = &NewContext;\n- }\n- ~RAIICleanup() { Context = nullptr; }\n- CompileContext *&Context;\n- };\n- RAIICleanup Cleanup(Context, NewContext);\n+ RAIICleanup Cleanup(Context, &NewContext);\n \n // Compile Function Types\n compile(Module.getTypeSection());\n@@ -5942,81 +6145,8 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n spdlog::info(\"verify start\"sv);\n LLModule.verify(LLVMPrintMessageAction);\n \n- spdlog::info(\"optimize start\"sv);\n auto &TM = D.extract().TM;\n- {\n- auto Triple = LLModule.getTarget();\n- auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\n- if (ErrorMessage) {\n- spdlog::error(\"getFromTriple failed:{}\"sv, ErrorMessage.string_view());\n- return Unexpect(ErrCode::Value::IllegalPath);\n- } else {\n- std::string CPUName;\n-#if defined(__riscv) && __riscv_xlen == 64\n- CPUName = \"generic-rv64\"s;\n-#else\n- if (!Conf.getCompilerConfigure().isGenericBinary()) {\n- CPUName = LLVM::getHostCPUName().string_view();\n- } else {\n- CPUName = \"generic\"s;\n- }\n-#endif\n-\n- // On RISC-V we use generic-rv64 as the CPU, so also use default\n- // features; host features under QEMU can be inconsistent (e.g.\n- // zvl*b without v) which LLVM >= 20 rejects.\n- TM = LLVM::TargetMachine::create(\n- TheTarget, Triple, CPUName.c_str(),\n-#if defined(__riscv) && __riscv_xlen == 64\n- \"\",\n-#else\n- LLVM::getHostCPUFeatures().unwrap(),\n-#endif\n- toLLVMCodeGenLevel(\n- Conf.getCompilerConfigure().getOptimizationLevel()),\n- LLVMRelocPIC, LLVMCodeModelDefault);\n- }\n-\n-#if LLVM_VERSION_MAJOR >= 13\n- auto PBO = LLVM::PassBuilderOptions::create();\n- if (auto Error = PBO.runPasses(\n- LLModule,\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n- TM)) {\n- spdlog::error(\"{}\"sv, Error.message().string_view());\n- }\n-#else\n- auto FP = LLVM::PassManager::createForModule(LLModule);\n- auto MP = LLVM::PassManager::create();\n-\n- TM.addAnalysisPasses(MP);\n- TM.addAnalysisPasses(FP);\n- {\n- auto PMB = LLVM::PassManagerBuilder::create();\n- auto [OptLevel, SizeLevel] =\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\n- PMB.setOptLevel(OptLevel);\n- PMB.setSizeLevel(SizeLevel);\n- PMB.populateFunctionPassManager(FP);\n- PMB.populateModulePassManager(MP);\n- }\n- switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\n- case CompilerConfigure::OptimizationLevel::O0:\n- case CompilerConfigure::OptimizationLevel::O1:\n- FP.addTailCallEliminationPass();\n- break;\n- default:\n- break;\n- }\n-\n- FP.initializeFunctionPassManager();\n- for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\n- FP.runFunctionPassManager(Fn);\n- }\n- FP.finalizeFunctionPassManager();\n- MP.runPassManager(LLModule);\n-#endif\n- }\n+ EXPECTED_TRY(optimize(LLModule, TM));\n \n // Set initializer for constant value\n if (auto IntrinsicsTable = LLModule.getNamedGlobal(\"intrinsics\")) {\n@@ -6031,12 +6161,11 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n LLVM::Value::getConstNull(IntrinsicsTableTy), \"intrinsics\");\n }\n-\n- spdlog::info(\"optimize done\"sv);\n return Expect<Data>{std::move(D)};\n }\n \n-void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n+void Compiler::compile(const AST::TypeSection &TypeSec,\n+ bool DeclarationsOnly) noexcept {\n auto WrapperTy =\n LLVM::Type::getFunctionType(Context->VoidTy,\n {Context->ExecCtxPtrTy, Context->Int8PtrTy,\n@@ -6050,10 +6179,25 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n Context->CompositeTypes.reserve(Size);\n Context->FunctionWrappers.reserve(Size);\n \n+ auto SetFuncAttributes = [&](auto FDecl) {\n+ FDecl.setVisibility(LLVMProtectedVisibility);\n+ FDecl.setDSOLocal(true);\n+ FDecl.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ FDecl.addFnAttr(Context->NoStackArgProbe);\n+ FDecl.addFnAttr(Context->StrictFP);\n+ FDecl.addFnAttr(Context->UWTable);\n+ FDecl.addParamAttr(0, Context->ReadOnly);\n+ FDecl.addParamAttr(0, Context->NoAlias);\n+ FDecl.addParamAttr(1, Context->NoAlias);\n+ FDecl.addParamAttr(2, Context->NoAlias);\n+ FDecl.addParamAttr(3, Context->NoAlias);\n+ };\n+\n // Iterate and compile types.\n for (size_t I = 0; I < Size; ++I) {\n const auto &CompType = SubTypes[I].getCompositeType();\n- const auto Name = fmt::format(\"t{}\"sv, Context->CompositeTypes.size());\n+ const auto Name =\n+ fmt::format(\"{}t{}\"sv, Context->Prefix, Context->CompositeTypes.size());\n if (CompType.isFunc()) {\n // Check that the function type is unique.\n {\n@@ -6065,13 +6209,21 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n if (OldFuncType == CompType.getFuncType()) {\n Unique = false;\n Context->CompositeTypes.push_back(Context->CompositeTypes[J]);\n- auto F = Context->FunctionWrappers[J];\n- Context->FunctionWrappers.push_back(F);\n- auto A = Context->LLModule.addAlias(WrapperTy, F, Name.c_str());\n- A.setLinkage(LLVMExternalLinkage);\n- A.setVisibility(LLVMProtectedVisibility);\n- A.setDSOLocal(true);\n- A.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ if (DeclarationsOnly) {\n+ auto FDecl = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n+ SetFuncAttributes(FDecl);\n+ Context->FunctionWrappers.push_back(FDecl);\n+ } else {\n+ auto F = Context->FunctionWrappers[J];\n+ Context->FunctionWrappers.push_back(F);\n+ auto A = Context->LLModule.get().addAlias(WrapperTy, F,\n+ Name.c_str());\n+ A.setLinkage(LLVMExternalLinkage);\n+ A.setVisibility(LLVMProtectedVisibility);\n+ A.setDSOLocal(true);\n+ A.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ }\n break;\n }\n }\n@@ -6082,81 +6234,66 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n }\n \n // Create Wrapper\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\n- Name.c_str());\n+ auto F = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n {\n- F.setVisibility(LLVMProtectedVisibility);\n- F.setDSOLocal(true);\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\n- F.addFnAttr(Context->NoStackArgProbe);\n- F.addFnAttr(Context->StrictFP);\n- F.addFnAttr(Context->UWTable);\n- F.addParamAttr(0, Context->ReadOnly);\n- F.addParamAttr(0, Context->NoAlias);\n- F.addParamAttr(1, Context->NoAlias);\n- F.addParamAttr(2, Context->NoAlias);\n- F.addParamAttr(3, Context->NoAlias);\n-\n- LLVM::Builder Builder(Context->LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n-\n- auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\n- CompType.getFuncType());\n- auto RTy = FTy.getReturnType();\n- std::vector<LLVM::Type> FPTy(FTy.getNumParams());\n- FTy.getParamTypes(FPTy);\n-\n- const size_t ArgCount = FPTy.size() - 1;\n- auto ExecCtxPtr = F.getFirstParam();\n- auto RawFunc = LLVM::FunctionCallee{\n- FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\n- FTy.getPointerTo())};\n- auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\n- auto RawRets = RawArgs.getNextParam();\n-\n- std::vector<LLVM::Value> Args;\n- Args.reserve(FTy.getNumParams());\n- Args.push_back(ExecCtxPtr);\n- for (size_t J = 0; J < ArgCount; ++J) {\n- Args.push_back(Builder.createValuePtrLoad(\n- FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\n- }\n+ SetFuncAttributes(F);\n+\n+ if (!DeclarationsOnly) {\n+ LLVM::Builder Builder(Context->LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n+\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\n+ CompType.getFuncType());\n+ auto RTy = FTy.getReturnType();\n+ std::vector<LLVM::Type> FPTy(FTy.getNumParams());\n+ FTy.getParamTypes(FPTy);\n+\n+ const size_t ArgCount = FPTy.size() - 1;\n+ auto ExecCtxPtr = F.getFirstParam();\n+ auto RawFunc = LLVM::FunctionCallee{\n+ FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\n+ FTy.getPointerTo())};\n+ auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\n+ auto RawRets = RawArgs.getNextParam();\n+\n+ std::vector<LLVM::Value> Args;\n+ Args.reserve(FTy.getNumParams());\n+ Args.push_back(ExecCtxPtr);\n+ for (size_t J = 0; J < ArgCount; ++J) {\n+ Args.push_back(Builder.createValuePtrLoad(\n+ FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\n+ }\n \n- auto Ret = Builder.createCall(RawFunc, Args);\n- if (RTy.isVoidTy()) {\n- // nothing to do\n- } else if (RTy.isStructTy()) {\n- auto Rets = unpackStruct(Builder, Ret);\n- Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty, kValSize);\n- } else {\n- Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\n+ auto Ret = Builder.createCall(RawFunc, Args);\n+ if (RTy.isVoidTy()) {\n+ // nothing to do\n+ } else if (RTy.isStructTy()) {\n+ auto Rets = unpackStruct(Builder, Ret);\n+ Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty,\n+ kValSize);\n+ } else {\n+ Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\n+ }\n+ Builder.createRetVoid();\n }\n- Builder.createRetVoid();\n }\n // Copy wrapper, param and return lists to module instance.\n Context->FunctionWrappers.push_back(F);\n } else {\n // Non function type case. Create empty wrapper.\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\n- Name.c_str());\n+ auto F = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n {\n- F.setVisibility(LLVMProtectedVisibility);\n- F.setDSOLocal(true);\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\n- F.addFnAttr(Context->NoStackArgProbe);\n- F.addFnAttr(Context->StrictFP);\n- F.addFnAttr(Context->UWTable);\n- F.addParamAttr(0, Context->ReadOnly);\n- F.addParamAttr(0, Context->NoAlias);\n- F.addParamAttr(1, Context->NoAlias);\n- F.addParamAttr(2, Context->NoAlias);\n- F.addParamAttr(3, Context->NoAlias);\n-\n- LLVM::Builder Builder(Context->LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n- Builder.createRetVoid();\n+ SetFuncAttributes(F);\n+\n+ if (!DeclarationsOnly) {\n+ LLVM::Builder Builder(Context->LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n+ Builder.createRetVoid();\n+ }\n }\n Context->FunctionWrappers.push_back(F);\n }\n@@ -6184,9 +6321,9 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\n toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n auto RTy = FTy.getReturnType();\n auto F = LLVM::FunctionCallee{\n- FTy,\n- Context->LLModule.addFunction(FTy, LLVMInternalLinkage,\n- fmt::format(\"f{}\"sv, FuncID).c_str())};\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMInternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n F.Fn.setDSOLocal(true);\n F.Fn.addFnAttr(Context->NoStackArgProbe);\n F.Fn.addFnAttr(Context->StrictFP);\n@@ -6231,6 +6368,7 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\n }\n \n Context->Functions.emplace_back(TypeIdx, F, nullptr);\n+ Context->ImportCount++;\n break;\n }\n case ExternalType::Table: // Table type\n@@ -6313,9 +6451,10 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n const auto FuncID = Context->Functions.size();\n auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n- LLVM::FunctionCallee F = {FTy, Context->LLModule.addFunction(\n- FTy, LLVMExternalLinkage,\n- fmt::format(\"f{}\"sv, FuncID).c_str())};\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n F.Fn.setVisibility(LLVMProtectedVisibility);\n F.Fn.setDSOLocal(true);\n F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n@@ -6339,10 +6478,11 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n Locals.push_back(Local.second);\n }\n }\n- FunctionCompiler FC(*Context, F, Locals,\n- Conf.getCompilerConfigure().isInterruptible(),\n- Conf.getStatisticsConfigure().isInstructionCounting(),\n- Conf.getStatisticsConfigure().isCostMeasuring());\n+ FunctionCompiler FC(\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\n auto Type = Context->resolveBlockType(T);\n EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n F.Fn.eliminateUnreachableBlocks();\n@@ -6350,5 +6490,235 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n return {};\n }\n \n+void Compiler::compileFunctionDeclarations(\n+ const AST::FunctionSection &FunctionSec,\n+ const AST::CodeSection &CodeSec) noexcept {\n+ const auto &TypeIdxs = FunctionSec.getContent();\n+ const auto &CodeSegs = CodeSec.getContent();\n+ assuming(TypeIdxs.size() == CodeSegs.size());\n+\n+ for (size_t I = 0; I < CodeSegs.size(); ++I) {\n+ const auto &TypeIdx = TypeIdxs[I];\n+ const auto &Code = CodeSegs[I];\n+ assuming(TypeIdx < Context->CompositeTypes.size());\n+ assuming(Context->CompositeTypes[TypeIdx]->isFunc());\n+ const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n+ const auto FuncID = Context->Functions.size();\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n+ F.Fn.setVisibility(LLVMProtectedVisibility);\n+ F.Fn.setDSOLocal(true);\n+ F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ F.Fn.addFnAttr(Context->NoStackArgProbe);\n+ F.Fn.addFnAttr(Context->StrictFP);\n+ F.Fn.addFnAttr(Context->UWTable);\n+ F.Fn.addParamAttr(0, Context->ReadOnly);\n+ F.Fn.addParamAttr(0, Context->NoAlias);\n+\n+ Context->Functions.emplace_back(TypeIdx, F, &Code);\n+ }\n+}\n+\n+Expect<void> Compiler::compileFunctionBody(uint32_t LocalFuncIndex) noexcept {\n+ // Find the function in the Functions list\n+ // LocalFuncIndex is relative to the defined functions (not imports)\n+ uint32_t GlobalFuncIndex = Context->ImportCount + LocalFuncIndex;\n+ if (GlobalFuncIndex >= Context->Functions.size()) {\n+ spdlog::error(\"[lazy-jit]: function index {} out of range\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ auto &[T, F, Code] = Context->Functions[GlobalFuncIndex];\n+ if (!Code) {\n+ spdlog::error(\"[lazy-jit]: cannot compile import function {}\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ // Check if already compiled (function has basic blocks)\n+ if (F.Fn.countBasicBlocks() > 0) {\n+ spdlog::debug(\"[lazy-jit]: function {} already compiled\"sv, LocalFuncIndex);\n+ return {};\n+ }\n+\n+ spdlog::debug(\"[lazy-jit]: compiling function {}\"sv, LocalFuncIndex);\n+\n+ std::vector<ValType> Locals;\n+ for (const auto &Local : Code->getLocals()) {\n+ for (unsigned I = 0; I < Local.first; ++I) {\n+ Locals.push_back(Local.second);\n+ }\n+ }\n+\n+ FunctionCompiler FC(\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\n+ auto Type = Context->resolveBlockType(T);\n+ EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n+ F.Fn.eliminateUnreachableBlocks();\n+\n+ return {};\n+}\n+\n+Expect<std::pair<LLVM::Data,\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter>>>\n+LLVM::Compiler::compileInfrastructure(const AST::Module &Module,\n+ std::string Prefix) noexcept {\n+ Data D;\n+ D.setPrefix(Prefix);\n+ // Check the module is validated.\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ spdlog::info(\"[lazy-jit]: compile infrastructure start\"sv);\n+\n+ auto LLContext = D.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = D.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ std::unique_ptr<CompileContext, CompileContextDeleter> NewContext(\n+ new CompileContext(LLContext, LLModule,\n+ Conf.getCompilerConfigure().isGenericBinary(),\n+ D.getPrefix()));\n+ RAIICleanup Cleanup(this->Context, NewContext.get());\n+\n+ // Compile Function Types\n+ compile(Module.getTypeSection());\n+ // Compile ImportSection\n+ compile(Module.getImportSection());\n+ // Compile GlobalSection\n+ compile(Module.getGlobalSection());\n+ // Compile MemorySection (MemorySec, DataSec)\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ // Compile TableSection (TableSec, ElemSec)\n+ compile(Module.getTableSection(), Module.getElementSection());\n+ // Create function declarations without compiling bodies\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+ // Compile ExportSection\n+ compile(Module.getExportSection());\n+\n+ // Set initializer for constant value\n+ auto IntrinsicsName = fmt::format(\"{}intrinsics\"sv, D.getPrefix());\n+ if (auto IntrinsicsTable = LLModule.getNamedGlobal(IntrinsicsName.c_str())) {\n+ IntrinsicsTable.setInitializer(\n+ LLVM::Value::getConstNull(IntrinsicsTable.getType()));\n+ IntrinsicsTable.setGlobalConstant(false);\n+ } else {\n+ auto IntrinsicsTableTy = LLVM::Type::getArrayType(\n+ LLContext.getInt8Ty().getPointerTo(),\n+ static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax));\n+ LLModule.addGlobal(\n+ IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n+ LLVM::Value::getConstNull(IntrinsicsTableTy), IntrinsicsName.c_str());\n+ }\n+ LLModule.verify(LLVMPrintMessageAction);\n+\n+ spdlog::info(\"[lazy-jit]: infrastructure compilation done\"sv);\n+\n+ return Expect<\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>>{\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>{\n+ std::move(D), std::move(NewContext)}};\n+}\n+\n+Expect<LLVM::Data>\n+Compiler::compileFunctions(Data &&LLData, CompileContext *NewContext,\n+ const AST::Module &Module,\n+ Span<const uint32_t> LocalFuncIndices) noexcept {\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+ if (unlikely(LocalFuncIndices.empty())) {\n+ spdlog::error(\"[lazy-jit]: compileFunctions with empty index list\"sv);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ std::vector<uint32_t> Sorted(LocalFuncIndices.begin(),\n+ LocalFuncIndices.end());\n+ std::sort(Sorted.begin(), Sorted.end());\n+ Sorted.erase(std::unique(Sorted.begin(), Sorted.end()), Sorted.end());\n+\n+ spdlog::debug(\"[lazy-jit]: compile functions batch ({}) start\"sv,\n+ Sorted.size());\n+\n+ auto LLContext = LLData.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = LLData.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ RAIICleanup Cleanup(this->Context, NewContext);\n+ Context->LLModule = LLModule;\n+\n+ Context->CompositeTypes.clear();\n+ Context->FunctionWrappers.clear();\n+ Context->Functions.clear();\n+ Context->LazyJITCacheVars.clear();\n+ Context->ImportCount = 0;\n+ Context->MemoryAddrTypes.clear();\n+ Context->TableAddrTypes.clear();\n+ Context->Globals.clear();\n+\n+ Context->IntrinsicsTable = LLModule.addGlobal(\n+ Context->IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\n+ fmt::format(\"{}intrinsics\"sv, Context->Prefix).c_str());\n+ Context->IntrinsicsTable.setInitializer(LLVM::Value());\n+ Context->Trap.Ty =\n+ LLVM::Type::getFunctionType(Context->VoidTy, {Context->Int32Ty});\n+ Context->Trap.Fn =\n+ LLModule.addFunction(Context->Trap.Ty, LLVMPrivateLinkage, \"trap\");\n+ Context->Trap.Fn.setDSOLocal(true);\n+ Context->Trap.Fn.addFnAttr(Context->NoStackArgProbe);\n+ Context->Trap.Fn.addFnAttr(Context->StrictFP);\n+ Context->Trap.Fn.addFnAttr(Context->UWTable);\n+ Context->Trap.Fn.addFnAttr(Context->NoReturn);\n+ Context->Trap.Fn.addFnAttr(Context->Cold);\n+ Context->Trap.Fn.addFnAttr(Context->NoInline);\n+ Context->compileTrap();\n+\n+ compile(Module.getTypeSection(), true);\n+ compile(Module.getImportSection());\n+ compile(Module.getGlobalSection());\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ compile(Module.getTableSection(), Module.getElementSection());\n+\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+\n+ for (uint32_t FuncIndex : Sorted) {\n+ EXPECTED_TRY(compileFunctionBody(FuncIndex));\n+ }\n+\n+ spdlog::info(\"[lazy-jit]: verify batch ({} funcs) start\"sv, Sorted.size());\n+ LLModule.verify(LLVMPrintMessageAction);\n+ spdlog::info(\"[lazy-jit]: verify batch ({} funcs) done\"sv, Sorted.size());\n+\n+ auto &TM = LLData.extract().TM;\n+ EXPECTED_TRY(optimize(LLModule, TM));\n+\n+ spdlog::debug(\"[lazy-jit]: compile functions batch ({}) done\"sv,\n+ Sorted.size());\n+ return Expect<Data>{std::move(LLData)};\n+}\n+\n+void LLVM::Compiler::CompileContextDeleter::operator()(\n+ CompileContext *Context) const noexcept {\n+ delete Context;\n+}\n } // namespace LLVM\n } // namespace WasmEdge\n"}],"string":"[\n {\n \"comment\": \"This appears to be debug information. Remove it if it is no longer needed.\",\n \"path\": \"lib/llvm/compiler.cpp\",\n \"hunk\": \"@@ -3998,12 +4003,15 @@ class FunctionCompiler {\\n }\\n void compileAtomicWait(unsigned MemoryIndex, uint64_t MemoryOffset,\\n LLVM::Type TargetType, uint32_t BitWidth) noexcept {\\n+ spdlog::error(\\\"[lazyjit] memory_index: {}\\\", MemoryIndex);\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp\\nindex 39da94d9a9ac..330e245f51c3 100644\\n--- a/lib/llvm/compiler.cpp\\n+++ b/lib/llvm/compiler.cpp\\n@@ -9,6 +9,7 @@\\n #include \\\"common/spdlog.h\\\"\\n #include \\\"data.h\\\"\\n #include \\\"llvm.h\\\"\\n+#include \\\"spdlog/spdlog.h\\\"\\n #include \\\"system/allocator.h\\\"\\n \\n #include <algorithm>\\n@@ -16,6 +17,7 @@\\n #include <cinttypes>\\n #include <cstdint>\\n #include <cstdlib>\\n+#include <functional>\\n #include <limits>\\n #include <memory>\\n #include <numeric>\\n@@ -28,6 +30,16 @@ using namespace std::literals;\\n \\n namespace {\\n \\n+struct RAIICleanup {\\n+ RAIICleanup(LLVM::Compiler::CompileContext *&Context,\\n+ LLVM::Compiler::CompileContext *NewContext)\\n+ : Context(Context) {\\n+ Context = NewContext;\\n+ }\\n+ ~RAIICleanup() { Context = nullptr; }\\n+ LLVM::Compiler::CompileContext *&Context;\\n+};\\n+\\n static bool\\n isVoidReturn(WasmEdge::Span<const WasmEdge::ValType> ValTypes) noexcept;\\n static LLVM::Type toLLVMType(LLVM::Context LLContext,\\n@@ -128,7 +140,7 @@ static inline LLVMCodeGenOptLevel toLLVMCodeGenLevel(\\n \\n struct LLVM::Compiler::CompileContext {\\n LLVM::Context LLContext;\\n- LLVM::Module &LLModule;\\n+ std::reference_wrapper<LLVM::Module> LLModule;\\n LLVM::Attribute Cold;\\n LLVM::Attribute NoAlias;\\n LLVM::Attribute NoInline;\\n@@ -202,13 +214,16 @@ struct LLVM::Compiler::CompileContext {\\n std::vector<std::tuple<uint32_t, LLVM::FunctionCallee,\\n const WasmEdge::AST::CodeSegment *>>\\n Functions;\\n+ std::vector<LLVM::Value> LazyJITCacheVars;\\n+ uint32_t ImportCount = 0;\\n std::vector<LLVM::Type> MemoryAddrTypes;\\n std::vector<LLVM::Type> TableAddrTypes;\\n std::vector<LLVM::Type> Globals;\\n+ std::string Prefix;\\n LLVM::Value IntrinsicsTable;\\n LLVM::FunctionCallee Trap;\\n- CompileContext(LLVM::Context C, LLVM::Module &M,\\n- bool IsGenericBinary) noexcept\\n+ CompileContext(LLVM::Context C, LLVM::Module &M, bool IsGenericBinary,\\n+ std::string_view P = \\\"\\\"sv) noexcept\\n : LLContext(C), LLModule(M),\\n Cold(LLVM::Attribute::createEnum(C, LLVM::Core::Cold, 0)),\\n NoAlias(LLVM::Attribute::createEnum(C, LLVM::Core::NoAlias, 0)),\\n@@ -256,14 +271,14 @@ struct LLVM::Compiler::CompileContext {\\n })),\\n ExecCtxPtrTy(ExecCtxTy.getPointerTo()),\\n IntrinsicsTableTy(LLVM::Type::getArrayType(\\n- Int8PtrTy,\\n+ Int8Ty.getPointerTo(),\\n static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax))),\\n- IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()),\\n- IntrinsicsTable(LLModule.addGlobal(IntrinsicsTablePtrTy, true,\\n- LLVMExternalLinkage, LLVM::Value(),\\n- \\\"intrinsics\\\")) {\\n+ IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()), Prefix(P),\\n+ IntrinsicsTable(LLModule.get().addGlobal(\\n+ IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\\n+ fmt::format(\\\"{}intrinsics\\\"sv, Prefix).c_str())) {\\n Trap.Ty = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\\n- Trap.Fn = LLModule.addFunction(Trap.Ty, LLVMPrivateLinkage, \\\"trap\\\");\\n+ Trap.Fn = LLModule.get().addFunction(Trap.Ty, LLVMPrivateLinkage, \\\"trap\\\");\\n Trap.Fn.setDSOLocal(true);\\n Trap.Fn.addFnAttr(NoStackArgProbe);\\n Trap.Fn.addFnAttr(StrictFP);\\n@@ -272,9 +287,10 @@ struct LLVM::Compiler::CompileContext {\\n Trap.Fn.addFnAttr(Cold);\\n Trap.Fn.addFnAttr(NoInline);\\n \\n- LLModule.addGlobal(Int32Ty, true, LLVMExternalLinkage,\\n- LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\\n- \\\"version\\\");\\n+ LLModule.get().addGlobal(\\n+ Int32Ty, true, LLVMExternalLinkage,\\n+ LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\\n+ fmt::format(\\\"{}version\\\"sv, Prefix).c_str());\\n \\n if (!IsGenericBinary) {\\n SubtargetFeatures = LLVM::getHostCPUFeatures();\\n@@ -313,18 +329,7 @@ struct LLVM::Compiler::CompileContext {\\n }\\n }\\n \\n- {\\n- // create trap\\n- LLVM::Builder Builder(LLContext);\\n- Builder.positionAtEnd(\\n- LLVM::BasicBlock::create(LLContext, Trap.Fn, \\\"entry\\\"));\\n- auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\\n- auto CallTrap = Builder.createCall(\\n- getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\\n- {Trap.Fn.getFirstParam()});\\n- CallTrap.addCallSiteAttribute(NoReturn);\\n- Builder.createUnreachable();\\n- }\\n+ compileTrap();\\n }\\n LLVM::Value getMemory(LLVM::Builder &Builder, LLVM::Value ExecCtx,\\n uint32_t Index) noexcept {\\n@@ -394,6 +399,17 @@ struct LLVM::Compiler::CompileContext {\\n auto Ptr = Builder.createBitCast(VPtr, PtrPtrTy);\\n return {Ty, Builder.createLoad(PtrTy, Ptr)};\\n }\\n+ void compileTrap() noexcept {\\n+ LLVM::Builder Builder(LLContext);\\n+ Builder.positionAtEnd(\\n+ LLVM::BasicBlock::create(LLContext, Trap.Fn, \\\"entry\\\"));\\n+ auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\\n+ auto CallTrap = Builder.createCall(\\n+ getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\\n+ {Trap.Fn.getFirstParam()});\\n+ CallTrap.addCallSiteAttribute(NoReturn);\\n+ Builder.createUnreachable();\\n+ }\\n std::pair<std::vector<ValType>, std::vector<ValType>>\\n resolveBlockType(const BlockType &BType) const noexcept {\\n using VecT = std::vector<ValType>;\\n@@ -544,9 +560,10 @@ class FunctionCompiler {\\n FunctionCompiler(LLVM::Compiler::CompileContext &Context,\\n LLVM::FunctionCallee F, Span<const ValType> Locals,\\n bool Interruptible, bool InstructionCounting,\\n- bool GasMeasuring) noexcept\\n+ bool GasMeasuring, bool IsLazyJIT) noexcept\\n : Context(Context), LLContext(Context.LLContext),\\n- Interruptible(Interruptible), F(F), Builder(LLContext) {\\n+ Interruptible(Interruptible), IsLazyJIT(IsLazyJIT), F(F),\\n+ Builder(LLContext) {\\n if (F.Fn) {\\n Builder.positionAtEnd(LLVM::BasicBlock::create(LLContext, F.Fn, \\\"entry\\\"));\\n ExecCtx = Builder.createLoad(Context.ExecCtxTy, F.Fn.getFirstParam());\\n@@ -4267,7 +4284,63 @@ class FunctionCompiler {\\n Args[J + 1] = stackPop();\\n }\\n \\n- auto Ret = Builder.createCall(Function, Args);\\n+ LLVM::Value Ret;\\n+ if (IsLazyJIT) {\\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\\n+ if (IsImport) {\\n+ Ret = Builder.createCall(Function, Args);\\n+ } else {\\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\\n+\\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\\n+ }\\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\\n+ if (!CacheVar) {\\n+ CacheVar = Context.LLModule.get().addGlobal(\\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \\\"\\\");\\n+ }\\n+\\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \\\"ic.check\\\");\\n+ auto ResolveBB =\\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \\\"ic.resolve\\\");\\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \\\"ic.call\\\");\\n+\\n+ Builder.createBr(CheckBB);\\n+ Builder.positionAtEnd(CheckBB);\\n+\\n+ auto CachedPtr =\\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\\n+ CachedPtr.setAlignment(8);\\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\\n+ auto IsNull = Builder.createIsNull(CachedPtr);\\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\\n+\\n+ Builder.positionAtEnd(ResolveBB);\\n+ auto FPtr = Builder.createCall(\\n+ Context.getIntrinsic(\\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\\n+ {Context.Int32Ty}, false)),\\n+ {LLContext.getInt32(FuncIndex)});\\n+ auto Store = Builder.createStore(FPtr, CacheVar);\\n+ Store.setAlignment(8);\\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\\n+ Builder.createBr(CallBB);\\n+\\n+ Builder.positionAtEnd(CallBB);\\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\\n+\\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\\n+ }\\n+ } else {\\n+ Ret = Builder.createCall(Function, Args);\\n+ }\\n+\\n auto Ty = Ret.getType();\\n if (Ty.isVoidTy()) {\\n // nothing to do\\n@@ -4387,7 +4460,64 @@ class FunctionCompiler {\\n Args[J + 1] = stackPop();\\n }\\n \\n- auto Ret = Builder.createCall(Function, Args);\\n+ LLVM::Value Ret;\\n+ if (IsLazyJIT) {\\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\\n+ if (IsImport) {\\n+ Ret = Builder.createCall(Function, Args);\\n+ } else {\\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\\n+\\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\\n+ }\\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\\n+ if (!CacheVar) {\\n+ CacheVar = Context.LLModule.get().addGlobal(\\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \\\"\\\");\\n+ }\\n+\\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \\\"rc.check\\\");\\n+ auto ResolveBB =\\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \\\"rc.resolve\\\");\\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \\\"rc.call\\\");\\n+\\n+ Builder.createBr(CheckBB);\\n+ Builder.positionAtEnd(CheckBB);\\n+\\n+ auto CachedPtr =\\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\\n+ CachedPtr.setAlignment(8);\\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\\n+ auto IsNull = Builder.createIsNull(CachedPtr);\\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\\n+\\n+ Builder.positionAtEnd(ResolveBB);\\n+ auto FPtr = Builder.createCall(\\n+ Context.getIntrinsic(\\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\\n+ {Context.Int32Ty}, false)),\\n+ {LLContext.getInt32(FuncIndex)});\\n+ auto Store = Builder.createStore(FPtr, CacheVar);\\n+ Store.setAlignment(8);\\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\\n+ Builder.createBr(CallBB);\\n+\\n+ Builder.positionAtEnd(CallBB);\\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\\n+\\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\\n+ }\\n+ } else {\\n+ Ret = Builder.createCall(Function, Args);\\n+ }\\n+\\n+ Ret.setMustTailCall();\\n auto Ty = Ret.getType();\\n if (Ty.isVoidTy()) {\\n Builder.createRetVoid();\\n@@ -4432,6 +4562,7 @@ class FunctionCompiler {\\n \\n auto FPtrRet =\\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\\n+ FPtrRet.setMustTailCall();\\n if (RetSize == 0) {\\n Builder.createRetVoid();\\n } else {\\n@@ -4608,6 +4739,7 @@ class FunctionCompiler {\\n \\n auto FPtrRet =\\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\\n+ FPtrRet.setMustTailCall();\\n if (RetSize == 0) {\\n Builder.createRetVoid();\\n } else {\\n@@ -5854,6 +5986,7 @@ class FunctionCompiler {\\n Control &operator=(const Control &) = default;\\n Control &operator=(Control &&) = default;\\n };\\n+ bool IsLazyJIT;\\n std::vector<Control> ControlStack;\\n LLVM::FunctionCallee F;\\n LLVM::Value ExecCtx;\\n@@ -5894,6 +6027,84 @@ Expect<void> Compiler::checkConfigure() noexcept {\\n return {};\\n }\\n \\n+Expect<void> Compiler::optimize(LLVM::Module &LLModule,\\n+ LLVM::TargetMachine &TM) noexcept {\\n+ spdlog::info(\\\"optimize start\\\"sv);\\n+ auto Triple = LLModule.getTarget();\\n+ auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\\n+ if (ErrorMessage) {\\n+ spdlog::error(\\\"getFromTriple failed:{}\\\"sv, ErrorMessage.string_view());\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ std::string CPUName;\\n+#if defined(__riscv) && __riscv_xlen == 64\\n+ CPUName = \\\"generic-rv64\\\"s;\\n+#else\\n+ if (!Conf.getCompilerConfigure().isGenericBinary()) {\\n+ CPUName = LLVM::getHostCPUName().string_view();\\n+ } else {\\n+ CPUName = \\\"generic\\\"s;\\n+ }\\n+#endif\\n+\\n+ // On RISC-V we use generic-rv64 as the CPU, so also use default\\n+ // features; host features under QEMU can be inconsistent (e.g.\\n+ // zvl*b without v) which LLVM >= 20 rejects.\\n+ TM = LLVM::TargetMachine::create(\\n+ TheTarget, Triple, CPUName.c_str(),\\n+#if defined(__riscv) && __riscv_xlen == 64\\n+ \\\"\\\",\\n+#else\\n+ LLVM::getHostCPUFeatures().unwrap(),\\n+#endif\\n+ toLLVMCodeGenLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\\n+ LLVMRelocPIC, LLVMCodeModelDefault);\\n+\\n+#if LLVM_VERSION_MAJOR >= 13\\n+ auto PBO = LLVM::PassBuilderOptions::create();\\n+ if (auto Error = PBO.runPasses(\\n+ LLModule,\\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\\n+ TM)) {\\n+ spdlog::error(\\\"{}\\\"sv, Error.message().string_view());\\n+ }\\n+#else\\n+ auto FP = LLVM::PassManager::createForModule(LLModule);\\n+ auto MP = LLVM::PassManager::create();\\n+\\n+ TM.addAnalysisPasses(MP);\\n+ TM.addAnalysisPasses(FP);\\n+ {\\n+ auto PMB = LLVM::PassManagerBuilder::create();\\n+ auto [OptLevel, SizeLevel] =\\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\\n+ PMB.setOptLevel(OptLevel);\\n+ PMB.setSizeLevel(SizeLevel);\\n+ PMB.populateFunctionPassManager(FP);\\n+ PMB.populateModulePassManager(MP);\\n+ }\\n+ switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\\n+ case CompilerConfigure::OptimizationLevel::O0:\\n+ case CompilerConfigure::OptimizationLevel::O1:\\n+ FP.addTailCallEliminationPass();\\n+ break;\\n+ default:\\n+ break;\\n+ }\\n+\\n+ FP.initializeFunctionPassManager();\\n+ for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\\n+ FP.runFunctionPassManager(Fn);\\n+ }\\n+ FP.finalizeFunctionPassManager();\\n+ MP.runPassManager(LLModule);\\n+#endif\\n+\\n+ spdlog::info(\\\"optimize done\\\"sv);\\n+ return {};\\n+}\\n+\\n Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\\n // Check that the module is validated.\\n if (unlikely(!Module.getIsValidated())) {\\n@@ -5913,15 +6124,7 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\\n \\n CompileContext NewContext(LLContext, LLModule,\\n Conf.getCompilerConfigure().isGenericBinary());\\n- struct RAIICleanup {\\n- RAIICleanup(CompileContext *&Context, CompileContext &NewContext)\\n- : Context(Context) {\\n- Context = &NewContext;\\n- }\\n- ~RAIICleanup() { Context = nullptr; }\\n- CompileContext *&Context;\\n- };\\n- RAIICleanup Cleanup(Context, NewContext);\\n+ RAIICleanup Cleanup(Context, &NewContext);\\n \\n // Compile Function Types\\n compile(Module.getTypeSection());\\n@@ -5942,81 +6145,8 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\\n spdlog::info(\\\"verify start\\\"sv);\\n LLModule.verify(LLVMPrintMessageAction);\\n \\n- spdlog::info(\\\"optimize start\\\"sv);\\n auto &TM = D.extract().TM;\\n- {\\n- auto Triple = LLModule.getTarget();\\n- auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\\n- if (ErrorMessage) {\\n- spdlog::error(\\\"getFromTriple failed:{}\\\"sv, ErrorMessage.string_view());\\n- return Unexpect(ErrCode::Value::IllegalPath);\\n- } else {\\n- std::string CPUName;\\n-#if defined(__riscv) && __riscv_xlen == 64\\n- CPUName = \\\"generic-rv64\\\"s;\\n-#else\\n- if (!Conf.getCompilerConfigure().isGenericBinary()) {\\n- CPUName = LLVM::getHostCPUName().string_view();\\n- } else {\\n- CPUName = \\\"generic\\\"s;\\n- }\\n-#endif\\n-\\n- // On RISC-V we use generic-rv64 as the CPU, so also use default\\n- // features; host features under QEMU can be inconsistent (e.g.\\n- // zvl*b without v) which LLVM >= 20 rejects.\\n- TM = LLVM::TargetMachine::create(\\n- TheTarget, Triple, CPUName.c_str(),\\n-#if defined(__riscv) && __riscv_xlen == 64\\n- \\\"\\\",\\n-#else\\n- LLVM::getHostCPUFeatures().unwrap(),\\n-#endif\\n- toLLVMCodeGenLevel(\\n- Conf.getCompilerConfigure().getOptimizationLevel()),\\n- LLVMRelocPIC, LLVMCodeModelDefault);\\n- }\\n-\\n-#if LLVM_VERSION_MAJOR >= 13\\n- auto PBO = LLVM::PassBuilderOptions::create();\\n- if (auto Error = PBO.runPasses(\\n- LLModule,\\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\\n- TM)) {\\n- spdlog::error(\\\"{}\\\"sv, Error.message().string_view());\\n- }\\n-#else\\n- auto FP = LLVM::PassManager::createForModule(LLModule);\\n- auto MP = LLVM::PassManager::create();\\n-\\n- TM.addAnalysisPasses(MP);\\n- TM.addAnalysisPasses(FP);\\n- {\\n- auto PMB = LLVM::PassManagerBuilder::create();\\n- auto [OptLevel, SizeLevel] =\\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\\n- PMB.setOptLevel(OptLevel);\\n- PMB.setSizeLevel(SizeLevel);\\n- PMB.populateFunctionPassManager(FP);\\n- PMB.populateModulePassManager(MP);\\n- }\\n- switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\\n- case CompilerConfigure::OptimizationLevel::O0:\\n- case CompilerConfigure::OptimizationLevel::O1:\\n- FP.addTailCallEliminationPass();\\n- break;\\n- default:\\n- break;\\n- }\\n-\\n- FP.initializeFunctionPassManager();\\n- for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\\n- FP.runFunctionPassManager(Fn);\\n- }\\n- FP.finalizeFunctionPassManager();\\n- MP.runPassManager(LLModule);\\n-#endif\\n- }\\n+ EXPECTED_TRY(optimize(LLModule, TM));\\n \\n // Set initializer for constant value\\n if (auto IntrinsicsTable = LLModule.getNamedGlobal(\\\"intrinsics\\\")) {\\n@@ -6031,12 +6161,11 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\\n IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\\n LLVM::Value::getConstNull(IntrinsicsTableTy), \\\"intrinsics\\\");\\n }\\n-\\n- spdlog::info(\\\"optimize done\\\"sv);\\n return Expect<Data>{std::move(D)};\\n }\\n \\n-void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\\n+void Compiler::compile(const AST::TypeSection &TypeSec,\\n+ bool DeclarationsOnly) noexcept {\\n auto WrapperTy =\\n LLVM::Type::getFunctionType(Context->VoidTy,\\n {Context->ExecCtxPtrTy, Context->Int8PtrTy,\\n@@ -6050,10 +6179,25 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\\n Context->CompositeTypes.reserve(Size);\\n Context->FunctionWrappers.reserve(Size);\\n \\n+ auto SetFuncAttributes = [&](auto FDecl) {\\n+ FDecl.setVisibility(LLVMProtectedVisibility);\\n+ FDecl.setDSOLocal(true);\\n+ FDecl.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ FDecl.addFnAttr(Context->NoStackArgProbe);\\n+ FDecl.addFnAttr(Context->StrictFP);\\n+ FDecl.addFnAttr(Context->UWTable);\\n+ FDecl.addParamAttr(0, Context->ReadOnly);\\n+ FDecl.addParamAttr(0, Context->NoAlias);\\n+ FDecl.addParamAttr(1, Context->NoAlias);\\n+ FDecl.addParamAttr(2, Context->NoAlias);\\n+ FDecl.addParamAttr(3, Context->NoAlias);\\n+ };\\n+\\n // Iterate and compile types.\\n for (size_t I = 0; I < Size; ++I) {\\n const auto &CompType = SubTypes[I].getCompositeType();\\n- const auto Name = fmt::format(\\\"t{}\\\"sv, Context->CompositeTypes.size());\\n+ const auto Name =\\n+ fmt::format(\\\"{}t{}\\\"sv, Context->Prefix, Context->CompositeTypes.size());\\n if (CompType.isFunc()) {\\n // Check that the function type is unique.\\n {\\n@@ -6065,13 +6209,21 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\\n if (OldFuncType == CompType.getFuncType()) {\\n Unique = false;\\n Context->CompositeTypes.push_back(Context->CompositeTypes[J]);\\n- auto F = Context->FunctionWrappers[J];\\n- Context->FunctionWrappers.push_back(F);\\n- auto A = Context->LLModule.addAlias(WrapperTy, F, Name.c_str());\\n- A.setLinkage(LLVMExternalLinkage);\\n- A.setVisibility(LLVMProtectedVisibility);\\n- A.setDSOLocal(true);\\n- A.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ if (DeclarationsOnly) {\\n+ auto FDecl = Context->LLModule.get().addFunction(\\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\\n+ SetFuncAttributes(FDecl);\\n+ Context->FunctionWrappers.push_back(FDecl);\\n+ } else {\\n+ auto F = Context->FunctionWrappers[J];\\n+ Context->FunctionWrappers.push_back(F);\\n+ auto A = Context->LLModule.get().addAlias(WrapperTy, F,\\n+ Name.c_str());\\n+ A.setLinkage(LLVMExternalLinkage);\\n+ A.setVisibility(LLVMProtectedVisibility);\\n+ A.setDSOLocal(true);\\n+ A.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ }\\n break;\\n }\\n }\\n@@ -6082,81 +6234,66 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\\n }\\n \\n // Create Wrapper\\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\\n- Name.c_str());\\n+ auto F = Context->LLModule.get().addFunction(\\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\\n {\\n- F.setVisibility(LLVMProtectedVisibility);\\n- F.setDSOLocal(true);\\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\\n- F.addFnAttr(Context->NoStackArgProbe);\\n- F.addFnAttr(Context->StrictFP);\\n- F.addFnAttr(Context->UWTable);\\n- F.addParamAttr(0, Context->ReadOnly);\\n- F.addParamAttr(0, Context->NoAlias);\\n- F.addParamAttr(1, Context->NoAlias);\\n- F.addParamAttr(2, Context->NoAlias);\\n- F.addParamAttr(3, Context->NoAlias);\\n-\\n- LLVM::Builder Builder(Context->LLContext);\\n- Builder.positionAtEnd(\\n- LLVM::BasicBlock::create(Context->LLContext, F, \\\"entry\\\"));\\n-\\n- auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\\n- CompType.getFuncType());\\n- auto RTy = FTy.getReturnType();\\n- std::vector<LLVM::Type> FPTy(FTy.getNumParams());\\n- FTy.getParamTypes(FPTy);\\n-\\n- const size_t ArgCount = FPTy.size() - 1;\\n- auto ExecCtxPtr = F.getFirstParam();\\n- auto RawFunc = LLVM::FunctionCallee{\\n- FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\\n- FTy.getPointerTo())};\\n- auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\\n- auto RawRets = RawArgs.getNextParam();\\n-\\n- std::vector<LLVM::Value> Args;\\n- Args.reserve(FTy.getNumParams());\\n- Args.push_back(ExecCtxPtr);\\n- for (size_t J = 0; J < ArgCount; ++J) {\\n- Args.push_back(Builder.createValuePtrLoad(\\n- FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\\n- }\\n+ SetFuncAttributes(F);\\n+\\n+ if (!DeclarationsOnly) {\\n+ LLVM::Builder Builder(Context->LLContext);\\n+ Builder.positionAtEnd(\\n+ LLVM::BasicBlock::create(Context->LLContext, F, \\\"entry\\\"));\\n+\\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\\n+ CompType.getFuncType());\\n+ auto RTy = FTy.getReturnType();\\n+ std::vector<LLVM::Type> FPTy(FTy.getNumParams());\\n+ FTy.getParamTypes(FPTy);\\n+\\n+ const size_t ArgCount = FPTy.size() - 1;\\n+ auto ExecCtxPtr = F.getFirstParam();\\n+ auto RawFunc = LLVM::FunctionCallee{\\n+ FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\\n+ FTy.getPointerTo())};\\n+ auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\\n+ auto RawRets = RawArgs.getNextParam();\\n+\\n+ std::vector<LLVM::Value> Args;\\n+ Args.reserve(FTy.getNumParams());\\n+ Args.push_back(ExecCtxPtr);\\n+ for (size_t J = 0; J < ArgCount; ++J) {\\n+ Args.push_back(Builder.createValuePtrLoad(\\n+ FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\\n+ }\\n \\n- auto Ret = Builder.createCall(RawFunc, Args);\\n- if (RTy.isVoidTy()) {\\n- // nothing to do\\n- } else if (RTy.isStructTy()) {\\n- auto Rets = unpackStruct(Builder, Ret);\\n- Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty, kValSize);\\n- } else {\\n- Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\\n+ auto Ret = Builder.createCall(RawFunc, Args);\\n+ if (RTy.isVoidTy()) {\\n+ // nothing to do\\n+ } else if (RTy.isStructTy()) {\\n+ auto Rets = unpackStruct(Builder, Ret);\\n+ Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty,\\n+ kValSize);\\n+ } else {\\n+ Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\\n+ }\\n+ Builder.createRetVoid();\\n }\\n- Builder.createRetVoid();\\n }\\n // Copy wrapper, param and return lists to module instance.\\n Context->FunctionWrappers.push_back(F);\\n } else {\\n // Non function type case. Create empty wrapper.\\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\\n- Name.c_str());\\n+ auto F = Context->LLModule.get().addFunction(\\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\\n {\\n- F.setVisibility(LLVMProtectedVisibility);\\n- F.setDSOLocal(true);\\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\\n- F.addFnAttr(Context->NoStackArgProbe);\\n- F.addFnAttr(Context->StrictFP);\\n- F.addFnAttr(Context->UWTable);\\n- F.addParamAttr(0, Context->ReadOnly);\\n- F.addParamAttr(0, Context->NoAlias);\\n- F.addParamAttr(1, Context->NoAlias);\\n- F.addParamAttr(2, Context->NoAlias);\\n- F.addParamAttr(3, Context->NoAlias);\\n-\\n- LLVM::Builder Builder(Context->LLContext);\\n- Builder.positionAtEnd(\\n- LLVM::BasicBlock::create(Context->LLContext, F, \\\"entry\\\"));\\n- Builder.createRetVoid();\\n+ SetFuncAttributes(F);\\n+\\n+ if (!DeclarationsOnly) {\\n+ LLVM::Builder Builder(Context->LLContext);\\n+ Builder.positionAtEnd(\\n+ LLVM::BasicBlock::create(Context->LLContext, F, \\\"entry\\\"));\\n+ Builder.createRetVoid();\\n+ }\\n }\\n Context->FunctionWrappers.push_back(F);\\n }\\n@@ -6184,9 +6321,9 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\\n toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\\n auto RTy = FTy.getReturnType();\\n auto F = LLVM::FunctionCallee{\\n- FTy,\\n- Context->LLModule.addFunction(FTy, LLVMInternalLinkage,\\n- fmt::format(\\\"f{}\\\"sv, FuncID).c_str())};\\n+ FTy, Context->LLModule.get().addFunction(\\n+ FTy, LLVMInternalLinkage,\\n+ fmt::format(\\\"{}f{}\\\"sv, Context->Prefix, FuncID).c_str())};\\n F.Fn.setDSOLocal(true);\\n F.Fn.addFnAttr(Context->NoStackArgProbe);\\n F.Fn.addFnAttr(Context->StrictFP);\\n@@ -6231,6 +6368,7 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\\n }\\n \\n Context->Functions.emplace_back(TypeIdx, F, nullptr);\\n+ Context->ImportCount++;\\n break;\\n }\\n case ExternalType::Table: // Table type\\n@@ -6313,9 +6451,10 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\\n const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\\n const auto FuncID = Context->Functions.size();\\n auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\\n- LLVM::FunctionCallee F = {FTy, Context->LLModule.addFunction(\\n- FTy, LLVMExternalLinkage,\\n- fmt::format(\\\"f{}\\\"sv, FuncID).c_str())};\\n+ LLVM::FunctionCallee F = {\\n+ FTy, Context->LLModule.get().addFunction(\\n+ FTy, LLVMExternalLinkage,\\n+ fmt::format(\\\"{}f{}\\\"sv, Context->Prefix, FuncID).c_str())};\\n F.Fn.setVisibility(LLVMProtectedVisibility);\\n F.Fn.setDSOLocal(true);\\n F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\\n@@ -6339,10 +6478,11 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\\n Locals.push_back(Local.second);\\n }\\n }\\n- FunctionCompiler FC(*Context, F, Locals,\\n- Conf.getCompilerConfigure().isInterruptible(),\\n- Conf.getStatisticsConfigure().isInstructionCounting(),\\n- Conf.getStatisticsConfigure().isCostMeasuring());\\n+ FunctionCompiler FC(\\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\\n auto Type = Context->resolveBlockType(T);\\n EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\\n F.Fn.eliminateUnreachableBlocks();\\n@@ -6350,5 +6490,235 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\\n return {};\\n }\\n \\n+void Compiler::compileFunctionDeclarations(\\n+ const AST::FunctionSection &FunctionSec,\\n+ const AST::CodeSection &CodeSec) noexcept {\\n+ const auto &TypeIdxs = FunctionSec.getContent();\\n+ const auto &CodeSegs = CodeSec.getContent();\\n+ assuming(TypeIdxs.size() == CodeSegs.size());\\n+\\n+ for (size_t I = 0; I < CodeSegs.size(); ++I) {\\n+ const auto &TypeIdx = TypeIdxs[I];\\n+ const auto &Code = CodeSegs[I];\\n+ assuming(TypeIdx < Context->CompositeTypes.size());\\n+ assuming(Context->CompositeTypes[TypeIdx]->isFunc());\\n+ const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\\n+ const auto FuncID = Context->Functions.size();\\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\\n+ LLVM::FunctionCallee F = {\\n+ FTy, Context->LLModule.get().addFunction(\\n+ FTy, LLVMExternalLinkage,\\n+ fmt::format(\\\"{}f{}\\\"sv, Context->Prefix, FuncID).c_str())};\\n+ F.Fn.setVisibility(LLVMProtectedVisibility);\\n+ F.Fn.setDSOLocal(true);\\n+ F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ F.Fn.addFnAttr(Context->NoStackArgProbe);\\n+ F.Fn.addFnAttr(Context->StrictFP);\\n+ F.Fn.addFnAttr(Context->UWTable);\\n+ F.Fn.addParamAttr(0, Context->ReadOnly);\\n+ F.Fn.addParamAttr(0, Context->NoAlias);\\n+\\n+ Context->Functions.emplace_back(TypeIdx, F, &Code);\\n+ }\\n+}\\n+\\n+Expect<void> Compiler::compileFunctionBody(uint32_t LocalFuncIndex) noexcept {\\n+ // Find the function in the Functions list\\n+ // LocalFuncIndex is relative to the defined functions (not imports)\\n+ uint32_t GlobalFuncIndex = Context->ImportCount + LocalFuncIndex;\\n+ if (GlobalFuncIndex >= Context->Functions.size()) {\\n+ spdlog::error(\\\"[lazy-jit]: function index {} out of range\\\"sv,\\n+ LocalFuncIndex);\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ auto &[T, F, Code] = Context->Functions[GlobalFuncIndex];\\n+ if (!Code) {\\n+ spdlog::error(\\\"[lazy-jit]: cannot compile import function {}\\\"sv,\\n+ LocalFuncIndex);\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ // Check if already compiled (function has basic blocks)\\n+ if (F.Fn.countBasicBlocks() > 0) {\\n+ spdlog::debug(\\\"[lazy-jit]: function {} already compiled\\\"sv, LocalFuncIndex);\\n+ return {};\\n+ }\\n+\\n+ spdlog::debug(\\\"[lazy-jit]: compiling function {}\\\"sv, LocalFuncIndex);\\n+\\n+ std::vector<ValType> Locals;\\n+ for (const auto &Local : Code->getLocals()) {\\n+ for (unsigned I = 0; I < Local.first; ++I) {\\n+ Locals.push_back(Local.second);\\n+ }\\n+ }\\n+\\n+ FunctionCompiler FC(\\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\\n+ auto Type = Context->resolveBlockType(T);\\n+ EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\\n+ F.Fn.eliminateUnreachableBlocks();\\n+\\n+ return {};\\n+}\\n+\\n+Expect<std::pair<LLVM::Data,\\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\\n+ LLVM::Compiler::CompileContextDeleter>>>\\n+LLVM::Compiler::compileInfrastructure(const AST::Module &Module,\\n+ std::string Prefix) noexcept {\\n+ Data D;\\n+ D.setPrefix(Prefix);\\n+ // Check the module is validated.\\n+ if (unlikely(!Module.getIsValidated())) {\\n+ spdlog::error(ErrCode::Value::NotValidated);\\n+ return Unexpect(ErrCode::Value::NotValidated);\\n+ }\\n+\\n+ std::unique_lock Lock(Mutex);\\n+ spdlog::info(\\\"[lazy-jit]: compile infrastructure start\\\"sv);\\n+\\n+ auto LLContext = D.extract().getLLContext();\\n+ LLVM::Core::init(LLContext.unwrap());\\n+ auto &LLModule = D.extract().LLModule;\\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \\\"PIC Level\\\"sv, 2);\\n+\\n+ std::unique_ptr<CompileContext, CompileContextDeleter> NewContext(\\n+ new CompileContext(LLContext, LLModule,\\n+ Conf.getCompilerConfigure().isGenericBinary(),\\n+ D.getPrefix()));\\n+ RAIICleanup Cleanup(this->Context, NewContext.get());\\n+\\n+ // Compile Function Types\\n+ compile(Module.getTypeSection());\\n+ // Compile ImportSection\\n+ compile(Module.getImportSection());\\n+ // Compile GlobalSection\\n+ compile(Module.getGlobalSection());\\n+ // Compile MemorySection (MemorySec, DataSec)\\n+ compile(Module.getMemorySection(), Module.getDataSection());\\n+ // Compile TableSection (TableSec, ElemSec)\\n+ compile(Module.getTableSection(), Module.getElementSection());\\n+ // Create function declarations without compiling bodies\\n+ compileFunctionDeclarations(Module.getFunctionSection(),\\n+ Module.getCodeSection());\\n+ // Compile ExportSection\\n+ compile(Module.getExportSection());\\n+\\n+ // Set initializer for constant value\\n+ auto IntrinsicsName = fmt::format(\\\"{}intrinsics\\\"sv, D.getPrefix());\\n+ if (auto IntrinsicsTable = LLModule.getNamedGlobal(IntrinsicsName.c_str())) {\\n+ IntrinsicsTable.setInitializer(\\n+ LLVM::Value::getConstNull(IntrinsicsTable.getType()));\\n+ IntrinsicsTable.setGlobalConstant(false);\\n+ } else {\\n+ auto IntrinsicsTableTy = LLVM::Type::getArrayType(\\n+ LLContext.getInt8Ty().getPointerTo(),\\n+ static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax));\\n+ LLModule.addGlobal(\\n+ IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\\n+ LLVM::Value::getConstNull(IntrinsicsTableTy), IntrinsicsName.c_str());\\n+ }\\n+ LLModule.verify(LLVMPrintMessageAction);\\n+\\n+ spdlog::info(\\\"[lazy-jit]: infrastructure compilation done\\\"sv);\\n+\\n+ return Expect<\\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>>{\\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>{\\n+ std::move(D), std::move(NewContext)}};\\n+}\\n+\\n+Expect<LLVM::Data>\\n+Compiler::compileFunctions(Data &&LLData, CompileContext *NewContext,\\n+ const AST::Module &Module,\\n+ Span<const uint32_t> LocalFuncIndices) noexcept {\\n+ if (unlikely(!Module.getIsValidated())) {\\n+ spdlog::error(ErrCode::Value::NotValidated);\\n+ return Unexpect(ErrCode::Value::NotValidated);\\n+ }\\n+ if (unlikely(LocalFuncIndices.empty())) {\\n+ spdlog::error(\\\"[lazy-jit]: compileFunctions with empty index list\\\"sv);\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ std::unique_lock Lock(Mutex);\\n+ std::vector<uint32_t> Sorted(LocalFuncIndices.begin(),\\n+ LocalFuncIndices.end());\\n+ std::sort(Sorted.begin(), Sorted.end());\\n+ Sorted.erase(std::unique(Sorted.begin(), Sorted.end()), Sorted.end());\\n+\\n+ spdlog::debug(\\\"[lazy-jit]: compile functions batch ({}) start\\\"sv,\\n+ Sorted.size());\\n+\\n+ auto LLContext = LLData.extract().getLLContext();\\n+ LLVM::Core::init(LLContext.unwrap());\\n+ auto &LLModule = LLData.extract().LLModule;\\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \\\"PIC Level\\\"sv, 2);\\n+\\n+ RAIICleanup Cleanup(this->Context, NewContext);\\n+ Context->LLModule = LLModule;\\n+\\n+ Context->CompositeTypes.clear();\\n+ Context->FunctionWrappers.clear();\\n+ Context->Functions.clear();\\n+ Context->LazyJITCacheVars.clear();\\n+ Context->ImportCount = 0;\\n+ Context->MemoryAddrTypes.clear();\\n+ Context->TableAddrTypes.clear();\\n+ Context->Globals.clear();\\n+\\n+ Context->IntrinsicsTable = LLModule.addGlobal(\\n+ Context->IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\\n+ fmt::format(\\\"{}intrinsics\\\"sv, Context->Prefix).c_str());\\n+ Context->IntrinsicsTable.setInitializer(LLVM::Value());\\n+ Context->Trap.Ty =\\n+ LLVM::Type::getFunctionType(Context->VoidTy, {Context->Int32Ty});\\n+ Context->Trap.Fn =\\n+ LLModule.addFunction(Context->Trap.Ty, LLVMPrivateLinkage, \\\"trap\\\");\\n+ Context->Trap.Fn.setDSOLocal(true);\\n+ Context->Trap.Fn.addFnAttr(Context->NoStackArgProbe);\\n+ Context->Trap.Fn.addFnAttr(Context->StrictFP);\\n+ Context->Trap.Fn.addFnAttr(Context->UWTable);\\n+ Context->Trap.Fn.addFnAttr(Context->NoReturn);\\n+ Context->Trap.Fn.addFnAttr(Context->Cold);\\n+ Context->Trap.Fn.addFnAttr(Context->NoInline);\\n+ Context->compileTrap();\\n+\\n+ compile(Module.getTypeSection(), true);\\n+ compile(Module.getImportSection());\\n+ compile(Module.getGlobalSection());\\n+ compile(Module.getMemorySection(), Module.getDataSection());\\n+ compile(Module.getTableSection(), Module.getElementSection());\\n+\\n+ compileFunctionDeclarations(Module.getFunctionSection(),\\n+ Module.getCodeSection());\\n+\\n+ for (uint32_t FuncIndex : Sorted) {\\n+ EXPECTED_TRY(compileFunctionBody(FuncIndex));\\n+ }\\n+\\n+ spdlog::info(\\\"[lazy-jit]: verify batch ({} funcs) start\\\"sv, Sorted.size());\\n+ LLModule.verify(LLVMPrintMessageAction);\\n+ spdlog::info(\\\"[lazy-jit]: verify batch ({} funcs) done\\\"sv, Sorted.size());\\n+\\n+ auto &TM = LLData.extract().TM;\\n+ EXPECTED_TRY(optimize(LLModule, TM));\\n+\\n+ spdlog::debug(\\\"[lazy-jit]: compile functions batch ({}) done\\\"sv,\\n+ Sorted.size());\\n+ return Expect<Data>{std::move(LLData)};\\n+}\\n+\\n+void LLVM::Compiler::CompileContextDeleter::operator()(\\n+ CompileContext *Context) const noexcept {\\n+ delete Context;\\n+}\\n } // namespace LLVM\\n } // namespace WasmEdge\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13285,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"This appears to be debug information. Remove it if it is no longer needed."},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp\nindex 39da94d9a9ac..330e245f51c3 100644\n--- a/lib/llvm/compiler.cpp\n+++ b/lib/llvm/compiler.cpp\n@@ -9,6 +9,7 @@\n #include \"common/spdlog.h\"\n #include \"data.h\"\n #include \"llvm.h\"\n+#include \"spdlog/spdlog.h\"\n #include \"system/allocator.h\"\n \n #include <algorithm>\n@@ -16,6 +17,7 @@\n #include <cinttypes>\n #include <cstdint>\n #include <cstdlib>\n+#include <functional>\n #include <limits>\n #include <memory>\n #include <numeric>\n@@ -28,6 +30,16 @@ using namespace std::literals;\n \n namespace {\n \n+struct RAIICleanup {\n+ RAIICleanup(LLVM::Compiler::CompileContext *&Context,\n+ LLVM::Compiler::CompileContext *NewContext)\n+ : Context(Context) {\n+ Context = NewContext;\n+ }\n+ ~RAIICleanup() { Context = nullptr; }\n+ LLVM::Compiler::CompileContext *&Context;\n+};\n+\n static bool\n isVoidReturn(WasmEdge::Span<const WasmEdge::ValType> ValTypes) noexcept;\n static LLVM::Type toLLVMType(LLVM::Context LLContext,\n@@ -128,7 +140,7 @@ static inline LLVMCodeGenOptLevel toLLVMCodeGenLevel(\n \n struct LLVM::Compiler::CompileContext {\n LLVM::Context LLContext;\n- LLVM::Module &LLModule;\n+ std::reference_wrapper<LLVM::Module> LLModule;\n LLVM::Attribute Cold;\n LLVM::Attribute NoAlias;\n LLVM::Attribute NoInline;\n@@ -202,13 +214,16 @@ struct LLVM::Compiler::CompileContext {\n std::vector<std::tuple<uint32_t, LLVM::FunctionCallee,\n const WasmEdge::AST::CodeSegment *>>\n Functions;\n+ std::vector<LLVM::Value> LazyJITCacheVars;\n+ uint32_t ImportCount = 0;\n std::vector<LLVM::Type> MemoryAddrTypes;\n std::vector<LLVM::Type> TableAddrTypes;\n std::vector<LLVM::Type> Globals;\n+ std::string Prefix;\n LLVM::Value IntrinsicsTable;\n LLVM::FunctionCallee Trap;\n- CompileContext(LLVM::Context C, LLVM::Module &M,\n- bool IsGenericBinary) noexcept\n+ CompileContext(LLVM::Context C, LLVM::Module &M, bool IsGenericBinary,\n+ std::string_view P = \"\"sv) noexcept\n : LLContext(C), LLModule(M),\n Cold(LLVM::Attribute::createEnum(C, LLVM::Core::Cold, 0)),\n NoAlias(LLVM::Attribute::createEnum(C, LLVM::Core::NoAlias, 0)),\n@@ -256,14 +271,14 @@ struct LLVM::Compiler::CompileContext {\n })),\n ExecCtxPtrTy(ExecCtxTy.getPointerTo()),\n IntrinsicsTableTy(LLVM::Type::getArrayType(\n- Int8PtrTy,\n+ Int8Ty.getPointerTo(),\n static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax))),\n- IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()),\n- IntrinsicsTable(LLModule.addGlobal(IntrinsicsTablePtrTy, true,\n- LLVMExternalLinkage, LLVM::Value(),\n- \"intrinsics\")) {\n+ IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()), Prefix(P),\n+ IntrinsicsTable(LLModule.get().addGlobal(\n+ IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\n+ fmt::format(\"{}intrinsics\"sv, Prefix).c_str())) {\n Trap.Ty = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n- Trap.Fn = LLModule.addFunction(Trap.Ty, LLVMPrivateLinkage, \"trap\");\n+ Trap.Fn = LLModule.get().addFunction(Trap.Ty, LLVMPrivateLinkage, \"trap\");\n Trap.Fn.setDSOLocal(true);\n Trap.Fn.addFnAttr(NoStackArgProbe);\n Trap.Fn.addFnAttr(StrictFP);\n@@ -272,9 +287,10 @@ struct LLVM::Compiler::CompileContext {\n Trap.Fn.addFnAttr(Cold);\n Trap.Fn.addFnAttr(NoInline);\n \n- LLModule.addGlobal(Int32Ty, true, LLVMExternalLinkage,\n- LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\n- \"version\");\n+ LLModule.get().addGlobal(\n+ Int32Ty, true, LLVMExternalLinkage,\n+ LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\n+ fmt::format(\"{}version\"sv, Prefix).c_str());\n \n if (!IsGenericBinary) {\n SubtargetFeatures = LLVM::getHostCPUFeatures();\n@@ -313,18 +329,7 @@ struct LLVM::Compiler::CompileContext {\n }\n }\n \n- {\n- // create trap\n- LLVM::Builder Builder(LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(LLContext, Trap.Fn, \"entry\"));\n- auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n- auto CallTrap = Builder.createCall(\n- getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\n- {Trap.Fn.getFirstParam()});\n- CallTrap.addCallSiteAttribute(NoReturn);\n- Builder.createUnreachable();\n- }\n+ compileTrap();\n }\n LLVM::Value getMemory(LLVM::Builder &Builder, LLVM::Value ExecCtx,\n uint32_t Index) noexcept {\n@@ -394,6 +399,17 @@ struct LLVM::Compiler::CompileContext {\n auto Ptr = Builder.createBitCast(VPtr, PtrPtrTy);\n return {Ty, Builder.createLoad(PtrTy, Ptr)};\n }\n+ void compileTrap() noexcept {\n+ LLVM::Builder Builder(LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(LLContext, Trap.Fn, \"entry\"));\n+ auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n+ auto CallTrap = Builder.createCall(\n+ getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\n+ {Trap.Fn.getFirstParam()});\n+ CallTrap.addCallSiteAttribute(NoReturn);\n+ Builder.createUnreachable();\n+ }\n std::pair<std::vector<ValType>, std::vector<ValType>>\n resolveBlockType(const BlockType &BType) const noexcept {\n using VecT = std::vector<ValType>;\n@@ -544,9 +560,10 @@ class FunctionCompiler {\n FunctionCompiler(LLVM::Compiler::CompileContext &Context,\n LLVM::FunctionCallee F, Span<const ValType> Locals,\n bool Interruptible, bool InstructionCounting,\n- bool GasMeasuring) noexcept\n+ bool GasMeasuring, bool IsLazyJIT) noexcept\n : Context(Context), LLContext(Context.LLContext),\n- Interruptible(Interruptible), F(F), Builder(LLContext) {\n+ Interruptible(Interruptible), IsLazyJIT(IsLazyJIT), F(F),\n+ Builder(LLContext) {\n if (F.Fn) {\n Builder.positionAtEnd(LLVM::BasicBlock::create(LLContext, F.Fn, \"entry\"));\n ExecCtx = Builder.createLoad(Context.ExecCtxTy, F.Fn.getFirstParam());\n@@ -4267,7 +4284,63 @@ class FunctionCompiler {\n Args[J + 1] = stackPop();\n }\n \n- auto Ret = Builder.createCall(Function, Args);\n+ LLVM::Value Ret;\n+ if (IsLazyJIT) {\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\n+ if (IsImport) {\n+ Ret = Builder.createCall(Function, Args);\n+ } else {\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\n+\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\n+ }\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\n+ if (!CacheVar) {\n+ CacheVar = Context.LLModule.get().addGlobal(\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \"\");\n+ }\n+\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.check\");\n+ auto ResolveBB =\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.resolve\");\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.call\");\n+\n+ Builder.createBr(CheckBB);\n+ Builder.positionAtEnd(CheckBB);\n+\n+ auto CachedPtr =\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\n+ CachedPtr.setAlignment(8);\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\n+ auto IsNull = Builder.createIsNull(CachedPtr);\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\n+\n+ Builder.positionAtEnd(ResolveBB);\n+ auto FPtr = Builder.createCall(\n+ Context.getIntrinsic(\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\n+ {Context.Int32Ty}, false)),\n+ {LLContext.getInt32(FuncIndex)});\n+ auto Store = Builder.createStore(FPtr, CacheVar);\n+ Store.setAlignment(8);\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\n+ Builder.createBr(CallBB);\n+\n+ Builder.positionAtEnd(CallBB);\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\n+\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\n+ }\n+ } else {\n+ Ret = Builder.createCall(Function, Args);\n+ }\n+\n auto Ty = Ret.getType();\n if (Ty.isVoidTy()) {\n // nothing to do\n@@ -4387,7 +4460,64 @@ class FunctionCompiler {\n Args[J + 1] = stackPop();\n }\n \n- auto Ret = Builder.createCall(Function, Args);\n+ LLVM::Value Ret;\n+ if (IsLazyJIT) {\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\n+ if (IsImport) {\n+ Ret = Builder.createCall(Function, Args);\n+ } else {\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\n+\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\n+ }\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\n+ if (!CacheVar) {\n+ CacheVar = Context.LLModule.get().addGlobal(\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \"\");\n+ }\n+\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.check\");\n+ auto ResolveBB =\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.resolve\");\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.call\");\n+\n+ Builder.createBr(CheckBB);\n+ Builder.positionAtEnd(CheckBB);\n+\n+ auto CachedPtr =\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\n+ CachedPtr.setAlignment(8);\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\n+ auto IsNull = Builder.createIsNull(CachedPtr);\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\n+\n+ Builder.positionAtEnd(ResolveBB);\n+ auto FPtr = Builder.createCall(\n+ Context.getIntrinsic(\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\n+ {Context.Int32Ty}, false)),\n+ {LLContext.getInt32(FuncIndex)});\n+ auto Store = Builder.createStore(FPtr, CacheVar);\n+ Store.setAlignment(8);\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\n+ Builder.createBr(CallBB);\n+\n+ Builder.positionAtEnd(CallBB);\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\n+\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\n+ }\n+ } else {\n+ Ret = Builder.createCall(Function, Args);\n+ }\n+\n+ Ret.setMustTailCall();\n auto Ty = Ret.getType();\n if (Ty.isVoidTy()) {\n Builder.createRetVoid();\n@@ -4432,6 +4562,7 @@ class FunctionCompiler {\n \n auto FPtrRet =\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\n+ FPtrRet.setMustTailCall();\n if (RetSize == 0) {\n Builder.createRetVoid();\n } else {\n@@ -4608,6 +4739,7 @@ class FunctionCompiler {\n \n auto FPtrRet =\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\n+ FPtrRet.setMustTailCall();\n if (RetSize == 0) {\n Builder.createRetVoid();\n } else {\n@@ -5854,6 +5986,7 @@ class FunctionCompiler {\n Control &operator=(const Control &) = default;\n Control &operator=(Control &&) = default;\n };\n+ bool IsLazyJIT;\n std::vector<Control> ControlStack;\n LLVM::FunctionCallee F;\n LLVM::Value ExecCtx;\n@@ -5894,6 +6027,84 @@ Expect<void> Compiler::checkConfigure() noexcept {\n return {};\n }\n \n+Expect<void> Compiler::optimize(LLVM::Module &LLModule,\n+ LLVM::TargetMachine &TM) noexcept {\n+ spdlog::info(\"optimize start\"sv);\n+ auto Triple = LLModule.getTarget();\n+ auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\n+ if (ErrorMessage) {\n+ spdlog::error(\"getFromTriple failed:{}\"sv, ErrorMessage.string_view());\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ std::string CPUName;\n+#if defined(__riscv) && __riscv_xlen == 64\n+ CPUName = \"generic-rv64\"s;\n+#else\n+ if (!Conf.getCompilerConfigure().isGenericBinary()) {\n+ CPUName = LLVM::getHostCPUName().string_view();\n+ } else {\n+ CPUName = \"generic\"s;\n+ }\n+#endif\n+\n+ // On RISC-V we use generic-rv64 as the CPU, so also use default\n+ // features; host features under QEMU can be inconsistent (e.g.\n+ // zvl*b without v) which LLVM >= 20 rejects.\n+ TM = LLVM::TargetMachine::create(\n+ TheTarget, Triple, CPUName.c_str(),\n+#if defined(__riscv) && __riscv_xlen == 64\n+ \"\",\n+#else\n+ LLVM::getHostCPUFeatures().unwrap(),\n+#endif\n+ toLLVMCodeGenLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n+ LLVMRelocPIC, LLVMCodeModelDefault);\n+\n+#if LLVM_VERSION_MAJOR >= 13\n+ auto PBO = LLVM::PassBuilderOptions::create();\n+ if (auto Error = PBO.runPasses(\n+ LLModule,\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n+ TM)) {\n+ spdlog::error(\"{}\"sv, Error.message().string_view());\n+ }\n+#else\n+ auto FP = LLVM::PassManager::createForModule(LLModule);\n+ auto MP = LLVM::PassManager::create();\n+\n+ TM.addAnalysisPasses(MP);\n+ TM.addAnalysisPasses(FP);\n+ {\n+ auto PMB = LLVM::PassManagerBuilder::create();\n+ auto [OptLevel, SizeLevel] =\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\n+ PMB.setOptLevel(OptLevel);\n+ PMB.setSizeLevel(SizeLevel);\n+ PMB.populateFunctionPassManager(FP);\n+ PMB.populateModulePassManager(MP);\n+ }\n+ switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\n+ case CompilerConfigure::OptimizationLevel::O0:\n+ case CompilerConfigure::OptimizationLevel::O1:\n+ FP.addTailCallEliminationPass();\n+ break;\n+ default:\n+ break;\n+ }\n+\n+ FP.initializeFunctionPassManager();\n+ for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\n+ FP.runFunctionPassManager(Fn);\n+ }\n+ FP.finalizeFunctionPassManager();\n+ MP.runPassManager(LLModule);\n+#endif\n+\n+ spdlog::info(\"optimize done\"sv);\n+ return {};\n+}\n+\n Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n // Check that the module is validated.\n if (unlikely(!Module.getIsValidated())) {\n@@ -5913,15 +6124,7 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n \n CompileContext NewContext(LLContext, LLModule,\n Conf.getCompilerConfigure().isGenericBinary());\n- struct RAIICleanup {\n- RAIICleanup(CompileContext *&Context, CompileContext &NewContext)\n- : Context(Context) {\n- Context = &NewContext;\n- }\n- ~RAIICleanup() { Context = nullptr; }\n- CompileContext *&Context;\n- };\n- RAIICleanup Cleanup(Context, NewContext);\n+ RAIICleanup Cleanup(Context, &NewContext);\n \n // Compile Function Types\n compile(Module.getTypeSection());\n@@ -5942,81 +6145,8 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n spdlog::info(\"verify start\"sv);\n LLModule.verify(LLVMPrintMessageAction);\n \n- spdlog::info(\"optimize start\"sv);\n auto &TM = D.extract().TM;\n- {\n- auto Triple = LLModule.getTarget();\n- auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\n- if (ErrorMessage) {\n- spdlog::error(\"getFromTriple failed:{}\"sv, ErrorMessage.string_view());\n- return Unexpect(ErrCode::Value::IllegalPath);\n- } else {\n- std::string CPUName;\n-#if defined(__riscv) && __riscv_xlen == 64\n- CPUName = \"generic-rv64\"s;\n-#else\n- if (!Conf.getCompilerConfigure().isGenericBinary()) {\n- CPUName = LLVM::getHostCPUName().string_view();\n- } else {\n- CPUName = \"generic\"s;\n- }\n-#endif\n-\n- // On RISC-V we use generic-rv64 as the CPU, so also use default\n- // features; host features under QEMU can be inconsistent (e.g.\n- // zvl*b without v) which LLVM >= 20 rejects.\n- TM = LLVM::TargetMachine::create(\n- TheTarget, Triple, CPUName.c_str(),\n-#if defined(__riscv) && __riscv_xlen == 64\n- \"\",\n-#else\n- LLVM::getHostCPUFeatures().unwrap(),\n-#endif\n- toLLVMCodeGenLevel(\n- Conf.getCompilerConfigure().getOptimizationLevel()),\n- LLVMRelocPIC, LLVMCodeModelDefault);\n- }\n-\n-#if LLVM_VERSION_MAJOR >= 13\n- auto PBO = LLVM::PassBuilderOptions::create();\n- if (auto Error = PBO.runPasses(\n- LLModule,\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n- TM)) {\n- spdlog::error(\"{}\"sv, Error.message().string_view());\n- }\n-#else\n- auto FP = LLVM::PassManager::createForModule(LLModule);\n- auto MP = LLVM::PassManager::create();\n-\n- TM.addAnalysisPasses(MP);\n- TM.addAnalysisPasses(FP);\n- {\n- auto PMB = LLVM::PassManagerBuilder::create();\n- auto [OptLevel, SizeLevel] =\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\n- PMB.setOptLevel(OptLevel);\n- PMB.setSizeLevel(SizeLevel);\n- PMB.populateFunctionPassManager(FP);\n- PMB.populateModulePassManager(MP);\n- }\n- switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\n- case CompilerConfigure::OptimizationLevel::O0:\n- case CompilerConfigure::OptimizationLevel::O1:\n- FP.addTailCallEliminationPass();\n- break;\n- default:\n- break;\n- }\n-\n- FP.initializeFunctionPassManager();\n- for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\n- FP.runFunctionPassManager(Fn);\n- }\n- FP.finalizeFunctionPassManager();\n- MP.runPassManager(LLModule);\n-#endif\n- }\n+ EXPECTED_TRY(optimize(LLModule, TM));\n \n // Set initializer for constant value\n if (auto IntrinsicsTable = LLModule.getNamedGlobal(\"intrinsics\")) {\n@@ -6031,12 +6161,11 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n LLVM::Value::getConstNull(IntrinsicsTableTy), \"intrinsics\");\n }\n-\n- spdlog::info(\"optimize done\"sv);\n return Expect<Data>{std::move(D)};\n }\n \n-void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n+void Compiler::compile(const AST::TypeSection &TypeSec,\n+ bool DeclarationsOnly) noexcept {\n auto WrapperTy =\n LLVM::Type::getFunctionType(Context->VoidTy,\n {Context->ExecCtxPtrTy, Context->Int8PtrTy,\n@@ -6050,10 +6179,25 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n Context->CompositeTypes.reserve(Size);\n Context->FunctionWrappers.reserve(Size);\n \n+ auto SetFuncAttributes = [&](auto FDecl) {\n+ FDecl.setVisibility(LLVMProtectedVisibility);\n+ FDecl.setDSOLocal(true);\n+ FDecl.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ FDecl.addFnAttr(Context->NoStackArgProbe);\n+ FDecl.addFnAttr(Context->StrictFP);\n+ FDecl.addFnAttr(Context->UWTable);\n+ FDecl.addParamAttr(0, Context->ReadOnly);\n+ FDecl.addParamAttr(0, Context->NoAlias);\n+ FDecl.addParamAttr(1, Context->NoAlias);\n+ FDecl.addParamAttr(2, Context->NoAlias);\n+ FDecl.addParamAttr(3, Context->NoAlias);\n+ };\n+\n // Iterate and compile types.\n for (size_t I = 0; I < Size; ++I) {\n const auto &CompType = SubTypes[I].getCompositeType();\n- const auto Name = fmt::format(\"t{}\"sv, Context->CompositeTypes.size());\n+ const auto Name =\n+ fmt::format(\"{}t{}\"sv, Context->Prefix, Context->CompositeTypes.size());\n if (CompType.isFunc()) {\n // Check that the function type is unique.\n {\n@@ -6065,13 +6209,21 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n if (OldFuncType == CompType.getFuncType()) {\n Unique = false;\n Context->CompositeTypes.push_back(Context->CompositeTypes[J]);\n- auto F = Context->FunctionWrappers[J];\n- Context->FunctionWrappers.push_back(F);\n- auto A = Context->LLModule.addAlias(WrapperTy, F, Name.c_str());\n- A.setLinkage(LLVMExternalLinkage);\n- A.setVisibility(LLVMProtectedVisibility);\n- A.setDSOLocal(true);\n- A.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ if (DeclarationsOnly) {\n+ auto FDecl = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n+ SetFuncAttributes(FDecl);\n+ Context->FunctionWrappers.push_back(FDecl);\n+ } else {\n+ auto F = Context->FunctionWrappers[J];\n+ Context->FunctionWrappers.push_back(F);\n+ auto A = Context->LLModule.get().addAlias(WrapperTy, F,\n+ Name.c_str());\n+ A.setLinkage(LLVMExternalLinkage);\n+ A.setVisibility(LLVMProtectedVisibility);\n+ A.setDSOLocal(true);\n+ A.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ }\n break;\n }\n }\n@@ -6082,81 +6234,66 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n }\n \n // Create Wrapper\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\n- Name.c_str());\n+ auto F = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n {\n- F.setVisibility(LLVMProtectedVisibility);\n- F.setDSOLocal(true);\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\n- F.addFnAttr(Context->NoStackArgProbe);\n- F.addFnAttr(Context->StrictFP);\n- F.addFnAttr(Context->UWTable);\n- F.addParamAttr(0, Context->ReadOnly);\n- F.addParamAttr(0, Context->NoAlias);\n- F.addParamAttr(1, Context->NoAlias);\n- F.addParamAttr(2, Context->NoAlias);\n- F.addParamAttr(3, Context->NoAlias);\n-\n- LLVM::Builder Builder(Context->LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n-\n- auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\n- CompType.getFuncType());\n- auto RTy = FTy.getReturnType();\n- std::vector<LLVM::Type> FPTy(FTy.getNumParams());\n- FTy.getParamTypes(FPTy);\n-\n- const size_t ArgCount = FPTy.size() - 1;\n- auto ExecCtxPtr = F.getFirstParam();\n- auto RawFunc = LLVM::FunctionCallee{\n- FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\n- FTy.getPointerTo())};\n- auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\n- auto RawRets = RawArgs.getNextParam();\n-\n- std::vector<LLVM::Value> Args;\n- Args.reserve(FTy.getNumParams());\n- Args.push_back(ExecCtxPtr);\n- for (size_t J = 0; J < ArgCount; ++J) {\n- Args.push_back(Builder.createValuePtrLoad(\n- FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\n- }\n+ SetFuncAttributes(F);\n+\n+ if (!DeclarationsOnly) {\n+ LLVM::Builder Builder(Context->LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n+\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\n+ CompType.getFuncType());\n+ auto RTy = FTy.getReturnType();\n+ std::vector<LLVM::Type> FPTy(FTy.getNumParams());\n+ FTy.getParamTypes(FPTy);\n+\n+ const size_t ArgCount = FPTy.size() - 1;\n+ auto ExecCtxPtr = F.getFirstParam();\n+ auto RawFunc = LLVM::FunctionCallee{\n+ FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\n+ FTy.getPointerTo())};\n+ auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\n+ auto RawRets = RawArgs.getNextParam();\n+\n+ std::vector<LLVM::Value> Args;\n+ Args.reserve(FTy.getNumParams());\n+ Args.push_back(ExecCtxPtr);\n+ for (size_t J = 0; J < ArgCount; ++J) {\n+ Args.push_back(Builder.createValuePtrLoad(\n+ FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\n+ }\n \n- auto Ret = Builder.createCall(RawFunc, Args);\n- if (RTy.isVoidTy()) {\n- // nothing to do\n- } else if (RTy.isStructTy()) {\n- auto Rets = unpackStruct(Builder, Ret);\n- Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty, kValSize);\n- } else {\n- Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\n+ auto Ret = Builder.createCall(RawFunc, Args);\n+ if (RTy.isVoidTy()) {\n+ // nothing to do\n+ } else if (RTy.isStructTy()) {\n+ auto Rets = unpackStruct(Builder, Ret);\n+ Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty,\n+ kValSize);\n+ } else {\n+ Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\n+ }\n+ Builder.createRetVoid();\n }\n- Builder.createRetVoid();\n }\n // Copy wrapper, param and return lists to module instance.\n Context->FunctionWrappers.push_back(F);\n } else {\n // Non function type case. Create empty wrapper.\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\n- Name.c_str());\n+ auto F = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n {\n- F.setVisibility(LLVMProtectedVisibility);\n- F.setDSOLocal(true);\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\n- F.addFnAttr(Context->NoStackArgProbe);\n- F.addFnAttr(Context->StrictFP);\n- F.addFnAttr(Context->UWTable);\n- F.addParamAttr(0, Context->ReadOnly);\n- F.addParamAttr(0, Context->NoAlias);\n- F.addParamAttr(1, Context->NoAlias);\n- F.addParamAttr(2, Context->NoAlias);\n- F.addParamAttr(3, Context->NoAlias);\n-\n- LLVM::Builder Builder(Context->LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n- Builder.createRetVoid();\n+ SetFuncAttributes(F);\n+\n+ if (!DeclarationsOnly) {\n+ LLVM::Builder Builder(Context->LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n+ Builder.createRetVoid();\n+ }\n }\n Context->FunctionWrappers.push_back(F);\n }\n@@ -6184,9 +6321,9 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\n toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n auto RTy = FTy.getReturnType();\n auto F = LLVM::FunctionCallee{\n- FTy,\n- Context->LLModule.addFunction(FTy, LLVMInternalLinkage,\n- fmt::format(\"f{}\"sv, FuncID).c_str())};\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMInternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n F.Fn.setDSOLocal(true);\n F.Fn.addFnAttr(Context->NoStackArgProbe);\n F.Fn.addFnAttr(Context->StrictFP);\n@@ -6231,6 +6368,7 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\n }\n \n Context->Functions.emplace_back(TypeIdx, F, nullptr);\n+ Context->ImportCount++;\n break;\n }\n case ExternalType::Table: // Table type\n@@ -6313,9 +6451,10 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n const auto FuncID = Context->Functions.size();\n auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n- LLVM::FunctionCallee F = {FTy, Context->LLModule.addFunction(\n- FTy, LLVMExternalLinkage,\n- fmt::format(\"f{}\"sv, FuncID).c_str())};\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n F.Fn.setVisibility(LLVMProtectedVisibility);\n F.Fn.setDSOLocal(true);\n F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n@@ -6339,10 +6478,11 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n Locals.push_back(Local.second);\n }\n }\n- FunctionCompiler FC(*Context, F, Locals,\n- Conf.getCompilerConfigure().isInterruptible(),\n- Conf.getStatisticsConfigure().isInstructionCounting(),\n- Conf.getStatisticsConfigure().isCostMeasuring());\n+ FunctionCompiler FC(\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\n auto Type = Context->resolveBlockType(T);\n EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n F.Fn.eliminateUnreachableBlocks();\n@@ -6350,5 +6490,235 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n return {};\n }\n \n+void Compiler::compileFunctionDeclarations(\n+ const AST::FunctionSection &FunctionSec,\n+ const AST::CodeSection &CodeSec) noexcept {\n+ const auto &TypeIdxs = FunctionSec.getContent();\n+ const auto &CodeSegs = CodeSec.getContent();\n+ assuming(TypeIdxs.size() == CodeSegs.size());\n+\n+ for (size_t I = 0; I < CodeSegs.size(); ++I) {\n+ const auto &TypeIdx = TypeIdxs[I];\n+ const auto &Code = CodeSegs[I];\n+ assuming(TypeIdx < Context->CompositeTypes.size());\n+ assuming(Context->CompositeTypes[TypeIdx]->isFunc());\n+ const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n+ const auto FuncID = Context->Functions.size();\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n+ F.Fn.setVisibility(LLVMProtectedVisibility);\n+ F.Fn.setDSOLocal(true);\n+ F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ F.Fn.addFnAttr(Context->NoStackArgProbe);\n+ F.Fn.addFnAttr(Context->StrictFP);\n+ F.Fn.addFnAttr(Context->UWTable);\n+ F.Fn.addParamAttr(0, Context->ReadOnly);\n+ F.Fn.addParamAttr(0, Context->NoAlias);\n+\n+ Context->Functions.emplace_back(TypeIdx, F, &Code);\n+ }\n+}\n+\n+Expect<void> Compiler::compileFunctionBody(uint32_t LocalFuncIndex) noexcept {\n+ // Find the function in the Functions list\n+ // LocalFuncIndex is relative to the defined functions (not imports)\n+ uint32_t GlobalFuncIndex = Context->ImportCount + LocalFuncIndex;\n+ if (GlobalFuncIndex >= Context->Functions.size()) {\n+ spdlog::error(\"[lazy-jit]: function index {} out of range\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ auto &[T, F, Code] = Context->Functions[GlobalFuncIndex];\n+ if (!Code) {\n+ spdlog::error(\"[lazy-jit]: cannot compile import function {}\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ // Check if already compiled (function has basic blocks)\n+ if (F.Fn.countBasicBlocks() > 0) {\n+ spdlog::debug(\"[lazy-jit]: function {} already compiled\"sv, LocalFuncIndex);\n+ return {};\n+ }\n+\n+ spdlog::debug(\"[lazy-jit]: compiling function {}\"sv, LocalFuncIndex);\n+\n+ std::vector<ValType> Locals;\n+ for (const auto &Local : Code->getLocals()) {\n+ for (unsigned I = 0; I < Local.first; ++I) {\n+ Locals.push_back(Local.second);\n+ }\n+ }\n+\n+ FunctionCompiler FC(\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\n+ auto Type = Context->resolveBlockType(T);\n+ EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n+ F.Fn.eliminateUnreachableBlocks();\n+\n+ return {};\n+}\n+\n+Expect<std::pair<LLVM::Data,\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter>>>\n+LLVM::Compiler::compileInfrastructure(const AST::Module &Module,\n+ std::string Prefix) noexcept {\n+ Data D;\n+ D.setPrefix(Prefix);\n+ // Check the module is validated.\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ spdlog::info(\"[lazy-jit]: compile infrastructure start\"sv);\n+\n+ auto LLContext = D.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = D.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ std::unique_ptr<CompileContext, CompileContextDeleter> NewContext(\n+ new CompileContext(LLContext, LLModule,\n+ Conf.getCompilerConfigure().isGenericBinary(),\n+ D.getPrefix()));\n+ RAIICleanup Cleanup(this->Context, NewContext.get());\n+\n+ // Compile Function Types\n+ compile(Module.getTypeSection());\n+ // Compile ImportSection\n+ compile(Module.getImportSection());\n+ // Compile GlobalSection\n+ compile(Module.getGlobalSection());\n+ // Compile MemorySection (MemorySec, DataSec)\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ // Compile TableSection (TableSec, ElemSec)\n+ compile(Module.getTableSection(), Module.getElementSection());\n+ // Create function declarations without compiling bodies\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+ // Compile ExportSection\n+ compile(Module.getExportSection());\n+\n+ // Set initializer for constant value\n+ auto IntrinsicsName = fmt::format(\"{}intrinsics\"sv, D.getPrefix());\n+ if (auto IntrinsicsTable = LLModule.getNamedGlobal(IntrinsicsName.c_str())) {\n+ IntrinsicsTable.setInitializer(\n+ LLVM::Value::getConstNull(IntrinsicsTable.getType()));\n+ IntrinsicsTable.setGlobalConstant(false);\n+ } else {\n+ auto IntrinsicsTableTy = LLVM::Type::getArrayType(\n+ LLContext.getInt8Ty().getPointerTo(),\n+ static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax));\n+ LLModule.addGlobal(\n+ IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n+ LLVM::Value::getConstNull(IntrinsicsTableTy), IntrinsicsName.c_str());\n+ }\n+ LLModule.verify(LLVMPrintMessageAction);\n+\n+ spdlog::info(\"[lazy-jit]: infrastructure compilation done\"sv);\n+\n+ return Expect<\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>>{\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>{\n+ std::move(D), std::move(NewContext)}};\n+}\n+\n+Expect<LLVM::Data>\n+Compiler::compileFunctions(Data &&LLData, CompileContext *NewContext,\n+ const AST::Module &Module,\n+ Span<const uint32_t> LocalFuncIndices) noexcept {\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+ if (unlikely(LocalFuncIndices.empty())) {\n+ spdlog::error(\"[lazy-jit]: compileFunctions with empty index list\"sv);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ std::vector<uint32_t> Sorted(LocalFuncIndices.begin(),\n+ LocalFuncIndices.end());\n+ std::sort(Sorted.begin(), Sorted.end());\n+ Sorted.erase(std::unique(Sorted.begin(), Sorted.end()), Sorted.end());\n+\n+ spdlog::debug(\"[lazy-jit]: compile functions batch ({}) start\"sv,\n+ Sorted.size());\n+\n+ auto LLContext = LLData.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = LLData.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ RAIICleanup Cleanup(this->Context, NewContext);\n+ Context->LLModule = LLModule;\n+\n+ Context->CompositeTypes.clear();\n+ Context->FunctionWrappers.clear();\n+ Context->Functions.clear();\n+ Context->LazyJITCacheVars.clear();\n+ Context->ImportCount = 0;\n+ Context->MemoryAddrTypes.clear();\n+ Context->TableAddrTypes.clear();\n+ Context->Globals.clear();\n+\n+ Context->IntrinsicsTable = LLModule.addGlobal(\n+ Context->IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\n+ fmt::format(\"{}intrinsics\"sv, Context->Prefix).c_str());\n+ Context->IntrinsicsTable.setInitializer(LLVM::Value());\n+ Context->Trap.Ty =\n+ LLVM::Type::getFunctionType(Context->VoidTy, {Context->Int32Ty});\n+ Context->Trap.Fn =\n+ LLModule.addFunction(Context->Trap.Ty, LLVMPrivateLinkage, \"trap\");\n+ Context->Trap.Fn.setDSOLocal(true);\n+ Context->Trap.Fn.addFnAttr(Context->NoStackArgProbe);\n+ Context->Trap.Fn.addFnAttr(Context->StrictFP);\n+ Context->Trap.Fn.addFnAttr(Context->UWTable);\n+ Context->Trap.Fn.addFnAttr(Context->NoReturn);\n+ Context->Trap.Fn.addFnAttr(Context->Cold);\n+ Context->Trap.Fn.addFnAttr(Context->NoInline);\n+ Context->compileTrap();\n+\n+ compile(Module.getTypeSection(), true);\n+ compile(Module.getImportSection());\n+ compile(Module.getGlobalSection());\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ compile(Module.getTableSection(), Module.getElementSection());\n+\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+\n+ for (uint32_t FuncIndex : Sorted) {\n+ EXPECTED_TRY(compileFunctionBody(FuncIndex));\n+ }\n+\n+ spdlog::info(\"[lazy-jit]: verify batch ({} funcs) start\"sv, Sorted.size());\n+ LLModule.verify(LLVMPrintMessageAction);\n+ spdlog::info(\"[lazy-jit]: verify batch ({} funcs) done\"sv, Sorted.size());\n+\n+ auto &TM = LLData.extract().TM;\n+ EXPECTED_TRY(optimize(LLModule, TM));\n+\n+ spdlog::debug(\"[lazy-jit]: compile functions batch ({}) done\"sv,\n+ Sorted.size());\n+ return Expect<Data>{std::move(LLData)};\n+}\n+\n+void LLVM::Compiler::CompileContextDeleter::operator()(\n+ CompileContext *Context) const noexcept {\n+ delete Context;\n+}\n } // namespace LLVM\n } // namespace WasmEdge\n"},"changed_files":{"kind":"list like","value":["lib/llvm/compiler.cpp"],"string":"[\n \"lib/llvm/compiler.cpp\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"This appears to be debug information. Remove it if it is no longer needed.","path":"lib/llvm/compiler.cpp","hunk":"@@ -3998,12 +4003,15 @@ class FunctionCompiler {\n }\n void compileAtomicWait(unsigned MemoryIndex, uint64_t MemoryOffset,\n LLVM::Type TargetType, uint32_t BitWidth) noexcept {\n+ spdlog::error(\"[lazyjit] memory_index: {}\", MemoryIndex);\n auto Timeout = stackPop();\n auto ExpectedValue = Builder.createZExtOrTrunc(stackPop(), Context.Int64Ty);\n auto Offset = Builder.createZExt(stackPop(), Context.Int64Ty);\n if (MemoryOffset != 0) {\n Offset = Builder.createAdd(Offset, LLContext.getInt64(MemoryOffset));\n }\n+ spdlog::error(\"Check: {}\",\n+ Context.MemoryAddrTypes[MemoryIndex].isStructTy());","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp\nindex 39da94d9a9ac..330e245f51c3 100644\n--- a/lib/llvm/compiler.cpp\n+++ b/lib/llvm/compiler.cpp\n@@ -9,6 +9,7 @@\n #include \"common/spdlog.h\"\n #include \"data.h\"\n #include \"llvm.h\"\n+#include \"spdlog/spdlog.h\"\n #include \"system/allocator.h\"\n \n #include <algorithm>\n@@ -16,6 +17,7 @@\n #include <cinttypes>\n #include <cstdint>\n #include <cstdlib>\n+#include <functional>\n #include <limits>\n #include <memory>\n #include <numeric>\n@@ -28,6 +30,16 @@ using namespace std::literals;\n \n namespace {\n \n+struct RAIICleanup {\n+ RAIICleanup(LLVM::Compiler::CompileContext *&Context,\n+ LLVM::Compiler::CompileContext *NewContext)\n+ : Context(Context) {\n+ Context = NewContext;\n+ }\n+ ~RAIICleanup() { Context = nullptr; }\n+ LLVM::Compiler::CompileContext *&Context;\n+};\n+\n static bool\n isVoidReturn(WasmEdge::Span<const WasmEdge::ValType> ValTypes) noexcept;\n static LLVM::Type toLLVMType(LLVM::Context LLContext,\n@@ -128,7 +140,7 @@ static inline LLVMCodeGenOptLevel toLLVMCodeGenLevel(\n \n struct LLVM::Compiler::CompileContext {\n LLVM::Context LLContext;\n- LLVM::Module &LLModule;\n+ std::reference_wrapper<LLVM::Module> LLModule;\n LLVM::Attribute Cold;\n LLVM::Attribute NoAlias;\n LLVM::Attribute NoInline;\n@@ -202,13 +214,16 @@ struct LLVM::Compiler::CompileContext {\n std::vector<std::tuple<uint32_t, LLVM::FunctionCallee,\n const WasmEdge::AST::CodeSegment *>>\n Functions;\n+ std::vector<LLVM::Value> LazyJITCacheVars;\n+ uint32_t ImportCount = 0;\n std::vector<LLVM::Type> MemoryAddrTypes;\n std::vector<LLVM::Type> TableAddrTypes;\n std::vector<LLVM::Type> Globals;\n+ std::string Prefix;\n LLVM::Value IntrinsicsTable;\n LLVM::FunctionCallee Trap;\n- CompileContext(LLVM::Context C, LLVM::Module &M,\n- bool IsGenericBinary) noexcept\n+ CompileContext(LLVM::Context C, LLVM::Module &M, bool IsGenericBinary,\n+ std::string_view P = \"\"sv) noexcept\n : LLContext(C), LLModule(M),\n Cold(LLVM::Attribute::createEnum(C, LLVM::Core::Cold, 0)),\n NoAlias(LLVM::Attribute::createEnum(C, LLVM::Core::NoAlias, 0)),\n@@ -256,14 +271,14 @@ struct LLVM::Compiler::CompileContext {\n })),\n ExecCtxPtrTy(ExecCtxTy.getPointerTo()),\n IntrinsicsTableTy(LLVM::Type::getArrayType(\n- Int8PtrTy,\n+ Int8Ty.getPointerTo(),\n static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax))),\n- IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()),\n- IntrinsicsTable(LLModule.addGlobal(IntrinsicsTablePtrTy, true,\n- LLVMExternalLinkage, LLVM::Value(),\n- \"intrinsics\")) {\n+ IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()), Prefix(P),\n+ IntrinsicsTable(LLModule.get().addGlobal(\n+ IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\n+ fmt::format(\"{}intrinsics\"sv, Prefix).c_str())) {\n Trap.Ty = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n- Trap.Fn = LLModule.addFunction(Trap.Ty, LLVMPrivateLinkage, \"trap\");\n+ Trap.Fn = LLModule.get().addFunction(Trap.Ty, LLVMPrivateLinkage, \"trap\");\n Trap.Fn.setDSOLocal(true);\n Trap.Fn.addFnAttr(NoStackArgProbe);\n Trap.Fn.addFnAttr(StrictFP);\n@@ -272,9 +287,10 @@ struct LLVM::Compiler::CompileContext {\n Trap.Fn.addFnAttr(Cold);\n Trap.Fn.addFnAttr(NoInline);\n \n- LLModule.addGlobal(Int32Ty, true, LLVMExternalLinkage,\n- LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\n- \"version\");\n+ LLModule.get().addGlobal(\n+ Int32Ty, true, LLVMExternalLinkage,\n+ LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\n+ fmt::format(\"{}version\"sv, Prefix).c_str());\n \n if (!IsGenericBinary) {\n SubtargetFeatures = LLVM::getHostCPUFeatures();\n@@ -313,18 +329,7 @@ struct LLVM::Compiler::CompileContext {\n }\n }\n \n- {\n- // create trap\n- LLVM::Builder Builder(LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(LLContext, Trap.Fn, \"entry\"));\n- auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n- auto CallTrap = Builder.createCall(\n- getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\n- {Trap.Fn.getFirstParam()});\n- CallTrap.addCallSiteAttribute(NoReturn);\n- Builder.createUnreachable();\n- }\n+ compileTrap();\n }\n LLVM::Value getMemory(LLVM::Builder &Builder, LLVM::Value ExecCtx,\n uint32_t Index) noexcept {\n@@ -394,6 +399,17 @@ struct LLVM::Compiler::CompileContext {\n auto Ptr = Builder.createBitCast(VPtr, PtrPtrTy);\n return {Ty, Builder.createLoad(PtrTy, Ptr)};\n }\n+ void compileTrap() noexcept {\n+ LLVM::Builder Builder(LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(LLContext, Trap.Fn, \"entry\"));\n+ auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n+ auto CallTrap = Builder.createCall(\n+ getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\n+ {Trap.Fn.getFirstParam()});\n+ CallTrap.addCallSiteAttribute(NoReturn);\n+ Builder.createUnreachable();\n+ }\n std::pair<std::vector<ValType>, std::vector<ValType>>\n resolveBlockType(const BlockType &BType) const noexcept {\n using VecT = std::vector<ValType>;\n@@ -544,9 +560,10 @@ class FunctionCompiler {\n FunctionCompiler(LLVM::Compiler::CompileContext &Context,\n LLVM::FunctionCallee F, Span<const ValType> Locals,\n bool Interruptible, bool InstructionCounting,\n- bool GasMeasuring) noexcept\n+ bool GasMeasuring, bool IsLazyJIT) noexcept\n : Context(Context), LLContext(Context.LLContext),\n- Interruptible(Interruptible), F(F), Builder(LLContext) {\n+ Interruptible(Interruptible), IsLazyJIT(IsLazyJIT), F(F),\n+ Builder(LLContext) {\n if (F.Fn) {\n Builder.positionAtEnd(LLVM::BasicBlock::create(LLContext, F.Fn, \"entry\"));\n ExecCtx = Builder.createLoad(Context.ExecCtxTy, F.Fn.getFirstParam());\n@@ -4267,7 +4284,63 @@ class FunctionCompiler {\n Args[J + 1] = stackPop();\n }\n \n- auto Ret = Builder.createCall(Function, Args);\n+ LLVM::Value Ret;\n+ if (IsLazyJIT) {\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\n+ if (IsImport) {\n+ Ret = Builder.createCall(Function, Args);\n+ } else {\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\n+\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\n+ }\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\n+ if (!CacheVar) {\n+ CacheVar = Context.LLModule.get().addGlobal(\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \"\");\n+ }\n+\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.check\");\n+ auto ResolveBB =\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.resolve\");\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.call\");\n+\n+ Builder.createBr(CheckBB);\n+ Builder.positionAtEnd(CheckBB);\n+\n+ auto CachedPtr =\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\n+ CachedPtr.setAlignment(8);\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\n+ auto IsNull = Builder.createIsNull(CachedPtr);\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\n+\n+ Builder.positionAtEnd(ResolveBB);\n+ auto FPtr = Builder.createCall(\n+ Context.getIntrinsic(\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\n+ {Context.Int32Ty}, false)),\n+ {LLContext.getInt32(FuncIndex)});\n+ auto Store = Builder.createStore(FPtr, CacheVar);\n+ Store.setAlignment(8);\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\n+ Builder.createBr(CallBB);\n+\n+ Builder.positionAtEnd(CallBB);\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\n+\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\n+ }\n+ } else {\n+ Ret = Builder.createCall(Function, Args);\n+ }\n+\n auto Ty = Ret.getType();\n if (Ty.isVoidTy()) {\n // nothing to do\n@@ -4387,7 +4460,64 @@ class FunctionCompiler {\n Args[J + 1] = stackPop();\n }\n \n- auto Ret = Builder.createCall(Function, Args);\n+ LLVM::Value Ret;\n+ if (IsLazyJIT) {\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\n+ if (IsImport) {\n+ Ret = Builder.createCall(Function, Args);\n+ } else {\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\n+\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\n+ }\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\n+ if (!CacheVar) {\n+ CacheVar = Context.LLModule.get().addGlobal(\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \"\");\n+ }\n+\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.check\");\n+ auto ResolveBB =\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.resolve\");\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.call\");\n+\n+ Builder.createBr(CheckBB);\n+ Builder.positionAtEnd(CheckBB);\n+\n+ auto CachedPtr =\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\n+ CachedPtr.setAlignment(8);\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\n+ auto IsNull = Builder.createIsNull(CachedPtr);\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\n+\n+ Builder.positionAtEnd(ResolveBB);\n+ auto FPtr = Builder.createCall(\n+ Context.getIntrinsic(\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\n+ {Context.Int32Ty}, false)),\n+ {LLContext.getInt32(FuncIndex)});\n+ auto Store = Builder.createStore(FPtr, CacheVar);\n+ Store.setAlignment(8);\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\n+ Builder.createBr(CallBB);\n+\n+ Builder.positionAtEnd(CallBB);\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\n+\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\n+ }\n+ } else {\n+ Ret = Builder.createCall(Function, Args);\n+ }\n+\n+ Ret.setMustTailCall();\n auto Ty = Ret.getType();\n if (Ty.isVoidTy()) {\n Builder.createRetVoid();\n@@ -4432,6 +4562,7 @@ class FunctionCompiler {\n \n auto FPtrRet =\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\n+ FPtrRet.setMustTailCall();\n if (RetSize == 0) {\n Builder.createRetVoid();\n } else {\n@@ -4608,6 +4739,7 @@ class FunctionCompiler {\n \n auto FPtrRet =\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\n+ FPtrRet.setMustTailCall();\n if (RetSize == 0) {\n Builder.createRetVoid();\n } else {\n@@ -5854,6 +5986,7 @@ class FunctionCompiler {\n Control &operator=(const Control &) = default;\n Control &operator=(Control &&) = default;\n };\n+ bool IsLazyJIT;\n std::vector<Control> ControlStack;\n LLVM::FunctionCallee F;\n LLVM::Value ExecCtx;\n@@ -5894,6 +6027,84 @@ Expect<void> Compiler::checkConfigure() noexcept {\n return {};\n }\n \n+Expect<void> Compiler::optimize(LLVM::Module &LLModule,\n+ LLVM::TargetMachine &TM) noexcept {\n+ spdlog::info(\"optimize start\"sv);\n+ auto Triple = LLModule.getTarget();\n+ auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\n+ if (ErrorMessage) {\n+ spdlog::error(\"getFromTriple failed:{}\"sv, ErrorMessage.string_view());\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ std::string CPUName;\n+#if defined(__riscv) && __riscv_xlen == 64\n+ CPUName = \"generic-rv64\"s;\n+#else\n+ if (!Conf.getCompilerConfigure().isGenericBinary()) {\n+ CPUName = LLVM::getHostCPUName().string_view();\n+ } else {\n+ CPUName = \"generic\"s;\n+ }\n+#endif\n+\n+ // On RISC-V we use generic-rv64 as the CPU, so also use default\n+ // features; host features under QEMU can be inconsistent (e.g.\n+ // zvl*b without v) which LLVM >= 20 rejects.\n+ TM = LLVM::TargetMachine::create(\n+ TheTarget, Triple, CPUName.c_str(),\n+#if defined(__riscv) && __riscv_xlen == 64\n+ \"\",\n+#else\n+ LLVM::getHostCPUFeatures().unwrap(),\n+#endif\n+ toLLVMCodeGenLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n+ LLVMRelocPIC, LLVMCodeModelDefault);\n+\n+#if LLVM_VERSION_MAJOR >= 13\n+ auto PBO = LLVM::PassBuilderOptions::create();\n+ if (auto Error = PBO.runPasses(\n+ LLModule,\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n+ TM)) {\n+ spdlog::error(\"{}\"sv, Error.message().string_view());\n+ }\n+#else\n+ auto FP = LLVM::PassManager::createForModule(LLModule);\n+ auto MP = LLVM::PassManager::create();\n+\n+ TM.addAnalysisPasses(MP);\n+ TM.addAnalysisPasses(FP);\n+ {\n+ auto PMB = LLVM::PassManagerBuilder::create();\n+ auto [OptLevel, SizeLevel] =\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\n+ PMB.setOptLevel(OptLevel);\n+ PMB.setSizeLevel(SizeLevel);\n+ PMB.populateFunctionPassManager(FP);\n+ PMB.populateModulePassManager(MP);\n+ }\n+ switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\n+ case CompilerConfigure::OptimizationLevel::O0:\n+ case CompilerConfigure::OptimizationLevel::O1:\n+ FP.addTailCallEliminationPass();\n+ break;\n+ default:\n+ break;\n+ }\n+\n+ FP.initializeFunctionPassManager();\n+ for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\n+ FP.runFunctionPassManager(Fn);\n+ }\n+ FP.finalizeFunctionPassManager();\n+ MP.runPassManager(LLModule);\n+#endif\n+\n+ spdlog::info(\"optimize done\"sv);\n+ return {};\n+}\n+\n Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n // Check that the module is validated.\n if (unlikely(!Module.getIsValidated())) {\n@@ -5913,15 +6124,7 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n \n CompileContext NewContext(LLContext, LLModule,\n Conf.getCompilerConfigure().isGenericBinary());\n- struct RAIICleanup {\n- RAIICleanup(CompileContext *&Context, CompileContext &NewContext)\n- : Context(Context) {\n- Context = &NewContext;\n- }\n- ~RAIICleanup() { Context = nullptr; }\n- CompileContext *&Context;\n- };\n- RAIICleanup Cleanup(Context, NewContext);\n+ RAIICleanup Cleanup(Context, &NewContext);\n \n // Compile Function Types\n compile(Module.getTypeSection());\n@@ -5942,81 +6145,8 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n spdlog::info(\"verify start\"sv);\n LLModule.verify(LLVMPrintMessageAction);\n \n- spdlog::info(\"optimize start\"sv);\n auto &TM = D.extract().TM;\n- {\n- auto Triple = LLModule.getTarget();\n- auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\n- if (ErrorMessage) {\n- spdlog::error(\"getFromTriple failed:{}\"sv, ErrorMessage.string_view());\n- return Unexpect(ErrCode::Value::IllegalPath);\n- } else {\n- std::string CPUName;\n-#if defined(__riscv) && __riscv_xlen == 64\n- CPUName = \"generic-rv64\"s;\n-#else\n- if (!Conf.getCompilerConfigure().isGenericBinary()) {\n- CPUName = LLVM::getHostCPUName().string_view();\n- } else {\n- CPUName = \"generic\"s;\n- }\n-#endif\n-\n- // On RISC-V we use generic-rv64 as the CPU, so also use default\n- // features; host features under QEMU can be inconsistent (e.g.\n- // zvl*b without v) which LLVM >= 20 rejects.\n- TM = LLVM::TargetMachine::create(\n- TheTarget, Triple, CPUName.c_str(),\n-#if defined(__riscv) && __riscv_xlen == 64\n- \"\",\n-#else\n- LLVM::getHostCPUFeatures().unwrap(),\n-#endif\n- toLLVMCodeGenLevel(\n- Conf.getCompilerConfigure().getOptimizationLevel()),\n- LLVMRelocPIC, LLVMCodeModelDefault);\n- }\n-\n-#if LLVM_VERSION_MAJOR >= 13\n- auto PBO = LLVM::PassBuilderOptions::create();\n- if (auto Error = PBO.runPasses(\n- LLModule,\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n- TM)) {\n- spdlog::error(\"{}\"sv, Error.message().string_view());\n- }\n-#else\n- auto FP = LLVM::PassManager::createForModule(LLModule);\n- auto MP = LLVM::PassManager::create();\n-\n- TM.addAnalysisPasses(MP);\n- TM.addAnalysisPasses(FP);\n- {\n- auto PMB = LLVM::PassManagerBuilder::create();\n- auto [OptLevel, SizeLevel] =\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\n- PMB.setOptLevel(OptLevel);\n- PMB.setSizeLevel(SizeLevel);\n- PMB.populateFunctionPassManager(FP);\n- PMB.populateModulePassManager(MP);\n- }\n- switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\n- case CompilerConfigure::OptimizationLevel::O0:\n- case CompilerConfigure::OptimizationLevel::O1:\n- FP.addTailCallEliminationPass();\n- break;\n- default:\n- break;\n- }\n-\n- FP.initializeFunctionPassManager();\n- for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\n- FP.runFunctionPassManager(Fn);\n- }\n- FP.finalizeFunctionPassManager();\n- MP.runPassManager(LLModule);\n-#endif\n- }\n+ EXPECTED_TRY(optimize(LLModule, TM));\n \n // Set initializer for constant value\n if (auto IntrinsicsTable = LLModule.getNamedGlobal(\"intrinsics\")) {\n@@ -6031,12 +6161,11 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n LLVM::Value::getConstNull(IntrinsicsTableTy), \"intrinsics\");\n }\n-\n- spdlog::info(\"optimize done\"sv);\n return Expect<Data>{std::move(D)};\n }\n \n-void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n+void Compiler::compile(const AST::TypeSection &TypeSec,\n+ bool DeclarationsOnly) noexcept {\n auto WrapperTy =\n LLVM::Type::getFunctionType(Context->VoidTy,\n {Context->ExecCtxPtrTy, Context->Int8PtrTy,\n@@ -6050,10 +6179,25 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n Context->CompositeTypes.reserve(Size);\n Context->FunctionWrappers.reserve(Size);\n \n+ auto SetFuncAttributes = [&](auto FDecl) {\n+ FDecl.setVisibility(LLVMProtectedVisibility);\n+ FDecl.setDSOLocal(true);\n+ FDecl.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ FDecl.addFnAttr(Context->NoStackArgProbe);\n+ FDecl.addFnAttr(Context->StrictFP);\n+ FDecl.addFnAttr(Context->UWTable);\n+ FDecl.addParamAttr(0, Context->ReadOnly);\n+ FDecl.addParamAttr(0, Context->NoAlias);\n+ FDecl.addParamAttr(1, Context->NoAlias);\n+ FDecl.addParamAttr(2, Context->NoAlias);\n+ FDecl.addParamAttr(3, Context->NoAlias);\n+ };\n+\n // Iterate and compile types.\n for (size_t I = 0; I < Size; ++I) {\n const auto &CompType = SubTypes[I].getCompositeType();\n- const auto Name = fmt::format(\"t{}\"sv, Context->CompositeTypes.size());\n+ const auto Name =\n+ fmt::format(\"{}t{}\"sv, Context->Prefix, Context->CompositeTypes.size());\n if (CompType.isFunc()) {\n // Check that the function type is unique.\n {\n@@ -6065,13 +6209,21 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n if (OldFuncType == CompType.getFuncType()) {\n Unique = false;\n Context->CompositeTypes.push_back(Context->CompositeTypes[J]);\n- auto F = Context->FunctionWrappers[J];\n- Context->FunctionWrappers.push_back(F);\n- auto A = Context->LLModule.addAlias(WrapperTy, F, Name.c_str());\n- A.setLinkage(LLVMExternalLinkage);\n- A.setVisibility(LLVMProtectedVisibility);\n- A.setDSOLocal(true);\n- A.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ if (DeclarationsOnly) {\n+ auto FDecl = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n+ SetFuncAttributes(FDecl);\n+ Context->FunctionWrappers.push_back(FDecl);\n+ } else {\n+ auto F = Context->FunctionWrappers[J];\n+ Context->FunctionWrappers.push_back(F);\n+ auto A = Context->LLModule.get().addAlias(WrapperTy, F,\n+ Name.c_str());\n+ A.setLinkage(LLVMExternalLinkage);\n+ A.setVisibility(LLVMProtectedVisibility);\n+ A.setDSOLocal(true);\n+ A.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ }\n break;\n }\n }\n@@ -6082,81 +6234,66 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n }\n \n // Create Wrapper\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\n- Name.c_str());\n+ auto F = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n {\n- F.setVisibility(LLVMProtectedVisibility);\n- F.setDSOLocal(true);\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\n- F.addFnAttr(Context->NoStackArgProbe);\n- F.addFnAttr(Context->StrictFP);\n- F.addFnAttr(Context->UWTable);\n- F.addParamAttr(0, Context->ReadOnly);\n- F.addParamAttr(0, Context->NoAlias);\n- F.addParamAttr(1, Context->NoAlias);\n- F.addParamAttr(2, Context->NoAlias);\n- F.addParamAttr(3, Context->NoAlias);\n-\n- LLVM::Builder Builder(Context->LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n-\n- auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\n- CompType.getFuncType());\n- auto RTy = FTy.getReturnType();\n- std::vector<LLVM::Type> FPTy(FTy.getNumParams());\n- FTy.getParamTypes(FPTy);\n-\n- const size_t ArgCount = FPTy.size() - 1;\n- auto ExecCtxPtr = F.getFirstParam();\n- auto RawFunc = LLVM::FunctionCallee{\n- FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\n- FTy.getPointerTo())};\n- auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\n- auto RawRets = RawArgs.getNextParam();\n-\n- std::vector<LLVM::Value> Args;\n- Args.reserve(FTy.getNumParams());\n- Args.push_back(ExecCtxPtr);\n- for (size_t J = 0; J < ArgCount; ++J) {\n- Args.push_back(Builder.createValuePtrLoad(\n- FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\n- }\n+ SetFuncAttributes(F);\n+\n+ if (!DeclarationsOnly) {\n+ LLVM::Builder Builder(Context->LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n+\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\n+ CompType.getFuncType());\n+ auto RTy = FTy.getReturnType();\n+ std::vector<LLVM::Type> FPTy(FTy.getNumParams());\n+ FTy.getParamTypes(FPTy);\n+\n+ const size_t ArgCount = FPTy.size() - 1;\n+ auto ExecCtxPtr = F.getFirstParam();\n+ auto RawFunc = LLVM::FunctionCallee{\n+ FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\n+ FTy.getPointerTo())};\n+ auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\n+ auto RawRets = RawArgs.getNextParam();\n+\n+ std::vector<LLVM::Value> Args;\n+ Args.reserve(FTy.getNumParams());\n+ Args.push_back(ExecCtxPtr);\n+ for (size_t J = 0; J < ArgCount; ++J) {\n+ Args.push_back(Builder.createValuePtrLoad(\n+ FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\n+ }\n \n- auto Ret = Builder.createCall(RawFunc, Args);\n- if (RTy.isVoidTy()) {\n- // nothing to do\n- } else if (RTy.isStructTy()) {\n- auto Rets = unpackStruct(Builder, Ret);\n- Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty, kValSize);\n- } else {\n- Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\n+ auto Ret = Builder.createCall(RawFunc, Args);\n+ if (RTy.isVoidTy()) {\n+ // nothing to do\n+ } else if (RTy.isStructTy()) {\n+ auto Rets = unpackStruct(Builder, Ret);\n+ Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty,\n+ kValSize);\n+ } else {\n+ Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\n+ }\n+ Builder.createRetVoid();\n }\n- Builder.createRetVoid();\n }\n // Copy wrapper, param and return lists to module instance.\n Context->FunctionWrappers.push_back(F);\n } else {\n // Non function type case. Create empty wrapper.\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\n- Name.c_str());\n+ auto F = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n {\n- F.setVisibility(LLVMProtectedVisibility);\n- F.setDSOLocal(true);\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\n- F.addFnAttr(Context->NoStackArgProbe);\n- F.addFnAttr(Context->StrictFP);\n- F.addFnAttr(Context->UWTable);\n- F.addParamAttr(0, Context->ReadOnly);\n- F.addParamAttr(0, Context->NoAlias);\n- F.addParamAttr(1, Context->NoAlias);\n- F.addParamAttr(2, Context->NoAlias);\n- F.addParamAttr(3, Context->NoAlias);\n-\n- LLVM::Builder Builder(Context->LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n- Builder.createRetVoid();\n+ SetFuncAttributes(F);\n+\n+ if (!DeclarationsOnly) {\n+ LLVM::Builder Builder(Context->LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n+ Builder.createRetVoid();\n+ }\n }\n Context->FunctionWrappers.push_back(F);\n }\n@@ -6184,9 +6321,9 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\n toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n auto RTy = FTy.getReturnType();\n auto F = LLVM::FunctionCallee{\n- FTy,\n- Context->LLModule.addFunction(FTy, LLVMInternalLinkage,\n- fmt::format(\"f{}\"sv, FuncID).c_str())};\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMInternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n F.Fn.setDSOLocal(true);\n F.Fn.addFnAttr(Context->NoStackArgProbe);\n F.Fn.addFnAttr(Context->StrictFP);\n@@ -6231,6 +6368,7 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\n }\n \n Context->Functions.emplace_back(TypeIdx, F, nullptr);\n+ Context->ImportCount++;\n break;\n }\n case ExternalType::Table: // Table type\n@@ -6313,9 +6451,10 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n const auto FuncID = Context->Functions.size();\n auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n- LLVM::FunctionCallee F = {FTy, Context->LLModule.addFunction(\n- FTy, LLVMExternalLinkage,\n- fmt::format(\"f{}\"sv, FuncID).c_str())};\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n F.Fn.setVisibility(LLVMProtectedVisibility);\n F.Fn.setDSOLocal(true);\n F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n@@ -6339,10 +6478,11 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n Locals.push_back(Local.second);\n }\n }\n- FunctionCompiler FC(*Context, F, Locals,\n- Conf.getCompilerConfigure().isInterruptible(),\n- Conf.getStatisticsConfigure().isInstructionCounting(),\n- Conf.getStatisticsConfigure().isCostMeasuring());\n+ FunctionCompiler FC(\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\n auto Type = Context->resolveBlockType(T);\n EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n F.Fn.eliminateUnreachableBlocks();\n@@ -6350,5 +6490,235 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n return {};\n }\n \n+void Compiler::compileFunctionDeclarations(\n+ const AST::FunctionSection &FunctionSec,\n+ const AST::CodeSection &CodeSec) noexcept {\n+ const auto &TypeIdxs = FunctionSec.getContent();\n+ const auto &CodeSegs = CodeSec.getContent();\n+ assuming(TypeIdxs.size() == CodeSegs.size());\n+\n+ for (size_t I = 0; I < CodeSegs.size(); ++I) {\n+ const auto &TypeIdx = TypeIdxs[I];\n+ const auto &Code = CodeSegs[I];\n+ assuming(TypeIdx < Context->CompositeTypes.size());\n+ assuming(Context->CompositeTypes[TypeIdx]->isFunc());\n+ const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n+ const auto FuncID = Context->Functions.size();\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n+ F.Fn.setVisibility(LLVMProtectedVisibility);\n+ F.Fn.setDSOLocal(true);\n+ F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ F.Fn.addFnAttr(Context->NoStackArgProbe);\n+ F.Fn.addFnAttr(Context->StrictFP);\n+ F.Fn.addFnAttr(Context->UWTable);\n+ F.Fn.addParamAttr(0, Context->ReadOnly);\n+ F.Fn.addParamAttr(0, Context->NoAlias);\n+\n+ Context->Functions.emplace_back(TypeIdx, F, &Code);\n+ }\n+}\n+\n+Expect<void> Compiler::compileFunctionBody(uint32_t LocalFuncIndex) noexcept {\n+ // Find the function in the Functions list\n+ // LocalFuncIndex is relative to the defined functions (not imports)\n+ uint32_t GlobalFuncIndex = Context->ImportCount + LocalFuncIndex;\n+ if (GlobalFuncIndex >= Context->Functions.size()) {\n+ spdlog::error(\"[lazy-jit]: function index {} out of range\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ auto &[T, F, Code] = Context->Functions[GlobalFuncIndex];\n+ if (!Code) {\n+ spdlog::error(\"[lazy-jit]: cannot compile import function {}\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ // Check if already compiled (function has basic blocks)\n+ if (F.Fn.countBasicBlocks() > 0) {\n+ spdlog::debug(\"[lazy-jit]: function {} already compiled\"sv, LocalFuncIndex);\n+ return {};\n+ }\n+\n+ spdlog::debug(\"[lazy-jit]: compiling function {}\"sv, LocalFuncIndex);\n+\n+ std::vector<ValType> Locals;\n+ for (const auto &Local : Code->getLocals()) {\n+ for (unsigned I = 0; I < Local.first; ++I) {\n+ Locals.push_back(Local.second);\n+ }\n+ }\n+\n+ FunctionCompiler FC(\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\n+ auto Type = Context->resolveBlockType(T);\n+ EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n+ F.Fn.eliminateUnreachableBlocks();\n+\n+ return {};\n+}\n+\n+Expect<std::pair<LLVM::Data,\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter>>>\n+LLVM::Compiler::compileInfrastructure(const AST::Module &Module,\n+ std::string Prefix) noexcept {\n+ Data D;\n+ D.setPrefix(Prefix);\n+ // Check the module is validated.\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ spdlog::info(\"[lazy-jit]: compile infrastructure start\"sv);\n+\n+ auto LLContext = D.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = D.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ std::unique_ptr<CompileContext, CompileContextDeleter> NewContext(\n+ new CompileContext(LLContext, LLModule,\n+ Conf.getCompilerConfigure().isGenericBinary(),\n+ D.getPrefix()));\n+ RAIICleanup Cleanup(this->Context, NewContext.get());\n+\n+ // Compile Function Types\n+ compile(Module.getTypeSection());\n+ // Compile ImportSection\n+ compile(Module.getImportSection());\n+ // Compile GlobalSection\n+ compile(Module.getGlobalSection());\n+ // Compile MemorySection (MemorySec, DataSec)\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ // Compile TableSection (TableSec, ElemSec)\n+ compile(Module.getTableSection(), Module.getElementSection());\n+ // Create function declarations without compiling bodies\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+ // Compile ExportSection\n+ compile(Module.getExportSection());\n+\n+ // Set initializer for constant value\n+ auto IntrinsicsName = fmt::format(\"{}intrinsics\"sv, D.getPrefix());\n+ if (auto IntrinsicsTable = LLModule.getNamedGlobal(IntrinsicsName.c_str())) {\n+ IntrinsicsTable.setInitializer(\n+ LLVM::Value::getConstNull(IntrinsicsTable.getType()));\n+ IntrinsicsTable.setGlobalConstant(false);\n+ } else {\n+ auto IntrinsicsTableTy = LLVM::Type::getArrayType(\n+ LLContext.getInt8Ty().getPointerTo(),\n+ static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax));\n+ LLModule.addGlobal(\n+ IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n+ LLVM::Value::getConstNull(IntrinsicsTableTy), IntrinsicsName.c_str());\n+ }\n+ LLModule.verify(LLVMPrintMessageAction);\n+\n+ spdlog::info(\"[lazy-jit]: infrastructure compilation done\"sv);\n+\n+ return Expect<\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>>{\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>{\n+ std::move(D), std::move(NewContext)}};\n+}\n+\n+Expect<LLVM::Data>\n+Compiler::compileFunctions(Data &&LLData, CompileContext *NewContext,\n+ const AST::Module &Module,\n+ Span<const uint32_t> LocalFuncIndices) noexcept {\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+ if (unlikely(LocalFuncIndices.empty())) {\n+ spdlog::error(\"[lazy-jit]: compileFunctions with empty index list\"sv);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ std::vector<uint32_t> Sorted(LocalFuncIndices.begin(),\n+ LocalFuncIndices.end());\n+ std::sort(Sorted.begin(), Sorted.end());\n+ Sorted.erase(std::unique(Sorted.begin(), Sorted.end()), Sorted.end());\n+\n+ spdlog::debug(\"[lazy-jit]: compile functions batch ({}) start\"sv,\n+ Sorted.size());\n+\n+ auto LLContext = LLData.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = LLData.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ RAIICleanup Cleanup(this->Context, NewContext);\n+ Context->LLModule = LLModule;\n+\n+ Context->CompositeTypes.clear();\n+ Context->FunctionWrappers.clear();\n+ Context->Functions.clear();\n+ Context->LazyJITCacheVars.clear();\n+ Context->ImportCount = 0;\n+ Context->MemoryAddrTypes.clear();\n+ Context->TableAddrTypes.clear();\n+ Context->Globals.clear();\n+\n+ Context->IntrinsicsTable = LLModule.addGlobal(\n+ Context->IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\n+ fmt::format(\"{}intrinsics\"sv, Context->Prefix).c_str());\n+ Context->IntrinsicsTable.setInitializer(LLVM::Value());\n+ Context->Trap.Ty =\n+ LLVM::Type::getFunctionType(Context->VoidTy, {Context->Int32Ty});\n+ Context->Trap.Fn =\n+ LLModule.addFunction(Context->Trap.Ty, LLVMPrivateLinkage, \"trap\");\n+ Context->Trap.Fn.setDSOLocal(true);\n+ Context->Trap.Fn.addFnAttr(Context->NoStackArgProbe);\n+ Context->Trap.Fn.addFnAttr(Context->StrictFP);\n+ Context->Trap.Fn.addFnAttr(Context->UWTable);\n+ Context->Trap.Fn.addFnAttr(Context->NoReturn);\n+ Context->Trap.Fn.addFnAttr(Context->Cold);\n+ Context->Trap.Fn.addFnAttr(Context->NoInline);\n+ Context->compileTrap();\n+\n+ compile(Module.getTypeSection(), true);\n+ compile(Module.getImportSection());\n+ compile(Module.getGlobalSection());\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ compile(Module.getTableSection(), Module.getElementSection());\n+\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+\n+ for (uint32_t FuncIndex : Sorted) {\n+ EXPECTED_TRY(compileFunctionBody(FuncIndex));\n+ }\n+\n+ spdlog::info(\"[lazy-jit]: verify batch ({} funcs) start\"sv, Sorted.size());\n+ LLModule.verify(LLVMPrintMessageAction);\n+ spdlog::info(\"[lazy-jit]: verify batch ({} funcs) done\"sv, Sorted.size());\n+\n+ auto &TM = LLData.extract().TM;\n+ EXPECTED_TRY(optimize(LLModule, TM));\n+\n+ spdlog::debug(\"[lazy-jit]: compile functions batch ({}) done\"sv,\n+ Sorted.size());\n+ return Expect<Data>{std::move(LLData)};\n+}\n+\n+void LLVM::Compiler::CompileContextDeleter::operator()(\n+ CompileContext *Context) const noexcept {\n+ delete Context;\n+}\n } // namespace LLVM\n } // namespace WasmEdge\n"}],"string":"[\n {\n \"comment\": \"This appears to be debug information. Remove it if it is no longer needed.\",\n \"path\": \"lib/llvm/compiler.cpp\",\n \"hunk\": \"@@ -3998,12 +4003,15 @@ class FunctionCompiler {\\n }\\n void compileAtomicWait(unsigned MemoryIndex, uint64_t MemoryOffset,\\n LLVM::Type TargetType, uint32_t BitWidth) noexcept {\\n+ spdlog::error(\\\"[lazyjit] memory_index: {}\\\", MemoryIndex);\\n auto Timeout = stackPop();\\n auto ExpectedValue = Builder.createZExtOrTrunc(stackPop(), Context.Int64Ty);\\n auto Offset = Builder.createZExt(stackPop(), Context.Int64Ty);\\n if (MemoryOffset != 0) {\\n Offset = Builder.createAdd(Offset, LLContext.getInt64(MemoryOffset));\\n }\\n+ spdlog::error(\\\"Check: {}\\\",\\n+ Context.MemoryAddrTypes[MemoryIndex].isStructTy());\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp\\nindex 39da94d9a9ac..330e245f51c3 100644\\n--- a/lib/llvm/compiler.cpp\\n+++ b/lib/llvm/compiler.cpp\\n@@ -9,6 +9,7 @@\\n #include \\\"common/spdlog.h\\\"\\n #include \\\"data.h\\\"\\n #include \\\"llvm.h\\\"\\n+#include \\\"spdlog/spdlog.h\\\"\\n #include \\\"system/allocator.h\\\"\\n \\n #include <algorithm>\\n@@ -16,6 +17,7 @@\\n #include <cinttypes>\\n #include <cstdint>\\n #include <cstdlib>\\n+#include <functional>\\n #include <limits>\\n #include <memory>\\n #include <numeric>\\n@@ -28,6 +30,16 @@ using namespace std::literals;\\n \\n namespace {\\n \\n+struct RAIICleanup {\\n+ RAIICleanup(LLVM::Compiler::CompileContext *&Context,\\n+ LLVM::Compiler::CompileContext *NewContext)\\n+ : Context(Context) {\\n+ Context = NewContext;\\n+ }\\n+ ~RAIICleanup() { Context = nullptr; }\\n+ LLVM::Compiler::CompileContext *&Context;\\n+};\\n+\\n static bool\\n isVoidReturn(WasmEdge::Span<const WasmEdge::ValType> ValTypes) noexcept;\\n static LLVM::Type toLLVMType(LLVM::Context LLContext,\\n@@ -128,7 +140,7 @@ static inline LLVMCodeGenOptLevel toLLVMCodeGenLevel(\\n \\n struct LLVM::Compiler::CompileContext {\\n LLVM::Context LLContext;\\n- LLVM::Module &LLModule;\\n+ std::reference_wrapper<LLVM::Module> LLModule;\\n LLVM::Attribute Cold;\\n LLVM::Attribute NoAlias;\\n LLVM::Attribute NoInline;\\n@@ -202,13 +214,16 @@ struct LLVM::Compiler::CompileContext {\\n std::vector<std::tuple<uint32_t, LLVM::FunctionCallee,\\n const WasmEdge::AST::CodeSegment *>>\\n Functions;\\n+ std::vector<LLVM::Value> LazyJITCacheVars;\\n+ uint32_t ImportCount = 0;\\n std::vector<LLVM::Type> MemoryAddrTypes;\\n std::vector<LLVM::Type> TableAddrTypes;\\n std::vector<LLVM::Type> Globals;\\n+ std::string Prefix;\\n LLVM::Value IntrinsicsTable;\\n LLVM::FunctionCallee Trap;\\n- CompileContext(LLVM::Context C, LLVM::Module &M,\\n- bool IsGenericBinary) noexcept\\n+ CompileContext(LLVM::Context C, LLVM::Module &M, bool IsGenericBinary,\\n+ std::string_view P = \\\"\\\"sv) noexcept\\n : LLContext(C), LLModule(M),\\n Cold(LLVM::Attribute::createEnum(C, LLVM::Core::Cold, 0)),\\n NoAlias(LLVM::Attribute::createEnum(C, LLVM::Core::NoAlias, 0)),\\n@@ -256,14 +271,14 @@ struct LLVM::Compiler::CompileContext {\\n })),\\n ExecCtxPtrTy(ExecCtxTy.getPointerTo()),\\n IntrinsicsTableTy(LLVM::Type::getArrayType(\\n- Int8PtrTy,\\n+ Int8Ty.getPointerTo(),\\n static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax))),\\n- IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()),\\n- IntrinsicsTable(LLModule.addGlobal(IntrinsicsTablePtrTy, true,\\n- LLVMExternalLinkage, LLVM::Value(),\\n- \\\"intrinsics\\\")) {\\n+ IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()), Prefix(P),\\n+ IntrinsicsTable(LLModule.get().addGlobal(\\n+ IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\\n+ fmt::format(\\\"{}intrinsics\\\"sv, Prefix).c_str())) {\\n Trap.Ty = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\\n- Trap.Fn = LLModule.addFunction(Trap.Ty, LLVMPrivateLinkage, \\\"trap\\\");\\n+ Trap.Fn = LLModule.get().addFunction(Trap.Ty, LLVMPrivateLinkage, \\\"trap\\\");\\n Trap.Fn.setDSOLocal(true);\\n Trap.Fn.addFnAttr(NoStackArgProbe);\\n Trap.Fn.addFnAttr(StrictFP);\\n@@ -272,9 +287,10 @@ struct LLVM::Compiler::CompileContext {\\n Trap.Fn.addFnAttr(Cold);\\n Trap.Fn.addFnAttr(NoInline);\\n \\n- LLModule.addGlobal(Int32Ty, true, LLVMExternalLinkage,\\n- LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\\n- \\\"version\\\");\\n+ LLModule.get().addGlobal(\\n+ Int32Ty, true, LLVMExternalLinkage,\\n+ LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\\n+ fmt::format(\\\"{}version\\\"sv, Prefix).c_str());\\n \\n if (!IsGenericBinary) {\\n SubtargetFeatures = LLVM::getHostCPUFeatures();\\n@@ -313,18 +329,7 @@ struct LLVM::Compiler::CompileContext {\\n }\\n }\\n \\n- {\\n- // create trap\\n- LLVM::Builder Builder(LLContext);\\n- Builder.positionAtEnd(\\n- LLVM::BasicBlock::create(LLContext, Trap.Fn, \\\"entry\\\"));\\n- auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\\n- auto CallTrap = Builder.createCall(\\n- getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\\n- {Trap.Fn.getFirstParam()});\\n- CallTrap.addCallSiteAttribute(NoReturn);\\n- Builder.createUnreachable();\\n- }\\n+ compileTrap();\\n }\\n LLVM::Value getMemory(LLVM::Builder &Builder, LLVM::Value ExecCtx,\\n uint32_t Index) noexcept {\\n@@ -394,6 +399,17 @@ struct LLVM::Compiler::CompileContext {\\n auto Ptr = Builder.createBitCast(VPtr, PtrPtrTy);\\n return {Ty, Builder.createLoad(PtrTy, Ptr)};\\n }\\n+ void compileTrap() noexcept {\\n+ LLVM::Builder Builder(LLContext);\\n+ Builder.positionAtEnd(\\n+ LLVM::BasicBlock::create(LLContext, Trap.Fn, \\\"entry\\\"));\\n+ auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\\n+ auto CallTrap = Builder.createCall(\\n+ getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\\n+ {Trap.Fn.getFirstParam()});\\n+ CallTrap.addCallSiteAttribute(NoReturn);\\n+ Builder.createUnreachable();\\n+ }\\n std::pair<std::vector<ValType>, std::vector<ValType>>\\n resolveBlockType(const BlockType &BType) const noexcept {\\n using VecT = std::vector<ValType>;\\n@@ -544,9 +560,10 @@ class FunctionCompiler {\\n FunctionCompiler(LLVM::Compiler::CompileContext &Context,\\n LLVM::FunctionCallee F, Span<const ValType> Locals,\\n bool Interruptible, bool InstructionCounting,\\n- bool GasMeasuring) noexcept\\n+ bool GasMeasuring, bool IsLazyJIT) noexcept\\n : Context(Context), LLContext(Context.LLContext),\\n- Interruptible(Interruptible), F(F), Builder(LLContext) {\\n+ Interruptible(Interruptible), IsLazyJIT(IsLazyJIT), F(F),\\n+ Builder(LLContext) {\\n if (F.Fn) {\\n Builder.positionAtEnd(LLVM::BasicBlock::create(LLContext, F.Fn, \\\"entry\\\"));\\n ExecCtx = Builder.createLoad(Context.ExecCtxTy, F.Fn.getFirstParam());\\n@@ -4267,7 +4284,63 @@ class FunctionCompiler {\\n Args[J + 1] = stackPop();\\n }\\n \\n- auto Ret = Builder.createCall(Function, Args);\\n+ LLVM::Value Ret;\\n+ if (IsLazyJIT) {\\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\\n+ if (IsImport) {\\n+ Ret = Builder.createCall(Function, Args);\\n+ } else {\\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\\n+\\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\\n+ }\\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\\n+ if (!CacheVar) {\\n+ CacheVar = Context.LLModule.get().addGlobal(\\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \\\"\\\");\\n+ }\\n+\\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \\\"ic.check\\\");\\n+ auto ResolveBB =\\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \\\"ic.resolve\\\");\\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \\\"ic.call\\\");\\n+\\n+ Builder.createBr(CheckBB);\\n+ Builder.positionAtEnd(CheckBB);\\n+\\n+ auto CachedPtr =\\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\\n+ CachedPtr.setAlignment(8);\\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\\n+ auto IsNull = Builder.createIsNull(CachedPtr);\\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\\n+\\n+ Builder.positionAtEnd(ResolveBB);\\n+ auto FPtr = Builder.createCall(\\n+ Context.getIntrinsic(\\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\\n+ {Context.Int32Ty}, false)),\\n+ {LLContext.getInt32(FuncIndex)});\\n+ auto Store = Builder.createStore(FPtr, CacheVar);\\n+ Store.setAlignment(8);\\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\\n+ Builder.createBr(CallBB);\\n+\\n+ Builder.positionAtEnd(CallBB);\\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\\n+\\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\\n+ }\\n+ } else {\\n+ Ret = Builder.createCall(Function, Args);\\n+ }\\n+\\n auto Ty = Ret.getType();\\n if (Ty.isVoidTy()) {\\n // nothing to do\\n@@ -4387,7 +4460,64 @@ class FunctionCompiler {\\n Args[J + 1] = stackPop();\\n }\\n \\n- auto Ret = Builder.createCall(Function, Args);\\n+ LLVM::Value Ret;\\n+ if (IsLazyJIT) {\\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\\n+ if (IsImport) {\\n+ Ret = Builder.createCall(Function, Args);\\n+ } else {\\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\\n+\\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\\n+ }\\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\\n+ if (!CacheVar) {\\n+ CacheVar = Context.LLModule.get().addGlobal(\\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \\\"\\\");\\n+ }\\n+\\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \\\"rc.check\\\");\\n+ auto ResolveBB =\\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \\\"rc.resolve\\\");\\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \\\"rc.call\\\");\\n+\\n+ Builder.createBr(CheckBB);\\n+ Builder.positionAtEnd(CheckBB);\\n+\\n+ auto CachedPtr =\\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\\n+ CachedPtr.setAlignment(8);\\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\\n+ auto IsNull = Builder.createIsNull(CachedPtr);\\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\\n+\\n+ Builder.positionAtEnd(ResolveBB);\\n+ auto FPtr = Builder.createCall(\\n+ Context.getIntrinsic(\\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\\n+ {Context.Int32Ty}, false)),\\n+ {LLContext.getInt32(FuncIndex)});\\n+ auto Store = Builder.createStore(FPtr, CacheVar);\\n+ Store.setAlignment(8);\\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\\n+ Builder.createBr(CallBB);\\n+\\n+ Builder.positionAtEnd(CallBB);\\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\\n+\\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\\n+ }\\n+ } else {\\n+ Ret = Builder.createCall(Function, Args);\\n+ }\\n+\\n+ Ret.setMustTailCall();\\n auto Ty = Ret.getType();\\n if (Ty.isVoidTy()) {\\n Builder.createRetVoid();\\n@@ -4432,6 +4562,7 @@ class FunctionCompiler {\\n \\n auto FPtrRet =\\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\\n+ FPtrRet.setMustTailCall();\\n if (RetSize == 0) {\\n Builder.createRetVoid();\\n } else {\\n@@ -4608,6 +4739,7 @@ class FunctionCompiler {\\n \\n auto FPtrRet =\\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\\n+ FPtrRet.setMustTailCall();\\n if (RetSize == 0) {\\n Builder.createRetVoid();\\n } else {\\n@@ -5854,6 +5986,7 @@ class FunctionCompiler {\\n Control &operator=(const Control &) = default;\\n Control &operator=(Control &&) = default;\\n };\\n+ bool IsLazyJIT;\\n std::vector<Control> ControlStack;\\n LLVM::FunctionCallee F;\\n LLVM::Value ExecCtx;\\n@@ -5894,6 +6027,84 @@ Expect<void> Compiler::checkConfigure() noexcept {\\n return {};\\n }\\n \\n+Expect<void> Compiler::optimize(LLVM::Module &LLModule,\\n+ LLVM::TargetMachine &TM) noexcept {\\n+ spdlog::info(\\\"optimize start\\\"sv);\\n+ auto Triple = LLModule.getTarget();\\n+ auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\\n+ if (ErrorMessage) {\\n+ spdlog::error(\\\"getFromTriple failed:{}\\\"sv, ErrorMessage.string_view());\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ std::string CPUName;\\n+#if defined(__riscv) && __riscv_xlen == 64\\n+ CPUName = \\\"generic-rv64\\\"s;\\n+#else\\n+ if (!Conf.getCompilerConfigure().isGenericBinary()) {\\n+ CPUName = LLVM::getHostCPUName().string_view();\\n+ } else {\\n+ CPUName = \\\"generic\\\"s;\\n+ }\\n+#endif\\n+\\n+ // On RISC-V we use generic-rv64 as the CPU, so also use default\\n+ // features; host features under QEMU can be inconsistent (e.g.\\n+ // zvl*b without v) which LLVM >= 20 rejects.\\n+ TM = LLVM::TargetMachine::create(\\n+ TheTarget, Triple, CPUName.c_str(),\\n+#if defined(__riscv) && __riscv_xlen == 64\\n+ \\\"\\\",\\n+#else\\n+ LLVM::getHostCPUFeatures().unwrap(),\\n+#endif\\n+ toLLVMCodeGenLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\\n+ LLVMRelocPIC, LLVMCodeModelDefault);\\n+\\n+#if LLVM_VERSION_MAJOR >= 13\\n+ auto PBO = LLVM::PassBuilderOptions::create();\\n+ if (auto Error = PBO.runPasses(\\n+ LLModule,\\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\\n+ TM)) {\\n+ spdlog::error(\\\"{}\\\"sv, Error.message().string_view());\\n+ }\\n+#else\\n+ auto FP = LLVM::PassManager::createForModule(LLModule);\\n+ auto MP = LLVM::PassManager::create();\\n+\\n+ TM.addAnalysisPasses(MP);\\n+ TM.addAnalysisPasses(FP);\\n+ {\\n+ auto PMB = LLVM::PassManagerBuilder::create();\\n+ auto [OptLevel, SizeLevel] =\\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\\n+ PMB.setOptLevel(OptLevel);\\n+ PMB.setSizeLevel(SizeLevel);\\n+ PMB.populateFunctionPassManager(FP);\\n+ PMB.populateModulePassManager(MP);\\n+ }\\n+ switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\\n+ case CompilerConfigure::OptimizationLevel::O0:\\n+ case CompilerConfigure::OptimizationLevel::O1:\\n+ FP.addTailCallEliminationPass();\\n+ break;\\n+ default:\\n+ break;\\n+ }\\n+\\n+ FP.initializeFunctionPassManager();\\n+ for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\\n+ FP.runFunctionPassManager(Fn);\\n+ }\\n+ FP.finalizeFunctionPassManager();\\n+ MP.runPassManager(LLModule);\\n+#endif\\n+\\n+ spdlog::info(\\\"optimize done\\\"sv);\\n+ return {};\\n+}\\n+\\n Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\\n // Check that the module is validated.\\n if (unlikely(!Module.getIsValidated())) {\\n@@ -5913,15 +6124,7 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\\n \\n CompileContext NewContext(LLContext, LLModule,\\n Conf.getCompilerConfigure().isGenericBinary());\\n- struct RAIICleanup {\\n- RAIICleanup(CompileContext *&Context, CompileContext &NewContext)\\n- : Context(Context) {\\n- Context = &NewContext;\\n- }\\n- ~RAIICleanup() { Context = nullptr; }\\n- CompileContext *&Context;\\n- };\\n- RAIICleanup Cleanup(Context, NewContext);\\n+ RAIICleanup Cleanup(Context, &NewContext);\\n \\n // Compile Function Types\\n compile(Module.getTypeSection());\\n@@ -5942,81 +6145,8 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\\n spdlog::info(\\\"verify start\\\"sv);\\n LLModule.verify(LLVMPrintMessageAction);\\n \\n- spdlog::info(\\\"optimize start\\\"sv);\\n auto &TM = D.extract().TM;\\n- {\\n- auto Triple = LLModule.getTarget();\\n- auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\\n- if (ErrorMessage) {\\n- spdlog::error(\\\"getFromTriple failed:{}\\\"sv, ErrorMessage.string_view());\\n- return Unexpect(ErrCode::Value::IllegalPath);\\n- } else {\\n- std::string CPUName;\\n-#if defined(__riscv) && __riscv_xlen == 64\\n- CPUName = \\\"generic-rv64\\\"s;\\n-#else\\n- if (!Conf.getCompilerConfigure().isGenericBinary()) {\\n- CPUName = LLVM::getHostCPUName().string_view();\\n- } else {\\n- CPUName = \\\"generic\\\"s;\\n- }\\n-#endif\\n-\\n- // On RISC-V we use generic-rv64 as the CPU, so also use default\\n- // features; host features under QEMU can be inconsistent (e.g.\\n- // zvl*b without v) which LLVM >= 20 rejects.\\n- TM = LLVM::TargetMachine::create(\\n- TheTarget, Triple, CPUName.c_str(),\\n-#if defined(__riscv) && __riscv_xlen == 64\\n- \\\"\\\",\\n-#else\\n- LLVM::getHostCPUFeatures().unwrap(),\\n-#endif\\n- toLLVMCodeGenLevel(\\n- Conf.getCompilerConfigure().getOptimizationLevel()),\\n- LLVMRelocPIC, LLVMCodeModelDefault);\\n- }\\n-\\n-#if LLVM_VERSION_MAJOR >= 13\\n- auto PBO = LLVM::PassBuilderOptions::create();\\n- if (auto Error = PBO.runPasses(\\n- LLModule,\\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\\n- TM)) {\\n- spdlog::error(\\\"{}\\\"sv, Error.message().string_view());\\n- }\\n-#else\\n- auto FP = LLVM::PassManager::createForModule(LLModule);\\n- auto MP = LLVM::PassManager::create();\\n-\\n- TM.addAnalysisPasses(MP);\\n- TM.addAnalysisPasses(FP);\\n- {\\n- auto PMB = LLVM::PassManagerBuilder::create();\\n- auto [OptLevel, SizeLevel] =\\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\\n- PMB.setOptLevel(OptLevel);\\n- PMB.setSizeLevel(SizeLevel);\\n- PMB.populateFunctionPassManager(FP);\\n- PMB.populateModulePassManager(MP);\\n- }\\n- switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\\n- case CompilerConfigure::OptimizationLevel::O0:\\n- case CompilerConfigure::OptimizationLevel::O1:\\n- FP.addTailCallEliminationPass();\\n- break;\\n- default:\\n- break;\\n- }\\n-\\n- FP.initializeFunctionPassManager();\\n- for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\\n- FP.runFunctionPassManager(Fn);\\n- }\\n- FP.finalizeFunctionPassManager();\\n- MP.runPassManager(LLModule);\\n-#endif\\n- }\\n+ EXPECTED_TRY(optimize(LLModule, TM));\\n \\n // Set initializer for constant value\\n if (auto IntrinsicsTable = LLModule.getNamedGlobal(\\\"intrinsics\\\")) {\\n@@ -6031,12 +6161,11 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\\n IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\\n LLVM::Value::getConstNull(IntrinsicsTableTy), \\\"intrinsics\\\");\\n }\\n-\\n- spdlog::info(\\\"optimize done\\\"sv);\\n return Expect<Data>{std::move(D)};\\n }\\n \\n-void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\\n+void Compiler::compile(const AST::TypeSection &TypeSec,\\n+ bool DeclarationsOnly) noexcept {\\n auto WrapperTy =\\n LLVM::Type::getFunctionType(Context->VoidTy,\\n {Context->ExecCtxPtrTy, Context->Int8PtrTy,\\n@@ -6050,10 +6179,25 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\\n Context->CompositeTypes.reserve(Size);\\n Context->FunctionWrappers.reserve(Size);\\n \\n+ auto SetFuncAttributes = [&](auto FDecl) {\\n+ FDecl.setVisibility(LLVMProtectedVisibility);\\n+ FDecl.setDSOLocal(true);\\n+ FDecl.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ FDecl.addFnAttr(Context->NoStackArgProbe);\\n+ FDecl.addFnAttr(Context->StrictFP);\\n+ FDecl.addFnAttr(Context->UWTable);\\n+ FDecl.addParamAttr(0, Context->ReadOnly);\\n+ FDecl.addParamAttr(0, Context->NoAlias);\\n+ FDecl.addParamAttr(1, Context->NoAlias);\\n+ FDecl.addParamAttr(2, Context->NoAlias);\\n+ FDecl.addParamAttr(3, Context->NoAlias);\\n+ };\\n+\\n // Iterate and compile types.\\n for (size_t I = 0; I < Size; ++I) {\\n const auto &CompType = SubTypes[I].getCompositeType();\\n- const auto Name = fmt::format(\\\"t{}\\\"sv, Context->CompositeTypes.size());\\n+ const auto Name =\\n+ fmt::format(\\\"{}t{}\\\"sv, Context->Prefix, Context->CompositeTypes.size());\\n if (CompType.isFunc()) {\\n // Check that the function type is unique.\\n {\\n@@ -6065,13 +6209,21 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\\n if (OldFuncType == CompType.getFuncType()) {\\n Unique = false;\\n Context->CompositeTypes.push_back(Context->CompositeTypes[J]);\\n- auto F = Context->FunctionWrappers[J];\\n- Context->FunctionWrappers.push_back(F);\\n- auto A = Context->LLModule.addAlias(WrapperTy, F, Name.c_str());\\n- A.setLinkage(LLVMExternalLinkage);\\n- A.setVisibility(LLVMProtectedVisibility);\\n- A.setDSOLocal(true);\\n- A.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ if (DeclarationsOnly) {\\n+ auto FDecl = Context->LLModule.get().addFunction(\\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\\n+ SetFuncAttributes(FDecl);\\n+ Context->FunctionWrappers.push_back(FDecl);\\n+ } else {\\n+ auto F = Context->FunctionWrappers[J];\\n+ Context->FunctionWrappers.push_back(F);\\n+ auto A = Context->LLModule.get().addAlias(WrapperTy, F,\\n+ Name.c_str());\\n+ A.setLinkage(LLVMExternalLinkage);\\n+ A.setVisibility(LLVMProtectedVisibility);\\n+ A.setDSOLocal(true);\\n+ A.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ }\\n break;\\n }\\n }\\n@@ -6082,81 +6234,66 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\\n }\\n \\n // Create Wrapper\\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\\n- Name.c_str());\\n+ auto F = Context->LLModule.get().addFunction(\\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\\n {\\n- F.setVisibility(LLVMProtectedVisibility);\\n- F.setDSOLocal(true);\\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\\n- F.addFnAttr(Context->NoStackArgProbe);\\n- F.addFnAttr(Context->StrictFP);\\n- F.addFnAttr(Context->UWTable);\\n- F.addParamAttr(0, Context->ReadOnly);\\n- F.addParamAttr(0, Context->NoAlias);\\n- F.addParamAttr(1, Context->NoAlias);\\n- F.addParamAttr(2, Context->NoAlias);\\n- F.addParamAttr(3, Context->NoAlias);\\n-\\n- LLVM::Builder Builder(Context->LLContext);\\n- Builder.positionAtEnd(\\n- LLVM::BasicBlock::create(Context->LLContext, F, \\\"entry\\\"));\\n-\\n- auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\\n- CompType.getFuncType());\\n- auto RTy = FTy.getReturnType();\\n- std::vector<LLVM::Type> FPTy(FTy.getNumParams());\\n- FTy.getParamTypes(FPTy);\\n-\\n- const size_t ArgCount = FPTy.size() - 1;\\n- auto ExecCtxPtr = F.getFirstParam();\\n- auto RawFunc = LLVM::FunctionCallee{\\n- FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\\n- FTy.getPointerTo())};\\n- auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\\n- auto RawRets = RawArgs.getNextParam();\\n-\\n- std::vector<LLVM::Value> Args;\\n- Args.reserve(FTy.getNumParams());\\n- Args.push_back(ExecCtxPtr);\\n- for (size_t J = 0; J < ArgCount; ++J) {\\n- Args.push_back(Builder.createValuePtrLoad(\\n- FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\\n- }\\n+ SetFuncAttributes(F);\\n+\\n+ if (!DeclarationsOnly) {\\n+ LLVM::Builder Builder(Context->LLContext);\\n+ Builder.positionAtEnd(\\n+ LLVM::BasicBlock::create(Context->LLContext, F, \\\"entry\\\"));\\n+\\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\\n+ CompType.getFuncType());\\n+ auto RTy = FTy.getReturnType();\\n+ std::vector<LLVM::Type> FPTy(FTy.getNumParams());\\n+ FTy.getParamTypes(FPTy);\\n+\\n+ const size_t ArgCount = FPTy.size() - 1;\\n+ auto ExecCtxPtr = F.getFirstParam();\\n+ auto RawFunc = LLVM::FunctionCallee{\\n+ FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\\n+ FTy.getPointerTo())};\\n+ auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\\n+ auto RawRets = RawArgs.getNextParam();\\n+\\n+ std::vector<LLVM::Value> Args;\\n+ Args.reserve(FTy.getNumParams());\\n+ Args.push_back(ExecCtxPtr);\\n+ for (size_t J = 0; J < ArgCount; ++J) {\\n+ Args.push_back(Builder.createValuePtrLoad(\\n+ FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\\n+ }\\n \\n- auto Ret = Builder.createCall(RawFunc, Args);\\n- if (RTy.isVoidTy()) {\\n- // nothing to do\\n- } else if (RTy.isStructTy()) {\\n- auto Rets = unpackStruct(Builder, Ret);\\n- Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty, kValSize);\\n- } else {\\n- Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\\n+ auto Ret = Builder.createCall(RawFunc, Args);\\n+ if (RTy.isVoidTy()) {\\n+ // nothing to do\\n+ } else if (RTy.isStructTy()) {\\n+ auto Rets = unpackStruct(Builder, Ret);\\n+ Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty,\\n+ kValSize);\\n+ } else {\\n+ Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\\n+ }\\n+ Builder.createRetVoid();\\n }\\n- Builder.createRetVoid();\\n }\\n // Copy wrapper, param and return lists to module instance.\\n Context->FunctionWrappers.push_back(F);\\n } else {\\n // Non function type case. Create empty wrapper.\\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\\n- Name.c_str());\\n+ auto F = Context->LLModule.get().addFunction(\\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\\n {\\n- F.setVisibility(LLVMProtectedVisibility);\\n- F.setDSOLocal(true);\\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\\n- F.addFnAttr(Context->NoStackArgProbe);\\n- F.addFnAttr(Context->StrictFP);\\n- F.addFnAttr(Context->UWTable);\\n- F.addParamAttr(0, Context->ReadOnly);\\n- F.addParamAttr(0, Context->NoAlias);\\n- F.addParamAttr(1, Context->NoAlias);\\n- F.addParamAttr(2, Context->NoAlias);\\n- F.addParamAttr(3, Context->NoAlias);\\n-\\n- LLVM::Builder Builder(Context->LLContext);\\n- Builder.positionAtEnd(\\n- LLVM::BasicBlock::create(Context->LLContext, F, \\\"entry\\\"));\\n- Builder.createRetVoid();\\n+ SetFuncAttributes(F);\\n+\\n+ if (!DeclarationsOnly) {\\n+ LLVM::Builder Builder(Context->LLContext);\\n+ Builder.positionAtEnd(\\n+ LLVM::BasicBlock::create(Context->LLContext, F, \\\"entry\\\"));\\n+ Builder.createRetVoid();\\n+ }\\n }\\n Context->FunctionWrappers.push_back(F);\\n }\\n@@ -6184,9 +6321,9 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\\n toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\\n auto RTy = FTy.getReturnType();\\n auto F = LLVM::FunctionCallee{\\n- FTy,\\n- Context->LLModule.addFunction(FTy, LLVMInternalLinkage,\\n- fmt::format(\\\"f{}\\\"sv, FuncID).c_str())};\\n+ FTy, Context->LLModule.get().addFunction(\\n+ FTy, LLVMInternalLinkage,\\n+ fmt::format(\\\"{}f{}\\\"sv, Context->Prefix, FuncID).c_str())};\\n F.Fn.setDSOLocal(true);\\n F.Fn.addFnAttr(Context->NoStackArgProbe);\\n F.Fn.addFnAttr(Context->StrictFP);\\n@@ -6231,6 +6368,7 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\\n }\\n \\n Context->Functions.emplace_back(TypeIdx, F, nullptr);\\n+ Context->ImportCount++;\\n break;\\n }\\n case ExternalType::Table: // Table type\\n@@ -6313,9 +6451,10 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\\n const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\\n const auto FuncID = Context->Functions.size();\\n auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\\n- LLVM::FunctionCallee F = {FTy, Context->LLModule.addFunction(\\n- FTy, LLVMExternalLinkage,\\n- fmt::format(\\\"f{}\\\"sv, FuncID).c_str())};\\n+ LLVM::FunctionCallee F = {\\n+ FTy, Context->LLModule.get().addFunction(\\n+ FTy, LLVMExternalLinkage,\\n+ fmt::format(\\\"{}f{}\\\"sv, Context->Prefix, FuncID).c_str())};\\n F.Fn.setVisibility(LLVMProtectedVisibility);\\n F.Fn.setDSOLocal(true);\\n F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\\n@@ -6339,10 +6478,11 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\\n Locals.push_back(Local.second);\\n }\\n }\\n- FunctionCompiler FC(*Context, F, Locals,\\n- Conf.getCompilerConfigure().isInterruptible(),\\n- Conf.getStatisticsConfigure().isInstructionCounting(),\\n- Conf.getStatisticsConfigure().isCostMeasuring());\\n+ FunctionCompiler FC(\\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\\n auto Type = Context->resolveBlockType(T);\\n EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\\n F.Fn.eliminateUnreachableBlocks();\\n@@ -6350,5 +6490,235 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\\n return {};\\n }\\n \\n+void Compiler::compileFunctionDeclarations(\\n+ const AST::FunctionSection &FunctionSec,\\n+ const AST::CodeSection &CodeSec) noexcept {\\n+ const auto &TypeIdxs = FunctionSec.getContent();\\n+ const auto &CodeSegs = CodeSec.getContent();\\n+ assuming(TypeIdxs.size() == CodeSegs.size());\\n+\\n+ for (size_t I = 0; I < CodeSegs.size(); ++I) {\\n+ const auto &TypeIdx = TypeIdxs[I];\\n+ const auto &Code = CodeSegs[I];\\n+ assuming(TypeIdx < Context->CompositeTypes.size());\\n+ assuming(Context->CompositeTypes[TypeIdx]->isFunc());\\n+ const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\\n+ const auto FuncID = Context->Functions.size();\\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\\n+ LLVM::FunctionCallee F = {\\n+ FTy, Context->LLModule.get().addFunction(\\n+ FTy, LLVMExternalLinkage,\\n+ fmt::format(\\\"{}f{}\\\"sv, Context->Prefix, FuncID).c_str())};\\n+ F.Fn.setVisibility(LLVMProtectedVisibility);\\n+ F.Fn.setDSOLocal(true);\\n+ F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ F.Fn.addFnAttr(Context->NoStackArgProbe);\\n+ F.Fn.addFnAttr(Context->StrictFP);\\n+ F.Fn.addFnAttr(Context->UWTable);\\n+ F.Fn.addParamAttr(0, Context->ReadOnly);\\n+ F.Fn.addParamAttr(0, Context->NoAlias);\\n+\\n+ Context->Functions.emplace_back(TypeIdx, F, &Code);\\n+ }\\n+}\\n+\\n+Expect<void> Compiler::compileFunctionBody(uint32_t LocalFuncIndex) noexcept {\\n+ // Find the function in the Functions list\\n+ // LocalFuncIndex is relative to the defined functions (not imports)\\n+ uint32_t GlobalFuncIndex = Context->ImportCount + LocalFuncIndex;\\n+ if (GlobalFuncIndex >= Context->Functions.size()) {\\n+ spdlog::error(\\\"[lazy-jit]: function index {} out of range\\\"sv,\\n+ LocalFuncIndex);\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ auto &[T, F, Code] = Context->Functions[GlobalFuncIndex];\\n+ if (!Code) {\\n+ spdlog::error(\\\"[lazy-jit]: cannot compile import function {}\\\"sv,\\n+ LocalFuncIndex);\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ // Check if already compiled (function has basic blocks)\\n+ if (F.Fn.countBasicBlocks() > 0) {\\n+ spdlog::debug(\\\"[lazy-jit]: function {} already compiled\\\"sv, LocalFuncIndex);\\n+ return {};\\n+ }\\n+\\n+ spdlog::debug(\\\"[lazy-jit]: compiling function {}\\\"sv, LocalFuncIndex);\\n+\\n+ std::vector<ValType> Locals;\\n+ for (const auto &Local : Code->getLocals()) {\\n+ for (unsigned I = 0; I < Local.first; ++I) {\\n+ Locals.push_back(Local.second);\\n+ }\\n+ }\\n+\\n+ FunctionCompiler FC(\\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\\n+ auto Type = Context->resolveBlockType(T);\\n+ EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\\n+ F.Fn.eliminateUnreachableBlocks();\\n+\\n+ return {};\\n+}\\n+\\n+Expect<std::pair<LLVM::Data,\\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\\n+ LLVM::Compiler::CompileContextDeleter>>>\\n+LLVM::Compiler::compileInfrastructure(const AST::Module &Module,\\n+ std::string Prefix) noexcept {\\n+ Data D;\\n+ D.setPrefix(Prefix);\\n+ // Check the module is validated.\\n+ if (unlikely(!Module.getIsValidated())) {\\n+ spdlog::error(ErrCode::Value::NotValidated);\\n+ return Unexpect(ErrCode::Value::NotValidated);\\n+ }\\n+\\n+ std::unique_lock Lock(Mutex);\\n+ spdlog::info(\\\"[lazy-jit]: compile infrastructure start\\\"sv);\\n+\\n+ auto LLContext = D.extract().getLLContext();\\n+ LLVM::Core::init(LLContext.unwrap());\\n+ auto &LLModule = D.extract().LLModule;\\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \\\"PIC Level\\\"sv, 2);\\n+\\n+ std::unique_ptr<CompileContext, CompileContextDeleter> NewContext(\\n+ new CompileContext(LLContext, LLModule,\\n+ Conf.getCompilerConfigure().isGenericBinary(),\\n+ D.getPrefix()));\\n+ RAIICleanup Cleanup(this->Context, NewContext.get());\\n+\\n+ // Compile Function Types\\n+ compile(Module.getTypeSection());\\n+ // Compile ImportSection\\n+ compile(Module.getImportSection());\\n+ // Compile GlobalSection\\n+ compile(Module.getGlobalSection());\\n+ // Compile MemorySection (MemorySec, DataSec)\\n+ compile(Module.getMemorySection(), Module.getDataSection());\\n+ // Compile TableSection (TableSec, ElemSec)\\n+ compile(Module.getTableSection(), Module.getElementSection());\\n+ // Create function declarations without compiling bodies\\n+ compileFunctionDeclarations(Module.getFunctionSection(),\\n+ Module.getCodeSection());\\n+ // Compile ExportSection\\n+ compile(Module.getExportSection());\\n+\\n+ // Set initializer for constant value\\n+ auto IntrinsicsName = fmt::format(\\\"{}intrinsics\\\"sv, D.getPrefix());\\n+ if (auto IntrinsicsTable = LLModule.getNamedGlobal(IntrinsicsName.c_str())) {\\n+ IntrinsicsTable.setInitializer(\\n+ LLVM::Value::getConstNull(IntrinsicsTable.getType()));\\n+ IntrinsicsTable.setGlobalConstant(false);\\n+ } else {\\n+ auto IntrinsicsTableTy = LLVM::Type::getArrayType(\\n+ LLContext.getInt8Ty().getPointerTo(),\\n+ static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax));\\n+ LLModule.addGlobal(\\n+ IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\\n+ LLVM::Value::getConstNull(IntrinsicsTableTy), IntrinsicsName.c_str());\\n+ }\\n+ LLModule.verify(LLVMPrintMessageAction);\\n+\\n+ spdlog::info(\\\"[lazy-jit]: infrastructure compilation done\\\"sv);\\n+\\n+ return Expect<\\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>>{\\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>{\\n+ std::move(D), std::move(NewContext)}};\\n+}\\n+\\n+Expect<LLVM::Data>\\n+Compiler::compileFunctions(Data &&LLData, CompileContext *NewContext,\\n+ const AST::Module &Module,\\n+ Span<const uint32_t> LocalFuncIndices) noexcept {\\n+ if (unlikely(!Module.getIsValidated())) {\\n+ spdlog::error(ErrCode::Value::NotValidated);\\n+ return Unexpect(ErrCode::Value::NotValidated);\\n+ }\\n+ if (unlikely(LocalFuncIndices.empty())) {\\n+ spdlog::error(\\\"[lazy-jit]: compileFunctions with empty index list\\\"sv);\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ std::unique_lock Lock(Mutex);\\n+ std::vector<uint32_t> Sorted(LocalFuncIndices.begin(),\\n+ LocalFuncIndices.end());\\n+ std::sort(Sorted.begin(), Sorted.end());\\n+ Sorted.erase(std::unique(Sorted.begin(), Sorted.end()), Sorted.end());\\n+\\n+ spdlog::debug(\\\"[lazy-jit]: compile functions batch ({}) start\\\"sv,\\n+ Sorted.size());\\n+\\n+ auto LLContext = LLData.extract().getLLContext();\\n+ LLVM::Core::init(LLContext.unwrap());\\n+ auto &LLModule = LLData.extract().LLModule;\\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \\\"PIC Level\\\"sv, 2);\\n+\\n+ RAIICleanup Cleanup(this->Context, NewContext);\\n+ Context->LLModule = LLModule;\\n+\\n+ Context->CompositeTypes.clear();\\n+ Context->FunctionWrappers.clear();\\n+ Context->Functions.clear();\\n+ Context->LazyJITCacheVars.clear();\\n+ Context->ImportCount = 0;\\n+ Context->MemoryAddrTypes.clear();\\n+ Context->TableAddrTypes.clear();\\n+ Context->Globals.clear();\\n+\\n+ Context->IntrinsicsTable = LLModule.addGlobal(\\n+ Context->IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\\n+ fmt::format(\\\"{}intrinsics\\\"sv, Context->Prefix).c_str());\\n+ Context->IntrinsicsTable.setInitializer(LLVM::Value());\\n+ Context->Trap.Ty =\\n+ LLVM::Type::getFunctionType(Context->VoidTy, {Context->Int32Ty});\\n+ Context->Trap.Fn =\\n+ LLModule.addFunction(Context->Trap.Ty, LLVMPrivateLinkage, \\\"trap\\\");\\n+ Context->Trap.Fn.setDSOLocal(true);\\n+ Context->Trap.Fn.addFnAttr(Context->NoStackArgProbe);\\n+ Context->Trap.Fn.addFnAttr(Context->StrictFP);\\n+ Context->Trap.Fn.addFnAttr(Context->UWTable);\\n+ Context->Trap.Fn.addFnAttr(Context->NoReturn);\\n+ Context->Trap.Fn.addFnAttr(Context->Cold);\\n+ Context->Trap.Fn.addFnAttr(Context->NoInline);\\n+ Context->compileTrap();\\n+\\n+ compile(Module.getTypeSection(), true);\\n+ compile(Module.getImportSection());\\n+ compile(Module.getGlobalSection());\\n+ compile(Module.getMemorySection(), Module.getDataSection());\\n+ compile(Module.getTableSection(), Module.getElementSection());\\n+\\n+ compileFunctionDeclarations(Module.getFunctionSection(),\\n+ Module.getCodeSection());\\n+\\n+ for (uint32_t FuncIndex : Sorted) {\\n+ EXPECTED_TRY(compileFunctionBody(FuncIndex));\\n+ }\\n+\\n+ spdlog::info(\\\"[lazy-jit]: verify batch ({} funcs) start\\\"sv, Sorted.size());\\n+ LLModule.verify(LLVMPrintMessageAction);\\n+ spdlog::info(\\\"[lazy-jit]: verify batch ({} funcs) done\\\"sv, Sorted.size());\\n+\\n+ auto &TM = LLData.extract().TM;\\n+ EXPECTED_TRY(optimize(LLModule, TM));\\n+\\n+ spdlog::debug(\\\"[lazy-jit]: compile functions batch ({}) done\\\"sv,\\n+ Sorted.size());\\n+ return Expect<Data>{std::move(LLData)};\\n+}\\n+\\n+void LLVM::Compiler::CompileContextDeleter::operator()(\\n+ CompileContext *Context) const noexcept {\\n+ delete Context;\\n+}\\n } // namespace LLVM\\n } // namespace WasmEdge\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13286,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"Your error message may not contain enough information to identify the issue location; please follow the same procedure to handle the log."},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/lib/llvm/jit.cpp b/lib/llvm/jit.cpp\nindex 4bf3cc80386a..f0afb693f598 100644\n--- a/lib/llvm/jit.cpp\n+++ b/lib/llvm/jit.cpp\n@@ -2,29 +2,96 @@\n // SPDX-FileCopyrightText: 2019-2024 Second State INC\n \n #include \"llvm/jit.h\"\n-#include \"common/spdlog.h\"\n \n #include \"data.h\"\n #include \"llvm.h\"\n+#include \"spdlog/spdlog.h\"\n+\n+#include <mutex>\n+\n+#include <fmt/format.h>\n \n namespace LLVM = WasmEdge::LLVM;\n using namespace std::literals;\n \n-namespace WasmEdge::LLVM {\n+namespace {\n+\n+std::string errorToString(LLVM::Error &&E) noexcept {\n+ auto Msg = E.message();\n+ return std::string(Msg.string_view());\n+}\n+\n+static WasmEdge::Expect<LLVM::OrcLLJIT> createTunedLazyLLJIT() noexcept {\n+ LLVMOrcLLJITBuilderRef Builder = LLVM::OrcLLJIT::getBuilder();\n+ if (!Builder) {\n+ Builder = LLVMOrcCreateLLJITBuilder();\n+ }\n+\n+ LLVMTargetRef TheTarget = nullptr;\n+ LLVM::Message Triple(LLVMGetDefaultTargetTriple());\n+ char *TripleErr = nullptr;\n+ if (LLVMGetTargetFromTriple(Triple.string_view().data(), &TheTarget,\n+ &TripleErr)) {\n+ spdlog::error(\"[lazy-jit]: getTargetFromTriple failed: {}\"sv,\n+ TripleErr ? TripleErr : \"\");\n+ LLVMDisposeMessage(TripleErr);\n+ LLVMOrcDisposeLLJITBuilder(Builder);\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ LLVM::Message CPU(LLVMGetHostCPUName());\n+ LLVM::Message Features(LLVMGetHostCPUFeatures());\n+\n+ // LLVMCodeGenLevelNone is used deliberately here as a performance trade-off.\n+ // ORC's IRCompileLayer inherits the codegen optimisation level from this\n+ // target machine and applies it during every lazy materialisation.\n+ // Note that this codegen level is independent of the optimisation\n+ // level passed through WasmEdge::Configure, which governs the\n+ // IR compilation step, this setting only controls the ORC materialisation\n+ // pipeline for lazy JIT.\n+ LLVMTargetMachineRef TM = LLVMCreateTargetMachine(\n+ TheTarget, Triple.string_view().data(), CPU.string_view().data(),\n+ Features.string_view().data(), LLVMCodeGenLevelNone, LLVMRelocDefault,\n+ LLVMCodeModelJITDefault);\n+\n+ if (!TM) {\n+ spdlog::error(\"[lazy-jit]: createTargetMachine failed\"sv);\n+ LLVMOrcDisposeLLJITBuilder(Builder);\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n \n-JITLibrary::JITLibrary(OrcLLJIT JIT) noexcept\n- : J(std::make_unique<OrcLLJIT>(std::move(JIT)).release()) {}\n+ LLVMOrcJITTargetMachineBuilderRef JTMB =\n+ LLVMOrcJITTargetMachineBuilderCreateFromTargetMachine(TM);\n+ LLVMOrcLLJITBuilderSetJITTargetMachineBuilder(Builder, JTMB);\n \n-JITLibrary::~JITLibrary() noexcept {\n- std::unique_ptr<OrcLLJIT> JIT(std::exchange(J, nullptr));\n+ LLVM::OrcLLJIT Result;\n+ if (LLVMErrorRef CreateErr = LLVMOrcCreateLLJIT(&Result.unwrap(), Builder)) {\n+ LLVM::ErrorMessage Msg(LLVMGetErrorMessage(CreateErr));\n+ spdlog::error(\"[lazy-jit]: LLVMOrcCreateLLJIT failed: {}\"sv,\n+ Msg.string_view());\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n+ return Result;\n }\n \n+} // namespace\n+\n+namespace WasmEdge::LLVM {\n+\n+JITLibrary::JITLibrary(std::shared_ptr<LLVM::OrcLLJIT> JIT, std::string P,\n+ bool IsLazy) noexcept\n+ : J(std::move(JIT)), Prefix(std::move(P)), IsLazy(IsLazy) {}\n+\n+JITLibrary::~JITLibrary() noexcept {}\n+\n Symbol<const Executable::IntrinsicsTable *>\n JITLibrary::getIntrinsics() noexcept {\n- if (auto Symbol = J->lookup<const IntrinsicsTable *>(\"intrinsics\")) {\n+ if (auto Symbol = J->lookup<const IntrinsicsTable *>(\n+ fmt::format(\"{}intrinsics\"sv, Prefix).c_str())) {\n return createSymbol<const IntrinsicsTable *>(*Symbol);\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ spdlog::error(\"[lazy-jit]: failed to lookup intrinsics symbol: {}\"sv,\n+ errorToString(std::move(Symbol.error())));\n return {};\n }\n }\n@@ -34,11 +101,12 @@ JITLibrary::getTypes(size_t Size) noexcept {\n std::vector<Symbol<Wrapper>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size; ++I) {\n- const std::string Name = fmt::format(\"t{}\"sv, I);\n+ const std::string Name = fmt::format(\"{}t{}\"sv, Prefix, I);\n if (auto Symbol = J->lookup<Wrapper>(Name.c_str())) {\n Result.push_back(createSymbol<Wrapper>(*Symbol));\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ spdlog::error(\"[lazy-jit]: failed to lookup table symbol {}: {}\"sv, Name,\n+ errorToString(std::move(Symbol.error())));\n Result.emplace_back();\n }\n }\n@@ -51,11 +119,25 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n std::vector<Symbol<void>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size; ++I) {\n- const std::string Name = fmt::format(\"f{}\"sv, I + Offset);\n- if (auto Symbol = J->lookup<void>(Name.c_str())) {\n- Result.push_back(createSymbol<void>(*Symbol));\n+ const std::string Name = fmt::format(\"{}f{}\"sv, Prefix, I + Offset);\n+ void *Addr = nullptr;\n+ auto AddrOrErr = J->lookup<void *>(Name.c_str());\n+ if (AddrOrErr) {\n+ Addr = *AddrOrErr;\n+ } else {\n+ auto ErrMsg = errorToString(std::move(AddrOrErr.error()));\n+ // consuming only symbol not found errors for lazy-jit\n+ if (!IsLazy || ErrMsg.find(\"Symbols not found\"sv) == std::string::npos) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ Name, ErrMsg);\n+ }\n+ }\n+ if (Addr) {\n+ Result.push_back(createSymbol<void>(Addr));\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ if (IsLazy) {\n+ spdlog::debug(\"[lazy-jit]: function {} not yet compiled\"sv, I + Offset);\n+ }\n Result.emplace_back();\n }\n }\n@@ -63,31 +145,109 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n return Result;\n }\n \n-Expect<std::shared_ptr<Executable>> JIT::load(Data D) noexcept {\n- OrcLLJIT J;\n- if (auto Res = OrcLLJIT::create(); !Res) {\n- spdlog::error(\"{}\"sv, Res.error().message().string_view());\n- return Unexpect(ErrCode::Value::HostFuncError);\n+Expect<std::shared_ptr<Executable>> JIT::load(Data &D, bool IsLazy) noexcept {\n+ OrcLLJIT LLJITInstance;\n+ if (IsLazy) {\n+ auto R = createTunedLazyLLJIT();\n+ if (!R) {\n+ spdlog::error(\"[lazy-jit]: failed to create LLJIT\"sv);\n+ return Unexpect(R.error());\n+ }\n+ LLJITInstance = std::move(*R);\n } else {\n- J = std::move(*Res);\n+ auto R = OrcLLJIT::create();\n+ if (!R) {\n+ spdlog::error(\"failed to create LLJIT: {}\"sv,\n+ R.error().message().string_view());\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+ LLJITInstance = std::move(*R);\n }\n \n auto &LLModule = D.extract().LLModule;\n- auto TSContext = D.extract().getTSContext();\n+ auto &TSContext = D.extract().getTSContext();\n \n if (Conf.getCompilerConfigure().isDumpIR()) {\n- if (auto ErrorMessage = LLModule.printModuleToFile(\"wasm-jit.ll\")) {\n+ const auto *Filename = IsLazy ? \"wasm-lazy-jit.ll\" : \"wasm-jit.ll\";\n+ if (auto ErrorMessage = LLModule.printModuleToFile(Filename)) {\n spdlog::error(\"printModuleToFile failed\"sv);\n }\n }\n \n- auto MainJD = J.getMainJITDylib();\n- if (auto Err = J.addLLVMIRModule(\n+ auto MainJD = LLJITInstance.getMainJITDylib();\n+ if (auto Err = LLJITInstance.addLLVMIRModule(\n MainJD, OrcThreadSafeModule(LLModule.release(), TSContext))) {\n- spdlog::error(\"{}\"sv, Err.message().string_view());\n+ spdlog::error(\"failed to add LLVM IR module: {}\"sv,\n+ Err.message().string_view());\n return Unexpect(ErrCode::Value::HostFuncError);\n }\n \n- return std::make_shared<JITLibrary>(std::move(J));\n+ return std::make_shared<JITLibrary>(\n+ std::make_shared<OrcLLJIT>(std::move(LLJITInstance)),\n+ std::string(D.getPrefix()), IsLazy);\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>>\n+JIT::add(JITLibrary &Lib, Data &D,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ if (GlobalFuncIndices.empty()) {\n+ spdlog::error(\"JIT::add: empty function index list\"sv);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ auto &LLModule = D.extract().LLModule;\n+ auto &TSContext = D.extract().getTSContext();\n+\n+ auto JD = Lib.J->getMainJITDylib();\n+ auto RT = JD.createResourceTracker();\n+ if (!RT) {\n+ spdlog::error(\"[lazy-jit]: failed to create resource tracker\"sv);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto Err = Lib.J->addLLVMIRModuleWithRT(\n+ RT, OrcThreadSafeModule(LLModule.release(), TSContext))) {\n+ spdlog::error(\"[lazy-jit]: failed to add LLVM IR module: {}\"sv,\n+ Err.message().string_view());\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ std::vector<WasmFunctionCodeAddress> Addresses;\n+ Addresses.reserve(GlobalFuncIndices.size());\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\n+ const std::string SymName =\n+ fmt::format(\"{}f{}\"sv, D.getPrefix(), GlobalFuncIndex);\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\n+ if (!AddrOrErr) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ SymName, errorToString(std::move(AddrOrErr.error())));\n+ if (auto RemoveErr = RT.remove()) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to remove failed module from tracker: {}\"sv,\n+ RemoveErr.message().string_view());\n+ }\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+ Addresses.push_back(*AddrOrErr);\n+ }\n+ return Addresses;\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>> JIT::lookupWasmFunctionSymbols(\n+ JITLibrary &Lib, std::string_view Prefix,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ std::vector<WasmFunctionCodeAddress> Addresses;\n+ Addresses.reserve(GlobalFuncIndices.size());\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\n+ const std::string SymName = fmt::format(\"{}f{}\"sv, Prefix, GlobalFuncIndex);\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\n+ if (!AddrOrErr) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ SymName, errorToString(std::move(AddrOrErr.error())));\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+ Addresses.push_back(*AddrOrErr);\n+ }\n+ return Addresses;\n }\n } // namespace WasmEdge::LLVM\n"},"changed_files":{"kind":"list like","value":["lib/llvm/jit.cpp"],"string":"[\n \"lib/llvm/jit.cpp\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"Your error message may not contain enough information to identify the issue location; please follow the same procedure to handle the log.","path":"lib/llvm/jit.cpp","hunk":"@@ -51,43 +125,144 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n std::vector<Symbol<void>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size; ++I) {\n- const std::string Name = fmt::format(\"f{}\"sv, I + Offset);\n- if (auto Symbol = J->lookup<void>(Name.c_str())) {\n- Result.push_back(createSymbol<void>(*Symbol));\n+ const std::string Name = fmt::format(\"{}f{}\"sv, Prefix, I + Offset);\n+ void *Addr = nullptr;\n+ auto AddrOrErr = J->lookup<void *>(Name.c_str());\n+ if (AddrOrErr) {\n+ Addr = *AddrOrErr;\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ if (!IsLazy) {\n+ spdlog::error(\"{}\"sv, errorToString(std::move(AddrOrErr.error())));\n+ } else {\n+ // Just consume the error if it's lazy (it might not be compiled yet)\n+ (void)AddrOrErr.error();\n+ }\n+ }\n+ if (Addr) {\n+ Result.push_back(createSymbol<void>(Addr));\n+ } else {\n+ if (IsLazy) {\n+ spdlog::debug(\"[lazy-jit]: function {} not yet compiled\"sv, I + Offset);\n+ }\n Result.emplace_back();\n }\n }\n \n return Result;\n }\n \n-Expect<std::shared_ptr<Executable>> JIT::load(Data D) noexcept {\n- OrcLLJIT J;\n- if (auto Res = OrcLLJIT::create(); !Res) {\n- spdlog::error(\"{}\"sv, Res.error().message().string_view());\n- return Unexpect(ErrCode::Value::HostFuncError);\n+Expect<std::shared_ptr<Executable>> JIT::load(Data &D, bool IsLazy) noexcept {\n+ OrcLLJIT LLJITInstance;\n+ if (IsLazy) {\n+ auto R = createTunedLazyLLJIT();\n+ if (!R) {\n+ spdlog::error(\"[lazy-jit]: failed to create LLJIT\"sv);\n+ return Unexpect(R.error());\n+ }\n+ LLJITInstance = std::move(*R);\n } else {\n- J = std::move(*Res);\n+ auto R = OrcLLJIT::create();\n+ if (!R) {\n+ spdlog::error(\"{}\"sv, R.error().message().string_view());\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+ LLJITInstance = std::move(*R);\n }\n \n auto &LLModule = D.extract().LLModule;\n- auto TSContext = D.extract().getTSContext();\n+ auto &TSContext = D.extract().getTSContext();\n \n if (Conf.getCompilerConfigure().isDumpIR()) {\n- if (auto ErrorMessage = LLModule.printModuleToFile(\"wasm-jit.ll\")) {\n+ const auto *Filename = IsLazy ? \"wasm-lazy-jit.ll\" : \"wasm-jit.ll\";\n+ if (auto ErrorMessage = LLModule.printModuleToFile(Filename)) {\n spdlog::error(\"printModuleToFile failed\"sv);\n }\n }\n \n- auto MainJD = J.getMainJITDylib();\n- if (auto Err = J.addLLVMIRModule(\n+ auto MainJD = LLJITInstance.getMainJITDylib();\n+ if (auto Err = LLJITInstance.addLLVMIRModule(\n MainJD, OrcThreadSafeModule(LLModule.release(), TSContext))) {\n spdlog::error(\"{}\"sv, Err.message().string_view());\n return Unexpect(ErrCode::Value::HostFuncError);\n }\n \n- return std::make_shared<JITLibrary>(std::move(J));\n+ return std::make_shared<JITLibrary>(\n+ std::make_shared<OrcLLJIT>(std::move(LLJITInstance)),\n+ std::string(D.getPrefix()), IsLazy);\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>>\n+JIT::add(Executable &Exec, Data &D,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ auto *Lib = static_cast<JITLibrary *>(&Exec);\n+ if (!Lib) {\n+ spdlog::error(\"JIT::add: executable is not a JITLibrary\"sv);\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+ if (GlobalFuncIndices.empty()) {\n+ spdlog::error(\"JIT::add: empty function index list\"sv);\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+\n+ std::lock_guard<std::mutex> Lock(Lib->LazyAddMutex);\n+ auto &LLModule = D.extract().LLModule;\n+ auto &TSContext = D.extract().getTSContext();\n+\n+ LLVMOrcJITDylibRef MainJDRef = LLVMOrcLLJITGetMainJITDylib(Lib->J->unwrap());\n+\n+ if (auto Err = Lib->J->addLLVMIRModule(\n+ OrcJITDylib(MainJDRef),\n+ OrcThreadSafeModule(LLModule.release(), TSContext))) {\n+ spdlog::error(\"{}\"sv, Err.message().string_view());","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/lib/llvm/jit.cpp b/lib/llvm/jit.cpp\nindex 4bf3cc80386a..f0afb693f598 100644\n--- a/lib/llvm/jit.cpp\n+++ b/lib/llvm/jit.cpp\n@@ -2,29 +2,96 @@\n // SPDX-FileCopyrightText: 2019-2024 Second State INC\n \n #include \"llvm/jit.h\"\n-#include \"common/spdlog.h\"\n \n #include \"data.h\"\n #include \"llvm.h\"\n+#include \"spdlog/spdlog.h\"\n+\n+#include <mutex>\n+\n+#include <fmt/format.h>\n \n namespace LLVM = WasmEdge::LLVM;\n using namespace std::literals;\n \n-namespace WasmEdge::LLVM {\n+namespace {\n+\n+std::string errorToString(LLVM::Error &&E) noexcept {\n+ auto Msg = E.message();\n+ return std::string(Msg.string_view());\n+}\n+\n+static WasmEdge::Expect<LLVM::OrcLLJIT> createTunedLazyLLJIT() noexcept {\n+ LLVMOrcLLJITBuilderRef Builder = LLVM::OrcLLJIT::getBuilder();\n+ if (!Builder) {\n+ Builder = LLVMOrcCreateLLJITBuilder();\n+ }\n+\n+ LLVMTargetRef TheTarget = nullptr;\n+ LLVM::Message Triple(LLVMGetDefaultTargetTriple());\n+ char *TripleErr = nullptr;\n+ if (LLVMGetTargetFromTriple(Triple.string_view().data(), &TheTarget,\n+ &TripleErr)) {\n+ spdlog::error(\"[lazy-jit]: getTargetFromTriple failed: {}\"sv,\n+ TripleErr ? TripleErr : \"\");\n+ LLVMDisposeMessage(TripleErr);\n+ LLVMOrcDisposeLLJITBuilder(Builder);\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ LLVM::Message CPU(LLVMGetHostCPUName());\n+ LLVM::Message Features(LLVMGetHostCPUFeatures());\n+\n+ // LLVMCodeGenLevelNone is used deliberately here as a performance trade-off.\n+ // ORC's IRCompileLayer inherits the codegen optimisation level from this\n+ // target machine and applies it during every lazy materialisation.\n+ // Note that this codegen level is independent of the optimisation\n+ // level passed through WasmEdge::Configure, which governs the\n+ // IR compilation step, this setting only controls the ORC materialisation\n+ // pipeline for lazy JIT.\n+ LLVMTargetMachineRef TM = LLVMCreateTargetMachine(\n+ TheTarget, Triple.string_view().data(), CPU.string_view().data(),\n+ Features.string_view().data(), LLVMCodeGenLevelNone, LLVMRelocDefault,\n+ LLVMCodeModelJITDefault);\n+\n+ if (!TM) {\n+ spdlog::error(\"[lazy-jit]: createTargetMachine failed\"sv);\n+ LLVMOrcDisposeLLJITBuilder(Builder);\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n \n-JITLibrary::JITLibrary(OrcLLJIT JIT) noexcept\n- : J(std::make_unique<OrcLLJIT>(std::move(JIT)).release()) {}\n+ LLVMOrcJITTargetMachineBuilderRef JTMB =\n+ LLVMOrcJITTargetMachineBuilderCreateFromTargetMachine(TM);\n+ LLVMOrcLLJITBuilderSetJITTargetMachineBuilder(Builder, JTMB);\n \n-JITLibrary::~JITLibrary() noexcept {\n- std::unique_ptr<OrcLLJIT> JIT(std::exchange(J, nullptr));\n+ LLVM::OrcLLJIT Result;\n+ if (LLVMErrorRef CreateErr = LLVMOrcCreateLLJIT(&Result.unwrap(), Builder)) {\n+ LLVM::ErrorMessage Msg(LLVMGetErrorMessage(CreateErr));\n+ spdlog::error(\"[lazy-jit]: LLVMOrcCreateLLJIT failed: {}\"sv,\n+ Msg.string_view());\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n+ return Result;\n }\n \n+} // namespace\n+\n+namespace WasmEdge::LLVM {\n+\n+JITLibrary::JITLibrary(std::shared_ptr<LLVM::OrcLLJIT> JIT, std::string P,\n+ bool IsLazy) noexcept\n+ : J(std::move(JIT)), Prefix(std::move(P)), IsLazy(IsLazy) {}\n+\n+JITLibrary::~JITLibrary() noexcept {}\n+\n Symbol<const Executable::IntrinsicsTable *>\n JITLibrary::getIntrinsics() noexcept {\n- if (auto Symbol = J->lookup<const IntrinsicsTable *>(\"intrinsics\")) {\n+ if (auto Symbol = J->lookup<const IntrinsicsTable *>(\n+ fmt::format(\"{}intrinsics\"sv, Prefix).c_str())) {\n return createSymbol<const IntrinsicsTable *>(*Symbol);\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ spdlog::error(\"[lazy-jit]: failed to lookup intrinsics symbol: {}\"sv,\n+ errorToString(std::move(Symbol.error())));\n return {};\n }\n }\n@@ -34,11 +101,12 @@ JITLibrary::getTypes(size_t Size) noexcept {\n std::vector<Symbol<Wrapper>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size; ++I) {\n- const std::string Name = fmt::format(\"t{}\"sv, I);\n+ const std::string Name = fmt::format(\"{}t{}\"sv, Prefix, I);\n if (auto Symbol = J->lookup<Wrapper>(Name.c_str())) {\n Result.push_back(createSymbol<Wrapper>(*Symbol));\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ spdlog::error(\"[lazy-jit]: failed to lookup table symbol {}: {}\"sv, Name,\n+ errorToString(std::move(Symbol.error())));\n Result.emplace_back();\n }\n }\n@@ -51,11 +119,25 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n std::vector<Symbol<void>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size; ++I) {\n- const std::string Name = fmt::format(\"f{}\"sv, I + Offset);\n- if (auto Symbol = J->lookup<void>(Name.c_str())) {\n- Result.push_back(createSymbol<void>(*Symbol));\n+ const std::string Name = fmt::format(\"{}f{}\"sv, Prefix, I + Offset);\n+ void *Addr = nullptr;\n+ auto AddrOrErr = J->lookup<void *>(Name.c_str());\n+ if (AddrOrErr) {\n+ Addr = *AddrOrErr;\n+ } else {\n+ auto ErrMsg = errorToString(std::move(AddrOrErr.error()));\n+ // consuming only symbol not found errors for lazy-jit\n+ if (!IsLazy || ErrMsg.find(\"Symbols not found\"sv) == std::string::npos) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ Name, ErrMsg);\n+ }\n+ }\n+ if (Addr) {\n+ Result.push_back(createSymbol<void>(Addr));\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ if (IsLazy) {\n+ spdlog::debug(\"[lazy-jit]: function {} not yet compiled\"sv, I + Offset);\n+ }\n Result.emplace_back();\n }\n }\n@@ -63,31 +145,109 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n return Result;\n }\n \n-Expect<std::shared_ptr<Executable>> JIT::load(Data D) noexcept {\n- OrcLLJIT J;\n- if (auto Res = OrcLLJIT::create(); !Res) {\n- spdlog::error(\"{}\"sv, Res.error().message().string_view());\n- return Unexpect(ErrCode::Value::HostFuncError);\n+Expect<std::shared_ptr<Executable>> JIT::load(Data &D, bool IsLazy) noexcept {\n+ OrcLLJIT LLJITInstance;\n+ if (IsLazy) {\n+ auto R = createTunedLazyLLJIT();\n+ if (!R) {\n+ spdlog::error(\"[lazy-jit]: failed to create LLJIT\"sv);\n+ return Unexpect(R.error());\n+ }\n+ LLJITInstance = std::move(*R);\n } else {\n- J = std::move(*Res);\n+ auto R = OrcLLJIT::create();\n+ if (!R) {\n+ spdlog::error(\"failed to create LLJIT: {}\"sv,\n+ R.error().message().string_view());\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+ LLJITInstance = std::move(*R);\n }\n \n auto &LLModule = D.extract().LLModule;\n- auto TSContext = D.extract().getTSContext();\n+ auto &TSContext = D.extract().getTSContext();\n \n if (Conf.getCompilerConfigure().isDumpIR()) {\n- if (auto ErrorMessage = LLModule.printModuleToFile(\"wasm-jit.ll\")) {\n+ const auto *Filename = IsLazy ? \"wasm-lazy-jit.ll\" : \"wasm-jit.ll\";\n+ if (auto ErrorMessage = LLModule.printModuleToFile(Filename)) {\n spdlog::error(\"printModuleToFile failed\"sv);\n }\n }\n \n- auto MainJD = J.getMainJITDylib();\n- if (auto Err = J.addLLVMIRModule(\n+ auto MainJD = LLJITInstance.getMainJITDylib();\n+ if (auto Err = LLJITInstance.addLLVMIRModule(\n MainJD, OrcThreadSafeModule(LLModule.release(), TSContext))) {\n- spdlog::error(\"{}\"sv, Err.message().string_view());\n+ spdlog::error(\"failed to add LLVM IR module: {}\"sv,\n+ Err.message().string_view());\n return Unexpect(ErrCode::Value::HostFuncError);\n }\n \n- return std::make_shared<JITLibrary>(std::move(J));\n+ return std::make_shared<JITLibrary>(\n+ std::make_shared<OrcLLJIT>(std::move(LLJITInstance)),\n+ std::string(D.getPrefix()), IsLazy);\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>>\n+JIT::add(JITLibrary &Lib, Data &D,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ if (GlobalFuncIndices.empty()) {\n+ spdlog::error(\"JIT::add: empty function index list\"sv);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ auto &LLModule = D.extract().LLModule;\n+ auto &TSContext = D.extract().getTSContext();\n+\n+ auto JD = Lib.J->getMainJITDylib();\n+ auto RT = JD.createResourceTracker();\n+ if (!RT) {\n+ spdlog::error(\"[lazy-jit]: failed to create resource tracker\"sv);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto Err = Lib.J->addLLVMIRModuleWithRT(\n+ RT, OrcThreadSafeModule(LLModule.release(), TSContext))) {\n+ spdlog::error(\"[lazy-jit]: failed to add LLVM IR module: {}\"sv,\n+ Err.message().string_view());\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ std::vector<WasmFunctionCodeAddress> Addresses;\n+ Addresses.reserve(GlobalFuncIndices.size());\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\n+ const std::string SymName =\n+ fmt::format(\"{}f{}\"sv, D.getPrefix(), GlobalFuncIndex);\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\n+ if (!AddrOrErr) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ SymName, errorToString(std::move(AddrOrErr.error())));\n+ if (auto RemoveErr = RT.remove()) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to remove failed module from tracker: {}\"sv,\n+ RemoveErr.message().string_view());\n+ }\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+ Addresses.push_back(*AddrOrErr);\n+ }\n+ return Addresses;\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>> JIT::lookupWasmFunctionSymbols(\n+ JITLibrary &Lib, std::string_view Prefix,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ std::vector<WasmFunctionCodeAddress> Addresses;\n+ Addresses.reserve(GlobalFuncIndices.size());\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\n+ const std::string SymName = fmt::format(\"{}f{}\"sv, Prefix, GlobalFuncIndex);\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\n+ if (!AddrOrErr) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ SymName, errorToString(std::move(AddrOrErr.error())));\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+ Addresses.push_back(*AddrOrErr);\n+ }\n+ return Addresses;\n }\n } // namespace WasmEdge::LLVM\n"}],"string":"[\n {\n \"comment\": \"Your error message may not contain enough information to identify the issue location; please follow the same procedure to handle the log.\",\n \"path\": \"lib/llvm/jit.cpp\",\n \"hunk\": \"@@ -51,43 +125,144 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\\n std::vector<Symbol<void>> Result;\\n Result.reserve(Size);\\n for (size_t I = 0; I < Size; ++I) {\\n- const std::string Name = fmt::format(\\\"f{}\\\"sv, I + Offset);\\n- if (auto Symbol = J->lookup<void>(Name.c_str())) {\\n- Result.push_back(createSymbol<void>(*Symbol));\\n+ const std::string Name = fmt::format(\\\"{}f{}\\\"sv, Prefix, I + Offset);\\n+ void *Addr = nullptr;\\n+ auto AddrOrErr = J->lookup<void *>(Name.c_str());\\n+ if (AddrOrErr) {\\n+ Addr = *AddrOrErr;\\n } else {\\n- spdlog::error(\\\"{}\\\"sv, Symbol.error().message().string_view());\\n+ if (!IsLazy) {\\n+ spdlog::error(\\\"{}\\\"sv, errorToString(std::move(AddrOrErr.error())));\\n+ } else {\\n+ // Just consume the error if it's lazy (it might not be compiled yet)\\n+ (void)AddrOrErr.error();\\n+ }\\n+ }\\n+ if (Addr) {\\n+ Result.push_back(createSymbol<void>(Addr));\\n+ } else {\\n+ if (IsLazy) {\\n+ spdlog::debug(\\\"[lazy-jit]: function {} not yet compiled\\\"sv, I + Offset);\\n+ }\\n Result.emplace_back();\\n }\\n }\\n \\n return Result;\\n }\\n \\n-Expect<std::shared_ptr<Executable>> JIT::load(Data D) noexcept {\\n- OrcLLJIT J;\\n- if (auto Res = OrcLLJIT::create(); !Res) {\\n- spdlog::error(\\\"{}\\\"sv, Res.error().message().string_view());\\n- return Unexpect(ErrCode::Value::HostFuncError);\\n+Expect<std::shared_ptr<Executable>> JIT::load(Data &D, bool IsLazy) noexcept {\\n+ OrcLLJIT LLJITInstance;\\n+ if (IsLazy) {\\n+ auto R = createTunedLazyLLJIT();\\n+ if (!R) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to create LLJIT\\\"sv);\\n+ return Unexpect(R.error());\\n+ }\\n+ LLJITInstance = std::move(*R);\\n } else {\\n- J = std::move(*Res);\\n+ auto R = OrcLLJIT::create();\\n+ if (!R) {\\n+ spdlog::error(\\\"{}\\\"sv, R.error().message().string_view());\\n+ return Unexpect(ErrCode::Value::HostFuncError);\\n+ }\\n+ LLJITInstance = std::move(*R);\\n }\\n \\n auto &LLModule = D.extract().LLModule;\\n- auto TSContext = D.extract().getTSContext();\\n+ auto &TSContext = D.extract().getTSContext();\\n \\n if (Conf.getCompilerConfigure().isDumpIR()) {\\n- if (auto ErrorMessage = LLModule.printModuleToFile(\\\"wasm-jit.ll\\\")) {\\n+ const auto *Filename = IsLazy ? \\\"wasm-lazy-jit.ll\\\" : \\\"wasm-jit.ll\\\";\\n+ if (auto ErrorMessage = LLModule.printModuleToFile(Filename)) {\\n spdlog::error(\\\"printModuleToFile failed\\\"sv);\\n }\\n }\\n \\n- auto MainJD = J.getMainJITDylib();\\n- if (auto Err = J.addLLVMIRModule(\\n+ auto MainJD = LLJITInstance.getMainJITDylib();\\n+ if (auto Err = LLJITInstance.addLLVMIRModule(\\n MainJD, OrcThreadSafeModule(LLModule.release(), TSContext))) {\\n spdlog::error(\\\"{}\\\"sv, Err.message().string_view());\\n return Unexpect(ErrCode::Value::HostFuncError);\\n }\\n \\n- return std::make_shared<JITLibrary>(std::move(J));\\n+ return std::make_shared<JITLibrary>(\\n+ std::make_shared<OrcLLJIT>(std::move(LLJITInstance)),\\n+ std::string(D.getPrefix()), IsLazy);\\n+}\\n+\\n+Expect<std::vector<WasmFunctionCodeAddress>>\\n+JIT::add(Executable &Exec, Data &D,\\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\\n+ auto *Lib = static_cast<JITLibrary *>(&Exec);\\n+ if (!Lib) {\\n+ spdlog::error(\\\"JIT::add: executable is not a JITLibrary\\\"sv);\\n+ return Unexpect(ErrCode::Value::HostFuncError);\\n+ }\\n+ if (GlobalFuncIndices.empty()) {\\n+ spdlog::error(\\\"JIT::add: empty function index list\\\"sv);\\n+ return Unexpect(ErrCode::Value::HostFuncError);\\n+ }\\n+\\n+ std::lock_guard<std::mutex> Lock(Lib->LazyAddMutex);\\n+ auto &LLModule = D.extract().LLModule;\\n+ auto &TSContext = D.extract().getTSContext();\\n+\\n+ LLVMOrcJITDylibRef MainJDRef = LLVMOrcLLJITGetMainJITDylib(Lib->J->unwrap());\\n+\\n+ if (auto Err = Lib->J->addLLVMIRModule(\\n+ OrcJITDylib(MainJDRef),\\n+ OrcThreadSafeModule(LLModule.release(), TSContext))) {\\n+ spdlog::error(\\\"{}\\\"sv, Err.message().string_view());\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/lib/llvm/jit.cpp b/lib/llvm/jit.cpp\\nindex 4bf3cc80386a..f0afb693f598 100644\\n--- a/lib/llvm/jit.cpp\\n+++ b/lib/llvm/jit.cpp\\n@@ -2,29 +2,96 @@\\n // SPDX-FileCopyrightText: 2019-2024 Second State INC\\n \\n #include \\\"llvm/jit.h\\\"\\n-#include \\\"common/spdlog.h\\\"\\n \\n #include \\\"data.h\\\"\\n #include \\\"llvm.h\\\"\\n+#include \\\"spdlog/spdlog.h\\\"\\n+\\n+#include <mutex>\\n+\\n+#include <fmt/format.h>\\n \\n namespace LLVM = WasmEdge::LLVM;\\n using namespace std::literals;\\n \\n-namespace WasmEdge::LLVM {\\n+namespace {\\n+\\n+std::string errorToString(LLVM::Error &&E) noexcept {\\n+ auto Msg = E.message();\\n+ return std::string(Msg.string_view());\\n+}\\n+\\n+static WasmEdge::Expect<LLVM::OrcLLJIT> createTunedLazyLLJIT() noexcept {\\n+ LLVMOrcLLJITBuilderRef Builder = LLVM::OrcLLJIT::getBuilder();\\n+ if (!Builder) {\\n+ Builder = LLVMOrcCreateLLJITBuilder();\\n+ }\\n+\\n+ LLVMTargetRef TheTarget = nullptr;\\n+ LLVM::Message Triple(LLVMGetDefaultTargetTriple());\\n+ char *TripleErr = nullptr;\\n+ if (LLVMGetTargetFromTriple(Triple.string_view().data(), &TheTarget,\\n+ &TripleErr)) {\\n+ spdlog::error(\\\"[lazy-jit]: getTargetFromTriple failed: {}\\\"sv,\\n+ TripleErr ? TripleErr : \\\"\\\");\\n+ LLVMDisposeMessage(TripleErr);\\n+ LLVMOrcDisposeLLJITBuilder(Builder);\\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ LLVM::Message CPU(LLVMGetHostCPUName());\\n+ LLVM::Message Features(LLVMGetHostCPUFeatures());\\n+\\n+ // LLVMCodeGenLevelNone is used deliberately here as a performance trade-off.\\n+ // ORC's IRCompileLayer inherits the codegen optimisation level from this\\n+ // target machine and applies it during every lazy materialisation.\\n+ // Note that this codegen level is independent of the optimisation\\n+ // level passed through WasmEdge::Configure, which governs the\\n+ // IR compilation step, this setting only controls the ORC materialisation\\n+ // pipeline for lazy JIT.\\n+ LLVMTargetMachineRef TM = LLVMCreateTargetMachine(\\n+ TheTarget, Triple.string_view().data(), CPU.string_view().data(),\\n+ Features.string_view().data(), LLVMCodeGenLevelNone, LLVMRelocDefault,\\n+ LLVMCodeModelJITDefault);\\n+\\n+ if (!TM) {\\n+ spdlog::error(\\\"[lazy-jit]: createTargetMachine failed\\\"sv);\\n+ LLVMOrcDisposeLLJITBuilder(Builder);\\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\\n+ }\\n \\n-JITLibrary::JITLibrary(OrcLLJIT JIT) noexcept\\n- : J(std::make_unique<OrcLLJIT>(std::move(JIT)).release()) {}\\n+ LLVMOrcJITTargetMachineBuilderRef JTMB =\\n+ LLVMOrcJITTargetMachineBuilderCreateFromTargetMachine(TM);\\n+ LLVMOrcLLJITBuilderSetJITTargetMachineBuilder(Builder, JTMB);\\n \\n-JITLibrary::~JITLibrary() noexcept {\\n- std::unique_ptr<OrcLLJIT> JIT(std::exchange(J, nullptr));\\n+ LLVM::OrcLLJIT Result;\\n+ if (LLVMErrorRef CreateErr = LLVMOrcCreateLLJIT(&Result.unwrap(), Builder)) {\\n+ LLVM::ErrorMessage Msg(LLVMGetErrorMessage(CreateErr));\\n+ spdlog::error(\\\"[lazy-jit]: LLVMOrcCreateLLJIT failed: {}\\\"sv,\\n+ Msg.string_view());\\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\\n+ }\\n+ return Result;\\n }\\n \\n+} // namespace\\n+\\n+namespace WasmEdge::LLVM {\\n+\\n+JITLibrary::JITLibrary(std::shared_ptr<LLVM::OrcLLJIT> JIT, std::string P,\\n+ bool IsLazy) noexcept\\n+ : J(std::move(JIT)), Prefix(std::move(P)), IsLazy(IsLazy) {}\\n+\\n+JITLibrary::~JITLibrary() noexcept {}\\n+\\n Symbol<const Executable::IntrinsicsTable *>\\n JITLibrary::getIntrinsics() noexcept {\\n- if (auto Symbol = J->lookup<const IntrinsicsTable *>(\\\"intrinsics\\\")) {\\n+ if (auto Symbol = J->lookup<const IntrinsicsTable *>(\\n+ fmt::format(\\\"{}intrinsics\\\"sv, Prefix).c_str())) {\\n return createSymbol<const IntrinsicsTable *>(*Symbol);\\n } else {\\n- spdlog::error(\\\"{}\\\"sv, Symbol.error().message().string_view());\\n+ spdlog::error(\\\"[lazy-jit]: failed to lookup intrinsics symbol: {}\\\"sv,\\n+ errorToString(std::move(Symbol.error())));\\n return {};\\n }\\n }\\n@@ -34,11 +101,12 @@ JITLibrary::getTypes(size_t Size) noexcept {\\n std::vector<Symbol<Wrapper>> Result;\\n Result.reserve(Size);\\n for (size_t I = 0; I < Size; ++I) {\\n- const std::string Name = fmt::format(\\\"t{}\\\"sv, I);\\n+ const std::string Name = fmt::format(\\\"{}t{}\\\"sv, Prefix, I);\\n if (auto Symbol = J->lookup<Wrapper>(Name.c_str())) {\\n Result.push_back(createSymbol<Wrapper>(*Symbol));\\n } else {\\n- spdlog::error(\\\"{}\\\"sv, Symbol.error().message().string_view());\\n+ spdlog::error(\\\"[lazy-jit]: failed to lookup table symbol {}: {}\\\"sv, Name,\\n+ errorToString(std::move(Symbol.error())));\\n Result.emplace_back();\\n }\\n }\\n@@ -51,11 +119,25 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\\n std::vector<Symbol<void>> Result;\\n Result.reserve(Size);\\n for (size_t I = 0; I < Size; ++I) {\\n- const std::string Name = fmt::format(\\\"f{}\\\"sv, I + Offset);\\n- if (auto Symbol = J->lookup<void>(Name.c_str())) {\\n- Result.push_back(createSymbol<void>(*Symbol));\\n+ const std::string Name = fmt::format(\\\"{}f{}\\\"sv, Prefix, I + Offset);\\n+ void *Addr = nullptr;\\n+ auto AddrOrErr = J->lookup<void *>(Name.c_str());\\n+ if (AddrOrErr) {\\n+ Addr = *AddrOrErr;\\n+ } else {\\n+ auto ErrMsg = errorToString(std::move(AddrOrErr.error()));\\n+ // consuming only symbol not found errors for lazy-jit\\n+ if (!IsLazy || ErrMsg.find(\\\"Symbols not found\\\"sv) == std::string::npos) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to lookup function symbol {}: {}\\\"sv,\\n+ Name, ErrMsg);\\n+ }\\n+ }\\n+ if (Addr) {\\n+ Result.push_back(createSymbol<void>(Addr));\\n } else {\\n- spdlog::error(\\\"{}\\\"sv, Symbol.error().message().string_view());\\n+ if (IsLazy) {\\n+ spdlog::debug(\\\"[lazy-jit]: function {} not yet compiled\\\"sv, I + Offset);\\n+ }\\n Result.emplace_back();\\n }\\n }\\n@@ -63,31 +145,109 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\\n return Result;\\n }\\n \\n-Expect<std::shared_ptr<Executable>> JIT::load(Data D) noexcept {\\n- OrcLLJIT J;\\n- if (auto Res = OrcLLJIT::create(); !Res) {\\n- spdlog::error(\\\"{}\\\"sv, Res.error().message().string_view());\\n- return Unexpect(ErrCode::Value::HostFuncError);\\n+Expect<std::shared_ptr<Executable>> JIT::load(Data &D, bool IsLazy) noexcept {\\n+ OrcLLJIT LLJITInstance;\\n+ if (IsLazy) {\\n+ auto R = createTunedLazyLLJIT();\\n+ if (!R) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to create LLJIT\\\"sv);\\n+ return Unexpect(R.error());\\n+ }\\n+ LLJITInstance = std::move(*R);\\n } else {\\n- J = std::move(*Res);\\n+ auto R = OrcLLJIT::create();\\n+ if (!R) {\\n+ spdlog::error(\\\"failed to create LLJIT: {}\\\"sv,\\n+ R.error().message().string_view());\\n+ return Unexpect(ErrCode::Value::HostFuncError);\\n+ }\\n+ LLJITInstance = std::move(*R);\\n }\\n \\n auto &LLModule = D.extract().LLModule;\\n- auto TSContext = D.extract().getTSContext();\\n+ auto &TSContext = D.extract().getTSContext();\\n \\n if (Conf.getCompilerConfigure().isDumpIR()) {\\n- if (auto ErrorMessage = LLModule.printModuleToFile(\\\"wasm-jit.ll\\\")) {\\n+ const auto *Filename = IsLazy ? \\\"wasm-lazy-jit.ll\\\" : \\\"wasm-jit.ll\\\";\\n+ if (auto ErrorMessage = LLModule.printModuleToFile(Filename)) {\\n spdlog::error(\\\"printModuleToFile failed\\\"sv);\\n }\\n }\\n \\n- auto MainJD = J.getMainJITDylib();\\n- if (auto Err = J.addLLVMIRModule(\\n+ auto MainJD = LLJITInstance.getMainJITDylib();\\n+ if (auto Err = LLJITInstance.addLLVMIRModule(\\n MainJD, OrcThreadSafeModule(LLModule.release(), TSContext))) {\\n- spdlog::error(\\\"{}\\\"sv, Err.message().string_view());\\n+ spdlog::error(\\\"failed to add LLVM IR module: {}\\\"sv,\\n+ Err.message().string_view());\\n return Unexpect(ErrCode::Value::HostFuncError);\\n }\\n \\n- return std::make_shared<JITLibrary>(std::move(J));\\n+ return std::make_shared<JITLibrary>(\\n+ std::make_shared<OrcLLJIT>(std::move(LLJITInstance)),\\n+ std::string(D.getPrefix()), IsLazy);\\n+}\\n+\\n+Expect<std::vector<WasmFunctionCodeAddress>>\\n+JIT::add(JITLibrary &Lib, Data &D,\\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\\n+ if (GlobalFuncIndices.empty()) {\\n+ spdlog::error(\\\"JIT::add: empty function index list\\\"sv);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ auto &LLModule = D.extract().LLModule;\\n+ auto &TSContext = D.extract().getTSContext();\\n+\\n+ auto JD = Lib.J->getMainJITDylib();\\n+ auto RT = JD.createResourceTracker();\\n+ if (!RT) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to create resource tracker\\\"sv);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ if (auto Err = Lib.J->addLLVMIRModuleWithRT(\\n+ RT, OrcThreadSafeModule(LLModule.release(), TSContext))) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to add LLVM IR module: {}\\\"sv,\\n+ Err.message().string_view());\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ std::vector<WasmFunctionCodeAddress> Addresses;\\n+ Addresses.reserve(GlobalFuncIndices.size());\\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\\n+ const std::string SymName =\\n+ fmt::format(\\\"{}f{}\\\"sv, D.getPrefix(), GlobalFuncIndex);\\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\\n+ if (!AddrOrErr) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to lookup function symbol {}: {}\\\"sv,\\n+ SymName, errorToString(std::move(AddrOrErr.error())));\\n+ if (auto RemoveErr = RT.remove()) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to remove failed module from tracker: {}\\\"sv,\\n+ RemoveErr.message().string_view());\\n+ }\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+ Addresses.push_back(*AddrOrErr);\\n+ }\\n+ return Addresses;\\n+}\\n+\\n+Expect<std::vector<WasmFunctionCodeAddress>> JIT::lookupWasmFunctionSymbols(\\n+ JITLibrary &Lib, std::string_view Prefix,\\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\\n+ std::vector<WasmFunctionCodeAddress> Addresses;\\n+ Addresses.reserve(GlobalFuncIndices.size());\\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\\n+ const std::string SymName = fmt::format(\\\"{}f{}\\\"sv, Prefix, GlobalFuncIndex);\\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\\n+ if (!AddrOrErr) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to lookup function symbol {}: {}\\\"sv,\\n+ SymName, errorToString(std::move(AddrOrErr.error())));\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+ Addresses.push_back(*AddrOrErr);\\n+ }\\n+ return Addresses;\\n }\\n } // namespace WasmEdge::LLVM\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13287,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"I just want to confirm if the `Exec` must be `JITLibrary`. Using `static_cast` here is really strange."},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/lib/llvm/jit.cpp b/lib/llvm/jit.cpp\nindex 4bf3cc80386a..f0afb693f598 100644\n--- a/lib/llvm/jit.cpp\n+++ b/lib/llvm/jit.cpp\n@@ -2,29 +2,96 @@\n // SPDX-FileCopyrightText: 2019-2024 Second State INC\n \n #include \"llvm/jit.h\"\n-#include \"common/spdlog.h\"\n \n #include \"data.h\"\n #include \"llvm.h\"\n+#include \"spdlog/spdlog.h\"\n+\n+#include <mutex>\n+\n+#include <fmt/format.h>\n \n namespace LLVM = WasmEdge::LLVM;\n using namespace std::literals;\n \n-namespace WasmEdge::LLVM {\n+namespace {\n+\n+std::string errorToString(LLVM::Error &&E) noexcept {\n+ auto Msg = E.message();\n+ return std::string(Msg.string_view());\n+}\n+\n+static WasmEdge::Expect<LLVM::OrcLLJIT> createTunedLazyLLJIT() noexcept {\n+ LLVMOrcLLJITBuilderRef Builder = LLVM::OrcLLJIT::getBuilder();\n+ if (!Builder) {\n+ Builder = LLVMOrcCreateLLJITBuilder();\n+ }\n+\n+ LLVMTargetRef TheTarget = nullptr;\n+ LLVM::Message Triple(LLVMGetDefaultTargetTriple());\n+ char *TripleErr = nullptr;\n+ if (LLVMGetTargetFromTriple(Triple.string_view().data(), &TheTarget,\n+ &TripleErr)) {\n+ spdlog::error(\"[lazy-jit]: getTargetFromTriple failed: {}\"sv,\n+ TripleErr ? TripleErr : \"\");\n+ LLVMDisposeMessage(TripleErr);\n+ LLVMOrcDisposeLLJITBuilder(Builder);\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ LLVM::Message CPU(LLVMGetHostCPUName());\n+ LLVM::Message Features(LLVMGetHostCPUFeatures());\n+\n+ // LLVMCodeGenLevelNone is used deliberately here as a performance trade-off.\n+ // ORC's IRCompileLayer inherits the codegen optimisation level from this\n+ // target machine and applies it during every lazy materialisation.\n+ // Note that this codegen level is independent of the optimisation\n+ // level passed through WasmEdge::Configure, which governs the\n+ // IR compilation step, this setting only controls the ORC materialisation\n+ // pipeline for lazy JIT.\n+ LLVMTargetMachineRef TM = LLVMCreateTargetMachine(\n+ TheTarget, Triple.string_view().data(), CPU.string_view().data(),\n+ Features.string_view().data(), LLVMCodeGenLevelNone, LLVMRelocDefault,\n+ LLVMCodeModelJITDefault);\n+\n+ if (!TM) {\n+ spdlog::error(\"[lazy-jit]: createTargetMachine failed\"sv);\n+ LLVMOrcDisposeLLJITBuilder(Builder);\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n \n-JITLibrary::JITLibrary(OrcLLJIT JIT) noexcept\n- : J(std::make_unique<OrcLLJIT>(std::move(JIT)).release()) {}\n+ LLVMOrcJITTargetMachineBuilderRef JTMB =\n+ LLVMOrcJITTargetMachineBuilderCreateFromTargetMachine(TM);\n+ LLVMOrcLLJITBuilderSetJITTargetMachineBuilder(Builder, JTMB);\n \n-JITLibrary::~JITLibrary() noexcept {\n- std::unique_ptr<OrcLLJIT> JIT(std::exchange(J, nullptr));\n+ LLVM::OrcLLJIT Result;\n+ if (LLVMErrorRef CreateErr = LLVMOrcCreateLLJIT(&Result.unwrap(), Builder)) {\n+ LLVM::ErrorMessage Msg(LLVMGetErrorMessage(CreateErr));\n+ spdlog::error(\"[lazy-jit]: LLVMOrcCreateLLJIT failed: {}\"sv,\n+ Msg.string_view());\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n+ return Result;\n }\n \n+} // namespace\n+\n+namespace WasmEdge::LLVM {\n+\n+JITLibrary::JITLibrary(std::shared_ptr<LLVM::OrcLLJIT> JIT, std::string P,\n+ bool IsLazy) noexcept\n+ : J(std::move(JIT)), Prefix(std::move(P)), IsLazy(IsLazy) {}\n+\n+JITLibrary::~JITLibrary() noexcept {}\n+\n Symbol<const Executable::IntrinsicsTable *>\n JITLibrary::getIntrinsics() noexcept {\n- if (auto Symbol = J->lookup<const IntrinsicsTable *>(\"intrinsics\")) {\n+ if (auto Symbol = J->lookup<const IntrinsicsTable *>(\n+ fmt::format(\"{}intrinsics\"sv, Prefix).c_str())) {\n return createSymbol<const IntrinsicsTable *>(*Symbol);\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ spdlog::error(\"[lazy-jit]: failed to lookup intrinsics symbol: {}\"sv,\n+ errorToString(std::move(Symbol.error())));\n return {};\n }\n }\n@@ -34,11 +101,12 @@ JITLibrary::getTypes(size_t Size) noexcept {\n std::vector<Symbol<Wrapper>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size; ++I) {\n- const std::string Name = fmt::format(\"t{}\"sv, I);\n+ const std::string Name = fmt::format(\"{}t{}\"sv, Prefix, I);\n if (auto Symbol = J->lookup<Wrapper>(Name.c_str())) {\n Result.push_back(createSymbol<Wrapper>(*Symbol));\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ spdlog::error(\"[lazy-jit]: failed to lookup table symbol {}: {}\"sv, Name,\n+ errorToString(std::move(Symbol.error())));\n Result.emplace_back();\n }\n }\n@@ -51,11 +119,25 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n std::vector<Symbol<void>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size; ++I) {\n- const std::string Name = fmt::format(\"f{}\"sv, I + Offset);\n- if (auto Symbol = J->lookup<void>(Name.c_str())) {\n- Result.push_back(createSymbol<void>(*Symbol));\n+ const std::string Name = fmt::format(\"{}f{}\"sv, Prefix, I + Offset);\n+ void *Addr = nullptr;\n+ auto AddrOrErr = J->lookup<void *>(Name.c_str());\n+ if (AddrOrErr) {\n+ Addr = *AddrOrErr;\n+ } else {\n+ auto ErrMsg = errorToString(std::move(AddrOrErr.error()));\n+ // consuming only symbol not found errors for lazy-jit\n+ if (!IsLazy || ErrMsg.find(\"Symbols not found\"sv) == std::string::npos) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ Name, ErrMsg);\n+ }\n+ }\n+ if (Addr) {\n+ Result.push_back(createSymbol<void>(Addr));\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ if (IsLazy) {\n+ spdlog::debug(\"[lazy-jit]: function {} not yet compiled\"sv, I + Offset);\n+ }\n Result.emplace_back();\n }\n }\n@@ -63,31 +145,109 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n return Result;\n }\n \n-Expect<std::shared_ptr<Executable>> JIT::load(Data D) noexcept {\n- OrcLLJIT J;\n- if (auto Res = OrcLLJIT::create(); !Res) {\n- spdlog::error(\"{}\"sv, Res.error().message().string_view());\n- return Unexpect(ErrCode::Value::HostFuncError);\n+Expect<std::shared_ptr<Executable>> JIT::load(Data &D, bool IsLazy) noexcept {\n+ OrcLLJIT LLJITInstance;\n+ if (IsLazy) {\n+ auto R = createTunedLazyLLJIT();\n+ if (!R) {\n+ spdlog::error(\"[lazy-jit]: failed to create LLJIT\"sv);\n+ return Unexpect(R.error());\n+ }\n+ LLJITInstance = std::move(*R);\n } else {\n- J = std::move(*Res);\n+ auto R = OrcLLJIT::create();\n+ if (!R) {\n+ spdlog::error(\"failed to create LLJIT: {}\"sv,\n+ R.error().message().string_view());\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+ LLJITInstance = std::move(*R);\n }\n \n auto &LLModule = D.extract().LLModule;\n- auto TSContext = D.extract().getTSContext();\n+ auto &TSContext = D.extract().getTSContext();\n \n if (Conf.getCompilerConfigure().isDumpIR()) {\n- if (auto ErrorMessage = LLModule.printModuleToFile(\"wasm-jit.ll\")) {\n+ const auto *Filename = IsLazy ? \"wasm-lazy-jit.ll\" : \"wasm-jit.ll\";\n+ if (auto ErrorMessage = LLModule.printModuleToFile(Filename)) {\n spdlog::error(\"printModuleToFile failed\"sv);\n }\n }\n \n- auto MainJD = J.getMainJITDylib();\n- if (auto Err = J.addLLVMIRModule(\n+ auto MainJD = LLJITInstance.getMainJITDylib();\n+ if (auto Err = LLJITInstance.addLLVMIRModule(\n MainJD, OrcThreadSafeModule(LLModule.release(), TSContext))) {\n- spdlog::error(\"{}\"sv, Err.message().string_view());\n+ spdlog::error(\"failed to add LLVM IR module: {}\"sv,\n+ Err.message().string_view());\n return Unexpect(ErrCode::Value::HostFuncError);\n }\n \n- return std::make_shared<JITLibrary>(std::move(J));\n+ return std::make_shared<JITLibrary>(\n+ std::make_shared<OrcLLJIT>(std::move(LLJITInstance)),\n+ std::string(D.getPrefix()), IsLazy);\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>>\n+JIT::add(JITLibrary &Lib, Data &D,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ if (GlobalFuncIndices.empty()) {\n+ spdlog::error(\"JIT::add: empty function index list\"sv);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ auto &LLModule = D.extract().LLModule;\n+ auto &TSContext = D.extract().getTSContext();\n+\n+ auto JD = Lib.J->getMainJITDylib();\n+ auto RT = JD.createResourceTracker();\n+ if (!RT) {\n+ spdlog::error(\"[lazy-jit]: failed to create resource tracker\"sv);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto Err = Lib.J->addLLVMIRModuleWithRT(\n+ RT, OrcThreadSafeModule(LLModule.release(), TSContext))) {\n+ spdlog::error(\"[lazy-jit]: failed to add LLVM IR module: {}\"sv,\n+ Err.message().string_view());\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ std::vector<WasmFunctionCodeAddress> Addresses;\n+ Addresses.reserve(GlobalFuncIndices.size());\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\n+ const std::string SymName =\n+ fmt::format(\"{}f{}\"sv, D.getPrefix(), GlobalFuncIndex);\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\n+ if (!AddrOrErr) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ SymName, errorToString(std::move(AddrOrErr.error())));\n+ if (auto RemoveErr = RT.remove()) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to remove failed module from tracker: {}\"sv,\n+ RemoveErr.message().string_view());\n+ }\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+ Addresses.push_back(*AddrOrErr);\n+ }\n+ return Addresses;\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>> JIT::lookupWasmFunctionSymbols(\n+ JITLibrary &Lib, std::string_view Prefix,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ std::vector<WasmFunctionCodeAddress> Addresses;\n+ Addresses.reserve(GlobalFuncIndices.size());\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\n+ const std::string SymName = fmt::format(\"{}f{}\"sv, Prefix, GlobalFuncIndex);\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\n+ if (!AddrOrErr) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ SymName, errorToString(std::move(AddrOrErr.error())));\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+ Addresses.push_back(*AddrOrErr);\n+ }\n+ return Addresses;\n }\n } // namespace WasmEdge::LLVM\n"},"changed_files":{"kind":"list like","value":["lib/llvm/jit.cpp"],"string":"[\n \"lib/llvm/jit.cpp\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"I just want to confirm if the `Exec` must be `JITLibrary`. Using `static_cast` here is really strange.","path":"lib/llvm/jit.cpp","hunk":"@@ -51,43 +125,144 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n std::vector<Symbol<void>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size; ++I) {\n- const std::string Name = fmt::format(\"f{}\"sv, I + Offset);\n- if (auto Symbol = J->lookup<void>(Name.c_str())) {\n- Result.push_back(createSymbol<void>(*Symbol));\n+ const std::string Name = fmt::format(\"{}f{}\"sv, Prefix, I + Offset);\n+ void *Addr = nullptr;\n+ auto AddrOrErr = J->lookup<void *>(Name.c_str());\n+ if (AddrOrErr) {\n+ Addr = *AddrOrErr;\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ if (!IsLazy) {\n+ spdlog::error(\"{}\"sv, errorToString(std::move(AddrOrErr.error())));\n+ } else {\n+ // Just consume the error if it's lazy (it might not be compiled yet)\n+ (void)AddrOrErr.error();\n+ }\n+ }\n+ if (Addr) {\n+ Result.push_back(createSymbol<void>(Addr));\n+ } else {\n+ if (IsLazy) {\n+ spdlog::debug(\"[lazy-jit]: function {} not yet compiled\"sv, I + Offset);\n+ }\n Result.emplace_back();\n }\n }\n \n return Result;\n }\n \n-Expect<std::shared_ptr<Executable>> JIT::load(Data D) noexcept {\n- OrcLLJIT J;\n- if (auto Res = OrcLLJIT::create(); !Res) {\n- spdlog::error(\"{}\"sv, Res.error().message().string_view());\n- return Unexpect(ErrCode::Value::HostFuncError);\n+Expect<std::shared_ptr<Executable>> JIT::load(Data &D, bool IsLazy) noexcept {\n+ OrcLLJIT LLJITInstance;\n+ if (IsLazy) {\n+ auto R = createTunedLazyLLJIT();\n+ if (!R) {\n+ spdlog::error(\"[lazy-jit]: failed to create LLJIT\"sv);\n+ return Unexpect(R.error());\n+ }\n+ LLJITInstance = std::move(*R);\n } else {\n- J = std::move(*Res);\n+ auto R = OrcLLJIT::create();\n+ if (!R) {\n+ spdlog::error(\"{}\"sv, R.error().message().string_view());\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+ LLJITInstance = std::move(*R);\n }\n \n auto &LLModule = D.extract().LLModule;\n- auto TSContext = D.extract().getTSContext();\n+ auto &TSContext = D.extract().getTSContext();\n \n if (Conf.getCompilerConfigure().isDumpIR()) {\n- if (auto ErrorMessage = LLModule.printModuleToFile(\"wasm-jit.ll\")) {\n+ const auto *Filename = IsLazy ? \"wasm-lazy-jit.ll\" : \"wasm-jit.ll\";\n+ if (auto ErrorMessage = LLModule.printModuleToFile(Filename)) {\n spdlog::error(\"printModuleToFile failed\"sv);\n }\n }\n \n- auto MainJD = J.getMainJITDylib();\n- if (auto Err = J.addLLVMIRModule(\n+ auto MainJD = LLJITInstance.getMainJITDylib();\n+ if (auto Err = LLJITInstance.addLLVMIRModule(\n MainJD, OrcThreadSafeModule(LLModule.release(), TSContext))) {\n spdlog::error(\"{}\"sv, Err.message().string_view());\n return Unexpect(ErrCode::Value::HostFuncError);\n }\n \n- return std::make_shared<JITLibrary>(std::move(J));\n+ return std::make_shared<JITLibrary>(\n+ std::make_shared<OrcLLJIT>(std::move(LLJITInstance)),\n+ std::string(D.getPrefix()), IsLazy);\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>>\n+JIT::add(Executable &Exec, Data &D,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ auto *Lib = static_cast<JITLibrary *>(&Exec);","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/lib/llvm/jit.cpp b/lib/llvm/jit.cpp\nindex 4bf3cc80386a..f0afb693f598 100644\n--- a/lib/llvm/jit.cpp\n+++ b/lib/llvm/jit.cpp\n@@ -2,29 +2,96 @@\n // SPDX-FileCopyrightText: 2019-2024 Second State INC\n \n #include \"llvm/jit.h\"\n-#include \"common/spdlog.h\"\n \n #include \"data.h\"\n #include \"llvm.h\"\n+#include \"spdlog/spdlog.h\"\n+\n+#include <mutex>\n+\n+#include <fmt/format.h>\n \n namespace LLVM = WasmEdge::LLVM;\n using namespace std::literals;\n \n-namespace WasmEdge::LLVM {\n+namespace {\n+\n+std::string errorToString(LLVM::Error &&E) noexcept {\n+ auto Msg = E.message();\n+ return std::string(Msg.string_view());\n+}\n+\n+static WasmEdge::Expect<LLVM::OrcLLJIT> createTunedLazyLLJIT() noexcept {\n+ LLVMOrcLLJITBuilderRef Builder = LLVM::OrcLLJIT::getBuilder();\n+ if (!Builder) {\n+ Builder = LLVMOrcCreateLLJITBuilder();\n+ }\n+\n+ LLVMTargetRef TheTarget = nullptr;\n+ LLVM::Message Triple(LLVMGetDefaultTargetTriple());\n+ char *TripleErr = nullptr;\n+ if (LLVMGetTargetFromTriple(Triple.string_view().data(), &TheTarget,\n+ &TripleErr)) {\n+ spdlog::error(\"[lazy-jit]: getTargetFromTriple failed: {}\"sv,\n+ TripleErr ? TripleErr : \"\");\n+ LLVMDisposeMessage(TripleErr);\n+ LLVMOrcDisposeLLJITBuilder(Builder);\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ LLVM::Message CPU(LLVMGetHostCPUName());\n+ LLVM::Message Features(LLVMGetHostCPUFeatures());\n+\n+ // LLVMCodeGenLevelNone is used deliberately here as a performance trade-off.\n+ // ORC's IRCompileLayer inherits the codegen optimisation level from this\n+ // target machine and applies it during every lazy materialisation.\n+ // Note that this codegen level is independent of the optimisation\n+ // level passed through WasmEdge::Configure, which governs the\n+ // IR compilation step, this setting only controls the ORC materialisation\n+ // pipeline for lazy JIT.\n+ LLVMTargetMachineRef TM = LLVMCreateTargetMachine(\n+ TheTarget, Triple.string_view().data(), CPU.string_view().data(),\n+ Features.string_view().data(), LLVMCodeGenLevelNone, LLVMRelocDefault,\n+ LLVMCodeModelJITDefault);\n+\n+ if (!TM) {\n+ spdlog::error(\"[lazy-jit]: createTargetMachine failed\"sv);\n+ LLVMOrcDisposeLLJITBuilder(Builder);\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n \n-JITLibrary::JITLibrary(OrcLLJIT JIT) noexcept\n- : J(std::make_unique<OrcLLJIT>(std::move(JIT)).release()) {}\n+ LLVMOrcJITTargetMachineBuilderRef JTMB =\n+ LLVMOrcJITTargetMachineBuilderCreateFromTargetMachine(TM);\n+ LLVMOrcLLJITBuilderSetJITTargetMachineBuilder(Builder, JTMB);\n \n-JITLibrary::~JITLibrary() noexcept {\n- std::unique_ptr<OrcLLJIT> JIT(std::exchange(J, nullptr));\n+ LLVM::OrcLLJIT Result;\n+ if (LLVMErrorRef CreateErr = LLVMOrcCreateLLJIT(&Result.unwrap(), Builder)) {\n+ LLVM::ErrorMessage Msg(LLVMGetErrorMessage(CreateErr));\n+ spdlog::error(\"[lazy-jit]: LLVMOrcCreateLLJIT failed: {}\"sv,\n+ Msg.string_view());\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n+ return Result;\n }\n \n+} // namespace\n+\n+namespace WasmEdge::LLVM {\n+\n+JITLibrary::JITLibrary(std::shared_ptr<LLVM::OrcLLJIT> JIT, std::string P,\n+ bool IsLazy) noexcept\n+ : J(std::move(JIT)), Prefix(std::move(P)), IsLazy(IsLazy) {}\n+\n+JITLibrary::~JITLibrary() noexcept {}\n+\n Symbol<const Executable::IntrinsicsTable *>\n JITLibrary::getIntrinsics() noexcept {\n- if (auto Symbol = J->lookup<const IntrinsicsTable *>(\"intrinsics\")) {\n+ if (auto Symbol = J->lookup<const IntrinsicsTable *>(\n+ fmt::format(\"{}intrinsics\"sv, Prefix).c_str())) {\n return createSymbol<const IntrinsicsTable *>(*Symbol);\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ spdlog::error(\"[lazy-jit]: failed to lookup intrinsics symbol: {}\"sv,\n+ errorToString(std::move(Symbol.error())));\n return {};\n }\n }\n@@ -34,11 +101,12 @@ JITLibrary::getTypes(size_t Size) noexcept {\n std::vector<Symbol<Wrapper>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size; ++I) {\n- const std::string Name = fmt::format(\"t{}\"sv, I);\n+ const std::string Name = fmt::format(\"{}t{}\"sv, Prefix, I);\n if (auto Symbol = J->lookup<Wrapper>(Name.c_str())) {\n Result.push_back(createSymbol<Wrapper>(*Symbol));\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ spdlog::error(\"[lazy-jit]: failed to lookup table symbol {}: {}\"sv, Name,\n+ errorToString(std::move(Symbol.error())));\n Result.emplace_back();\n }\n }\n@@ -51,11 +119,25 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n std::vector<Symbol<void>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size; ++I) {\n- const std::string Name = fmt::format(\"f{}\"sv, I + Offset);\n- if (auto Symbol = J->lookup<void>(Name.c_str())) {\n- Result.push_back(createSymbol<void>(*Symbol));\n+ const std::string Name = fmt::format(\"{}f{}\"sv, Prefix, I + Offset);\n+ void *Addr = nullptr;\n+ auto AddrOrErr = J->lookup<void *>(Name.c_str());\n+ if (AddrOrErr) {\n+ Addr = *AddrOrErr;\n+ } else {\n+ auto ErrMsg = errorToString(std::move(AddrOrErr.error()));\n+ // consuming only symbol not found errors for lazy-jit\n+ if (!IsLazy || ErrMsg.find(\"Symbols not found\"sv) == std::string::npos) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ Name, ErrMsg);\n+ }\n+ }\n+ if (Addr) {\n+ Result.push_back(createSymbol<void>(Addr));\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ if (IsLazy) {\n+ spdlog::debug(\"[lazy-jit]: function {} not yet compiled\"sv, I + Offset);\n+ }\n Result.emplace_back();\n }\n }\n@@ -63,31 +145,109 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n return Result;\n }\n \n-Expect<std::shared_ptr<Executable>> JIT::load(Data D) noexcept {\n- OrcLLJIT J;\n- if (auto Res = OrcLLJIT::create(); !Res) {\n- spdlog::error(\"{}\"sv, Res.error().message().string_view());\n- return Unexpect(ErrCode::Value::HostFuncError);\n+Expect<std::shared_ptr<Executable>> JIT::load(Data &D, bool IsLazy) noexcept {\n+ OrcLLJIT LLJITInstance;\n+ if (IsLazy) {\n+ auto R = createTunedLazyLLJIT();\n+ if (!R) {\n+ spdlog::error(\"[lazy-jit]: failed to create LLJIT\"sv);\n+ return Unexpect(R.error());\n+ }\n+ LLJITInstance = std::move(*R);\n } else {\n- J = std::move(*Res);\n+ auto R = OrcLLJIT::create();\n+ if (!R) {\n+ spdlog::error(\"failed to create LLJIT: {}\"sv,\n+ R.error().message().string_view());\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+ LLJITInstance = std::move(*R);\n }\n \n auto &LLModule = D.extract().LLModule;\n- auto TSContext = D.extract().getTSContext();\n+ auto &TSContext = D.extract().getTSContext();\n \n if (Conf.getCompilerConfigure().isDumpIR()) {\n- if (auto ErrorMessage = LLModule.printModuleToFile(\"wasm-jit.ll\")) {\n+ const auto *Filename = IsLazy ? \"wasm-lazy-jit.ll\" : \"wasm-jit.ll\";\n+ if (auto ErrorMessage = LLModule.printModuleToFile(Filename)) {\n spdlog::error(\"printModuleToFile failed\"sv);\n }\n }\n \n- auto MainJD = J.getMainJITDylib();\n- if (auto Err = J.addLLVMIRModule(\n+ auto MainJD = LLJITInstance.getMainJITDylib();\n+ if (auto Err = LLJITInstance.addLLVMIRModule(\n MainJD, OrcThreadSafeModule(LLModule.release(), TSContext))) {\n- spdlog::error(\"{}\"sv, Err.message().string_view());\n+ spdlog::error(\"failed to add LLVM IR module: {}\"sv,\n+ Err.message().string_view());\n return Unexpect(ErrCode::Value::HostFuncError);\n }\n \n- return std::make_shared<JITLibrary>(std::move(J));\n+ return std::make_shared<JITLibrary>(\n+ std::make_shared<OrcLLJIT>(std::move(LLJITInstance)),\n+ std::string(D.getPrefix()), IsLazy);\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>>\n+JIT::add(JITLibrary &Lib, Data &D,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ if (GlobalFuncIndices.empty()) {\n+ spdlog::error(\"JIT::add: empty function index list\"sv);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ auto &LLModule = D.extract().LLModule;\n+ auto &TSContext = D.extract().getTSContext();\n+\n+ auto JD = Lib.J->getMainJITDylib();\n+ auto RT = JD.createResourceTracker();\n+ if (!RT) {\n+ spdlog::error(\"[lazy-jit]: failed to create resource tracker\"sv);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto Err = Lib.J->addLLVMIRModuleWithRT(\n+ RT, OrcThreadSafeModule(LLModule.release(), TSContext))) {\n+ spdlog::error(\"[lazy-jit]: failed to add LLVM IR module: {}\"sv,\n+ Err.message().string_view());\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ std::vector<WasmFunctionCodeAddress> Addresses;\n+ Addresses.reserve(GlobalFuncIndices.size());\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\n+ const std::string SymName =\n+ fmt::format(\"{}f{}\"sv, D.getPrefix(), GlobalFuncIndex);\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\n+ if (!AddrOrErr) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ SymName, errorToString(std::move(AddrOrErr.error())));\n+ if (auto RemoveErr = RT.remove()) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to remove failed module from tracker: {}\"sv,\n+ RemoveErr.message().string_view());\n+ }\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+ Addresses.push_back(*AddrOrErr);\n+ }\n+ return Addresses;\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>> JIT::lookupWasmFunctionSymbols(\n+ JITLibrary &Lib, std::string_view Prefix,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ std::vector<WasmFunctionCodeAddress> Addresses;\n+ Addresses.reserve(GlobalFuncIndices.size());\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\n+ const std::string SymName = fmt::format(\"{}f{}\"sv, Prefix, GlobalFuncIndex);\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\n+ if (!AddrOrErr) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ SymName, errorToString(std::move(AddrOrErr.error())));\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+ Addresses.push_back(*AddrOrErr);\n+ }\n+ return Addresses;\n }\n } // namespace WasmEdge::LLVM\n"}],"string":"[\n {\n \"comment\": \"I just want to confirm if the `Exec` must be `JITLibrary`. Using `static_cast` here is really strange.\",\n \"path\": \"lib/llvm/jit.cpp\",\n \"hunk\": \"@@ -51,43 +125,144 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\\n std::vector<Symbol<void>> Result;\\n Result.reserve(Size);\\n for (size_t I = 0; I < Size; ++I) {\\n- const std::string Name = fmt::format(\\\"f{}\\\"sv, I + Offset);\\n- if (auto Symbol = J->lookup<void>(Name.c_str())) {\\n- Result.push_back(createSymbol<void>(*Symbol));\\n+ const std::string Name = fmt::format(\\\"{}f{}\\\"sv, Prefix, I + Offset);\\n+ void *Addr = nullptr;\\n+ auto AddrOrErr = J->lookup<void *>(Name.c_str());\\n+ if (AddrOrErr) {\\n+ Addr = *AddrOrErr;\\n } else {\\n- spdlog::error(\\\"{}\\\"sv, Symbol.error().message().string_view());\\n+ if (!IsLazy) {\\n+ spdlog::error(\\\"{}\\\"sv, errorToString(std::move(AddrOrErr.error())));\\n+ } else {\\n+ // Just consume the error if it's lazy (it might not be compiled yet)\\n+ (void)AddrOrErr.error();\\n+ }\\n+ }\\n+ if (Addr) {\\n+ Result.push_back(createSymbol<void>(Addr));\\n+ } else {\\n+ if (IsLazy) {\\n+ spdlog::debug(\\\"[lazy-jit]: function {} not yet compiled\\\"sv, I + Offset);\\n+ }\\n Result.emplace_back();\\n }\\n }\\n \\n return Result;\\n }\\n \\n-Expect<std::shared_ptr<Executable>> JIT::load(Data D) noexcept {\\n- OrcLLJIT J;\\n- if (auto Res = OrcLLJIT::create(); !Res) {\\n- spdlog::error(\\\"{}\\\"sv, Res.error().message().string_view());\\n- return Unexpect(ErrCode::Value::HostFuncError);\\n+Expect<std::shared_ptr<Executable>> JIT::load(Data &D, bool IsLazy) noexcept {\\n+ OrcLLJIT LLJITInstance;\\n+ if (IsLazy) {\\n+ auto R = createTunedLazyLLJIT();\\n+ if (!R) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to create LLJIT\\\"sv);\\n+ return Unexpect(R.error());\\n+ }\\n+ LLJITInstance = std::move(*R);\\n } else {\\n- J = std::move(*Res);\\n+ auto R = OrcLLJIT::create();\\n+ if (!R) {\\n+ spdlog::error(\\\"{}\\\"sv, R.error().message().string_view());\\n+ return Unexpect(ErrCode::Value::HostFuncError);\\n+ }\\n+ LLJITInstance = std::move(*R);\\n }\\n \\n auto &LLModule = D.extract().LLModule;\\n- auto TSContext = D.extract().getTSContext();\\n+ auto &TSContext = D.extract().getTSContext();\\n \\n if (Conf.getCompilerConfigure().isDumpIR()) {\\n- if (auto ErrorMessage = LLModule.printModuleToFile(\\\"wasm-jit.ll\\\")) {\\n+ const auto *Filename = IsLazy ? \\\"wasm-lazy-jit.ll\\\" : \\\"wasm-jit.ll\\\";\\n+ if (auto ErrorMessage = LLModule.printModuleToFile(Filename)) {\\n spdlog::error(\\\"printModuleToFile failed\\\"sv);\\n }\\n }\\n \\n- auto MainJD = J.getMainJITDylib();\\n- if (auto Err = J.addLLVMIRModule(\\n+ auto MainJD = LLJITInstance.getMainJITDylib();\\n+ if (auto Err = LLJITInstance.addLLVMIRModule(\\n MainJD, OrcThreadSafeModule(LLModule.release(), TSContext))) {\\n spdlog::error(\\\"{}\\\"sv, Err.message().string_view());\\n return Unexpect(ErrCode::Value::HostFuncError);\\n }\\n \\n- return std::make_shared<JITLibrary>(std::move(J));\\n+ return std::make_shared<JITLibrary>(\\n+ std::make_shared<OrcLLJIT>(std::move(LLJITInstance)),\\n+ std::string(D.getPrefix()), IsLazy);\\n+}\\n+\\n+Expect<std::vector<WasmFunctionCodeAddress>>\\n+JIT::add(Executable &Exec, Data &D,\\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\\n+ auto *Lib = static_cast<JITLibrary *>(&Exec);\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/lib/llvm/jit.cpp b/lib/llvm/jit.cpp\\nindex 4bf3cc80386a..f0afb693f598 100644\\n--- a/lib/llvm/jit.cpp\\n+++ b/lib/llvm/jit.cpp\\n@@ -2,29 +2,96 @@\\n // SPDX-FileCopyrightText: 2019-2024 Second State INC\\n \\n #include \\\"llvm/jit.h\\\"\\n-#include \\\"common/spdlog.h\\\"\\n \\n #include \\\"data.h\\\"\\n #include \\\"llvm.h\\\"\\n+#include \\\"spdlog/spdlog.h\\\"\\n+\\n+#include <mutex>\\n+\\n+#include <fmt/format.h>\\n \\n namespace LLVM = WasmEdge::LLVM;\\n using namespace std::literals;\\n \\n-namespace WasmEdge::LLVM {\\n+namespace {\\n+\\n+std::string errorToString(LLVM::Error &&E) noexcept {\\n+ auto Msg = E.message();\\n+ return std::string(Msg.string_view());\\n+}\\n+\\n+static WasmEdge::Expect<LLVM::OrcLLJIT> createTunedLazyLLJIT() noexcept {\\n+ LLVMOrcLLJITBuilderRef Builder = LLVM::OrcLLJIT::getBuilder();\\n+ if (!Builder) {\\n+ Builder = LLVMOrcCreateLLJITBuilder();\\n+ }\\n+\\n+ LLVMTargetRef TheTarget = nullptr;\\n+ LLVM::Message Triple(LLVMGetDefaultTargetTriple());\\n+ char *TripleErr = nullptr;\\n+ if (LLVMGetTargetFromTriple(Triple.string_view().data(), &TheTarget,\\n+ &TripleErr)) {\\n+ spdlog::error(\\\"[lazy-jit]: getTargetFromTriple failed: {}\\\"sv,\\n+ TripleErr ? TripleErr : \\\"\\\");\\n+ LLVMDisposeMessage(TripleErr);\\n+ LLVMOrcDisposeLLJITBuilder(Builder);\\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ LLVM::Message CPU(LLVMGetHostCPUName());\\n+ LLVM::Message Features(LLVMGetHostCPUFeatures());\\n+\\n+ // LLVMCodeGenLevelNone is used deliberately here as a performance trade-off.\\n+ // ORC's IRCompileLayer inherits the codegen optimisation level from this\\n+ // target machine and applies it during every lazy materialisation.\\n+ // Note that this codegen level is independent of the optimisation\\n+ // level passed through WasmEdge::Configure, which governs the\\n+ // IR compilation step, this setting only controls the ORC materialisation\\n+ // pipeline for lazy JIT.\\n+ LLVMTargetMachineRef TM = LLVMCreateTargetMachine(\\n+ TheTarget, Triple.string_view().data(), CPU.string_view().data(),\\n+ Features.string_view().data(), LLVMCodeGenLevelNone, LLVMRelocDefault,\\n+ LLVMCodeModelJITDefault);\\n+\\n+ if (!TM) {\\n+ spdlog::error(\\\"[lazy-jit]: createTargetMachine failed\\\"sv);\\n+ LLVMOrcDisposeLLJITBuilder(Builder);\\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\\n+ }\\n \\n-JITLibrary::JITLibrary(OrcLLJIT JIT) noexcept\\n- : J(std::make_unique<OrcLLJIT>(std::move(JIT)).release()) {}\\n+ LLVMOrcJITTargetMachineBuilderRef JTMB =\\n+ LLVMOrcJITTargetMachineBuilderCreateFromTargetMachine(TM);\\n+ LLVMOrcLLJITBuilderSetJITTargetMachineBuilder(Builder, JTMB);\\n \\n-JITLibrary::~JITLibrary() noexcept {\\n- std::unique_ptr<OrcLLJIT> JIT(std::exchange(J, nullptr));\\n+ LLVM::OrcLLJIT Result;\\n+ if (LLVMErrorRef CreateErr = LLVMOrcCreateLLJIT(&Result.unwrap(), Builder)) {\\n+ LLVM::ErrorMessage Msg(LLVMGetErrorMessage(CreateErr));\\n+ spdlog::error(\\\"[lazy-jit]: LLVMOrcCreateLLJIT failed: {}\\\"sv,\\n+ Msg.string_view());\\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\\n+ }\\n+ return Result;\\n }\\n \\n+} // namespace\\n+\\n+namespace WasmEdge::LLVM {\\n+\\n+JITLibrary::JITLibrary(std::shared_ptr<LLVM::OrcLLJIT> JIT, std::string P,\\n+ bool IsLazy) noexcept\\n+ : J(std::move(JIT)), Prefix(std::move(P)), IsLazy(IsLazy) {}\\n+\\n+JITLibrary::~JITLibrary() noexcept {}\\n+\\n Symbol<const Executable::IntrinsicsTable *>\\n JITLibrary::getIntrinsics() noexcept {\\n- if (auto Symbol = J->lookup<const IntrinsicsTable *>(\\\"intrinsics\\\")) {\\n+ if (auto Symbol = J->lookup<const IntrinsicsTable *>(\\n+ fmt::format(\\\"{}intrinsics\\\"sv, Prefix).c_str())) {\\n return createSymbol<const IntrinsicsTable *>(*Symbol);\\n } else {\\n- spdlog::error(\\\"{}\\\"sv, Symbol.error().message().string_view());\\n+ spdlog::error(\\\"[lazy-jit]: failed to lookup intrinsics symbol: {}\\\"sv,\\n+ errorToString(std::move(Symbol.error())));\\n return {};\\n }\\n }\\n@@ -34,11 +101,12 @@ JITLibrary::getTypes(size_t Size) noexcept {\\n std::vector<Symbol<Wrapper>> Result;\\n Result.reserve(Size);\\n for (size_t I = 0; I < Size; ++I) {\\n- const std::string Name = fmt::format(\\\"t{}\\\"sv, I);\\n+ const std::string Name = fmt::format(\\\"{}t{}\\\"sv, Prefix, I);\\n if (auto Symbol = J->lookup<Wrapper>(Name.c_str())) {\\n Result.push_back(createSymbol<Wrapper>(*Symbol));\\n } else {\\n- spdlog::error(\\\"{}\\\"sv, Symbol.error().message().string_view());\\n+ spdlog::error(\\\"[lazy-jit]: failed to lookup table symbol {}: {}\\\"sv, Name,\\n+ errorToString(std::move(Symbol.error())));\\n Result.emplace_back();\\n }\\n }\\n@@ -51,11 +119,25 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\\n std::vector<Symbol<void>> Result;\\n Result.reserve(Size);\\n for (size_t I = 0; I < Size; ++I) {\\n- const std::string Name = fmt::format(\\\"f{}\\\"sv, I + Offset);\\n- if (auto Symbol = J->lookup<void>(Name.c_str())) {\\n- Result.push_back(createSymbol<void>(*Symbol));\\n+ const std::string Name = fmt::format(\\\"{}f{}\\\"sv, Prefix, I + Offset);\\n+ void *Addr = nullptr;\\n+ auto AddrOrErr = J->lookup<void *>(Name.c_str());\\n+ if (AddrOrErr) {\\n+ Addr = *AddrOrErr;\\n+ } else {\\n+ auto ErrMsg = errorToString(std::move(AddrOrErr.error()));\\n+ // consuming only symbol not found errors for lazy-jit\\n+ if (!IsLazy || ErrMsg.find(\\\"Symbols not found\\\"sv) == std::string::npos) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to lookup function symbol {}: {}\\\"sv,\\n+ Name, ErrMsg);\\n+ }\\n+ }\\n+ if (Addr) {\\n+ Result.push_back(createSymbol<void>(Addr));\\n } else {\\n- spdlog::error(\\\"{}\\\"sv, Symbol.error().message().string_view());\\n+ if (IsLazy) {\\n+ spdlog::debug(\\\"[lazy-jit]: function {} not yet compiled\\\"sv, I + Offset);\\n+ }\\n Result.emplace_back();\\n }\\n }\\n@@ -63,31 +145,109 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\\n return Result;\\n }\\n \\n-Expect<std::shared_ptr<Executable>> JIT::load(Data D) noexcept {\\n- OrcLLJIT J;\\n- if (auto Res = OrcLLJIT::create(); !Res) {\\n- spdlog::error(\\\"{}\\\"sv, Res.error().message().string_view());\\n- return Unexpect(ErrCode::Value::HostFuncError);\\n+Expect<std::shared_ptr<Executable>> JIT::load(Data &D, bool IsLazy) noexcept {\\n+ OrcLLJIT LLJITInstance;\\n+ if (IsLazy) {\\n+ auto R = createTunedLazyLLJIT();\\n+ if (!R) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to create LLJIT\\\"sv);\\n+ return Unexpect(R.error());\\n+ }\\n+ LLJITInstance = std::move(*R);\\n } else {\\n- J = std::move(*Res);\\n+ auto R = OrcLLJIT::create();\\n+ if (!R) {\\n+ spdlog::error(\\\"failed to create LLJIT: {}\\\"sv,\\n+ R.error().message().string_view());\\n+ return Unexpect(ErrCode::Value::HostFuncError);\\n+ }\\n+ LLJITInstance = std::move(*R);\\n }\\n \\n auto &LLModule = D.extract().LLModule;\\n- auto TSContext = D.extract().getTSContext();\\n+ auto &TSContext = D.extract().getTSContext();\\n \\n if (Conf.getCompilerConfigure().isDumpIR()) {\\n- if (auto ErrorMessage = LLModule.printModuleToFile(\\\"wasm-jit.ll\\\")) {\\n+ const auto *Filename = IsLazy ? \\\"wasm-lazy-jit.ll\\\" : \\\"wasm-jit.ll\\\";\\n+ if (auto ErrorMessage = LLModule.printModuleToFile(Filename)) {\\n spdlog::error(\\\"printModuleToFile failed\\\"sv);\\n }\\n }\\n \\n- auto MainJD = J.getMainJITDylib();\\n- if (auto Err = J.addLLVMIRModule(\\n+ auto MainJD = LLJITInstance.getMainJITDylib();\\n+ if (auto Err = LLJITInstance.addLLVMIRModule(\\n MainJD, OrcThreadSafeModule(LLModule.release(), TSContext))) {\\n- spdlog::error(\\\"{}\\\"sv, Err.message().string_view());\\n+ spdlog::error(\\\"failed to add LLVM IR module: {}\\\"sv,\\n+ Err.message().string_view());\\n return Unexpect(ErrCode::Value::HostFuncError);\\n }\\n \\n- return std::make_shared<JITLibrary>(std::move(J));\\n+ return std::make_shared<JITLibrary>(\\n+ std::make_shared<OrcLLJIT>(std::move(LLJITInstance)),\\n+ std::string(D.getPrefix()), IsLazy);\\n+}\\n+\\n+Expect<std::vector<WasmFunctionCodeAddress>>\\n+JIT::add(JITLibrary &Lib, Data &D,\\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\\n+ if (GlobalFuncIndices.empty()) {\\n+ spdlog::error(\\\"JIT::add: empty function index list\\\"sv);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ auto &LLModule = D.extract().LLModule;\\n+ auto &TSContext = D.extract().getTSContext();\\n+\\n+ auto JD = Lib.J->getMainJITDylib();\\n+ auto RT = JD.createResourceTracker();\\n+ if (!RT) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to create resource tracker\\\"sv);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ if (auto Err = Lib.J->addLLVMIRModuleWithRT(\\n+ RT, OrcThreadSafeModule(LLModule.release(), TSContext))) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to add LLVM IR module: {}\\\"sv,\\n+ Err.message().string_view());\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ std::vector<WasmFunctionCodeAddress> Addresses;\\n+ Addresses.reserve(GlobalFuncIndices.size());\\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\\n+ const std::string SymName =\\n+ fmt::format(\\\"{}f{}\\\"sv, D.getPrefix(), GlobalFuncIndex);\\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\\n+ if (!AddrOrErr) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to lookup function symbol {}: {}\\\"sv,\\n+ SymName, errorToString(std::move(AddrOrErr.error())));\\n+ if (auto RemoveErr = RT.remove()) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to remove failed module from tracker: {}\\\"sv,\\n+ RemoveErr.message().string_view());\\n+ }\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+ Addresses.push_back(*AddrOrErr);\\n+ }\\n+ return Addresses;\\n+}\\n+\\n+Expect<std::vector<WasmFunctionCodeAddress>> JIT::lookupWasmFunctionSymbols(\\n+ JITLibrary &Lib, std::string_view Prefix,\\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\\n+ std::vector<WasmFunctionCodeAddress> Addresses;\\n+ Addresses.reserve(GlobalFuncIndices.size());\\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\\n+ const std::string SymName = fmt::format(\\\"{}f{}\\\"sv, Prefix, GlobalFuncIndex);\\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\\n+ if (!AddrOrErr) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to lookup function symbol {}: {}\\\"sv,\\n+ SymName, errorToString(std::move(AddrOrErr.error())));\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+ Addresses.push_back(*AddrOrErr);\\n+ }\\n+ return Addresses;\\n }\\n } // namespace WasmEdge::LLVM\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13288,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"Please confirm if this is the intended usage of the same `static_cast`."},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/lib/llvm/jit.cpp b/lib/llvm/jit.cpp\nindex 4bf3cc80386a..f0afb693f598 100644\n--- a/lib/llvm/jit.cpp\n+++ b/lib/llvm/jit.cpp\n@@ -2,29 +2,96 @@\n // SPDX-FileCopyrightText: 2019-2024 Second State INC\n \n #include \"llvm/jit.h\"\n-#include \"common/spdlog.h\"\n \n #include \"data.h\"\n #include \"llvm.h\"\n+#include \"spdlog/spdlog.h\"\n+\n+#include <mutex>\n+\n+#include <fmt/format.h>\n \n namespace LLVM = WasmEdge::LLVM;\n using namespace std::literals;\n \n-namespace WasmEdge::LLVM {\n+namespace {\n+\n+std::string errorToString(LLVM::Error &&E) noexcept {\n+ auto Msg = E.message();\n+ return std::string(Msg.string_view());\n+}\n+\n+static WasmEdge::Expect<LLVM::OrcLLJIT> createTunedLazyLLJIT() noexcept {\n+ LLVMOrcLLJITBuilderRef Builder = LLVM::OrcLLJIT::getBuilder();\n+ if (!Builder) {\n+ Builder = LLVMOrcCreateLLJITBuilder();\n+ }\n+\n+ LLVMTargetRef TheTarget = nullptr;\n+ LLVM::Message Triple(LLVMGetDefaultTargetTriple());\n+ char *TripleErr = nullptr;\n+ if (LLVMGetTargetFromTriple(Triple.string_view().data(), &TheTarget,\n+ &TripleErr)) {\n+ spdlog::error(\"[lazy-jit]: getTargetFromTriple failed: {}\"sv,\n+ TripleErr ? TripleErr : \"\");\n+ LLVMDisposeMessage(TripleErr);\n+ LLVMOrcDisposeLLJITBuilder(Builder);\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ LLVM::Message CPU(LLVMGetHostCPUName());\n+ LLVM::Message Features(LLVMGetHostCPUFeatures());\n+\n+ // LLVMCodeGenLevelNone is used deliberately here as a performance trade-off.\n+ // ORC's IRCompileLayer inherits the codegen optimisation level from this\n+ // target machine and applies it during every lazy materialisation.\n+ // Note that this codegen level is independent of the optimisation\n+ // level passed through WasmEdge::Configure, which governs the\n+ // IR compilation step, this setting only controls the ORC materialisation\n+ // pipeline for lazy JIT.\n+ LLVMTargetMachineRef TM = LLVMCreateTargetMachine(\n+ TheTarget, Triple.string_view().data(), CPU.string_view().data(),\n+ Features.string_view().data(), LLVMCodeGenLevelNone, LLVMRelocDefault,\n+ LLVMCodeModelJITDefault);\n+\n+ if (!TM) {\n+ spdlog::error(\"[lazy-jit]: createTargetMachine failed\"sv);\n+ LLVMOrcDisposeLLJITBuilder(Builder);\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n \n-JITLibrary::JITLibrary(OrcLLJIT JIT) noexcept\n- : J(std::make_unique<OrcLLJIT>(std::move(JIT)).release()) {}\n+ LLVMOrcJITTargetMachineBuilderRef JTMB =\n+ LLVMOrcJITTargetMachineBuilderCreateFromTargetMachine(TM);\n+ LLVMOrcLLJITBuilderSetJITTargetMachineBuilder(Builder, JTMB);\n \n-JITLibrary::~JITLibrary() noexcept {\n- std::unique_ptr<OrcLLJIT> JIT(std::exchange(J, nullptr));\n+ LLVM::OrcLLJIT Result;\n+ if (LLVMErrorRef CreateErr = LLVMOrcCreateLLJIT(&Result.unwrap(), Builder)) {\n+ LLVM::ErrorMessage Msg(LLVMGetErrorMessage(CreateErr));\n+ spdlog::error(\"[lazy-jit]: LLVMOrcCreateLLJIT failed: {}\"sv,\n+ Msg.string_view());\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n+ return Result;\n }\n \n+} // namespace\n+\n+namespace WasmEdge::LLVM {\n+\n+JITLibrary::JITLibrary(std::shared_ptr<LLVM::OrcLLJIT> JIT, std::string P,\n+ bool IsLazy) noexcept\n+ : J(std::move(JIT)), Prefix(std::move(P)), IsLazy(IsLazy) {}\n+\n+JITLibrary::~JITLibrary() noexcept {}\n+\n Symbol<const Executable::IntrinsicsTable *>\n JITLibrary::getIntrinsics() noexcept {\n- if (auto Symbol = J->lookup<const IntrinsicsTable *>(\"intrinsics\")) {\n+ if (auto Symbol = J->lookup<const IntrinsicsTable *>(\n+ fmt::format(\"{}intrinsics\"sv, Prefix).c_str())) {\n return createSymbol<const IntrinsicsTable *>(*Symbol);\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ spdlog::error(\"[lazy-jit]: failed to lookup intrinsics symbol: {}\"sv,\n+ errorToString(std::move(Symbol.error())));\n return {};\n }\n }\n@@ -34,11 +101,12 @@ JITLibrary::getTypes(size_t Size) noexcept {\n std::vector<Symbol<Wrapper>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size; ++I) {\n- const std::string Name = fmt::format(\"t{}\"sv, I);\n+ const std::string Name = fmt::format(\"{}t{}\"sv, Prefix, I);\n if (auto Symbol = J->lookup<Wrapper>(Name.c_str())) {\n Result.push_back(createSymbol<Wrapper>(*Symbol));\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ spdlog::error(\"[lazy-jit]: failed to lookup table symbol {}: {}\"sv, Name,\n+ errorToString(std::move(Symbol.error())));\n Result.emplace_back();\n }\n }\n@@ -51,11 +119,25 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n std::vector<Symbol<void>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size; ++I) {\n- const std::string Name = fmt::format(\"f{}\"sv, I + Offset);\n- if (auto Symbol = J->lookup<void>(Name.c_str())) {\n- Result.push_back(createSymbol<void>(*Symbol));\n+ const std::string Name = fmt::format(\"{}f{}\"sv, Prefix, I + Offset);\n+ void *Addr = nullptr;\n+ auto AddrOrErr = J->lookup<void *>(Name.c_str());\n+ if (AddrOrErr) {\n+ Addr = *AddrOrErr;\n+ } else {\n+ auto ErrMsg = errorToString(std::move(AddrOrErr.error()));\n+ // consuming only symbol not found errors for lazy-jit\n+ if (!IsLazy || ErrMsg.find(\"Symbols not found\"sv) == std::string::npos) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ Name, ErrMsg);\n+ }\n+ }\n+ if (Addr) {\n+ Result.push_back(createSymbol<void>(Addr));\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ if (IsLazy) {\n+ spdlog::debug(\"[lazy-jit]: function {} not yet compiled\"sv, I + Offset);\n+ }\n Result.emplace_back();\n }\n }\n@@ -63,31 +145,109 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n return Result;\n }\n \n-Expect<std::shared_ptr<Executable>> JIT::load(Data D) noexcept {\n- OrcLLJIT J;\n- if (auto Res = OrcLLJIT::create(); !Res) {\n- spdlog::error(\"{}\"sv, Res.error().message().string_view());\n- return Unexpect(ErrCode::Value::HostFuncError);\n+Expect<std::shared_ptr<Executable>> JIT::load(Data &D, bool IsLazy) noexcept {\n+ OrcLLJIT LLJITInstance;\n+ if (IsLazy) {\n+ auto R = createTunedLazyLLJIT();\n+ if (!R) {\n+ spdlog::error(\"[lazy-jit]: failed to create LLJIT\"sv);\n+ return Unexpect(R.error());\n+ }\n+ LLJITInstance = std::move(*R);\n } else {\n- J = std::move(*Res);\n+ auto R = OrcLLJIT::create();\n+ if (!R) {\n+ spdlog::error(\"failed to create LLJIT: {}\"sv,\n+ R.error().message().string_view());\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+ LLJITInstance = std::move(*R);\n }\n \n auto &LLModule = D.extract().LLModule;\n- auto TSContext = D.extract().getTSContext();\n+ auto &TSContext = D.extract().getTSContext();\n \n if (Conf.getCompilerConfigure().isDumpIR()) {\n- if (auto ErrorMessage = LLModule.printModuleToFile(\"wasm-jit.ll\")) {\n+ const auto *Filename = IsLazy ? \"wasm-lazy-jit.ll\" : \"wasm-jit.ll\";\n+ if (auto ErrorMessage = LLModule.printModuleToFile(Filename)) {\n spdlog::error(\"printModuleToFile failed\"sv);\n }\n }\n \n- auto MainJD = J.getMainJITDylib();\n- if (auto Err = J.addLLVMIRModule(\n+ auto MainJD = LLJITInstance.getMainJITDylib();\n+ if (auto Err = LLJITInstance.addLLVMIRModule(\n MainJD, OrcThreadSafeModule(LLModule.release(), TSContext))) {\n- spdlog::error(\"{}\"sv, Err.message().string_view());\n+ spdlog::error(\"failed to add LLVM IR module: {}\"sv,\n+ Err.message().string_view());\n return Unexpect(ErrCode::Value::HostFuncError);\n }\n \n- return std::make_shared<JITLibrary>(std::move(J));\n+ return std::make_shared<JITLibrary>(\n+ std::make_shared<OrcLLJIT>(std::move(LLJITInstance)),\n+ std::string(D.getPrefix()), IsLazy);\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>>\n+JIT::add(JITLibrary &Lib, Data &D,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ if (GlobalFuncIndices.empty()) {\n+ spdlog::error(\"JIT::add: empty function index list\"sv);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ auto &LLModule = D.extract().LLModule;\n+ auto &TSContext = D.extract().getTSContext();\n+\n+ auto JD = Lib.J->getMainJITDylib();\n+ auto RT = JD.createResourceTracker();\n+ if (!RT) {\n+ spdlog::error(\"[lazy-jit]: failed to create resource tracker\"sv);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto Err = Lib.J->addLLVMIRModuleWithRT(\n+ RT, OrcThreadSafeModule(LLModule.release(), TSContext))) {\n+ spdlog::error(\"[lazy-jit]: failed to add LLVM IR module: {}\"sv,\n+ Err.message().string_view());\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ std::vector<WasmFunctionCodeAddress> Addresses;\n+ Addresses.reserve(GlobalFuncIndices.size());\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\n+ const std::string SymName =\n+ fmt::format(\"{}f{}\"sv, D.getPrefix(), GlobalFuncIndex);\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\n+ if (!AddrOrErr) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ SymName, errorToString(std::move(AddrOrErr.error())));\n+ if (auto RemoveErr = RT.remove()) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to remove failed module from tracker: {}\"sv,\n+ RemoveErr.message().string_view());\n+ }\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+ Addresses.push_back(*AddrOrErr);\n+ }\n+ return Addresses;\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>> JIT::lookupWasmFunctionSymbols(\n+ JITLibrary &Lib, std::string_view Prefix,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ std::vector<WasmFunctionCodeAddress> Addresses;\n+ Addresses.reserve(GlobalFuncIndices.size());\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\n+ const std::string SymName = fmt::format(\"{}f{}\"sv, Prefix, GlobalFuncIndex);\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\n+ if (!AddrOrErr) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ SymName, errorToString(std::move(AddrOrErr.error())));\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+ Addresses.push_back(*AddrOrErr);\n+ }\n+ return Addresses;\n }\n } // namespace WasmEdge::LLVM\n"},"changed_files":{"kind":"list like","value":["lib/llvm/jit.cpp"],"string":"[\n \"lib/llvm/jit.cpp\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"Please confirm if this is the intended usage of the same `static_cast`.","path":"lib/llvm/jit.cpp","hunk":"@@ -51,43 +125,144 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n std::vector<Symbol<void>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size; ++I) {\n- const std::string Name = fmt::format(\"f{}\"sv, I + Offset);\n- if (auto Symbol = J->lookup<void>(Name.c_str())) {\n- Result.push_back(createSymbol<void>(*Symbol));\n+ const std::string Name = fmt::format(\"{}f{}\"sv, Prefix, I + Offset);\n+ void *Addr = nullptr;\n+ auto AddrOrErr = J->lookup<void *>(Name.c_str());\n+ if (AddrOrErr) {\n+ Addr = *AddrOrErr;\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ if (!IsLazy) {\n+ spdlog::error(\"{}\"sv, errorToString(std::move(AddrOrErr.error())));\n+ } else {\n+ // Just consume the error if it's lazy (it might not be compiled yet)\n+ (void)AddrOrErr.error();\n+ }\n+ }\n+ if (Addr) {\n+ Result.push_back(createSymbol<void>(Addr));\n+ } else {\n+ if (IsLazy) {\n+ spdlog::debug(\"[lazy-jit]: function {} not yet compiled\"sv, I + Offset);\n+ }\n Result.emplace_back();\n }\n }\n \n return Result;\n }\n \n-Expect<std::shared_ptr<Executable>> JIT::load(Data D) noexcept {\n- OrcLLJIT J;\n- if (auto Res = OrcLLJIT::create(); !Res) {\n- spdlog::error(\"{}\"sv, Res.error().message().string_view());\n- return Unexpect(ErrCode::Value::HostFuncError);\n+Expect<std::shared_ptr<Executable>> JIT::load(Data &D, bool IsLazy) noexcept {\n+ OrcLLJIT LLJITInstance;\n+ if (IsLazy) {\n+ auto R = createTunedLazyLLJIT();\n+ if (!R) {\n+ spdlog::error(\"[lazy-jit]: failed to create LLJIT\"sv);\n+ return Unexpect(R.error());\n+ }\n+ LLJITInstance = std::move(*R);\n } else {\n- J = std::move(*Res);\n+ auto R = OrcLLJIT::create();\n+ if (!R) {\n+ spdlog::error(\"{}\"sv, R.error().message().string_view());\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+ LLJITInstance = std::move(*R);\n }\n \n auto &LLModule = D.extract().LLModule;\n- auto TSContext = D.extract().getTSContext();\n+ auto &TSContext = D.extract().getTSContext();\n \n if (Conf.getCompilerConfigure().isDumpIR()) {\n- if (auto ErrorMessage = LLModule.printModuleToFile(\"wasm-jit.ll\")) {\n+ const auto *Filename = IsLazy ? \"wasm-lazy-jit.ll\" : \"wasm-jit.ll\";\n+ if (auto ErrorMessage = LLModule.printModuleToFile(Filename)) {\n spdlog::error(\"printModuleToFile failed\"sv);\n }\n }\n \n- auto MainJD = J.getMainJITDylib();\n- if (auto Err = J.addLLVMIRModule(\n+ auto MainJD = LLJITInstance.getMainJITDylib();\n+ if (auto Err = LLJITInstance.addLLVMIRModule(\n MainJD, OrcThreadSafeModule(LLModule.release(), TSContext))) {\n spdlog::error(\"{}\"sv, Err.message().string_view());\n return Unexpect(ErrCode::Value::HostFuncError);\n }\n \n- return std::make_shared<JITLibrary>(std::move(J));\n+ return std::make_shared<JITLibrary>(\n+ std::make_shared<OrcLLJIT>(std::move(LLJITInstance)),\n+ std::string(D.getPrefix()), IsLazy);\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>>\n+JIT::add(Executable &Exec, Data &D,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ auto *Lib = static_cast<JITLibrary *>(&Exec);\n+ if (!Lib) {\n+ spdlog::error(\"JIT::add: executable is not a JITLibrary\"sv);\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+ if (GlobalFuncIndices.empty()) {\n+ spdlog::error(\"JIT::add: empty function index list\"sv);\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+\n+ std::lock_guard<std::mutex> Lock(Lib->LazyAddMutex);\n+ auto &LLModule = D.extract().LLModule;\n+ auto &TSContext = D.extract().getTSContext();\n+\n+ LLVMOrcJITDylibRef MainJDRef = LLVMOrcLLJITGetMainJITDylib(Lib->J->unwrap());\n+\n+ if (auto Err = Lib->J->addLLVMIRModule(\n+ OrcJITDylib(MainJDRef),\n+ OrcThreadSafeModule(LLModule.release(), TSContext))) {\n+ spdlog::error(\"{}\"sv, Err.message().string_view());\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+\n+ std::vector<WasmFunctionCodeAddress> Addresses;\n+ Addresses.reserve(GlobalFuncIndices.size());\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\n+ const std::string SymName =\n+ fmt::format(\"{}f{}\"sv, D.getPrefix(), GlobalFuncIndex);\n+ auto AddrOrErr = Lib->J->lookup<void *>(SymName.c_str());\n+ if (!AddrOrErr) {\n+ spdlog::error(\"{}\"sv, errorToString(std::move(AddrOrErr.error())));\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+ Addresses.push_back(*AddrOrErr);\n+ }\n+ return Addresses;\n+}\n+\n+Expect<WasmFunctionCodeAddress> JIT::add(Executable &Exec, Data &D,\n+ uint32_t GlobalFuncIndex) noexcept {\n+ const uint32_t One[1] = {GlobalFuncIndex};\n+ auto Batch = add(Exec, D, Span<const uint32_t>(One, 1));\n+ if (!Batch) {\n+ return Unexpect(Batch.error());\n+ }\n+ return (*Batch)[0];\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>> JIT::lookupWasmFunctionSymbols(\n+ Executable &Exec, std::string_view Prefix,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ auto *Lib = static_cast<JITLibrary *>(&Exec);","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/lib/llvm/jit.cpp b/lib/llvm/jit.cpp\nindex 4bf3cc80386a..f0afb693f598 100644\n--- a/lib/llvm/jit.cpp\n+++ b/lib/llvm/jit.cpp\n@@ -2,29 +2,96 @@\n // SPDX-FileCopyrightText: 2019-2024 Second State INC\n \n #include \"llvm/jit.h\"\n-#include \"common/spdlog.h\"\n \n #include \"data.h\"\n #include \"llvm.h\"\n+#include \"spdlog/spdlog.h\"\n+\n+#include <mutex>\n+\n+#include <fmt/format.h>\n \n namespace LLVM = WasmEdge::LLVM;\n using namespace std::literals;\n \n-namespace WasmEdge::LLVM {\n+namespace {\n+\n+std::string errorToString(LLVM::Error &&E) noexcept {\n+ auto Msg = E.message();\n+ return std::string(Msg.string_view());\n+}\n+\n+static WasmEdge::Expect<LLVM::OrcLLJIT> createTunedLazyLLJIT() noexcept {\n+ LLVMOrcLLJITBuilderRef Builder = LLVM::OrcLLJIT::getBuilder();\n+ if (!Builder) {\n+ Builder = LLVMOrcCreateLLJITBuilder();\n+ }\n+\n+ LLVMTargetRef TheTarget = nullptr;\n+ LLVM::Message Triple(LLVMGetDefaultTargetTriple());\n+ char *TripleErr = nullptr;\n+ if (LLVMGetTargetFromTriple(Triple.string_view().data(), &TheTarget,\n+ &TripleErr)) {\n+ spdlog::error(\"[lazy-jit]: getTargetFromTriple failed: {}\"sv,\n+ TripleErr ? TripleErr : \"\");\n+ LLVMDisposeMessage(TripleErr);\n+ LLVMOrcDisposeLLJITBuilder(Builder);\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ LLVM::Message CPU(LLVMGetHostCPUName());\n+ LLVM::Message Features(LLVMGetHostCPUFeatures());\n+\n+ // LLVMCodeGenLevelNone is used deliberately here as a performance trade-off.\n+ // ORC's IRCompileLayer inherits the codegen optimisation level from this\n+ // target machine and applies it during every lazy materialisation.\n+ // Note that this codegen level is independent of the optimisation\n+ // level passed through WasmEdge::Configure, which governs the\n+ // IR compilation step, this setting only controls the ORC materialisation\n+ // pipeline for lazy JIT.\n+ LLVMTargetMachineRef TM = LLVMCreateTargetMachine(\n+ TheTarget, Triple.string_view().data(), CPU.string_view().data(),\n+ Features.string_view().data(), LLVMCodeGenLevelNone, LLVMRelocDefault,\n+ LLVMCodeModelJITDefault);\n+\n+ if (!TM) {\n+ spdlog::error(\"[lazy-jit]: createTargetMachine failed\"sv);\n+ LLVMOrcDisposeLLJITBuilder(Builder);\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n \n-JITLibrary::JITLibrary(OrcLLJIT JIT) noexcept\n- : J(std::make_unique<OrcLLJIT>(std::move(JIT)).release()) {}\n+ LLVMOrcJITTargetMachineBuilderRef JTMB =\n+ LLVMOrcJITTargetMachineBuilderCreateFromTargetMachine(TM);\n+ LLVMOrcLLJITBuilderSetJITTargetMachineBuilder(Builder, JTMB);\n \n-JITLibrary::~JITLibrary() noexcept {\n- std::unique_ptr<OrcLLJIT> JIT(std::exchange(J, nullptr));\n+ LLVM::OrcLLJIT Result;\n+ if (LLVMErrorRef CreateErr = LLVMOrcCreateLLJIT(&Result.unwrap(), Builder)) {\n+ LLVM::ErrorMessage Msg(LLVMGetErrorMessage(CreateErr));\n+ spdlog::error(\"[lazy-jit]: LLVMOrcCreateLLJIT failed: {}\"sv,\n+ Msg.string_view());\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n+ return Result;\n }\n \n+} // namespace\n+\n+namespace WasmEdge::LLVM {\n+\n+JITLibrary::JITLibrary(std::shared_ptr<LLVM::OrcLLJIT> JIT, std::string P,\n+ bool IsLazy) noexcept\n+ : J(std::move(JIT)), Prefix(std::move(P)), IsLazy(IsLazy) {}\n+\n+JITLibrary::~JITLibrary() noexcept {}\n+\n Symbol<const Executable::IntrinsicsTable *>\n JITLibrary::getIntrinsics() noexcept {\n- if (auto Symbol = J->lookup<const IntrinsicsTable *>(\"intrinsics\")) {\n+ if (auto Symbol = J->lookup<const IntrinsicsTable *>(\n+ fmt::format(\"{}intrinsics\"sv, Prefix).c_str())) {\n return createSymbol<const IntrinsicsTable *>(*Symbol);\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ spdlog::error(\"[lazy-jit]: failed to lookup intrinsics symbol: {}\"sv,\n+ errorToString(std::move(Symbol.error())));\n return {};\n }\n }\n@@ -34,11 +101,12 @@ JITLibrary::getTypes(size_t Size) noexcept {\n std::vector<Symbol<Wrapper>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size; ++I) {\n- const std::string Name = fmt::format(\"t{}\"sv, I);\n+ const std::string Name = fmt::format(\"{}t{}\"sv, Prefix, I);\n if (auto Symbol = J->lookup<Wrapper>(Name.c_str())) {\n Result.push_back(createSymbol<Wrapper>(*Symbol));\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ spdlog::error(\"[lazy-jit]: failed to lookup table symbol {}: {}\"sv, Name,\n+ errorToString(std::move(Symbol.error())));\n Result.emplace_back();\n }\n }\n@@ -51,11 +119,25 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n std::vector<Symbol<void>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size; ++I) {\n- const std::string Name = fmt::format(\"f{}\"sv, I + Offset);\n- if (auto Symbol = J->lookup<void>(Name.c_str())) {\n- Result.push_back(createSymbol<void>(*Symbol));\n+ const std::string Name = fmt::format(\"{}f{}\"sv, Prefix, I + Offset);\n+ void *Addr = nullptr;\n+ auto AddrOrErr = J->lookup<void *>(Name.c_str());\n+ if (AddrOrErr) {\n+ Addr = *AddrOrErr;\n+ } else {\n+ auto ErrMsg = errorToString(std::move(AddrOrErr.error()));\n+ // consuming only symbol not found errors for lazy-jit\n+ if (!IsLazy || ErrMsg.find(\"Symbols not found\"sv) == std::string::npos) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ Name, ErrMsg);\n+ }\n+ }\n+ if (Addr) {\n+ Result.push_back(createSymbol<void>(Addr));\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ if (IsLazy) {\n+ spdlog::debug(\"[lazy-jit]: function {} not yet compiled\"sv, I + Offset);\n+ }\n Result.emplace_back();\n }\n }\n@@ -63,31 +145,109 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n return Result;\n }\n \n-Expect<std::shared_ptr<Executable>> JIT::load(Data D) noexcept {\n- OrcLLJIT J;\n- if (auto Res = OrcLLJIT::create(); !Res) {\n- spdlog::error(\"{}\"sv, Res.error().message().string_view());\n- return Unexpect(ErrCode::Value::HostFuncError);\n+Expect<std::shared_ptr<Executable>> JIT::load(Data &D, bool IsLazy) noexcept {\n+ OrcLLJIT LLJITInstance;\n+ if (IsLazy) {\n+ auto R = createTunedLazyLLJIT();\n+ if (!R) {\n+ spdlog::error(\"[lazy-jit]: failed to create LLJIT\"sv);\n+ return Unexpect(R.error());\n+ }\n+ LLJITInstance = std::move(*R);\n } else {\n- J = std::move(*Res);\n+ auto R = OrcLLJIT::create();\n+ if (!R) {\n+ spdlog::error(\"failed to create LLJIT: {}\"sv,\n+ R.error().message().string_view());\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+ LLJITInstance = std::move(*R);\n }\n \n auto &LLModule = D.extract().LLModule;\n- auto TSContext = D.extract().getTSContext();\n+ auto &TSContext = D.extract().getTSContext();\n \n if (Conf.getCompilerConfigure().isDumpIR()) {\n- if (auto ErrorMessage = LLModule.printModuleToFile(\"wasm-jit.ll\")) {\n+ const auto *Filename = IsLazy ? \"wasm-lazy-jit.ll\" : \"wasm-jit.ll\";\n+ if (auto ErrorMessage = LLModule.printModuleToFile(Filename)) {\n spdlog::error(\"printModuleToFile failed\"sv);\n }\n }\n \n- auto MainJD = J.getMainJITDylib();\n- if (auto Err = J.addLLVMIRModule(\n+ auto MainJD = LLJITInstance.getMainJITDylib();\n+ if (auto Err = LLJITInstance.addLLVMIRModule(\n MainJD, OrcThreadSafeModule(LLModule.release(), TSContext))) {\n- spdlog::error(\"{}\"sv, Err.message().string_view());\n+ spdlog::error(\"failed to add LLVM IR module: {}\"sv,\n+ Err.message().string_view());\n return Unexpect(ErrCode::Value::HostFuncError);\n }\n \n- return std::make_shared<JITLibrary>(std::move(J));\n+ return std::make_shared<JITLibrary>(\n+ std::make_shared<OrcLLJIT>(std::move(LLJITInstance)),\n+ std::string(D.getPrefix()), IsLazy);\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>>\n+JIT::add(JITLibrary &Lib, Data &D,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ if (GlobalFuncIndices.empty()) {\n+ spdlog::error(\"JIT::add: empty function index list\"sv);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ auto &LLModule = D.extract().LLModule;\n+ auto &TSContext = D.extract().getTSContext();\n+\n+ auto JD = Lib.J->getMainJITDylib();\n+ auto RT = JD.createResourceTracker();\n+ if (!RT) {\n+ spdlog::error(\"[lazy-jit]: failed to create resource tracker\"sv);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto Err = Lib.J->addLLVMIRModuleWithRT(\n+ RT, OrcThreadSafeModule(LLModule.release(), TSContext))) {\n+ spdlog::error(\"[lazy-jit]: failed to add LLVM IR module: {}\"sv,\n+ Err.message().string_view());\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ std::vector<WasmFunctionCodeAddress> Addresses;\n+ Addresses.reserve(GlobalFuncIndices.size());\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\n+ const std::string SymName =\n+ fmt::format(\"{}f{}\"sv, D.getPrefix(), GlobalFuncIndex);\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\n+ if (!AddrOrErr) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ SymName, errorToString(std::move(AddrOrErr.error())));\n+ if (auto RemoveErr = RT.remove()) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to remove failed module from tracker: {}\"sv,\n+ RemoveErr.message().string_view());\n+ }\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+ Addresses.push_back(*AddrOrErr);\n+ }\n+ return Addresses;\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>> JIT::lookupWasmFunctionSymbols(\n+ JITLibrary &Lib, std::string_view Prefix,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ std::vector<WasmFunctionCodeAddress> Addresses;\n+ Addresses.reserve(GlobalFuncIndices.size());\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\n+ const std::string SymName = fmt::format(\"{}f{}\"sv, Prefix, GlobalFuncIndex);\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\n+ if (!AddrOrErr) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ SymName, errorToString(std::move(AddrOrErr.error())));\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+ Addresses.push_back(*AddrOrErr);\n+ }\n+ return Addresses;\n }\n } // namespace WasmEdge::LLVM\n"}],"string":"[\n {\n \"comment\": \"Please confirm if this is the intended usage of the same `static_cast`.\",\n \"path\": \"lib/llvm/jit.cpp\",\n \"hunk\": \"@@ -51,43 +125,144 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\\n std::vector<Symbol<void>> Result;\\n Result.reserve(Size);\\n for (size_t I = 0; I < Size; ++I) {\\n- const std::string Name = fmt::format(\\\"f{}\\\"sv, I + Offset);\\n- if (auto Symbol = J->lookup<void>(Name.c_str())) {\\n- Result.push_back(createSymbol<void>(*Symbol));\\n+ const std::string Name = fmt::format(\\\"{}f{}\\\"sv, Prefix, I + Offset);\\n+ void *Addr = nullptr;\\n+ auto AddrOrErr = J->lookup<void *>(Name.c_str());\\n+ if (AddrOrErr) {\\n+ Addr = *AddrOrErr;\\n } else {\\n- spdlog::error(\\\"{}\\\"sv, Symbol.error().message().string_view());\\n+ if (!IsLazy) {\\n+ spdlog::error(\\\"{}\\\"sv, errorToString(std::move(AddrOrErr.error())));\\n+ } else {\\n+ // Just consume the error if it's lazy (it might not be compiled yet)\\n+ (void)AddrOrErr.error();\\n+ }\\n+ }\\n+ if (Addr) {\\n+ Result.push_back(createSymbol<void>(Addr));\\n+ } else {\\n+ if (IsLazy) {\\n+ spdlog::debug(\\\"[lazy-jit]: function {} not yet compiled\\\"sv, I + Offset);\\n+ }\\n Result.emplace_back();\\n }\\n }\\n \\n return Result;\\n }\\n \\n-Expect<std::shared_ptr<Executable>> JIT::load(Data D) noexcept {\\n- OrcLLJIT J;\\n- if (auto Res = OrcLLJIT::create(); !Res) {\\n- spdlog::error(\\\"{}\\\"sv, Res.error().message().string_view());\\n- return Unexpect(ErrCode::Value::HostFuncError);\\n+Expect<std::shared_ptr<Executable>> JIT::load(Data &D, bool IsLazy) noexcept {\\n+ OrcLLJIT LLJITInstance;\\n+ if (IsLazy) {\\n+ auto R = createTunedLazyLLJIT();\\n+ if (!R) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to create LLJIT\\\"sv);\\n+ return Unexpect(R.error());\\n+ }\\n+ LLJITInstance = std::move(*R);\\n } else {\\n- J = std::move(*Res);\\n+ auto R = OrcLLJIT::create();\\n+ if (!R) {\\n+ spdlog::error(\\\"{}\\\"sv, R.error().message().string_view());\\n+ return Unexpect(ErrCode::Value::HostFuncError);\\n+ }\\n+ LLJITInstance = std::move(*R);\\n }\\n \\n auto &LLModule = D.extract().LLModule;\\n- auto TSContext = D.extract().getTSContext();\\n+ auto &TSContext = D.extract().getTSContext();\\n \\n if (Conf.getCompilerConfigure().isDumpIR()) {\\n- if (auto ErrorMessage = LLModule.printModuleToFile(\\\"wasm-jit.ll\\\")) {\\n+ const auto *Filename = IsLazy ? \\\"wasm-lazy-jit.ll\\\" : \\\"wasm-jit.ll\\\";\\n+ if (auto ErrorMessage = LLModule.printModuleToFile(Filename)) {\\n spdlog::error(\\\"printModuleToFile failed\\\"sv);\\n }\\n }\\n \\n- auto MainJD = J.getMainJITDylib();\\n- if (auto Err = J.addLLVMIRModule(\\n+ auto MainJD = LLJITInstance.getMainJITDylib();\\n+ if (auto Err = LLJITInstance.addLLVMIRModule(\\n MainJD, OrcThreadSafeModule(LLModule.release(), TSContext))) {\\n spdlog::error(\\\"{}\\\"sv, Err.message().string_view());\\n return Unexpect(ErrCode::Value::HostFuncError);\\n }\\n \\n- return std::make_shared<JITLibrary>(std::move(J));\\n+ return std::make_shared<JITLibrary>(\\n+ std::make_shared<OrcLLJIT>(std::move(LLJITInstance)),\\n+ std::string(D.getPrefix()), IsLazy);\\n+}\\n+\\n+Expect<std::vector<WasmFunctionCodeAddress>>\\n+JIT::add(Executable &Exec, Data &D,\\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\\n+ auto *Lib = static_cast<JITLibrary *>(&Exec);\\n+ if (!Lib) {\\n+ spdlog::error(\\\"JIT::add: executable is not a JITLibrary\\\"sv);\\n+ return Unexpect(ErrCode::Value::HostFuncError);\\n+ }\\n+ if (GlobalFuncIndices.empty()) {\\n+ spdlog::error(\\\"JIT::add: empty function index list\\\"sv);\\n+ return Unexpect(ErrCode::Value::HostFuncError);\\n+ }\\n+\\n+ std::lock_guard<std::mutex> Lock(Lib->LazyAddMutex);\\n+ auto &LLModule = D.extract().LLModule;\\n+ auto &TSContext = D.extract().getTSContext();\\n+\\n+ LLVMOrcJITDylibRef MainJDRef = LLVMOrcLLJITGetMainJITDylib(Lib->J->unwrap());\\n+\\n+ if (auto Err = Lib->J->addLLVMIRModule(\\n+ OrcJITDylib(MainJDRef),\\n+ OrcThreadSafeModule(LLModule.release(), TSContext))) {\\n+ spdlog::error(\\\"{}\\\"sv, Err.message().string_view());\\n+ return Unexpect(ErrCode::Value::HostFuncError);\\n+ }\\n+\\n+ std::vector<WasmFunctionCodeAddress> Addresses;\\n+ Addresses.reserve(GlobalFuncIndices.size());\\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\\n+ const std::string SymName =\\n+ fmt::format(\\\"{}f{}\\\"sv, D.getPrefix(), GlobalFuncIndex);\\n+ auto AddrOrErr = Lib->J->lookup<void *>(SymName.c_str());\\n+ if (!AddrOrErr) {\\n+ spdlog::error(\\\"{}\\\"sv, errorToString(std::move(AddrOrErr.error())));\\n+ return Unexpect(ErrCode::Value::HostFuncError);\\n+ }\\n+ Addresses.push_back(*AddrOrErr);\\n+ }\\n+ return Addresses;\\n+}\\n+\\n+Expect<WasmFunctionCodeAddress> JIT::add(Executable &Exec, Data &D,\\n+ uint32_t GlobalFuncIndex) noexcept {\\n+ const uint32_t One[1] = {GlobalFuncIndex};\\n+ auto Batch = add(Exec, D, Span<const uint32_t>(One, 1));\\n+ if (!Batch) {\\n+ return Unexpect(Batch.error());\\n+ }\\n+ return (*Batch)[0];\\n+}\\n+\\n+Expect<std::vector<WasmFunctionCodeAddress>> JIT::lookupWasmFunctionSymbols(\\n+ Executable &Exec, std::string_view Prefix,\\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\\n+ auto *Lib = static_cast<JITLibrary *>(&Exec);\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/lib/llvm/jit.cpp b/lib/llvm/jit.cpp\\nindex 4bf3cc80386a..f0afb693f598 100644\\n--- a/lib/llvm/jit.cpp\\n+++ b/lib/llvm/jit.cpp\\n@@ -2,29 +2,96 @@\\n // SPDX-FileCopyrightText: 2019-2024 Second State INC\\n \\n #include \\\"llvm/jit.h\\\"\\n-#include \\\"common/spdlog.h\\\"\\n \\n #include \\\"data.h\\\"\\n #include \\\"llvm.h\\\"\\n+#include \\\"spdlog/spdlog.h\\\"\\n+\\n+#include <mutex>\\n+\\n+#include <fmt/format.h>\\n \\n namespace LLVM = WasmEdge::LLVM;\\n using namespace std::literals;\\n \\n-namespace WasmEdge::LLVM {\\n+namespace {\\n+\\n+std::string errorToString(LLVM::Error &&E) noexcept {\\n+ auto Msg = E.message();\\n+ return std::string(Msg.string_view());\\n+}\\n+\\n+static WasmEdge::Expect<LLVM::OrcLLJIT> createTunedLazyLLJIT() noexcept {\\n+ LLVMOrcLLJITBuilderRef Builder = LLVM::OrcLLJIT::getBuilder();\\n+ if (!Builder) {\\n+ Builder = LLVMOrcCreateLLJITBuilder();\\n+ }\\n+\\n+ LLVMTargetRef TheTarget = nullptr;\\n+ LLVM::Message Triple(LLVMGetDefaultTargetTriple());\\n+ char *TripleErr = nullptr;\\n+ if (LLVMGetTargetFromTriple(Triple.string_view().data(), &TheTarget,\\n+ &TripleErr)) {\\n+ spdlog::error(\\\"[lazy-jit]: getTargetFromTriple failed: {}\\\"sv,\\n+ TripleErr ? TripleErr : \\\"\\\");\\n+ LLVMDisposeMessage(TripleErr);\\n+ LLVMOrcDisposeLLJITBuilder(Builder);\\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ LLVM::Message CPU(LLVMGetHostCPUName());\\n+ LLVM::Message Features(LLVMGetHostCPUFeatures());\\n+\\n+ // LLVMCodeGenLevelNone is used deliberately here as a performance trade-off.\\n+ // ORC's IRCompileLayer inherits the codegen optimisation level from this\\n+ // target machine and applies it during every lazy materialisation.\\n+ // Note that this codegen level is independent of the optimisation\\n+ // level passed through WasmEdge::Configure, which governs the\\n+ // IR compilation step, this setting only controls the ORC materialisation\\n+ // pipeline for lazy JIT.\\n+ LLVMTargetMachineRef TM = LLVMCreateTargetMachine(\\n+ TheTarget, Triple.string_view().data(), CPU.string_view().data(),\\n+ Features.string_view().data(), LLVMCodeGenLevelNone, LLVMRelocDefault,\\n+ LLVMCodeModelJITDefault);\\n+\\n+ if (!TM) {\\n+ spdlog::error(\\\"[lazy-jit]: createTargetMachine failed\\\"sv);\\n+ LLVMOrcDisposeLLJITBuilder(Builder);\\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\\n+ }\\n \\n-JITLibrary::JITLibrary(OrcLLJIT JIT) noexcept\\n- : J(std::make_unique<OrcLLJIT>(std::move(JIT)).release()) {}\\n+ LLVMOrcJITTargetMachineBuilderRef JTMB =\\n+ LLVMOrcJITTargetMachineBuilderCreateFromTargetMachine(TM);\\n+ LLVMOrcLLJITBuilderSetJITTargetMachineBuilder(Builder, JTMB);\\n \\n-JITLibrary::~JITLibrary() noexcept {\\n- std::unique_ptr<OrcLLJIT> JIT(std::exchange(J, nullptr));\\n+ LLVM::OrcLLJIT Result;\\n+ if (LLVMErrorRef CreateErr = LLVMOrcCreateLLJIT(&Result.unwrap(), Builder)) {\\n+ LLVM::ErrorMessage Msg(LLVMGetErrorMessage(CreateErr));\\n+ spdlog::error(\\\"[lazy-jit]: LLVMOrcCreateLLJIT failed: {}\\\"sv,\\n+ Msg.string_view());\\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\\n+ }\\n+ return Result;\\n }\\n \\n+} // namespace\\n+\\n+namespace WasmEdge::LLVM {\\n+\\n+JITLibrary::JITLibrary(std::shared_ptr<LLVM::OrcLLJIT> JIT, std::string P,\\n+ bool IsLazy) noexcept\\n+ : J(std::move(JIT)), Prefix(std::move(P)), IsLazy(IsLazy) {}\\n+\\n+JITLibrary::~JITLibrary() noexcept {}\\n+\\n Symbol<const Executable::IntrinsicsTable *>\\n JITLibrary::getIntrinsics() noexcept {\\n- if (auto Symbol = J->lookup<const IntrinsicsTable *>(\\\"intrinsics\\\")) {\\n+ if (auto Symbol = J->lookup<const IntrinsicsTable *>(\\n+ fmt::format(\\\"{}intrinsics\\\"sv, Prefix).c_str())) {\\n return createSymbol<const IntrinsicsTable *>(*Symbol);\\n } else {\\n- spdlog::error(\\\"{}\\\"sv, Symbol.error().message().string_view());\\n+ spdlog::error(\\\"[lazy-jit]: failed to lookup intrinsics symbol: {}\\\"sv,\\n+ errorToString(std::move(Symbol.error())));\\n return {};\\n }\\n }\\n@@ -34,11 +101,12 @@ JITLibrary::getTypes(size_t Size) noexcept {\\n std::vector<Symbol<Wrapper>> Result;\\n Result.reserve(Size);\\n for (size_t I = 0; I < Size; ++I) {\\n- const std::string Name = fmt::format(\\\"t{}\\\"sv, I);\\n+ const std::string Name = fmt::format(\\\"{}t{}\\\"sv, Prefix, I);\\n if (auto Symbol = J->lookup<Wrapper>(Name.c_str())) {\\n Result.push_back(createSymbol<Wrapper>(*Symbol));\\n } else {\\n- spdlog::error(\\\"{}\\\"sv, Symbol.error().message().string_view());\\n+ spdlog::error(\\\"[lazy-jit]: failed to lookup table symbol {}: {}\\\"sv, Name,\\n+ errorToString(std::move(Symbol.error())));\\n Result.emplace_back();\\n }\\n }\\n@@ -51,11 +119,25 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\\n std::vector<Symbol<void>> Result;\\n Result.reserve(Size);\\n for (size_t I = 0; I < Size; ++I) {\\n- const std::string Name = fmt::format(\\\"f{}\\\"sv, I + Offset);\\n- if (auto Symbol = J->lookup<void>(Name.c_str())) {\\n- Result.push_back(createSymbol<void>(*Symbol));\\n+ const std::string Name = fmt::format(\\\"{}f{}\\\"sv, Prefix, I + Offset);\\n+ void *Addr = nullptr;\\n+ auto AddrOrErr = J->lookup<void *>(Name.c_str());\\n+ if (AddrOrErr) {\\n+ Addr = *AddrOrErr;\\n+ } else {\\n+ auto ErrMsg = errorToString(std::move(AddrOrErr.error()));\\n+ // consuming only symbol not found errors for lazy-jit\\n+ if (!IsLazy || ErrMsg.find(\\\"Symbols not found\\\"sv) == std::string::npos) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to lookup function symbol {}: {}\\\"sv,\\n+ Name, ErrMsg);\\n+ }\\n+ }\\n+ if (Addr) {\\n+ Result.push_back(createSymbol<void>(Addr));\\n } else {\\n- spdlog::error(\\\"{}\\\"sv, Symbol.error().message().string_view());\\n+ if (IsLazy) {\\n+ spdlog::debug(\\\"[lazy-jit]: function {} not yet compiled\\\"sv, I + Offset);\\n+ }\\n Result.emplace_back();\\n }\\n }\\n@@ -63,31 +145,109 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\\n return Result;\\n }\\n \\n-Expect<std::shared_ptr<Executable>> JIT::load(Data D) noexcept {\\n- OrcLLJIT J;\\n- if (auto Res = OrcLLJIT::create(); !Res) {\\n- spdlog::error(\\\"{}\\\"sv, Res.error().message().string_view());\\n- return Unexpect(ErrCode::Value::HostFuncError);\\n+Expect<std::shared_ptr<Executable>> JIT::load(Data &D, bool IsLazy) noexcept {\\n+ OrcLLJIT LLJITInstance;\\n+ if (IsLazy) {\\n+ auto R = createTunedLazyLLJIT();\\n+ if (!R) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to create LLJIT\\\"sv);\\n+ return Unexpect(R.error());\\n+ }\\n+ LLJITInstance = std::move(*R);\\n } else {\\n- J = std::move(*Res);\\n+ auto R = OrcLLJIT::create();\\n+ if (!R) {\\n+ spdlog::error(\\\"failed to create LLJIT: {}\\\"sv,\\n+ R.error().message().string_view());\\n+ return Unexpect(ErrCode::Value::HostFuncError);\\n+ }\\n+ LLJITInstance = std::move(*R);\\n }\\n \\n auto &LLModule = D.extract().LLModule;\\n- auto TSContext = D.extract().getTSContext();\\n+ auto &TSContext = D.extract().getTSContext();\\n \\n if (Conf.getCompilerConfigure().isDumpIR()) {\\n- if (auto ErrorMessage = LLModule.printModuleToFile(\\\"wasm-jit.ll\\\")) {\\n+ const auto *Filename = IsLazy ? \\\"wasm-lazy-jit.ll\\\" : \\\"wasm-jit.ll\\\";\\n+ if (auto ErrorMessage = LLModule.printModuleToFile(Filename)) {\\n spdlog::error(\\\"printModuleToFile failed\\\"sv);\\n }\\n }\\n \\n- auto MainJD = J.getMainJITDylib();\\n- if (auto Err = J.addLLVMIRModule(\\n+ auto MainJD = LLJITInstance.getMainJITDylib();\\n+ if (auto Err = LLJITInstance.addLLVMIRModule(\\n MainJD, OrcThreadSafeModule(LLModule.release(), TSContext))) {\\n- spdlog::error(\\\"{}\\\"sv, Err.message().string_view());\\n+ spdlog::error(\\\"failed to add LLVM IR module: {}\\\"sv,\\n+ Err.message().string_view());\\n return Unexpect(ErrCode::Value::HostFuncError);\\n }\\n \\n- return std::make_shared<JITLibrary>(std::move(J));\\n+ return std::make_shared<JITLibrary>(\\n+ std::make_shared<OrcLLJIT>(std::move(LLJITInstance)),\\n+ std::string(D.getPrefix()), IsLazy);\\n+}\\n+\\n+Expect<std::vector<WasmFunctionCodeAddress>>\\n+JIT::add(JITLibrary &Lib, Data &D,\\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\\n+ if (GlobalFuncIndices.empty()) {\\n+ spdlog::error(\\\"JIT::add: empty function index list\\\"sv);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ auto &LLModule = D.extract().LLModule;\\n+ auto &TSContext = D.extract().getTSContext();\\n+\\n+ auto JD = Lib.J->getMainJITDylib();\\n+ auto RT = JD.createResourceTracker();\\n+ if (!RT) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to create resource tracker\\\"sv);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ if (auto Err = Lib.J->addLLVMIRModuleWithRT(\\n+ RT, OrcThreadSafeModule(LLModule.release(), TSContext))) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to add LLVM IR module: {}\\\"sv,\\n+ Err.message().string_view());\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ std::vector<WasmFunctionCodeAddress> Addresses;\\n+ Addresses.reserve(GlobalFuncIndices.size());\\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\\n+ const std::string SymName =\\n+ fmt::format(\\\"{}f{}\\\"sv, D.getPrefix(), GlobalFuncIndex);\\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\\n+ if (!AddrOrErr) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to lookup function symbol {}: {}\\\"sv,\\n+ SymName, errorToString(std::move(AddrOrErr.error())));\\n+ if (auto RemoveErr = RT.remove()) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to remove failed module from tracker: {}\\\"sv,\\n+ RemoveErr.message().string_view());\\n+ }\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+ Addresses.push_back(*AddrOrErr);\\n+ }\\n+ return Addresses;\\n+}\\n+\\n+Expect<std::vector<WasmFunctionCodeAddress>> JIT::lookupWasmFunctionSymbols(\\n+ JITLibrary &Lib, std::string_view Prefix,\\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\\n+ std::vector<WasmFunctionCodeAddress> Addresses;\\n+ Addresses.reserve(GlobalFuncIndices.size());\\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\\n+ const std::string SymName = fmt::format(\\\"{}f{}\\\"sv, Prefix, GlobalFuncIndex);\\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\\n+ if (!AddrOrErr) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to lookup function symbol {}: {}\\\"sv,\\n+ SymName, errorToString(std::move(AddrOrErr.error())));\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+ Addresses.push_back(*AddrOrErr);\\n+ }\\n+ return Addresses;\\n }\\n } // namespace WasmEdge::LLVM\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13289,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"Once you use `static_cast`, this check will always be true, which means it does nothing."},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/lib/llvm/jit.cpp b/lib/llvm/jit.cpp\nindex 4bf3cc80386a..f0afb693f598 100644\n--- a/lib/llvm/jit.cpp\n+++ b/lib/llvm/jit.cpp\n@@ -2,29 +2,96 @@\n // SPDX-FileCopyrightText: 2019-2024 Second State INC\n \n #include \"llvm/jit.h\"\n-#include \"common/spdlog.h\"\n \n #include \"data.h\"\n #include \"llvm.h\"\n+#include \"spdlog/spdlog.h\"\n+\n+#include <mutex>\n+\n+#include <fmt/format.h>\n \n namespace LLVM = WasmEdge::LLVM;\n using namespace std::literals;\n \n-namespace WasmEdge::LLVM {\n+namespace {\n+\n+std::string errorToString(LLVM::Error &&E) noexcept {\n+ auto Msg = E.message();\n+ return std::string(Msg.string_view());\n+}\n+\n+static WasmEdge::Expect<LLVM::OrcLLJIT> createTunedLazyLLJIT() noexcept {\n+ LLVMOrcLLJITBuilderRef Builder = LLVM::OrcLLJIT::getBuilder();\n+ if (!Builder) {\n+ Builder = LLVMOrcCreateLLJITBuilder();\n+ }\n+\n+ LLVMTargetRef TheTarget = nullptr;\n+ LLVM::Message Triple(LLVMGetDefaultTargetTriple());\n+ char *TripleErr = nullptr;\n+ if (LLVMGetTargetFromTriple(Triple.string_view().data(), &TheTarget,\n+ &TripleErr)) {\n+ spdlog::error(\"[lazy-jit]: getTargetFromTriple failed: {}\"sv,\n+ TripleErr ? TripleErr : \"\");\n+ LLVMDisposeMessage(TripleErr);\n+ LLVMOrcDisposeLLJITBuilder(Builder);\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ LLVM::Message CPU(LLVMGetHostCPUName());\n+ LLVM::Message Features(LLVMGetHostCPUFeatures());\n+\n+ // LLVMCodeGenLevelNone is used deliberately here as a performance trade-off.\n+ // ORC's IRCompileLayer inherits the codegen optimisation level from this\n+ // target machine and applies it during every lazy materialisation.\n+ // Note that this codegen level is independent of the optimisation\n+ // level passed through WasmEdge::Configure, which governs the\n+ // IR compilation step, this setting only controls the ORC materialisation\n+ // pipeline for lazy JIT.\n+ LLVMTargetMachineRef TM = LLVMCreateTargetMachine(\n+ TheTarget, Triple.string_view().data(), CPU.string_view().data(),\n+ Features.string_view().data(), LLVMCodeGenLevelNone, LLVMRelocDefault,\n+ LLVMCodeModelJITDefault);\n+\n+ if (!TM) {\n+ spdlog::error(\"[lazy-jit]: createTargetMachine failed\"sv);\n+ LLVMOrcDisposeLLJITBuilder(Builder);\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n \n-JITLibrary::JITLibrary(OrcLLJIT JIT) noexcept\n- : J(std::make_unique<OrcLLJIT>(std::move(JIT)).release()) {}\n+ LLVMOrcJITTargetMachineBuilderRef JTMB =\n+ LLVMOrcJITTargetMachineBuilderCreateFromTargetMachine(TM);\n+ LLVMOrcLLJITBuilderSetJITTargetMachineBuilder(Builder, JTMB);\n \n-JITLibrary::~JITLibrary() noexcept {\n- std::unique_ptr<OrcLLJIT> JIT(std::exchange(J, nullptr));\n+ LLVM::OrcLLJIT Result;\n+ if (LLVMErrorRef CreateErr = LLVMOrcCreateLLJIT(&Result.unwrap(), Builder)) {\n+ LLVM::ErrorMessage Msg(LLVMGetErrorMessage(CreateErr));\n+ spdlog::error(\"[lazy-jit]: LLVMOrcCreateLLJIT failed: {}\"sv,\n+ Msg.string_view());\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n+ return Result;\n }\n \n+} // namespace\n+\n+namespace WasmEdge::LLVM {\n+\n+JITLibrary::JITLibrary(std::shared_ptr<LLVM::OrcLLJIT> JIT, std::string P,\n+ bool IsLazy) noexcept\n+ : J(std::move(JIT)), Prefix(std::move(P)), IsLazy(IsLazy) {}\n+\n+JITLibrary::~JITLibrary() noexcept {}\n+\n Symbol<const Executable::IntrinsicsTable *>\n JITLibrary::getIntrinsics() noexcept {\n- if (auto Symbol = J->lookup<const IntrinsicsTable *>(\"intrinsics\")) {\n+ if (auto Symbol = J->lookup<const IntrinsicsTable *>(\n+ fmt::format(\"{}intrinsics\"sv, Prefix).c_str())) {\n return createSymbol<const IntrinsicsTable *>(*Symbol);\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ spdlog::error(\"[lazy-jit]: failed to lookup intrinsics symbol: {}\"sv,\n+ errorToString(std::move(Symbol.error())));\n return {};\n }\n }\n@@ -34,11 +101,12 @@ JITLibrary::getTypes(size_t Size) noexcept {\n std::vector<Symbol<Wrapper>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size; ++I) {\n- const std::string Name = fmt::format(\"t{}\"sv, I);\n+ const std::string Name = fmt::format(\"{}t{}\"sv, Prefix, I);\n if (auto Symbol = J->lookup<Wrapper>(Name.c_str())) {\n Result.push_back(createSymbol<Wrapper>(*Symbol));\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ spdlog::error(\"[lazy-jit]: failed to lookup table symbol {}: {}\"sv, Name,\n+ errorToString(std::move(Symbol.error())));\n Result.emplace_back();\n }\n }\n@@ -51,11 +119,25 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n std::vector<Symbol<void>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size; ++I) {\n- const std::string Name = fmt::format(\"f{}\"sv, I + Offset);\n- if (auto Symbol = J->lookup<void>(Name.c_str())) {\n- Result.push_back(createSymbol<void>(*Symbol));\n+ const std::string Name = fmt::format(\"{}f{}\"sv, Prefix, I + Offset);\n+ void *Addr = nullptr;\n+ auto AddrOrErr = J->lookup<void *>(Name.c_str());\n+ if (AddrOrErr) {\n+ Addr = *AddrOrErr;\n+ } else {\n+ auto ErrMsg = errorToString(std::move(AddrOrErr.error()));\n+ // consuming only symbol not found errors for lazy-jit\n+ if (!IsLazy || ErrMsg.find(\"Symbols not found\"sv) == std::string::npos) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ Name, ErrMsg);\n+ }\n+ }\n+ if (Addr) {\n+ Result.push_back(createSymbol<void>(Addr));\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ if (IsLazy) {\n+ spdlog::debug(\"[lazy-jit]: function {} not yet compiled\"sv, I + Offset);\n+ }\n Result.emplace_back();\n }\n }\n@@ -63,31 +145,109 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n return Result;\n }\n \n-Expect<std::shared_ptr<Executable>> JIT::load(Data D) noexcept {\n- OrcLLJIT J;\n- if (auto Res = OrcLLJIT::create(); !Res) {\n- spdlog::error(\"{}\"sv, Res.error().message().string_view());\n- return Unexpect(ErrCode::Value::HostFuncError);\n+Expect<std::shared_ptr<Executable>> JIT::load(Data &D, bool IsLazy) noexcept {\n+ OrcLLJIT LLJITInstance;\n+ if (IsLazy) {\n+ auto R = createTunedLazyLLJIT();\n+ if (!R) {\n+ spdlog::error(\"[lazy-jit]: failed to create LLJIT\"sv);\n+ return Unexpect(R.error());\n+ }\n+ LLJITInstance = std::move(*R);\n } else {\n- J = std::move(*Res);\n+ auto R = OrcLLJIT::create();\n+ if (!R) {\n+ spdlog::error(\"failed to create LLJIT: {}\"sv,\n+ R.error().message().string_view());\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+ LLJITInstance = std::move(*R);\n }\n \n auto &LLModule = D.extract().LLModule;\n- auto TSContext = D.extract().getTSContext();\n+ auto &TSContext = D.extract().getTSContext();\n \n if (Conf.getCompilerConfigure().isDumpIR()) {\n- if (auto ErrorMessage = LLModule.printModuleToFile(\"wasm-jit.ll\")) {\n+ const auto *Filename = IsLazy ? \"wasm-lazy-jit.ll\" : \"wasm-jit.ll\";\n+ if (auto ErrorMessage = LLModule.printModuleToFile(Filename)) {\n spdlog::error(\"printModuleToFile failed\"sv);\n }\n }\n \n- auto MainJD = J.getMainJITDylib();\n- if (auto Err = J.addLLVMIRModule(\n+ auto MainJD = LLJITInstance.getMainJITDylib();\n+ if (auto Err = LLJITInstance.addLLVMIRModule(\n MainJD, OrcThreadSafeModule(LLModule.release(), TSContext))) {\n- spdlog::error(\"{}\"sv, Err.message().string_view());\n+ spdlog::error(\"failed to add LLVM IR module: {}\"sv,\n+ Err.message().string_view());\n return Unexpect(ErrCode::Value::HostFuncError);\n }\n \n- return std::make_shared<JITLibrary>(std::move(J));\n+ return std::make_shared<JITLibrary>(\n+ std::make_shared<OrcLLJIT>(std::move(LLJITInstance)),\n+ std::string(D.getPrefix()), IsLazy);\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>>\n+JIT::add(JITLibrary &Lib, Data &D,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ if (GlobalFuncIndices.empty()) {\n+ spdlog::error(\"JIT::add: empty function index list\"sv);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ auto &LLModule = D.extract().LLModule;\n+ auto &TSContext = D.extract().getTSContext();\n+\n+ auto JD = Lib.J->getMainJITDylib();\n+ auto RT = JD.createResourceTracker();\n+ if (!RT) {\n+ spdlog::error(\"[lazy-jit]: failed to create resource tracker\"sv);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto Err = Lib.J->addLLVMIRModuleWithRT(\n+ RT, OrcThreadSafeModule(LLModule.release(), TSContext))) {\n+ spdlog::error(\"[lazy-jit]: failed to add LLVM IR module: {}\"sv,\n+ Err.message().string_view());\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ std::vector<WasmFunctionCodeAddress> Addresses;\n+ Addresses.reserve(GlobalFuncIndices.size());\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\n+ const std::string SymName =\n+ fmt::format(\"{}f{}\"sv, D.getPrefix(), GlobalFuncIndex);\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\n+ if (!AddrOrErr) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ SymName, errorToString(std::move(AddrOrErr.error())));\n+ if (auto RemoveErr = RT.remove()) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to remove failed module from tracker: {}\"sv,\n+ RemoveErr.message().string_view());\n+ }\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+ Addresses.push_back(*AddrOrErr);\n+ }\n+ return Addresses;\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>> JIT::lookupWasmFunctionSymbols(\n+ JITLibrary &Lib, std::string_view Prefix,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ std::vector<WasmFunctionCodeAddress> Addresses;\n+ Addresses.reserve(GlobalFuncIndices.size());\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\n+ const std::string SymName = fmt::format(\"{}f{}\"sv, Prefix, GlobalFuncIndex);\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\n+ if (!AddrOrErr) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ SymName, errorToString(std::move(AddrOrErr.error())));\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+ Addresses.push_back(*AddrOrErr);\n+ }\n+ return Addresses;\n }\n } // namespace WasmEdge::LLVM\n"},"changed_files":{"kind":"list like","value":["lib/llvm/jit.cpp"],"string":"[\n \"lib/llvm/jit.cpp\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"Once you use `static_cast`, this check will always be true, which means it does nothing.","path":"lib/llvm/jit.cpp","hunk":"@@ -51,43 +125,144 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n std::vector<Symbol<void>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size; ++I) {\n- const std::string Name = fmt::format(\"f{}\"sv, I + Offset);\n- if (auto Symbol = J->lookup<void>(Name.c_str())) {\n- Result.push_back(createSymbol<void>(*Symbol));\n+ const std::string Name = fmt::format(\"{}f{}\"sv, Prefix, I + Offset);\n+ void *Addr = nullptr;\n+ auto AddrOrErr = J->lookup<void *>(Name.c_str());\n+ if (AddrOrErr) {\n+ Addr = *AddrOrErr;\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ if (!IsLazy) {\n+ spdlog::error(\"{}\"sv, errorToString(std::move(AddrOrErr.error())));\n+ } else {\n+ // Just consume the error if it's lazy (it might not be compiled yet)\n+ (void)AddrOrErr.error();\n+ }\n+ }\n+ if (Addr) {\n+ Result.push_back(createSymbol<void>(Addr));\n+ } else {\n+ if (IsLazy) {\n+ spdlog::debug(\"[lazy-jit]: function {} not yet compiled\"sv, I + Offset);\n+ }\n Result.emplace_back();\n }\n }\n \n return Result;\n }\n \n-Expect<std::shared_ptr<Executable>> JIT::load(Data D) noexcept {\n- OrcLLJIT J;\n- if (auto Res = OrcLLJIT::create(); !Res) {\n- spdlog::error(\"{}\"sv, Res.error().message().string_view());\n- return Unexpect(ErrCode::Value::HostFuncError);\n+Expect<std::shared_ptr<Executable>> JIT::load(Data &D, bool IsLazy) noexcept {\n+ OrcLLJIT LLJITInstance;\n+ if (IsLazy) {\n+ auto R = createTunedLazyLLJIT();\n+ if (!R) {\n+ spdlog::error(\"[lazy-jit]: failed to create LLJIT\"sv);\n+ return Unexpect(R.error());\n+ }\n+ LLJITInstance = std::move(*R);\n } else {\n- J = std::move(*Res);\n+ auto R = OrcLLJIT::create();\n+ if (!R) {\n+ spdlog::error(\"{}\"sv, R.error().message().string_view());\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+ LLJITInstance = std::move(*R);\n }\n \n auto &LLModule = D.extract().LLModule;\n- auto TSContext = D.extract().getTSContext();\n+ auto &TSContext = D.extract().getTSContext();\n \n if (Conf.getCompilerConfigure().isDumpIR()) {\n- if (auto ErrorMessage = LLModule.printModuleToFile(\"wasm-jit.ll\")) {\n+ const auto *Filename = IsLazy ? \"wasm-lazy-jit.ll\" : \"wasm-jit.ll\";\n+ if (auto ErrorMessage = LLModule.printModuleToFile(Filename)) {\n spdlog::error(\"printModuleToFile failed\"sv);\n }\n }\n \n- auto MainJD = J.getMainJITDylib();\n- if (auto Err = J.addLLVMIRModule(\n+ auto MainJD = LLJITInstance.getMainJITDylib();\n+ if (auto Err = LLJITInstance.addLLVMIRModule(\n MainJD, OrcThreadSafeModule(LLModule.release(), TSContext))) {\n spdlog::error(\"{}\"sv, Err.message().string_view());\n return Unexpect(ErrCode::Value::HostFuncError);\n }\n \n- return std::make_shared<JITLibrary>(std::move(J));\n+ return std::make_shared<JITLibrary>(\n+ std::make_shared<OrcLLJIT>(std::move(LLJITInstance)),\n+ std::string(D.getPrefix()), IsLazy);\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>>\n+JIT::add(Executable &Exec, Data &D,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ auto *Lib = static_cast<JITLibrary *>(&Exec);\n+ if (!Lib) {\n+ spdlog::error(\"JIT::add: executable is not a JITLibrary\"sv);\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+ if (GlobalFuncIndices.empty()) {\n+ spdlog::error(\"JIT::add: empty function index list\"sv);\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+\n+ std::lock_guard<std::mutex> Lock(Lib->LazyAddMutex);\n+ auto &LLModule = D.extract().LLModule;\n+ auto &TSContext = D.extract().getTSContext();\n+\n+ LLVMOrcJITDylibRef MainJDRef = LLVMOrcLLJITGetMainJITDylib(Lib->J->unwrap());\n+\n+ if (auto Err = Lib->J->addLLVMIRModule(\n+ OrcJITDylib(MainJDRef),\n+ OrcThreadSafeModule(LLModule.release(), TSContext))) {\n+ spdlog::error(\"{}\"sv, Err.message().string_view());\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+\n+ std::vector<WasmFunctionCodeAddress> Addresses;\n+ Addresses.reserve(GlobalFuncIndices.size());\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\n+ const std::string SymName =\n+ fmt::format(\"{}f{}\"sv, D.getPrefix(), GlobalFuncIndex);\n+ auto AddrOrErr = Lib->J->lookup<void *>(SymName.c_str());\n+ if (!AddrOrErr) {\n+ spdlog::error(\"{}\"sv, errorToString(std::move(AddrOrErr.error())));\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+ Addresses.push_back(*AddrOrErr);\n+ }\n+ return Addresses;\n+}\n+\n+Expect<WasmFunctionCodeAddress> JIT::add(Executable &Exec, Data &D,\n+ uint32_t GlobalFuncIndex) noexcept {\n+ const uint32_t One[1] = {GlobalFuncIndex};\n+ auto Batch = add(Exec, D, Span<const uint32_t>(One, 1));\n+ if (!Batch) {\n+ return Unexpect(Batch.error());\n+ }\n+ return (*Batch)[0];\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>> JIT::lookupWasmFunctionSymbols(\n+ Executable &Exec, std::string_view Prefix,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ auto *Lib = static_cast<JITLibrary *>(&Exec);\n+ if (!Lib) {","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/lib/llvm/jit.cpp b/lib/llvm/jit.cpp\nindex 4bf3cc80386a..f0afb693f598 100644\n--- a/lib/llvm/jit.cpp\n+++ b/lib/llvm/jit.cpp\n@@ -2,29 +2,96 @@\n // SPDX-FileCopyrightText: 2019-2024 Second State INC\n \n #include \"llvm/jit.h\"\n-#include \"common/spdlog.h\"\n \n #include \"data.h\"\n #include \"llvm.h\"\n+#include \"spdlog/spdlog.h\"\n+\n+#include <mutex>\n+\n+#include <fmt/format.h>\n \n namespace LLVM = WasmEdge::LLVM;\n using namespace std::literals;\n \n-namespace WasmEdge::LLVM {\n+namespace {\n+\n+std::string errorToString(LLVM::Error &&E) noexcept {\n+ auto Msg = E.message();\n+ return std::string(Msg.string_view());\n+}\n+\n+static WasmEdge::Expect<LLVM::OrcLLJIT> createTunedLazyLLJIT() noexcept {\n+ LLVMOrcLLJITBuilderRef Builder = LLVM::OrcLLJIT::getBuilder();\n+ if (!Builder) {\n+ Builder = LLVMOrcCreateLLJITBuilder();\n+ }\n+\n+ LLVMTargetRef TheTarget = nullptr;\n+ LLVM::Message Triple(LLVMGetDefaultTargetTriple());\n+ char *TripleErr = nullptr;\n+ if (LLVMGetTargetFromTriple(Triple.string_view().data(), &TheTarget,\n+ &TripleErr)) {\n+ spdlog::error(\"[lazy-jit]: getTargetFromTriple failed: {}\"sv,\n+ TripleErr ? TripleErr : \"\");\n+ LLVMDisposeMessage(TripleErr);\n+ LLVMOrcDisposeLLJITBuilder(Builder);\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ LLVM::Message CPU(LLVMGetHostCPUName());\n+ LLVM::Message Features(LLVMGetHostCPUFeatures());\n+\n+ // LLVMCodeGenLevelNone is used deliberately here as a performance trade-off.\n+ // ORC's IRCompileLayer inherits the codegen optimisation level from this\n+ // target machine and applies it during every lazy materialisation.\n+ // Note that this codegen level is independent of the optimisation\n+ // level passed through WasmEdge::Configure, which governs the\n+ // IR compilation step, this setting only controls the ORC materialisation\n+ // pipeline for lazy JIT.\n+ LLVMTargetMachineRef TM = LLVMCreateTargetMachine(\n+ TheTarget, Triple.string_view().data(), CPU.string_view().data(),\n+ Features.string_view().data(), LLVMCodeGenLevelNone, LLVMRelocDefault,\n+ LLVMCodeModelJITDefault);\n+\n+ if (!TM) {\n+ spdlog::error(\"[lazy-jit]: createTargetMachine failed\"sv);\n+ LLVMOrcDisposeLLJITBuilder(Builder);\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n \n-JITLibrary::JITLibrary(OrcLLJIT JIT) noexcept\n- : J(std::make_unique<OrcLLJIT>(std::move(JIT)).release()) {}\n+ LLVMOrcJITTargetMachineBuilderRef JTMB =\n+ LLVMOrcJITTargetMachineBuilderCreateFromTargetMachine(TM);\n+ LLVMOrcLLJITBuilderSetJITTargetMachineBuilder(Builder, JTMB);\n \n-JITLibrary::~JITLibrary() noexcept {\n- std::unique_ptr<OrcLLJIT> JIT(std::exchange(J, nullptr));\n+ LLVM::OrcLLJIT Result;\n+ if (LLVMErrorRef CreateErr = LLVMOrcCreateLLJIT(&Result.unwrap(), Builder)) {\n+ LLVM::ErrorMessage Msg(LLVMGetErrorMessage(CreateErr));\n+ spdlog::error(\"[lazy-jit]: LLVMOrcCreateLLJIT failed: {}\"sv,\n+ Msg.string_view());\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\n+ }\n+ return Result;\n }\n \n+} // namespace\n+\n+namespace WasmEdge::LLVM {\n+\n+JITLibrary::JITLibrary(std::shared_ptr<LLVM::OrcLLJIT> JIT, std::string P,\n+ bool IsLazy) noexcept\n+ : J(std::move(JIT)), Prefix(std::move(P)), IsLazy(IsLazy) {}\n+\n+JITLibrary::~JITLibrary() noexcept {}\n+\n Symbol<const Executable::IntrinsicsTable *>\n JITLibrary::getIntrinsics() noexcept {\n- if (auto Symbol = J->lookup<const IntrinsicsTable *>(\"intrinsics\")) {\n+ if (auto Symbol = J->lookup<const IntrinsicsTable *>(\n+ fmt::format(\"{}intrinsics\"sv, Prefix).c_str())) {\n return createSymbol<const IntrinsicsTable *>(*Symbol);\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ spdlog::error(\"[lazy-jit]: failed to lookup intrinsics symbol: {}\"sv,\n+ errorToString(std::move(Symbol.error())));\n return {};\n }\n }\n@@ -34,11 +101,12 @@ JITLibrary::getTypes(size_t Size) noexcept {\n std::vector<Symbol<Wrapper>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size; ++I) {\n- const std::string Name = fmt::format(\"t{}\"sv, I);\n+ const std::string Name = fmt::format(\"{}t{}\"sv, Prefix, I);\n if (auto Symbol = J->lookup<Wrapper>(Name.c_str())) {\n Result.push_back(createSymbol<Wrapper>(*Symbol));\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ spdlog::error(\"[lazy-jit]: failed to lookup table symbol {}: {}\"sv, Name,\n+ errorToString(std::move(Symbol.error())));\n Result.emplace_back();\n }\n }\n@@ -51,11 +119,25 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n std::vector<Symbol<void>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size; ++I) {\n- const std::string Name = fmt::format(\"f{}\"sv, I + Offset);\n- if (auto Symbol = J->lookup<void>(Name.c_str())) {\n- Result.push_back(createSymbol<void>(*Symbol));\n+ const std::string Name = fmt::format(\"{}f{}\"sv, Prefix, I + Offset);\n+ void *Addr = nullptr;\n+ auto AddrOrErr = J->lookup<void *>(Name.c_str());\n+ if (AddrOrErr) {\n+ Addr = *AddrOrErr;\n+ } else {\n+ auto ErrMsg = errorToString(std::move(AddrOrErr.error()));\n+ // consuming only symbol not found errors for lazy-jit\n+ if (!IsLazy || ErrMsg.find(\"Symbols not found\"sv) == std::string::npos) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ Name, ErrMsg);\n+ }\n+ }\n+ if (Addr) {\n+ Result.push_back(createSymbol<void>(Addr));\n } else {\n- spdlog::error(\"{}\"sv, Symbol.error().message().string_view());\n+ if (IsLazy) {\n+ spdlog::debug(\"[lazy-jit]: function {} not yet compiled\"sv, I + Offset);\n+ }\n Result.emplace_back();\n }\n }\n@@ -63,31 +145,109 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n return Result;\n }\n \n-Expect<std::shared_ptr<Executable>> JIT::load(Data D) noexcept {\n- OrcLLJIT J;\n- if (auto Res = OrcLLJIT::create(); !Res) {\n- spdlog::error(\"{}\"sv, Res.error().message().string_view());\n- return Unexpect(ErrCode::Value::HostFuncError);\n+Expect<std::shared_ptr<Executable>> JIT::load(Data &D, bool IsLazy) noexcept {\n+ OrcLLJIT LLJITInstance;\n+ if (IsLazy) {\n+ auto R = createTunedLazyLLJIT();\n+ if (!R) {\n+ spdlog::error(\"[lazy-jit]: failed to create LLJIT\"sv);\n+ return Unexpect(R.error());\n+ }\n+ LLJITInstance = std::move(*R);\n } else {\n- J = std::move(*Res);\n+ auto R = OrcLLJIT::create();\n+ if (!R) {\n+ spdlog::error(\"failed to create LLJIT: {}\"sv,\n+ R.error().message().string_view());\n+ return Unexpect(ErrCode::Value::HostFuncError);\n+ }\n+ LLJITInstance = std::move(*R);\n }\n \n auto &LLModule = D.extract().LLModule;\n- auto TSContext = D.extract().getTSContext();\n+ auto &TSContext = D.extract().getTSContext();\n \n if (Conf.getCompilerConfigure().isDumpIR()) {\n- if (auto ErrorMessage = LLModule.printModuleToFile(\"wasm-jit.ll\")) {\n+ const auto *Filename = IsLazy ? \"wasm-lazy-jit.ll\" : \"wasm-jit.ll\";\n+ if (auto ErrorMessage = LLModule.printModuleToFile(Filename)) {\n spdlog::error(\"printModuleToFile failed\"sv);\n }\n }\n \n- auto MainJD = J.getMainJITDylib();\n- if (auto Err = J.addLLVMIRModule(\n+ auto MainJD = LLJITInstance.getMainJITDylib();\n+ if (auto Err = LLJITInstance.addLLVMIRModule(\n MainJD, OrcThreadSafeModule(LLModule.release(), TSContext))) {\n- spdlog::error(\"{}\"sv, Err.message().string_view());\n+ spdlog::error(\"failed to add LLVM IR module: {}\"sv,\n+ Err.message().string_view());\n return Unexpect(ErrCode::Value::HostFuncError);\n }\n \n- return std::make_shared<JITLibrary>(std::move(J));\n+ return std::make_shared<JITLibrary>(\n+ std::make_shared<OrcLLJIT>(std::move(LLJITInstance)),\n+ std::string(D.getPrefix()), IsLazy);\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>>\n+JIT::add(JITLibrary &Lib, Data &D,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ if (GlobalFuncIndices.empty()) {\n+ spdlog::error(\"JIT::add: empty function index list\"sv);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ auto &LLModule = D.extract().LLModule;\n+ auto &TSContext = D.extract().getTSContext();\n+\n+ auto JD = Lib.J->getMainJITDylib();\n+ auto RT = JD.createResourceTracker();\n+ if (!RT) {\n+ spdlog::error(\"[lazy-jit]: failed to create resource tracker\"sv);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto Err = Lib.J->addLLVMIRModuleWithRT(\n+ RT, OrcThreadSafeModule(LLModule.release(), TSContext))) {\n+ spdlog::error(\"[lazy-jit]: failed to add LLVM IR module: {}\"sv,\n+ Err.message().string_view());\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ std::vector<WasmFunctionCodeAddress> Addresses;\n+ Addresses.reserve(GlobalFuncIndices.size());\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\n+ const std::string SymName =\n+ fmt::format(\"{}f{}\"sv, D.getPrefix(), GlobalFuncIndex);\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\n+ if (!AddrOrErr) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ SymName, errorToString(std::move(AddrOrErr.error())));\n+ if (auto RemoveErr = RT.remove()) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to remove failed module from tracker: {}\"sv,\n+ RemoveErr.message().string_view());\n+ }\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+ Addresses.push_back(*AddrOrErr);\n+ }\n+ return Addresses;\n+}\n+\n+Expect<std::vector<WasmFunctionCodeAddress>> JIT::lookupWasmFunctionSymbols(\n+ JITLibrary &Lib, std::string_view Prefix,\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\n+ std::vector<WasmFunctionCodeAddress> Addresses;\n+ Addresses.reserve(GlobalFuncIndices.size());\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\n+ const std::string SymName = fmt::format(\"{}f{}\"sv, Prefix, GlobalFuncIndex);\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\n+ if (!AddrOrErr) {\n+ spdlog::error(\"[lazy-jit]: failed to lookup function symbol {}: {}\"sv,\n+ SymName, errorToString(std::move(AddrOrErr.error())));\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+ Addresses.push_back(*AddrOrErr);\n+ }\n+ return Addresses;\n }\n } // namespace WasmEdge::LLVM\n"}],"string":"[\n {\n \"comment\": \"Once you use `static_cast`, this check will always be true, which means it does nothing.\",\n \"path\": \"lib/llvm/jit.cpp\",\n \"hunk\": \"@@ -51,43 +125,144 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\\n std::vector<Symbol<void>> Result;\\n Result.reserve(Size);\\n for (size_t I = 0; I < Size; ++I) {\\n- const std::string Name = fmt::format(\\\"f{}\\\"sv, I + Offset);\\n- if (auto Symbol = J->lookup<void>(Name.c_str())) {\\n- Result.push_back(createSymbol<void>(*Symbol));\\n+ const std::string Name = fmt::format(\\\"{}f{}\\\"sv, Prefix, I + Offset);\\n+ void *Addr = nullptr;\\n+ auto AddrOrErr = J->lookup<void *>(Name.c_str());\\n+ if (AddrOrErr) {\\n+ Addr = *AddrOrErr;\\n } else {\\n- spdlog::error(\\\"{}\\\"sv, Symbol.error().message().string_view());\\n+ if (!IsLazy) {\\n+ spdlog::error(\\\"{}\\\"sv, errorToString(std::move(AddrOrErr.error())));\\n+ } else {\\n+ // Just consume the error if it's lazy (it might not be compiled yet)\\n+ (void)AddrOrErr.error();\\n+ }\\n+ }\\n+ if (Addr) {\\n+ Result.push_back(createSymbol<void>(Addr));\\n+ } else {\\n+ if (IsLazy) {\\n+ spdlog::debug(\\\"[lazy-jit]: function {} not yet compiled\\\"sv, I + Offset);\\n+ }\\n Result.emplace_back();\\n }\\n }\\n \\n return Result;\\n }\\n \\n-Expect<std::shared_ptr<Executable>> JIT::load(Data D) noexcept {\\n- OrcLLJIT J;\\n- if (auto Res = OrcLLJIT::create(); !Res) {\\n- spdlog::error(\\\"{}\\\"sv, Res.error().message().string_view());\\n- return Unexpect(ErrCode::Value::HostFuncError);\\n+Expect<std::shared_ptr<Executable>> JIT::load(Data &D, bool IsLazy) noexcept {\\n+ OrcLLJIT LLJITInstance;\\n+ if (IsLazy) {\\n+ auto R = createTunedLazyLLJIT();\\n+ if (!R) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to create LLJIT\\\"sv);\\n+ return Unexpect(R.error());\\n+ }\\n+ LLJITInstance = std::move(*R);\\n } else {\\n- J = std::move(*Res);\\n+ auto R = OrcLLJIT::create();\\n+ if (!R) {\\n+ spdlog::error(\\\"{}\\\"sv, R.error().message().string_view());\\n+ return Unexpect(ErrCode::Value::HostFuncError);\\n+ }\\n+ LLJITInstance = std::move(*R);\\n }\\n \\n auto &LLModule = D.extract().LLModule;\\n- auto TSContext = D.extract().getTSContext();\\n+ auto &TSContext = D.extract().getTSContext();\\n \\n if (Conf.getCompilerConfigure().isDumpIR()) {\\n- if (auto ErrorMessage = LLModule.printModuleToFile(\\\"wasm-jit.ll\\\")) {\\n+ const auto *Filename = IsLazy ? \\\"wasm-lazy-jit.ll\\\" : \\\"wasm-jit.ll\\\";\\n+ if (auto ErrorMessage = LLModule.printModuleToFile(Filename)) {\\n spdlog::error(\\\"printModuleToFile failed\\\"sv);\\n }\\n }\\n \\n- auto MainJD = J.getMainJITDylib();\\n- if (auto Err = J.addLLVMIRModule(\\n+ auto MainJD = LLJITInstance.getMainJITDylib();\\n+ if (auto Err = LLJITInstance.addLLVMIRModule(\\n MainJD, OrcThreadSafeModule(LLModule.release(), TSContext))) {\\n spdlog::error(\\\"{}\\\"sv, Err.message().string_view());\\n return Unexpect(ErrCode::Value::HostFuncError);\\n }\\n \\n- return std::make_shared<JITLibrary>(std::move(J));\\n+ return std::make_shared<JITLibrary>(\\n+ std::make_shared<OrcLLJIT>(std::move(LLJITInstance)),\\n+ std::string(D.getPrefix()), IsLazy);\\n+}\\n+\\n+Expect<std::vector<WasmFunctionCodeAddress>>\\n+JIT::add(Executable &Exec, Data &D,\\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\\n+ auto *Lib = static_cast<JITLibrary *>(&Exec);\\n+ if (!Lib) {\\n+ spdlog::error(\\\"JIT::add: executable is not a JITLibrary\\\"sv);\\n+ return Unexpect(ErrCode::Value::HostFuncError);\\n+ }\\n+ if (GlobalFuncIndices.empty()) {\\n+ spdlog::error(\\\"JIT::add: empty function index list\\\"sv);\\n+ return Unexpect(ErrCode::Value::HostFuncError);\\n+ }\\n+\\n+ std::lock_guard<std::mutex> Lock(Lib->LazyAddMutex);\\n+ auto &LLModule = D.extract().LLModule;\\n+ auto &TSContext = D.extract().getTSContext();\\n+\\n+ LLVMOrcJITDylibRef MainJDRef = LLVMOrcLLJITGetMainJITDylib(Lib->J->unwrap());\\n+\\n+ if (auto Err = Lib->J->addLLVMIRModule(\\n+ OrcJITDylib(MainJDRef),\\n+ OrcThreadSafeModule(LLModule.release(), TSContext))) {\\n+ spdlog::error(\\\"{}\\\"sv, Err.message().string_view());\\n+ return Unexpect(ErrCode::Value::HostFuncError);\\n+ }\\n+\\n+ std::vector<WasmFunctionCodeAddress> Addresses;\\n+ Addresses.reserve(GlobalFuncIndices.size());\\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\\n+ const std::string SymName =\\n+ fmt::format(\\\"{}f{}\\\"sv, D.getPrefix(), GlobalFuncIndex);\\n+ auto AddrOrErr = Lib->J->lookup<void *>(SymName.c_str());\\n+ if (!AddrOrErr) {\\n+ spdlog::error(\\\"{}\\\"sv, errorToString(std::move(AddrOrErr.error())));\\n+ return Unexpect(ErrCode::Value::HostFuncError);\\n+ }\\n+ Addresses.push_back(*AddrOrErr);\\n+ }\\n+ return Addresses;\\n+}\\n+\\n+Expect<WasmFunctionCodeAddress> JIT::add(Executable &Exec, Data &D,\\n+ uint32_t GlobalFuncIndex) noexcept {\\n+ const uint32_t One[1] = {GlobalFuncIndex};\\n+ auto Batch = add(Exec, D, Span<const uint32_t>(One, 1));\\n+ if (!Batch) {\\n+ return Unexpect(Batch.error());\\n+ }\\n+ return (*Batch)[0];\\n+}\\n+\\n+Expect<std::vector<WasmFunctionCodeAddress>> JIT::lookupWasmFunctionSymbols(\\n+ Executable &Exec, std::string_view Prefix,\\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\\n+ auto *Lib = static_cast<JITLibrary *>(&Exec);\\n+ if (!Lib) {\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/lib/llvm/jit.cpp b/lib/llvm/jit.cpp\\nindex 4bf3cc80386a..f0afb693f598 100644\\n--- a/lib/llvm/jit.cpp\\n+++ b/lib/llvm/jit.cpp\\n@@ -2,29 +2,96 @@\\n // SPDX-FileCopyrightText: 2019-2024 Second State INC\\n \\n #include \\\"llvm/jit.h\\\"\\n-#include \\\"common/spdlog.h\\\"\\n \\n #include \\\"data.h\\\"\\n #include \\\"llvm.h\\\"\\n+#include \\\"spdlog/spdlog.h\\\"\\n+\\n+#include <mutex>\\n+\\n+#include <fmt/format.h>\\n \\n namespace LLVM = WasmEdge::LLVM;\\n using namespace std::literals;\\n \\n-namespace WasmEdge::LLVM {\\n+namespace {\\n+\\n+std::string errorToString(LLVM::Error &&E) noexcept {\\n+ auto Msg = E.message();\\n+ return std::string(Msg.string_view());\\n+}\\n+\\n+static WasmEdge::Expect<LLVM::OrcLLJIT> createTunedLazyLLJIT() noexcept {\\n+ LLVMOrcLLJITBuilderRef Builder = LLVM::OrcLLJIT::getBuilder();\\n+ if (!Builder) {\\n+ Builder = LLVMOrcCreateLLJITBuilder();\\n+ }\\n+\\n+ LLVMTargetRef TheTarget = nullptr;\\n+ LLVM::Message Triple(LLVMGetDefaultTargetTriple());\\n+ char *TripleErr = nullptr;\\n+ if (LLVMGetTargetFromTriple(Triple.string_view().data(), &TheTarget,\\n+ &TripleErr)) {\\n+ spdlog::error(\\\"[lazy-jit]: getTargetFromTriple failed: {}\\\"sv,\\n+ TripleErr ? TripleErr : \\\"\\\");\\n+ LLVMDisposeMessage(TripleErr);\\n+ LLVMOrcDisposeLLJITBuilder(Builder);\\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ LLVM::Message CPU(LLVMGetHostCPUName());\\n+ LLVM::Message Features(LLVMGetHostCPUFeatures());\\n+\\n+ // LLVMCodeGenLevelNone is used deliberately here as a performance trade-off.\\n+ // ORC's IRCompileLayer inherits the codegen optimisation level from this\\n+ // target machine and applies it during every lazy materialisation.\\n+ // Note that this codegen level is independent of the optimisation\\n+ // level passed through WasmEdge::Configure, which governs the\\n+ // IR compilation step, this setting only controls the ORC materialisation\\n+ // pipeline for lazy JIT.\\n+ LLVMTargetMachineRef TM = LLVMCreateTargetMachine(\\n+ TheTarget, Triple.string_view().data(), CPU.string_view().data(),\\n+ Features.string_view().data(), LLVMCodeGenLevelNone, LLVMRelocDefault,\\n+ LLVMCodeModelJITDefault);\\n+\\n+ if (!TM) {\\n+ spdlog::error(\\\"[lazy-jit]: createTargetMachine failed\\\"sv);\\n+ LLVMOrcDisposeLLJITBuilder(Builder);\\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\\n+ }\\n \\n-JITLibrary::JITLibrary(OrcLLJIT JIT) noexcept\\n- : J(std::make_unique<OrcLLJIT>(std::move(JIT)).release()) {}\\n+ LLVMOrcJITTargetMachineBuilderRef JTMB =\\n+ LLVMOrcJITTargetMachineBuilderCreateFromTargetMachine(TM);\\n+ LLVMOrcLLJITBuilderSetJITTargetMachineBuilder(Builder, JTMB);\\n \\n-JITLibrary::~JITLibrary() noexcept {\\n- std::unique_ptr<OrcLLJIT> JIT(std::exchange(J, nullptr));\\n+ LLVM::OrcLLJIT Result;\\n+ if (LLVMErrorRef CreateErr = LLVMOrcCreateLLJIT(&Result.unwrap(), Builder)) {\\n+ LLVM::ErrorMessage Msg(LLVMGetErrorMessage(CreateErr));\\n+ spdlog::error(\\\"[lazy-jit]: LLVMOrcCreateLLJIT failed: {}\\\"sv,\\n+ Msg.string_view());\\n+ return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::LazyCompilationError);\\n+ }\\n+ return Result;\\n }\\n \\n+} // namespace\\n+\\n+namespace WasmEdge::LLVM {\\n+\\n+JITLibrary::JITLibrary(std::shared_ptr<LLVM::OrcLLJIT> JIT, std::string P,\\n+ bool IsLazy) noexcept\\n+ : J(std::move(JIT)), Prefix(std::move(P)), IsLazy(IsLazy) {}\\n+\\n+JITLibrary::~JITLibrary() noexcept {}\\n+\\n Symbol<const Executable::IntrinsicsTable *>\\n JITLibrary::getIntrinsics() noexcept {\\n- if (auto Symbol = J->lookup<const IntrinsicsTable *>(\\\"intrinsics\\\")) {\\n+ if (auto Symbol = J->lookup<const IntrinsicsTable *>(\\n+ fmt::format(\\\"{}intrinsics\\\"sv, Prefix).c_str())) {\\n return createSymbol<const IntrinsicsTable *>(*Symbol);\\n } else {\\n- spdlog::error(\\\"{}\\\"sv, Symbol.error().message().string_view());\\n+ spdlog::error(\\\"[lazy-jit]: failed to lookup intrinsics symbol: {}\\\"sv,\\n+ errorToString(std::move(Symbol.error())));\\n return {};\\n }\\n }\\n@@ -34,11 +101,12 @@ JITLibrary::getTypes(size_t Size) noexcept {\\n std::vector<Symbol<Wrapper>> Result;\\n Result.reserve(Size);\\n for (size_t I = 0; I < Size; ++I) {\\n- const std::string Name = fmt::format(\\\"t{}\\\"sv, I);\\n+ const std::string Name = fmt::format(\\\"{}t{}\\\"sv, Prefix, I);\\n if (auto Symbol = J->lookup<Wrapper>(Name.c_str())) {\\n Result.push_back(createSymbol<Wrapper>(*Symbol));\\n } else {\\n- spdlog::error(\\\"{}\\\"sv, Symbol.error().message().string_view());\\n+ spdlog::error(\\\"[lazy-jit]: failed to lookup table symbol {}: {}\\\"sv, Name,\\n+ errorToString(std::move(Symbol.error())));\\n Result.emplace_back();\\n }\\n }\\n@@ -51,11 +119,25 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\\n std::vector<Symbol<void>> Result;\\n Result.reserve(Size);\\n for (size_t I = 0; I < Size; ++I) {\\n- const std::string Name = fmt::format(\\\"f{}\\\"sv, I + Offset);\\n- if (auto Symbol = J->lookup<void>(Name.c_str())) {\\n- Result.push_back(createSymbol<void>(*Symbol));\\n+ const std::string Name = fmt::format(\\\"{}f{}\\\"sv, Prefix, I + Offset);\\n+ void *Addr = nullptr;\\n+ auto AddrOrErr = J->lookup<void *>(Name.c_str());\\n+ if (AddrOrErr) {\\n+ Addr = *AddrOrErr;\\n+ } else {\\n+ auto ErrMsg = errorToString(std::move(AddrOrErr.error()));\\n+ // consuming only symbol not found errors for lazy-jit\\n+ if (!IsLazy || ErrMsg.find(\\\"Symbols not found\\\"sv) == std::string::npos) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to lookup function symbol {}: {}\\\"sv,\\n+ Name, ErrMsg);\\n+ }\\n+ }\\n+ if (Addr) {\\n+ Result.push_back(createSymbol<void>(Addr));\\n } else {\\n- spdlog::error(\\\"{}\\\"sv, Symbol.error().message().string_view());\\n+ if (IsLazy) {\\n+ spdlog::debug(\\\"[lazy-jit]: function {} not yet compiled\\\"sv, I + Offset);\\n+ }\\n Result.emplace_back();\\n }\\n }\\n@@ -63,31 +145,109 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\\n return Result;\\n }\\n \\n-Expect<std::shared_ptr<Executable>> JIT::load(Data D) noexcept {\\n- OrcLLJIT J;\\n- if (auto Res = OrcLLJIT::create(); !Res) {\\n- spdlog::error(\\\"{}\\\"sv, Res.error().message().string_view());\\n- return Unexpect(ErrCode::Value::HostFuncError);\\n+Expect<std::shared_ptr<Executable>> JIT::load(Data &D, bool IsLazy) noexcept {\\n+ OrcLLJIT LLJITInstance;\\n+ if (IsLazy) {\\n+ auto R = createTunedLazyLLJIT();\\n+ if (!R) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to create LLJIT\\\"sv);\\n+ return Unexpect(R.error());\\n+ }\\n+ LLJITInstance = std::move(*R);\\n } else {\\n- J = std::move(*Res);\\n+ auto R = OrcLLJIT::create();\\n+ if (!R) {\\n+ spdlog::error(\\\"failed to create LLJIT: {}\\\"sv,\\n+ R.error().message().string_view());\\n+ return Unexpect(ErrCode::Value::HostFuncError);\\n+ }\\n+ LLJITInstance = std::move(*R);\\n }\\n \\n auto &LLModule = D.extract().LLModule;\\n- auto TSContext = D.extract().getTSContext();\\n+ auto &TSContext = D.extract().getTSContext();\\n \\n if (Conf.getCompilerConfigure().isDumpIR()) {\\n- if (auto ErrorMessage = LLModule.printModuleToFile(\\\"wasm-jit.ll\\\")) {\\n+ const auto *Filename = IsLazy ? \\\"wasm-lazy-jit.ll\\\" : \\\"wasm-jit.ll\\\";\\n+ if (auto ErrorMessage = LLModule.printModuleToFile(Filename)) {\\n spdlog::error(\\\"printModuleToFile failed\\\"sv);\\n }\\n }\\n \\n- auto MainJD = J.getMainJITDylib();\\n- if (auto Err = J.addLLVMIRModule(\\n+ auto MainJD = LLJITInstance.getMainJITDylib();\\n+ if (auto Err = LLJITInstance.addLLVMIRModule(\\n MainJD, OrcThreadSafeModule(LLModule.release(), TSContext))) {\\n- spdlog::error(\\\"{}\\\"sv, Err.message().string_view());\\n+ spdlog::error(\\\"failed to add LLVM IR module: {}\\\"sv,\\n+ Err.message().string_view());\\n return Unexpect(ErrCode::Value::HostFuncError);\\n }\\n \\n- return std::make_shared<JITLibrary>(std::move(J));\\n+ return std::make_shared<JITLibrary>(\\n+ std::make_shared<OrcLLJIT>(std::move(LLJITInstance)),\\n+ std::string(D.getPrefix()), IsLazy);\\n+}\\n+\\n+Expect<std::vector<WasmFunctionCodeAddress>>\\n+JIT::add(JITLibrary &Lib, Data &D,\\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\\n+ if (GlobalFuncIndices.empty()) {\\n+ spdlog::error(\\\"JIT::add: empty function index list\\\"sv);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ auto &LLModule = D.extract().LLModule;\\n+ auto &TSContext = D.extract().getTSContext();\\n+\\n+ auto JD = Lib.J->getMainJITDylib();\\n+ auto RT = JD.createResourceTracker();\\n+ if (!RT) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to create resource tracker\\\"sv);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ if (auto Err = Lib.J->addLLVMIRModuleWithRT(\\n+ RT, OrcThreadSafeModule(LLModule.release(), TSContext))) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to add LLVM IR module: {}\\\"sv,\\n+ Err.message().string_view());\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ std::vector<WasmFunctionCodeAddress> Addresses;\\n+ Addresses.reserve(GlobalFuncIndices.size());\\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\\n+ const std::string SymName =\\n+ fmt::format(\\\"{}f{}\\\"sv, D.getPrefix(), GlobalFuncIndex);\\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\\n+ if (!AddrOrErr) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to lookup function symbol {}: {}\\\"sv,\\n+ SymName, errorToString(std::move(AddrOrErr.error())));\\n+ if (auto RemoveErr = RT.remove()) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to remove failed module from tracker: {}\\\"sv,\\n+ RemoveErr.message().string_view());\\n+ }\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+ Addresses.push_back(*AddrOrErr);\\n+ }\\n+ return Addresses;\\n+}\\n+\\n+Expect<std::vector<WasmFunctionCodeAddress>> JIT::lookupWasmFunctionSymbols(\\n+ JITLibrary &Lib, std::string_view Prefix,\\n+ Span<const uint32_t> GlobalFuncIndices) noexcept {\\n+ std::vector<WasmFunctionCodeAddress> Addresses;\\n+ Addresses.reserve(GlobalFuncIndices.size());\\n+ for (uint32_t GlobalFuncIndex : GlobalFuncIndices) {\\n+ const std::string SymName = fmt::format(\\\"{}f{}\\\"sv, Prefix, GlobalFuncIndex);\\n+ auto AddrOrErr = Lib.J->lookup<void *>(SymName.c_str());\\n+ if (!AddrOrErr) {\\n+ spdlog::error(\\\"[lazy-jit]: failed to lookup function symbol {}: {}\\\"sv,\\n+ SymName, errorToString(std::move(AddrOrErr.error())));\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+ Addresses.push_back(*AddrOrErr);\\n+ }\\n+ return Addresses;\\n }\\n } // namespace WasmEdge::LLVM\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13290,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"This branch seems to be eager JIT.\nWhat's the reason that we need the LazyMutex and update the `Pending`?"},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\nindex 680d35094656..cf594a8be374 100644\n--- a/lib/vm/vm.cpp\n+++ b/lib/vm/vm.cpp\n@@ -3,7 +3,9 @@\n \n #include \"vm/vm.h\"\n \n+#include \"ast/instruction.h\"\n #include \"ast/module.h\"\n+#include \"common/enum_errcode.hpp\"\n #include \"common/errcode.h\"\n #include \"common/types.h\"\n #include \"host/wasi/wasimodule.h\"\n@@ -20,14 +22,71 @@\n #include \"host/mock/wasmedge_tensorflow_module.h\"\n #include \"host/mock/wasmedge_tensorflowlite_module.h\"\n #include \"validator/validator.h\"\n+#include <algorithm>\n+#include <cstddef>\n #include <memory>\n #include <variant>\n+#include <vector>\n+\n+#ifdef WASMEDGE_USE_LLVM\n+#include <llvm/IR/Module.h>\n+#endif\n \n namespace WasmEdge {\n namespace VM {\n \n namespace {\n \n+#ifdef WASMEDGE_USE_LLVM\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\n+ uint32_t ImportFuncCount,\n+ const std::unordered_set<uint32_t> &LazyCompiled,\n+ std::vector<uint32_t> &OutSortedLocals) {\n+ OutSortedLocals.clear();\n+ if (!ModulePtr) {\n+ return;\n+ }\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\n+\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\n+ return;\n+ }\n+\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\n+ std::vector<uint32_t> Stack;\n+ Stack.reserve(64);\n+\n+ Visited[LocalSeed] = 1;\n+ Stack.push_back(LocalSeed);\n+ OutSortedLocals.push_back(LocalSeed);\n+\n+ while (!Stack.empty()) {\n+ const uint32_t L = Stack.back();\n+ Stack.pop_back();\n+\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\n+ const auto Op = Instr.getOpCode();\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\n+ Op == OpCode::Ref__func) {\n+ const uint32_t Target = Instr.getTargetIndex();\n+ if (Target >= ImportFuncCount) {\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\n+ !LazyCompiled.count(LocalIdx)) {\n+ Visited[LocalIdx] = 1;\n+ Stack.push_back(LocalIdx);\n+ OutSortedLocals.push_back(LocalIdx);\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\n+}\n+#endif\n+\n template <typename T> struct VisitUnit {\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n \n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ spdlog::warn(\n+ \"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\"sv);\n+ ExecutorEngine.registerLazyCompilationCallback(\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\n+ return lazyCompileFunctions(ID, FuncIdx);\n+ });\n+ }\n+#endif\n+\n // Register all module instances.\n unsafeRegisterBuiltInHosts();\n unsafeRegisterPlugInHosts();\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Path));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Code));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+\n+ std::string ID = Module.getID();\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\n+ !Module.getSymbol()) {\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\n+ }\n+#endif\n+\n // Instantiate and register module.\n EXPECTED_TRY(auto ModInst,\n ExecutorEngine.registerModule(StoreRef, Module, Name));\n RegModInsts.push_back(std::move(ModInst));\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (State) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates.insert({ID, std::move(*State)});\n+ }\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ size_t InstIdx = RegModInsts.size() - 1;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ auto It = RegModMap.find(ID);\n+ if (It != RegModMap.end()) {\n+ It->second[1] = InstIdx;\n+ } else {\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\n+ }\n+ }\n+#endif\n+\n return {};\n }\n \n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\n }\n-\n if (Mod) {\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\n+ std::string ID = Mod->getID();\n+\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\n !Mod->getSymbol()) {\n #ifdef WASMEDGE_USE_LLVM\n- LLVM::Compiler Compiler(Conf);\n- Compiler.checkConfigure()\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&]() { return Compiler.compile(*Mod); })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compilation failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto LLModule) {\n- LLVM::JIT JIT(Conf);\n- return JIT.load(std::move(LLModule));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\n- \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto Module) {\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n- \"mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- });\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates[ID] = std::move(State);\n+ } else {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() { return Compiler.compile(*Mod); })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(LLModule);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Module) {\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n+ \"mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ });\n+ }\n #else\n spdlog::warn(\"JIT was requested but WasmEdge was built without LLVM, \"\n \"falling back to interpreter.\"sv);\n #endif\n }\n \n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ auto StateIt = LazyJITStates.find(ID);\n+ if (StateIt != LazyJITStates.end()) {\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ StateIt->second.ImportFuncCount =\n+ static_cast<uint32_t>(ImportFuncCount);\n+ StateIt->second.LazyCompiledFuncs.clear();\n+ }\n+ }\n+#endif\n+\n EXPECTED_TRY(ActiveModInst,\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\n+\n Stage = VMStage::Instantiated;\n return {};\n } else if (Comp) {\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\n Runtime::Instance::FunctionInstance *FuncInst =\n ModInst->findFuncExports(Func);\n \n+#ifdef WASMEDGE_USE_LLVM\n+ // lazy JIT: compile function on-demand if needed.\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\n+ bool NeedsCompile = false;\n+ uint32_t FuncIdx = UINT32_MAX;\n+ {\n+ std::shared_lock Lock(LazyJITMutex);\n+ if (FuncInst->isWasmFunction()) {\n+ NeedsCompile = true;\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\n+ FuncIdx = *Res;\n+ }\n+ }\n+ }\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\n+ !Result) {\n+ return Unexpect(Result.error());\n+ }\n+ }\n+ }\n+#endif\n+\n // Execute function.\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\n .map_error([&ModInst, &Func](auto E) {\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\n }\n StoreRef.reset();\n RegModInsts.clear();\n+ RegASTModules.clear();\n+ RegModMap.clear();\n Stat.clear();\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\n unsafeRegisterPlugInHosts();\n LoaderEngine.reset();\n Stage = VMStage::Inited;\n+#ifdef WASMEDGE_USE_LLVM\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\n+ // LLContexts.\n+ LazyJITStates.clear();\n+#endif\n }\n \n std::vector<std::pair<std::string, const AST::FunctionType &>>\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\n return nullptr;\n };\n \n+#ifdef WASMEDGE_USE_LLVM\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ uint32_t ImportFuncCount = 0;\n+ const AST::Module *ModulePtr = nullptr;\n+ LLVM::Data *LLDataPtr = nullptr;\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\n+ nullptr;\n+ LLVM::LazyJITState *StatePtr = nullptr;\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\n+\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\n+ ModInst = ActiveModInst.get();\n+ ModulePtr = Mod.get();\n+ } else {\n+ auto ItMap = RegModMap.find(ID);\n+ if (ItMap != RegModMap.end()) {\n+ ModInst = RegModInsts[ItMap->second[1]].get();\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\n+ }\n+ }\n+\n+ if (!ModInst || !ModulePtr) {\n+ return {};\n+ }\n+\n+ auto It = LazyJITStates.find(ID);\n+ if (It != LazyJITStates.end()) {\n+ StatePtr = &It->second;\n+ ImportFuncCount = StatePtr->ImportFuncCount;\n+ LLDataPtr = &StatePtr->LLData;\n+ LLContextPtr = &StatePtr->LLContext;\n+ } else {\n+ spdlog::error(\"[lazy-jit]: failed to find JIT state for ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ if (FuncIdx < ImportFuncCount) {\n+ return {};\n+ }\n+\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\n+\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\n+ if (!FuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ FuncIdx, ID);\n+ return Unexpect(FuncResult.error());\n+ }\n+ auto *FuncInst = *FuncResult;\n+\n+ // If already compiled or not a Wasm function, nothing to do.\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\n+ return {};\n+ }\n+\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\n+ return {};\n+ }\n+\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\n+ const std::unordered_set<uint32_t> &CompiledSet =\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\n+\n+ std::vector<uint32_t> BatchLocals;\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\n+ CompiledSet, BatchLocals);\n+ if (BatchLocals.empty()) {\n+ return {};\n+ }\n+\n+ spdlog::debug(\n+ \"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(), LocalFuncIdx, ID);\n+\n+ LLVM::Compiler Compiler(Conf);\n+ auto ConfigResult = Compiler.checkConfigure();\n+ if (!ConfigResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\"sv,\n+ ConfigResult.error(), ID);\n+ return Unexpect(ConfigResult.error());\n+ }\n+\n+ if (!LLDataPtr->hasModule()) {\n+ LLDataPtr->resetModule();\n+ }\n+ auto CompileResult = Compiler.compileFunctions(\n+ std::move(*LLDataPtr),\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\n+ *ModulePtr,\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\n+ if (!CompileResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\"sv,\n+ CompileResult.error(), ID);\n+ return Unexpect(CompileResult.error());\n+ }\n+\n+ *LLDataPtr = std::move(*CompileResult);\n+ LLVM::JIT JIT(Conf);\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\n+ if (StatePtr && StatePtr->JITLib) {\n+ JITLib = StatePtr->JITLib;\n+ }\n+\n+ std::vector<uint32_t> BatchGlobal;\n+ BatchGlobal.reserve(BatchLocals.size());\n+ for (uint32_t L : BatchLocals) {\n+ BatchGlobal.push_back(ImportFuncCount + L);\n+ }\n+\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\n+ if (JITLib) {\n+ auto AddrRes = JIT.add(\n+ *JITLib, *LLDataPtr,\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!AddrRes) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\"sv,\n+ AddrRes.error(), ID);\n+ return Unexpect(AddrRes.error());\n+ }\n+ ResolvedAddresses = std::move(*AddrRes);\n+ } else {\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\n+ if (!LoadResult) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\"sv,\n+ LoadResult.error(), ID);\n+ return Unexpect(LoadResult.error());\n+ }\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\n+ if (StatePtr) {\n+ StatePtr->JITLib = JITLib;\n+ }\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\n+ *JITLib, LLDataPtr->getPrefix(),\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!LkRes) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\"sv,\n+ LkRes.error(), ID);\n+ return Unexpect(LkRes.error());\n+ }\n+ ResolvedAddresses = std::move(*LkRes);\n+ }\n+\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\n+ } else {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\n+ const uint32_t L = BatchLocals[I];\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\n+ if (!BatchFuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ WasmFuncIdx, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ auto *BatchFuncInst = *BatchFuncResult;\n+ if (BatchFuncInst->isWasmFunction()) {\n+ auto CompiledSym = JITLib->createSymbol(\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\n+ *>(CompiledCodePtr));\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\n+ }\n+ }\n+\n+ if (StatePtr) {\n+ for (uint32_t L : BatchLocals) {\n+ StatePtr->LazyCompiledFuncs.insert(L);\n+ }\n+ }\n+\n+ spdlog::debug(\n+ \"Lazy compilation completed for batch of {} functions, total compiled: \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(),\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\n+\n+ return {};\n+}\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\n+ WasmEdge::LLVM::LazyJITState State;\n+ LLVM::Compiler Compiler(Conf);\n+ EXPECTED_TRY(\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\n+\n+ auto Prefix = fmt::format(\"m{}_\"sv, Module.getID());\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\n+\n+ State.LLData = std::move(LLModule.first);\n+ State.LLContext = std::move(LLModule.second);\n+\n+ LLVM::JIT JIT(Conf);\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\n+\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\n+\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\n+\n+ return State;\n+}\n+#endif\n+\n } // namespace VM\n } // namespace WasmEdge\n"},"changed_files":{"kind":"list like","value":["lib/vm/vm.cpp"],"string":"[\n \"lib/vm/vm.cpp\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"This branch seems to be eager JIT.\nWhat's the reason that we need the LazyMutex and update the `Pending`?","path":"lib/vm/vm.cpp","hunk":"@@ -423,59 +607,150 @@ Expect<void> VM::unsafeInstantiate() {\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\n }\n-\n if (Mod) {\n if (Conf.getRuntimeConfigure().isEnableJIT() && !Mod->getSymbol()) {\n #ifdef WASMEDGE_USE_LLVM\n- LLVM::Compiler Compiler(Conf);\n- Compiler.checkConfigure()\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&]() { return Compiler.compile(*Mod); })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compilation failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto LLModule) {\n- LLVM::JIT JIT(Conf);\n- return JIT.load(std::move(LLModule));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\n- \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto Module) {\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n- \"mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- });\n+ if (Conf.getRuntimeConfigure().isEnableLazyJIT()) {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() {\n+ auto Prefix = fmt::format(\n+ \"m{:p}_\"sv, reinterpret_cast<const void *>(Mod.get()));\n+ return Compiler.compileInfrastructure(*Mod, Prefix);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ std::unique_lock Lock(LazyMutex);\n+ Pending.LLData = std::move(LLModule.first);\n+ Pending.LLContext = std::move(LLModule.second);\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(Pending.LLData, true);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Module) {\n+ {\n+ std::unique_lock Lock(LazyMutex);\n+ Pending.Exec = Module;\n+ }\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n+ \"mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ });\n+ } else {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() { return Compiler.compile(*Mod); })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(LLModule);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Module) {\n+ {\n+ std::unique_lock Lock(LazyMutex);\n+ Pending.Exec = Module;","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\nindex 680d35094656..cf594a8be374 100644\n--- a/lib/vm/vm.cpp\n+++ b/lib/vm/vm.cpp\n@@ -3,7 +3,9 @@\n \n #include \"vm/vm.h\"\n \n+#include \"ast/instruction.h\"\n #include \"ast/module.h\"\n+#include \"common/enum_errcode.hpp\"\n #include \"common/errcode.h\"\n #include \"common/types.h\"\n #include \"host/wasi/wasimodule.h\"\n@@ -20,14 +22,71 @@\n #include \"host/mock/wasmedge_tensorflow_module.h\"\n #include \"host/mock/wasmedge_tensorflowlite_module.h\"\n #include \"validator/validator.h\"\n+#include <algorithm>\n+#include <cstddef>\n #include <memory>\n #include <variant>\n+#include <vector>\n+\n+#ifdef WASMEDGE_USE_LLVM\n+#include <llvm/IR/Module.h>\n+#endif\n \n namespace WasmEdge {\n namespace VM {\n \n namespace {\n \n+#ifdef WASMEDGE_USE_LLVM\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\n+ uint32_t ImportFuncCount,\n+ const std::unordered_set<uint32_t> &LazyCompiled,\n+ std::vector<uint32_t> &OutSortedLocals) {\n+ OutSortedLocals.clear();\n+ if (!ModulePtr) {\n+ return;\n+ }\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\n+\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\n+ return;\n+ }\n+\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\n+ std::vector<uint32_t> Stack;\n+ Stack.reserve(64);\n+\n+ Visited[LocalSeed] = 1;\n+ Stack.push_back(LocalSeed);\n+ OutSortedLocals.push_back(LocalSeed);\n+\n+ while (!Stack.empty()) {\n+ const uint32_t L = Stack.back();\n+ Stack.pop_back();\n+\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\n+ const auto Op = Instr.getOpCode();\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\n+ Op == OpCode::Ref__func) {\n+ const uint32_t Target = Instr.getTargetIndex();\n+ if (Target >= ImportFuncCount) {\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\n+ !LazyCompiled.count(LocalIdx)) {\n+ Visited[LocalIdx] = 1;\n+ Stack.push_back(LocalIdx);\n+ OutSortedLocals.push_back(LocalIdx);\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\n+}\n+#endif\n+\n template <typename T> struct VisitUnit {\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n \n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ spdlog::warn(\n+ \"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\"sv);\n+ ExecutorEngine.registerLazyCompilationCallback(\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\n+ return lazyCompileFunctions(ID, FuncIdx);\n+ });\n+ }\n+#endif\n+\n // Register all module instances.\n unsafeRegisterBuiltInHosts();\n unsafeRegisterPlugInHosts();\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Path));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Code));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+\n+ std::string ID = Module.getID();\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\n+ !Module.getSymbol()) {\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\n+ }\n+#endif\n+\n // Instantiate and register module.\n EXPECTED_TRY(auto ModInst,\n ExecutorEngine.registerModule(StoreRef, Module, Name));\n RegModInsts.push_back(std::move(ModInst));\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (State) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates.insert({ID, std::move(*State)});\n+ }\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ size_t InstIdx = RegModInsts.size() - 1;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ auto It = RegModMap.find(ID);\n+ if (It != RegModMap.end()) {\n+ It->second[1] = InstIdx;\n+ } else {\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\n+ }\n+ }\n+#endif\n+\n return {};\n }\n \n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\n }\n-\n if (Mod) {\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\n+ std::string ID = Mod->getID();\n+\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\n !Mod->getSymbol()) {\n #ifdef WASMEDGE_USE_LLVM\n- LLVM::Compiler Compiler(Conf);\n- Compiler.checkConfigure()\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&]() { return Compiler.compile(*Mod); })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compilation failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto LLModule) {\n- LLVM::JIT JIT(Conf);\n- return JIT.load(std::move(LLModule));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\n- \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto Module) {\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n- \"mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- });\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates[ID] = std::move(State);\n+ } else {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() { return Compiler.compile(*Mod); })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(LLModule);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Module) {\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n+ \"mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ });\n+ }\n #else\n spdlog::warn(\"JIT was requested but WasmEdge was built without LLVM, \"\n \"falling back to interpreter.\"sv);\n #endif\n }\n \n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ auto StateIt = LazyJITStates.find(ID);\n+ if (StateIt != LazyJITStates.end()) {\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ StateIt->second.ImportFuncCount =\n+ static_cast<uint32_t>(ImportFuncCount);\n+ StateIt->second.LazyCompiledFuncs.clear();\n+ }\n+ }\n+#endif\n+\n EXPECTED_TRY(ActiveModInst,\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\n+\n Stage = VMStage::Instantiated;\n return {};\n } else if (Comp) {\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\n Runtime::Instance::FunctionInstance *FuncInst =\n ModInst->findFuncExports(Func);\n \n+#ifdef WASMEDGE_USE_LLVM\n+ // lazy JIT: compile function on-demand if needed.\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\n+ bool NeedsCompile = false;\n+ uint32_t FuncIdx = UINT32_MAX;\n+ {\n+ std::shared_lock Lock(LazyJITMutex);\n+ if (FuncInst->isWasmFunction()) {\n+ NeedsCompile = true;\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\n+ FuncIdx = *Res;\n+ }\n+ }\n+ }\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\n+ !Result) {\n+ return Unexpect(Result.error());\n+ }\n+ }\n+ }\n+#endif\n+\n // Execute function.\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\n .map_error([&ModInst, &Func](auto E) {\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\n }\n StoreRef.reset();\n RegModInsts.clear();\n+ RegASTModules.clear();\n+ RegModMap.clear();\n Stat.clear();\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\n unsafeRegisterPlugInHosts();\n LoaderEngine.reset();\n Stage = VMStage::Inited;\n+#ifdef WASMEDGE_USE_LLVM\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\n+ // LLContexts.\n+ LazyJITStates.clear();\n+#endif\n }\n \n std::vector<std::pair<std::string, const AST::FunctionType &>>\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\n return nullptr;\n };\n \n+#ifdef WASMEDGE_USE_LLVM\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ uint32_t ImportFuncCount = 0;\n+ const AST::Module *ModulePtr = nullptr;\n+ LLVM::Data *LLDataPtr = nullptr;\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\n+ nullptr;\n+ LLVM::LazyJITState *StatePtr = nullptr;\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\n+\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\n+ ModInst = ActiveModInst.get();\n+ ModulePtr = Mod.get();\n+ } else {\n+ auto ItMap = RegModMap.find(ID);\n+ if (ItMap != RegModMap.end()) {\n+ ModInst = RegModInsts[ItMap->second[1]].get();\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\n+ }\n+ }\n+\n+ if (!ModInst || !ModulePtr) {\n+ return {};\n+ }\n+\n+ auto It = LazyJITStates.find(ID);\n+ if (It != LazyJITStates.end()) {\n+ StatePtr = &It->second;\n+ ImportFuncCount = StatePtr->ImportFuncCount;\n+ LLDataPtr = &StatePtr->LLData;\n+ LLContextPtr = &StatePtr->LLContext;\n+ } else {\n+ spdlog::error(\"[lazy-jit]: failed to find JIT state for ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ if (FuncIdx < ImportFuncCount) {\n+ return {};\n+ }\n+\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\n+\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\n+ if (!FuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ FuncIdx, ID);\n+ return Unexpect(FuncResult.error());\n+ }\n+ auto *FuncInst = *FuncResult;\n+\n+ // If already compiled or not a Wasm function, nothing to do.\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\n+ return {};\n+ }\n+\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\n+ return {};\n+ }\n+\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\n+ const std::unordered_set<uint32_t> &CompiledSet =\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\n+\n+ std::vector<uint32_t> BatchLocals;\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\n+ CompiledSet, BatchLocals);\n+ if (BatchLocals.empty()) {\n+ return {};\n+ }\n+\n+ spdlog::debug(\n+ \"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(), LocalFuncIdx, ID);\n+\n+ LLVM::Compiler Compiler(Conf);\n+ auto ConfigResult = Compiler.checkConfigure();\n+ if (!ConfigResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\"sv,\n+ ConfigResult.error(), ID);\n+ return Unexpect(ConfigResult.error());\n+ }\n+\n+ if (!LLDataPtr->hasModule()) {\n+ LLDataPtr->resetModule();\n+ }\n+ auto CompileResult = Compiler.compileFunctions(\n+ std::move(*LLDataPtr),\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\n+ *ModulePtr,\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\n+ if (!CompileResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\"sv,\n+ CompileResult.error(), ID);\n+ return Unexpect(CompileResult.error());\n+ }\n+\n+ *LLDataPtr = std::move(*CompileResult);\n+ LLVM::JIT JIT(Conf);\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\n+ if (StatePtr && StatePtr->JITLib) {\n+ JITLib = StatePtr->JITLib;\n+ }\n+\n+ std::vector<uint32_t> BatchGlobal;\n+ BatchGlobal.reserve(BatchLocals.size());\n+ for (uint32_t L : BatchLocals) {\n+ BatchGlobal.push_back(ImportFuncCount + L);\n+ }\n+\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\n+ if (JITLib) {\n+ auto AddrRes = JIT.add(\n+ *JITLib, *LLDataPtr,\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!AddrRes) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\"sv,\n+ AddrRes.error(), ID);\n+ return Unexpect(AddrRes.error());\n+ }\n+ ResolvedAddresses = std::move(*AddrRes);\n+ } else {\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\n+ if (!LoadResult) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\"sv,\n+ LoadResult.error(), ID);\n+ return Unexpect(LoadResult.error());\n+ }\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\n+ if (StatePtr) {\n+ StatePtr->JITLib = JITLib;\n+ }\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\n+ *JITLib, LLDataPtr->getPrefix(),\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!LkRes) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\"sv,\n+ LkRes.error(), ID);\n+ return Unexpect(LkRes.error());\n+ }\n+ ResolvedAddresses = std::move(*LkRes);\n+ }\n+\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\n+ } else {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\n+ const uint32_t L = BatchLocals[I];\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\n+ if (!BatchFuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ WasmFuncIdx, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ auto *BatchFuncInst = *BatchFuncResult;\n+ if (BatchFuncInst->isWasmFunction()) {\n+ auto CompiledSym = JITLib->createSymbol(\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\n+ *>(CompiledCodePtr));\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\n+ }\n+ }\n+\n+ if (StatePtr) {\n+ for (uint32_t L : BatchLocals) {\n+ StatePtr->LazyCompiledFuncs.insert(L);\n+ }\n+ }\n+\n+ spdlog::debug(\n+ \"Lazy compilation completed for batch of {} functions, total compiled: \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(),\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\n+\n+ return {};\n+}\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\n+ WasmEdge::LLVM::LazyJITState State;\n+ LLVM::Compiler Compiler(Conf);\n+ EXPECTED_TRY(\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\n+\n+ auto Prefix = fmt::format(\"m{}_\"sv, Module.getID());\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\n+\n+ State.LLData = std::move(LLModule.first);\n+ State.LLContext = std::move(LLModule.second);\n+\n+ LLVM::JIT JIT(Conf);\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\n+\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\n+\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\n+\n+ return State;\n+}\n+#endif\n+\n } // namespace VM\n } // namespace WasmEdge\n"}],"string":"[\n {\n \"comment\": \"This branch seems to be eager JIT.\\nWhat's the reason that we need the LazyMutex and update the `Pending`?\",\n \"path\": \"lib/vm/vm.cpp\",\n \"hunk\": \"@@ -423,59 +607,150 @@ Expect<void> VM::unsafeInstantiate() {\\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\\n }\\n-\\n if (Mod) {\\n if (Conf.getRuntimeConfigure().isEnableJIT() && !Mod->getSymbol()) {\\n #ifdef WASMEDGE_USE_LLVM\\n- LLVM::Compiler Compiler(Conf);\\n- Compiler.checkConfigure()\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n- \\\"interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&]() { return Compiler.compile(*Mod); })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n- \\\"interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&](auto LLModule) {\\n- LLVM::JIT JIT(Conf);\\n- return JIT.load(std::move(LLModule));\\n- })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::warn(\\n- \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&](auto Module) {\\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\\n- })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n- \\\"mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- });\\n+ if (Conf.getRuntimeConfigure().isEnableLazyJIT()) {\\n+ LLVM::Compiler Compiler(Conf);\\n+ Compiler.checkConfigure()\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&]() {\\n+ auto Prefix = fmt::format(\\n+ \\\"m{:p}_\\\"sv, reinterpret_cast<const void *>(Mod.get()));\\n+ return Compiler.compileInfrastructure(*Mod, Prefix);\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto LLModule) {\\n+ std::unique_lock Lock(LazyMutex);\\n+ Pending.LLData = std::move(LLModule.first);\\n+ Pending.LLContext = std::move(LLModule.second);\\n+ LLVM::JIT JIT(Conf);\\n+ return JIT.load(Pending.LLData, true);\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\n+ \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto Module) {\\n+ {\\n+ std::unique_lock Lock(LazyMutex);\\n+ Pending.Exec = Module;\\n+ }\\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n+ \\\"mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ });\\n+ } else {\\n+ LLVM::Compiler Compiler(Conf);\\n+ Compiler.checkConfigure()\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&]() { return Compiler.compile(*Mod); })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto LLModule) {\\n+ LLVM::JIT JIT(Conf);\\n+ return JIT.load(LLModule);\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\n+ \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto Module) {\\n+ {\\n+ std::unique_lock Lock(LazyMutex);\\n+ Pending.Exec = Module;\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\\nindex 680d35094656..cf594a8be374 100644\\n--- a/lib/vm/vm.cpp\\n+++ b/lib/vm/vm.cpp\\n@@ -3,7 +3,9 @@\\n \\n #include \\\"vm/vm.h\\\"\\n \\n+#include \\\"ast/instruction.h\\\"\\n #include \\\"ast/module.h\\\"\\n+#include \\\"common/enum_errcode.hpp\\\"\\n #include \\\"common/errcode.h\\\"\\n #include \\\"common/types.h\\\"\\n #include \\\"host/wasi/wasimodule.h\\\"\\n@@ -20,14 +22,71 @@\\n #include \\\"host/mock/wasmedge_tensorflow_module.h\\\"\\n #include \\\"host/mock/wasmedge_tensorflowlite_module.h\\\"\\n #include \\\"validator/validator.h\\\"\\n+#include <algorithm>\\n+#include <cstddef>\\n #include <memory>\\n #include <variant>\\n+#include <vector>\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+#include <llvm/IR/Module.h>\\n+#endif\\n \\n namespace WasmEdge {\\n namespace VM {\\n \\n namespace {\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\\n+ uint32_t ImportFuncCount,\\n+ const std::unordered_set<uint32_t> &LazyCompiled,\\n+ std::vector<uint32_t> &OutSortedLocals) {\\n+ OutSortedLocals.clear();\\n+ if (!ModulePtr) {\\n+ return;\\n+ }\\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\\n+\\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\\n+ return;\\n+ }\\n+\\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\\n+ std::vector<uint32_t> Stack;\\n+ Stack.reserve(64);\\n+\\n+ Visited[LocalSeed] = 1;\\n+ Stack.push_back(LocalSeed);\\n+ OutSortedLocals.push_back(LocalSeed);\\n+\\n+ while (!Stack.empty()) {\\n+ const uint32_t L = Stack.back();\\n+ Stack.pop_back();\\n+\\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\\n+ const auto Op = Instr.getOpCode();\\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\\n+ Op == OpCode::Ref__func) {\\n+ const uint32_t Target = Instr.getTargetIndex();\\n+ if (Target >= ImportFuncCount) {\\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\\n+ !LazyCompiled.count(LocalIdx)) {\\n+ Visited[LocalIdx] = 1;\\n+ Stack.push_back(LocalIdx);\\n+ OutSortedLocals.push_back(LocalIdx);\\n+ }\\n+ }\\n+ }\\n+ }\\n+ }\\n+\\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\\n+}\\n+#endif\\n+\\n template <typename T> struct VisitUnit {\\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\\n unsafeLoadBuiltInHosts();\\n unsafeLoadPlugInHosts();\\n \\n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ spdlog::warn(\\n+ \\\"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\\\"sv);\\n+ ExecutorEngine.registerLazyCompilationCallback(\\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\\n+ return lazyCompileFunctions(ID, FuncIdx);\\n+ });\\n+ }\\n+#endif\\n+\\n // Register all module instances.\\n unsafeRegisterBuiltInHosts();\\n unsafeRegisterPlugInHosts();\\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n Stage = VMStage::Validated;\\n }\\n // Load module.\\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\\n- return unsafeRegisterModule(Name, *Module.get());\\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\\n+ LoaderEngine.parseModule(Path));\\n+\\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\\n+\\n+ if (!RegASTModules.empty()) {\\n+ RegASTModules.back() = Module;\\n+ }\\n+\\n+ return {};\\n }\\n \\n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n Stage = VMStage::Validated;\\n }\\n // Load module.\\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\\n- return unsafeRegisterModule(Name, *Module.get());\\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\\n+ LoaderEngine.parseModule(Code));\\n+\\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\\n+\\n+ if (!RegASTModules.empty()) {\\n+ RegASTModules.back() = Module;\\n+ }\\n+\\n+ return {};\\n }\\n \\n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n }\\n // Validate module.\\n EXPECTED_TRY(ValidatorEngine.validate(Module));\\n+\\n+ std::string ID = Module.getID();\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\\n+ !Module.getSymbol()) {\\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\\n+ }\\n+#endif\\n+\\n // Instantiate and register module.\\n EXPECTED_TRY(auto ModInst,\\n ExecutorEngine.registerModule(StoreRef, Module, Name));\\n RegModInsts.push_back(std::move(ModInst));\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (State) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ LazyJITStates.insert({ID, std::move(*State)});\\n+ }\\n+#endif\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ size_t InstIdx = RegModInsts.size() - 1;\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ auto It = RegModMap.find(ID);\\n+ if (It != RegModMap.end()) {\\n+ It->second[1] = InstIdx;\\n+ } else {\\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\\n+ }\\n+ }\\n+#endif\\n+\\n return {};\\n }\\n \\n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\\n }\\n-\\n if (Mod) {\\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\\n+ std::string ID = Mod->getID();\\n+\\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\\n !Mod->getSymbol()) {\\n #ifdef WASMEDGE_USE_LLVM\\n- LLVM::Compiler Compiler(Conf);\\n- Compiler.checkConfigure()\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n- \\\"interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&]() { return Compiler.compile(*Mod); })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n- \\\"interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&](auto LLModule) {\\n- LLVM::JIT JIT(Conf);\\n- return JIT.load(std::move(LLModule));\\n- })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::warn(\\n- \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&](auto Module) {\\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\\n- })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n- \\\"mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- });\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ LazyJITStates[ID] = std::move(State);\\n+ } else {\\n+ LLVM::Compiler Compiler(Conf);\\n+ Compiler.checkConfigure()\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&]() { return Compiler.compile(*Mod); })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto LLModule) {\\n+ LLVM::JIT JIT(Conf);\\n+ return JIT.load(LLModule);\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\n+ \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto Module) {\\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n+ \\\"mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ });\\n+ }\\n #else\\n spdlog::warn(\\\"JIT was requested but WasmEdge was built without LLVM, \\\"\\n \\\"falling back to interpreter.\\\"sv);\\n #endif\\n }\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ auto StateIt = LazyJITStates.find(ID);\\n+ if (StateIt != LazyJITStates.end()) {\\n+ size_t ImportFuncCount = 0;\\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\\n+ ++ImportFuncCount;\\n+ }\\n+ }\\n+ StateIt->second.ImportFuncCount =\\n+ static_cast<uint32_t>(ImportFuncCount);\\n+ StateIt->second.LazyCompiledFuncs.clear();\\n+ }\\n+ }\\n+#endif\\n+\\n EXPECTED_TRY(ActiveModInst,\\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\\n+\\n Stage = VMStage::Instantiated;\\n return {};\\n } else if (Comp) {\\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\\n Runtime::Instance::FunctionInstance *FuncInst =\\n ModInst->findFuncExports(Func);\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+ // lazy JIT: compile function on-demand if needed.\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\\n+ bool NeedsCompile = false;\\n+ uint32_t FuncIdx = UINT32_MAX;\\n+ {\\n+ std::shared_lock Lock(LazyJITMutex);\\n+ if (FuncInst->isWasmFunction()) {\\n+ NeedsCompile = true;\\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\\n+ FuncIdx = *Res;\\n+ }\\n+ }\\n+ }\\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\\n+ !Result) {\\n+ return Unexpect(Result.error());\\n+ }\\n+ }\\n+ }\\n+#endif\\n+\\n // Execute function.\\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\\n .map_error([&ModInst, &Func](auto E) {\\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\\n }\\n StoreRef.reset();\\n RegModInsts.clear();\\n+ RegASTModules.clear();\\n+ RegModMap.clear();\\n Stat.clear();\\n unsafeLoadBuiltInHosts();\\n unsafeLoadPlugInHosts();\\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\\n unsafeRegisterPlugInHosts();\\n LoaderEngine.reset();\\n Stage = VMStage::Inited;\\n+#ifdef WASMEDGE_USE_LLVM\\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\\n+ // LLContexts.\\n+ LazyJITStates.clear();\\n+#endif\\n }\\n \\n std::vector<std::pair<std::string, const AST::FunctionType &>>\\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\\n return nullptr;\\n };\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ uint32_t ImportFuncCount = 0;\\n+ const AST::Module *ModulePtr = nullptr;\\n+ LLVM::Data *LLDataPtr = nullptr;\\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\\n+ nullptr;\\n+ LLVM::LazyJITState *StatePtr = nullptr;\\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\\n+\\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\\n+ ModInst = ActiveModInst.get();\\n+ ModulePtr = Mod.get();\\n+ } else {\\n+ auto ItMap = RegModMap.find(ID);\\n+ if (ItMap != RegModMap.end()) {\\n+ ModInst = RegModInsts[ItMap->second[1]].get();\\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\\n+ }\\n+ }\\n+\\n+ if (!ModInst || !ModulePtr) {\\n+ return {};\\n+ }\\n+\\n+ auto It = LazyJITStates.find(ID);\\n+ if (It != LazyJITStates.end()) {\\n+ StatePtr = &It->second;\\n+ ImportFuncCount = StatePtr->ImportFuncCount;\\n+ LLDataPtr = &StatePtr->LLData;\\n+ LLContextPtr = &StatePtr->LLContext;\\n+ } else {\\n+ spdlog::error(\\\"[lazy-jit]: failed to find JIT state for ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\\n+ }\\n+\\n+ if (FuncIdx < ImportFuncCount) {\\n+ return {};\\n+ }\\n+\\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\\n+\\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\\n+ if (!FuncResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get function instance for index {}, module ID: {}\\\"sv,\\n+ FuncIdx, ID);\\n+ return Unexpect(FuncResult.error());\\n+ }\\n+ auto *FuncInst = *FuncResult;\\n+\\n+ // If already compiled or not a Wasm function, nothing to do.\\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\\n+ return {};\\n+ }\\n+\\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\\n+ return {};\\n+ }\\n+\\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\\n+ const std::unordered_set<uint32_t> &CompiledSet =\\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\\n+\\n+ std::vector<uint32_t> BatchLocals;\\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\\n+ CompiledSet, BatchLocals);\\n+ if (BatchLocals.empty()) {\\n+ return {};\\n+ }\\n+\\n+ spdlog::debug(\\n+ \\\"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \\\"\\n+ \\\"{}, module ID: {}\\\"sv,\\n+ BatchLocals.size(), LocalFuncIdx, ID);\\n+\\n+ LLVM::Compiler Compiler(Conf);\\n+ auto ConfigResult = Compiler.checkConfigure();\\n+ if (!ConfigResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\\\"sv,\\n+ ConfigResult.error(), ID);\\n+ return Unexpect(ConfigResult.error());\\n+ }\\n+\\n+ if (!LLDataPtr->hasModule()) {\\n+ LLDataPtr->resetModule();\\n+ }\\n+ auto CompileResult = Compiler.compileFunctions(\\n+ std::move(*LLDataPtr),\\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\\n+ *ModulePtr,\\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\\n+ if (!CompileResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\\\"sv,\\n+ CompileResult.error(), ID);\\n+ return Unexpect(CompileResult.error());\\n+ }\\n+\\n+ *LLDataPtr = std::move(*CompileResult);\\n+ LLVM::JIT JIT(Conf);\\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\\n+ if (StatePtr && StatePtr->JITLib) {\\n+ JITLib = StatePtr->JITLib;\\n+ }\\n+\\n+ std::vector<uint32_t> BatchGlobal;\\n+ BatchGlobal.reserve(BatchLocals.size());\\n+ for (uint32_t L : BatchLocals) {\\n+ BatchGlobal.push_back(ImportFuncCount + L);\\n+ }\\n+\\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\\n+ if (JITLib) {\\n+ auto AddrRes = JIT.add(\\n+ *JITLib, *LLDataPtr,\\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\\n+ if (!AddrRes) {\\n+ spdlog::error(\\\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\\\"sv,\\n+ AddrRes.error(), ID);\\n+ return Unexpect(AddrRes.error());\\n+ }\\n+ ResolvedAddresses = std::move(*AddrRes);\\n+ } else {\\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\\n+ if (!LoadResult) {\\n+ spdlog::error(\\\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\\\"sv,\\n+ LoadResult.error(), ID);\\n+ return Unexpect(LoadResult.error());\\n+ }\\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\\n+ if (StatePtr) {\\n+ StatePtr->JITLib = JITLib;\\n+ }\\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\\n+ *JITLib, LLDataPtr->getPrefix(),\\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\\n+ if (!LkRes) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\\\"sv,\\n+ LkRes.error(), ID);\\n+ return Unexpect(LkRes.error());\\n+ }\\n+ ResolvedAddresses = std::move(*LkRes);\\n+ }\\n+\\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\\n+ } else {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\\n+ const uint32_t L = BatchLocals[I];\\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\\n+ if (!BatchFuncResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get function instance for index {}, module ID: {}\\\"sv,\\n+ WasmFuncIdx, ID);\\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\\n+ }\\n+\\n+ auto *BatchFuncInst = *BatchFuncResult;\\n+ if (BatchFuncInst->isWasmFunction()) {\\n+ auto CompiledSym = JITLib->createSymbol(\\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\\n+ *>(CompiledCodePtr));\\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\\n+ }\\n+ }\\n+\\n+ if (StatePtr) {\\n+ for (uint32_t L : BatchLocals) {\\n+ StatePtr->LazyCompiledFuncs.insert(L);\\n+ }\\n+ }\\n+\\n+ spdlog::debug(\\n+ \\\"Lazy compilation completed for batch of {} functions, total compiled: \\\"\\n+ \\\"{}, module ID: {}\\\"sv,\\n+ BatchLocals.size(),\\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\\n+\\n+ return {};\\n+}\\n+#endif\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\\n+ WasmEdge::LLVM::LazyJITState State;\\n+ LLVM::Compiler Compiler(Conf);\\n+ EXPECTED_TRY(\\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\\n+\\n+ auto Prefix = fmt::format(\\\"m{}_\\\"sv, Module.getID());\\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\\n+\\n+ State.LLData = std::move(LLModule.first);\\n+ State.LLContext = std::move(LLModule.second);\\n+\\n+ LLVM::JIT JIT(Conf);\\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\\n+\\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\\n+\\n+ size_t ImportFuncCount = 0;\\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\\n+ ++ImportFuncCount;\\n+ }\\n+ }\\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\\n+\\n+ return State;\\n+}\\n+#endif\\n+\\n } // namespace VM\\n } // namespace WasmEdge\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13291,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"I am thinking about this chain.\nSince you are trying to have it in multiple places, it would be better to extract.\nHow about creating a private struct and the helper functions like this?\n\n```cpp\nstruct LazyJITArtifacts {\n LLVM::Data LLData;\n std::unique_ptr<LLVM::Compiler::CompileContext,\n LLVM::Compiler::CompileContextDeleter>\n LLContext;\n std::shared_ptr<Executable> Exec;\n uint32_t ImportFuncCount = 0;\n};\n\nExpect<LazyJITArtifacts>\nrunLazyJITPipeline(AST::Module &Module);\n\n# And handle the return value like this:\n\nEXPECTED_TRY(auto Artifacts, runLazyJITPipeline(\n const_cast<AST::Module &>(Module)));\nstd::unique_lock Lock(LazyMutex);\nPending.LLData = std::move(Artifacts.LLData);\n(......)\nPending.ImportFuncCount = Artifacts.ImportFuncCount;\n```"},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\nindex 680d35094656..cf594a8be374 100644\n--- a/lib/vm/vm.cpp\n+++ b/lib/vm/vm.cpp\n@@ -3,7 +3,9 @@\n \n #include \"vm/vm.h\"\n \n+#include \"ast/instruction.h\"\n #include \"ast/module.h\"\n+#include \"common/enum_errcode.hpp\"\n #include \"common/errcode.h\"\n #include \"common/types.h\"\n #include \"host/wasi/wasimodule.h\"\n@@ -20,14 +22,71 @@\n #include \"host/mock/wasmedge_tensorflow_module.h\"\n #include \"host/mock/wasmedge_tensorflowlite_module.h\"\n #include \"validator/validator.h\"\n+#include <algorithm>\n+#include <cstddef>\n #include <memory>\n #include <variant>\n+#include <vector>\n+\n+#ifdef WASMEDGE_USE_LLVM\n+#include <llvm/IR/Module.h>\n+#endif\n \n namespace WasmEdge {\n namespace VM {\n \n namespace {\n \n+#ifdef WASMEDGE_USE_LLVM\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\n+ uint32_t ImportFuncCount,\n+ const std::unordered_set<uint32_t> &LazyCompiled,\n+ std::vector<uint32_t> &OutSortedLocals) {\n+ OutSortedLocals.clear();\n+ if (!ModulePtr) {\n+ return;\n+ }\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\n+\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\n+ return;\n+ }\n+\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\n+ std::vector<uint32_t> Stack;\n+ Stack.reserve(64);\n+\n+ Visited[LocalSeed] = 1;\n+ Stack.push_back(LocalSeed);\n+ OutSortedLocals.push_back(LocalSeed);\n+\n+ while (!Stack.empty()) {\n+ const uint32_t L = Stack.back();\n+ Stack.pop_back();\n+\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\n+ const auto Op = Instr.getOpCode();\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\n+ Op == OpCode::Ref__func) {\n+ const uint32_t Target = Instr.getTargetIndex();\n+ if (Target >= ImportFuncCount) {\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\n+ !LazyCompiled.count(LocalIdx)) {\n+ Visited[LocalIdx] = 1;\n+ Stack.push_back(LocalIdx);\n+ OutSortedLocals.push_back(LocalIdx);\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\n+}\n+#endif\n+\n template <typename T> struct VisitUnit {\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n \n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ spdlog::warn(\n+ \"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\"sv);\n+ ExecutorEngine.registerLazyCompilationCallback(\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\n+ return lazyCompileFunctions(ID, FuncIdx);\n+ });\n+ }\n+#endif\n+\n // Register all module instances.\n unsafeRegisterBuiltInHosts();\n unsafeRegisterPlugInHosts();\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Path));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Code));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+\n+ std::string ID = Module.getID();\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\n+ !Module.getSymbol()) {\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\n+ }\n+#endif\n+\n // Instantiate and register module.\n EXPECTED_TRY(auto ModInst,\n ExecutorEngine.registerModule(StoreRef, Module, Name));\n RegModInsts.push_back(std::move(ModInst));\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (State) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates.insert({ID, std::move(*State)});\n+ }\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ size_t InstIdx = RegModInsts.size() - 1;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ auto It = RegModMap.find(ID);\n+ if (It != RegModMap.end()) {\n+ It->second[1] = InstIdx;\n+ } else {\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\n+ }\n+ }\n+#endif\n+\n return {};\n }\n \n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\n }\n-\n if (Mod) {\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\n+ std::string ID = Mod->getID();\n+\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\n !Mod->getSymbol()) {\n #ifdef WASMEDGE_USE_LLVM\n- LLVM::Compiler Compiler(Conf);\n- Compiler.checkConfigure()\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&]() { return Compiler.compile(*Mod); })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compilation failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto LLModule) {\n- LLVM::JIT JIT(Conf);\n- return JIT.load(std::move(LLModule));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\n- \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto Module) {\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n- \"mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- });\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates[ID] = std::move(State);\n+ } else {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() { return Compiler.compile(*Mod); })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(LLModule);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Module) {\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n+ \"mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ });\n+ }\n #else\n spdlog::warn(\"JIT was requested but WasmEdge was built without LLVM, \"\n \"falling back to interpreter.\"sv);\n #endif\n }\n \n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ auto StateIt = LazyJITStates.find(ID);\n+ if (StateIt != LazyJITStates.end()) {\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ StateIt->second.ImportFuncCount =\n+ static_cast<uint32_t>(ImportFuncCount);\n+ StateIt->second.LazyCompiledFuncs.clear();\n+ }\n+ }\n+#endif\n+\n EXPECTED_TRY(ActiveModInst,\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\n+\n Stage = VMStage::Instantiated;\n return {};\n } else if (Comp) {\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\n Runtime::Instance::FunctionInstance *FuncInst =\n ModInst->findFuncExports(Func);\n \n+#ifdef WASMEDGE_USE_LLVM\n+ // lazy JIT: compile function on-demand if needed.\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\n+ bool NeedsCompile = false;\n+ uint32_t FuncIdx = UINT32_MAX;\n+ {\n+ std::shared_lock Lock(LazyJITMutex);\n+ if (FuncInst->isWasmFunction()) {\n+ NeedsCompile = true;\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\n+ FuncIdx = *Res;\n+ }\n+ }\n+ }\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\n+ !Result) {\n+ return Unexpect(Result.error());\n+ }\n+ }\n+ }\n+#endif\n+\n // Execute function.\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\n .map_error([&ModInst, &Func](auto E) {\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\n }\n StoreRef.reset();\n RegModInsts.clear();\n+ RegASTModules.clear();\n+ RegModMap.clear();\n Stat.clear();\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\n unsafeRegisterPlugInHosts();\n LoaderEngine.reset();\n Stage = VMStage::Inited;\n+#ifdef WASMEDGE_USE_LLVM\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\n+ // LLContexts.\n+ LazyJITStates.clear();\n+#endif\n }\n \n std::vector<std::pair<std::string, const AST::FunctionType &>>\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\n return nullptr;\n };\n \n+#ifdef WASMEDGE_USE_LLVM\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ uint32_t ImportFuncCount = 0;\n+ const AST::Module *ModulePtr = nullptr;\n+ LLVM::Data *LLDataPtr = nullptr;\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\n+ nullptr;\n+ LLVM::LazyJITState *StatePtr = nullptr;\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\n+\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\n+ ModInst = ActiveModInst.get();\n+ ModulePtr = Mod.get();\n+ } else {\n+ auto ItMap = RegModMap.find(ID);\n+ if (ItMap != RegModMap.end()) {\n+ ModInst = RegModInsts[ItMap->second[1]].get();\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\n+ }\n+ }\n+\n+ if (!ModInst || !ModulePtr) {\n+ return {};\n+ }\n+\n+ auto It = LazyJITStates.find(ID);\n+ if (It != LazyJITStates.end()) {\n+ StatePtr = &It->second;\n+ ImportFuncCount = StatePtr->ImportFuncCount;\n+ LLDataPtr = &StatePtr->LLData;\n+ LLContextPtr = &StatePtr->LLContext;\n+ } else {\n+ spdlog::error(\"[lazy-jit]: failed to find JIT state for ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ if (FuncIdx < ImportFuncCount) {\n+ return {};\n+ }\n+\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\n+\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\n+ if (!FuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ FuncIdx, ID);\n+ return Unexpect(FuncResult.error());\n+ }\n+ auto *FuncInst = *FuncResult;\n+\n+ // If already compiled or not a Wasm function, nothing to do.\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\n+ return {};\n+ }\n+\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\n+ return {};\n+ }\n+\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\n+ const std::unordered_set<uint32_t> &CompiledSet =\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\n+\n+ std::vector<uint32_t> BatchLocals;\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\n+ CompiledSet, BatchLocals);\n+ if (BatchLocals.empty()) {\n+ return {};\n+ }\n+\n+ spdlog::debug(\n+ \"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(), LocalFuncIdx, ID);\n+\n+ LLVM::Compiler Compiler(Conf);\n+ auto ConfigResult = Compiler.checkConfigure();\n+ if (!ConfigResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\"sv,\n+ ConfigResult.error(), ID);\n+ return Unexpect(ConfigResult.error());\n+ }\n+\n+ if (!LLDataPtr->hasModule()) {\n+ LLDataPtr->resetModule();\n+ }\n+ auto CompileResult = Compiler.compileFunctions(\n+ std::move(*LLDataPtr),\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\n+ *ModulePtr,\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\n+ if (!CompileResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\"sv,\n+ CompileResult.error(), ID);\n+ return Unexpect(CompileResult.error());\n+ }\n+\n+ *LLDataPtr = std::move(*CompileResult);\n+ LLVM::JIT JIT(Conf);\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\n+ if (StatePtr && StatePtr->JITLib) {\n+ JITLib = StatePtr->JITLib;\n+ }\n+\n+ std::vector<uint32_t> BatchGlobal;\n+ BatchGlobal.reserve(BatchLocals.size());\n+ for (uint32_t L : BatchLocals) {\n+ BatchGlobal.push_back(ImportFuncCount + L);\n+ }\n+\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\n+ if (JITLib) {\n+ auto AddrRes = JIT.add(\n+ *JITLib, *LLDataPtr,\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!AddrRes) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\"sv,\n+ AddrRes.error(), ID);\n+ return Unexpect(AddrRes.error());\n+ }\n+ ResolvedAddresses = std::move(*AddrRes);\n+ } else {\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\n+ if (!LoadResult) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\"sv,\n+ LoadResult.error(), ID);\n+ return Unexpect(LoadResult.error());\n+ }\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\n+ if (StatePtr) {\n+ StatePtr->JITLib = JITLib;\n+ }\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\n+ *JITLib, LLDataPtr->getPrefix(),\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!LkRes) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\"sv,\n+ LkRes.error(), ID);\n+ return Unexpect(LkRes.error());\n+ }\n+ ResolvedAddresses = std::move(*LkRes);\n+ }\n+\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\n+ } else {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\n+ const uint32_t L = BatchLocals[I];\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\n+ if (!BatchFuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ WasmFuncIdx, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ auto *BatchFuncInst = *BatchFuncResult;\n+ if (BatchFuncInst->isWasmFunction()) {\n+ auto CompiledSym = JITLib->createSymbol(\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\n+ *>(CompiledCodePtr));\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\n+ }\n+ }\n+\n+ if (StatePtr) {\n+ for (uint32_t L : BatchLocals) {\n+ StatePtr->LazyCompiledFuncs.insert(L);\n+ }\n+ }\n+\n+ spdlog::debug(\n+ \"Lazy compilation completed for batch of {} functions, total compiled: \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(),\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\n+\n+ return {};\n+}\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\n+ WasmEdge::LLVM::LazyJITState State;\n+ LLVM::Compiler Compiler(Conf);\n+ EXPECTED_TRY(\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\n+\n+ auto Prefix = fmt::format(\"m{}_\"sv, Module.getID());\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\n+\n+ State.LLData = std::move(LLModule.first);\n+ State.LLContext = std::move(LLModule.second);\n+\n+ LLVM::JIT JIT(Conf);\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\n+\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\n+\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\n+\n+ return State;\n+}\n+#endif\n+\n } // namespace VM\n } // namespace WasmEdge\n"},"changed_files":{"kind":"list like","value":["lib/vm/vm.cpp"],"string":"[\n \"lib/vm/vm.cpp\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"I am thinking about this chain.\nSince you are trying to have it in multiple places, it would be better to extract.\nHow about creating a private struct and the helper functions like this?\n\n```cpp\nstruct LazyJITArtifacts {\n LLVM::Data LLData;\n std::unique_ptr<LLVM::Compiler::CompileContext,\n LLVM::Compiler::CompileContextDeleter>\n LLContext;\n std::shared_ptr<Executable> Exec;\n uint32_t ImportFuncCount = 0;\n};\n\nExpect<LazyJITArtifacts>\nrunLazyJITPipeline(AST::Module &Module);\n\n# And handle the return value like this:\n\nEXPECTED_TRY(auto Artifacts, runLazyJITPipeline(\n const_cast<AST::Module &>(Module)));\nstd::unique_lock Lock(LazyMutex);\nPending.LLData = std::move(Artifacts.LLData);\n(......)\nPending.ImportFuncCount = Artifacts.ImportFuncCount;\n```","path":"lib/vm/vm.cpp","hunk":"@@ -207,10 +302,99 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+ spdlog::info(\"Module validated: {}\"sv, Module.getIsValidated());\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().isEnableLazyJIT() &&\n+ Conf.getRuntimeConfigure().isEnableJIT() && !Module.getSymbol()) {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() {\n+ auto Prefix =\n+ fmt::format(\"m{:p}_\"sv, reinterpret_cast<const void *>(&Module));\n+ return Compiler.compileInfrastructure(Module, Prefix);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ std::unique_lock Lock(LazyMutex);\n+ Pending.LLData = std::move(LLModule.first);\n+ Pending.LLContext = std::move(LLModule.second);\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(Pending.LLData, true);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\nindex 680d35094656..cf594a8be374 100644\n--- a/lib/vm/vm.cpp\n+++ b/lib/vm/vm.cpp\n@@ -3,7 +3,9 @@\n \n #include \"vm/vm.h\"\n \n+#include \"ast/instruction.h\"\n #include \"ast/module.h\"\n+#include \"common/enum_errcode.hpp\"\n #include \"common/errcode.h\"\n #include \"common/types.h\"\n #include \"host/wasi/wasimodule.h\"\n@@ -20,14 +22,71 @@\n #include \"host/mock/wasmedge_tensorflow_module.h\"\n #include \"host/mock/wasmedge_tensorflowlite_module.h\"\n #include \"validator/validator.h\"\n+#include <algorithm>\n+#include <cstddef>\n #include <memory>\n #include <variant>\n+#include <vector>\n+\n+#ifdef WASMEDGE_USE_LLVM\n+#include <llvm/IR/Module.h>\n+#endif\n \n namespace WasmEdge {\n namespace VM {\n \n namespace {\n \n+#ifdef WASMEDGE_USE_LLVM\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\n+ uint32_t ImportFuncCount,\n+ const std::unordered_set<uint32_t> &LazyCompiled,\n+ std::vector<uint32_t> &OutSortedLocals) {\n+ OutSortedLocals.clear();\n+ if (!ModulePtr) {\n+ return;\n+ }\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\n+\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\n+ return;\n+ }\n+\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\n+ std::vector<uint32_t> Stack;\n+ Stack.reserve(64);\n+\n+ Visited[LocalSeed] = 1;\n+ Stack.push_back(LocalSeed);\n+ OutSortedLocals.push_back(LocalSeed);\n+\n+ while (!Stack.empty()) {\n+ const uint32_t L = Stack.back();\n+ Stack.pop_back();\n+\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\n+ const auto Op = Instr.getOpCode();\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\n+ Op == OpCode::Ref__func) {\n+ const uint32_t Target = Instr.getTargetIndex();\n+ if (Target >= ImportFuncCount) {\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\n+ !LazyCompiled.count(LocalIdx)) {\n+ Visited[LocalIdx] = 1;\n+ Stack.push_back(LocalIdx);\n+ OutSortedLocals.push_back(LocalIdx);\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\n+}\n+#endif\n+\n template <typename T> struct VisitUnit {\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n \n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ spdlog::warn(\n+ \"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\"sv);\n+ ExecutorEngine.registerLazyCompilationCallback(\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\n+ return lazyCompileFunctions(ID, FuncIdx);\n+ });\n+ }\n+#endif\n+\n // Register all module instances.\n unsafeRegisterBuiltInHosts();\n unsafeRegisterPlugInHosts();\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Path));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Code));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+\n+ std::string ID = Module.getID();\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\n+ !Module.getSymbol()) {\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\n+ }\n+#endif\n+\n // Instantiate and register module.\n EXPECTED_TRY(auto ModInst,\n ExecutorEngine.registerModule(StoreRef, Module, Name));\n RegModInsts.push_back(std::move(ModInst));\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (State) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates.insert({ID, std::move(*State)});\n+ }\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ size_t InstIdx = RegModInsts.size() - 1;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ auto It = RegModMap.find(ID);\n+ if (It != RegModMap.end()) {\n+ It->second[1] = InstIdx;\n+ } else {\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\n+ }\n+ }\n+#endif\n+\n return {};\n }\n \n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\n }\n-\n if (Mod) {\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\n+ std::string ID = Mod->getID();\n+\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\n !Mod->getSymbol()) {\n #ifdef WASMEDGE_USE_LLVM\n- LLVM::Compiler Compiler(Conf);\n- Compiler.checkConfigure()\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&]() { return Compiler.compile(*Mod); })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compilation failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto LLModule) {\n- LLVM::JIT JIT(Conf);\n- return JIT.load(std::move(LLModule));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\n- \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto Module) {\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n- \"mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- });\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates[ID] = std::move(State);\n+ } else {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() { return Compiler.compile(*Mod); })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(LLModule);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Module) {\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n+ \"mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ });\n+ }\n #else\n spdlog::warn(\"JIT was requested but WasmEdge was built without LLVM, \"\n \"falling back to interpreter.\"sv);\n #endif\n }\n \n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ auto StateIt = LazyJITStates.find(ID);\n+ if (StateIt != LazyJITStates.end()) {\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ StateIt->second.ImportFuncCount =\n+ static_cast<uint32_t>(ImportFuncCount);\n+ StateIt->second.LazyCompiledFuncs.clear();\n+ }\n+ }\n+#endif\n+\n EXPECTED_TRY(ActiveModInst,\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\n+\n Stage = VMStage::Instantiated;\n return {};\n } else if (Comp) {\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\n Runtime::Instance::FunctionInstance *FuncInst =\n ModInst->findFuncExports(Func);\n \n+#ifdef WASMEDGE_USE_LLVM\n+ // lazy JIT: compile function on-demand if needed.\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\n+ bool NeedsCompile = false;\n+ uint32_t FuncIdx = UINT32_MAX;\n+ {\n+ std::shared_lock Lock(LazyJITMutex);\n+ if (FuncInst->isWasmFunction()) {\n+ NeedsCompile = true;\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\n+ FuncIdx = *Res;\n+ }\n+ }\n+ }\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\n+ !Result) {\n+ return Unexpect(Result.error());\n+ }\n+ }\n+ }\n+#endif\n+\n // Execute function.\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\n .map_error([&ModInst, &Func](auto E) {\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\n }\n StoreRef.reset();\n RegModInsts.clear();\n+ RegASTModules.clear();\n+ RegModMap.clear();\n Stat.clear();\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\n unsafeRegisterPlugInHosts();\n LoaderEngine.reset();\n Stage = VMStage::Inited;\n+#ifdef WASMEDGE_USE_LLVM\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\n+ // LLContexts.\n+ LazyJITStates.clear();\n+#endif\n }\n \n std::vector<std::pair<std::string, const AST::FunctionType &>>\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\n return nullptr;\n };\n \n+#ifdef WASMEDGE_USE_LLVM\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ uint32_t ImportFuncCount = 0;\n+ const AST::Module *ModulePtr = nullptr;\n+ LLVM::Data *LLDataPtr = nullptr;\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\n+ nullptr;\n+ LLVM::LazyJITState *StatePtr = nullptr;\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\n+\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\n+ ModInst = ActiveModInst.get();\n+ ModulePtr = Mod.get();\n+ } else {\n+ auto ItMap = RegModMap.find(ID);\n+ if (ItMap != RegModMap.end()) {\n+ ModInst = RegModInsts[ItMap->second[1]].get();\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\n+ }\n+ }\n+\n+ if (!ModInst || !ModulePtr) {\n+ return {};\n+ }\n+\n+ auto It = LazyJITStates.find(ID);\n+ if (It != LazyJITStates.end()) {\n+ StatePtr = &It->second;\n+ ImportFuncCount = StatePtr->ImportFuncCount;\n+ LLDataPtr = &StatePtr->LLData;\n+ LLContextPtr = &StatePtr->LLContext;\n+ } else {\n+ spdlog::error(\"[lazy-jit]: failed to find JIT state for ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ if (FuncIdx < ImportFuncCount) {\n+ return {};\n+ }\n+\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\n+\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\n+ if (!FuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ FuncIdx, ID);\n+ return Unexpect(FuncResult.error());\n+ }\n+ auto *FuncInst = *FuncResult;\n+\n+ // If already compiled or not a Wasm function, nothing to do.\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\n+ return {};\n+ }\n+\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\n+ return {};\n+ }\n+\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\n+ const std::unordered_set<uint32_t> &CompiledSet =\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\n+\n+ std::vector<uint32_t> BatchLocals;\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\n+ CompiledSet, BatchLocals);\n+ if (BatchLocals.empty()) {\n+ return {};\n+ }\n+\n+ spdlog::debug(\n+ \"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(), LocalFuncIdx, ID);\n+\n+ LLVM::Compiler Compiler(Conf);\n+ auto ConfigResult = Compiler.checkConfigure();\n+ if (!ConfigResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\"sv,\n+ ConfigResult.error(), ID);\n+ return Unexpect(ConfigResult.error());\n+ }\n+\n+ if (!LLDataPtr->hasModule()) {\n+ LLDataPtr->resetModule();\n+ }\n+ auto CompileResult = Compiler.compileFunctions(\n+ std::move(*LLDataPtr),\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\n+ *ModulePtr,\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\n+ if (!CompileResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\"sv,\n+ CompileResult.error(), ID);\n+ return Unexpect(CompileResult.error());\n+ }\n+\n+ *LLDataPtr = std::move(*CompileResult);\n+ LLVM::JIT JIT(Conf);\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\n+ if (StatePtr && StatePtr->JITLib) {\n+ JITLib = StatePtr->JITLib;\n+ }\n+\n+ std::vector<uint32_t> BatchGlobal;\n+ BatchGlobal.reserve(BatchLocals.size());\n+ for (uint32_t L : BatchLocals) {\n+ BatchGlobal.push_back(ImportFuncCount + L);\n+ }\n+\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\n+ if (JITLib) {\n+ auto AddrRes = JIT.add(\n+ *JITLib, *LLDataPtr,\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!AddrRes) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\"sv,\n+ AddrRes.error(), ID);\n+ return Unexpect(AddrRes.error());\n+ }\n+ ResolvedAddresses = std::move(*AddrRes);\n+ } else {\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\n+ if (!LoadResult) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\"sv,\n+ LoadResult.error(), ID);\n+ return Unexpect(LoadResult.error());\n+ }\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\n+ if (StatePtr) {\n+ StatePtr->JITLib = JITLib;\n+ }\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\n+ *JITLib, LLDataPtr->getPrefix(),\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!LkRes) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\"sv,\n+ LkRes.error(), ID);\n+ return Unexpect(LkRes.error());\n+ }\n+ ResolvedAddresses = std::move(*LkRes);\n+ }\n+\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\n+ } else {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\n+ const uint32_t L = BatchLocals[I];\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\n+ if (!BatchFuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ WasmFuncIdx, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ auto *BatchFuncInst = *BatchFuncResult;\n+ if (BatchFuncInst->isWasmFunction()) {\n+ auto CompiledSym = JITLib->createSymbol(\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\n+ *>(CompiledCodePtr));\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\n+ }\n+ }\n+\n+ if (StatePtr) {\n+ for (uint32_t L : BatchLocals) {\n+ StatePtr->LazyCompiledFuncs.insert(L);\n+ }\n+ }\n+\n+ spdlog::debug(\n+ \"Lazy compilation completed for batch of {} functions, total compiled: \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(),\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\n+\n+ return {};\n+}\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\n+ WasmEdge::LLVM::LazyJITState State;\n+ LLVM::Compiler Compiler(Conf);\n+ EXPECTED_TRY(\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\n+\n+ auto Prefix = fmt::format(\"m{}_\"sv, Module.getID());\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\n+\n+ State.LLData = std::move(LLModule.first);\n+ State.LLContext = std::move(LLModule.second);\n+\n+ LLVM::JIT JIT(Conf);\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\n+\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\n+\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\n+\n+ return State;\n+}\n+#endif\n+\n } // namespace VM\n } // namespace WasmEdge\n"}],"string":"[\n {\n \"comment\": \"I am thinking about this chain.\\nSince you are trying to have it in multiple places, it would be better to extract.\\nHow about creating a private struct and the helper functions like this?\\n\\n```cpp\\nstruct LazyJITArtifacts {\\n LLVM::Data LLData;\\n std::unique_ptr<LLVM::Compiler::CompileContext,\\n LLVM::Compiler::CompileContextDeleter>\\n LLContext;\\n std::shared_ptr<Executable> Exec;\\n uint32_t ImportFuncCount = 0;\\n};\\n\\nExpect<LazyJITArtifacts>\\nrunLazyJITPipeline(AST::Module &Module);\\n\\n# And handle the return value like this:\\n\\nEXPECTED_TRY(auto Artifacts, runLazyJITPipeline(\\n const_cast<AST::Module &>(Module)));\\nstd::unique_lock Lock(LazyMutex);\\nPending.LLData = std::move(Artifacts.LLData);\\n(......)\\nPending.ImportFuncCount = Artifacts.ImportFuncCount;\\n```\",\n \"path\": \"lib/vm/vm.cpp\",\n \"hunk\": \"@@ -207,10 +302,99 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n }\\n // Validate module.\\n EXPECTED_TRY(ValidatorEngine.validate(Module));\\n+ spdlog::info(\\\"Module validated: {}\\\"sv, Module.getIsValidated());\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().isEnableLazyJIT() &&\\n+ Conf.getRuntimeConfigure().isEnableJIT() && !Module.getSymbol()) {\\n+ LLVM::Compiler Compiler(Conf);\\n+ Compiler.checkConfigure()\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&]() {\\n+ auto Prefix =\\n+ fmt::format(\\\"m{:p}_\\\"sv, reinterpret_cast<const void *>(&Module));\\n+ return Compiler.compileInfrastructure(Module, Prefix);\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto LLModule) {\\n+ std::unique_lock Lock(LazyMutex);\\n+ Pending.LLData = std::move(LLModule.first);\\n+ Pending.LLContext = std::move(LLModule.second);\\n+ LLVM::JIT JIT(Conf);\\n+ return JIT.load(Pending.LLData, true);\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\n+ \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\\nindex 680d35094656..cf594a8be374 100644\\n--- a/lib/vm/vm.cpp\\n+++ b/lib/vm/vm.cpp\\n@@ -3,7 +3,9 @@\\n \\n #include \\\"vm/vm.h\\\"\\n \\n+#include \\\"ast/instruction.h\\\"\\n #include \\\"ast/module.h\\\"\\n+#include \\\"common/enum_errcode.hpp\\\"\\n #include \\\"common/errcode.h\\\"\\n #include \\\"common/types.h\\\"\\n #include \\\"host/wasi/wasimodule.h\\\"\\n@@ -20,14 +22,71 @@\\n #include \\\"host/mock/wasmedge_tensorflow_module.h\\\"\\n #include \\\"host/mock/wasmedge_tensorflowlite_module.h\\\"\\n #include \\\"validator/validator.h\\\"\\n+#include <algorithm>\\n+#include <cstddef>\\n #include <memory>\\n #include <variant>\\n+#include <vector>\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+#include <llvm/IR/Module.h>\\n+#endif\\n \\n namespace WasmEdge {\\n namespace VM {\\n \\n namespace {\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\\n+ uint32_t ImportFuncCount,\\n+ const std::unordered_set<uint32_t> &LazyCompiled,\\n+ std::vector<uint32_t> &OutSortedLocals) {\\n+ OutSortedLocals.clear();\\n+ if (!ModulePtr) {\\n+ return;\\n+ }\\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\\n+\\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\\n+ return;\\n+ }\\n+\\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\\n+ std::vector<uint32_t> Stack;\\n+ Stack.reserve(64);\\n+\\n+ Visited[LocalSeed] = 1;\\n+ Stack.push_back(LocalSeed);\\n+ OutSortedLocals.push_back(LocalSeed);\\n+\\n+ while (!Stack.empty()) {\\n+ const uint32_t L = Stack.back();\\n+ Stack.pop_back();\\n+\\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\\n+ const auto Op = Instr.getOpCode();\\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\\n+ Op == OpCode::Ref__func) {\\n+ const uint32_t Target = Instr.getTargetIndex();\\n+ if (Target >= ImportFuncCount) {\\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\\n+ !LazyCompiled.count(LocalIdx)) {\\n+ Visited[LocalIdx] = 1;\\n+ Stack.push_back(LocalIdx);\\n+ OutSortedLocals.push_back(LocalIdx);\\n+ }\\n+ }\\n+ }\\n+ }\\n+ }\\n+\\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\\n+}\\n+#endif\\n+\\n template <typename T> struct VisitUnit {\\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\\n unsafeLoadBuiltInHosts();\\n unsafeLoadPlugInHosts();\\n \\n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ spdlog::warn(\\n+ \\\"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\\\"sv);\\n+ ExecutorEngine.registerLazyCompilationCallback(\\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\\n+ return lazyCompileFunctions(ID, FuncIdx);\\n+ });\\n+ }\\n+#endif\\n+\\n // Register all module instances.\\n unsafeRegisterBuiltInHosts();\\n unsafeRegisterPlugInHosts();\\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n Stage = VMStage::Validated;\\n }\\n // Load module.\\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\\n- return unsafeRegisterModule(Name, *Module.get());\\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\\n+ LoaderEngine.parseModule(Path));\\n+\\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\\n+\\n+ if (!RegASTModules.empty()) {\\n+ RegASTModules.back() = Module;\\n+ }\\n+\\n+ return {};\\n }\\n \\n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n Stage = VMStage::Validated;\\n }\\n // Load module.\\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\\n- return unsafeRegisterModule(Name, *Module.get());\\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\\n+ LoaderEngine.parseModule(Code));\\n+\\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\\n+\\n+ if (!RegASTModules.empty()) {\\n+ RegASTModules.back() = Module;\\n+ }\\n+\\n+ return {};\\n }\\n \\n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n }\\n // Validate module.\\n EXPECTED_TRY(ValidatorEngine.validate(Module));\\n+\\n+ std::string ID = Module.getID();\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\\n+ !Module.getSymbol()) {\\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\\n+ }\\n+#endif\\n+\\n // Instantiate and register module.\\n EXPECTED_TRY(auto ModInst,\\n ExecutorEngine.registerModule(StoreRef, Module, Name));\\n RegModInsts.push_back(std::move(ModInst));\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (State) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ LazyJITStates.insert({ID, std::move(*State)});\\n+ }\\n+#endif\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ size_t InstIdx = RegModInsts.size() - 1;\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ auto It = RegModMap.find(ID);\\n+ if (It != RegModMap.end()) {\\n+ It->second[1] = InstIdx;\\n+ } else {\\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\\n+ }\\n+ }\\n+#endif\\n+\\n return {};\\n }\\n \\n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\\n }\\n-\\n if (Mod) {\\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\\n+ std::string ID = Mod->getID();\\n+\\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\\n !Mod->getSymbol()) {\\n #ifdef WASMEDGE_USE_LLVM\\n- LLVM::Compiler Compiler(Conf);\\n- Compiler.checkConfigure()\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n- \\\"interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&]() { return Compiler.compile(*Mod); })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n- \\\"interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&](auto LLModule) {\\n- LLVM::JIT JIT(Conf);\\n- return JIT.load(std::move(LLModule));\\n- })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::warn(\\n- \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&](auto Module) {\\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\\n- })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n- \\\"mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- });\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ LazyJITStates[ID] = std::move(State);\\n+ } else {\\n+ LLVM::Compiler Compiler(Conf);\\n+ Compiler.checkConfigure()\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&]() { return Compiler.compile(*Mod); })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto LLModule) {\\n+ LLVM::JIT JIT(Conf);\\n+ return JIT.load(LLModule);\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\n+ \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto Module) {\\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n+ \\\"mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ });\\n+ }\\n #else\\n spdlog::warn(\\\"JIT was requested but WasmEdge was built without LLVM, \\\"\\n \\\"falling back to interpreter.\\\"sv);\\n #endif\\n }\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ auto StateIt = LazyJITStates.find(ID);\\n+ if (StateIt != LazyJITStates.end()) {\\n+ size_t ImportFuncCount = 0;\\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\\n+ ++ImportFuncCount;\\n+ }\\n+ }\\n+ StateIt->second.ImportFuncCount =\\n+ static_cast<uint32_t>(ImportFuncCount);\\n+ StateIt->second.LazyCompiledFuncs.clear();\\n+ }\\n+ }\\n+#endif\\n+\\n EXPECTED_TRY(ActiveModInst,\\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\\n+\\n Stage = VMStage::Instantiated;\\n return {};\\n } else if (Comp) {\\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\\n Runtime::Instance::FunctionInstance *FuncInst =\\n ModInst->findFuncExports(Func);\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+ // lazy JIT: compile function on-demand if needed.\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\\n+ bool NeedsCompile = false;\\n+ uint32_t FuncIdx = UINT32_MAX;\\n+ {\\n+ std::shared_lock Lock(LazyJITMutex);\\n+ if (FuncInst->isWasmFunction()) {\\n+ NeedsCompile = true;\\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\\n+ FuncIdx = *Res;\\n+ }\\n+ }\\n+ }\\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\\n+ !Result) {\\n+ return Unexpect(Result.error());\\n+ }\\n+ }\\n+ }\\n+#endif\\n+\\n // Execute function.\\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\\n .map_error([&ModInst, &Func](auto E) {\\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\\n }\\n StoreRef.reset();\\n RegModInsts.clear();\\n+ RegASTModules.clear();\\n+ RegModMap.clear();\\n Stat.clear();\\n unsafeLoadBuiltInHosts();\\n unsafeLoadPlugInHosts();\\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\\n unsafeRegisterPlugInHosts();\\n LoaderEngine.reset();\\n Stage = VMStage::Inited;\\n+#ifdef WASMEDGE_USE_LLVM\\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\\n+ // LLContexts.\\n+ LazyJITStates.clear();\\n+#endif\\n }\\n \\n std::vector<std::pair<std::string, const AST::FunctionType &>>\\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\\n return nullptr;\\n };\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ uint32_t ImportFuncCount = 0;\\n+ const AST::Module *ModulePtr = nullptr;\\n+ LLVM::Data *LLDataPtr = nullptr;\\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\\n+ nullptr;\\n+ LLVM::LazyJITState *StatePtr = nullptr;\\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\\n+\\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\\n+ ModInst = ActiveModInst.get();\\n+ ModulePtr = Mod.get();\\n+ } else {\\n+ auto ItMap = RegModMap.find(ID);\\n+ if (ItMap != RegModMap.end()) {\\n+ ModInst = RegModInsts[ItMap->second[1]].get();\\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\\n+ }\\n+ }\\n+\\n+ if (!ModInst || !ModulePtr) {\\n+ return {};\\n+ }\\n+\\n+ auto It = LazyJITStates.find(ID);\\n+ if (It != LazyJITStates.end()) {\\n+ StatePtr = &It->second;\\n+ ImportFuncCount = StatePtr->ImportFuncCount;\\n+ LLDataPtr = &StatePtr->LLData;\\n+ LLContextPtr = &StatePtr->LLContext;\\n+ } else {\\n+ spdlog::error(\\\"[lazy-jit]: failed to find JIT state for ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\\n+ }\\n+\\n+ if (FuncIdx < ImportFuncCount) {\\n+ return {};\\n+ }\\n+\\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\\n+\\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\\n+ if (!FuncResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get function instance for index {}, module ID: {}\\\"sv,\\n+ FuncIdx, ID);\\n+ return Unexpect(FuncResult.error());\\n+ }\\n+ auto *FuncInst = *FuncResult;\\n+\\n+ // If already compiled or not a Wasm function, nothing to do.\\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\\n+ return {};\\n+ }\\n+\\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\\n+ return {};\\n+ }\\n+\\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\\n+ const std::unordered_set<uint32_t> &CompiledSet =\\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\\n+\\n+ std::vector<uint32_t> BatchLocals;\\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\\n+ CompiledSet, BatchLocals);\\n+ if (BatchLocals.empty()) {\\n+ return {};\\n+ }\\n+\\n+ spdlog::debug(\\n+ \\\"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \\\"\\n+ \\\"{}, module ID: {}\\\"sv,\\n+ BatchLocals.size(), LocalFuncIdx, ID);\\n+\\n+ LLVM::Compiler Compiler(Conf);\\n+ auto ConfigResult = Compiler.checkConfigure();\\n+ if (!ConfigResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\\\"sv,\\n+ ConfigResult.error(), ID);\\n+ return Unexpect(ConfigResult.error());\\n+ }\\n+\\n+ if (!LLDataPtr->hasModule()) {\\n+ LLDataPtr->resetModule();\\n+ }\\n+ auto CompileResult = Compiler.compileFunctions(\\n+ std::move(*LLDataPtr),\\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\\n+ *ModulePtr,\\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\\n+ if (!CompileResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\\\"sv,\\n+ CompileResult.error(), ID);\\n+ return Unexpect(CompileResult.error());\\n+ }\\n+\\n+ *LLDataPtr = std::move(*CompileResult);\\n+ LLVM::JIT JIT(Conf);\\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\\n+ if (StatePtr && StatePtr->JITLib) {\\n+ JITLib = StatePtr->JITLib;\\n+ }\\n+\\n+ std::vector<uint32_t> BatchGlobal;\\n+ BatchGlobal.reserve(BatchLocals.size());\\n+ for (uint32_t L : BatchLocals) {\\n+ BatchGlobal.push_back(ImportFuncCount + L);\\n+ }\\n+\\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\\n+ if (JITLib) {\\n+ auto AddrRes = JIT.add(\\n+ *JITLib, *LLDataPtr,\\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\\n+ if (!AddrRes) {\\n+ spdlog::error(\\\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\\\"sv,\\n+ AddrRes.error(), ID);\\n+ return Unexpect(AddrRes.error());\\n+ }\\n+ ResolvedAddresses = std::move(*AddrRes);\\n+ } else {\\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\\n+ if (!LoadResult) {\\n+ spdlog::error(\\\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\\\"sv,\\n+ LoadResult.error(), ID);\\n+ return Unexpect(LoadResult.error());\\n+ }\\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\\n+ if (StatePtr) {\\n+ StatePtr->JITLib = JITLib;\\n+ }\\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\\n+ *JITLib, LLDataPtr->getPrefix(),\\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\\n+ if (!LkRes) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\\\"sv,\\n+ LkRes.error(), ID);\\n+ return Unexpect(LkRes.error());\\n+ }\\n+ ResolvedAddresses = std::move(*LkRes);\\n+ }\\n+\\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\\n+ } else {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\\n+ const uint32_t L = BatchLocals[I];\\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\\n+ if (!BatchFuncResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get function instance for index {}, module ID: {}\\\"sv,\\n+ WasmFuncIdx, ID);\\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\\n+ }\\n+\\n+ auto *BatchFuncInst = *BatchFuncResult;\\n+ if (BatchFuncInst->isWasmFunction()) {\\n+ auto CompiledSym = JITLib->createSymbol(\\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\\n+ *>(CompiledCodePtr));\\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\\n+ }\\n+ }\\n+\\n+ if (StatePtr) {\\n+ for (uint32_t L : BatchLocals) {\\n+ StatePtr->LazyCompiledFuncs.insert(L);\\n+ }\\n+ }\\n+\\n+ spdlog::debug(\\n+ \\\"Lazy compilation completed for batch of {} functions, total compiled: \\\"\\n+ \\\"{}, module ID: {}\\\"sv,\\n+ BatchLocals.size(),\\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\\n+\\n+ return {};\\n+}\\n+#endif\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\\n+ WasmEdge::LLVM::LazyJITState State;\\n+ LLVM::Compiler Compiler(Conf);\\n+ EXPECTED_TRY(\\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\\n+\\n+ auto Prefix = fmt::format(\\\"m{}_\\\"sv, Module.getID());\\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\\n+\\n+ State.LLData = std::move(LLModule.first);\\n+ State.LLContext = std::move(LLModule.second);\\n+\\n+ LLVM::JIT JIT(Conf);\\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\\n+\\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\\n+\\n+ size_t ImportFuncCount = 0;\\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\\n+ ++ImportFuncCount;\\n+ }\\n+ }\\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\\n+\\n+ return State;\\n+}\\n+#endif\\n+\\n } // namespace VM\\n } // namespace WasmEdge\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13292,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"If we introduce the above `LazyJITArtifacts`, we no longer need a global `Pending`. We can use the `LazyJITArtifacts` as a local variable to transit these data.\n\nLike this:\n\n```cpp\n LazyJITArtifacts Artifacts;\n bool HasLazyArtifacts = false;\n\n if (lazy mode) {\n EXPECTED_TRY(Artifacts, runLazyJITPipeline(Module));\n HasLazyArtifacts = true;\n }\n\n EXPECTED_TRY(auto ModInst,\n ExecutorEngine.registerModule(StoreRef, Module, Name));\n RegModInsts.push_back(std::move(ModInst));\n\n if (HasLazyArtifacts) {\n std::unique_lock Lock(LazyMutex);\n auto *RegisteredModInst = RegModInsts.back().get();\n auto &State = LazyJITStates[RegisteredModInst];\n State.ImportFuncCount = Artifacts.ImportFuncCount;\n State.LazyCompiledFuncs.clear();\n State.ModulePtr = &Module;\n State.LLData = std::move(Artifacts.LLData);\n State.LLContext = std::move(Artifacts.LLContext);\n State.Exec = std::move(Artifacts.Exec);\n }\n return {};\n```"},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\nindex 680d35094656..cf594a8be374 100644\n--- a/lib/vm/vm.cpp\n+++ b/lib/vm/vm.cpp\n@@ -3,7 +3,9 @@\n \n #include \"vm/vm.h\"\n \n+#include \"ast/instruction.h\"\n #include \"ast/module.h\"\n+#include \"common/enum_errcode.hpp\"\n #include \"common/errcode.h\"\n #include \"common/types.h\"\n #include \"host/wasi/wasimodule.h\"\n@@ -20,14 +22,71 @@\n #include \"host/mock/wasmedge_tensorflow_module.h\"\n #include \"host/mock/wasmedge_tensorflowlite_module.h\"\n #include \"validator/validator.h\"\n+#include <algorithm>\n+#include <cstddef>\n #include <memory>\n #include <variant>\n+#include <vector>\n+\n+#ifdef WASMEDGE_USE_LLVM\n+#include <llvm/IR/Module.h>\n+#endif\n \n namespace WasmEdge {\n namespace VM {\n \n namespace {\n \n+#ifdef WASMEDGE_USE_LLVM\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\n+ uint32_t ImportFuncCount,\n+ const std::unordered_set<uint32_t> &LazyCompiled,\n+ std::vector<uint32_t> &OutSortedLocals) {\n+ OutSortedLocals.clear();\n+ if (!ModulePtr) {\n+ return;\n+ }\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\n+\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\n+ return;\n+ }\n+\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\n+ std::vector<uint32_t> Stack;\n+ Stack.reserve(64);\n+\n+ Visited[LocalSeed] = 1;\n+ Stack.push_back(LocalSeed);\n+ OutSortedLocals.push_back(LocalSeed);\n+\n+ while (!Stack.empty()) {\n+ const uint32_t L = Stack.back();\n+ Stack.pop_back();\n+\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\n+ const auto Op = Instr.getOpCode();\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\n+ Op == OpCode::Ref__func) {\n+ const uint32_t Target = Instr.getTargetIndex();\n+ if (Target >= ImportFuncCount) {\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\n+ !LazyCompiled.count(LocalIdx)) {\n+ Visited[LocalIdx] = 1;\n+ Stack.push_back(LocalIdx);\n+ OutSortedLocals.push_back(LocalIdx);\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\n+}\n+#endif\n+\n template <typename T> struct VisitUnit {\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n \n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ spdlog::warn(\n+ \"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\"sv);\n+ ExecutorEngine.registerLazyCompilationCallback(\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\n+ return lazyCompileFunctions(ID, FuncIdx);\n+ });\n+ }\n+#endif\n+\n // Register all module instances.\n unsafeRegisterBuiltInHosts();\n unsafeRegisterPlugInHosts();\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Path));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Code));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+\n+ std::string ID = Module.getID();\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\n+ !Module.getSymbol()) {\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\n+ }\n+#endif\n+\n // Instantiate and register module.\n EXPECTED_TRY(auto ModInst,\n ExecutorEngine.registerModule(StoreRef, Module, Name));\n RegModInsts.push_back(std::move(ModInst));\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (State) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates.insert({ID, std::move(*State)});\n+ }\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ size_t InstIdx = RegModInsts.size() - 1;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ auto It = RegModMap.find(ID);\n+ if (It != RegModMap.end()) {\n+ It->second[1] = InstIdx;\n+ } else {\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\n+ }\n+ }\n+#endif\n+\n return {};\n }\n \n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\n }\n-\n if (Mod) {\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\n+ std::string ID = Mod->getID();\n+\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\n !Mod->getSymbol()) {\n #ifdef WASMEDGE_USE_LLVM\n- LLVM::Compiler Compiler(Conf);\n- Compiler.checkConfigure()\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&]() { return Compiler.compile(*Mod); })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compilation failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto LLModule) {\n- LLVM::JIT JIT(Conf);\n- return JIT.load(std::move(LLModule));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\n- \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto Module) {\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n- \"mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- });\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates[ID] = std::move(State);\n+ } else {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() { return Compiler.compile(*Mod); })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(LLModule);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Module) {\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n+ \"mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ });\n+ }\n #else\n spdlog::warn(\"JIT was requested but WasmEdge was built without LLVM, \"\n \"falling back to interpreter.\"sv);\n #endif\n }\n \n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ auto StateIt = LazyJITStates.find(ID);\n+ if (StateIt != LazyJITStates.end()) {\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ StateIt->second.ImportFuncCount =\n+ static_cast<uint32_t>(ImportFuncCount);\n+ StateIt->second.LazyCompiledFuncs.clear();\n+ }\n+ }\n+#endif\n+\n EXPECTED_TRY(ActiveModInst,\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\n+\n Stage = VMStage::Instantiated;\n return {};\n } else if (Comp) {\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\n Runtime::Instance::FunctionInstance *FuncInst =\n ModInst->findFuncExports(Func);\n \n+#ifdef WASMEDGE_USE_LLVM\n+ // lazy JIT: compile function on-demand if needed.\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\n+ bool NeedsCompile = false;\n+ uint32_t FuncIdx = UINT32_MAX;\n+ {\n+ std::shared_lock Lock(LazyJITMutex);\n+ if (FuncInst->isWasmFunction()) {\n+ NeedsCompile = true;\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\n+ FuncIdx = *Res;\n+ }\n+ }\n+ }\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\n+ !Result) {\n+ return Unexpect(Result.error());\n+ }\n+ }\n+ }\n+#endif\n+\n // Execute function.\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\n .map_error([&ModInst, &Func](auto E) {\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\n }\n StoreRef.reset();\n RegModInsts.clear();\n+ RegASTModules.clear();\n+ RegModMap.clear();\n Stat.clear();\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\n unsafeRegisterPlugInHosts();\n LoaderEngine.reset();\n Stage = VMStage::Inited;\n+#ifdef WASMEDGE_USE_LLVM\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\n+ // LLContexts.\n+ LazyJITStates.clear();\n+#endif\n }\n \n std::vector<std::pair<std::string, const AST::FunctionType &>>\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\n return nullptr;\n };\n \n+#ifdef WASMEDGE_USE_LLVM\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ uint32_t ImportFuncCount = 0;\n+ const AST::Module *ModulePtr = nullptr;\n+ LLVM::Data *LLDataPtr = nullptr;\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\n+ nullptr;\n+ LLVM::LazyJITState *StatePtr = nullptr;\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\n+\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\n+ ModInst = ActiveModInst.get();\n+ ModulePtr = Mod.get();\n+ } else {\n+ auto ItMap = RegModMap.find(ID);\n+ if (ItMap != RegModMap.end()) {\n+ ModInst = RegModInsts[ItMap->second[1]].get();\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\n+ }\n+ }\n+\n+ if (!ModInst || !ModulePtr) {\n+ return {};\n+ }\n+\n+ auto It = LazyJITStates.find(ID);\n+ if (It != LazyJITStates.end()) {\n+ StatePtr = &It->second;\n+ ImportFuncCount = StatePtr->ImportFuncCount;\n+ LLDataPtr = &StatePtr->LLData;\n+ LLContextPtr = &StatePtr->LLContext;\n+ } else {\n+ spdlog::error(\"[lazy-jit]: failed to find JIT state for ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ if (FuncIdx < ImportFuncCount) {\n+ return {};\n+ }\n+\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\n+\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\n+ if (!FuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ FuncIdx, ID);\n+ return Unexpect(FuncResult.error());\n+ }\n+ auto *FuncInst = *FuncResult;\n+\n+ // If already compiled or not a Wasm function, nothing to do.\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\n+ return {};\n+ }\n+\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\n+ return {};\n+ }\n+\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\n+ const std::unordered_set<uint32_t> &CompiledSet =\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\n+\n+ std::vector<uint32_t> BatchLocals;\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\n+ CompiledSet, BatchLocals);\n+ if (BatchLocals.empty()) {\n+ return {};\n+ }\n+\n+ spdlog::debug(\n+ \"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(), LocalFuncIdx, ID);\n+\n+ LLVM::Compiler Compiler(Conf);\n+ auto ConfigResult = Compiler.checkConfigure();\n+ if (!ConfigResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\"sv,\n+ ConfigResult.error(), ID);\n+ return Unexpect(ConfigResult.error());\n+ }\n+\n+ if (!LLDataPtr->hasModule()) {\n+ LLDataPtr->resetModule();\n+ }\n+ auto CompileResult = Compiler.compileFunctions(\n+ std::move(*LLDataPtr),\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\n+ *ModulePtr,\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\n+ if (!CompileResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\"sv,\n+ CompileResult.error(), ID);\n+ return Unexpect(CompileResult.error());\n+ }\n+\n+ *LLDataPtr = std::move(*CompileResult);\n+ LLVM::JIT JIT(Conf);\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\n+ if (StatePtr && StatePtr->JITLib) {\n+ JITLib = StatePtr->JITLib;\n+ }\n+\n+ std::vector<uint32_t> BatchGlobal;\n+ BatchGlobal.reserve(BatchLocals.size());\n+ for (uint32_t L : BatchLocals) {\n+ BatchGlobal.push_back(ImportFuncCount + L);\n+ }\n+\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\n+ if (JITLib) {\n+ auto AddrRes = JIT.add(\n+ *JITLib, *LLDataPtr,\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!AddrRes) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\"sv,\n+ AddrRes.error(), ID);\n+ return Unexpect(AddrRes.error());\n+ }\n+ ResolvedAddresses = std::move(*AddrRes);\n+ } else {\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\n+ if (!LoadResult) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\"sv,\n+ LoadResult.error(), ID);\n+ return Unexpect(LoadResult.error());\n+ }\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\n+ if (StatePtr) {\n+ StatePtr->JITLib = JITLib;\n+ }\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\n+ *JITLib, LLDataPtr->getPrefix(),\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!LkRes) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\"sv,\n+ LkRes.error(), ID);\n+ return Unexpect(LkRes.error());\n+ }\n+ ResolvedAddresses = std::move(*LkRes);\n+ }\n+\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\n+ } else {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\n+ const uint32_t L = BatchLocals[I];\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\n+ if (!BatchFuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ WasmFuncIdx, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ auto *BatchFuncInst = *BatchFuncResult;\n+ if (BatchFuncInst->isWasmFunction()) {\n+ auto CompiledSym = JITLib->createSymbol(\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\n+ *>(CompiledCodePtr));\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\n+ }\n+ }\n+\n+ if (StatePtr) {\n+ for (uint32_t L : BatchLocals) {\n+ StatePtr->LazyCompiledFuncs.insert(L);\n+ }\n+ }\n+\n+ spdlog::debug(\n+ \"Lazy compilation completed for batch of {} functions, total compiled: \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(),\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\n+\n+ return {};\n+}\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\n+ WasmEdge::LLVM::LazyJITState State;\n+ LLVM::Compiler Compiler(Conf);\n+ EXPECTED_TRY(\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\n+\n+ auto Prefix = fmt::format(\"m{}_\"sv, Module.getID());\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\n+\n+ State.LLData = std::move(LLModule.first);\n+ State.LLContext = std::move(LLModule.second);\n+\n+ LLVM::JIT JIT(Conf);\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\n+\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\n+\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\n+\n+ return State;\n+}\n+#endif\n+\n } // namespace VM\n } // namespace WasmEdge\n"},"changed_files":{"kind":"list like","value":["lib/vm/vm.cpp"],"string":"[\n \"lib/vm/vm.cpp\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"If we introduce the above `LazyJITArtifacts`, we no longer need a global `Pending`. We can use the `LazyJITArtifacts` as a local variable to transit these data.\n\nLike this:\n\n```cpp\n LazyJITArtifacts Artifacts;\n bool HasLazyArtifacts = false;\n\n if (lazy mode) {\n EXPECTED_TRY(Artifacts, runLazyJITPipeline(Module));\n HasLazyArtifacts = true;\n }\n\n EXPECTED_TRY(auto ModInst,\n ExecutorEngine.registerModule(StoreRef, Module, Name));\n RegModInsts.push_back(std::move(ModInst));\n\n if (HasLazyArtifacts) {\n std::unique_lock Lock(LazyMutex);\n auto *RegisteredModInst = RegModInsts.back().get();\n auto &State = LazyJITStates[RegisteredModInst];\n State.ImportFuncCount = Artifacts.ImportFuncCount;\n State.LazyCompiledFuncs.clear();\n State.ModulePtr = &Module;\n State.LLData = std::move(Artifacts.LLData);\n State.LLContext = std::move(Artifacts.LLContext);\n State.Exec = std::move(Artifacts.Exec);\n }\n return {};\n```","path":"lib/vm/vm.cpp","hunk":"@@ -207,10 +302,99 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+ spdlog::info(\"Module validated: {}\"sv, Module.getIsValidated());\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().isEnableLazyJIT() &&\n+ Conf.getRuntimeConfigure().isEnableJIT() && !Module.getSymbol()) {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() {\n+ auto Prefix =\n+ fmt::format(\"m{:p}_\"sv, reinterpret_cast<const void *>(&Module));\n+ return Compiler.compileInfrastructure(Module, Prefix);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ std::unique_lock Lock(LazyMutex);\n+ Pending.LLData = std::move(LLModule.first);\n+ Pending.LLContext = std::move(LLModule.second);\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(Pending.LLData, true);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Exec) {\n+ std::unique_lock Lock(LazyMutex);\n+ Pending.Exec = Exec;\n+ return LoaderEngine.loadExecutable(const_cast<AST::Module &>(Module),\n+ std::move(Exec));\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n+ \"mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ });\n+\n+ std::unique_lock Lock(LazyMutex);\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ Pending.Module = &Module;\n+ Pending.ModuleInstance = nullptr;\n+ Pending.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\nindex 680d35094656..cf594a8be374 100644\n--- a/lib/vm/vm.cpp\n+++ b/lib/vm/vm.cpp\n@@ -3,7 +3,9 @@\n \n #include \"vm/vm.h\"\n \n+#include \"ast/instruction.h\"\n #include \"ast/module.h\"\n+#include \"common/enum_errcode.hpp\"\n #include \"common/errcode.h\"\n #include \"common/types.h\"\n #include \"host/wasi/wasimodule.h\"\n@@ -20,14 +22,71 @@\n #include \"host/mock/wasmedge_tensorflow_module.h\"\n #include \"host/mock/wasmedge_tensorflowlite_module.h\"\n #include \"validator/validator.h\"\n+#include <algorithm>\n+#include <cstddef>\n #include <memory>\n #include <variant>\n+#include <vector>\n+\n+#ifdef WASMEDGE_USE_LLVM\n+#include <llvm/IR/Module.h>\n+#endif\n \n namespace WasmEdge {\n namespace VM {\n \n namespace {\n \n+#ifdef WASMEDGE_USE_LLVM\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\n+ uint32_t ImportFuncCount,\n+ const std::unordered_set<uint32_t> &LazyCompiled,\n+ std::vector<uint32_t> &OutSortedLocals) {\n+ OutSortedLocals.clear();\n+ if (!ModulePtr) {\n+ return;\n+ }\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\n+\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\n+ return;\n+ }\n+\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\n+ std::vector<uint32_t> Stack;\n+ Stack.reserve(64);\n+\n+ Visited[LocalSeed] = 1;\n+ Stack.push_back(LocalSeed);\n+ OutSortedLocals.push_back(LocalSeed);\n+\n+ while (!Stack.empty()) {\n+ const uint32_t L = Stack.back();\n+ Stack.pop_back();\n+\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\n+ const auto Op = Instr.getOpCode();\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\n+ Op == OpCode::Ref__func) {\n+ const uint32_t Target = Instr.getTargetIndex();\n+ if (Target >= ImportFuncCount) {\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\n+ !LazyCompiled.count(LocalIdx)) {\n+ Visited[LocalIdx] = 1;\n+ Stack.push_back(LocalIdx);\n+ OutSortedLocals.push_back(LocalIdx);\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\n+}\n+#endif\n+\n template <typename T> struct VisitUnit {\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n \n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ spdlog::warn(\n+ \"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\"sv);\n+ ExecutorEngine.registerLazyCompilationCallback(\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\n+ return lazyCompileFunctions(ID, FuncIdx);\n+ });\n+ }\n+#endif\n+\n // Register all module instances.\n unsafeRegisterBuiltInHosts();\n unsafeRegisterPlugInHosts();\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Path));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Code));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+\n+ std::string ID = Module.getID();\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\n+ !Module.getSymbol()) {\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\n+ }\n+#endif\n+\n // Instantiate and register module.\n EXPECTED_TRY(auto ModInst,\n ExecutorEngine.registerModule(StoreRef, Module, Name));\n RegModInsts.push_back(std::move(ModInst));\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (State) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates.insert({ID, std::move(*State)});\n+ }\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ size_t InstIdx = RegModInsts.size() - 1;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ auto It = RegModMap.find(ID);\n+ if (It != RegModMap.end()) {\n+ It->second[1] = InstIdx;\n+ } else {\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\n+ }\n+ }\n+#endif\n+\n return {};\n }\n \n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\n }\n-\n if (Mod) {\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\n+ std::string ID = Mod->getID();\n+\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\n !Mod->getSymbol()) {\n #ifdef WASMEDGE_USE_LLVM\n- LLVM::Compiler Compiler(Conf);\n- Compiler.checkConfigure()\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&]() { return Compiler.compile(*Mod); })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compilation failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto LLModule) {\n- LLVM::JIT JIT(Conf);\n- return JIT.load(std::move(LLModule));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\n- \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto Module) {\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n- \"mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- });\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates[ID] = std::move(State);\n+ } else {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() { return Compiler.compile(*Mod); })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(LLModule);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Module) {\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n+ \"mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ });\n+ }\n #else\n spdlog::warn(\"JIT was requested but WasmEdge was built without LLVM, \"\n \"falling back to interpreter.\"sv);\n #endif\n }\n \n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ auto StateIt = LazyJITStates.find(ID);\n+ if (StateIt != LazyJITStates.end()) {\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ StateIt->second.ImportFuncCount =\n+ static_cast<uint32_t>(ImportFuncCount);\n+ StateIt->second.LazyCompiledFuncs.clear();\n+ }\n+ }\n+#endif\n+\n EXPECTED_TRY(ActiveModInst,\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\n+\n Stage = VMStage::Instantiated;\n return {};\n } else if (Comp) {\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\n Runtime::Instance::FunctionInstance *FuncInst =\n ModInst->findFuncExports(Func);\n \n+#ifdef WASMEDGE_USE_LLVM\n+ // lazy JIT: compile function on-demand if needed.\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\n+ bool NeedsCompile = false;\n+ uint32_t FuncIdx = UINT32_MAX;\n+ {\n+ std::shared_lock Lock(LazyJITMutex);\n+ if (FuncInst->isWasmFunction()) {\n+ NeedsCompile = true;\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\n+ FuncIdx = *Res;\n+ }\n+ }\n+ }\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\n+ !Result) {\n+ return Unexpect(Result.error());\n+ }\n+ }\n+ }\n+#endif\n+\n // Execute function.\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\n .map_error([&ModInst, &Func](auto E) {\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\n }\n StoreRef.reset();\n RegModInsts.clear();\n+ RegASTModules.clear();\n+ RegModMap.clear();\n Stat.clear();\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\n unsafeRegisterPlugInHosts();\n LoaderEngine.reset();\n Stage = VMStage::Inited;\n+#ifdef WASMEDGE_USE_LLVM\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\n+ // LLContexts.\n+ LazyJITStates.clear();\n+#endif\n }\n \n std::vector<std::pair<std::string, const AST::FunctionType &>>\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\n return nullptr;\n };\n \n+#ifdef WASMEDGE_USE_LLVM\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ uint32_t ImportFuncCount = 0;\n+ const AST::Module *ModulePtr = nullptr;\n+ LLVM::Data *LLDataPtr = nullptr;\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\n+ nullptr;\n+ LLVM::LazyJITState *StatePtr = nullptr;\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\n+\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\n+ ModInst = ActiveModInst.get();\n+ ModulePtr = Mod.get();\n+ } else {\n+ auto ItMap = RegModMap.find(ID);\n+ if (ItMap != RegModMap.end()) {\n+ ModInst = RegModInsts[ItMap->second[1]].get();\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\n+ }\n+ }\n+\n+ if (!ModInst || !ModulePtr) {\n+ return {};\n+ }\n+\n+ auto It = LazyJITStates.find(ID);\n+ if (It != LazyJITStates.end()) {\n+ StatePtr = &It->second;\n+ ImportFuncCount = StatePtr->ImportFuncCount;\n+ LLDataPtr = &StatePtr->LLData;\n+ LLContextPtr = &StatePtr->LLContext;\n+ } else {\n+ spdlog::error(\"[lazy-jit]: failed to find JIT state for ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ if (FuncIdx < ImportFuncCount) {\n+ return {};\n+ }\n+\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\n+\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\n+ if (!FuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ FuncIdx, ID);\n+ return Unexpect(FuncResult.error());\n+ }\n+ auto *FuncInst = *FuncResult;\n+\n+ // If already compiled or not a Wasm function, nothing to do.\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\n+ return {};\n+ }\n+\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\n+ return {};\n+ }\n+\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\n+ const std::unordered_set<uint32_t> &CompiledSet =\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\n+\n+ std::vector<uint32_t> BatchLocals;\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\n+ CompiledSet, BatchLocals);\n+ if (BatchLocals.empty()) {\n+ return {};\n+ }\n+\n+ spdlog::debug(\n+ \"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(), LocalFuncIdx, ID);\n+\n+ LLVM::Compiler Compiler(Conf);\n+ auto ConfigResult = Compiler.checkConfigure();\n+ if (!ConfigResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\"sv,\n+ ConfigResult.error(), ID);\n+ return Unexpect(ConfigResult.error());\n+ }\n+\n+ if (!LLDataPtr->hasModule()) {\n+ LLDataPtr->resetModule();\n+ }\n+ auto CompileResult = Compiler.compileFunctions(\n+ std::move(*LLDataPtr),\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\n+ *ModulePtr,\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\n+ if (!CompileResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\"sv,\n+ CompileResult.error(), ID);\n+ return Unexpect(CompileResult.error());\n+ }\n+\n+ *LLDataPtr = std::move(*CompileResult);\n+ LLVM::JIT JIT(Conf);\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\n+ if (StatePtr && StatePtr->JITLib) {\n+ JITLib = StatePtr->JITLib;\n+ }\n+\n+ std::vector<uint32_t> BatchGlobal;\n+ BatchGlobal.reserve(BatchLocals.size());\n+ for (uint32_t L : BatchLocals) {\n+ BatchGlobal.push_back(ImportFuncCount + L);\n+ }\n+\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\n+ if (JITLib) {\n+ auto AddrRes = JIT.add(\n+ *JITLib, *LLDataPtr,\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!AddrRes) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\"sv,\n+ AddrRes.error(), ID);\n+ return Unexpect(AddrRes.error());\n+ }\n+ ResolvedAddresses = std::move(*AddrRes);\n+ } else {\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\n+ if (!LoadResult) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\"sv,\n+ LoadResult.error(), ID);\n+ return Unexpect(LoadResult.error());\n+ }\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\n+ if (StatePtr) {\n+ StatePtr->JITLib = JITLib;\n+ }\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\n+ *JITLib, LLDataPtr->getPrefix(),\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!LkRes) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\"sv,\n+ LkRes.error(), ID);\n+ return Unexpect(LkRes.error());\n+ }\n+ ResolvedAddresses = std::move(*LkRes);\n+ }\n+\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\n+ } else {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\n+ const uint32_t L = BatchLocals[I];\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\n+ if (!BatchFuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ WasmFuncIdx, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ auto *BatchFuncInst = *BatchFuncResult;\n+ if (BatchFuncInst->isWasmFunction()) {\n+ auto CompiledSym = JITLib->createSymbol(\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\n+ *>(CompiledCodePtr));\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\n+ }\n+ }\n+\n+ if (StatePtr) {\n+ for (uint32_t L : BatchLocals) {\n+ StatePtr->LazyCompiledFuncs.insert(L);\n+ }\n+ }\n+\n+ spdlog::debug(\n+ \"Lazy compilation completed for batch of {} functions, total compiled: \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(),\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\n+\n+ return {};\n+}\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\n+ WasmEdge::LLVM::LazyJITState State;\n+ LLVM::Compiler Compiler(Conf);\n+ EXPECTED_TRY(\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\n+\n+ auto Prefix = fmt::format(\"m{}_\"sv, Module.getID());\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\n+\n+ State.LLData = std::move(LLModule.first);\n+ State.LLContext = std::move(LLModule.second);\n+\n+ LLVM::JIT JIT(Conf);\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\n+\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\n+\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\n+\n+ return State;\n+}\n+#endif\n+\n } // namespace VM\n } // namespace WasmEdge\n"}],"string":"[\n {\n \"comment\": \"If we introduce the above `LazyJITArtifacts`, we no longer need a global `Pending`. We can use the `LazyJITArtifacts` as a local variable to transit these data.\\n\\nLike this:\\n\\n```cpp\\n LazyJITArtifacts Artifacts;\\n bool HasLazyArtifacts = false;\\n\\n if (lazy mode) {\\n EXPECTED_TRY(Artifacts, runLazyJITPipeline(Module));\\n HasLazyArtifacts = true;\\n }\\n\\n EXPECTED_TRY(auto ModInst,\\n ExecutorEngine.registerModule(StoreRef, Module, Name));\\n RegModInsts.push_back(std::move(ModInst));\\n\\n if (HasLazyArtifacts) {\\n std::unique_lock Lock(LazyMutex);\\n auto *RegisteredModInst = RegModInsts.back().get();\\n auto &State = LazyJITStates[RegisteredModInst];\\n State.ImportFuncCount = Artifacts.ImportFuncCount;\\n State.LazyCompiledFuncs.clear();\\n State.ModulePtr = &Module;\\n State.LLData = std::move(Artifacts.LLData);\\n State.LLContext = std::move(Artifacts.LLContext);\\n State.Exec = std::move(Artifacts.Exec);\\n }\\n return {};\\n```\",\n \"path\": \"lib/vm/vm.cpp\",\n \"hunk\": \"@@ -207,10 +302,99 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n }\\n // Validate module.\\n EXPECTED_TRY(ValidatorEngine.validate(Module));\\n+ spdlog::info(\\\"Module validated: {}\\\"sv, Module.getIsValidated());\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().isEnableLazyJIT() &&\\n+ Conf.getRuntimeConfigure().isEnableJIT() && !Module.getSymbol()) {\\n+ LLVM::Compiler Compiler(Conf);\\n+ Compiler.checkConfigure()\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&]() {\\n+ auto Prefix =\\n+ fmt::format(\\\"m{:p}_\\\"sv, reinterpret_cast<const void *>(&Module));\\n+ return Compiler.compileInfrastructure(Module, Prefix);\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto LLModule) {\\n+ std::unique_lock Lock(LazyMutex);\\n+ Pending.LLData = std::move(LLModule.first);\\n+ Pending.LLContext = std::move(LLModule.second);\\n+ LLVM::JIT JIT(Conf);\\n+ return JIT.load(Pending.LLData, true);\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\n+ \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto Exec) {\\n+ std::unique_lock Lock(LazyMutex);\\n+ Pending.Exec = Exec;\\n+ return LoaderEngine.loadExecutable(const_cast<AST::Module &>(Module),\\n+ std::move(Exec));\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n+ \\\"mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ });\\n+\\n+ std::unique_lock Lock(LazyMutex);\\n+ size_t ImportFuncCount = 0;\\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\\n+ ++ImportFuncCount;\\n+ }\\n+ }\\n+ Pending.Module = &Module;\\n+ Pending.ModuleInstance = nullptr;\\n+ Pending.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\\nindex 680d35094656..cf594a8be374 100644\\n--- a/lib/vm/vm.cpp\\n+++ b/lib/vm/vm.cpp\\n@@ -3,7 +3,9 @@\\n \\n #include \\\"vm/vm.h\\\"\\n \\n+#include \\\"ast/instruction.h\\\"\\n #include \\\"ast/module.h\\\"\\n+#include \\\"common/enum_errcode.hpp\\\"\\n #include \\\"common/errcode.h\\\"\\n #include \\\"common/types.h\\\"\\n #include \\\"host/wasi/wasimodule.h\\\"\\n@@ -20,14 +22,71 @@\\n #include \\\"host/mock/wasmedge_tensorflow_module.h\\\"\\n #include \\\"host/mock/wasmedge_tensorflowlite_module.h\\\"\\n #include \\\"validator/validator.h\\\"\\n+#include <algorithm>\\n+#include <cstddef>\\n #include <memory>\\n #include <variant>\\n+#include <vector>\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+#include <llvm/IR/Module.h>\\n+#endif\\n \\n namespace WasmEdge {\\n namespace VM {\\n \\n namespace {\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\\n+ uint32_t ImportFuncCount,\\n+ const std::unordered_set<uint32_t> &LazyCompiled,\\n+ std::vector<uint32_t> &OutSortedLocals) {\\n+ OutSortedLocals.clear();\\n+ if (!ModulePtr) {\\n+ return;\\n+ }\\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\\n+\\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\\n+ return;\\n+ }\\n+\\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\\n+ std::vector<uint32_t> Stack;\\n+ Stack.reserve(64);\\n+\\n+ Visited[LocalSeed] = 1;\\n+ Stack.push_back(LocalSeed);\\n+ OutSortedLocals.push_back(LocalSeed);\\n+\\n+ while (!Stack.empty()) {\\n+ const uint32_t L = Stack.back();\\n+ Stack.pop_back();\\n+\\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\\n+ const auto Op = Instr.getOpCode();\\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\\n+ Op == OpCode::Ref__func) {\\n+ const uint32_t Target = Instr.getTargetIndex();\\n+ if (Target >= ImportFuncCount) {\\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\\n+ !LazyCompiled.count(LocalIdx)) {\\n+ Visited[LocalIdx] = 1;\\n+ Stack.push_back(LocalIdx);\\n+ OutSortedLocals.push_back(LocalIdx);\\n+ }\\n+ }\\n+ }\\n+ }\\n+ }\\n+\\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\\n+}\\n+#endif\\n+\\n template <typename T> struct VisitUnit {\\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\\n unsafeLoadBuiltInHosts();\\n unsafeLoadPlugInHosts();\\n \\n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ spdlog::warn(\\n+ \\\"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\\\"sv);\\n+ ExecutorEngine.registerLazyCompilationCallback(\\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\\n+ return lazyCompileFunctions(ID, FuncIdx);\\n+ });\\n+ }\\n+#endif\\n+\\n // Register all module instances.\\n unsafeRegisterBuiltInHosts();\\n unsafeRegisterPlugInHosts();\\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n Stage = VMStage::Validated;\\n }\\n // Load module.\\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\\n- return unsafeRegisterModule(Name, *Module.get());\\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\\n+ LoaderEngine.parseModule(Path));\\n+\\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\\n+\\n+ if (!RegASTModules.empty()) {\\n+ RegASTModules.back() = Module;\\n+ }\\n+\\n+ return {};\\n }\\n \\n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n Stage = VMStage::Validated;\\n }\\n // Load module.\\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\\n- return unsafeRegisterModule(Name, *Module.get());\\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\\n+ LoaderEngine.parseModule(Code));\\n+\\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\\n+\\n+ if (!RegASTModules.empty()) {\\n+ RegASTModules.back() = Module;\\n+ }\\n+\\n+ return {};\\n }\\n \\n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n }\\n // Validate module.\\n EXPECTED_TRY(ValidatorEngine.validate(Module));\\n+\\n+ std::string ID = Module.getID();\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\\n+ !Module.getSymbol()) {\\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\\n+ }\\n+#endif\\n+\\n // Instantiate and register module.\\n EXPECTED_TRY(auto ModInst,\\n ExecutorEngine.registerModule(StoreRef, Module, Name));\\n RegModInsts.push_back(std::move(ModInst));\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (State) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ LazyJITStates.insert({ID, std::move(*State)});\\n+ }\\n+#endif\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ size_t InstIdx = RegModInsts.size() - 1;\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ auto It = RegModMap.find(ID);\\n+ if (It != RegModMap.end()) {\\n+ It->second[1] = InstIdx;\\n+ } else {\\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\\n+ }\\n+ }\\n+#endif\\n+\\n return {};\\n }\\n \\n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\\n }\\n-\\n if (Mod) {\\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\\n+ std::string ID = Mod->getID();\\n+\\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\\n !Mod->getSymbol()) {\\n #ifdef WASMEDGE_USE_LLVM\\n- LLVM::Compiler Compiler(Conf);\\n- Compiler.checkConfigure()\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n- \\\"interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&]() { return Compiler.compile(*Mod); })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n- \\\"interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&](auto LLModule) {\\n- LLVM::JIT JIT(Conf);\\n- return JIT.load(std::move(LLModule));\\n- })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::warn(\\n- \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&](auto Module) {\\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\\n- })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n- \\\"mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- });\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ LazyJITStates[ID] = std::move(State);\\n+ } else {\\n+ LLVM::Compiler Compiler(Conf);\\n+ Compiler.checkConfigure()\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&]() { return Compiler.compile(*Mod); })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto LLModule) {\\n+ LLVM::JIT JIT(Conf);\\n+ return JIT.load(LLModule);\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\n+ \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto Module) {\\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n+ \\\"mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ });\\n+ }\\n #else\\n spdlog::warn(\\\"JIT was requested but WasmEdge was built without LLVM, \\\"\\n \\\"falling back to interpreter.\\\"sv);\\n #endif\\n }\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ auto StateIt = LazyJITStates.find(ID);\\n+ if (StateIt != LazyJITStates.end()) {\\n+ size_t ImportFuncCount = 0;\\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\\n+ ++ImportFuncCount;\\n+ }\\n+ }\\n+ StateIt->second.ImportFuncCount =\\n+ static_cast<uint32_t>(ImportFuncCount);\\n+ StateIt->second.LazyCompiledFuncs.clear();\\n+ }\\n+ }\\n+#endif\\n+\\n EXPECTED_TRY(ActiveModInst,\\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\\n+\\n Stage = VMStage::Instantiated;\\n return {};\\n } else if (Comp) {\\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\\n Runtime::Instance::FunctionInstance *FuncInst =\\n ModInst->findFuncExports(Func);\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+ // lazy JIT: compile function on-demand if needed.\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\\n+ bool NeedsCompile = false;\\n+ uint32_t FuncIdx = UINT32_MAX;\\n+ {\\n+ std::shared_lock Lock(LazyJITMutex);\\n+ if (FuncInst->isWasmFunction()) {\\n+ NeedsCompile = true;\\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\\n+ FuncIdx = *Res;\\n+ }\\n+ }\\n+ }\\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\\n+ !Result) {\\n+ return Unexpect(Result.error());\\n+ }\\n+ }\\n+ }\\n+#endif\\n+\\n // Execute function.\\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\\n .map_error([&ModInst, &Func](auto E) {\\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\\n }\\n StoreRef.reset();\\n RegModInsts.clear();\\n+ RegASTModules.clear();\\n+ RegModMap.clear();\\n Stat.clear();\\n unsafeLoadBuiltInHosts();\\n unsafeLoadPlugInHosts();\\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\\n unsafeRegisterPlugInHosts();\\n LoaderEngine.reset();\\n Stage = VMStage::Inited;\\n+#ifdef WASMEDGE_USE_LLVM\\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\\n+ // LLContexts.\\n+ LazyJITStates.clear();\\n+#endif\\n }\\n \\n std::vector<std::pair<std::string, const AST::FunctionType &>>\\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\\n return nullptr;\\n };\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ uint32_t ImportFuncCount = 0;\\n+ const AST::Module *ModulePtr = nullptr;\\n+ LLVM::Data *LLDataPtr = nullptr;\\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\\n+ nullptr;\\n+ LLVM::LazyJITState *StatePtr = nullptr;\\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\\n+\\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\\n+ ModInst = ActiveModInst.get();\\n+ ModulePtr = Mod.get();\\n+ } else {\\n+ auto ItMap = RegModMap.find(ID);\\n+ if (ItMap != RegModMap.end()) {\\n+ ModInst = RegModInsts[ItMap->second[1]].get();\\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\\n+ }\\n+ }\\n+\\n+ if (!ModInst || !ModulePtr) {\\n+ return {};\\n+ }\\n+\\n+ auto It = LazyJITStates.find(ID);\\n+ if (It != LazyJITStates.end()) {\\n+ StatePtr = &It->second;\\n+ ImportFuncCount = StatePtr->ImportFuncCount;\\n+ LLDataPtr = &StatePtr->LLData;\\n+ LLContextPtr = &StatePtr->LLContext;\\n+ } else {\\n+ spdlog::error(\\\"[lazy-jit]: failed to find JIT state for ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\\n+ }\\n+\\n+ if (FuncIdx < ImportFuncCount) {\\n+ return {};\\n+ }\\n+\\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\\n+\\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\\n+ if (!FuncResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get function instance for index {}, module ID: {}\\\"sv,\\n+ FuncIdx, ID);\\n+ return Unexpect(FuncResult.error());\\n+ }\\n+ auto *FuncInst = *FuncResult;\\n+\\n+ // If already compiled or not a Wasm function, nothing to do.\\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\\n+ return {};\\n+ }\\n+\\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\\n+ return {};\\n+ }\\n+\\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\\n+ const std::unordered_set<uint32_t> &CompiledSet =\\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\\n+\\n+ std::vector<uint32_t> BatchLocals;\\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\\n+ CompiledSet, BatchLocals);\\n+ if (BatchLocals.empty()) {\\n+ return {};\\n+ }\\n+\\n+ spdlog::debug(\\n+ \\\"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \\\"\\n+ \\\"{}, module ID: {}\\\"sv,\\n+ BatchLocals.size(), LocalFuncIdx, ID);\\n+\\n+ LLVM::Compiler Compiler(Conf);\\n+ auto ConfigResult = Compiler.checkConfigure();\\n+ if (!ConfigResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\\\"sv,\\n+ ConfigResult.error(), ID);\\n+ return Unexpect(ConfigResult.error());\\n+ }\\n+\\n+ if (!LLDataPtr->hasModule()) {\\n+ LLDataPtr->resetModule();\\n+ }\\n+ auto CompileResult = Compiler.compileFunctions(\\n+ std::move(*LLDataPtr),\\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\\n+ *ModulePtr,\\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\\n+ if (!CompileResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\\\"sv,\\n+ CompileResult.error(), ID);\\n+ return Unexpect(CompileResult.error());\\n+ }\\n+\\n+ *LLDataPtr = std::move(*CompileResult);\\n+ LLVM::JIT JIT(Conf);\\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\\n+ if (StatePtr && StatePtr->JITLib) {\\n+ JITLib = StatePtr->JITLib;\\n+ }\\n+\\n+ std::vector<uint32_t> BatchGlobal;\\n+ BatchGlobal.reserve(BatchLocals.size());\\n+ for (uint32_t L : BatchLocals) {\\n+ BatchGlobal.push_back(ImportFuncCount + L);\\n+ }\\n+\\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\\n+ if (JITLib) {\\n+ auto AddrRes = JIT.add(\\n+ *JITLib, *LLDataPtr,\\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\\n+ if (!AddrRes) {\\n+ spdlog::error(\\\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\\\"sv,\\n+ AddrRes.error(), ID);\\n+ return Unexpect(AddrRes.error());\\n+ }\\n+ ResolvedAddresses = std::move(*AddrRes);\\n+ } else {\\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\\n+ if (!LoadResult) {\\n+ spdlog::error(\\\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\\\"sv,\\n+ LoadResult.error(), ID);\\n+ return Unexpect(LoadResult.error());\\n+ }\\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\\n+ if (StatePtr) {\\n+ StatePtr->JITLib = JITLib;\\n+ }\\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\\n+ *JITLib, LLDataPtr->getPrefix(),\\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\\n+ if (!LkRes) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\\\"sv,\\n+ LkRes.error(), ID);\\n+ return Unexpect(LkRes.error());\\n+ }\\n+ ResolvedAddresses = std::move(*LkRes);\\n+ }\\n+\\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\\n+ } else {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\\n+ const uint32_t L = BatchLocals[I];\\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\\n+ if (!BatchFuncResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get function instance for index {}, module ID: {}\\\"sv,\\n+ WasmFuncIdx, ID);\\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\\n+ }\\n+\\n+ auto *BatchFuncInst = *BatchFuncResult;\\n+ if (BatchFuncInst->isWasmFunction()) {\\n+ auto CompiledSym = JITLib->createSymbol(\\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\\n+ *>(CompiledCodePtr));\\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\\n+ }\\n+ }\\n+\\n+ if (StatePtr) {\\n+ for (uint32_t L : BatchLocals) {\\n+ StatePtr->LazyCompiledFuncs.insert(L);\\n+ }\\n+ }\\n+\\n+ spdlog::debug(\\n+ \\\"Lazy compilation completed for batch of {} functions, total compiled: \\\"\\n+ \\\"{}, module ID: {}\\\"sv,\\n+ BatchLocals.size(),\\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\\n+\\n+ return {};\\n+}\\n+#endif\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\\n+ WasmEdge::LLVM::LazyJITState State;\\n+ LLVM::Compiler Compiler(Conf);\\n+ EXPECTED_TRY(\\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\\n+\\n+ auto Prefix = fmt::format(\\\"m{}_\\\"sv, Module.getID());\\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\\n+\\n+ State.LLData = std::move(LLModule.first);\\n+ State.LLContext = std::move(LLModule.second);\\n+\\n+ LLVM::JIT JIT(Conf);\\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\\n+\\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\\n+\\n+ size_t ImportFuncCount = 0;\\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\\n+ ++ImportFuncCount;\\n+ }\\n+ }\\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\\n+\\n+ return State;\\n+}\\n+#endif\\n+\\n } // namespace VM\\n } // namespace WasmEdge\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13293,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"Why do we need to change this part?"},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\nindex 680d35094656..cf594a8be374 100644\n--- a/lib/vm/vm.cpp\n+++ b/lib/vm/vm.cpp\n@@ -3,7 +3,9 @@\n \n #include \"vm/vm.h\"\n \n+#include \"ast/instruction.h\"\n #include \"ast/module.h\"\n+#include \"common/enum_errcode.hpp\"\n #include \"common/errcode.h\"\n #include \"common/types.h\"\n #include \"host/wasi/wasimodule.h\"\n@@ -20,14 +22,71 @@\n #include \"host/mock/wasmedge_tensorflow_module.h\"\n #include \"host/mock/wasmedge_tensorflowlite_module.h\"\n #include \"validator/validator.h\"\n+#include <algorithm>\n+#include <cstddef>\n #include <memory>\n #include <variant>\n+#include <vector>\n+\n+#ifdef WASMEDGE_USE_LLVM\n+#include <llvm/IR/Module.h>\n+#endif\n \n namespace WasmEdge {\n namespace VM {\n \n namespace {\n \n+#ifdef WASMEDGE_USE_LLVM\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\n+ uint32_t ImportFuncCount,\n+ const std::unordered_set<uint32_t> &LazyCompiled,\n+ std::vector<uint32_t> &OutSortedLocals) {\n+ OutSortedLocals.clear();\n+ if (!ModulePtr) {\n+ return;\n+ }\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\n+\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\n+ return;\n+ }\n+\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\n+ std::vector<uint32_t> Stack;\n+ Stack.reserve(64);\n+\n+ Visited[LocalSeed] = 1;\n+ Stack.push_back(LocalSeed);\n+ OutSortedLocals.push_back(LocalSeed);\n+\n+ while (!Stack.empty()) {\n+ const uint32_t L = Stack.back();\n+ Stack.pop_back();\n+\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\n+ const auto Op = Instr.getOpCode();\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\n+ Op == OpCode::Ref__func) {\n+ const uint32_t Target = Instr.getTargetIndex();\n+ if (Target >= ImportFuncCount) {\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\n+ !LazyCompiled.count(LocalIdx)) {\n+ Visited[LocalIdx] = 1;\n+ Stack.push_back(LocalIdx);\n+ OutSortedLocals.push_back(LocalIdx);\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\n+}\n+#endif\n+\n template <typename T> struct VisitUnit {\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n \n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ spdlog::warn(\n+ \"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\"sv);\n+ ExecutorEngine.registerLazyCompilationCallback(\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\n+ return lazyCompileFunctions(ID, FuncIdx);\n+ });\n+ }\n+#endif\n+\n // Register all module instances.\n unsafeRegisterBuiltInHosts();\n unsafeRegisterPlugInHosts();\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Path));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Code));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+\n+ std::string ID = Module.getID();\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\n+ !Module.getSymbol()) {\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\n+ }\n+#endif\n+\n // Instantiate and register module.\n EXPECTED_TRY(auto ModInst,\n ExecutorEngine.registerModule(StoreRef, Module, Name));\n RegModInsts.push_back(std::move(ModInst));\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (State) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates.insert({ID, std::move(*State)});\n+ }\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ size_t InstIdx = RegModInsts.size() - 1;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ auto It = RegModMap.find(ID);\n+ if (It != RegModMap.end()) {\n+ It->second[1] = InstIdx;\n+ } else {\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\n+ }\n+ }\n+#endif\n+\n return {};\n }\n \n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\n }\n-\n if (Mod) {\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\n+ std::string ID = Mod->getID();\n+\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\n !Mod->getSymbol()) {\n #ifdef WASMEDGE_USE_LLVM\n- LLVM::Compiler Compiler(Conf);\n- Compiler.checkConfigure()\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&]() { return Compiler.compile(*Mod); })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compilation failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto LLModule) {\n- LLVM::JIT JIT(Conf);\n- return JIT.load(std::move(LLModule));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\n- \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto Module) {\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n- \"mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- });\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates[ID] = std::move(State);\n+ } else {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() { return Compiler.compile(*Mod); })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(LLModule);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Module) {\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n+ \"mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ });\n+ }\n #else\n spdlog::warn(\"JIT was requested but WasmEdge was built without LLVM, \"\n \"falling back to interpreter.\"sv);\n #endif\n }\n \n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ auto StateIt = LazyJITStates.find(ID);\n+ if (StateIt != LazyJITStates.end()) {\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ StateIt->second.ImportFuncCount =\n+ static_cast<uint32_t>(ImportFuncCount);\n+ StateIt->second.LazyCompiledFuncs.clear();\n+ }\n+ }\n+#endif\n+\n EXPECTED_TRY(ActiveModInst,\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\n+\n Stage = VMStage::Instantiated;\n return {};\n } else if (Comp) {\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\n Runtime::Instance::FunctionInstance *FuncInst =\n ModInst->findFuncExports(Func);\n \n+#ifdef WASMEDGE_USE_LLVM\n+ // lazy JIT: compile function on-demand if needed.\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\n+ bool NeedsCompile = false;\n+ uint32_t FuncIdx = UINT32_MAX;\n+ {\n+ std::shared_lock Lock(LazyJITMutex);\n+ if (FuncInst->isWasmFunction()) {\n+ NeedsCompile = true;\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\n+ FuncIdx = *Res;\n+ }\n+ }\n+ }\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\n+ !Result) {\n+ return Unexpect(Result.error());\n+ }\n+ }\n+ }\n+#endif\n+\n // Execute function.\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\n .map_error([&ModInst, &Func](auto E) {\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\n }\n StoreRef.reset();\n RegModInsts.clear();\n+ RegASTModules.clear();\n+ RegModMap.clear();\n Stat.clear();\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\n unsafeRegisterPlugInHosts();\n LoaderEngine.reset();\n Stage = VMStage::Inited;\n+#ifdef WASMEDGE_USE_LLVM\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\n+ // LLContexts.\n+ LazyJITStates.clear();\n+#endif\n }\n \n std::vector<std::pair<std::string, const AST::FunctionType &>>\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\n return nullptr;\n };\n \n+#ifdef WASMEDGE_USE_LLVM\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ uint32_t ImportFuncCount = 0;\n+ const AST::Module *ModulePtr = nullptr;\n+ LLVM::Data *LLDataPtr = nullptr;\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\n+ nullptr;\n+ LLVM::LazyJITState *StatePtr = nullptr;\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\n+\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\n+ ModInst = ActiveModInst.get();\n+ ModulePtr = Mod.get();\n+ } else {\n+ auto ItMap = RegModMap.find(ID);\n+ if (ItMap != RegModMap.end()) {\n+ ModInst = RegModInsts[ItMap->second[1]].get();\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\n+ }\n+ }\n+\n+ if (!ModInst || !ModulePtr) {\n+ return {};\n+ }\n+\n+ auto It = LazyJITStates.find(ID);\n+ if (It != LazyJITStates.end()) {\n+ StatePtr = &It->second;\n+ ImportFuncCount = StatePtr->ImportFuncCount;\n+ LLDataPtr = &StatePtr->LLData;\n+ LLContextPtr = &StatePtr->LLContext;\n+ } else {\n+ spdlog::error(\"[lazy-jit]: failed to find JIT state for ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ if (FuncIdx < ImportFuncCount) {\n+ return {};\n+ }\n+\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\n+\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\n+ if (!FuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ FuncIdx, ID);\n+ return Unexpect(FuncResult.error());\n+ }\n+ auto *FuncInst = *FuncResult;\n+\n+ // If already compiled or not a Wasm function, nothing to do.\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\n+ return {};\n+ }\n+\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\n+ return {};\n+ }\n+\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\n+ const std::unordered_set<uint32_t> &CompiledSet =\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\n+\n+ std::vector<uint32_t> BatchLocals;\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\n+ CompiledSet, BatchLocals);\n+ if (BatchLocals.empty()) {\n+ return {};\n+ }\n+\n+ spdlog::debug(\n+ \"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(), LocalFuncIdx, ID);\n+\n+ LLVM::Compiler Compiler(Conf);\n+ auto ConfigResult = Compiler.checkConfigure();\n+ if (!ConfigResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\"sv,\n+ ConfigResult.error(), ID);\n+ return Unexpect(ConfigResult.error());\n+ }\n+\n+ if (!LLDataPtr->hasModule()) {\n+ LLDataPtr->resetModule();\n+ }\n+ auto CompileResult = Compiler.compileFunctions(\n+ std::move(*LLDataPtr),\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\n+ *ModulePtr,\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\n+ if (!CompileResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\"sv,\n+ CompileResult.error(), ID);\n+ return Unexpect(CompileResult.error());\n+ }\n+\n+ *LLDataPtr = std::move(*CompileResult);\n+ LLVM::JIT JIT(Conf);\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\n+ if (StatePtr && StatePtr->JITLib) {\n+ JITLib = StatePtr->JITLib;\n+ }\n+\n+ std::vector<uint32_t> BatchGlobal;\n+ BatchGlobal.reserve(BatchLocals.size());\n+ for (uint32_t L : BatchLocals) {\n+ BatchGlobal.push_back(ImportFuncCount + L);\n+ }\n+\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\n+ if (JITLib) {\n+ auto AddrRes = JIT.add(\n+ *JITLib, *LLDataPtr,\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!AddrRes) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\"sv,\n+ AddrRes.error(), ID);\n+ return Unexpect(AddrRes.error());\n+ }\n+ ResolvedAddresses = std::move(*AddrRes);\n+ } else {\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\n+ if (!LoadResult) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\"sv,\n+ LoadResult.error(), ID);\n+ return Unexpect(LoadResult.error());\n+ }\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\n+ if (StatePtr) {\n+ StatePtr->JITLib = JITLib;\n+ }\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\n+ *JITLib, LLDataPtr->getPrefix(),\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!LkRes) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\"sv,\n+ LkRes.error(), ID);\n+ return Unexpect(LkRes.error());\n+ }\n+ ResolvedAddresses = std::move(*LkRes);\n+ }\n+\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\n+ } else {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\n+ const uint32_t L = BatchLocals[I];\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\n+ if (!BatchFuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ WasmFuncIdx, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ auto *BatchFuncInst = *BatchFuncResult;\n+ if (BatchFuncInst->isWasmFunction()) {\n+ auto CompiledSym = JITLib->createSymbol(\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\n+ *>(CompiledCodePtr));\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\n+ }\n+ }\n+\n+ if (StatePtr) {\n+ for (uint32_t L : BatchLocals) {\n+ StatePtr->LazyCompiledFuncs.insert(L);\n+ }\n+ }\n+\n+ spdlog::debug(\n+ \"Lazy compilation completed for batch of {} functions, total compiled: \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(),\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\n+\n+ return {};\n+}\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\n+ WasmEdge::LLVM::LazyJITState State;\n+ LLVM::Compiler Compiler(Conf);\n+ EXPECTED_TRY(\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\n+\n+ auto Prefix = fmt::format(\"m{}_\"sv, Module.getID());\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\n+\n+ State.LLData = std::move(LLModule.first);\n+ State.LLContext = std::move(LLModule.second);\n+\n+ LLVM::JIT JIT(Conf);\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\n+\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\n+\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\n+\n+ return State;\n+}\n+#endif\n+\n } // namespace VM\n } // namespace WasmEdge\n"},"changed_files":{"kind":"list like","value":["lib/vm/vm.cpp"],"string":"[\n \"lib/vm/vm.cpp\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"Why do we need to change this part?","path":"lib/vm/vm.cpp","hunk":"@@ -207,10 +302,99 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+ spdlog::info(\"Module validated: {}\"sv, Module.getIsValidated());\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().isEnableLazyJIT() &&\n+ Conf.getRuntimeConfigure().isEnableJIT() && !Module.getSymbol()) {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() {\n+ auto Prefix =\n+ fmt::format(\"m{:p}_\"sv, reinterpret_cast<const void *>(&Module));\n+ return Compiler.compileInfrastructure(Module, Prefix);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ std::unique_lock Lock(LazyMutex);\n+ Pending.LLData = std::move(LLModule.first);\n+ Pending.LLContext = std::move(LLModule.second);\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(Pending.LLData, true);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Exec) {\n+ std::unique_lock Lock(LazyMutex);\n+ Pending.Exec = Exec;\n+ return LoaderEngine.loadExecutable(const_cast<AST::Module &>(Module),\n+ std::move(Exec));\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n+ \"mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ });\n+\n+ std::unique_lock Lock(LazyMutex);\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ Pending.Module = &Module;\n+ Pending.ModuleInstance = nullptr;\n+ Pending.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\n+ }\n+#endif\n+\n // Instantiate and register module.\n- EXPECTED_TRY(auto ModInst,\n- ExecutorEngine.registerModule(StoreRef, Module, Name));\n+ auto ModInstResult = ExecutorEngine.registerModule(StoreRef, Module, Name);\n+\n+ EXPECTED_TRY(auto ModInst, std::move(ModInstResult));","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\nindex 680d35094656..cf594a8be374 100644\n--- a/lib/vm/vm.cpp\n+++ b/lib/vm/vm.cpp\n@@ -3,7 +3,9 @@\n \n #include \"vm/vm.h\"\n \n+#include \"ast/instruction.h\"\n #include \"ast/module.h\"\n+#include \"common/enum_errcode.hpp\"\n #include \"common/errcode.h\"\n #include \"common/types.h\"\n #include \"host/wasi/wasimodule.h\"\n@@ -20,14 +22,71 @@\n #include \"host/mock/wasmedge_tensorflow_module.h\"\n #include \"host/mock/wasmedge_tensorflowlite_module.h\"\n #include \"validator/validator.h\"\n+#include <algorithm>\n+#include <cstddef>\n #include <memory>\n #include <variant>\n+#include <vector>\n+\n+#ifdef WASMEDGE_USE_LLVM\n+#include <llvm/IR/Module.h>\n+#endif\n \n namespace WasmEdge {\n namespace VM {\n \n namespace {\n \n+#ifdef WASMEDGE_USE_LLVM\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\n+ uint32_t ImportFuncCount,\n+ const std::unordered_set<uint32_t> &LazyCompiled,\n+ std::vector<uint32_t> &OutSortedLocals) {\n+ OutSortedLocals.clear();\n+ if (!ModulePtr) {\n+ return;\n+ }\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\n+\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\n+ return;\n+ }\n+\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\n+ std::vector<uint32_t> Stack;\n+ Stack.reserve(64);\n+\n+ Visited[LocalSeed] = 1;\n+ Stack.push_back(LocalSeed);\n+ OutSortedLocals.push_back(LocalSeed);\n+\n+ while (!Stack.empty()) {\n+ const uint32_t L = Stack.back();\n+ Stack.pop_back();\n+\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\n+ const auto Op = Instr.getOpCode();\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\n+ Op == OpCode::Ref__func) {\n+ const uint32_t Target = Instr.getTargetIndex();\n+ if (Target >= ImportFuncCount) {\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\n+ !LazyCompiled.count(LocalIdx)) {\n+ Visited[LocalIdx] = 1;\n+ Stack.push_back(LocalIdx);\n+ OutSortedLocals.push_back(LocalIdx);\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\n+}\n+#endif\n+\n template <typename T> struct VisitUnit {\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n \n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ spdlog::warn(\n+ \"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\"sv);\n+ ExecutorEngine.registerLazyCompilationCallback(\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\n+ return lazyCompileFunctions(ID, FuncIdx);\n+ });\n+ }\n+#endif\n+\n // Register all module instances.\n unsafeRegisterBuiltInHosts();\n unsafeRegisterPlugInHosts();\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Path));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Code));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+\n+ std::string ID = Module.getID();\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\n+ !Module.getSymbol()) {\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\n+ }\n+#endif\n+\n // Instantiate and register module.\n EXPECTED_TRY(auto ModInst,\n ExecutorEngine.registerModule(StoreRef, Module, Name));\n RegModInsts.push_back(std::move(ModInst));\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (State) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates.insert({ID, std::move(*State)});\n+ }\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ size_t InstIdx = RegModInsts.size() - 1;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ auto It = RegModMap.find(ID);\n+ if (It != RegModMap.end()) {\n+ It->second[1] = InstIdx;\n+ } else {\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\n+ }\n+ }\n+#endif\n+\n return {};\n }\n \n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\n }\n-\n if (Mod) {\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\n+ std::string ID = Mod->getID();\n+\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\n !Mod->getSymbol()) {\n #ifdef WASMEDGE_USE_LLVM\n- LLVM::Compiler Compiler(Conf);\n- Compiler.checkConfigure()\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&]() { return Compiler.compile(*Mod); })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compilation failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto LLModule) {\n- LLVM::JIT JIT(Conf);\n- return JIT.load(std::move(LLModule));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\n- \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto Module) {\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n- \"mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- });\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates[ID] = std::move(State);\n+ } else {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() { return Compiler.compile(*Mod); })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(LLModule);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Module) {\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n+ \"mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ });\n+ }\n #else\n spdlog::warn(\"JIT was requested but WasmEdge was built without LLVM, \"\n \"falling back to interpreter.\"sv);\n #endif\n }\n \n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ auto StateIt = LazyJITStates.find(ID);\n+ if (StateIt != LazyJITStates.end()) {\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ StateIt->second.ImportFuncCount =\n+ static_cast<uint32_t>(ImportFuncCount);\n+ StateIt->second.LazyCompiledFuncs.clear();\n+ }\n+ }\n+#endif\n+\n EXPECTED_TRY(ActiveModInst,\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\n+\n Stage = VMStage::Instantiated;\n return {};\n } else if (Comp) {\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\n Runtime::Instance::FunctionInstance *FuncInst =\n ModInst->findFuncExports(Func);\n \n+#ifdef WASMEDGE_USE_LLVM\n+ // lazy JIT: compile function on-demand if needed.\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\n+ bool NeedsCompile = false;\n+ uint32_t FuncIdx = UINT32_MAX;\n+ {\n+ std::shared_lock Lock(LazyJITMutex);\n+ if (FuncInst->isWasmFunction()) {\n+ NeedsCompile = true;\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\n+ FuncIdx = *Res;\n+ }\n+ }\n+ }\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\n+ !Result) {\n+ return Unexpect(Result.error());\n+ }\n+ }\n+ }\n+#endif\n+\n // Execute function.\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\n .map_error([&ModInst, &Func](auto E) {\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\n }\n StoreRef.reset();\n RegModInsts.clear();\n+ RegASTModules.clear();\n+ RegModMap.clear();\n Stat.clear();\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\n unsafeRegisterPlugInHosts();\n LoaderEngine.reset();\n Stage = VMStage::Inited;\n+#ifdef WASMEDGE_USE_LLVM\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\n+ // LLContexts.\n+ LazyJITStates.clear();\n+#endif\n }\n \n std::vector<std::pair<std::string, const AST::FunctionType &>>\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\n return nullptr;\n };\n \n+#ifdef WASMEDGE_USE_LLVM\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ uint32_t ImportFuncCount = 0;\n+ const AST::Module *ModulePtr = nullptr;\n+ LLVM::Data *LLDataPtr = nullptr;\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\n+ nullptr;\n+ LLVM::LazyJITState *StatePtr = nullptr;\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\n+\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\n+ ModInst = ActiveModInst.get();\n+ ModulePtr = Mod.get();\n+ } else {\n+ auto ItMap = RegModMap.find(ID);\n+ if (ItMap != RegModMap.end()) {\n+ ModInst = RegModInsts[ItMap->second[1]].get();\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\n+ }\n+ }\n+\n+ if (!ModInst || !ModulePtr) {\n+ return {};\n+ }\n+\n+ auto It = LazyJITStates.find(ID);\n+ if (It != LazyJITStates.end()) {\n+ StatePtr = &It->second;\n+ ImportFuncCount = StatePtr->ImportFuncCount;\n+ LLDataPtr = &StatePtr->LLData;\n+ LLContextPtr = &StatePtr->LLContext;\n+ } else {\n+ spdlog::error(\"[lazy-jit]: failed to find JIT state for ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ if (FuncIdx < ImportFuncCount) {\n+ return {};\n+ }\n+\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\n+\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\n+ if (!FuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ FuncIdx, ID);\n+ return Unexpect(FuncResult.error());\n+ }\n+ auto *FuncInst = *FuncResult;\n+\n+ // If already compiled or not a Wasm function, nothing to do.\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\n+ return {};\n+ }\n+\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\n+ return {};\n+ }\n+\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\n+ const std::unordered_set<uint32_t> &CompiledSet =\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\n+\n+ std::vector<uint32_t> BatchLocals;\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\n+ CompiledSet, BatchLocals);\n+ if (BatchLocals.empty()) {\n+ return {};\n+ }\n+\n+ spdlog::debug(\n+ \"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(), LocalFuncIdx, ID);\n+\n+ LLVM::Compiler Compiler(Conf);\n+ auto ConfigResult = Compiler.checkConfigure();\n+ if (!ConfigResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\"sv,\n+ ConfigResult.error(), ID);\n+ return Unexpect(ConfigResult.error());\n+ }\n+\n+ if (!LLDataPtr->hasModule()) {\n+ LLDataPtr->resetModule();\n+ }\n+ auto CompileResult = Compiler.compileFunctions(\n+ std::move(*LLDataPtr),\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\n+ *ModulePtr,\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\n+ if (!CompileResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\"sv,\n+ CompileResult.error(), ID);\n+ return Unexpect(CompileResult.error());\n+ }\n+\n+ *LLDataPtr = std::move(*CompileResult);\n+ LLVM::JIT JIT(Conf);\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\n+ if (StatePtr && StatePtr->JITLib) {\n+ JITLib = StatePtr->JITLib;\n+ }\n+\n+ std::vector<uint32_t> BatchGlobal;\n+ BatchGlobal.reserve(BatchLocals.size());\n+ for (uint32_t L : BatchLocals) {\n+ BatchGlobal.push_back(ImportFuncCount + L);\n+ }\n+\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\n+ if (JITLib) {\n+ auto AddrRes = JIT.add(\n+ *JITLib, *LLDataPtr,\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!AddrRes) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\"sv,\n+ AddrRes.error(), ID);\n+ return Unexpect(AddrRes.error());\n+ }\n+ ResolvedAddresses = std::move(*AddrRes);\n+ } else {\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\n+ if (!LoadResult) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\"sv,\n+ LoadResult.error(), ID);\n+ return Unexpect(LoadResult.error());\n+ }\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\n+ if (StatePtr) {\n+ StatePtr->JITLib = JITLib;\n+ }\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\n+ *JITLib, LLDataPtr->getPrefix(),\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!LkRes) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\"sv,\n+ LkRes.error(), ID);\n+ return Unexpect(LkRes.error());\n+ }\n+ ResolvedAddresses = std::move(*LkRes);\n+ }\n+\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\n+ } else {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\n+ const uint32_t L = BatchLocals[I];\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\n+ if (!BatchFuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ WasmFuncIdx, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ auto *BatchFuncInst = *BatchFuncResult;\n+ if (BatchFuncInst->isWasmFunction()) {\n+ auto CompiledSym = JITLib->createSymbol(\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\n+ *>(CompiledCodePtr));\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\n+ }\n+ }\n+\n+ if (StatePtr) {\n+ for (uint32_t L : BatchLocals) {\n+ StatePtr->LazyCompiledFuncs.insert(L);\n+ }\n+ }\n+\n+ spdlog::debug(\n+ \"Lazy compilation completed for batch of {} functions, total compiled: \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(),\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\n+\n+ return {};\n+}\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\n+ WasmEdge::LLVM::LazyJITState State;\n+ LLVM::Compiler Compiler(Conf);\n+ EXPECTED_TRY(\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\n+\n+ auto Prefix = fmt::format(\"m{}_\"sv, Module.getID());\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\n+\n+ State.LLData = std::move(LLModule.first);\n+ State.LLContext = std::move(LLModule.second);\n+\n+ LLVM::JIT JIT(Conf);\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\n+\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\n+\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\n+\n+ return State;\n+}\n+#endif\n+\n } // namespace VM\n } // namespace WasmEdge\n"}],"string":"[\n {\n \"comment\": \"Why do we need to change this part?\",\n \"path\": \"lib/vm/vm.cpp\",\n \"hunk\": \"@@ -207,10 +302,99 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n }\\n // Validate module.\\n EXPECTED_TRY(ValidatorEngine.validate(Module));\\n+ spdlog::info(\\\"Module validated: {}\\\"sv, Module.getIsValidated());\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().isEnableLazyJIT() &&\\n+ Conf.getRuntimeConfigure().isEnableJIT() && !Module.getSymbol()) {\\n+ LLVM::Compiler Compiler(Conf);\\n+ Compiler.checkConfigure()\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&]() {\\n+ auto Prefix =\\n+ fmt::format(\\\"m{:p}_\\\"sv, reinterpret_cast<const void *>(&Module));\\n+ return Compiler.compileInfrastructure(Module, Prefix);\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto LLModule) {\\n+ std::unique_lock Lock(LazyMutex);\\n+ Pending.LLData = std::move(LLModule.first);\\n+ Pending.LLContext = std::move(LLModule.second);\\n+ LLVM::JIT JIT(Conf);\\n+ return JIT.load(Pending.LLData, true);\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\n+ \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto Exec) {\\n+ std::unique_lock Lock(LazyMutex);\\n+ Pending.Exec = Exec;\\n+ return LoaderEngine.loadExecutable(const_cast<AST::Module &>(Module),\\n+ std::move(Exec));\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n+ \\\"mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ });\\n+\\n+ std::unique_lock Lock(LazyMutex);\\n+ size_t ImportFuncCount = 0;\\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\\n+ ++ImportFuncCount;\\n+ }\\n+ }\\n+ Pending.Module = &Module;\\n+ Pending.ModuleInstance = nullptr;\\n+ Pending.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\\n+ }\\n+#endif\\n+\\n // Instantiate and register module.\\n- EXPECTED_TRY(auto ModInst,\\n- ExecutorEngine.registerModule(StoreRef, Module, Name));\\n+ auto ModInstResult = ExecutorEngine.registerModule(StoreRef, Module, Name);\\n+\\n+ EXPECTED_TRY(auto ModInst, std::move(ModInstResult));\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\\nindex 680d35094656..cf594a8be374 100644\\n--- a/lib/vm/vm.cpp\\n+++ b/lib/vm/vm.cpp\\n@@ -3,7 +3,9 @@\\n \\n #include \\\"vm/vm.h\\\"\\n \\n+#include \\\"ast/instruction.h\\\"\\n #include \\\"ast/module.h\\\"\\n+#include \\\"common/enum_errcode.hpp\\\"\\n #include \\\"common/errcode.h\\\"\\n #include \\\"common/types.h\\\"\\n #include \\\"host/wasi/wasimodule.h\\\"\\n@@ -20,14 +22,71 @@\\n #include \\\"host/mock/wasmedge_tensorflow_module.h\\\"\\n #include \\\"host/mock/wasmedge_tensorflowlite_module.h\\\"\\n #include \\\"validator/validator.h\\\"\\n+#include <algorithm>\\n+#include <cstddef>\\n #include <memory>\\n #include <variant>\\n+#include <vector>\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+#include <llvm/IR/Module.h>\\n+#endif\\n \\n namespace WasmEdge {\\n namespace VM {\\n \\n namespace {\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\\n+ uint32_t ImportFuncCount,\\n+ const std::unordered_set<uint32_t> &LazyCompiled,\\n+ std::vector<uint32_t> &OutSortedLocals) {\\n+ OutSortedLocals.clear();\\n+ if (!ModulePtr) {\\n+ return;\\n+ }\\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\\n+\\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\\n+ return;\\n+ }\\n+\\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\\n+ std::vector<uint32_t> Stack;\\n+ Stack.reserve(64);\\n+\\n+ Visited[LocalSeed] = 1;\\n+ Stack.push_back(LocalSeed);\\n+ OutSortedLocals.push_back(LocalSeed);\\n+\\n+ while (!Stack.empty()) {\\n+ const uint32_t L = Stack.back();\\n+ Stack.pop_back();\\n+\\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\\n+ const auto Op = Instr.getOpCode();\\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\\n+ Op == OpCode::Ref__func) {\\n+ const uint32_t Target = Instr.getTargetIndex();\\n+ if (Target >= ImportFuncCount) {\\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\\n+ !LazyCompiled.count(LocalIdx)) {\\n+ Visited[LocalIdx] = 1;\\n+ Stack.push_back(LocalIdx);\\n+ OutSortedLocals.push_back(LocalIdx);\\n+ }\\n+ }\\n+ }\\n+ }\\n+ }\\n+\\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\\n+}\\n+#endif\\n+\\n template <typename T> struct VisitUnit {\\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\\n unsafeLoadBuiltInHosts();\\n unsafeLoadPlugInHosts();\\n \\n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ spdlog::warn(\\n+ \\\"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\\\"sv);\\n+ ExecutorEngine.registerLazyCompilationCallback(\\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\\n+ return lazyCompileFunctions(ID, FuncIdx);\\n+ });\\n+ }\\n+#endif\\n+\\n // Register all module instances.\\n unsafeRegisterBuiltInHosts();\\n unsafeRegisterPlugInHosts();\\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n Stage = VMStage::Validated;\\n }\\n // Load module.\\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\\n- return unsafeRegisterModule(Name, *Module.get());\\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\\n+ LoaderEngine.parseModule(Path));\\n+\\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\\n+\\n+ if (!RegASTModules.empty()) {\\n+ RegASTModules.back() = Module;\\n+ }\\n+\\n+ return {};\\n }\\n \\n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n Stage = VMStage::Validated;\\n }\\n // Load module.\\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\\n- return unsafeRegisterModule(Name, *Module.get());\\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\\n+ LoaderEngine.parseModule(Code));\\n+\\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\\n+\\n+ if (!RegASTModules.empty()) {\\n+ RegASTModules.back() = Module;\\n+ }\\n+\\n+ return {};\\n }\\n \\n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n }\\n // Validate module.\\n EXPECTED_TRY(ValidatorEngine.validate(Module));\\n+\\n+ std::string ID = Module.getID();\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\\n+ !Module.getSymbol()) {\\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\\n+ }\\n+#endif\\n+\\n // Instantiate and register module.\\n EXPECTED_TRY(auto ModInst,\\n ExecutorEngine.registerModule(StoreRef, Module, Name));\\n RegModInsts.push_back(std::move(ModInst));\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (State) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ LazyJITStates.insert({ID, std::move(*State)});\\n+ }\\n+#endif\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ size_t InstIdx = RegModInsts.size() - 1;\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ auto It = RegModMap.find(ID);\\n+ if (It != RegModMap.end()) {\\n+ It->second[1] = InstIdx;\\n+ } else {\\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\\n+ }\\n+ }\\n+#endif\\n+\\n return {};\\n }\\n \\n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\\n }\\n-\\n if (Mod) {\\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\\n+ std::string ID = Mod->getID();\\n+\\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\\n !Mod->getSymbol()) {\\n #ifdef WASMEDGE_USE_LLVM\\n- LLVM::Compiler Compiler(Conf);\\n- Compiler.checkConfigure()\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n- \\\"interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&]() { return Compiler.compile(*Mod); })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n- \\\"interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&](auto LLModule) {\\n- LLVM::JIT JIT(Conf);\\n- return JIT.load(std::move(LLModule));\\n- })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::warn(\\n- \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&](auto Module) {\\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\\n- })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n- \\\"mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- });\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ LazyJITStates[ID] = std::move(State);\\n+ } else {\\n+ LLVM::Compiler Compiler(Conf);\\n+ Compiler.checkConfigure()\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&]() { return Compiler.compile(*Mod); })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto LLModule) {\\n+ LLVM::JIT JIT(Conf);\\n+ return JIT.load(LLModule);\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\n+ \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto Module) {\\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n+ \\\"mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ });\\n+ }\\n #else\\n spdlog::warn(\\\"JIT was requested but WasmEdge was built without LLVM, \\\"\\n \\\"falling back to interpreter.\\\"sv);\\n #endif\\n }\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ auto StateIt = LazyJITStates.find(ID);\\n+ if (StateIt != LazyJITStates.end()) {\\n+ size_t ImportFuncCount = 0;\\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\\n+ ++ImportFuncCount;\\n+ }\\n+ }\\n+ StateIt->second.ImportFuncCount =\\n+ static_cast<uint32_t>(ImportFuncCount);\\n+ StateIt->second.LazyCompiledFuncs.clear();\\n+ }\\n+ }\\n+#endif\\n+\\n EXPECTED_TRY(ActiveModInst,\\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\\n+\\n Stage = VMStage::Instantiated;\\n return {};\\n } else if (Comp) {\\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\\n Runtime::Instance::FunctionInstance *FuncInst =\\n ModInst->findFuncExports(Func);\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+ // lazy JIT: compile function on-demand if needed.\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\\n+ bool NeedsCompile = false;\\n+ uint32_t FuncIdx = UINT32_MAX;\\n+ {\\n+ std::shared_lock Lock(LazyJITMutex);\\n+ if (FuncInst->isWasmFunction()) {\\n+ NeedsCompile = true;\\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\\n+ FuncIdx = *Res;\\n+ }\\n+ }\\n+ }\\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\\n+ !Result) {\\n+ return Unexpect(Result.error());\\n+ }\\n+ }\\n+ }\\n+#endif\\n+\\n // Execute function.\\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\\n .map_error([&ModInst, &Func](auto E) {\\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\\n }\\n StoreRef.reset();\\n RegModInsts.clear();\\n+ RegASTModules.clear();\\n+ RegModMap.clear();\\n Stat.clear();\\n unsafeLoadBuiltInHosts();\\n unsafeLoadPlugInHosts();\\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\\n unsafeRegisterPlugInHosts();\\n LoaderEngine.reset();\\n Stage = VMStage::Inited;\\n+#ifdef WASMEDGE_USE_LLVM\\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\\n+ // LLContexts.\\n+ LazyJITStates.clear();\\n+#endif\\n }\\n \\n std::vector<std::pair<std::string, const AST::FunctionType &>>\\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\\n return nullptr;\\n };\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ uint32_t ImportFuncCount = 0;\\n+ const AST::Module *ModulePtr = nullptr;\\n+ LLVM::Data *LLDataPtr = nullptr;\\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\\n+ nullptr;\\n+ LLVM::LazyJITState *StatePtr = nullptr;\\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\\n+\\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\\n+ ModInst = ActiveModInst.get();\\n+ ModulePtr = Mod.get();\\n+ } else {\\n+ auto ItMap = RegModMap.find(ID);\\n+ if (ItMap != RegModMap.end()) {\\n+ ModInst = RegModInsts[ItMap->second[1]].get();\\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\\n+ }\\n+ }\\n+\\n+ if (!ModInst || !ModulePtr) {\\n+ return {};\\n+ }\\n+\\n+ auto It = LazyJITStates.find(ID);\\n+ if (It != LazyJITStates.end()) {\\n+ StatePtr = &It->second;\\n+ ImportFuncCount = StatePtr->ImportFuncCount;\\n+ LLDataPtr = &StatePtr->LLData;\\n+ LLContextPtr = &StatePtr->LLContext;\\n+ } else {\\n+ spdlog::error(\\\"[lazy-jit]: failed to find JIT state for ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\\n+ }\\n+\\n+ if (FuncIdx < ImportFuncCount) {\\n+ return {};\\n+ }\\n+\\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\\n+\\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\\n+ if (!FuncResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get function instance for index {}, module ID: {}\\\"sv,\\n+ FuncIdx, ID);\\n+ return Unexpect(FuncResult.error());\\n+ }\\n+ auto *FuncInst = *FuncResult;\\n+\\n+ // If already compiled or not a Wasm function, nothing to do.\\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\\n+ return {};\\n+ }\\n+\\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\\n+ return {};\\n+ }\\n+\\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\\n+ const std::unordered_set<uint32_t> &CompiledSet =\\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\\n+\\n+ std::vector<uint32_t> BatchLocals;\\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\\n+ CompiledSet, BatchLocals);\\n+ if (BatchLocals.empty()) {\\n+ return {};\\n+ }\\n+\\n+ spdlog::debug(\\n+ \\\"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \\\"\\n+ \\\"{}, module ID: {}\\\"sv,\\n+ BatchLocals.size(), LocalFuncIdx, ID);\\n+\\n+ LLVM::Compiler Compiler(Conf);\\n+ auto ConfigResult = Compiler.checkConfigure();\\n+ if (!ConfigResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\\\"sv,\\n+ ConfigResult.error(), ID);\\n+ return Unexpect(ConfigResult.error());\\n+ }\\n+\\n+ if (!LLDataPtr->hasModule()) {\\n+ LLDataPtr->resetModule();\\n+ }\\n+ auto CompileResult = Compiler.compileFunctions(\\n+ std::move(*LLDataPtr),\\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\\n+ *ModulePtr,\\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\\n+ if (!CompileResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\\\"sv,\\n+ CompileResult.error(), ID);\\n+ return Unexpect(CompileResult.error());\\n+ }\\n+\\n+ *LLDataPtr = std::move(*CompileResult);\\n+ LLVM::JIT JIT(Conf);\\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\\n+ if (StatePtr && StatePtr->JITLib) {\\n+ JITLib = StatePtr->JITLib;\\n+ }\\n+\\n+ std::vector<uint32_t> BatchGlobal;\\n+ BatchGlobal.reserve(BatchLocals.size());\\n+ for (uint32_t L : BatchLocals) {\\n+ BatchGlobal.push_back(ImportFuncCount + L);\\n+ }\\n+\\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\\n+ if (JITLib) {\\n+ auto AddrRes = JIT.add(\\n+ *JITLib, *LLDataPtr,\\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\\n+ if (!AddrRes) {\\n+ spdlog::error(\\\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\\\"sv,\\n+ AddrRes.error(), ID);\\n+ return Unexpect(AddrRes.error());\\n+ }\\n+ ResolvedAddresses = std::move(*AddrRes);\\n+ } else {\\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\\n+ if (!LoadResult) {\\n+ spdlog::error(\\\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\\\"sv,\\n+ LoadResult.error(), ID);\\n+ return Unexpect(LoadResult.error());\\n+ }\\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\\n+ if (StatePtr) {\\n+ StatePtr->JITLib = JITLib;\\n+ }\\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\\n+ *JITLib, LLDataPtr->getPrefix(),\\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\\n+ if (!LkRes) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\\\"sv,\\n+ LkRes.error(), ID);\\n+ return Unexpect(LkRes.error());\\n+ }\\n+ ResolvedAddresses = std::move(*LkRes);\\n+ }\\n+\\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\\n+ } else {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\\n+ const uint32_t L = BatchLocals[I];\\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\\n+ if (!BatchFuncResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get function instance for index {}, module ID: {}\\\"sv,\\n+ WasmFuncIdx, ID);\\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\\n+ }\\n+\\n+ auto *BatchFuncInst = *BatchFuncResult;\\n+ if (BatchFuncInst->isWasmFunction()) {\\n+ auto CompiledSym = JITLib->createSymbol(\\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\\n+ *>(CompiledCodePtr));\\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\\n+ }\\n+ }\\n+\\n+ if (StatePtr) {\\n+ for (uint32_t L : BatchLocals) {\\n+ StatePtr->LazyCompiledFuncs.insert(L);\\n+ }\\n+ }\\n+\\n+ spdlog::debug(\\n+ \\\"Lazy compilation completed for batch of {} functions, total compiled: \\\"\\n+ \\\"{}, module ID: {}\\\"sv,\\n+ BatchLocals.size(),\\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\\n+\\n+ return {};\\n+}\\n+#endif\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\\n+ WasmEdge::LLVM::LazyJITState State;\\n+ LLVM::Compiler Compiler(Conf);\\n+ EXPECTED_TRY(\\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\\n+\\n+ auto Prefix = fmt::format(\\\"m{}_\\\"sv, Module.getID());\\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\\n+\\n+ State.LLData = std::move(LLModule.first);\\n+ State.LLContext = std::move(LLModule.second);\\n+\\n+ LLVM::JIT JIT(Conf);\\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\\n+\\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\\n+\\n+ size_t ImportFuncCount = 0;\\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\\n+ ++ImportFuncCount;\\n+ }\\n+ }\\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\\n+\\n+ return State;\\n+}\\n+#endif\\n+\\n } // namespace VM\\n } // namespace WasmEdge\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13294,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"The `RegModInsts` will never be empty due to the above line."},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\nindex 680d35094656..cf594a8be374 100644\n--- a/lib/vm/vm.cpp\n+++ b/lib/vm/vm.cpp\n@@ -3,7 +3,9 @@\n \n #include \"vm/vm.h\"\n \n+#include \"ast/instruction.h\"\n #include \"ast/module.h\"\n+#include \"common/enum_errcode.hpp\"\n #include \"common/errcode.h\"\n #include \"common/types.h\"\n #include \"host/wasi/wasimodule.h\"\n@@ -20,14 +22,71 @@\n #include \"host/mock/wasmedge_tensorflow_module.h\"\n #include \"host/mock/wasmedge_tensorflowlite_module.h\"\n #include \"validator/validator.h\"\n+#include <algorithm>\n+#include <cstddef>\n #include <memory>\n #include <variant>\n+#include <vector>\n+\n+#ifdef WASMEDGE_USE_LLVM\n+#include <llvm/IR/Module.h>\n+#endif\n \n namespace WasmEdge {\n namespace VM {\n \n namespace {\n \n+#ifdef WASMEDGE_USE_LLVM\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\n+ uint32_t ImportFuncCount,\n+ const std::unordered_set<uint32_t> &LazyCompiled,\n+ std::vector<uint32_t> &OutSortedLocals) {\n+ OutSortedLocals.clear();\n+ if (!ModulePtr) {\n+ return;\n+ }\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\n+\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\n+ return;\n+ }\n+\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\n+ std::vector<uint32_t> Stack;\n+ Stack.reserve(64);\n+\n+ Visited[LocalSeed] = 1;\n+ Stack.push_back(LocalSeed);\n+ OutSortedLocals.push_back(LocalSeed);\n+\n+ while (!Stack.empty()) {\n+ const uint32_t L = Stack.back();\n+ Stack.pop_back();\n+\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\n+ const auto Op = Instr.getOpCode();\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\n+ Op == OpCode::Ref__func) {\n+ const uint32_t Target = Instr.getTargetIndex();\n+ if (Target >= ImportFuncCount) {\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\n+ !LazyCompiled.count(LocalIdx)) {\n+ Visited[LocalIdx] = 1;\n+ Stack.push_back(LocalIdx);\n+ OutSortedLocals.push_back(LocalIdx);\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\n+}\n+#endif\n+\n template <typename T> struct VisitUnit {\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n \n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ spdlog::warn(\n+ \"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\"sv);\n+ ExecutorEngine.registerLazyCompilationCallback(\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\n+ return lazyCompileFunctions(ID, FuncIdx);\n+ });\n+ }\n+#endif\n+\n // Register all module instances.\n unsafeRegisterBuiltInHosts();\n unsafeRegisterPlugInHosts();\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Path));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Code));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+\n+ std::string ID = Module.getID();\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\n+ !Module.getSymbol()) {\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\n+ }\n+#endif\n+\n // Instantiate and register module.\n EXPECTED_TRY(auto ModInst,\n ExecutorEngine.registerModule(StoreRef, Module, Name));\n RegModInsts.push_back(std::move(ModInst));\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (State) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates.insert({ID, std::move(*State)});\n+ }\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ size_t InstIdx = RegModInsts.size() - 1;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ auto It = RegModMap.find(ID);\n+ if (It != RegModMap.end()) {\n+ It->second[1] = InstIdx;\n+ } else {\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\n+ }\n+ }\n+#endif\n+\n return {};\n }\n \n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\n }\n-\n if (Mod) {\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\n+ std::string ID = Mod->getID();\n+\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\n !Mod->getSymbol()) {\n #ifdef WASMEDGE_USE_LLVM\n- LLVM::Compiler Compiler(Conf);\n- Compiler.checkConfigure()\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&]() { return Compiler.compile(*Mod); })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compilation failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto LLModule) {\n- LLVM::JIT JIT(Conf);\n- return JIT.load(std::move(LLModule));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\n- \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto Module) {\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n- \"mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- });\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates[ID] = std::move(State);\n+ } else {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() { return Compiler.compile(*Mod); })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(LLModule);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Module) {\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n+ \"mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ });\n+ }\n #else\n spdlog::warn(\"JIT was requested but WasmEdge was built without LLVM, \"\n \"falling back to interpreter.\"sv);\n #endif\n }\n \n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ auto StateIt = LazyJITStates.find(ID);\n+ if (StateIt != LazyJITStates.end()) {\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ StateIt->second.ImportFuncCount =\n+ static_cast<uint32_t>(ImportFuncCount);\n+ StateIt->second.LazyCompiledFuncs.clear();\n+ }\n+ }\n+#endif\n+\n EXPECTED_TRY(ActiveModInst,\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\n+\n Stage = VMStage::Instantiated;\n return {};\n } else if (Comp) {\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\n Runtime::Instance::FunctionInstance *FuncInst =\n ModInst->findFuncExports(Func);\n \n+#ifdef WASMEDGE_USE_LLVM\n+ // lazy JIT: compile function on-demand if needed.\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\n+ bool NeedsCompile = false;\n+ uint32_t FuncIdx = UINT32_MAX;\n+ {\n+ std::shared_lock Lock(LazyJITMutex);\n+ if (FuncInst->isWasmFunction()) {\n+ NeedsCompile = true;\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\n+ FuncIdx = *Res;\n+ }\n+ }\n+ }\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\n+ !Result) {\n+ return Unexpect(Result.error());\n+ }\n+ }\n+ }\n+#endif\n+\n // Execute function.\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\n .map_error([&ModInst, &Func](auto E) {\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\n }\n StoreRef.reset();\n RegModInsts.clear();\n+ RegASTModules.clear();\n+ RegModMap.clear();\n Stat.clear();\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\n unsafeRegisterPlugInHosts();\n LoaderEngine.reset();\n Stage = VMStage::Inited;\n+#ifdef WASMEDGE_USE_LLVM\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\n+ // LLContexts.\n+ LazyJITStates.clear();\n+#endif\n }\n \n std::vector<std::pair<std::string, const AST::FunctionType &>>\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\n return nullptr;\n };\n \n+#ifdef WASMEDGE_USE_LLVM\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ uint32_t ImportFuncCount = 0;\n+ const AST::Module *ModulePtr = nullptr;\n+ LLVM::Data *LLDataPtr = nullptr;\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\n+ nullptr;\n+ LLVM::LazyJITState *StatePtr = nullptr;\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\n+\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\n+ ModInst = ActiveModInst.get();\n+ ModulePtr = Mod.get();\n+ } else {\n+ auto ItMap = RegModMap.find(ID);\n+ if (ItMap != RegModMap.end()) {\n+ ModInst = RegModInsts[ItMap->second[1]].get();\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\n+ }\n+ }\n+\n+ if (!ModInst || !ModulePtr) {\n+ return {};\n+ }\n+\n+ auto It = LazyJITStates.find(ID);\n+ if (It != LazyJITStates.end()) {\n+ StatePtr = &It->second;\n+ ImportFuncCount = StatePtr->ImportFuncCount;\n+ LLDataPtr = &StatePtr->LLData;\n+ LLContextPtr = &StatePtr->LLContext;\n+ } else {\n+ spdlog::error(\"[lazy-jit]: failed to find JIT state for ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ if (FuncIdx < ImportFuncCount) {\n+ return {};\n+ }\n+\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\n+\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\n+ if (!FuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ FuncIdx, ID);\n+ return Unexpect(FuncResult.error());\n+ }\n+ auto *FuncInst = *FuncResult;\n+\n+ // If already compiled or not a Wasm function, nothing to do.\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\n+ return {};\n+ }\n+\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\n+ return {};\n+ }\n+\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\n+ const std::unordered_set<uint32_t> &CompiledSet =\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\n+\n+ std::vector<uint32_t> BatchLocals;\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\n+ CompiledSet, BatchLocals);\n+ if (BatchLocals.empty()) {\n+ return {};\n+ }\n+\n+ spdlog::debug(\n+ \"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(), LocalFuncIdx, ID);\n+\n+ LLVM::Compiler Compiler(Conf);\n+ auto ConfigResult = Compiler.checkConfigure();\n+ if (!ConfigResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\"sv,\n+ ConfigResult.error(), ID);\n+ return Unexpect(ConfigResult.error());\n+ }\n+\n+ if (!LLDataPtr->hasModule()) {\n+ LLDataPtr->resetModule();\n+ }\n+ auto CompileResult = Compiler.compileFunctions(\n+ std::move(*LLDataPtr),\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\n+ *ModulePtr,\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\n+ if (!CompileResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\"sv,\n+ CompileResult.error(), ID);\n+ return Unexpect(CompileResult.error());\n+ }\n+\n+ *LLDataPtr = std::move(*CompileResult);\n+ LLVM::JIT JIT(Conf);\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\n+ if (StatePtr && StatePtr->JITLib) {\n+ JITLib = StatePtr->JITLib;\n+ }\n+\n+ std::vector<uint32_t> BatchGlobal;\n+ BatchGlobal.reserve(BatchLocals.size());\n+ for (uint32_t L : BatchLocals) {\n+ BatchGlobal.push_back(ImportFuncCount + L);\n+ }\n+\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\n+ if (JITLib) {\n+ auto AddrRes = JIT.add(\n+ *JITLib, *LLDataPtr,\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!AddrRes) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\"sv,\n+ AddrRes.error(), ID);\n+ return Unexpect(AddrRes.error());\n+ }\n+ ResolvedAddresses = std::move(*AddrRes);\n+ } else {\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\n+ if (!LoadResult) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\"sv,\n+ LoadResult.error(), ID);\n+ return Unexpect(LoadResult.error());\n+ }\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\n+ if (StatePtr) {\n+ StatePtr->JITLib = JITLib;\n+ }\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\n+ *JITLib, LLDataPtr->getPrefix(),\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!LkRes) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\"sv,\n+ LkRes.error(), ID);\n+ return Unexpect(LkRes.error());\n+ }\n+ ResolvedAddresses = std::move(*LkRes);\n+ }\n+\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\n+ } else {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\n+ const uint32_t L = BatchLocals[I];\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\n+ if (!BatchFuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ WasmFuncIdx, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ auto *BatchFuncInst = *BatchFuncResult;\n+ if (BatchFuncInst->isWasmFunction()) {\n+ auto CompiledSym = JITLib->createSymbol(\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\n+ *>(CompiledCodePtr));\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\n+ }\n+ }\n+\n+ if (StatePtr) {\n+ for (uint32_t L : BatchLocals) {\n+ StatePtr->LazyCompiledFuncs.insert(L);\n+ }\n+ }\n+\n+ spdlog::debug(\n+ \"Lazy compilation completed for batch of {} functions, total compiled: \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(),\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\n+\n+ return {};\n+}\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\n+ WasmEdge::LLVM::LazyJITState State;\n+ LLVM::Compiler Compiler(Conf);\n+ EXPECTED_TRY(\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\n+\n+ auto Prefix = fmt::format(\"m{}_\"sv, Module.getID());\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\n+\n+ State.LLData = std::move(LLModule.first);\n+ State.LLContext = std::move(LLModule.second);\n+\n+ LLVM::JIT JIT(Conf);\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\n+\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\n+\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\n+\n+ return State;\n+}\n+#endif\n+\n } // namespace VM\n } // namespace WasmEdge\n"},"changed_files":{"kind":"list like","value":["lib/vm/vm.cpp"],"string":"[\n \"lib/vm/vm.cpp\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"The `RegModInsts` will never be empty due to the above line.","path":"lib/vm/vm.cpp","hunk":"@@ -207,10 +302,99 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+ spdlog::info(\"Module validated: {}\"sv, Module.getIsValidated());\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().isEnableLazyJIT() &&\n+ Conf.getRuntimeConfigure().isEnableJIT() && !Module.getSymbol()) {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() {\n+ auto Prefix =\n+ fmt::format(\"m{:p}_\"sv, reinterpret_cast<const void *>(&Module));\n+ return Compiler.compileInfrastructure(Module, Prefix);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ std::unique_lock Lock(LazyMutex);\n+ Pending.LLData = std::move(LLModule.first);\n+ Pending.LLContext = std::move(LLModule.second);\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(Pending.LLData, true);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Exec) {\n+ std::unique_lock Lock(LazyMutex);\n+ Pending.Exec = Exec;\n+ return LoaderEngine.loadExecutable(const_cast<AST::Module &>(Module),\n+ std::move(Exec));\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n+ \"mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ });\n+\n+ std::unique_lock Lock(LazyMutex);\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ Pending.Module = &Module;\n+ Pending.ModuleInstance = nullptr;\n+ Pending.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\n+ }\n+#endif\n+\n // Instantiate and register module.\n- EXPECTED_TRY(auto ModInst,\n- ExecutorEngine.registerModule(StoreRef, Module, Name));\n+ auto ModInstResult = ExecutorEngine.registerModule(StoreRef, Module, Name);\n+\n+ EXPECTED_TRY(auto ModInst, std::move(ModInstResult));\n RegModInsts.push_back(std::move(ModInst));\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().isEnableLazyJIT() && !RegModInsts.empty()) {","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\nindex 680d35094656..cf594a8be374 100644\n--- a/lib/vm/vm.cpp\n+++ b/lib/vm/vm.cpp\n@@ -3,7 +3,9 @@\n \n #include \"vm/vm.h\"\n \n+#include \"ast/instruction.h\"\n #include \"ast/module.h\"\n+#include \"common/enum_errcode.hpp\"\n #include \"common/errcode.h\"\n #include \"common/types.h\"\n #include \"host/wasi/wasimodule.h\"\n@@ -20,14 +22,71 @@\n #include \"host/mock/wasmedge_tensorflow_module.h\"\n #include \"host/mock/wasmedge_tensorflowlite_module.h\"\n #include \"validator/validator.h\"\n+#include <algorithm>\n+#include <cstddef>\n #include <memory>\n #include <variant>\n+#include <vector>\n+\n+#ifdef WASMEDGE_USE_LLVM\n+#include <llvm/IR/Module.h>\n+#endif\n \n namespace WasmEdge {\n namespace VM {\n \n namespace {\n \n+#ifdef WASMEDGE_USE_LLVM\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\n+ uint32_t ImportFuncCount,\n+ const std::unordered_set<uint32_t> &LazyCompiled,\n+ std::vector<uint32_t> &OutSortedLocals) {\n+ OutSortedLocals.clear();\n+ if (!ModulePtr) {\n+ return;\n+ }\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\n+\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\n+ return;\n+ }\n+\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\n+ std::vector<uint32_t> Stack;\n+ Stack.reserve(64);\n+\n+ Visited[LocalSeed] = 1;\n+ Stack.push_back(LocalSeed);\n+ OutSortedLocals.push_back(LocalSeed);\n+\n+ while (!Stack.empty()) {\n+ const uint32_t L = Stack.back();\n+ Stack.pop_back();\n+\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\n+ const auto Op = Instr.getOpCode();\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\n+ Op == OpCode::Ref__func) {\n+ const uint32_t Target = Instr.getTargetIndex();\n+ if (Target >= ImportFuncCount) {\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\n+ !LazyCompiled.count(LocalIdx)) {\n+ Visited[LocalIdx] = 1;\n+ Stack.push_back(LocalIdx);\n+ OutSortedLocals.push_back(LocalIdx);\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\n+}\n+#endif\n+\n template <typename T> struct VisitUnit {\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n \n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ spdlog::warn(\n+ \"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\"sv);\n+ ExecutorEngine.registerLazyCompilationCallback(\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\n+ return lazyCompileFunctions(ID, FuncIdx);\n+ });\n+ }\n+#endif\n+\n // Register all module instances.\n unsafeRegisterBuiltInHosts();\n unsafeRegisterPlugInHosts();\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Path));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n Stage = VMStage::Validated;\n }\n // Load module.\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\n- return unsafeRegisterModule(Name, *Module.get());\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\n+ LoaderEngine.parseModule(Code));\n+\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\n+\n+ if (!RegASTModules.empty()) {\n+ RegASTModules.back() = Module;\n+ }\n+\n+ return {};\n }\n \n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+\n+ std::string ID = Module.getID();\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\n+ !Module.getSymbol()) {\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\n+ }\n+#endif\n+\n // Instantiate and register module.\n EXPECTED_TRY(auto ModInst,\n ExecutorEngine.registerModule(StoreRef, Module, Name));\n RegModInsts.push_back(std::move(ModInst));\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ if (State) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates.insert({ID, std::move(*State)});\n+ }\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ size_t InstIdx = RegModInsts.size() - 1;\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ auto It = RegModMap.find(ID);\n+ if (It != RegModMap.end()) {\n+ It->second[1] = InstIdx;\n+ } else {\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\n+ }\n+ }\n+#endif\n+\n return {};\n }\n \n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\n }\n-\n if (Mod) {\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\n+ std::string ID = Mod->getID();\n+\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\n !Mod->getSymbol()) {\n #ifdef WASMEDGE_USE_LLVM\n- LLVM::Compiler Compiler(Conf);\n- Compiler.checkConfigure()\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&]() { return Compiler.compile(*Mod); })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::error(\"Compilation failed. Error code: {}, use \"\n- \"interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto LLModule) {\n- LLVM::JIT JIT(Conf);\n- return JIT.load(std::move(LLModule));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\n- \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- })\n- .and_then([&](auto Module) {\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n- })\n- .map_error([](uint32_t Err) {\n- if (Err != ErrCode::Value::Success) {\n- spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n- \"mode instead.\"sv,\n- Err);\n- }\n- return ErrCode::Value::Success;\n- });\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\n+ std::unique_lock Lock(LazyJITMutex);\n+ LazyJITStates[ID] = std::move(State);\n+ } else {\n+ LLVM::Compiler Compiler(Conf);\n+ Compiler.checkConfigure()\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compiler Configure failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&]() { return Compiler.compile(*Mod); })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::error(\"Compilation failed. Error code: {}, use \"\n+ \"interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto LLModule) {\n+ LLVM::JIT JIT(Conf);\n+ return JIT.load(LLModule);\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\n+ \"JIT failed. Error code: {}, use interpreter mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ })\n+ .and_then([&](auto Module) {\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\n+ })\n+ .map_error([](uint32_t Err) {\n+ if (Err != ErrCode::Value::Success) {\n+ spdlog::warn(\"Loader failed. Error code: {}, use interpreter \"\n+ \"mode instead.\"sv,\n+ Err);\n+ }\n+ return ErrCode::Value::Success;\n+ });\n+ }\n #else\n spdlog::warn(\"JIT was requested but WasmEdge was built without LLVM, \"\n \"falling back to interpreter.\"sv);\n #endif\n }\n \n+#ifdef WASMEDGE_USE_LLVM\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ auto StateIt = LazyJITStates.find(ID);\n+ if (StateIt != LazyJITStates.end()) {\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ StateIt->second.ImportFuncCount =\n+ static_cast<uint32_t>(ImportFuncCount);\n+ StateIt->second.LazyCompiledFuncs.clear();\n+ }\n+ }\n+#endif\n+\n EXPECTED_TRY(ActiveModInst,\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\n+\n Stage = VMStage::Instantiated;\n return {};\n } else if (Comp) {\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\n Runtime::Instance::FunctionInstance *FuncInst =\n ModInst->findFuncExports(Func);\n \n+#ifdef WASMEDGE_USE_LLVM\n+ // lazy JIT: compile function on-demand if needed.\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\n+ bool NeedsCompile = false;\n+ uint32_t FuncIdx = UINT32_MAX;\n+ {\n+ std::shared_lock Lock(LazyJITMutex);\n+ if (FuncInst->isWasmFunction()) {\n+ NeedsCompile = true;\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\n+ FuncIdx = *Res;\n+ }\n+ }\n+ }\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\n+ !Result) {\n+ return Unexpect(Result.error());\n+ }\n+ }\n+ }\n+#endif\n+\n // Execute function.\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\n .map_error([&ModInst, &Func](auto E) {\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\n }\n StoreRef.reset();\n RegModInsts.clear();\n+ RegASTModules.clear();\n+ RegModMap.clear();\n Stat.clear();\n unsafeLoadBuiltInHosts();\n unsafeLoadPlugInHosts();\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\n unsafeRegisterPlugInHosts();\n LoaderEngine.reset();\n Stage = VMStage::Inited;\n+#ifdef WASMEDGE_USE_LLVM\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\n+ // LLContexts.\n+ LazyJITStates.clear();\n+#endif\n }\n \n std::vector<std::pair<std::string, const AST::FunctionType &>>\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\n return nullptr;\n };\n \n+#ifdef WASMEDGE_USE_LLVM\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\n+ std::unique_lock Lock(LazyJITMutex);\n+ uint32_t ImportFuncCount = 0;\n+ const AST::Module *ModulePtr = nullptr;\n+ LLVM::Data *LLDataPtr = nullptr;\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\n+ nullptr;\n+ LLVM::LazyJITState *StatePtr = nullptr;\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\n+\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\n+ ModInst = ActiveModInst.get();\n+ ModulePtr = Mod.get();\n+ } else {\n+ auto ItMap = RegModMap.find(ID);\n+ if (ItMap != RegModMap.end()) {\n+ ModInst = RegModInsts[ItMap->second[1]].get();\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\n+ }\n+ }\n+\n+ if (!ModInst || !ModulePtr) {\n+ return {};\n+ }\n+\n+ auto It = LazyJITStates.find(ID);\n+ if (It != LazyJITStates.end()) {\n+ StatePtr = &It->second;\n+ ImportFuncCount = StatePtr->ImportFuncCount;\n+ LLDataPtr = &StatePtr->LLData;\n+ LLContextPtr = &StatePtr->LLContext;\n+ } else {\n+ spdlog::error(\"[lazy-jit]: failed to find JIT state for ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ if (FuncIdx < ImportFuncCount) {\n+ return {};\n+ }\n+\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\n+\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\n+ if (!FuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ FuncIdx, ID);\n+ return Unexpect(FuncResult.error());\n+ }\n+ auto *FuncInst = *FuncResult;\n+\n+ // If already compiled or not a Wasm function, nothing to do.\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\n+ return {};\n+ }\n+\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\n+ return {};\n+ }\n+\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\n+ const std::unordered_set<uint32_t> &CompiledSet =\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\n+\n+ std::vector<uint32_t> BatchLocals;\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\n+ CompiledSet, BatchLocals);\n+ if (BatchLocals.empty()) {\n+ return {};\n+ }\n+\n+ spdlog::debug(\n+ \"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(), LocalFuncIdx, ID);\n+\n+ LLVM::Compiler Compiler(Conf);\n+ auto ConfigResult = Compiler.checkConfigure();\n+ if (!ConfigResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\"sv,\n+ ConfigResult.error(), ID);\n+ return Unexpect(ConfigResult.error());\n+ }\n+\n+ if (!LLDataPtr->hasModule()) {\n+ LLDataPtr->resetModule();\n+ }\n+ auto CompileResult = Compiler.compileFunctions(\n+ std::move(*LLDataPtr),\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\n+ *ModulePtr,\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\n+ if (!CompileResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\"sv,\n+ CompileResult.error(), ID);\n+ return Unexpect(CompileResult.error());\n+ }\n+\n+ *LLDataPtr = std::move(*CompileResult);\n+ LLVM::JIT JIT(Conf);\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\n+ if (StatePtr && StatePtr->JITLib) {\n+ JITLib = StatePtr->JITLib;\n+ }\n+\n+ std::vector<uint32_t> BatchGlobal;\n+ BatchGlobal.reserve(BatchLocals.size());\n+ for (uint32_t L : BatchLocals) {\n+ BatchGlobal.push_back(ImportFuncCount + L);\n+ }\n+\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\n+ if (JITLib) {\n+ auto AddrRes = JIT.add(\n+ *JITLib, *LLDataPtr,\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!AddrRes) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\"sv,\n+ AddrRes.error(), ID);\n+ return Unexpect(AddrRes.error());\n+ }\n+ ResolvedAddresses = std::move(*AddrRes);\n+ } else {\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\n+ if (!LoadResult) {\n+ spdlog::error(\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\"sv,\n+ LoadResult.error(), ID);\n+ return Unexpect(LoadResult.error());\n+ }\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\n+ if (StatePtr) {\n+ StatePtr->JITLib = JITLib;\n+ }\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\n+ *JITLib, LLDataPtr->getPrefix(),\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\n+ if (!LkRes) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\"sv,\n+ LkRes.error(), ID);\n+ return Unexpect(LkRes.error());\n+ }\n+ ResolvedAddresses = std::move(*LkRes);\n+ }\n+\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\n+ spdlog::error(\n+ \"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\n+ } else {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\"sv, ID);\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\n+ }\n+\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\n+ const uint32_t L = BatchLocals[I];\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\n+ if (!BatchFuncResult) {\n+ spdlog::error(\n+ \"[lazy-jit]: failed to get function instance for index {}, module ID: {}\"sv,\n+ WasmFuncIdx, ID);\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\n+ }\n+\n+ auto *BatchFuncInst = *BatchFuncResult;\n+ if (BatchFuncInst->isWasmFunction()) {\n+ auto CompiledSym = JITLib->createSymbol(\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\n+ *>(CompiledCodePtr));\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\n+ }\n+ }\n+\n+ if (StatePtr) {\n+ for (uint32_t L : BatchLocals) {\n+ StatePtr->LazyCompiledFuncs.insert(L);\n+ }\n+ }\n+\n+ spdlog::debug(\n+ \"Lazy compilation completed for batch of {} functions, total compiled: \"\n+ \"{}, module ID: {}\"sv,\n+ BatchLocals.size(),\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\n+\n+ return {};\n+}\n+#endif\n+\n+#ifdef WASMEDGE_USE_LLVM\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\n+ WasmEdge::LLVM::LazyJITState State;\n+ LLVM::Compiler Compiler(Conf);\n+ EXPECTED_TRY(\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\n+\n+ auto Prefix = fmt::format(\"m{}_\"sv, Module.getID());\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\n+\n+ State.LLData = std::move(LLModule.first);\n+ State.LLContext = std::move(LLModule.second);\n+\n+ LLVM::JIT JIT(Conf);\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\n+\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\n+\n+ size_t ImportFuncCount = 0;\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\n+ ++ImportFuncCount;\n+ }\n+ }\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\n+\n+ return State;\n+}\n+#endif\n+\n } // namespace VM\n } // namespace WasmEdge\n"}],"string":"[\n {\n \"comment\": \"The `RegModInsts` will never be empty due to the above line.\",\n \"path\": \"lib/vm/vm.cpp\",\n \"hunk\": \"@@ -207,10 +302,99 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n }\\n // Validate module.\\n EXPECTED_TRY(ValidatorEngine.validate(Module));\\n+ spdlog::info(\\\"Module validated: {}\\\"sv, Module.getIsValidated());\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().isEnableLazyJIT() &&\\n+ Conf.getRuntimeConfigure().isEnableJIT() && !Module.getSymbol()) {\\n+ LLVM::Compiler Compiler(Conf);\\n+ Compiler.checkConfigure()\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&]() {\\n+ auto Prefix =\\n+ fmt::format(\\\"m{:p}_\\\"sv, reinterpret_cast<const void *>(&Module));\\n+ return Compiler.compileInfrastructure(Module, Prefix);\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto LLModule) {\\n+ std::unique_lock Lock(LazyMutex);\\n+ Pending.LLData = std::move(LLModule.first);\\n+ Pending.LLContext = std::move(LLModule.second);\\n+ LLVM::JIT JIT(Conf);\\n+ return JIT.load(Pending.LLData, true);\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\n+ \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto Exec) {\\n+ std::unique_lock Lock(LazyMutex);\\n+ Pending.Exec = Exec;\\n+ return LoaderEngine.loadExecutable(const_cast<AST::Module &>(Module),\\n+ std::move(Exec));\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n+ \\\"mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ });\\n+\\n+ std::unique_lock Lock(LazyMutex);\\n+ size_t ImportFuncCount = 0;\\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\\n+ ++ImportFuncCount;\\n+ }\\n+ }\\n+ Pending.Module = &Module;\\n+ Pending.ModuleInstance = nullptr;\\n+ Pending.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\\n+ }\\n+#endif\\n+\\n // Instantiate and register module.\\n- EXPECTED_TRY(auto ModInst,\\n- ExecutorEngine.registerModule(StoreRef, Module, Name));\\n+ auto ModInstResult = ExecutorEngine.registerModule(StoreRef, Module, Name);\\n+\\n+ EXPECTED_TRY(auto ModInst, std::move(ModInstResult));\\n RegModInsts.push_back(std::move(ModInst));\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().isEnableLazyJIT() && !RegModInsts.empty()) {\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp\\nindex 680d35094656..cf594a8be374 100644\\n--- a/lib/vm/vm.cpp\\n+++ b/lib/vm/vm.cpp\\n@@ -3,7 +3,9 @@\\n \\n #include \\\"vm/vm.h\\\"\\n \\n+#include \\\"ast/instruction.h\\\"\\n #include \\\"ast/module.h\\\"\\n+#include \\\"common/enum_errcode.hpp\\\"\\n #include \\\"common/errcode.h\\\"\\n #include \\\"common/types.h\\\"\\n #include \\\"host/wasi/wasimodule.h\\\"\\n@@ -20,14 +22,71 @@\\n #include \\\"host/mock/wasmedge_tensorflow_module.h\\\"\\n #include \\\"host/mock/wasmedge_tensorflowlite_module.h\\\"\\n #include \\\"validator/validator.h\\\"\\n+#include <algorithm>\\n+#include <cstddef>\\n #include <memory>\\n #include <variant>\\n+#include <vector>\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+#include <llvm/IR/Module.h>\\n+#endif\\n \\n namespace WasmEdge {\\n namespace VM {\\n \\n namespace {\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+void collectLazyCallGraphBatch(uint32_t LocalSeed, const AST::Module *ModulePtr,\\n+ uint32_t ImportFuncCount,\\n+ const std::unordered_set<uint32_t> &LazyCompiled,\\n+ std::vector<uint32_t> &OutSortedLocals) {\\n+ OutSortedLocals.clear();\\n+ if (!ModulePtr) {\\n+ return;\\n+ }\\n+ const auto &CodeSec = ModulePtr->getCodeSection().getContent();\\n+ const uint32_t DefinedCount = static_cast<uint32_t>(CodeSec.size());\\n+\\n+ if (LocalSeed >= DefinedCount || LazyCompiled.count(LocalSeed)) {\\n+ return;\\n+ }\\n+\\n+ std::vector<uint8_t> Visited(DefinedCount, 0);\\n+ std::vector<uint32_t> Stack;\\n+ Stack.reserve(64);\\n+\\n+ Visited[LocalSeed] = 1;\\n+ Stack.push_back(LocalSeed);\\n+ OutSortedLocals.push_back(LocalSeed);\\n+\\n+ while (!Stack.empty()) {\\n+ const uint32_t L = Stack.back();\\n+ Stack.pop_back();\\n+\\n+ for (const auto &Instr : CodeSec[L].getExpr().getInstrs()) {\\n+ const auto Op = Instr.getOpCode();\\n+ if (Op == OpCode::Call || Op == OpCode::Return_call ||\\n+ Op == OpCode::Ref__func) {\\n+ const uint32_t Target = Instr.getTargetIndex();\\n+ if (Target >= ImportFuncCount) {\\n+ const uint32_t LocalIdx = Target - ImportFuncCount;\\n+ if (LocalIdx < DefinedCount && !Visited[LocalIdx] &&\\n+ !LazyCompiled.count(LocalIdx)) {\\n+ Visited[LocalIdx] = 1;\\n+ Stack.push_back(LocalIdx);\\n+ OutSortedLocals.push_back(LocalIdx);\\n+ }\\n+ }\\n+ }\\n+ }\\n+ }\\n+\\n+ std::sort(OutSortedLocals.begin(), OutSortedLocals.end());\\n+}\\n+#endif\\n+\\n template <typename T> struct VisitUnit {\\n using MT = std::function<T(std::unique_ptr<AST::Module> &)>;\\n using CT = std::function<T(std::unique_ptr<AST::Component::Component> &)>;\\n@@ -80,6 +139,18 @@ void VM::unsafeInitVM() {\\n unsafeLoadBuiltInHosts();\\n unsafeLoadPlugInHosts();\\n \\n+ // Register the lazy compilation callback if lazy JIT mode is enabled.\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ spdlog::warn(\\n+ \\\"Lazy JIT is an alpha and experimental feature, which is not ready for production use.\\\"sv);\\n+ ExecutorEngine.registerLazyCompilationCallback(\\n+ [this](const std::string &ID, const uint32_t FuncIdx) -> Expect<void> {\\n+ return lazyCompileFunctions(ID, FuncIdx);\\n+ });\\n+ }\\n+#endif\\n+\\n // Register all module instances.\\n unsafeRegisterBuiltInHosts();\\n unsafeRegisterPlugInHosts();\\n@@ -182,8 +253,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n Stage = VMStage::Validated;\\n }\\n // Load module.\\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Path));\\n- return unsafeRegisterModule(Name, *Module.get());\\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\\n+ LoaderEngine.parseModule(Path));\\n+\\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\\n+\\n+ if (!RegASTModules.empty()) {\\n+ RegASTModules.back() = Module;\\n+ }\\n+\\n+ return {};\\n }\\n \\n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n@@ -194,8 +273,16 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n Stage = VMStage::Validated;\\n }\\n // Load module.\\n- EXPECTED_TRY(auto Module, LoaderEngine.parseModule(Code));\\n- return unsafeRegisterModule(Name, *Module.get());\\n+ EXPECTED_TRY(std::shared_ptr<AST::Module> Module,\\n+ LoaderEngine.parseModule(Code));\\n+\\n+ EXPECTED_TRY(unsafeRegisterModule(Name, *Module));\\n+\\n+ if (!RegASTModules.empty()) {\\n+ RegASTModules.back() = Module;\\n+ }\\n+\\n+ return {};\\n }\\n \\n Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n@@ -207,10 +294,42 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\\n }\\n // Validate module.\\n EXPECTED_TRY(ValidatorEngine.validate(Module));\\n+\\n+ std::string ID = Module.getID();\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ std::optional<WasmEdge::LLVM::LazyJITState> State;\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT &&\\n+ !Module.getSymbol()) {\\n+ EXPECTED_TRY(State, prepareLazyJIT(const_cast<AST::Module &>(Module)));\\n+ }\\n+#endif\\n+\\n // Instantiate and register module.\\n EXPECTED_TRY(auto ModInst,\\n ExecutorEngine.registerModule(StoreRef, Module, Name));\\n RegModInsts.push_back(std::move(ModInst));\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (State) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ LazyJITStates.insert({ID, std::move(*State)});\\n+ }\\n+#endif\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ size_t InstIdx = RegModInsts.size() - 1;\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ auto It = RegModMap.find(ID);\\n+ if (It != RegModMap.end()) {\\n+ It->second[1] = InstIdx;\\n+ } else {\\n+ RegASTModules.push_back(std::make_shared<const AST::Module>(Module));\\n+ RegModMap[ID] = {RegASTModules.size() - 1, InstIdx};\\n+ }\\n+ }\\n+#endif\\n+\\n return {};\\n }\\n \\n@@ -423,61 +542,88 @@ Expect<void> VM::unsafeInstantiate() {\\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\\n return Unexpect(ErrCode::Value::WrongVMWorkflow);\\n }\\n-\\n if (Mod) {\\n- if (Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT &&\\n+ std::string ID = Mod->getID();\\n+\\n+ if ((Conf.getRuntimeConfigure().getRunMode() == RunMode::JIT ||\\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) &&\\n !Mod->getSymbol()) {\\n #ifdef WASMEDGE_USE_LLVM\\n- LLVM::Compiler Compiler(Conf);\\n- Compiler.checkConfigure()\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n- \\\"interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&]() { return Compiler.compile(*Mod); })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n- \\\"interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&](auto LLModule) {\\n- LLVM::JIT JIT(Conf);\\n- return JIT.load(std::move(LLModule));\\n- })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::warn(\\n- \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- })\\n- .and_then([&](auto Module) {\\n- return LoaderEngine.loadExecutable(*Mod, std::move(Module));\\n- })\\n- .map_error([](uint32_t Err) {\\n- if (Err != ErrCode::Value::Success) {\\n- spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n- \\\"mode instead.\\\"sv,\\n- Err);\\n- }\\n- return ErrCode::Value::Success;\\n- });\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ EXPECTED_TRY(auto State, prepareLazyJIT(*Mod));\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ LazyJITStates[ID] = std::move(State);\\n+ } else {\\n+ LLVM::Compiler Compiler(Conf);\\n+ Compiler.checkConfigure()\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compiler Configure failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&]() { return Compiler.compile(*Mod); })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::error(\\\"Compilation failed. Error code: {}, use \\\"\\n+ \\\"interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto LLModule) {\\n+ LLVM::JIT JIT(Conf);\\n+ return JIT.load(LLModule);\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\n+ \\\"JIT failed. Error code: {}, use interpreter mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ })\\n+ .and_then([&](auto Module) {\\n+ return LoaderEngine.loadExecutable(*Mod, std::move(Module));\\n+ })\\n+ .map_error([](uint32_t Err) {\\n+ if (Err != ErrCode::Value::Success) {\\n+ spdlog::warn(\\\"Loader failed. Error code: {}, use interpreter \\\"\\n+ \\\"mode instead.\\\"sv,\\n+ Err);\\n+ }\\n+ return ErrCode::Value::Success;\\n+ });\\n+ }\\n #else\\n spdlog::warn(\\\"JIT was requested but WasmEdge was built without LLVM, \\\"\\n \\\"falling back to interpreter.\\\"sv);\\n #endif\\n }\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ auto StateIt = LazyJITStates.find(ID);\\n+ if (StateIt != LazyJITStates.end()) {\\n+ size_t ImportFuncCount = 0;\\n+ for (const auto &ImpDesc : Mod->getImportSection().getContent()) {\\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\\n+ ++ImportFuncCount;\\n+ }\\n+ }\\n+ StateIt->second.ImportFuncCount =\\n+ static_cast<uint32_t>(ImportFuncCount);\\n+ StateIt->second.LazyCompiledFuncs.clear();\\n+ }\\n+ }\\n+#endif\\n+\\n EXPECTED_TRY(ActiveModInst,\\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\\n+\\n Stage = VMStage::Instantiated;\\n return {};\\n } else if (Comp) {\\n@@ -553,6 +699,29 @@ VM::unsafeExecute(const Runtime::Instance::ModuleInstance *ModInst,\\n Runtime::Instance::FunctionInstance *FuncInst =\\n ModInst->findFuncExports(Func);\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+ // lazy JIT: compile function on-demand if needed.\\n+ if (Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT && FuncInst) {\\n+ bool NeedsCompile = false;\\n+ uint32_t FuncIdx = UINT32_MAX;\\n+ {\\n+ std::shared_lock Lock(LazyJITMutex);\\n+ if (FuncInst->isWasmFunction()) {\\n+ NeedsCompile = true;\\n+ if (auto Res = ModInst->getFuncIdx(FuncInst)) {\\n+ FuncIdx = *Res;\\n+ }\\n+ }\\n+ }\\n+ if (NeedsCompile && FuncIdx != UINT32_MAX) {\\n+ if (auto Result = lazyCompileFunctions(ModInst->getID(), FuncIdx);\\n+ !Result) {\\n+ return Unexpect(Result.error());\\n+ }\\n+ }\\n+ }\\n+#endif\\n+\\n // Execute function.\\n return ExecutorEngine.invoke(FuncInst, Params, ParamTypes)\\n .map_error([&ModInst, &Func](auto E) {\\n@@ -652,6 +821,8 @@ void VM::unsafeCleanup() {\\n }\\n StoreRef.reset();\\n RegModInsts.clear();\\n+ RegASTModules.clear();\\n+ RegModMap.clear();\\n Stat.clear();\\n unsafeLoadBuiltInHosts();\\n unsafeLoadPlugInHosts();\\n@@ -659,6 +830,11 @@ void VM::unsafeCleanup() {\\n unsafeRegisterPlugInHosts();\\n LoaderEngine.reset();\\n Stage = VMStage::Inited;\\n+#ifdef WASMEDGE_USE_LLVM\\n+ // LazyJITStates.clear() will automatically clean up all unique_ptr\\n+ // LLContexts.\\n+ LazyJITStates.clear();\\n+#endif\\n }\\n \\n std::vector<std::pair<std::string, const AST::FunctionType &>>\\n@@ -706,5 +882,236 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetActiveModule() const {\\n return nullptr;\\n };\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+Expect<void> VM::lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx) {\\n+ std::unique_lock Lock(LazyJITMutex);\\n+ uint32_t ImportFuncCount = 0;\\n+ const AST::Module *ModulePtr = nullptr;\\n+ LLVM::Data *LLDataPtr = nullptr;\\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\\n+ LLVM::Compiler::CompileContextDeleter> *LLContextPtr =\\n+ nullptr;\\n+ LLVM::LazyJITState *StatePtr = nullptr;\\n+ const Runtime::Instance::ModuleInstance *ModInst = nullptr;\\n+\\n+ if (ActiveModInst && ActiveModInst->getID() == ID) {\\n+ ModInst = ActiveModInst.get();\\n+ ModulePtr = Mod.get();\\n+ } else {\\n+ auto ItMap = RegModMap.find(ID);\\n+ if (ItMap != RegModMap.end()) {\\n+ ModInst = RegModInsts[ItMap->second[1]].get();\\n+ ModulePtr = RegASTModules[ItMap->second[0]].get();\\n+ }\\n+ }\\n+\\n+ if (!ModInst || !ModulePtr) {\\n+ return {};\\n+ }\\n+\\n+ auto It = LazyJITStates.find(ID);\\n+ if (It != LazyJITStates.end()) {\\n+ StatePtr = &It->second;\\n+ ImportFuncCount = StatePtr->ImportFuncCount;\\n+ LLDataPtr = &StatePtr->LLData;\\n+ LLContextPtr = &StatePtr->LLContext;\\n+ } else {\\n+ spdlog::error(\\\"[lazy-jit]: failed to find JIT state for ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\\n+ }\\n+\\n+ if (FuncIdx < ImportFuncCount) {\\n+ return {};\\n+ }\\n+\\n+ uint32_t LocalFuncIdx = FuncIdx - ImportFuncCount;\\n+\\n+ auto FuncResult = ModInst->getFuncInst(FuncIdx);\\n+ if (!FuncResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get function instance for index {}, module ID: {}\\\"sv,\\n+ FuncIdx, ID);\\n+ return Unexpect(FuncResult.error());\\n+ }\\n+ auto *FuncInst = *FuncResult;\\n+\\n+ // If already compiled or not a Wasm function, nothing to do.\\n+ if (!FuncInst->isWasmFunction() || FuncInst->isCompiledFunction()) {\\n+ return {};\\n+ }\\n+\\n+ if (StatePtr && StatePtr->LazyCompiledFuncs.count(LocalFuncIdx) > 0) {\\n+ return {};\\n+ }\\n+\\n+ const std::unordered_set<uint32_t> EmptyCompiledSet;\\n+ const std::unordered_set<uint32_t> &CompiledSet =\\n+ StatePtr ? StatePtr->LazyCompiledFuncs : EmptyCompiledSet;\\n+\\n+ std::vector<uint32_t> BatchLocals;\\n+ collectLazyCallGraphBatch(LocalFuncIdx, ModulePtr, ImportFuncCount,\\n+ CompiledSet, BatchLocals);\\n+ if (BatchLocals.empty()) {\\n+ return {};\\n+ }\\n+\\n+ spdlog::debug(\\n+ \\\"[lazy-jit]: Lazy compiling batch ({} local funcs) for wasm entry local \\\"\\n+ \\\"{}, module ID: {}\\\"sv,\\n+ BatchLocals.size(), LocalFuncIdx, ID);\\n+\\n+ LLVM::Compiler Compiler(Conf);\\n+ auto ConfigResult = Compiler.checkConfigure();\\n+ if (!ConfigResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT compiler config failed: {}, module ID: {}\\\"sv,\\n+ ConfigResult.error(), ID);\\n+ return Unexpect(ConfigResult.error());\\n+ }\\n+\\n+ if (!LLDataPtr->hasModule()) {\\n+ LLDataPtr->resetModule();\\n+ }\\n+ auto CompileResult = Compiler.compileFunctions(\\n+ std::move(*LLDataPtr),\\n+ static_cast<LLVM::Compiler::CompileContext *>(LLContextPtr->get()),\\n+ *ModulePtr,\\n+ WasmEdge::Span<const uint32_t>(BatchLocals.data(), BatchLocals.size()));\\n+ if (!CompileResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT function compilation failed: {}, module ID: {}\\\"sv,\\n+ CompileResult.error(), ID);\\n+ return Unexpect(CompileResult.error());\\n+ }\\n+\\n+ *LLDataPtr = std::move(*CompileResult);\\n+ LLVM::JIT JIT(Conf);\\n+ std::shared_ptr<LLVM::JITLibrary> JITLib;\\n+ if (StatePtr && StatePtr->JITLib) {\\n+ JITLib = StatePtr->JITLib;\\n+ }\\n+\\n+ std::vector<uint32_t> BatchGlobal;\\n+ BatchGlobal.reserve(BatchLocals.size());\\n+ for (uint32_t L : BatchLocals) {\\n+ BatchGlobal.push_back(ImportFuncCount + L);\\n+ }\\n+\\n+ std::vector<LLVM::WasmFunctionCodeAddress> ResolvedAddresses;\\n+ if (JITLib) {\\n+ auto AddrRes = JIT.add(\\n+ *JITLib, *LLDataPtr,\\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\\n+ if (!AddrRes) {\\n+ spdlog::error(\\\"[lazy-jit]: Lazy JIT add failed: {}, module ID: {}\\\"sv,\\n+ AddrRes.error(), ID);\\n+ return Unexpect(AddrRes.error());\\n+ }\\n+ ResolvedAddresses = std::move(*AddrRes);\\n+ } else {\\n+ auto LoadResult = JIT.load(*LLDataPtr, true);\\n+ if (!LoadResult) {\\n+ spdlog::error(\\\"[lazy-jit]: Lazy JIT load failed: {}, module ID: {}\\\"sv,\\n+ LoadResult.error(), ID);\\n+ return Unexpect(LoadResult.error());\\n+ }\\n+ JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*LoadResult);\\n+ if (StatePtr) {\\n+ StatePtr->JITLib = JITLib;\\n+ }\\n+ auto LkRes = JIT.lookupWasmFunctionSymbols(\\n+ *JITLib, LLDataPtr->getPrefix(),\\n+ WasmEdge::Span<const uint32_t>(BatchGlobal.data(), BatchGlobal.size()));\\n+ if (!LkRes) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT symbol resolution failed: {}, module ID: {}\\\"sv,\\n+ LkRes.error(), ID);\\n+ return Unexpect(LkRes.error());\\n+ }\\n+ ResolvedAddresses = std::move(*LkRes);\\n+ }\\n+\\n+ if (ResolvedAddresses.size() != BatchLocals.size()) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: Lazy JIT address count mismatch, module ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ if (auto IntrinsicsSymbol = JITLib->getIntrinsics()) {\\n+ *IntrinsicsSymbol = &Executor::Executor::Intrinsics;\\n+ } else {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get intrinsics symbol, module ID: {}\\\"sv, ID);\\n+ return Unexpect(ErrCode::Value::LazyCompilationError);\\n+ }\\n+\\n+ for (size_t I = 0; I < BatchLocals.size(); ++I) {\\n+ const uint32_t L = BatchLocals[I];\\n+ const uint32_t WasmFuncIdx = ImportFuncCount + L;\\n+ LLVM::WasmFunctionCodeAddress CompiledCodePtr = ResolvedAddresses[I];\\n+ auto BatchFuncResult = ModInst->getFuncInst(WasmFuncIdx);\\n+ if (!BatchFuncResult) {\\n+ spdlog::error(\\n+ \\\"[lazy-jit]: failed to get function instance for index {}, module ID: {}\\\"sv,\\n+ WasmFuncIdx, ID);\\n+ return Unexpect(ErrCode::Value::WrongInstanceAddress);\\n+ }\\n+\\n+ auto *BatchFuncInst = *BatchFuncResult;\\n+ if (BatchFuncInst->isWasmFunction()) {\\n+ auto CompiledSym = JITLib->createSymbol(\\n+ reinterpret_cast<Runtime::Instance::FunctionInstance::CompiledFunction\\n+ *>(CompiledCodePtr));\\n+ BatchFuncInst->unsafeUpgradeToCompiled(std::move(CompiledSym));\\n+ }\\n+ }\\n+\\n+ if (StatePtr) {\\n+ for (uint32_t L : BatchLocals) {\\n+ StatePtr->LazyCompiledFuncs.insert(L);\\n+ }\\n+ }\\n+\\n+ spdlog::debug(\\n+ \\\"Lazy compilation completed for batch of {} functions, total compiled: \\\"\\n+ \\\"{}, module ID: {}\\\"sv,\\n+ BatchLocals.size(),\\n+ StatePtr ? StatePtr->LazyCompiledFuncs.size() : BatchLocals.size(), ID);\\n+\\n+ return {};\\n+}\\n+#endif\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+Expect<WasmEdge::LLVM::LazyJITState> VM::prepareLazyJIT(AST::Module &Module) {\\n+ WasmEdge::LLVM::LazyJITState State;\\n+ LLVM::Compiler Compiler(Conf);\\n+ EXPECTED_TRY(\\n+ Compiler.checkConfigure().map_error([](uint32_t Err) { return Err; }));\\n+\\n+ auto Prefix = fmt::format(\\\"m{}_\\\"sv, Module.getID());\\n+ EXPECTED_TRY(auto LLModule, Compiler.compileInfrastructure(Module, Prefix));\\n+\\n+ State.LLData = std::move(LLModule.first);\\n+ State.LLContext = std::move(LLModule.second);\\n+\\n+ LLVM::JIT JIT(Conf);\\n+ EXPECTED_TRY(auto Exec, JIT.load(State.LLData, true));\\n+ State.JITLib = std::static_pointer_cast<LLVM::JITLibrary>(Exec);\\n+\\n+ EXPECTED_TRY(LoaderEngine.loadExecutable(Module, State.JITLib));\\n+\\n+ size_t ImportFuncCount = 0;\\n+ for (const auto &ImpDesc : Module.getImportSection().getContent()) {\\n+ if (ImpDesc.getExternalType() == ExternalType::Function) {\\n+ ++ImportFuncCount;\\n+ }\\n+ }\\n+ State.ImportFuncCount = static_cast<uint32_t>(ImportFuncCount);\\n+\\n+ return State;\\n+}\\n+#endif\\n+\\n } // namespace VM\\n } // namespace WasmEdge\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13295,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"I am thinking about the cleanup because we have a class called `RAIICleanup` in the `compile()` function for the entire module. Could we handle all related cleanup together with a unified function to ensure that the cleanup actually occurs?"},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp\nindex 39da94d9a9ac..330e245f51c3 100644\n--- a/lib/llvm/compiler.cpp\n+++ b/lib/llvm/compiler.cpp\n@@ -9,6 +9,7 @@\n #include \"common/spdlog.h\"\n #include \"data.h\"\n #include \"llvm.h\"\n+#include \"spdlog/spdlog.h\"\n #include \"system/allocator.h\"\n \n #include <algorithm>\n@@ -16,6 +17,7 @@\n #include <cinttypes>\n #include <cstdint>\n #include <cstdlib>\n+#include <functional>\n #include <limits>\n #include <memory>\n #include <numeric>\n@@ -28,6 +30,16 @@ using namespace std::literals;\n \n namespace {\n \n+struct RAIICleanup {\n+ RAIICleanup(LLVM::Compiler::CompileContext *&Context,\n+ LLVM::Compiler::CompileContext *NewContext)\n+ : Context(Context) {\n+ Context = NewContext;\n+ }\n+ ~RAIICleanup() { Context = nullptr; }\n+ LLVM::Compiler::CompileContext *&Context;\n+};\n+\n static bool\n isVoidReturn(WasmEdge::Span<const WasmEdge::ValType> ValTypes) noexcept;\n static LLVM::Type toLLVMType(LLVM::Context LLContext,\n@@ -128,7 +140,7 @@ static inline LLVMCodeGenOptLevel toLLVMCodeGenLevel(\n \n struct LLVM::Compiler::CompileContext {\n LLVM::Context LLContext;\n- LLVM::Module &LLModule;\n+ std::reference_wrapper<LLVM::Module> LLModule;\n LLVM::Attribute Cold;\n LLVM::Attribute NoAlias;\n LLVM::Attribute NoInline;\n@@ -202,13 +214,16 @@ struct LLVM::Compiler::CompileContext {\n std::vector<std::tuple<uint32_t, LLVM::FunctionCallee,\n const WasmEdge::AST::CodeSegment *>>\n Functions;\n+ std::vector<LLVM::Value> LazyJITCacheVars;\n+ uint32_t ImportCount = 0;\n std::vector<LLVM::Type> MemoryAddrTypes;\n std::vector<LLVM::Type> TableAddrTypes;\n std::vector<LLVM::Type> Globals;\n+ std::string Prefix;\n LLVM::Value IntrinsicsTable;\n LLVM::FunctionCallee Trap;\n- CompileContext(LLVM::Context C, LLVM::Module &M,\n- bool IsGenericBinary) noexcept\n+ CompileContext(LLVM::Context C, LLVM::Module &M, bool IsGenericBinary,\n+ std::string_view P = \"\"sv) noexcept\n : LLContext(C), LLModule(M),\n Cold(LLVM::Attribute::createEnum(C, LLVM::Core::Cold, 0)),\n NoAlias(LLVM::Attribute::createEnum(C, LLVM::Core::NoAlias, 0)),\n@@ -256,14 +271,14 @@ struct LLVM::Compiler::CompileContext {\n })),\n ExecCtxPtrTy(ExecCtxTy.getPointerTo()),\n IntrinsicsTableTy(LLVM::Type::getArrayType(\n- Int8PtrTy,\n+ Int8Ty.getPointerTo(),\n static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax))),\n- IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()),\n- IntrinsicsTable(LLModule.addGlobal(IntrinsicsTablePtrTy, true,\n- LLVMExternalLinkage, LLVM::Value(),\n- \"intrinsics\")) {\n+ IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()), Prefix(P),\n+ IntrinsicsTable(LLModule.get().addGlobal(\n+ IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\n+ fmt::format(\"{}intrinsics\"sv, Prefix).c_str())) {\n Trap.Ty = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n- Trap.Fn = LLModule.addFunction(Trap.Ty, LLVMPrivateLinkage, \"trap\");\n+ Trap.Fn = LLModule.get().addFunction(Trap.Ty, LLVMPrivateLinkage, \"trap\");\n Trap.Fn.setDSOLocal(true);\n Trap.Fn.addFnAttr(NoStackArgProbe);\n Trap.Fn.addFnAttr(StrictFP);\n@@ -272,9 +287,10 @@ struct LLVM::Compiler::CompileContext {\n Trap.Fn.addFnAttr(Cold);\n Trap.Fn.addFnAttr(NoInline);\n \n- LLModule.addGlobal(Int32Ty, true, LLVMExternalLinkage,\n- LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\n- \"version\");\n+ LLModule.get().addGlobal(\n+ Int32Ty, true, LLVMExternalLinkage,\n+ LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\n+ fmt::format(\"{}version\"sv, Prefix).c_str());\n \n if (!IsGenericBinary) {\n SubtargetFeatures = LLVM::getHostCPUFeatures();\n@@ -313,18 +329,7 @@ struct LLVM::Compiler::CompileContext {\n }\n }\n \n- {\n- // create trap\n- LLVM::Builder Builder(LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(LLContext, Trap.Fn, \"entry\"));\n- auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n- auto CallTrap = Builder.createCall(\n- getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\n- {Trap.Fn.getFirstParam()});\n- CallTrap.addCallSiteAttribute(NoReturn);\n- Builder.createUnreachable();\n- }\n+ compileTrap();\n }\n LLVM::Value getMemory(LLVM::Builder &Builder, LLVM::Value ExecCtx,\n uint32_t Index) noexcept {\n@@ -394,6 +399,17 @@ struct LLVM::Compiler::CompileContext {\n auto Ptr = Builder.createBitCast(VPtr, PtrPtrTy);\n return {Ty, Builder.createLoad(PtrTy, Ptr)};\n }\n+ void compileTrap() noexcept {\n+ LLVM::Builder Builder(LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(LLContext, Trap.Fn, \"entry\"));\n+ auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n+ auto CallTrap = Builder.createCall(\n+ getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\n+ {Trap.Fn.getFirstParam()});\n+ CallTrap.addCallSiteAttribute(NoReturn);\n+ Builder.createUnreachable();\n+ }\n std::pair<std::vector<ValType>, std::vector<ValType>>\n resolveBlockType(const BlockType &BType) const noexcept {\n using VecT = std::vector<ValType>;\n@@ -544,9 +560,10 @@ class FunctionCompiler {\n FunctionCompiler(LLVM::Compiler::CompileContext &Context,\n LLVM::FunctionCallee F, Span<const ValType> Locals,\n bool Interruptible, bool InstructionCounting,\n- bool GasMeasuring) noexcept\n+ bool GasMeasuring, bool IsLazyJIT) noexcept\n : Context(Context), LLContext(Context.LLContext),\n- Interruptible(Interruptible), F(F), Builder(LLContext) {\n+ Interruptible(Interruptible), IsLazyJIT(IsLazyJIT), F(F),\n+ Builder(LLContext) {\n if (F.Fn) {\n Builder.positionAtEnd(LLVM::BasicBlock::create(LLContext, F.Fn, \"entry\"));\n ExecCtx = Builder.createLoad(Context.ExecCtxTy, F.Fn.getFirstParam());\n@@ -4267,7 +4284,63 @@ class FunctionCompiler {\n Args[J + 1] = stackPop();\n }\n \n- auto Ret = Builder.createCall(Function, Args);\n+ LLVM::Value Ret;\n+ if (IsLazyJIT) {\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\n+ if (IsImport) {\n+ Ret = Builder.createCall(Function, Args);\n+ } else {\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\n+\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\n+ }\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\n+ if (!CacheVar) {\n+ CacheVar = Context.LLModule.get().addGlobal(\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \"\");\n+ }\n+\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.check\");\n+ auto ResolveBB =\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.resolve\");\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.call\");\n+\n+ Builder.createBr(CheckBB);\n+ Builder.positionAtEnd(CheckBB);\n+\n+ auto CachedPtr =\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\n+ CachedPtr.setAlignment(8);\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\n+ auto IsNull = Builder.createIsNull(CachedPtr);\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\n+\n+ Builder.positionAtEnd(ResolveBB);\n+ auto FPtr = Builder.createCall(\n+ Context.getIntrinsic(\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\n+ {Context.Int32Ty}, false)),\n+ {LLContext.getInt32(FuncIndex)});\n+ auto Store = Builder.createStore(FPtr, CacheVar);\n+ Store.setAlignment(8);\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\n+ Builder.createBr(CallBB);\n+\n+ Builder.positionAtEnd(CallBB);\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\n+\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\n+ }\n+ } else {\n+ Ret = Builder.createCall(Function, Args);\n+ }\n+\n auto Ty = Ret.getType();\n if (Ty.isVoidTy()) {\n // nothing to do\n@@ -4387,7 +4460,64 @@ class FunctionCompiler {\n Args[J + 1] = stackPop();\n }\n \n- auto Ret = Builder.createCall(Function, Args);\n+ LLVM::Value Ret;\n+ if (IsLazyJIT) {\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\n+ if (IsImport) {\n+ Ret = Builder.createCall(Function, Args);\n+ } else {\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\n+\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\n+ }\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\n+ if (!CacheVar) {\n+ CacheVar = Context.LLModule.get().addGlobal(\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \"\");\n+ }\n+\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.check\");\n+ auto ResolveBB =\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.resolve\");\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.call\");\n+\n+ Builder.createBr(CheckBB);\n+ Builder.positionAtEnd(CheckBB);\n+\n+ auto CachedPtr =\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\n+ CachedPtr.setAlignment(8);\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\n+ auto IsNull = Builder.createIsNull(CachedPtr);\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\n+\n+ Builder.positionAtEnd(ResolveBB);\n+ auto FPtr = Builder.createCall(\n+ Context.getIntrinsic(\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\n+ {Context.Int32Ty}, false)),\n+ {LLContext.getInt32(FuncIndex)});\n+ auto Store = Builder.createStore(FPtr, CacheVar);\n+ Store.setAlignment(8);\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\n+ Builder.createBr(CallBB);\n+\n+ Builder.positionAtEnd(CallBB);\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\n+\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\n+ }\n+ } else {\n+ Ret = Builder.createCall(Function, Args);\n+ }\n+\n+ Ret.setMustTailCall();\n auto Ty = Ret.getType();\n if (Ty.isVoidTy()) {\n Builder.createRetVoid();\n@@ -4432,6 +4562,7 @@ class FunctionCompiler {\n \n auto FPtrRet =\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\n+ FPtrRet.setMustTailCall();\n if (RetSize == 0) {\n Builder.createRetVoid();\n } else {\n@@ -4608,6 +4739,7 @@ class FunctionCompiler {\n \n auto FPtrRet =\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\n+ FPtrRet.setMustTailCall();\n if (RetSize == 0) {\n Builder.createRetVoid();\n } else {\n@@ -5854,6 +5986,7 @@ class FunctionCompiler {\n Control &operator=(const Control &) = default;\n Control &operator=(Control &&) = default;\n };\n+ bool IsLazyJIT;\n std::vector<Control> ControlStack;\n LLVM::FunctionCallee F;\n LLVM::Value ExecCtx;\n@@ -5894,6 +6027,84 @@ Expect<void> Compiler::checkConfigure() noexcept {\n return {};\n }\n \n+Expect<void> Compiler::optimize(LLVM::Module &LLModule,\n+ LLVM::TargetMachine &TM) noexcept {\n+ spdlog::info(\"optimize start\"sv);\n+ auto Triple = LLModule.getTarget();\n+ auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\n+ if (ErrorMessage) {\n+ spdlog::error(\"getFromTriple failed:{}\"sv, ErrorMessage.string_view());\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ std::string CPUName;\n+#if defined(__riscv) && __riscv_xlen == 64\n+ CPUName = \"generic-rv64\"s;\n+#else\n+ if (!Conf.getCompilerConfigure().isGenericBinary()) {\n+ CPUName = LLVM::getHostCPUName().string_view();\n+ } else {\n+ CPUName = \"generic\"s;\n+ }\n+#endif\n+\n+ // On RISC-V we use generic-rv64 as the CPU, so also use default\n+ // features; host features under QEMU can be inconsistent (e.g.\n+ // zvl*b without v) which LLVM >= 20 rejects.\n+ TM = LLVM::TargetMachine::create(\n+ TheTarget, Triple, CPUName.c_str(),\n+#if defined(__riscv) && __riscv_xlen == 64\n+ \"\",\n+#else\n+ LLVM::getHostCPUFeatures().unwrap(),\n+#endif\n+ toLLVMCodeGenLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n+ LLVMRelocPIC, LLVMCodeModelDefault);\n+\n+#if LLVM_VERSION_MAJOR >= 13\n+ auto PBO = LLVM::PassBuilderOptions::create();\n+ if (auto Error = PBO.runPasses(\n+ LLModule,\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n+ TM)) {\n+ spdlog::error(\"{}\"sv, Error.message().string_view());\n+ }\n+#else\n+ auto FP = LLVM::PassManager::createForModule(LLModule);\n+ auto MP = LLVM::PassManager::create();\n+\n+ TM.addAnalysisPasses(MP);\n+ TM.addAnalysisPasses(FP);\n+ {\n+ auto PMB = LLVM::PassManagerBuilder::create();\n+ auto [OptLevel, SizeLevel] =\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\n+ PMB.setOptLevel(OptLevel);\n+ PMB.setSizeLevel(SizeLevel);\n+ PMB.populateFunctionPassManager(FP);\n+ PMB.populateModulePassManager(MP);\n+ }\n+ switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\n+ case CompilerConfigure::OptimizationLevel::O0:\n+ case CompilerConfigure::OptimizationLevel::O1:\n+ FP.addTailCallEliminationPass();\n+ break;\n+ default:\n+ break;\n+ }\n+\n+ FP.initializeFunctionPassManager();\n+ for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\n+ FP.runFunctionPassManager(Fn);\n+ }\n+ FP.finalizeFunctionPassManager();\n+ MP.runPassManager(LLModule);\n+#endif\n+\n+ spdlog::info(\"optimize done\"sv);\n+ return {};\n+}\n+\n Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n // Check that the module is validated.\n if (unlikely(!Module.getIsValidated())) {\n@@ -5913,15 +6124,7 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n \n CompileContext NewContext(LLContext, LLModule,\n Conf.getCompilerConfigure().isGenericBinary());\n- struct RAIICleanup {\n- RAIICleanup(CompileContext *&Context, CompileContext &NewContext)\n- : Context(Context) {\n- Context = &NewContext;\n- }\n- ~RAIICleanup() { Context = nullptr; }\n- CompileContext *&Context;\n- };\n- RAIICleanup Cleanup(Context, NewContext);\n+ RAIICleanup Cleanup(Context, &NewContext);\n \n // Compile Function Types\n compile(Module.getTypeSection());\n@@ -5942,81 +6145,8 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n spdlog::info(\"verify start\"sv);\n LLModule.verify(LLVMPrintMessageAction);\n \n- spdlog::info(\"optimize start\"sv);\n auto &TM = D.extract().TM;\n- {\n- auto Triple = LLModule.getTarget();\n- auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\n- if (ErrorMessage) {\n- spdlog::error(\"getFromTriple failed:{}\"sv, ErrorMessage.string_view());\n- return Unexpect(ErrCode::Value::IllegalPath);\n- } else {\n- std::string CPUName;\n-#if defined(__riscv) && __riscv_xlen == 64\n- CPUName = \"generic-rv64\"s;\n-#else\n- if (!Conf.getCompilerConfigure().isGenericBinary()) {\n- CPUName = LLVM::getHostCPUName().string_view();\n- } else {\n- CPUName = \"generic\"s;\n- }\n-#endif\n-\n- // On RISC-V we use generic-rv64 as the CPU, so also use default\n- // features; host features under QEMU can be inconsistent (e.g.\n- // zvl*b without v) which LLVM >= 20 rejects.\n- TM = LLVM::TargetMachine::create(\n- TheTarget, Triple, CPUName.c_str(),\n-#if defined(__riscv) && __riscv_xlen == 64\n- \"\",\n-#else\n- LLVM::getHostCPUFeatures().unwrap(),\n-#endif\n- toLLVMCodeGenLevel(\n- Conf.getCompilerConfigure().getOptimizationLevel()),\n- LLVMRelocPIC, LLVMCodeModelDefault);\n- }\n-\n-#if LLVM_VERSION_MAJOR >= 13\n- auto PBO = LLVM::PassBuilderOptions::create();\n- if (auto Error = PBO.runPasses(\n- LLModule,\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n- TM)) {\n- spdlog::error(\"{}\"sv, Error.message().string_view());\n- }\n-#else\n- auto FP = LLVM::PassManager::createForModule(LLModule);\n- auto MP = LLVM::PassManager::create();\n-\n- TM.addAnalysisPasses(MP);\n- TM.addAnalysisPasses(FP);\n- {\n- auto PMB = LLVM::PassManagerBuilder::create();\n- auto [OptLevel, SizeLevel] =\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\n- PMB.setOptLevel(OptLevel);\n- PMB.setSizeLevel(SizeLevel);\n- PMB.populateFunctionPassManager(FP);\n- PMB.populateModulePassManager(MP);\n- }\n- switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\n- case CompilerConfigure::OptimizationLevel::O0:\n- case CompilerConfigure::OptimizationLevel::O1:\n- FP.addTailCallEliminationPass();\n- break;\n- default:\n- break;\n- }\n-\n- FP.initializeFunctionPassManager();\n- for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\n- FP.runFunctionPassManager(Fn);\n- }\n- FP.finalizeFunctionPassManager();\n- MP.runPassManager(LLModule);\n-#endif\n- }\n+ EXPECTED_TRY(optimize(LLModule, TM));\n \n // Set initializer for constant value\n if (auto IntrinsicsTable = LLModule.getNamedGlobal(\"intrinsics\")) {\n@@ -6031,12 +6161,11 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n LLVM::Value::getConstNull(IntrinsicsTableTy), \"intrinsics\");\n }\n-\n- spdlog::info(\"optimize done\"sv);\n return Expect<Data>{std::move(D)};\n }\n \n-void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n+void Compiler::compile(const AST::TypeSection &TypeSec,\n+ bool DeclarationsOnly) noexcept {\n auto WrapperTy =\n LLVM::Type::getFunctionType(Context->VoidTy,\n {Context->ExecCtxPtrTy, Context->Int8PtrTy,\n@@ -6050,10 +6179,25 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n Context->CompositeTypes.reserve(Size);\n Context->FunctionWrappers.reserve(Size);\n \n+ auto SetFuncAttributes = [&](auto FDecl) {\n+ FDecl.setVisibility(LLVMProtectedVisibility);\n+ FDecl.setDSOLocal(true);\n+ FDecl.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ FDecl.addFnAttr(Context->NoStackArgProbe);\n+ FDecl.addFnAttr(Context->StrictFP);\n+ FDecl.addFnAttr(Context->UWTable);\n+ FDecl.addParamAttr(0, Context->ReadOnly);\n+ FDecl.addParamAttr(0, Context->NoAlias);\n+ FDecl.addParamAttr(1, Context->NoAlias);\n+ FDecl.addParamAttr(2, Context->NoAlias);\n+ FDecl.addParamAttr(3, Context->NoAlias);\n+ };\n+\n // Iterate and compile types.\n for (size_t I = 0; I < Size; ++I) {\n const auto &CompType = SubTypes[I].getCompositeType();\n- const auto Name = fmt::format(\"t{}\"sv, Context->CompositeTypes.size());\n+ const auto Name =\n+ fmt::format(\"{}t{}\"sv, Context->Prefix, Context->CompositeTypes.size());\n if (CompType.isFunc()) {\n // Check that the function type is unique.\n {\n@@ -6065,13 +6209,21 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n if (OldFuncType == CompType.getFuncType()) {\n Unique = false;\n Context->CompositeTypes.push_back(Context->CompositeTypes[J]);\n- auto F = Context->FunctionWrappers[J];\n- Context->FunctionWrappers.push_back(F);\n- auto A = Context->LLModule.addAlias(WrapperTy, F, Name.c_str());\n- A.setLinkage(LLVMExternalLinkage);\n- A.setVisibility(LLVMProtectedVisibility);\n- A.setDSOLocal(true);\n- A.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ if (DeclarationsOnly) {\n+ auto FDecl = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n+ SetFuncAttributes(FDecl);\n+ Context->FunctionWrappers.push_back(FDecl);\n+ } else {\n+ auto F = Context->FunctionWrappers[J];\n+ Context->FunctionWrappers.push_back(F);\n+ auto A = Context->LLModule.get().addAlias(WrapperTy, F,\n+ Name.c_str());\n+ A.setLinkage(LLVMExternalLinkage);\n+ A.setVisibility(LLVMProtectedVisibility);\n+ A.setDSOLocal(true);\n+ A.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ }\n break;\n }\n }\n@@ -6082,81 +6234,66 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n }\n \n // Create Wrapper\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\n- Name.c_str());\n+ auto F = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n {\n- F.setVisibility(LLVMProtectedVisibility);\n- F.setDSOLocal(true);\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\n- F.addFnAttr(Context->NoStackArgProbe);\n- F.addFnAttr(Context->StrictFP);\n- F.addFnAttr(Context->UWTable);\n- F.addParamAttr(0, Context->ReadOnly);\n- F.addParamAttr(0, Context->NoAlias);\n- F.addParamAttr(1, Context->NoAlias);\n- F.addParamAttr(2, Context->NoAlias);\n- F.addParamAttr(3, Context->NoAlias);\n-\n- LLVM::Builder Builder(Context->LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n-\n- auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\n- CompType.getFuncType());\n- auto RTy = FTy.getReturnType();\n- std::vector<LLVM::Type> FPTy(FTy.getNumParams());\n- FTy.getParamTypes(FPTy);\n-\n- const size_t ArgCount = FPTy.size() - 1;\n- auto ExecCtxPtr = F.getFirstParam();\n- auto RawFunc = LLVM::FunctionCallee{\n- FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\n- FTy.getPointerTo())};\n- auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\n- auto RawRets = RawArgs.getNextParam();\n-\n- std::vector<LLVM::Value> Args;\n- Args.reserve(FTy.getNumParams());\n- Args.push_back(ExecCtxPtr);\n- for (size_t J = 0; J < ArgCount; ++J) {\n- Args.push_back(Builder.createValuePtrLoad(\n- FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\n- }\n+ SetFuncAttributes(F);\n+\n+ if (!DeclarationsOnly) {\n+ LLVM::Builder Builder(Context->LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n+\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\n+ CompType.getFuncType());\n+ auto RTy = FTy.getReturnType();\n+ std::vector<LLVM::Type> FPTy(FTy.getNumParams());\n+ FTy.getParamTypes(FPTy);\n+\n+ const size_t ArgCount = FPTy.size() - 1;\n+ auto ExecCtxPtr = F.getFirstParam();\n+ auto RawFunc = LLVM::FunctionCallee{\n+ FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\n+ FTy.getPointerTo())};\n+ auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\n+ auto RawRets = RawArgs.getNextParam();\n+\n+ std::vector<LLVM::Value> Args;\n+ Args.reserve(FTy.getNumParams());\n+ Args.push_back(ExecCtxPtr);\n+ for (size_t J = 0; J < ArgCount; ++J) {\n+ Args.push_back(Builder.createValuePtrLoad(\n+ FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\n+ }\n \n- auto Ret = Builder.createCall(RawFunc, Args);\n- if (RTy.isVoidTy()) {\n- // nothing to do\n- } else if (RTy.isStructTy()) {\n- auto Rets = unpackStruct(Builder, Ret);\n- Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty, kValSize);\n- } else {\n- Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\n+ auto Ret = Builder.createCall(RawFunc, Args);\n+ if (RTy.isVoidTy()) {\n+ // nothing to do\n+ } else if (RTy.isStructTy()) {\n+ auto Rets = unpackStruct(Builder, Ret);\n+ Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty,\n+ kValSize);\n+ } else {\n+ Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\n+ }\n+ Builder.createRetVoid();\n }\n- Builder.createRetVoid();\n }\n // Copy wrapper, param and return lists to module instance.\n Context->FunctionWrappers.push_back(F);\n } else {\n // Non function type case. Create empty wrapper.\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\n- Name.c_str());\n+ auto F = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n {\n- F.setVisibility(LLVMProtectedVisibility);\n- F.setDSOLocal(true);\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\n- F.addFnAttr(Context->NoStackArgProbe);\n- F.addFnAttr(Context->StrictFP);\n- F.addFnAttr(Context->UWTable);\n- F.addParamAttr(0, Context->ReadOnly);\n- F.addParamAttr(0, Context->NoAlias);\n- F.addParamAttr(1, Context->NoAlias);\n- F.addParamAttr(2, Context->NoAlias);\n- F.addParamAttr(3, Context->NoAlias);\n-\n- LLVM::Builder Builder(Context->LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n- Builder.createRetVoid();\n+ SetFuncAttributes(F);\n+\n+ if (!DeclarationsOnly) {\n+ LLVM::Builder Builder(Context->LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n+ Builder.createRetVoid();\n+ }\n }\n Context->FunctionWrappers.push_back(F);\n }\n@@ -6184,9 +6321,9 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\n toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n auto RTy = FTy.getReturnType();\n auto F = LLVM::FunctionCallee{\n- FTy,\n- Context->LLModule.addFunction(FTy, LLVMInternalLinkage,\n- fmt::format(\"f{}\"sv, FuncID).c_str())};\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMInternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n F.Fn.setDSOLocal(true);\n F.Fn.addFnAttr(Context->NoStackArgProbe);\n F.Fn.addFnAttr(Context->StrictFP);\n@@ -6231,6 +6368,7 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\n }\n \n Context->Functions.emplace_back(TypeIdx, F, nullptr);\n+ Context->ImportCount++;\n break;\n }\n case ExternalType::Table: // Table type\n@@ -6313,9 +6451,10 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n const auto FuncID = Context->Functions.size();\n auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n- LLVM::FunctionCallee F = {FTy, Context->LLModule.addFunction(\n- FTy, LLVMExternalLinkage,\n- fmt::format(\"f{}\"sv, FuncID).c_str())};\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n F.Fn.setVisibility(LLVMProtectedVisibility);\n F.Fn.setDSOLocal(true);\n F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n@@ -6339,10 +6478,11 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n Locals.push_back(Local.second);\n }\n }\n- FunctionCompiler FC(*Context, F, Locals,\n- Conf.getCompilerConfigure().isInterruptible(),\n- Conf.getStatisticsConfigure().isInstructionCounting(),\n- Conf.getStatisticsConfigure().isCostMeasuring());\n+ FunctionCompiler FC(\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\n auto Type = Context->resolveBlockType(T);\n EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n F.Fn.eliminateUnreachableBlocks();\n@@ -6350,5 +6490,235 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n return {};\n }\n \n+void Compiler::compileFunctionDeclarations(\n+ const AST::FunctionSection &FunctionSec,\n+ const AST::CodeSection &CodeSec) noexcept {\n+ const auto &TypeIdxs = FunctionSec.getContent();\n+ const auto &CodeSegs = CodeSec.getContent();\n+ assuming(TypeIdxs.size() == CodeSegs.size());\n+\n+ for (size_t I = 0; I < CodeSegs.size(); ++I) {\n+ const auto &TypeIdx = TypeIdxs[I];\n+ const auto &Code = CodeSegs[I];\n+ assuming(TypeIdx < Context->CompositeTypes.size());\n+ assuming(Context->CompositeTypes[TypeIdx]->isFunc());\n+ const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n+ const auto FuncID = Context->Functions.size();\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n+ F.Fn.setVisibility(LLVMProtectedVisibility);\n+ F.Fn.setDSOLocal(true);\n+ F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ F.Fn.addFnAttr(Context->NoStackArgProbe);\n+ F.Fn.addFnAttr(Context->StrictFP);\n+ F.Fn.addFnAttr(Context->UWTable);\n+ F.Fn.addParamAttr(0, Context->ReadOnly);\n+ F.Fn.addParamAttr(0, Context->NoAlias);\n+\n+ Context->Functions.emplace_back(TypeIdx, F, &Code);\n+ }\n+}\n+\n+Expect<void> Compiler::compileFunctionBody(uint32_t LocalFuncIndex) noexcept {\n+ // Find the function in the Functions list\n+ // LocalFuncIndex is relative to the defined functions (not imports)\n+ uint32_t GlobalFuncIndex = Context->ImportCount + LocalFuncIndex;\n+ if (GlobalFuncIndex >= Context->Functions.size()) {\n+ spdlog::error(\"[lazy-jit]: function index {} out of range\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ auto &[T, F, Code] = Context->Functions[GlobalFuncIndex];\n+ if (!Code) {\n+ spdlog::error(\"[lazy-jit]: cannot compile import function {}\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ // Check if already compiled (function has basic blocks)\n+ if (F.Fn.countBasicBlocks() > 0) {\n+ spdlog::debug(\"[lazy-jit]: function {} already compiled\"sv, LocalFuncIndex);\n+ return {};\n+ }\n+\n+ spdlog::debug(\"[lazy-jit]: compiling function {}\"sv, LocalFuncIndex);\n+\n+ std::vector<ValType> Locals;\n+ for (const auto &Local : Code->getLocals()) {\n+ for (unsigned I = 0; I < Local.first; ++I) {\n+ Locals.push_back(Local.second);\n+ }\n+ }\n+\n+ FunctionCompiler FC(\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\n+ auto Type = Context->resolveBlockType(T);\n+ EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n+ F.Fn.eliminateUnreachableBlocks();\n+\n+ return {};\n+}\n+\n+Expect<std::pair<LLVM::Data,\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter>>>\n+LLVM::Compiler::compileInfrastructure(const AST::Module &Module,\n+ std::string Prefix) noexcept {\n+ Data D;\n+ D.setPrefix(Prefix);\n+ // Check the module is validated.\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ spdlog::info(\"[lazy-jit]: compile infrastructure start\"sv);\n+\n+ auto LLContext = D.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = D.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ std::unique_ptr<CompileContext, CompileContextDeleter> NewContext(\n+ new CompileContext(LLContext, LLModule,\n+ Conf.getCompilerConfigure().isGenericBinary(),\n+ D.getPrefix()));\n+ RAIICleanup Cleanup(this->Context, NewContext.get());\n+\n+ // Compile Function Types\n+ compile(Module.getTypeSection());\n+ // Compile ImportSection\n+ compile(Module.getImportSection());\n+ // Compile GlobalSection\n+ compile(Module.getGlobalSection());\n+ // Compile MemorySection (MemorySec, DataSec)\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ // Compile TableSection (TableSec, ElemSec)\n+ compile(Module.getTableSection(), Module.getElementSection());\n+ // Create function declarations without compiling bodies\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+ // Compile ExportSection\n+ compile(Module.getExportSection());\n+\n+ // Set initializer for constant value\n+ auto IntrinsicsName = fmt::format(\"{}intrinsics\"sv, D.getPrefix());\n+ if (auto IntrinsicsTable = LLModule.getNamedGlobal(IntrinsicsName.c_str())) {\n+ IntrinsicsTable.setInitializer(\n+ LLVM::Value::getConstNull(IntrinsicsTable.getType()));\n+ IntrinsicsTable.setGlobalConstant(false);\n+ } else {\n+ auto IntrinsicsTableTy = LLVM::Type::getArrayType(\n+ LLContext.getInt8Ty().getPointerTo(),\n+ static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax));\n+ LLModule.addGlobal(\n+ IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n+ LLVM::Value::getConstNull(IntrinsicsTableTy), IntrinsicsName.c_str());\n+ }\n+ LLModule.verify(LLVMPrintMessageAction);\n+\n+ spdlog::info(\"[lazy-jit]: infrastructure compilation done\"sv);\n+\n+ return Expect<\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>>{\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>{\n+ std::move(D), std::move(NewContext)}};\n+}\n+\n+Expect<LLVM::Data>\n+Compiler::compileFunctions(Data &&LLData, CompileContext *NewContext,\n+ const AST::Module &Module,\n+ Span<const uint32_t> LocalFuncIndices) noexcept {\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+ if (unlikely(LocalFuncIndices.empty())) {\n+ spdlog::error(\"[lazy-jit]: compileFunctions with empty index list\"sv);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ std::vector<uint32_t> Sorted(LocalFuncIndices.begin(),\n+ LocalFuncIndices.end());\n+ std::sort(Sorted.begin(), Sorted.end());\n+ Sorted.erase(std::unique(Sorted.begin(), Sorted.end()), Sorted.end());\n+\n+ spdlog::debug(\"[lazy-jit]: compile functions batch ({}) start\"sv,\n+ Sorted.size());\n+\n+ auto LLContext = LLData.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = LLData.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ RAIICleanup Cleanup(this->Context, NewContext);\n+ Context->LLModule = LLModule;\n+\n+ Context->CompositeTypes.clear();\n+ Context->FunctionWrappers.clear();\n+ Context->Functions.clear();\n+ Context->LazyJITCacheVars.clear();\n+ Context->ImportCount = 0;\n+ Context->MemoryAddrTypes.clear();\n+ Context->TableAddrTypes.clear();\n+ Context->Globals.clear();\n+\n+ Context->IntrinsicsTable = LLModule.addGlobal(\n+ Context->IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\n+ fmt::format(\"{}intrinsics\"sv, Context->Prefix).c_str());\n+ Context->IntrinsicsTable.setInitializer(LLVM::Value());\n+ Context->Trap.Ty =\n+ LLVM::Type::getFunctionType(Context->VoidTy, {Context->Int32Ty});\n+ Context->Trap.Fn =\n+ LLModule.addFunction(Context->Trap.Ty, LLVMPrivateLinkage, \"trap\");\n+ Context->Trap.Fn.setDSOLocal(true);\n+ Context->Trap.Fn.addFnAttr(Context->NoStackArgProbe);\n+ Context->Trap.Fn.addFnAttr(Context->StrictFP);\n+ Context->Trap.Fn.addFnAttr(Context->UWTable);\n+ Context->Trap.Fn.addFnAttr(Context->NoReturn);\n+ Context->Trap.Fn.addFnAttr(Context->Cold);\n+ Context->Trap.Fn.addFnAttr(Context->NoInline);\n+ Context->compileTrap();\n+\n+ compile(Module.getTypeSection(), true);\n+ compile(Module.getImportSection());\n+ compile(Module.getGlobalSection());\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ compile(Module.getTableSection(), Module.getElementSection());\n+\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+\n+ for (uint32_t FuncIndex : Sorted) {\n+ EXPECTED_TRY(compileFunctionBody(FuncIndex));\n+ }\n+\n+ spdlog::info(\"[lazy-jit]: verify batch ({} funcs) start\"sv, Sorted.size());\n+ LLModule.verify(LLVMPrintMessageAction);\n+ spdlog::info(\"[lazy-jit]: verify batch ({} funcs) done\"sv, Sorted.size());\n+\n+ auto &TM = LLData.extract().TM;\n+ EXPECTED_TRY(optimize(LLModule, TM));\n+\n+ spdlog::debug(\"[lazy-jit]: compile functions batch ({}) done\"sv,\n+ Sorted.size());\n+ return Expect<Data>{std::move(LLData)};\n+}\n+\n+void LLVM::Compiler::CompileContextDeleter::operator()(\n+ CompileContext *Context) const noexcept {\n+ delete Context;\n+}\n } // namespace LLVM\n } // namespace WasmEdge\n"},"changed_files":{"kind":"list like","value":["lib/llvm/compiler.cpp"],"string":"[\n \"lib/llvm/compiler.cpp\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"I am thinking about the cleanup because we have a class called `RAIICleanup` in the `compile()` function for the entire module. Could we handle all related cleanup together with a unified function to ensure that the cleanup actually occurs?","path":"lib/llvm/compiler.cpp","hunk":"@@ -6342,13 +6498,255 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n FunctionCompiler FC(*Context, F, Locals,\n Conf.getCompilerConfigure().isInterruptible(),\n Conf.getStatisticsConfigure().isInstructionCounting(),\n- Conf.getStatisticsConfigure().isCostMeasuring());\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().isEnableLazyJIT());\n auto Type = Context->resolveBlockType(T);\n EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n F.Fn.eliminateUnreachableBlocks();\n }\n return {};\n }\n \n+void Compiler::compileFunctionDeclarations(\n+ const AST::FunctionSection &FunctionSec,\n+ const AST::CodeSection &CodeSec) noexcept {\n+ const auto &TypeIdxs = FunctionSec.getContent();\n+ const auto &CodeSegs = CodeSec.getContent();\n+ assuming(TypeIdxs.size() == CodeSegs.size());\n+\n+ for (size_t I = 0; I < CodeSegs.size(); ++I) {\n+ const auto &TypeIdx = TypeIdxs[I];\n+ const auto &Code = CodeSegs[I];\n+ assuming(TypeIdx < Context->CompositeTypes.size());\n+ assuming(Context->CompositeTypes[TypeIdx]->isFunc());\n+ const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n+ const auto FuncID = Context->Functions.size();\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n+ F.Fn.setVisibility(LLVMProtectedVisibility);\n+ F.Fn.setDSOLocal(true);\n+ F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ F.Fn.addFnAttr(Context->NoStackArgProbe);\n+ F.Fn.addFnAttr(Context->StrictFP);\n+ F.Fn.addFnAttr(Context->UWTable);\n+ F.Fn.addParamAttr(0, Context->ReadOnly);\n+ F.Fn.addParamAttr(0, Context->NoAlias);\n+\n+ Context->Functions.emplace_back(TypeIdx, F, &Code);\n+ }\n+}\n+\n+Expect<void> Compiler::compileFunctionBody(uint32_t LocalFuncIndex) noexcept {\n+ // Find the function in the Functions list\n+ // LocalFuncIndex is relative to the defined functions (not imports)\n+ uint32_t ImportCount = 0;\n+ for (const auto &[T, F, Code] : Context->Functions) {\n+ if (!Code) {\n+ ImportCount++;\n+ }\n+ }\n+\n+ uint32_t GlobalFuncIndex = ImportCount + LocalFuncIndex;\n+ if (GlobalFuncIndex >= Context->Functions.size()) {\n+ spdlog::error(\"[lazy-jit]: function index {} out of range\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ auto &[T, F, Code] = Context->Functions[GlobalFuncIndex];\n+ if (!Code) {\n+ spdlog::error(\"[lazy-jit]: cannot compile import function {}\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ // Check if already compiled (function has basic blocks)\n+ if (F.Fn.countBasicBlocks() > 0) {\n+ spdlog::debug(\"[lazy-jit]: function {} already compiled\"sv, LocalFuncIndex);\n+ return {};\n+ }\n+\n+ spdlog::debug(\"[lazy-jit]: compiling function {}\"sv, LocalFuncIndex);\n+\n+ std::vector<ValType> Locals;\n+ for (const auto &Local : Code->getLocals()) {\n+ for (unsigned I = 0; I < Local.first; ++I) {\n+ Locals.push_back(Local.second);\n+ }\n+ }\n+\n+ FunctionCompiler FC(*Context, F, Locals,\n+ Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().isEnableLazyJIT());\n+ auto Type = Context->resolveBlockType(T);\n+ EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n+ F.Fn.eliminateUnreachableBlocks();\n+\n+ return {};\n+}\n+\n+Expect<std::pair<LLVM::Data,\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter>>>\n+LLVM::Compiler::compileInfrastructure(const AST::Module &Module,\n+ std::string Prefix) noexcept {\n+ Data D;\n+ D.setPrefix(Prefix);\n+ // Check the module is validated.\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ spdlog::info(\"[lazyjit]: compile infrastructure start\"sv);\n+\n+ auto LLContext = D.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = D.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ std::unique_ptr<CompileContext, CompileContextDeleter> NewContext(\n+ new CompileContext(LLContext, LLModule,\n+ Conf.getCompilerConfigure().isGenericBinary(),\n+ D.getPrefix()));\n+ this->Context = NewContext.get();\n+\n+ // Compile Function Types\n+ compile(Module.getTypeSection());\n+ // Compile ImportSection\n+ compile(Module.getImportSection());\n+ // Compile GlobalSection\n+ compile(Module.getGlobalSection());\n+ // Compile MemorySection (MemorySec, DataSec)\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ // Compile TableSection (TableSec, ElemSec)\n+ compile(Module.getTableSection(), Module.getElementSection());\n+ // Create function declarations without compiling bodies\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+ // Compile ExportSection\n+ compile(Module.getExportSection());\n+\n+ // Set initializer for constant value\n+ auto IntrinsicsName = fmt::format(\"{}intrinsics\"sv, D.getPrefix());\n+ if (auto IntrinsicsTable = LLModule.getNamedGlobal(IntrinsicsName.c_str())) {\n+ IntrinsicsTable.setInitializer(\n+ LLVM::Value::getConstNull(IntrinsicsTable.getType()));\n+ IntrinsicsTable.setGlobalConstant(false);\n+ } else {\n+ auto IntrinsicsTableTy = LLVM::Type::getArrayType(\n+ LLContext.getInt8Ty().getPointerTo(),\n+ static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax));\n+ LLModule.addGlobal(\n+ IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n+ LLVM::Value::getConstNull(IntrinsicsTableTy), IntrinsicsName.c_str());\n+ }\n+\n+ spdlog::info(\"[lazyjit]: infrastructure compilation done\"sv);\n+\n+ this->Context = nullptr;","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp\nindex 39da94d9a9ac..330e245f51c3 100644\n--- a/lib/llvm/compiler.cpp\n+++ b/lib/llvm/compiler.cpp\n@@ -9,6 +9,7 @@\n #include \"common/spdlog.h\"\n #include \"data.h\"\n #include \"llvm.h\"\n+#include \"spdlog/spdlog.h\"\n #include \"system/allocator.h\"\n \n #include <algorithm>\n@@ -16,6 +17,7 @@\n #include <cinttypes>\n #include <cstdint>\n #include <cstdlib>\n+#include <functional>\n #include <limits>\n #include <memory>\n #include <numeric>\n@@ -28,6 +30,16 @@ using namespace std::literals;\n \n namespace {\n \n+struct RAIICleanup {\n+ RAIICleanup(LLVM::Compiler::CompileContext *&Context,\n+ LLVM::Compiler::CompileContext *NewContext)\n+ : Context(Context) {\n+ Context = NewContext;\n+ }\n+ ~RAIICleanup() { Context = nullptr; }\n+ LLVM::Compiler::CompileContext *&Context;\n+};\n+\n static bool\n isVoidReturn(WasmEdge::Span<const WasmEdge::ValType> ValTypes) noexcept;\n static LLVM::Type toLLVMType(LLVM::Context LLContext,\n@@ -128,7 +140,7 @@ static inline LLVMCodeGenOptLevel toLLVMCodeGenLevel(\n \n struct LLVM::Compiler::CompileContext {\n LLVM::Context LLContext;\n- LLVM::Module &LLModule;\n+ std::reference_wrapper<LLVM::Module> LLModule;\n LLVM::Attribute Cold;\n LLVM::Attribute NoAlias;\n LLVM::Attribute NoInline;\n@@ -202,13 +214,16 @@ struct LLVM::Compiler::CompileContext {\n std::vector<std::tuple<uint32_t, LLVM::FunctionCallee,\n const WasmEdge::AST::CodeSegment *>>\n Functions;\n+ std::vector<LLVM::Value> LazyJITCacheVars;\n+ uint32_t ImportCount = 0;\n std::vector<LLVM::Type> MemoryAddrTypes;\n std::vector<LLVM::Type> TableAddrTypes;\n std::vector<LLVM::Type> Globals;\n+ std::string Prefix;\n LLVM::Value IntrinsicsTable;\n LLVM::FunctionCallee Trap;\n- CompileContext(LLVM::Context C, LLVM::Module &M,\n- bool IsGenericBinary) noexcept\n+ CompileContext(LLVM::Context C, LLVM::Module &M, bool IsGenericBinary,\n+ std::string_view P = \"\"sv) noexcept\n : LLContext(C), LLModule(M),\n Cold(LLVM::Attribute::createEnum(C, LLVM::Core::Cold, 0)),\n NoAlias(LLVM::Attribute::createEnum(C, LLVM::Core::NoAlias, 0)),\n@@ -256,14 +271,14 @@ struct LLVM::Compiler::CompileContext {\n })),\n ExecCtxPtrTy(ExecCtxTy.getPointerTo()),\n IntrinsicsTableTy(LLVM::Type::getArrayType(\n- Int8PtrTy,\n+ Int8Ty.getPointerTo(),\n static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax))),\n- IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()),\n- IntrinsicsTable(LLModule.addGlobal(IntrinsicsTablePtrTy, true,\n- LLVMExternalLinkage, LLVM::Value(),\n- \"intrinsics\")) {\n+ IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()), Prefix(P),\n+ IntrinsicsTable(LLModule.get().addGlobal(\n+ IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\n+ fmt::format(\"{}intrinsics\"sv, Prefix).c_str())) {\n Trap.Ty = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n- Trap.Fn = LLModule.addFunction(Trap.Ty, LLVMPrivateLinkage, \"trap\");\n+ Trap.Fn = LLModule.get().addFunction(Trap.Ty, LLVMPrivateLinkage, \"trap\");\n Trap.Fn.setDSOLocal(true);\n Trap.Fn.addFnAttr(NoStackArgProbe);\n Trap.Fn.addFnAttr(StrictFP);\n@@ -272,9 +287,10 @@ struct LLVM::Compiler::CompileContext {\n Trap.Fn.addFnAttr(Cold);\n Trap.Fn.addFnAttr(NoInline);\n \n- LLModule.addGlobal(Int32Ty, true, LLVMExternalLinkage,\n- LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\n- \"version\");\n+ LLModule.get().addGlobal(\n+ Int32Ty, true, LLVMExternalLinkage,\n+ LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\n+ fmt::format(\"{}version\"sv, Prefix).c_str());\n \n if (!IsGenericBinary) {\n SubtargetFeatures = LLVM::getHostCPUFeatures();\n@@ -313,18 +329,7 @@ struct LLVM::Compiler::CompileContext {\n }\n }\n \n- {\n- // create trap\n- LLVM::Builder Builder(LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(LLContext, Trap.Fn, \"entry\"));\n- auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n- auto CallTrap = Builder.createCall(\n- getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\n- {Trap.Fn.getFirstParam()});\n- CallTrap.addCallSiteAttribute(NoReturn);\n- Builder.createUnreachable();\n- }\n+ compileTrap();\n }\n LLVM::Value getMemory(LLVM::Builder &Builder, LLVM::Value ExecCtx,\n uint32_t Index) noexcept {\n@@ -394,6 +399,17 @@ struct LLVM::Compiler::CompileContext {\n auto Ptr = Builder.createBitCast(VPtr, PtrPtrTy);\n return {Ty, Builder.createLoad(PtrTy, Ptr)};\n }\n+ void compileTrap() noexcept {\n+ LLVM::Builder Builder(LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(LLContext, Trap.Fn, \"entry\"));\n+ auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n+ auto CallTrap = Builder.createCall(\n+ getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\n+ {Trap.Fn.getFirstParam()});\n+ CallTrap.addCallSiteAttribute(NoReturn);\n+ Builder.createUnreachable();\n+ }\n std::pair<std::vector<ValType>, std::vector<ValType>>\n resolveBlockType(const BlockType &BType) const noexcept {\n using VecT = std::vector<ValType>;\n@@ -544,9 +560,10 @@ class FunctionCompiler {\n FunctionCompiler(LLVM::Compiler::CompileContext &Context,\n LLVM::FunctionCallee F, Span<const ValType> Locals,\n bool Interruptible, bool InstructionCounting,\n- bool GasMeasuring) noexcept\n+ bool GasMeasuring, bool IsLazyJIT) noexcept\n : Context(Context), LLContext(Context.LLContext),\n- Interruptible(Interruptible), F(F), Builder(LLContext) {\n+ Interruptible(Interruptible), IsLazyJIT(IsLazyJIT), F(F),\n+ Builder(LLContext) {\n if (F.Fn) {\n Builder.positionAtEnd(LLVM::BasicBlock::create(LLContext, F.Fn, \"entry\"));\n ExecCtx = Builder.createLoad(Context.ExecCtxTy, F.Fn.getFirstParam());\n@@ -4267,7 +4284,63 @@ class FunctionCompiler {\n Args[J + 1] = stackPop();\n }\n \n- auto Ret = Builder.createCall(Function, Args);\n+ LLVM::Value Ret;\n+ if (IsLazyJIT) {\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\n+ if (IsImport) {\n+ Ret = Builder.createCall(Function, Args);\n+ } else {\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\n+\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\n+ }\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\n+ if (!CacheVar) {\n+ CacheVar = Context.LLModule.get().addGlobal(\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \"\");\n+ }\n+\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.check\");\n+ auto ResolveBB =\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.resolve\");\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.call\");\n+\n+ Builder.createBr(CheckBB);\n+ Builder.positionAtEnd(CheckBB);\n+\n+ auto CachedPtr =\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\n+ CachedPtr.setAlignment(8);\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\n+ auto IsNull = Builder.createIsNull(CachedPtr);\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\n+\n+ Builder.positionAtEnd(ResolveBB);\n+ auto FPtr = Builder.createCall(\n+ Context.getIntrinsic(\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\n+ {Context.Int32Ty}, false)),\n+ {LLContext.getInt32(FuncIndex)});\n+ auto Store = Builder.createStore(FPtr, CacheVar);\n+ Store.setAlignment(8);\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\n+ Builder.createBr(CallBB);\n+\n+ Builder.positionAtEnd(CallBB);\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\n+\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\n+ }\n+ } else {\n+ Ret = Builder.createCall(Function, Args);\n+ }\n+\n auto Ty = Ret.getType();\n if (Ty.isVoidTy()) {\n // nothing to do\n@@ -4387,7 +4460,64 @@ class FunctionCompiler {\n Args[J + 1] = stackPop();\n }\n \n- auto Ret = Builder.createCall(Function, Args);\n+ LLVM::Value Ret;\n+ if (IsLazyJIT) {\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\n+ if (IsImport) {\n+ Ret = Builder.createCall(Function, Args);\n+ } else {\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\n+\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\n+ }\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\n+ if (!CacheVar) {\n+ CacheVar = Context.LLModule.get().addGlobal(\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \"\");\n+ }\n+\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.check\");\n+ auto ResolveBB =\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.resolve\");\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.call\");\n+\n+ Builder.createBr(CheckBB);\n+ Builder.positionAtEnd(CheckBB);\n+\n+ auto CachedPtr =\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\n+ CachedPtr.setAlignment(8);\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\n+ auto IsNull = Builder.createIsNull(CachedPtr);\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\n+\n+ Builder.positionAtEnd(ResolveBB);\n+ auto FPtr = Builder.createCall(\n+ Context.getIntrinsic(\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\n+ {Context.Int32Ty}, false)),\n+ {LLContext.getInt32(FuncIndex)});\n+ auto Store = Builder.createStore(FPtr, CacheVar);\n+ Store.setAlignment(8);\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\n+ Builder.createBr(CallBB);\n+\n+ Builder.positionAtEnd(CallBB);\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\n+\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\n+ }\n+ } else {\n+ Ret = Builder.createCall(Function, Args);\n+ }\n+\n+ Ret.setMustTailCall();\n auto Ty = Ret.getType();\n if (Ty.isVoidTy()) {\n Builder.createRetVoid();\n@@ -4432,6 +4562,7 @@ class FunctionCompiler {\n \n auto FPtrRet =\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\n+ FPtrRet.setMustTailCall();\n if (RetSize == 0) {\n Builder.createRetVoid();\n } else {\n@@ -4608,6 +4739,7 @@ class FunctionCompiler {\n \n auto FPtrRet =\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\n+ FPtrRet.setMustTailCall();\n if (RetSize == 0) {\n Builder.createRetVoid();\n } else {\n@@ -5854,6 +5986,7 @@ class FunctionCompiler {\n Control &operator=(const Control &) = default;\n Control &operator=(Control &&) = default;\n };\n+ bool IsLazyJIT;\n std::vector<Control> ControlStack;\n LLVM::FunctionCallee F;\n LLVM::Value ExecCtx;\n@@ -5894,6 +6027,84 @@ Expect<void> Compiler::checkConfigure() noexcept {\n return {};\n }\n \n+Expect<void> Compiler::optimize(LLVM::Module &LLModule,\n+ LLVM::TargetMachine &TM) noexcept {\n+ spdlog::info(\"optimize start\"sv);\n+ auto Triple = LLModule.getTarget();\n+ auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\n+ if (ErrorMessage) {\n+ spdlog::error(\"getFromTriple failed:{}\"sv, ErrorMessage.string_view());\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ std::string CPUName;\n+#if defined(__riscv) && __riscv_xlen == 64\n+ CPUName = \"generic-rv64\"s;\n+#else\n+ if (!Conf.getCompilerConfigure().isGenericBinary()) {\n+ CPUName = LLVM::getHostCPUName().string_view();\n+ } else {\n+ CPUName = \"generic\"s;\n+ }\n+#endif\n+\n+ // On RISC-V we use generic-rv64 as the CPU, so also use default\n+ // features; host features under QEMU can be inconsistent (e.g.\n+ // zvl*b without v) which LLVM >= 20 rejects.\n+ TM = LLVM::TargetMachine::create(\n+ TheTarget, Triple, CPUName.c_str(),\n+#if defined(__riscv) && __riscv_xlen == 64\n+ \"\",\n+#else\n+ LLVM::getHostCPUFeatures().unwrap(),\n+#endif\n+ toLLVMCodeGenLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n+ LLVMRelocPIC, LLVMCodeModelDefault);\n+\n+#if LLVM_VERSION_MAJOR >= 13\n+ auto PBO = LLVM::PassBuilderOptions::create();\n+ if (auto Error = PBO.runPasses(\n+ LLModule,\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n+ TM)) {\n+ spdlog::error(\"{}\"sv, Error.message().string_view());\n+ }\n+#else\n+ auto FP = LLVM::PassManager::createForModule(LLModule);\n+ auto MP = LLVM::PassManager::create();\n+\n+ TM.addAnalysisPasses(MP);\n+ TM.addAnalysisPasses(FP);\n+ {\n+ auto PMB = LLVM::PassManagerBuilder::create();\n+ auto [OptLevel, SizeLevel] =\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\n+ PMB.setOptLevel(OptLevel);\n+ PMB.setSizeLevel(SizeLevel);\n+ PMB.populateFunctionPassManager(FP);\n+ PMB.populateModulePassManager(MP);\n+ }\n+ switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\n+ case CompilerConfigure::OptimizationLevel::O0:\n+ case CompilerConfigure::OptimizationLevel::O1:\n+ FP.addTailCallEliminationPass();\n+ break;\n+ default:\n+ break;\n+ }\n+\n+ FP.initializeFunctionPassManager();\n+ for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\n+ FP.runFunctionPassManager(Fn);\n+ }\n+ FP.finalizeFunctionPassManager();\n+ MP.runPassManager(LLModule);\n+#endif\n+\n+ spdlog::info(\"optimize done\"sv);\n+ return {};\n+}\n+\n Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n // Check that the module is validated.\n if (unlikely(!Module.getIsValidated())) {\n@@ -5913,15 +6124,7 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n \n CompileContext NewContext(LLContext, LLModule,\n Conf.getCompilerConfigure().isGenericBinary());\n- struct RAIICleanup {\n- RAIICleanup(CompileContext *&Context, CompileContext &NewContext)\n- : Context(Context) {\n- Context = &NewContext;\n- }\n- ~RAIICleanup() { Context = nullptr; }\n- CompileContext *&Context;\n- };\n- RAIICleanup Cleanup(Context, NewContext);\n+ RAIICleanup Cleanup(Context, &NewContext);\n \n // Compile Function Types\n compile(Module.getTypeSection());\n@@ -5942,81 +6145,8 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n spdlog::info(\"verify start\"sv);\n LLModule.verify(LLVMPrintMessageAction);\n \n- spdlog::info(\"optimize start\"sv);\n auto &TM = D.extract().TM;\n- {\n- auto Triple = LLModule.getTarget();\n- auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\n- if (ErrorMessage) {\n- spdlog::error(\"getFromTriple failed:{}\"sv, ErrorMessage.string_view());\n- return Unexpect(ErrCode::Value::IllegalPath);\n- } else {\n- std::string CPUName;\n-#if defined(__riscv) && __riscv_xlen == 64\n- CPUName = \"generic-rv64\"s;\n-#else\n- if (!Conf.getCompilerConfigure().isGenericBinary()) {\n- CPUName = LLVM::getHostCPUName().string_view();\n- } else {\n- CPUName = \"generic\"s;\n- }\n-#endif\n-\n- // On RISC-V we use generic-rv64 as the CPU, so also use default\n- // features; host features under QEMU can be inconsistent (e.g.\n- // zvl*b without v) which LLVM >= 20 rejects.\n- TM = LLVM::TargetMachine::create(\n- TheTarget, Triple, CPUName.c_str(),\n-#if defined(__riscv) && __riscv_xlen == 64\n- \"\",\n-#else\n- LLVM::getHostCPUFeatures().unwrap(),\n-#endif\n- toLLVMCodeGenLevel(\n- Conf.getCompilerConfigure().getOptimizationLevel()),\n- LLVMRelocPIC, LLVMCodeModelDefault);\n- }\n-\n-#if LLVM_VERSION_MAJOR >= 13\n- auto PBO = LLVM::PassBuilderOptions::create();\n- if (auto Error = PBO.runPasses(\n- LLModule,\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n- TM)) {\n- spdlog::error(\"{}\"sv, Error.message().string_view());\n- }\n-#else\n- auto FP = LLVM::PassManager::createForModule(LLModule);\n- auto MP = LLVM::PassManager::create();\n-\n- TM.addAnalysisPasses(MP);\n- TM.addAnalysisPasses(FP);\n- {\n- auto PMB = LLVM::PassManagerBuilder::create();\n- auto [OptLevel, SizeLevel] =\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\n- PMB.setOptLevel(OptLevel);\n- PMB.setSizeLevel(SizeLevel);\n- PMB.populateFunctionPassManager(FP);\n- PMB.populateModulePassManager(MP);\n- }\n- switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\n- case CompilerConfigure::OptimizationLevel::O0:\n- case CompilerConfigure::OptimizationLevel::O1:\n- FP.addTailCallEliminationPass();\n- break;\n- default:\n- break;\n- }\n-\n- FP.initializeFunctionPassManager();\n- for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\n- FP.runFunctionPassManager(Fn);\n- }\n- FP.finalizeFunctionPassManager();\n- MP.runPassManager(LLModule);\n-#endif\n- }\n+ EXPECTED_TRY(optimize(LLModule, TM));\n \n // Set initializer for constant value\n if (auto IntrinsicsTable = LLModule.getNamedGlobal(\"intrinsics\")) {\n@@ -6031,12 +6161,11 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n LLVM::Value::getConstNull(IntrinsicsTableTy), \"intrinsics\");\n }\n-\n- spdlog::info(\"optimize done\"sv);\n return Expect<Data>{std::move(D)};\n }\n \n-void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n+void Compiler::compile(const AST::TypeSection &TypeSec,\n+ bool DeclarationsOnly) noexcept {\n auto WrapperTy =\n LLVM::Type::getFunctionType(Context->VoidTy,\n {Context->ExecCtxPtrTy, Context->Int8PtrTy,\n@@ -6050,10 +6179,25 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n Context->CompositeTypes.reserve(Size);\n Context->FunctionWrappers.reserve(Size);\n \n+ auto SetFuncAttributes = [&](auto FDecl) {\n+ FDecl.setVisibility(LLVMProtectedVisibility);\n+ FDecl.setDSOLocal(true);\n+ FDecl.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ FDecl.addFnAttr(Context->NoStackArgProbe);\n+ FDecl.addFnAttr(Context->StrictFP);\n+ FDecl.addFnAttr(Context->UWTable);\n+ FDecl.addParamAttr(0, Context->ReadOnly);\n+ FDecl.addParamAttr(0, Context->NoAlias);\n+ FDecl.addParamAttr(1, Context->NoAlias);\n+ FDecl.addParamAttr(2, Context->NoAlias);\n+ FDecl.addParamAttr(3, Context->NoAlias);\n+ };\n+\n // Iterate and compile types.\n for (size_t I = 0; I < Size; ++I) {\n const auto &CompType = SubTypes[I].getCompositeType();\n- const auto Name = fmt::format(\"t{}\"sv, Context->CompositeTypes.size());\n+ const auto Name =\n+ fmt::format(\"{}t{}\"sv, Context->Prefix, Context->CompositeTypes.size());\n if (CompType.isFunc()) {\n // Check that the function type is unique.\n {\n@@ -6065,13 +6209,21 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n if (OldFuncType == CompType.getFuncType()) {\n Unique = false;\n Context->CompositeTypes.push_back(Context->CompositeTypes[J]);\n- auto F = Context->FunctionWrappers[J];\n- Context->FunctionWrappers.push_back(F);\n- auto A = Context->LLModule.addAlias(WrapperTy, F, Name.c_str());\n- A.setLinkage(LLVMExternalLinkage);\n- A.setVisibility(LLVMProtectedVisibility);\n- A.setDSOLocal(true);\n- A.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ if (DeclarationsOnly) {\n+ auto FDecl = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n+ SetFuncAttributes(FDecl);\n+ Context->FunctionWrappers.push_back(FDecl);\n+ } else {\n+ auto F = Context->FunctionWrappers[J];\n+ Context->FunctionWrappers.push_back(F);\n+ auto A = Context->LLModule.get().addAlias(WrapperTy, F,\n+ Name.c_str());\n+ A.setLinkage(LLVMExternalLinkage);\n+ A.setVisibility(LLVMProtectedVisibility);\n+ A.setDSOLocal(true);\n+ A.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ }\n break;\n }\n }\n@@ -6082,81 +6234,66 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n }\n \n // Create Wrapper\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\n- Name.c_str());\n+ auto F = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n {\n- F.setVisibility(LLVMProtectedVisibility);\n- F.setDSOLocal(true);\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\n- F.addFnAttr(Context->NoStackArgProbe);\n- F.addFnAttr(Context->StrictFP);\n- F.addFnAttr(Context->UWTable);\n- F.addParamAttr(0, Context->ReadOnly);\n- F.addParamAttr(0, Context->NoAlias);\n- F.addParamAttr(1, Context->NoAlias);\n- F.addParamAttr(2, Context->NoAlias);\n- F.addParamAttr(3, Context->NoAlias);\n-\n- LLVM::Builder Builder(Context->LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n-\n- auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\n- CompType.getFuncType());\n- auto RTy = FTy.getReturnType();\n- std::vector<LLVM::Type> FPTy(FTy.getNumParams());\n- FTy.getParamTypes(FPTy);\n-\n- const size_t ArgCount = FPTy.size() - 1;\n- auto ExecCtxPtr = F.getFirstParam();\n- auto RawFunc = LLVM::FunctionCallee{\n- FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\n- FTy.getPointerTo())};\n- auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\n- auto RawRets = RawArgs.getNextParam();\n-\n- std::vector<LLVM::Value> Args;\n- Args.reserve(FTy.getNumParams());\n- Args.push_back(ExecCtxPtr);\n- for (size_t J = 0; J < ArgCount; ++J) {\n- Args.push_back(Builder.createValuePtrLoad(\n- FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\n- }\n+ SetFuncAttributes(F);\n+\n+ if (!DeclarationsOnly) {\n+ LLVM::Builder Builder(Context->LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n+\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\n+ CompType.getFuncType());\n+ auto RTy = FTy.getReturnType();\n+ std::vector<LLVM::Type> FPTy(FTy.getNumParams());\n+ FTy.getParamTypes(FPTy);\n+\n+ const size_t ArgCount = FPTy.size() - 1;\n+ auto ExecCtxPtr = F.getFirstParam();\n+ auto RawFunc = LLVM::FunctionCallee{\n+ FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\n+ FTy.getPointerTo())};\n+ auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\n+ auto RawRets = RawArgs.getNextParam();\n+\n+ std::vector<LLVM::Value> Args;\n+ Args.reserve(FTy.getNumParams());\n+ Args.push_back(ExecCtxPtr);\n+ for (size_t J = 0; J < ArgCount; ++J) {\n+ Args.push_back(Builder.createValuePtrLoad(\n+ FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\n+ }\n \n- auto Ret = Builder.createCall(RawFunc, Args);\n- if (RTy.isVoidTy()) {\n- // nothing to do\n- } else if (RTy.isStructTy()) {\n- auto Rets = unpackStruct(Builder, Ret);\n- Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty, kValSize);\n- } else {\n- Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\n+ auto Ret = Builder.createCall(RawFunc, Args);\n+ if (RTy.isVoidTy()) {\n+ // nothing to do\n+ } else if (RTy.isStructTy()) {\n+ auto Rets = unpackStruct(Builder, Ret);\n+ Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty,\n+ kValSize);\n+ } else {\n+ Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\n+ }\n+ Builder.createRetVoid();\n }\n- Builder.createRetVoid();\n }\n // Copy wrapper, param and return lists to module instance.\n Context->FunctionWrappers.push_back(F);\n } else {\n // Non function type case. Create empty wrapper.\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\n- Name.c_str());\n+ auto F = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n {\n- F.setVisibility(LLVMProtectedVisibility);\n- F.setDSOLocal(true);\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\n- F.addFnAttr(Context->NoStackArgProbe);\n- F.addFnAttr(Context->StrictFP);\n- F.addFnAttr(Context->UWTable);\n- F.addParamAttr(0, Context->ReadOnly);\n- F.addParamAttr(0, Context->NoAlias);\n- F.addParamAttr(1, Context->NoAlias);\n- F.addParamAttr(2, Context->NoAlias);\n- F.addParamAttr(3, Context->NoAlias);\n-\n- LLVM::Builder Builder(Context->LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n- Builder.createRetVoid();\n+ SetFuncAttributes(F);\n+\n+ if (!DeclarationsOnly) {\n+ LLVM::Builder Builder(Context->LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n+ Builder.createRetVoid();\n+ }\n }\n Context->FunctionWrappers.push_back(F);\n }\n@@ -6184,9 +6321,9 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\n toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n auto RTy = FTy.getReturnType();\n auto F = LLVM::FunctionCallee{\n- FTy,\n- Context->LLModule.addFunction(FTy, LLVMInternalLinkage,\n- fmt::format(\"f{}\"sv, FuncID).c_str())};\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMInternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n F.Fn.setDSOLocal(true);\n F.Fn.addFnAttr(Context->NoStackArgProbe);\n F.Fn.addFnAttr(Context->StrictFP);\n@@ -6231,6 +6368,7 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\n }\n \n Context->Functions.emplace_back(TypeIdx, F, nullptr);\n+ Context->ImportCount++;\n break;\n }\n case ExternalType::Table: // Table type\n@@ -6313,9 +6451,10 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n const auto FuncID = Context->Functions.size();\n auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n- LLVM::FunctionCallee F = {FTy, Context->LLModule.addFunction(\n- FTy, LLVMExternalLinkage,\n- fmt::format(\"f{}\"sv, FuncID).c_str())};\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n F.Fn.setVisibility(LLVMProtectedVisibility);\n F.Fn.setDSOLocal(true);\n F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n@@ -6339,10 +6478,11 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n Locals.push_back(Local.second);\n }\n }\n- FunctionCompiler FC(*Context, F, Locals,\n- Conf.getCompilerConfigure().isInterruptible(),\n- Conf.getStatisticsConfigure().isInstructionCounting(),\n- Conf.getStatisticsConfigure().isCostMeasuring());\n+ FunctionCompiler FC(\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\n auto Type = Context->resolveBlockType(T);\n EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n F.Fn.eliminateUnreachableBlocks();\n@@ -6350,5 +6490,235 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n return {};\n }\n \n+void Compiler::compileFunctionDeclarations(\n+ const AST::FunctionSection &FunctionSec,\n+ const AST::CodeSection &CodeSec) noexcept {\n+ const auto &TypeIdxs = FunctionSec.getContent();\n+ const auto &CodeSegs = CodeSec.getContent();\n+ assuming(TypeIdxs.size() == CodeSegs.size());\n+\n+ for (size_t I = 0; I < CodeSegs.size(); ++I) {\n+ const auto &TypeIdx = TypeIdxs[I];\n+ const auto &Code = CodeSegs[I];\n+ assuming(TypeIdx < Context->CompositeTypes.size());\n+ assuming(Context->CompositeTypes[TypeIdx]->isFunc());\n+ const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n+ const auto FuncID = Context->Functions.size();\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n+ F.Fn.setVisibility(LLVMProtectedVisibility);\n+ F.Fn.setDSOLocal(true);\n+ F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ F.Fn.addFnAttr(Context->NoStackArgProbe);\n+ F.Fn.addFnAttr(Context->StrictFP);\n+ F.Fn.addFnAttr(Context->UWTable);\n+ F.Fn.addParamAttr(0, Context->ReadOnly);\n+ F.Fn.addParamAttr(0, Context->NoAlias);\n+\n+ Context->Functions.emplace_back(TypeIdx, F, &Code);\n+ }\n+}\n+\n+Expect<void> Compiler::compileFunctionBody(uint32_t LocalFuncIndex) noexcept {\n+ // Find the function in the Functions list\n+ // LocalFuncIndex is relative to the defined functions (not imports)\n+ uint32_t GlobalFuncIndex = Context->ImportCount + LocalFuncIndex;\n+ if (GlobalFuncIndex >= Context->Functions.size()) {\n+ spdlog::error(\"[lazy-jit]: function index {} out of range\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ auto &[T, F, Code] = Context->Functions[GlobalFuncIndex];\n+ if (!Code) {\n+ spdlog::error(\"[lazy-jit]: cannot compile import function {}\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ // Check if already compiled (function has basic blocks)\n+ if (F.Fn.countBasicBlocks() > 0) {\n+ spdlog::debug(\"[lazy-jit]: function {} already compiled\"sv, LocalFuncIndex);\n+ return {};\n+ }\n+\n+ spdlog::debug(\"[lazy-jit]: compiling function {}\"sv, LocalFuncIndex);\n+\n+ std::vector<ValType> Locals;\n+ for (const auto &Local : Code->getLocals()) {\n+ for (unsigned I = 0; I < Local.first; ++I) {\n+ Locals.push_back(Local.second);\n+ }\n+ }\n+\n+ FunctionCompiler FC(\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\n+ auto Type = Context->resolveBlockType(T);\n+ EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n+ F.Fn.eliminateUnreachableBlocks();\n+\n+ return {};\n+}\n+\n+Expect<std::pair<LLVM::Data,\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter>>>\n+LLVM::Compiler::compileInfrastructure(const AST::Module &Module,\n+ std::string Prefix) noexcept {\n+ Data D;\n+ D.setPrefix(Prefix);\n+ // Check the module is validated.\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ spdlog::info(\"[lazy-jit]: compile infrastructure start\"sv);\n+\n+ auto LLContext = D.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = D.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ std::unique_ptr<CompileContext, CompileContextDeleter> NewContext(\n+ new CompileContext(LLContext, LLModule,\n+ Conf.getCompilerConfigure().isGenericBinary(),\n+ D.getPrefix()));\n+ RAIICleanup Cleanup(this->Context, NewContext.get());\n+\n+ // Compile Function Types\n+ compile(Module.getTypeSection());\n+ // Compile ImportSection\n+ compile(Module.getImportSection());\n+ // Compile GlobalSection\n+ compile(Module.getGlobalSection());\n+ // Compile MemorySection (MemorySec, DataSec)\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ // Compile TableSection (TableSec, ElemSec)\n+ compile(Module.getTableSection(), Module.getElementSection());\n+ // Create function declarations without compiling bodies\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+ // Compile ExportSection\n+ compile(Module.getExportSection());\n+\n+ // Set initializer for constant value\n+ auto IntrinsicsName = fmt::format(\"{}intrinsics\"sv, D.getPrefix());\n+ if (auto IntrinsicsTable = LLModule.getNamedGlobal(IntrinsicsName.c_str())) {\n+ IntrinsicsTable.setInitializer(\n+ LLVM::Value::getConstNull(IntrinsicsTable.getType()));\n+ IntrinsicsTable.setGlobalConstant(false);\n+ } else {\n+ auto IntrinsicsTableTy = LLVM::Type::getArrayType(\n+ LLContext.getInt8Ty().getPointerTo(),\n+ static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax));\n+ LLModule.addGlobal(\n+ IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n+ LLVM::Value::getConstNull(IntrinsicsTableTy), IntrinsicsName.c_str());\n+ }\n+ LLModule.verify(LLVMPrintMessageAction);\n+\n+ spdlog::info(\"[lazy-jit]: infrastructure compilation done\"sv);\n+\n+ return Expect<\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>>{\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>{\n+ std::move(D), std::move(NewContext)}};\n+}\n+\n+Expect<LLVM::Data>\n+Compiler::compileFunctions(Data &&LLData, CompileContext *NewContext,\n+ const AST::Module &Module,\n+ Span<const uint32_t> LocalFuncIndices) noexcept {\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+ if (unlikely(LocalFuncIndices.empty())) {\n+ spdlog::error(\"[lazy-jit]: compileFunctions with empty index list\"sv);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ std::vector<uint32_t> Sorted(LocalFuncIndices.begin(),\n+ LocalFuncIndices.end());\n+ std::sort(Sorted.begin(), Sorted.end());\n+ Sorted.erase(std::unique(Sorted.begin(), Sorted.end()), Sorted.end());\n+\n+ spdlog::debug(\"[lazy-jit]: compile functions batch ({}) start\"sv,\n+ Sorted.size());\n+\n+ auto LLContext = LLData.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = LLData.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ RAIICleanup Cleanup(this->Context, NewContext);\n+ Context->LLModule = LLModule;\n+\n+ Context->CompositeTypes.clear();\n+ Context->FunctionWrappers.clear();\n+ Context->Functions.clear();\n+ Context->LazyJITCacheVars.clear();\n+ Context->ImportCount = 0;\n+ Context->MemoryAddrTypes.clear();\n+ Context->TableAddrTypes.clear();\n+ Context->Globals.clear();\n+\n+ Context->IntrinsicsTable = LLModule.addGlobal(\n+ Context->IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\n+ fmt::format(\"{}intrinsics\"sv, Context->Prefix).c_str());\n+ Context->IntrinsicsTable.setInitializer(LLVM::Value());\n+ Context->Trap.Ty =\n+ LLVM::Type::getFunctionType(Context->VoidTy, {Context->Int32Ty});\n+ Context->Trap.Fn =\n+ LLModule.addFunction(Context->Trap.Ty, LLVMPrivateLinkage, \"trap\");\n+ Context->Trap.Fn.setDSOLocal(true);\n+ Context->Trap.Fn.addFnAttr(Context->NoStackArgProbe);\n+ Context->Trap.Fn.addFnAttr(Context->StrictFP);\n+ Context->Trap.Fn.addFnAttr(Context->UWTable);\n+ Context->Trap.Fn.addFnAttr(Context->NoReturn);\n+ Context->Trap.Fn.addFnAttr(Context->Cold);\n+ Context->Trap.Fn.addFnAttr(Context->NoInline);\n+ Context->compileTrap();\n+\n+ compile(Module.getTypeSection(), true);\n+ compile(Module.getImportSection());\n+ compile(Module.getGlobalSection());\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ compile(Module.getTableSection(), Module.getElementSection());\n+\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+\n+ for (uint32_t FuncIndex : Sorted) {\n+ EXPECTED_TRY(compileFunctionBody(FuncIndex));\n+ }\n+\n+ spdlog::info(\"[lazy-jit]: verify batch ({} funcs) start\"sv, Sorted.size());\n+ LLModule.verify(LLVMPrintMessageAction);\n+ spdlog::info(\"[lazy-jit]: verify batch ({} funcs) done\"sv, Sorted.size());\n+\n+ auto &TM = LLData.extract().TM;\n+ EXPECTED_TRY(optimize(LLModule, TM));\n+\n+ spdlog::debug(\"[lazy-jit]: compile functions batch ({}) done\"sv,\n+ Sorted.size());\n+ return Expect<Data>{std::move(LLData)};\n+}\n+\n+void LLVM::Compiler::CompileContextDeleter::operator()(\n+ CompileContext *Context) const noexcept {\n+ delete Context;\n+}\n } // namespace LLVM\n } // namespace WasmEdge\n"}],"string":"[\n {\n \"comment\": \"I am thinking about the cleanup because we have a class called `RAIICleanup` in the `compile()` function for the entire module. Could we handle all related cleanup together with a unified function to ensure that the cleanup actually occurs?\",\n \"path\": \"lib/llvm/compiler.cpp\",\n \"hunk\": \"@@ -6342,13 +6498,255 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\\n FunctionCompiler FC(*Context, F, Locals,\\n Conf.getCompilerConfigure().isInterruptible(),\\n Conf.getStatisticsConfigure().isInstructionCounting(),\\n- Conf.getStatisticsConfigure().isCostMeasuring());\\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\\n+ Conf.getRuntimeConfigure().isEnableLazyJIT());\\n auto Type = Context->resolveBlockType(T);\\n EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\\n F.Fn.eliminateUnreachableBlocks();\\n }\\n return {};\\n }\\n \\n+void Compiler::compileFunctionDeclarations(\\n+ const AST::FunctionSection &FunctionSec,\\n+ const AST::CodeSection &CodeSec) noexcept {\\n+ const auto &TypeIdxs = FunctionSec.getContent();\\n+ const auto &CodeSegs = CodeSec.getContent();\\n+ assuming(TypeIdxs.size() == CodeSegs.size());\\n+\\n+ for (size_t I = 0; I < CodeSegs.size(); ++I) {\\n+ const auto &TypeIdx = TypeIdxs[I];\\n+ const auto &Code = CodeSegs[I];\\n+ assuming(TypeIdx < Context->CompositeTypes.size());\\n+ assuming(Context->CompositeTypes[TypeIdx]->isFunc());\\n+ const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\\n+ const auto FuncID = Context->Functions.size();\\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\\n+ LLVM::FunctionCallee F = {\\n+ FTy, Context->LLModule.get().addFunction(\\n+ FTy, LLVMExternalLinkage,\\n+ fmt::format(\\\"{}f{}\\\"sv, Context->Prefix, FuncID).c_str())};\\n+ F.Fn.setVisibility(LLVMProtectedVisibility);\\n+ F.Fn.setDSOLocal(true);\\n+ F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ F.Fn.addFnAttr(Context->NoStackArgProbe);\\n+ F.Fn.addFnAttr(Context->StrictFP);\\n+ F.Fn.addFnAttr(Context->UWTable);\\n+ F.Fn.addParamAttr(0, Context->ReadOnly);\\n+ F.Fn.addParamAttr(0, Context->NoAlias);\\n+\\n+ Context->Functions.emplace_back(TypeIdx, F, &Code);\\n+ }\\n+}\\n+\\n+Expect<void> Compiler::compileFunctionBody(uint32_t LocalFuncIndex) noexcept {\\n+ // Find the function in the Functions list\\n+ // LocalFuncIndex is relative to the defined functions (not imports)\\n+ uint32_t ImportCount = 0;\\n+ for (const auto &[T, F, Code] : Context->Functions) {\\n+ if (!Code) {\\n+ ImportCount++;\\n+ }\\n+ }\\n+\\n+ uint32_t GlobalFuncIndex = ImportCount + LocalFuncIndex;\\n+ if (GlobalFuncIndex >= Context->Functions.size()) {\\n+ spdlog::error(\\\"[lazy-jit]: function index {} out of range\\\"sv,\\n+ LocalFuncIndex);\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ auto &[T, F, Code] = Context->Functions[GlobalFuncIndex];\\n+ if (!Code) {\\n+ spdlog::error(\\\"[lazy-jit]: cannot compile import function {}\\\"sv,\\n+ LocalFuncIndex);\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ // Check if already compiled (function has basic blocks)\\n+ if (F.Fn.countBasicBlocks() > 0) {\\n+ spdlog::debug(\\\"[lazy-jit]: function {} already compiled\\\"sv, LocalFuncIndex);\\n+ return {};\\n+ }\\n+\\n+ spdlog::debug(\\\"[lazy-jit]: compiling function {}\\\"sv, LocalFuncIndex);\\n+\\n+ std::vector<ValType> Locals;\\n+ for (const auto &Local : Code->getLocals()) {\\n+ for (unsigned I = 0; I < Local.first; ++I) {\\n+ Locals.push_back(Local.second);\\n+ }\\n+ }\\n+\\n+ FunctionCompiler FC(*Context, F, Locals,\\n+ Conf.getCompilerConfigure().isInterruptible(),\\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\\n+ Conf.getRuntimeConfigure().isEnableLazyJIT());\\n+ auto Type = Context->resolveBlockType(T);\\n+ EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\\n+ F.Fn.eliminateUnreachableBlocks();\\n+\\n+ return {};\\n+}\\n+\\n+Expect<std::pair<LLVM::Data,\\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\\n+ LLVM::Compiler::CompileContextDeleter>>>\\n+LLVM::Compiler::compileInfrastructure(const AST::Module &Module,\\n+ std::string Prefix) noexcept {\\n+ Data D;\\n+ D.setPrefix(Prefix);\\n+ // Check the module is validated.\\n+ if (unlikely(!Module.getIsValidated())) {\\n+ spdlog::error(ErrCode::Value::NotValidated);\\n+ return Unexpect(ErrCode::Value::NotValidated);\\n+ }\\n+\\n+ std::unique_lock Lock(Mutex);\\n+ spdlog::info(\\\"[lazyjit]: compile infrastructure start\\\"sv);\\n+\\n+ auto LLContext = D.extract().getLLContext();\\n+ LLVM::Core::init(LLContext.unwrap());\\n+ auto &LLModule = D.extract().LLModule;\\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \\\"PIC Level\\\"sv, 2);\\n+\\n+ std::unique_ptr<CompileContext, CompileContextDeleter> NewContext(\\n+ new CompileContext(LLContext, LLModule,\\n+ Conf.getCompilerConfigure().isGenericBinary(),\\n+ D.getPrefix()));\\n+ this->Context = NewContext.get();\\n+\\n+ // Compile Function Types\\n+ compile(Module.getTypeSection());\\n+ // Compile ImportSection\\n+ compile(Module.getImportSection());\\n+ // Compile GlobalSection\\n+ compile(Module.getGlobalSection());\\n+ // Compile MemorySection (MemorySec, DataSec)\\n+ compile(Module.getMemorySection(), Module.getDataSection());\\n+ // Compile TableSection (TableSec, ElemSec)\\n+ compile(Module.getTableSection(), Module.getElementSection());\\n+ // Create function declarations without compiling bodies\\n+ compileFunctionDeclarations(Module.getFunctionSection(),\\n+ Module.getCodeSection());\\n+ // Compile ExportSection\\n+ compile(Module.getExportSection());\\n+\\n+ // Set initializer for constant value\\n+ auto IntrinsicsName = fmt::format(\\\"{}intrinsics\\\"sv, D.getPrefix());\\n+ if (auto IntrinsicsTable = LLModule.getNamedGlobal(IntrinsicsName.c_str())) {\\n+ IntrinsicsTable.setInitializer(\\n+ LLVM::Value::getConstNull(IntrinsicsTable.getType()));\\n+ IntrinsicsTable.setGlobalConstant(false);\\n+ } else {\\n+ auto IntrinsicsTableTy = LLVM::Type::getArrayType(\\n+ LLContext.getInt8Ty().getPointerTo(),\\n+ static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax));\\n+ LLModule.addGlobal(\\n+ IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\\n+ LLVM::Value::getConstNull(IntrinsicsTableTy), IntrinsicsName.c_str());\\n+ }\\n+\\n+ spdlog::info(\\\"[lazyjit]: infrastructure compilation done\\\"sv);\\n+\\n+ this->Context = nullptr;\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp\\nindex 39da94d9a9ac..330e245f51c3 100644\\n--- a/lib/llvm/compiler.cpp\\n+++ b/lib/llvm/compiler.cpp\\n@@ -9,6 +9,7 @@\\n #include \\\"common/spdlog.h\\\"\\n #include \\\"data.h\\\"\\n #include \\\"llvm.h\\\"\\n+#include \\\"spdlog/spdlog.h\\\"\\n #include \\\"system/allocator.h\\\"\\n \\n #include <algorithm>\\n@@ -16,6 +17,7 @@\\n #include <cinttypes>\\n #include <cstdint>\\n #include <cstdlib>\\n+#include <functional>\\n #include <limits>\\n #include <memory>\\n #include <numeric>\\n@@ -28,6 +30,16 @@ using namespace std::literals;\\n \\n namespace {\\n \\n+struct RAIICleanup {\\n+ RAIICleanup(LLVM::Compiler::CompileContext *&Context,\\n+ LLVM::Compiler::CompileContext *NewContext)\\n+ : Context(Context) {\\n+ Context = NewContext;\\n+ }\\n+ ~RAIICleanup() { Context = nullptr; }\\n+ LLVM::Compiler::CompileContext *&Context;\\n+};\\n+\\n static bool\\n isVoidReturn(WasmEdge::Span<const WasmEdge::ValType> ValTypes) noexcept;\\n static LLVM::Type toLLVMType(LLVM::Context LLContext,\\n@@ -128,7 +140,7 @@ static inline LLVMCodeGenOptLevel toLLVMCodeGenLevel(\\n \\n struct LLVM::Compiler::CompileContext {\\n LLVM::Context LLContext;\\n- LLVM::Module &LLModule;\\n+ std::reference_wrapper<LLVM::Module> LLModule;\\n LLVM::Attribute Cold;\\n LLVM::Attribute NoAlias;\\n LLVM::Attribute NoInline;\\n@@ -202,13 +214,16 @@ struct LLVM::Compiler::CompileContext {\\n std::vector<std::tuple<uint32_t, LLVM::FunctionCallee,\\n const WasmEdge::AST::CodeSegment *>>\\n Functions;\\n+ std::vector<LLVM::Value> LazyJITCacheVars;\\n+ uint32_t ImportCount = 0;\\n std::vector<LLVM::Type> MemoryAddrTypes;\\n std::vector<LLVM::Type> TableAddrTypes;\\n std::vector<LLVM::Type> Globals;\\n+ std::string Prefix;\\n LLVM::Value IntrinsicsTable;\\n LLVM::FunctionCallee Trap;\\n- CompileContext(LLVM::Context C, LLVM::Module &M,\\n- bool IsGenericBinary) noexcept\\n+ CompileContext(LLVM::Context C, LLVM::Module &M, bool IsGenericBinary,\\n+ std::string_view P = \\\"\\\"sv) noexcept\\n : LLContext(C), LLModule(M),\\n Cold(LLVM::Attribute::createEnum(C, LLVM::Core::Cold, 0)),\\n NoAlias(LLVM::Attribute::createEnum(C, LLVM::Core::NoAlias, 0)),\\n@@ -256,14 +271,14 @@ struct LLVM::Compiler::CompileContext {\\n })),\\n ExecCtxPtrTy(ExecCtxTy.getPointerTo()),\\n IntrinsicsTableTy(LLVM::Type::getArrayType(\\n- Int8PtrTy,\\n+ Int8Ty.getPointerTo(),\\n static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax))),\\n- IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()),\\n- IntrinsicsTable(LLModule.addGlobal(IntrinsicsTablePtrTy, true,\\n- LLVMExternalLinkage, LLVM::Value(),\\n- \\\"intrinsics\\\")) {\\n+ IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()), Prefix(P),\\n+ IntrinsicsTable(LLModule.get().addGlobal(\\n+ IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\\n+ fmt::format(\\\"{}intrinsics\\\"sv, Prefix).c_str())) {\\n Trap.Ty = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\\n- Trap.Fn = LLModule.addFunction(Trap.Ty, LLVMPrivateLinkage, \\\"trap\\\");\\n+ Trap.Fn = LLModule.get().addFunction(Trap.Ty, LLVMPrivateLinkage, \\\"trap\\\");\\n Trap.Fn.setDSOLocal(true);\\n Trap.Fn.addFnAttr(NoStackArgProbe);\\n Trap.Fn.addFnAttr(StrictFP);\\n@@ -272,9 +287,10 @@ struct LLVM::Compiler::CompileContext {\\n Trap.Fn.addFnAttr(Cold);\\n Trap.Fn.addFnAttr(NoInline);\\n \\n- LLModule.addGlobal(Int32Ty, true, LLVMExternalLinkage,\\n- LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\\n- \\\"version\\\");\\n+ LLModule.get().addGlobal(\\n+ Int32Ty, true, LLVMExternalLinkage,\\n+ LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\\n+ fmt::format(\\\"{}version\\\"sv, Prefix).c_str());\\n \\n if (!IsGenericBinary) {\\n SubtargetFeatures = LLVM::getHostCPUFeatures();\\n@@ -313,18 +329,7 @@ struct LLVM::Compiler::CompileContext {\\n }\\n }\\n \\n- {\\n- // create trap\\n- LLVM::Builder Builder(LLContext);\\n- Builder.positionAtEnd(\\n- LLVM::BasicBlock::create(LLContext, Trap.Fn, \\\"entry\\\"));\\n- auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\\n- auto CallTrap = Builder.createCall(\\n- getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\\n- {Trap.Fn.getFirstParam()});\\n- CallTrap.addCallSiteAttribute(NoReturn);\\n- Builder.createUnreachable();\\n- }\\n+ compileTrap();\\n }\\n LLVM::Value getMemory(LLVM::Builder &Builder, LLVM::Value ExecCtx,\\n uint32_t Index) noexcept {\\n@@ -394,6 +399,17 @@ struct LLVM::Compiler::CompileContext {\\n auto Ptr = Builder.createBitCast(VPtr, PtrPtrTy);\\n return {Ty, Builder.createLoad(PtrTy, Ptr)};\\n }\\n+ void compileTrap() noexcept {\\n+ LLVM::Builder Builder(LLContext);\\n+ Builder.positionAtEnd(\\n+ LLVM::BasicBlock::create(LLContext, Trap.Fn, \\\"entry\\\"));\\n+ auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\\n+ auto CallTrap = Builder.createCall(\\n+ getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\\n+ {Trap.Fn.getFirstParam()});\\n+ CallTrap.addCallSiteAttribute(NoReturn);\\n+ Builder.createUnreachable();\\n+ }\\n std::pair<std::vector<ValType>, std::vector<ValType>>\\n resolveBlockType(const BlockType &BType) const noexcept {\\n using VecT = std::vector<ValType>;\\n@@ -544,9 +560,10 @@ class FunctionCompiler {\\n FunctionCompiler(LLVM::Compiler::CompileContext &Context,\\n LLVM::FunctionCallee F, Span<const ValType> Locals,\\n bool Interruptible, bool InstructionCounting,\\n- bool GasMeasuring) noexcept\\n+ bool GasMeasuring, bool IsLazyJIT) noexcept\\n : Context(Context), LLContext(Context.LLContext),\\n- Interruptible(Interruptible), F(F), Builder(LLContext) {\\n+ Interruptible(Interruptible), IsLazyJIT(IsLazyJIT), F(F),\\n+ Builder(LLContext) {\\n if (F.Fn) {\\n Builder.positionAtEnd(LLVM::BasicBlock::create(LLContext, F.Fn, \\\"entry\\\"));\\n ExecCtx = Builder.createLoad(Context.ExecCtxTy, F.Fn.getFirstParam());\\n@@ -4267,7 +4284,63 @@ class FunctionCompiler {\\n Args[J + 1] = stackPop();\\n }\\n \\n- auto Ret = Builder.createCall(Function, Args);\\n+ LLVM::Value Ret;\\n+ if (IsLazyJIT) {\\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\\n+ if (IsImport) {\\n+ Ret = Builder.createCall(Function, Args);\\n+ } else {\\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\\n+\\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\\n+ }\\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\\n+ if (!CacheVar) {\\n+ CacheVar = Context.LLModule.get().addGlobal(\\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \\\"\\\");\\n+ }\\n+\\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \\\"ic.check\\\");\\n+ auto ResolveBB =\\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \\\"ic.resolve\\\");\\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \\\"ic.call\\\");\\n+\\n+ Builder.createBr(CheckBB);\\n+ Builder.positionAtEnd(CheckBB);\\n+\\n+ auto CachedPtr =\\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\\n+ CachedPtr.setAlignment(8);\\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\\n+ auto IsNull = Builder.createIsNull(CachedPtr);\\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\\n+\\n+ Builder.positionAtEnd(ResolveBB);\\n+ auto FPtr = Builder.createCall(\\n+ Context.getIntrinsic(\\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\\n+ {Context.Int32Ty}, false)),\\n+ {LLContext.getInt32(FuncIndex)});\\n+ auto Store = Builder.createStore(FPtr, CacheVar);\\n+ Store.setAlignment(8);\\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\\n+ Builder.createBr(CallBB);\\n+\\n+ Builder.positionAtEnd(CallBB);\\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\\n+\\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\\n+ }\\n+ } else {\\n+ Ret = Builder.createCall(Function, Args);\\n+ }\\n+\\n auto Ty = Ret.getType();\\n if (Ty.isVoidTy()) {\\n // nothing to do\\n@@ -4387,7 +4460,64 @@ class FunctionCompiler {\\n Args[J + 1] = stackPop();\\n }\\n \\n- auto Ret = Builder.createCall(Function, Args);\\n+ LLVM::Value Ret;\\n+ if (IsLazyJIT) {\\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\\n+ if (IsImport) {\\n+ Ret = Builder.createCall(Function, Args);\\n+ } else {\\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\\n+\\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\\n+ }\\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\\n+ if (!CacheVar) {\\n+ CacheVar = Context.LLModule.get().addGlobal(\\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \\\"\\\");\\n+ }\\n+\\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \\\"rc.check\\\");\\n+ auto ResolveBB =\\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \\\"rc.resolve\\\");\\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \\\"rc.call\\\");\\n+\\n+ Builder.createBr(CheckBB);\\n+ Builder.positionAtEnd(CheckBB);\\n+\\n+ auto CachedPtr =\\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\\n+ CachedPtr.setAlignment(8);\\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\\n+ auto IsNull = Builder.createIsNull(CachedPtr);\\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\\n+\\n+ Builder.positionAtEnd(ResolveBB);\\n+ auto FPtr = Builder.createCall(\\n+ Context.getIntrinsic(\\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\\n+ {Context.Int32Ty}, false)),\\n+ {LLContext.getInt32(FuncIndex)});\\n+ auto Store = Builder.createStore(FPtr, CacheVar);\\n+ Store.setAlignment(8);\\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\\n+ Builder.createBr(CallBB);\\n+\\n+ Builder.positionAtEnd(CallBB);\\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\\n+\\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\\n+ }\\n+ } else {\\n+ Ret = Builder.createCall(Function, Args);\\n+ }\\n+\\n+ Ret.setMustTailCall();\\n auto Ty = Ret.getType();\\n if (Ty.isVoidTy()) {\\n Builder.createRetVoid();\\n@@ -4432,6 +4562,7 @@ class FunctionCompiler {\\n \\n auto FPtrRet =\\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\\n+ FPtrRet.setMustTailCall();\\n if (RetSize == 0) {\\n Builder.createRetVoid();\\n } else {\\n@@ -4608,6 +4739,7 @@ class FunctionCompiler {\\n \\n auto FPtrRet =\\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\\n+ FPtrRet.setMustTailCall();\\n if (RetSize == 0) {\\n Builder.createRetVoid();\\n } else {\\n@@ -5854,6 +5986,7 @@ class FunctionCompiler {\\n Control &operator=(const Control &) = default;\\n Control &operator=(Control &&) = default;\\n };\\n+ bool IsLazyJIT;\\n std::vector<Control> ControlStack;\\n LLVM::FunctionCallee F;\\n LLVM::Value ExecCtx;\\n@@ -5894,6 +6027,84 @@ Expect<void> Compiler::checkConfigure() noexcept {\\n return {};\\n }\\n \\n+Expect<void> Compiler::optimize(LLVM::Module &LLModule,\\n+ LLVM::TargetMachine &TM) noexcept {\\n+ spdlog::info(\\\"optimize start\\\"sv);\\n+ auto Triple = LLModule.getTarget();\\n+ auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\\n+ if (ErrorMessage) {\\n+ spdlog::error(\\\"getFromTriple failed:{}\\\"sv, ErrorMessage.string_view());\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ std::string CPUName;\\n+#if defined(__riscv) && __riscv_xlen == 64\\n+ CPUName = \\\"generic-rv64\\\"s;\\n+#else\\n+ if (!Conf.getCompilerConfigure().isGenericBinary()) {\\n+ CPUName = LLVM::getHostCPUName().string_view();\\n+ } else {\\n+ CPUName = \\\"generic\\\"s;\\n+ }\\n+#endif\\n+\\n+ // On RISC-V we use generic-rv64 as the CPU, so also use default\\n+ // features; host features under QEMU can be inconsistent (e.g.\\n+ // zvl*b without v) which LLVM >= 20 rejects.\\n+ TM = LLVM::TargetMachine::create(\\n+ TheTarget, Triple, CPUName.c_str(),\\n+#if defined(__riscv) && __riscv_xlen == 64\\n+ \\\"\\\",\\n+#else\\n+ LLVM::getHostCPUFeatures().unwrap(),\\n+#endif\\n+ toLLVMCodeGenLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\\n+ LLVMRelocPIC, LLVMCodeModelDefault);\\n+\\n+#if LLVM_VERSION_MAJOR >= 13\\n+ auto PBO = LLVM::PassBuilderOptions::create();\\n+ if (auto Error = PBO.runPasses(\\n+ LLModule,\\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\\n+ TM)) {\\n+ spdlog::error(\\\"{}\\\"sv, Error.message().string_view());\\n+ }\\n+#else\\n+ auto FP = LLVM::PassManager::createForModule(LLModule);\\n+ auto MP = LLVM::PassManager::create();\\n+\\n+ TM.addAnalysisPasses(MP);\\n+ TM.addAnalysisPasses(FP);\\n+ {\\n+ auto PMB = LLVM::PassManagerBuilder::create();\\n+ auto [OptLevel, SizeLevel] =\\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\\n+ PMB.setOptLevel(OptLevel);\\n+ PMB.setSizeLevel(SizeLevel);\\n+ PMB.populateFunctionPassManager(FP);\\n+ PMB.populateModulePassManager(MP);\\n+ }\\n+ switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\\n+ case CompilerConfigure::OptimizationLevel::O0:\\n+ case CompilerConfigure::OptimizationLevel::O1:\\n+ FP.addTailCallEliminationPass();\\n+ break;\\n+ default:\\n+ break;\\n+ }\\n+\\n+ FP.initializeFunctionPassManager();\\n+ for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\\n+ FP.runFunctionPassManager(Fn);\\n+ }\\n+ FP.finalizeFunctionPassManager();\\n+ MP.runPassManager(LLModule);\\n+#endif\\n+\\n+ spdlog::info(\\\"optimize done\\\"sv);\\n+ return {};\\n+}\\n+\\n Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\\n // Check that the module is validated.\\n if (unlikely(!Module.getIsValidated())) {\\n@@ -5913,15 +6124,7 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\\n \\n CompileContext NewContext(LLContext, LLModule,\\n Conf.getCompilerConfigure().isGenericBinary());\\n- struct RAIICleanup {\\n- RAIICleanup(CompileContext *&Context, CompileContext &NewContext)\\n- : Context(Context) {\\n- Context = &NewContext;\\n- }\\n- ~RAIICleanup() { Context = nullptr; }\\n- CompileContext *&Context;\\n- };\\n- RAIICleanup Cleanup(Context, NewContext);\\n+ RAIICleanup Cleanup(Context, &NewContext);\\n \\n // Compile Function Types\\n compile(Module.getTypeSection());\\n@@ -5942,81 +6145,8 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\\n spdlog::info(\\\"verify start\\\"sv);\\n LLModule.verify(LLVMPrintMessageAction);\\n \\n- spdlog::info(\\\"optimize start\\\"sv);\\n auto &TM = D.extract().TM;\\n- {\\n- auto Triple = LLModule.getTarget();\\n- auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\\n- if (ErrorMessage) {\\n- spdlog::error(\\\"getFromTriple failed:{}\\\"sv, ErrorMessage.string_view());\\n- return Unexpect(ErrCode::Value::IllegalPath);\\n- } else {\\n- std::string CPUName;\\n-#if defined(__riscv) && __riscv_xlen == 64\\n- CPUName = \\\"generic-rv64\\\"s;\\n-#else\\n- if (!Conf.getCompilerConfigure().isGenericBinary()) {\\n- CPUName = LLVM::getHostCPUName().string_view();\\n- } else {\\n- CPUName = \\\"generic\\\"s;\\n- }\\n-#endif\\n-\\n- // On RISC-V we use generic-rv64 as the CPU, so also use default\\n- // features; host features under QEMU can be inconsistent (e.g.\\n- // zvl*b without v) which LLVM >= 20 rejects.\\n- TM = LLVM::TargetMachine::create(\\n- TheTarget, Triple, CPUName.c_str(),\\n-#if defined(__riscv) && __riscv_xlen == 64\\n- \\\"\\\",\\n-#else\\n- LLVM::getHostCPUFeatures().unwrap(),\\n-#endif\\n- toLLVMCodeGenLevel(\\n- Conf.getCompilerConfigure().getOptimizationLevel()),\\n- LLVMRelocPIC, LLVMCodeModelDefault);\\n- }\\n-\\n-#if LLVM_VERSION_MAJOR >= 13\\n- auto PBO = LLVM::PassBuilderOptions::create();\\n- if (auto Error = PBO.runPasses(\\n- LLModule,\\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\\n- TM)) {\\n- spdlog::error(\\\"{}\\\"sv, Error.message().string_view());\\n- }\\n-#else\\n- auto FP = LLVM::PassManager::createForModule(LLModule);\\n- auto MP = LLVM::PassManager::create();\\n-\\n- TM.addAnalysisPasses(MP);\\n- TM.addAnalysisPasses(FP);\\n- {\\n- auto PMB = LLVM::PassManagerBuilder::create();\\n- auto [OptLevel, SizeLevel] =\\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\\n- PMB.setOptLevel(OptLevel);\\n- PMB.setSizeLevel(SizeLevel);\\n- PMB.populateFunctionPassManager(FP);\\n- PMB.populateModulePassManager(MP);\\n- }\\n- switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\\n- case CompilerConfigure::OptimizationLevel::O0:\\n- case CompilerConfigure::OptimizationLevel::O1:\\n- FP.addTailCallEliminationPass();\\n- break;\\n- default:\\n- break;\\n- }\\n-\\n- FP.initializeFunctionPassManager();\\n- for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\\n- FP.runFunctionPassManager(Fn);\\n- }\\n- FP.finalizeFunctionPassManager();\\n- MP.runPassManager(LLModule);\\n-#endif\\n- }\\n+ EXPECTED_TRY(optimize(LLModule, TM));\\n \\n // Set initializer for constant value\\n if (auto IntrinsicsTable = LLModule.getNamedGlobal(\\\"intrinsics\\\")) {\\n@@ -6031,12 +6161,11 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\\n IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\\n LLVM::Value::getConstNull(IntrinsicsTableTy), \\\"intrinsics\\\");\\n }\\n-\\n- spdlog::info(\\\"optimize done\\\"sv);\\n return Expect<Data>{std::move(D)};\\n }\\n \\n-void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\\n+void Compiler::compile(const AST::TypeSection &TypeSec,\\n+ bool DeclarationsOnly) noexcept {\\n auto WrapperTy =\\n LLVM::Type::getFunctionType(Context->VoidTy,\\n {Context->ExecCtxPtrTy, Context->Int8PtrTy,\\n@@ -6050,10 +6179,25 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\\n Context->CompositeTypes.reserve(Size);\\n Context->FunctionWrappers.reserve(Size);\\n \\n+ auto SetFuncAttributes = [&](auto FDecl) {\\n+ FDecl.setVisibility(LLVMProtectedVisibility);\\n+ FDecl.setDSOLocal(true);\\n+ FDecl.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ FDecl.addFnAttr(Context->NoStackArgProbe);\\n+ FDecl.addFnAttr(Context->StrictFP);\\n+ FDecl.addFnAttr(Context->UWTable);\\n+ FDecl.addParamAttr(0, Context->ReadOnly);\\n+ FDecl.addParamAttr(0, Context->NoAlias);\\n+ FDecl.addParamAttr(1, Context->NoAlias);\\n+ FDecl.addParamAttr(2, Context->NoAlias);\\n+ FDecl.addParamAttr(3, Context->NoAlias);\\n+ };\\n+\\n // Iterate and compile types.\\n for (size_t I = 0; I < Size; ++I) {\\n const auto &CompType = SubTypes[I].getCompositeType();\\n- const auto Name = fmt::format(\\\"t{}\\\"sv, Context->CompositeTypes.size());\\n+ const auto Name =\\n+ fmt::format(\\\"{}t{}\\\"sv, Context->Prefix, Context->CompositeTypes.size());\\n if (CompType.isFunc()) {\\n // Check that the function type is unique.\\n {\\n@@ -6065,13 +6209,21 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\\n if (OldFuncType == CompType.getFuncType()) {\\n Unique = false;\\n Context->CompositeTypes.push_back(Context->CompositeTypes[J]);\\n- auto F = Context->FunctionWrappers[J];\\n- Context->FunctionWrappers.push_back(F);\\n- auto A = Context->LLModule.addAlias(WrapperTy, F, Name.c_str());\\n- A.setLinkage(LLVMExternalLinkage);\\n- A.setVisibility(LLVMProtectedVisibility);\\n- A.setDSOLocal(true);\\n- A.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ if (DeclarationsOnly) {\\n+ auto FDecl = Context->LLModule.get().addFunction(\\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\\n+ SetFuncAttributes(FDecl);\\n+ Context->FunctionWrappers.push_back(FDecl);\\n+ } else {\\n+ auto F = Context->FunctionWrappers[J];\\n+ Context->FunctionWrappers.push_back(F);\\n+ auto A = Context->LLModule.get().addAlias(WrapperTy, F,\\n+ Name.c_str());\\n+ A.setLinkage(LLVMExternalLinkage);\\n+ A.setVisibility(LLVMProtectedVisibility);\\n+ A.setDSOLocal(true);\\n+ A.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ }\\n break;\\n }\\n }\\n@@ -6082,81 +6234,66 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\\n }\\n \\n // Create Wrapper\\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\\n- Name.c_str());\\n+ auto F = Context->LLModule.get().addFunction(\\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\\n {\\n- F.setVisibility(LLVMProtectedVisibility);\\n- F.setDSOLocal(true);\\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\\n- F.addFnAttr(Context->NoStackArgProbe);\\n- F.addFnAttr(Context->StrictFP);\\n- F.addFnAttr(Context->UWTable);\\n- F.addParamAttr(0, Context->ReadOnly);\\n- F.addParamAttr(0, Context->NoAlias);\\n- F.addParamAttr(1, Context->NoAlias);\\n- F.addParamAttr(2, Context->NoAlias);\\n- F.addParamAttr(3, Context->NoAlias);\\n-\\n- LLVM::Builder Builder(Context->LLContext);\\n- Builder.positionAtEnd(\\n- LLVM::BasicBlock::create(Context->LLContext, F, \\\"entry\\\"));\\n-\\n- auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\\n- CompType.getFuncType());\\n- auto RTy = FTy.getReturnType();\\n- std::vector<LLVM::Type> FPTy(FTy.getNumParams());\\n- FTy.getParamTypes(FPTy);\\n-\\n- const size_t ArgCount = FPTy.size() - 1;\\n- auto ExecCtxPtr = F.getFirstParam();\\n- auto RawFunc = LLVM::FunctionCallee{\\n- FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\\n- FTy.getPointerTo())};\\n- auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\\n- auto RawRets = RawArgs.getNextParam();\\n-\\n- std::vector<LLVM::Value> Args;\\n- Args.reserve(FTy.getNumParams());\\n- Args.push_back(ExecCtxPtr);\\n- for (size_t J = 0; J < ArgCount; ++J) {\\n- Args.push_back(Builder.createValuePtrLoad(\\n- FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\\n- }\\n+ SetFuncAttributes(F);\\n+\\n+ if (!DeclarationsOnly) {\\n+ LLVM::Builder Builder(Context->LLContext);\\n+ Builder.positionAtEnd(\\n+ LLVM::BasicBlock::create(Context->LLContext, F, \\\"entry\\\"));\\n+\\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\\n+ CompType.getFuncType());\\n+ auto RTy = FTy.getReturnType();\\n+ std::vector<LLVM::Type> FPTy(FTy.getNumParams());\\n+ FTy.getParamTypes(FPTy);\\n+\\n+ const size_t ArgCount = FPTy.size() - 1;\\n+ auto ExecCtxPtr = F.getFirstParam();\\n+ auto RawFunc = LLVM::FunctionCallee{\\n+ FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\\n+ FTy.getPointerTo())};\\n+ auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\\n+ auto RawRets = RawArgs.getNextParam();\\n+\\n+ std::vector<LLVM::Value> Args;\\n+ Args.reserve(FTy.getNumParams());\\n+ Args.push_back(ExecCtxPtr);\\n+ for (size_t J = 0; J < ArgCount; ++J) {\\n+ Args.push_back(Builder.createValuePtrLoad(\\n+ FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\\n+ }\\n \\n- auto Ret = Builder.createCall(RawFunc, Args);\\n- if (RTy.isVoidTy()) {\\n- // nothing to do\\n- } else if (RTy.isStructTy()) {\\n- auto Rets = unpackStruct(Builder, Ret);\\n- Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty, kValSize);\\n- } else {\\n- Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\\n+ auto Ret = Builder.createCall(RawFunc, Args);\\n+ if (RTy.isVoidTy()) {\\n+ // nothing to do\\n+ } else if (RTy.isStructTy()) {\\n+ auto Rets = unpackStruct(Builder, Ret);\\n+ Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty,\\n+ kValSize);\\n+ } else {\\n+ Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\\n+ }\\n+ Builder.createRetVoid();\\n }\\n- Builder.createRetVoid();\\n }\\n // Copy wrapper, param and return lists to module instance.\\n Context->FunctionWrappers.push_back(F);\\n } else {\\n // Non function type case. Create empty wrapper.\\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\\n- Name.c_str());\\n+ auto F = Context->LLModule.get().addFunction(\\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\\n {\\n- F.setVisibility(LLVMProtectedVisibility);\\n- F.setDSOLocal(true);\\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\\n- F.addFnAttr(Context->NoStackArgProbe);\\n- F.addFnAttr(Context->StrictFP);\\n- F.addFnAttr(Context->UWTable);\\n- F.addParamAttr(0, Context->ReadOnly);\\n- F.addParamAttr(0, Context->NoAlias);\\n- F.addParamAttr(1, Context->NoAlias);\\n- F.addParamAttr(2, Context->NoAlias);\\n- F.addParamAttr(3, Context->NoAlias);\\n-\\n- LLVM::Builder Builder(Context->LLContext);\\n- Builder.positionAtEnd(\\n- LLVM::BasicBlock::create(Context->LLContext, F, \\\"entry\\\"));\\n- Builder.createRetVoid();\\n+ SetFuncAttributes(F);\\n+\\n+ if (!DeclarationsOnly) {\\n+ LLVM::Builder Builder(Context->LLContext);\\n+ Builder.positionAtEnd(\\n+ LLVM::BasicBlock::create(Context->LLContext, F, \\\"entry\\\"));\\n+ Builder.createRetVoid();\\n+ }\\n }\\n Context->FunctionWrappers.push_back(F);\\n }\\n@@ -6184,9 +6321,9 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\\n toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\\n auto RTy = FTy.getReturnType();\\n auto F = LLVM::FunctionCallee{\\n- FTy,\\n- Context->LLModule.addFunction(FTy, LLVMInternalLinkage,\\n- fmt::format(\\\"f{}\\\"sv, FuncID).c_str())};\\n+ FTy, Context->LLModule.get().addFunction(\\n+ FTy, LLVMInternalLinkage,\\n+ fmt::format(\\\"{}f{}\\\"sv, Context->Prefix, FuncID).c_str())};\\n F.Fn.setDSOLocal(true);\\n F.Fn.addFnAttr(Context->NoStackArgProbe);\\n F.Fn.addFnAttr(Context->StrictFP);\\n@@ -6231,6 +6368,7 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\\n }\\n \\n Context->Functions.emplace_back(TypeIdx, F, nullptr);\\n+ Context->ImportCount++;\\n break;\\n }\\n case ExternalType::Table: // Table type\\n@@ -6313,9 +6451,10 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\\n const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\\n const auto FuncID = Context->Functions.size();\\n auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\\n- LLVM::FunctionCallee F = {FTy, Context->LLModule.addFunction(\\n- FTy, LLVMExternalLinkage,\\n- fmt::format(\\\"f{}\\\"sv, FuncID).c_str())};\\n+ LLVM::FunctionCallee F = {\\n+ FTy, Context->LLModule.get().addFunction(\\n+ FTy, LLVMExternalLinkage,\\n+ fmt::format(\\\"{}f{}\\\"sv, Context->Prefix, FuncID).c_str())};\\n F.Fn.setVisibility(LLVMProtectedVisibility);\\n F.Fn.setDSOLocal(true);\\n F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\\n@@ -6339,10 +6478,11 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\\n Locals.push_back(Local.second);\\n }\\n }\\n- FunctionCompiler FC(*Context, F, Locals,\\n- Conf.getCompilerConfigure().isInterruptible(),\\n- Conf.getStatisticsConfigure().isInstructionCounting(),\\n- Conf.getStatisticsConfigure().isCostMeasuring());\\n+ FunctionCompiler FC(\\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\\n auto Type = Context->resolveBlockType(T);\\n EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\\n F.Fn.eliminateUnreachableBlocks();\\n@@ -6350,5 +6490,235 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\\n return {};\\n }\\n \\n+void Compiler::compileFunctionDeclarations(\\n+ const AST::FunctionSection &FunctionSec,\\n+ const AST::CodeSection &CodeSec) noexcept {\\n+ const auto &TypeIdxs = FunctionSec.getContent();\\n+ const auto &CodeSegs = CodeSec.getContent();\\n+ assuming(TypeIdxs.size() == CodeSegs.size());\\n+\\n+ for (size_t I = 0; I < CodeSegs.size(); ++I) {\\n+ const auto &TypeIdx = TypeIdxs[I];\\n+ const auto &Code = CodeSegs[I];\\n+ assuming(TypeIdx < Context->CompositeTypes.size());\\n+ assuming(Context->CompositeTypes[TypeIdx]->isFunc());\\n+ const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\\n+ const auto FuncID = Context->Functions.size();\\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\\n+ LLVM::FunctionCallee F = {\\n+ FTy, Context->LLModule.get().addFunction(\\n+ FTy, LLVMExternalLinkage,\\n+ fmt::format(\\\"{}f{}\\\"sv, Context->Prefix, FuncID).c_str())};\\n+ F.Fn.setVisibility(LLVMProtectedVisibility);\\n+ F.Fn.setDSOLocal(true);\\n+ F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ F.Fn.addFnAttr(Context->NoStackArgProbe);\\n+ F.Fn.addFnAttr(Context->StrictFP);\\n+ F.Fn.addFnAttr(Context->UWTable);\\n+ F.Fn.addParamAttr(0, Context->ReadOnly);\\n+ F.Fn.addParamAttr(0, Context->NoAlias);\\n+\\n+ Context->Functions.emplace_back(TypeIdx, F, &Code);\\n+ }\\n+}\\n+\\n+Expect<void> Compiler::compileFunctionBody(uint32_t LocalFuncIndex) noexcept {\\n+ // Find the function in the Functions list\\n+ // LocalFuncIndex is relative to the defined functions (not imports)\\n+ uint32_t GlobalFuncIndex = Context->ImportCount + LocalFuncIndex;\\n+ if (GlobalFuncIndex >= Context->Functions.size()) {\\n+ spdlog::error(\\\"[lazy-jit]: function index {} out of range\\\"sv,\\n+ LocalFuncIndex);\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ auto &[T, F, Code] = Context->Functions[GlobalFuncIndex];\\n+ if (!Code) {\\n+ spdlog::error(\\\"[lazy-jit]: cannot compile import function {}\\\"sv,\\n+ LocalFuncIndex);\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ // Check if already compiled (function has basic blocks)\\n+ if (F.Fn.countBasicBlocks() > 0) {\\n+ spdlog::debug(\\\"[lazy-jit]: function {} already compiled\\\"sv, LocalFuncIndex);\\n+ return {};\\n+ }\\n+\\n+ spdlog::debug(\\\"[lazy-jit]: compiling function {}\\\"sv, LocalFuncIndex);\\n+\\n+ std::vector<ValType> Locals;\\n+ for (const auto &Local : Code->getLocals()) {\\n+ for (unsigned I = 0; I < Local.first; ++I) {\\n+ Locals.push_back(Local.second);\\n+ }\\n+ }\\n+\\n+ FunctionCompiler FC(\\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\\n+ auto Type = Context->resolveBlockType(T);\\n+ EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\\n+ F.Fn.eliminateUnreachableBlocks();\\n+\\n+ return {};\\n+}\\n+\\n+Expect<std::pair<LLVM::Data,\\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\\n+ LLVM::Compiler::CompileContextDeleter>>>\\n+LLVM::Compiler::compileInfrastructure(const AST::Module &Module,\\n+ std::string Prefix) noexcept {\\n+ Data D;\\n+ D.setPrefix(Prefix);\\n+ // Check the module is validated.\\n+ if (unlikely(!Module.getIsValidated())) {\\n+ spdlog::error(ErrCode::Value::NotValidated);\\n+ return Unexpect(ErrCode::Value::NotValidated);\\n+ }\\n+\\n+ std::unique_lock Lock(Mutex);\\n+ spdlog::info(\\\"[lazy-jit]: compile infrastructure start\\\"sv);\\n+\\n+ auto LLContext = D.extract().getLLContext();\\n+ LLVM::Core::init(LLContext.unwrap());\\n+ auto &LLModule = D.extract().LLModule;\\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \\\"PIC Level\\\"sv, 2);\\n+\\n+ std::unique_ptr<CompileContext, CompileContextDeleter> NewContext(\\n+ new CompileContext(LLContext, LLModule,\\n+ Conf.getCompilerConfigure().isGenericBinary(),\\n+ D.getPrefix()));\\n+ RAIICleanup Cleanup(this->Context, NewContext.get());\\n+\\n+ // Compile Function Types\\n+ compile(Module.getTypeSection());\\n+ // Compile ImportSection\\n+ compile(Module.getImportSection());\\n+ // Compile GlobalSection\\n+ compile(Module.getGlobalSection());\\n+ // Compile MemorySection (MemorySec, DataSec)\\n+ compile(Module.getMemorySection(), Module.getDataSection());\\n+ // Compile TableSection (TableSec, ElemSec)\\n+ compile(Module.getTableSection(), Module.getElementSection());\\n+ // Create function declarations without compiling bodies\\n+ compileFunctionDeclarations(Module.getFunctionSection(),\\n+ Module.getCodeSection());\\n+ // Compile ExportSection\\n+ compile(Module.getExportSection());\\n+\\n+ // Set initializer for constant value\\n+ auto IntrinsicsName = fmt::format(\\\"{}intrinsics\\\"sv, D.getPrefix());\\n+ if (auto IntrinsicsTable = LLModule.getNamedGlobal(IntrinsicsName.c_str())) {\\n+ IntrinsicsTable.setInitializer(\\n+ LLVM::Value::getConstNull(IntrinsicsTable.getType()));\\n+ IntrinsicsTable.setGlobalConstant(false);\\n+ } else {\\n+ auto IntrinsicsTableTy = LLVM::Type::getArrayType(\\n+ LLContext.getInt8Ty().getPointerTo(),\\n+ static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax));\\n+ LLModule.addGlobal(\\n+ IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\\n+ LLVM::Value::getConstNull(IntrinsicsTableTy), IntrinsicsName.c_str());\\n+ }\\n+ LLModule.verify(LLVMPrintMessageAction);\\n+\\n+ spdlog::info(\\\"[lazy-jit]: infrastructure compilation done\\\"sv);\\n+\\n+ return Expect<\\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>>{\\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>{\\n+ std::move(D), std::move(NewContext)}};\\n+}\\n+\\n+Expect<LLVM::Data>\\n+Compiler::compileFunctions(Data &&LLData, CompileContext *NewContext,\\n+ const AST::Module &Module,\\n+ Span<const uint32_t> LocalFuncIndices) noexcept {\\n+ if (unlikely(!Module.getIsValidated())) {\\n+ spdlog::error(ErrCode::Value::NotValidated);\\n+ return Unexpect(ErrCode::Value::NotValidated);\\n+ }\\n+ if (unlikely(LocalFuncIndices.empty())) {\\n+ spdlog::error(\\\"[lazy-jit]: compileFunctions with empty index list\\\"sv);\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ std::unique_lock Lock(Mutex);\\n+ std::vector<uint32_t> Sorted(LocalFuncIndices.begin(),\\n+ LocalFuncIndices.end());\\n+ std::sort(Sorted.begin(), Sorted.end());\\n+ Sorted.erase(std::unique(Sorted.begin(), Sorted.end()), Sorted.end());\\n+\\n+ spdlog::debug(\\\"[lazy-jit]: compile functions batch ({}) start\\\"sv,\\n+ Sorted.size());\\n+\\n+ auto LLContext = LLData.extract().getLLContext();\\n+ LLVM::Core::init(LLContext.unwrap());\\n+ auto &LLModule = LLData.extract().LLModule;\\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \\\"PIC Level\\\"sv, 2);\\n+\\n+ RAIICleanup Cleanup(this->Context, NewContext);\\n+ Context->LLModule = LLModule;\\n+\\n+ Context->CompositeTypes.clear();\\n+ Context->FunctionWrappers.clear();\\n+ Context->Functions.clear();\\n+ Context->LazyJITCacheVars.clear();\\n+ Context->ImportCount = 0;\\n+ Context->MemoryAddrTypes.clear();\\n+ Context->TableAddrTypes.clear();\\n+ Context->Globals.clear();\\n+\\n+ Context->IntrinsicsTable = LLModule.addGlobal(\\n+ Context->IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\\n+ fmt::format(\\\"{}intrinsics\\\"sv, Context->Prefix).c_str());\\n+ Context->IntrinsicsTable.setInitializer(LLVM::Value());\\n+ Context->Trap.Ty =\\n+ LLVM::Type::getFunctionType(Context->VoidTy, {Context->Int32Ty});\\n+ Context->Trap.Fn =\\n+ LLModule.addFunction(Context->Trap.Ty, LLVMPrivateLinkage, \\\"trap\\\");\\n+ Context->Trap.Fn.setDSOLocal(true);\\n+ Context->Trap.Fn.addFnAttr(Context->NoStackArgProbe);\\n+ Context->Trap.Fn.addFnAttr(Context->StrictFP);\\n+ Context->Trap.Fn.addFnAttr(Context->UWTable);\\n+ Context->Trap.Fn.addFnAttr(Context->NoReturn);\\n+ Context->Trap.Fn.addFnAttr(Context->Cold);\\n+ Context->Trap.Fn.addFnAttr(Context->NoInline);\\n+ Context->compileTrap();\\n+\\n+ compile(Module.getTypeSection(), true);\\n+ compile(Module.getImportSection());\\n+ compile(Module.getGlobalSection());\\n+ compile(Module.getMemorySection(), Module.getDataSection());\\n+ compile(Module.getTableSection(), Module.getElementSection());\\n+\\n+ compileFunctionDeclarations(Module.getFunctionSection(),\\n+ Module.getCodeSection());\\n+\\n+ for (uint32_t FuncIndex : Sorted) {\\n+ EXPECTED_TRY(compileFunctionBody(FuncIndex));\\n+ }\\n+\\n+ spdlog::info(\\\"[lazy-jit]: verify batch ({} funcs) start\\\"sv, Sorted.size());\\n+ LLModule.verify(LLVMPrintMessageAction);\\n+ spdlog::info(\\\"[lazy-jit]: verify batch ({} funcs) done\\\"sv, Sorted.size());\\n+\\n+ auto &TM = LLData.extract().TM;\\n+ EXPECTED_TRY(optimize(LLModule, TM));\\n+\\n+ spdlog::debug(\\\"[lazy-jit]: compile functions batch ({}) done\\\"sv,\\n+ Sorted.size());\\n+ return Expect<Data>{std::move(LLData)};\\n+}\\n+\\n+void LLVM::Compiler::CompileContextDeleter::operator()(\\n+ CompileContext *Context) const noexcept {\\n+ delete Context;\\n+}\\n } // namespace LLVM\\n } // namespace WasmEdge\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13296,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"It seems like you don't call the `LLModule.verify()` inside `compileInfrastructure`?"},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp\nindex 39da94d9a9ac..330e245f51c3 100644\n--- a/lib/llvm/compiler.cpp\n+++ b/lib/llvm/compiler.cpp\n@@ -9,6 +9,7 @@\n #include \"common/spdlog.h\"\n #include \"data.h\"\n #include \"llvm.h\"\n+#include \"spdlog/spdlog.h\"\n #include \"system/allocator.h\"\n \n #include <algorithm>\n@@ -16,6 +17,7 @@\n #include <cinttypes>\n #include <cstdint>\n #include <cstdlib>\n+#include <functional>\n #include <limits>\n #include <memory>\n #include <numeric>\n@@ -28,6 +30,16 @@ using namespace std::literals;\n \n namespace {\n \n+struct RAIICleanup {\n+ RAIICleanup(LLVM::Compiler::CompileContext *&Context,\n+ LLVM::Compiler::CompileContext *NewContext)\n+ : Context(Context) {\n+ Context = NewContext;\n+ }\n+ ~RAIICleanup() { Context = nullptr; }\n+ LLVM::Compiler::CompileContext *&Context;\n+};\n+\n static bool\n isVoidReturn(WasmEdge::Span<const WasmEdge::ValType> ValTypes) noexcept;\n static LLVM::Type toLLVMType(LLVM::Context LLContext,\n@@ -128,7 +140,7 @@ static inline LLVMCodeGenOptLevel toLLVMCodeGenLevel(\n \n struct LLVM::Compiler::CompileContext {\n LLVM::Context LLContext;\n- LLVM::Module &LLModule;\n+ std::reference_wrapper<LLVM::Module> LLModule;\n LLVM::Attribute Cold;\n LLVM::Attribute NoAlias;\n LLVM::Attribute NoInline;\n@@ -202,13 +214,16 @@ struct LLVM::Compiler::CompileContext {\n std::vector<std::tuple<uint32_t, LLVM::FunctionCallee,\n const WasmEdge::AST::CodeSegment *>>\n Functions;\n+ std::vector<LLVM::Value> LazyJITCacheVars;\n+ uint32_t ImportCount = 0;\n std::vector<LLVM::Type> MemoryAddrTypes;\n std::vector<LLVM::Type> TableAddrTypes;\n std::vector<LLVM::Type> Globals;\n+ std::string Prefix;\n LLVM::Value IntrinsicsTable;\n LLVM::FunctionCallee Trap;\n- CompileContext(LLVM::Context C, LLVM::Module &M,\n- bool IsGenericBinary) noexcept\n+ CompileContext(LLVM::Context C, LLVM::Module &M, bool IsGenericBinary,\n+ std::string_view P = \"\"sv) noexcept\n : LLContext(C), LLModule(M),\n Cold(LLVM::Attribute::createEnum(C, LLVM::Core::Cold, 0)),\n NoAlias(LLVM::Attribute::createEnum(C, LLVM::Core::NoAlias, 0)),\n@@ -256,14 +271,14 @@ struct LLVM::Compiler::CompileContext {\n })),\n ExecCtxPtrTy(ExecCtxTy.getPointerTo()),\n IntrinsicsTableTy(LLVM::Type::getArrayType(\n- Int8PtrTy,\n+ Int8Ty.getPointerTo(),\n static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax))),\n- IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()),\n- IntrinsicsTable(LLModule.addGlobal(IntrinsicsTablePtrTy, true,\n- LLVMExternalLinkage, LLVM::Value(),\n- \"intrinsics\")) {\n+ IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()), Prefix(P),\n+ IntrinsicsTable(LLModule.get().addGlobal(\n+ IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\n+ fmt::format(\"{}intrinsics\"sv, Prefix).c_str())) {\n Trap.Ty = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n- Trap.Fn = LLModule.addFunction(Trap.Ty, LLVMPrivateLinkage, \"trap\");\n+ Trap.Fn = LLModule.get().addFunction(Trap.Ty, LLVMPrivateLinkage, \"trap\");\n Trap.Fn.setDSOLocal(true);\n Trap.Fn.addFnAttr(NoStackArgProbe);\n Trap.Fn.addFnAttr(StrictFP);\n@@ -272,9 +287,10 @@ struct LLVM::Compiler::CompileContext {\n Trap.Fn.addFnAttr(Cold);\n Trap.Fn.addFnAttr(NoInline);\n \n- LLModule.addGlobal(Int32Ty, true, LLVMExternalLinkage,\n- LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\n- \"version\");\n+ LLModule.get().addGlobal(\n+ Int32Ty, true, LLVMExternalLinkage,\n+ LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\n+ fmt::format(\"{}version\"sv, Prefix).c_str());\n \n if (!IsGenericBinary) {\n SubtargetFeatures = LLVM::getHostCPUFeatures();\n@@ -313,18 +329,7 @@ struct LLVM::Compiler::CompileContext {\n }\n }\n \n- {\n- // create trap\n- LLVM::Builder Builder(LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(LLContext, Trap.Fn, \"entry\"));\n- auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n- auto CallTrap = Builder.createCall(\n- getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\n- {Trap.Fn.getFirstParam()});\n- CallTrap.addCallSiteAttribute(NoReturn);\n- Builder.createUnreachable();\n- }\n+ compileTrap();\n }\n LLVM::Value getMemory(LLVM::Builder &Builder, LLVM::Value ExecCtx,\n uint32_t Index) noexcept {\n@@ -394,6 +399,17 @@ struct LLVM::Compiler::CompileContext {\n auto Ptr = Builder.createBitCast(VPtr, PtrPtrTy);\n return {Ty, Builder.createLoad(PtrTy, Ptr)};\n }\n+ void compileTrap() noexcept {\n+ LLVM::Builder Builder(LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(LLContext, Trap.Fn, \"entry\"));\n+ auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n+ auto CallTrap = Builder.createCall(\n+ getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\n+ {Trap.Fn.getFirstParam()});\n+ CallTrap.addCallSiteAttribute(NoReturn);\n+ Builder.createUnreachable();\n+ }\n std::pair<std::vector<ValType>, std::vector<ValType>>\n resolveBlockType(const BlockType &BType) const noexcept {\n using VecT = std::vector<ValType>;\n@@ -544,9 +560,10 @@ class FunctionCompiler {\n FunctionCompiler(LLVM::Compiler::CompileContext &Context,\n LLVM::FunctionCallee F, Span<const ValType> Locals,\n bool Interruptible, bool InstructionCounting,\n- bool GasMeasuring) noexcept\n+ bool GasMeasuring, bool IsLazyJIT) noexcept\n : Context(Context), LLContext(Context.LLContext),\n- Interruptible(Interruptible), F(F), Builder(LLContext) {\n+ Interruptible(Interruptible), IsLazyJIT(IsLazyJIT), F(F),\n+ Builder(LLContext) {\n if (F.Fn) {\n Builder.positionAtEnd(LLVM::BasicBlock::create(LLContext, F.Fn, \"entry\"));\n ExecCtx = Builder.createLoad(Context.ExecCtxTy, F.Fn.getFirstParam());\n@@ -4267,7 +4284,63 @@ class FunctionCompiler {\n Args[J + 1] = stackPop();\n }\n \n- auto Ret = Builder.createCall(Function, Args);\n+ LLVM::Value Ret;\n+ if (IsLazyJIT) {\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\n+ if (IsImport) {\n+ Ret = Builder.createCall(Function, Args);\n+ } else {\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\n+\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\n+ }\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\n+ if (!CacheVar) {\n+ CacheVar = Context.LLModule.get().addGlobal(\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \"\");\n+ }\n+\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.check\");\n+ auto ResolveBB =\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.resolve\");\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.call\");\n+\n+ Builder.createBr(CheckBB);\n+ Builder.positionAtEnd(CheckBB);\n+\n+ auto CachedPtr =\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\n+ CachedPtr.setAlignment(8);\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\n+ auto IsNull = Builder.createIsNull(CachedPtr);\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\n+\n+ Builder.positionAtEnd(ResolveBB);\n+ auto FPtr = Builder.createCall(\n+ Context.getIntrinsic(\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\n+ {Context.Int32Ty}, false)),\n+ {LLContext.getInt32(FuncIndex)});\n+ auto Store = Builder.createStore(FPtr, CacheVar);\n+ Store.setAlignment(8);\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\n+ Builder.createBr(CallBB);\n+\n+ Builder.positionAtEnd(CallBB);\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\n+\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\n+ }\n+ } else {\n+ Ret = Builder.createCall(Function, Args);\n+ }\n+\n auto Ty = Ret.getType();\n if (Ty.isVoidTy()) {\n // nothing to do\n@@ -4387,7 +4460,64 @@ class FunctionCompiler {\n Args[J + 1] = stackPop();\n }\n \n- auto Ret = Builder.createCall(Function, Args);\n+ LLVM::Value Ret;\n+ if (IsLazyJIT) {\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\n+ if (IsImport) {\n+ Ret = Builder.createCall(Function, Args);\n+ } else {\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\n+\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\n+ }\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\n+ if (!CacheVar) {\n+ CacheVar = Context.LLModule.get().addGlobal(\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \"\");\n+ }\n+\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.check\");\n+ auto ResolveBB =\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.resolve\");\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.call\");\n+\n+ Builder.createBr(CheckBB);\n+ Builder.positionAtEnd(CheckBB);\n+\n+ auto CachedPtr =\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\n+ CachedPtr.setAlignment(8);\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\n+ auto IsNull = Builder.createIsNull(CachedPtr);\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\n+\n+ Builder.positionAtEnd(ResolveBB);\n+ auto FPtr = Builder.createCall(\n+ Context.getIntrinsic(\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\n+ {Context.Int32Ty}, false)),\n+ {LLContext.getInt32(FuncIndex)});\n+ auto Store = Builder.createStore(FPtr, CacheVar);\n+ Store.setAlignment(8);\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\n+ Builder.createBr(CallBB);\n+\n+ Builder.positionAtEnd(CallBB);\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\n+\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\n+ }\n+ } else {\n+ Ret = Builder.createCall(Function, Args);\n+ }\n+\n+ Ret.setMustTailCall();\n auto Ty = Ret.getType();\n if (Ty.isVoidTy()) {\n Builder.createRetVoid();\n@@ -4432,6 +4562,7 @@ class FunctionCompiler {\n \n auto FPtrRet =\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\n+ FPtrRet.setMustTailCall();\n if (RetSize == 0) {\n Builder.createRetVoid();\n } else {\n@@ -4608,6 +4739,7 @@ class FunctionCompiler {\n \n auto FPtrRet =\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\n+ FPtrRet.setMustTailCall();\n if (RetSize == 0) {\n Builder.createRetVoid();\n } else {\n@@ -5854,6 +5986,7 @@ class FunctionCompiler {\n Control &operator=(const Control &) = default;\n Control &operator=(Control &&) = default;\n };\n+ bool IsLazyJIT;\n std::vector<Control> ControlStack;\n LLVM::FunctionCallee F;\n LLVM::Value ExecCtx;\n@@ -5894,6 +6027,84 @@ Expect<void> Compiler::checkConfigure() noexcept {\n return {};\n }\n \n+Expect<void> Compiler::optimize(LLVM::Module &LLModule,\n+ LLVM::TargetMachine &TM) noexcept {\n+ spdlog::info(\"optimize start\"sv);\n+ auto Triple = LLModule.getTarget();\n+ auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\n+ if (ErrorMessage) {\n+ spdlog::error(\"getFromTriple failed:{}\"sv, ErrorMessage.string_view());\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ std::string CPUName;\n+#if defined(__riscv) && __riscv_xlen == 64\n+ CPUName = \"generic-rv64\"s;\n+#else\n+ if (!Conf.getCompilerConfigure().isGenericBinary()) {\n+ CPUName = LLVM::getHostCPUName().string_view();\n+ } else {\n+ CPUName = \"generic\"s;\n+ }\n+#endif\n+\n+ // On RISC-V we use generic-rv64 as the CPU, so also use default\n+ // features; host features under QEMU can be inconsistent (e.g.\n+ // zvl*b without v) which LLVM >= 20 rejects.\n+ TM = LLVM::TargetMachine::create(\n+ TheTarget, Triple, CPUName.c_str(),\n+#if defined(__riscv) && __riscv_xlen == 64\n+ \"\",\n+#else\n+ LLVM::getHostCPUFeatures().unwrap(),\n+#endif\n+ toLLVMCodeGenLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n+ LLVMRelocPIC, LLVMCodeModelDefault);\n+\n+#if LLVM_VERSION_MAJOR >= 13\n+ auto PBO = LLVM::PassBuilderOptions::create();\n+ if (auto Error = PBO.runPasses(\n+ LLModule,\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n+ TM)) {\n+ spdlog::error(\"{}\"sv, Error.message().string_view());\n+ }\n+#else\n+ auto FP = LLVM::PassManager::createForModule(LLModule);\n+ auto MP = LLVM::PassManager::create();\n+\n+ TM.addAnalysisPasses(MP);\n+ TM.addAnalysisPasses(FP);\n+ {\n+ auto PMB = LLVM::PassManagerBuilder::create();\n+ auto [OptLevel, SizeLevel] =\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\n+ PMB.setOptLevel(OptLevel);\n+ PMB.setSizeLevel(SizeLevel);\n+ PMB.populateFunctionPassManager(FP);\n+ PMB.populateModulePassManager(MP);\n+ }\n+ switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\n+ case CompilerConfigure::OptimizationLevel::O0:\n+ case CompilerConfigure::OptimizationLevel::O1:\n+ FP.addTailCallEliminationPass();\n+ break;\n+ default:\n+ break;\n+ }\n+\n+ FP.initializeFunctionPassManager();\n+ for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\n+ FP.runFunctionPassManager(Fn);\n+ }\n+ FP.finalizeFunctionPassManager();\n+ MP.runPassManager(LLModule);\n+#endif\n+\n+ spdlog::info(\"optimize done\"sv);\n+ return {};\n+}\n+\n Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n // Check that the module is validated.\n if (unlikely(!Module.getIsValidated())) {\n@@ -5913,15 +6124,7 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n \n CompileContext NewContext(LLContext, LLModule,\n Conf.getCompilerConfigure().isGenericBinary());\n- struct RAIICleanup {\n- RAIICleanup(CompileContext *&Context, CompileContext &NewContext)\n- : Context(Context) {\n- Context = &NewContext;\n- }\n- ~RAIICleanup() { Context = nullptr; }\n- CompileContext *&Context;\n- };\n- RAIICleanup Cleanup(Context, NewContext);\n+ RAIICleanup Cleanup(Context, &NewContext);\n \n // Compile Function Types\n compile(Module.getTypeSection());\n@@ -5942,81 +6145,8 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n spdlog::info(\"verify start\"sv);\n LLModule.verify(LLVMPrintMessageAction);\n \n- spdlog::info(\"optimize start\"sv);\n auto &TM = D.extract().TM;\n- {\n- auto Triple = LLModule.getTarget();\n- auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\n- if (ErrorMessage) {\n- spdlog::error(\"getFromTriple failed:{}\"sv, ErrorMessage.string_view());\n- return Unexpect(ErrCode::Value::IllegalPath);\n- } else {\n- std::string CPUName;\n-#if defined(__riscv) && __riscv_xlen == 64\n- CPUName = \"generic-rv64\"s;\n-#else\n- if (!Conf.getCompilerConfigure().isGenericBinary()) {\n- CPUName = LLVM::getHostCPUName().string_view();\n- } else {\n- CPUName = \"generic\"s;\n- }\n-#endif\n-\n- // On RISC-V we use generic-rv64 as the CPU, so also use default\n- // features; host features under QEMU can be inconsistent (e.g.\n- // zvl*b without v) which LLVM >= 20 rejects.\n- TM = LLVM::TargetMachine::create(\n- TheTarget, Triple, CPUName.c_str(),\n-#if defined(__riscv) && __riscv_xlen == 64\n- \"\",\n-#else\n- LLVM::getHostCPUFeatures().unwrap(),\n-#endif\n- toLLVMCodeGenLevel(\n- Conf.getCompilerConfigure().getOptimizationLevel()),\n- LLVMRelocPIC, LLVMCodeModelDefault);\n- }\n-\n-#if LLVM_VERSION_MAJOR >= 13\n- auto PBO = LLVM::PassBuilderOptions::create();\n- if (auto Error = PBO.runPasses(\n- LLModule,\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n- TM)) {\n- spdlog::error(\"{}\"sv, Error.message().string_view());\n- }\n-#else\n- auto FP = LLVM::PassManager::createForModule(LLModule);\n- auto MP = LLVM::PassManager::create();\n-\n- TM.addAnalysisPasses(MP);\n- TM.addAnalysisPasses(FP);\n- {\n- auto PMB = LLVM::PassManagerBuilder::create();\n- auto [OptLevel, SizeLevel] =\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\n- PMB.setOptLevel(OptLevel);\n- PMB.setSizeLevel(SizeLevel);\n- PMB.populateFunctionPassManager(FP);\n- PMB.populateModulePassManager(MP);\n- }\n- switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\n- case CompilerConfigure::OptimizationLevel::O0:\n- case CompilerConfigure::OptimizationLevel::O1:\n- FP.addTailCallEliminationPass();\n- break;\n- default:\n- break;\n- }\n-\n- FP.initializeFunctionPassManager();\n- for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\n- FP.runFunctionPassManager(Fn);\n- }\n- FP.finalizeFunctionPassManager();\n- MP.runPassManager(LLModule);\n-#endif\n- }\n+ EXPECTED_TRY(optimize(LLModule, TM));\n \n // Set initializer for constant value\n if (auto IntrinsicsTable = LLModule.getNamedGlobal(\"intrinsics\")) {\n@@ -6031,12 +6161,11 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n LLVM::Value::getConstNull(IntrinsicsTableTy), \"intrinsics\");\n }\n-\n- spdlog::info(\"optimize done\"sv);\n return Expect<Data>{std::move(D)};\n }\n \n-void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n+void Compiler::compile(const AST::TypeSection &TypeSec,\n+ bool DeclarationsOnly) noexcept {\n auto WrapperTy =\n LLVM::Type::getFunctionType(Context->VoidTy,\n {Context->ExecCtxPtrTy, Context->Int8PtrTy,\n@@ -6050,10 +6179,25 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n Context->CompositeTypes.reserve(Size);\n Context->FunctionWrappers.reserve(Size);\n \n+ auto SetFuncAttributes = [&](auto FDecl) {\n+ FDecl.setVisibility(LLVMProtectedVisibility);\n+ FDecl.setDSOLocal(true);\n+ FDecl.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ FDecl.addFnAttr(Context->NoStackArgProbe);\n+ FDecl.addFnAttr(Context->StrictFP);\n+ FDecl.addFnAttr(Context->UWTable);\n+ FDecl.addParamAttr(0, Context->ReadOnly);\n+ FDecl.addParamAttr(0, Context->NoAlias);\n+ FDecl.addParamAttr(1, Context->NoAlias);\n+ FDecl.addParamAttr(2, Context->NoAlias);\n+ FDecl.addParamAttr(3, Context->NoAlias);\n+ };\n+\n // Iterate and compile types.\n for (size_t I = 0; I < Size; ++I) {\n const auto &CompType = SubTypes[I].getCompositeType();\n- const auto Name = fmt::format(\"t{}\"sv, Context->CompositeTypes.size());\n+ const auto Name =\n+ fmt::format(\"{}t{}\"sv, Context->Prefix, Context->CompositeTypes.size());\n if (CompType.isFunc()) {\n // Check that the function type is unique.\n {\n@@ -6065,13 +6209,21 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n if (OldFuncType == CompType.getFuncType()) {\n Unique = false;\n Context->CompositeTypes.push_back(Context->CompositeTypes[J]);\n- auto F = Context->FunctionWrappers[J];\n- Context->FunctionWrappers.push_back(F);\n- auto A = Context->LLModule.addAlias(WrapperTy, F, Name.c_str());\n- A.setLinkage(LLVMExternalLinkage);\n- A.setVisibility(LLVMProtectedVisibility);\n- A.setDSOLocal(true);\n- A.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ if (DeclarationsOnly) {\n+ auto FDecl = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n+ SetFuncAttributes(FDecl);\n+ Context->FunctionWrappers.push_back(FDecl);\n+ } else {\n+ auto F = Context->FunctionWrappers[J];\n+ Context->FunctionWrappers.push_back(F);\n+ auto A = Context->LLModule.get().addAlias(WrapperTy, F,\n+ Name.c_str());\n+ A.setLinkage(LLVMExternalLinkage);\n+ A.setVisibility(LLVMProtectedVisibility);\n+ A.setDSOLocal(true);\n+ A.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ }\n break;\n }\n }\n@@ -6082,81 +6234,66 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n }\n \n // Create Wrapper\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\n- Name.c_str());\n+ auto F = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n {\n- F.setVisibility(LLVMProtectedVisibility);\n- F.setDSOLocal(true);\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\n- F.addFnAttr(Context->NoStackArgProbe);\n- F.addFnAttr(Context->StrictFP);\n- F.addFnAttr(Context->UWTable);\n- F.addParamAttr(0, Context->ReadOnly);\n- F.addParamAttr(0, Context->NoAlias);\n- F.addParamAttr(1, Context->NoAlias);\n- F.addParamAttr(2, Context->NoAlias);\n- F.addParamAttr(3, Context->NoAlias);\n-\n- LLVM::Builder Builder(Context->LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n-\n- auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\n- CompType.getFuncType());\n- auto RTy = FTy.getReturnType();\n- std::vector<LLVM::Type> FPTy(FTy.getNumParams());\n- FTy.getParamTypes(FPTy);\n-\n- const size_t ArgCount = FPTy.size() - 1;\n- auto ExecCtxPtr = F.getFirstParam();\n- auto RawFunc = LLVM::FunctionCallee{\n- FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\n- FTy.getPointerTo())};\n- auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\n- auto RawRets = RawArgs.getNextParam();\n-\n- std::vector<LLVM::Value> Args;\n- Args.reserve(FTy.getNumParams());\n- Args.push_back(ExecCtxPtr);\n- for (size_t J = 0; J < ArgCount; ++J) {\n- Args.push_back(Builder.createValuePtrLoad(\n- FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\n- }\n+ SetFuncAttributes(F);\n+\n+ if (!DeclarationsOnly) {\n+ LLVM::Builder Builder(Context->LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n+\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\n+ CompType.getFuncType());\n+ auto RTy = FTy.getReturnType();\n+ std::vector<LLVM::Type> FPTy(FTy.getNumParams());\n+ FTy.getParamTypes(FPTy);\n+\n+ const size_t ArgCount = FPTy.size() - 1;\n+ auto ExecCtxPtr = F.getFirstParam();\n+ auto RawFunc = LLVM::FunctionCallee{\n+ FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\n+ FTy.getPointerTo())};\n+ auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\n+ auto RawRets = RawArgs.getNextParam();\n+\n+ std::vector<LLVM::Value> Args;\n+ Args.reserve(FTy.getNumParams());\n+ Args.push_back(ExecCtxPtr);\n+ for (size_t J = 0; J < ArgCount; ++J) {\n+ Args.push_back(Builder.createValuePtrLoad(\n+ FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\n+ }\n \n- auto Ret = Builder.createCall(RawFunc, Args);\n- if (RTy.isVoidTy()) {\n- // nothing to do\n- } else if (RTy.isStructTy()) {\n- auto Rets = unpackStruct(Builder, Ret);\n- Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty, kValSize);\n- } else {\n- Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\n+ auto Ret = Builder.createCall(RawFunc, Args);\n+ if (RTy.isVoidTy()) {\n+ // nothing to do\n+ } else if (RTy.isStructTy()) {\n+ auto Rets = unpackStruct(Builder, Ret);\n+ Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty,\n+ kValSize);\n+ } else {\n+ Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\n+ }\n+ Builder.createRetVoid();\n }\n- Builder.createRetVoid();\n }\n // Copy wrapper, param and return lists to module instance.\n Context->FunctionWrappers.push_back(F);\n } else {\n // Non function type case. Create empty wrapper.\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\n- Name.c_str());\n+ auto F = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n {\n- F.setVisibility(LLVMProtectedVisibility);\n- F.setDSOLocal(true);\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\n- F.addFnAttr(Context->NoStackArgProbe);\n- F.addFnAttr(Context->StrictFP);\n- F.addFnAttr(Context->UWTable);\n- F.addParamAttr(0, Context->ReadOnly);\n- F.addParamAttr(0, Context->NoAlias);\n- F.addParamAttr(1, Context->NoAlias);\n- F.addParamAttr(2, Context->NoAlias);\n- F.addParamAttr(3, Context->NoAlias);\n-\n- LLVM::Builder Builder(Context->LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n- Builder.createRetVoid();\n+ SetFuncAttributes(F);\n+\n+ if (!DeclarationsOnly) {\n+ LLVM::Builder Builder(Context->LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n+ Builder.createRetVoid();\n+ }\n }\n Context->FunctionWrappers.push_back(F);\n }\n@@ -6184,9 +6321,9 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\n toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n auto RTy = FTy.getReturnType();\n auto F = LLVM::FunctionCallee{\n- FTy,\n- Context->LLModule.addFunction(FTy, LLVMInternalLinkage,\n- fmt::format(\"f{}\"sv, FuncID).c_str())};\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMInternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n F.Fn.setDSOLocal(true);\n F.Fn.addFnAttr(Context->NoStackArgProbe);\n F.Fn.addFnAttr(Context->StrictFP);\n@@ -6231,6 +6368,7 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\n }\n \n Context->Functions.emplace_back(TypeIdx, F, nullptr);\n+ Context->ImportCount++;\n break;\n }\n case ExternalType::Table: // Table type\n@@ -6313,9 +6451,10 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n const auto FuncID = Context->Functions.size();\n auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n- LLVM::FunctionCallee F = {FTy, Context->LLModule.addFunction(\n- FTy, LLVMExternalLinkage,\n- fmt::format(\"f{}\"sv, FuncID).c_str())};\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n F.Fn.setVisibility(LLVMProtectedVisibility);\n F.Fn.setDSOLocal(true);\n F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n@@ -6339,10 +6478,11 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n Locals.push_back(Local.second);\n }\n }\n- FunctionCompiler FC(*Context, F, Locals,\n- Conf.getCompilerConfigure().isInterruptible(),\n- Conf.getStatisticsConfigure().isInstructionCounting(),\n- Conf.getStatisticsConfigure().isCostMeasuring());\n+ FunctionCompiler FC(\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\n auto Type = Context->resolveBlockType(T);\n EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n F.Fn.eliminateUnreachableBlocks();\n@@ -6350,5 +6490,235 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n return {};\n }\n \n+void Compiler::compileFunctionDeclarations(\n+ const AST::FunctionSection &FunctionSec,\n+ const AST::CodeSection &CodeSec) noexcept {\n+ const auto &TypeIdxs = FunctionSec.getContent();\n+ const auto &CodeSegs = CodeSec.getContent();\n+ assuming(TypeIdxs.size() == CodeSegs.size());\n+\n+ for (size_t I = 0; I < CodeSegs.size(); ++I) {\n+ const auto &TypeIdx = TypeIdxs[I];\n+ const auto &Code = CodeSegs[I];\n+ assuming(TypeIdx < Context->CompositeTypes.size());\n+ assuming(Context->CompositeTypes[TypeIdx]->isFunc());\n+ const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n+ const auto FuncID = Context->Functions.size();\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n+ F.Fn.setVisibility(LLVMProtectedVisibility);\n+ F.Fn.setDSOLocal(true);\n+ F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ F.Fn.addFnAttr(Context->NoStackArgProbe);\n+ F.Fn.addFnAttr(Context->StrictFP);\n+ F.Fn.addFnAttr(Context->UWTable);\n+ F.Fn.addParamAttr(0, Context->ReadOnly);\n+ F.Fn.addParamAttr(0, Context->NoAlias);\n+\n+ Context->Functions.emplace_back(TypeIdx, F, &Code);\n+ }\n+}\n+\n+Expect<void> Compiler::compileFunctionBody(uint32_t LocalFuncIndex) noexcept {\n+ // Find the function in the Functions list\n+ // LocalFuncIndex is relative to the defined functions (not imports)\n+ uint32_t GlobalFuncIndex = Context->ImportCount + LocalFuncIndex;\n+ if (GlobalFuncIndex >= Context->Functions.size()) {\n+ spdlog::error(\"[lazy-jit]: function index {} out of range\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ auto &[T, F, Code] = Context->Functions[GlobalFuncIndex];\n+ if (!Code) {\n+ spdlog::error(\"[lazy-jit]: cannot compile import function {}\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ // Check if already compiled (function has basic blocks)\n+ if (F.Fn.countBasicBlocks() > 0) {\n+ spdlog::debug(\"[lazy-jit]: function {} already compiled\"sv, LocalFuncIndex);\n+ return {};\n+ }\n+\n+ spdlog::debug(\"[lazy-jit]: compiling function {}\"sv, LocalFuncIndex);\n+\n+ std::vector<ValType> Locals;\n+ for (const auto &Local : Code->getLocals()) {\n+ for (unsigned I = 0; I < Local.first; ++I) {\n+ Locals.push_back(Local.second);\n+ }\n+ }\n+\n+ FunctionCompiler FC(\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\n+ auto Type = Context->resolveBlockType(T);\n+ EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n+ F.Fn.eliminateUnreachableBlocks();\n+\n+ return {};\n+}\n+\n+Expect<std::pair<LLVM::Data,\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter>>>\n+LLVM::Compiler::compileInfrastructure(const AST::Module &Module,\n+ std::string Prefix) noexcept {\n+ Data D;\n+ D.setPrefix(Prefix);\n+ // Check the module is validated.\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ spdlog::info(\"[lazy-jit]: compile infrastructure start\"sv);\n+\n+ auto LLContext = D.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = D.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ std::unique_ptr<CompileContext, CompileContextDeleter> NewContext(\n+ new CompileContext(LLContext, LLModule,\n+ Conf.getCompilerConfigure().isGenericBinary(),\n+ D.getPrefix()));\n+ RAIICleanup Cleanup(this->Context, NewContext.get());\n+\n+ // Compile Function Types\n+ compile(Module.getTypeSection());\n+ // Compile ImportSection\n+ compile(Module.getImportSection());\n+ // Compile GlobalSection\n+ compile(Module.getGlobalSection());\n+ // Compile MemorySection (MemorySec, DataSec)\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ // Compile TableSection (TableSec, ElemSec)\n+ compile(Module.getTableSection(), Module.getElementSection());\n+ // Create function declarations without compiling bodies\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+ // Compile ExportSection\n+ compile(Module.getExportSection());\n+\n+ // Set initializer for constant value\n+ auto IntrinsicsName = fmt::format(\"{}intrinsics\"sv, D.getPrefix());\n+ if (auto IntrinsicsTable = LLModule.getNamedGlobal(IntrinsicsName.c_str())) {\n+ IntrinsicsTable.setInitializer(\n+ LLVM::Value::getConstNull(IntrinsicsTable.getType()));\n+ IntrinsicsTable.setGlobalConstant(false);\n+ } else {\n+ auto IntrinsicsTableTy = LLVM::Type::getArrayType(\n+ LLContext.getInt8Ty().getPointerTo(),\n+ static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax));\n+ LLModule.addGlobal(\n+ IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n+ LLVM::Value::getConstNull(IntrinsicsTableTy), IntrinsicsName.c_str());\n+ }\n+ LLModule.verify(LLVMPrintMessageAction);\n+\n+ spdlog::info(\"[lazy-jit]: infrastructure compilation done\"sv);\n+\n+ return Expect<\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>>{\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>{\n+ std::move(D), std::move(NewContext)}};\n+}\n+\n+Expect<LLVM::Data>\n+Compiler::compileFunctions(Data &&LLData, CompileContext *NewContext,\n+ const AST::Module &Module,\n+ Span<const uint32_t> LocalFuncIndices) noexcept {\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+ if (unlikely(LocalFuncIndices.empty())) {\n+ spdlog::error(\"[lazy-jit]: compileFunctions with empty index list\"sv);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ std::vector<uint32_t> Sorted(LocalFuncIndices.begin(),\n+ LocalFuncIndices.end());\n+ std::sort(Sorted.begin(), Sorted.end());\n+ Sorted.erase(std::unique(Sorted.begin(), Sorted.end()), Sorted.end());\n+\n+ spdlog::debug(\"[lazy-jit]: compile functions batch ({}) start\"sv,\n+ Sorted.size());\n+\n+ auto LLContext = LLData.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = LLData.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ RAIICleanup Cleanup(this->Context, NewContext);\n+ Context->LLModule = LLModule;\n+\n+ Context->CompositeTypes.clear();\n+ Context->FunctionWrappers.clear();\n+ Context->Functions.clear();\n+ Context->LazyJITCacheVars.clear();\n+ Context->ImportCount = 0;\n+ Context->MemoryAddrTypes.clear();\n+ Context->TableAddrTypes.clear();\n+ Context->Globals.clear();\n+\n+ Context->IntrinsicsTable = LLModule.addGlobal(\n+ Context->IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\n+ fmt::format(\"{}intrinsics\"sv, Context->Prefix).c_str());\n+ Context->IntrinsicsTable.setInitializer(LLVM::Value());\n+ Context->Trap.Ty =\n+ LLVM::Type::getFunctionType(Context->VoidTy, {Context->Int32Ty});\n+ Context->Trap.Fn =\n+ LLModule.addFunction(Context->Trap.Ty, LLVMPrivateLinkage, \"trap\");\n+ Context->Trap.Fn.setDSOLocal(true);\n+ Context->Trap.Fn.addFnAttr(Context->NoStackArgProbe);\n+ Context->Trap.Fn.addFnAttr(Context->StrictFP);\n+ Context->Trap.Fn.addFnAttr(Context->UWTable);\n+ Context->Trap.Fn.addFnAttr(Context->NoReturn);\n+ Context->Trap.Fn.addFnAttr(Context->Cold);\n+ Context->Trap.Fn.addFnAttr(Context->NoInline);\n+ Context->compileTrap();\n+\n+ compile(Module.getTypeSection(), true);\n+ compile(Module.getImportSection());\n+ compile(Module.getGlobalSection());\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ compile(Module.getTableSection(), Module.getElementSection());\n+\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+\n+ for (uint32_t FuncIndex : Sorted) {\n+ EXPECTED_TRY(compileFunctionBody(FuncIndex));\n+ }\n+\n+ spdlog::info(\"[lazy-jit]: verify batch ({} funcs) start\"sv, Sorted.size());\n+ LLModule.verify(LLVMPrintMessageAction);\n+ spdlog::info(\"[lazy-jit]: verify batch ({} funcs) done\"sv, Sorted.size());\n+\n+ auto &TM = LLData.extract().TM;\n+ EXPECTED_TRY(optimize(LLModule, TM));\n+\n+ spdlog::debug(\"[lazy-jit]: compile functions batch ({}) done\"sv,\n+ Sorted.size());\n+ return Expect<Data>{std::move(LLData)};\n+}\n+\n+void LLVM::Compiler::CompileContextDeleter::operator()(\n+ CompileContext *Context) const noexcept {\n+ delete Context;\n+}\n } // namespace LLVM\n } // namespace WasmEdge\n"},"changed_files":{"kind":"list like","value":["lib/llvm/compiler.cpp"],"string":"[\n \"lib/llvm/compiler.cpp\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"It seems like you don't call the `LLModule.verify()` inside `compileInfrastructure`?","path":"lib/llvm/compiler.cpp","hunk":"@@ -6342,13 +6498,255 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n FunctionCompiler FC(*Context, F, Locals,\n Conf.getCompilerConfigure().isInterruptible(),\n Conf.getStatisticsConfigure().isInstructionCounting(),\n- Conf.getStatisticsConfigure().isCostMeasuring());\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().isEnableLazyJIT());\n auto Type = Context->resolveBlockType(T);\n EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n F.Fn.eliminateUnreachableBlocks();\n }\n return {};\n }\n \n+void Compiler::compileFunctionDeclarations(\n+ const AST::FunctionSection &FunctionSec,\n+ const AST::CodeSection &CodeSec) noexcept {\n+ const auto &TypeIdxs = FunctionSec.getContent();\n+ const auto &CodeSegs = CodeSec.getContent();\n+ assuming(TypeIdxs.size() == CodeSegs.size());\n+\n+ for (size_t I = 0; I < CodeSegs.size(); ++I) {\n+ const auto &TypeIdx = TypeIdxs[I];\n+ const auto &Code = CodeSegs[I];\n+ assuming(TypeIdx < Context->CompositeTypes.size());\n+ assuming(Context->CompositeTypes[TypeIdx]->isFunc());\n+ const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n+ const auto FuncID = Context->Functions.size();\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n+ F.Fn.setVisibility(LLVMProtectedVisibility);\n+ F.Fn.setDSOLocal(true);\n+ F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ F.Fn.addFnAttr(Context->NoStackArgProbe);\n+ F.Fn.addFnAttr(Context->StrictFP);\n+ F.Fn.addFnAttr(Context->UWTable);\n+ F.Fn.addParamAttr(0, Context->ReadOnly);\n+ F.Fn.addParamAttr(0, Context->NoAlias);\n+\n+ Context->Functions.emplace_back(TypeIdx, F, &Code);\n+ }\n+}\n+\n+Expect<void> Compiler::compileFunctionBody(uint32_t LocalFuncIndex) noexcept {\n+ // Find the function in the Functions list\n+ // LocalFuncIndex is relative to the defined functions (not imports)\n+ uint32_t ImportCount = 0;\n+ for (const auto &[T, F, Code] : Context->Functions) {\n+ if (!Code) {\n+ ImportCount++;\n+ }\n+ }\n+\n+ uint32_t GlobalFuncIndex = ImportCount + LocalFuncIndex;\n+ if (GlobalFuncIndex >= Context->Functions.size()) {\n+ spdlog::error(\"[lazy-jit]: function index {} out of range\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ auto &[T, F, Code] = Context->Functions[GlobalFuncIndex];\n+ if (!Code) {\n+ spdlog::error(\"[lazy-jit]: cannot compile import function {}\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ // Check if already compiled (function has basic blocks)\n+ if (F.Fn.countBasicBlocks() > 0) {\n+ spdlog::debug(\"[lazy-jit]: function {} already compiled\"sv, LocalFuncIndex);\n+ return {};\n+ }\n+\n+ spdlog::debug(\"[lazy-jit]: compiling function {}\"sv, LocalFuncIndex);\n+\n+ std::vector<ValType> Locals;\n+ for (const auto &Local : Code->getLocals()) {\n+ for (unsigned I = 0; I < Local.first; ++I) {\n+ Locals.push_back(Local.second);\n+ }\n+ }\n+\n+ FunctionCompiler FC(*Context, F, Locals,\n+ Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().isEnableLazyJIT());\n+ auto Type = Context->resolveBlockType(T);\n+ EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n+ F.Fn.eliminateUnreachableBlocks();\n+\n+ return {};\n+}\n+\n+Expect<std::pair<LLVM::Data,\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter>>>\n+LLVM::Compiler::compileInfrastructure(const AST::Module &Module,\n+ std::string Prefix) noexcept {\n+ Data D;\n+ D.setPrefix(Prefix);\n+ // Check the module is validated.\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ spdlog::info(\"[lazyjit]: compile infrastructure start\"sv);\n+\n+ auto LLContext = D.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = D.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ std::unique_ptr<CompileContext, CompileContextDeleter> NewContext(\n+ new CompileContext(LLContext, LLModule,\n+ Conf.getCompilerConfigure().isGenericBinary(),\n+ D.getPrefix()));\n+ this->Context = NewContext.get();\n+\n+ // Compile Function Types\n+ compile(Module.getTypeSection());\n+ // Compile ImportSection\n+ compile(Module.getImportSection());\n+ // Compile GlobalSection\n+ compile(Module.getGlobalSection());\n+ // Compile MemorySection (MemorySec, DataSec)\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ // Compile TableSection (TableSec, ElemSec)\n+ compile(Module.getTableSection(), Module.getElementSection());\n+ // Create function declarations without compiling bodies\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+ // Compile ExportSection\n+ compile(Module.getExportSection());\n+\n+ // Set initializer for constant value\n+ auto IntrinsicsName = fmt::format(\"{}intrinsics\"sv, D.getPrefix());\n+ if (auto IntrinsicsTable = LLModule.getNamedGlobal(IntrinsicsName.c_str())) {\n+ IntrinsicsTable.setInitializer(\n+ LLVM::Value::getConstNull(IntrinsicsTable.getType()));\n+ IntrinsicsTable.setGlobalConstant(false);\n+ } else {\n+ auto IntrinsicsTableTy = LLVM::Type::getArrayType(\n+ LLContext.getInt8Ty().getPointerTo(),\n+ static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax));\n+ LLModule.addGlobal(\n+ IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n+ LLVM::Value::getConstNull(IntrinsicsTableTy), IntrinsicsName.c_str());\n+ }\n+\n+ spdlog::info(\"[lazyjit]: infrastructure compilation done\"sv);","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp\nindex 39da94d9a9ac..330e245f51c3 100644\n--- a/lib/llvm/compiler.cpp\n+++ b/lib/llvm/compiler.cpp\n@@ -9,6 +9,7 @@\n #include \"common/spdlog.h\"\n #include \"data.h\"\n #include \"llvm.h\"\n+#include \"spdlog/spdlog.h\"\n #include \"system/allocator.h\"\n \n #include <algorithm>\n@@ -16,6 +17,7 @@\n #include <cinttypes>\n #include <cstdint>\n #include <cstdlib>\n+#include <functional>\n #include <limits>\n #include <memory>\n #include <numeric>\n@@ -28,6 +30,16 @@ using namespace std::literals;\n \n namespace {\n \n+struct RAIICleanup {\n+ RAIICleanup(LLVM::Compiler::CompileContext *&Context,\n+ LLVM::Compiler::CompileContext *NewContext)\n+ : Context(Context) {\n+ Context = NewContext;\n+ }\n+ ~RAIICleanup() { Context = nullptr; }\n+ LLVM::Compiler::CompileContext *&Context;\n+};\n+\n static bool\n isVoidReturn(WasmEdge::Span<const WasmEdge::ValType> ValTypes) noexcept;\n static LLVM::Type toLLVMType(LLVM::Context LLContext,\n@@ -128,7 +140,7 @@ static inline LLVMCodeGenOptLevel toLLVMCodeGenLevel(\n \n struct LLVM::Compiler::CompileContext {\n LLVM::Context LLContext;\n- LLVM::Module &LLModule;\n+ std::reference_wrapper<LLVM::Module> LLModule;\n LLVM::Attribute Cold;\n LLVM::Attribute NoAlias;\n LLVM::Attribute NoInline;\n@@ -202,13 +214,16 @@ struct LLVM::Compiler::CompileContext {\n std::vector<std::tuple<uint32_t, LLVM::FunctionCallee,\n const WasmEdge::AST::CodeSegment *>>\n Functions;\n+ std::vector<LLVM::Value> LazyJITCacheVars;\n+ uint32_t ImportCount = 0;\n std::vector<LLVM::Type> MemoryAddrTypes;\n std::vector<LLVM::Type> TableAddrTypes;\n std::vector<LLVM::Type> Globals;\n+ std::string Prefix;\n LLVM::Value IntrinsicsTable;\n LLVM::FunctionCallee Trap;\n- CompileContext(LLVM::Context C, LLVM::Module &M,\n- bool IsGenericBinary) noexcept\n+ CompileContext(LLVM::Context C, LLVM::Module &M, bool IsGenericBinary,\n+ std::string_view P = \"\"sv) noexcept\n : LLContext(C), LLModule(M),\n Cold(LLVM::Attribute::createEnum(C, LLVM::Core::Cold, 0)),\n NoAlias(LLVM::Attribute::createEnum(C, LLVM::Core::NoAlias, 0)),\n@@ -256,14 +271,14 @@ struct LLVM::Compiler::CompileContext {\n })),\n ExecCtxPtrTy(ExecCtxTy.getPointerTo()),\n IntrinsicsTableTy(LLVM::Type::getArrayType(\n- Int8PtrTy,\n+ Int8Ty.getPointerTo(),\n static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax))),\n- IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()),\n- IntrinsicsTable(LLModule.addGlobal(IntrinsicsTablePtrTy, true,\n- LLVMExternalLinkage, LLVM::Value(),\n- \"intrinsics\")) {\n+ IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()), Prefix(P),\n+ IntrinsicsTable(LLModule.get().addGlobal(\n+ IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\n+ fmt::format(\"{}intrinsics\"sv, Prefix).c_str())) {\n Trap.Ty = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n- Trap.Fn = LLModule.addFunction(Trap.Ty, LLVMPrivateLinkage, \"trap\");\n+ Trap.Fn = LLModule.get().addFunction(Trap.Ty, LLVMPrivateLinkage, \"trap\");\n Trap.Fn.setDSOLocal(true);\n Trap.Fn.addFnAttr(NoStackArgProbe);\n Trap.Fn.addFnAttr(StrictFP);\n@@ -272,9 +287,10 @@ struct LLVM::Compiler::CompileContext {\n Trap.Fn.addFnAttr(Cold);\n Trap.Fn.addFnAttr(NoInline);\n \n- LLModule.addGlobal(Int32Ty, true, LLVMExternalLinkage,\n- LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\n- \"version\");\n+ LLModule.get().addGlobal(\n+ Int32Ty, true, LLVMExternalLinkage,\n+ LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\n+ fmt::format(\"{}version\"sv, Prefix).c_str());\n \n if (!IsGenericBinary) {\n SubtargetFeatures = LLVM::getHostCPUFeatures();\n@@ -313,18 +329,7 @@ struct LLVM::Compiler::CompileContext {\n }\n }\n \n- {\n- // create trap\n- LLVM::Builder Builder(LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(LLContext, Trap.Fn, \"entry\"));\n- auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n- auto CallTrap = Builder.createCall(\n- getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\n- {Trap.Fn.getFirstParam()});\n- CallTrap.addCallSiteAttribute(NoReturn);\n- Builder.createUnreachable();\n- }\n+ compileTrap();\n }\n LLVM::Value getMemory(LLVM::Builder &Builder, LLVM::Value ExecCtx,\n uint32_t Index) noexcept {\n@@ -394,6 +399,17 @@ struct LLVM::Compiler::CompileContext {\n auto Ptr = Builder.createBitCast(VPtr, PtrPtrTy);\n return {Ty, Builder.createLoad(PtrTy, Ptr)};\n }\n+ void compileTrap() noexcept {\n+ LLVM::Builder Builder(LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(LLContext, Trap.Fn, \"entry\"));\n+ auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\n+ auto CallTrap = Builder.createCall(\n+ getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\n+ {Trap.Fn.getFirstParam()});\n+ CallTrap.addCallSiteAttribute(NoReturn);\n+ Builder.createUnreachable();\n+ }\n std::pair<std::vector<ValType>, std::vector<ValType>>\n resolveBlockType(const BlockType &BType) const noexcept {\n using VecT = std::vector<ValType>;\n@@ -544,9 +560,10 @@ class FunctionCompiler {\n FunctionCompiler(LLVM::Compiler::CompileContext &Context,\n LLVM::FunctionCallee F, Span<const ValType> Locals,\n bool Interruptible, bool InstructionCounting,\n- bool GasMeasuring) noexcept\n+ bool GasMeasuring, bool IsLazyJIT) noexcept\n : Context(Context), LLContext(Context.LLContext),\n- Interruptible(Interruptible), F(F), Builder(LLContext) {\n+ Interruptible(Interruptible), IsLazyJIT(IsLazyJIT), F(F),\n+ Builder(LLContext) {\n if (F.Fn) {\n Builder.positionAtEnd(LLVM::BasicBlock::create(LLContext, F.Fn, \"entry\"));\n ExecCtx = Builder.createLoad(Context.ExecCtxTy, F.Fn.getFirstParam());\n@@ -4267,7 +4284,63 @@ class FunctionCompiler {\n Args[J + 1] = stackPop();\n }\n \n- auto Ret = Builder.createCall(Function, Args);\n+ LLVM::Value Ret;\n+ if (IsLazyJIT) {\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\n+ if (IsImport) {\n+ Ret = Builder.createCall(Function, Args);\n+ } else {\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\n+\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\n+ }\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\n+ if (!CacheVar) {\n+ CacheVar = Context.LLModule.get().addGlobal(\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \"\");\n+ }\n+\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.check\");\n+ auto ResolveBB =\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.resolve\");\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"ic.call\");\n+\n+ Builder.createBr(CheckBB);\n+ Builder.positionAtEnd(CheckBB);\n+\n+ auto CachedPtr =\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\n+ CachedPtr.setAlignment(8);\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\n+ auto IsNull = Builder.createIsNull(CachedPtr);\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\n+\n+ Builder.positionAtEnd(ResolveBB);\n+ auto FPtr = Builder.createCall(\n+ Context.getIntrinsic(\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\n+ {Context.Int32Ty}, false)),\n+ {LLContext.getInt32(FuncIndex)});\n+ auto Store = Builder.createStore(FPtr, CacheVar);\n+ Store.setAlignment(8);\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\n+ Builder.createBr(CallBB);\n+\n+ Builder.positionAtEnd(CallBB);\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\n+\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\n+ }\n+ } else {\n+ Ret = Builder.createCall(Function, Args);\n+ }\n+\n auto Ty = Ret.getType();\n if (Ty.isVoidTy()) {\n // nothing to do\n@@ -4387,7 +4460,64 @@ class FunctionCompiler {\n Args[J + 1] = stackPop();\n }\n \n- auto Ret = Builder.createCall(Function, Args);\n+ LLVM::Value Ret;\n+ if (IsLazyJIT) {\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\n+ if (IsImport) {\n+ Ret = Builder.createCall(Function, Args);\n+ } else {\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\n+\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\n+ }\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\n+ if (!CacheVar) {\n+ CacheVar = Context.LLModule.get().addGlobal(\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \"\");\n+ }\n+\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.check\");\n+ auto ResolveBB =\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.resolve\");\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \"rc.call\");\n+\n+ Builder.createBr(CheckBB);\n+ Builder.positionAtEnd(CheckBB);\n+\n+ auto CachedPtr =\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\n+ CachedPtr.setAlignment(8);\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\n+ auto IsNull = Builder.createIsNull(CachedPtr);\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\n+\n+ Builder.positionAtEnd(ResolveBB);\n+ auto FPtr = Builder.createCall(\n+ Context.getIntrinsic(\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\n+ {Context.Int32Ty}, false)),\n+ {LLContext.getInt32(FuncIndex)});\n+ auto Store = Builder.createStore(FPtr, CacheVar);\n+ Store.setAlignment(8);\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\n+ Builder.createBr(CallBB);\n+\n+ Builder.positionAtEnd(CallBB);\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\n+\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\n+ }\n+ } else {\n+ Ret = Builder.createCall(Function, Args);\n+ }\n+\n+ Ret.setMustTailCall();\n auto Ty = Ret.getType();\n if (Ty.isVoidTy()) {\n Builder.createRetVoid();\n@@ -4432,6 +4562,7 @@ class FunctionCompiler {\n \n auto FPtrRet =\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\n+ FPtrRet.setMustTailCall();\n if (RetSize == 0) {\n Builder.createRetVoid();\n } else {\n@@ -4608,6 +4739,7 @@ class FunctionCompiler {\n \n auto FPtrRet =\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\n+ FPtrRet.setMustTailCall();\n if (RetSize == 0) {\n Builder.createRetVoid();\n } else {\n@@ -5854,6 +5986,7 @@ class FunctionCompiler {\n Control &operator=(const Control &) = default;\n Control &operator=(Control &&) = default;\n };\n+ bool IsLazyJIT;\n std::vector<Control> ControlStack;\n LLVM::FunctionCallee F;\n LLVM::Value ExecCtx;\n@@ -5894,6 +6027,84 @@ Expect<void> Compiler::checkConfigure() noexcept {\n return {};\n }\n \n+Expect<void> Compiler::optimize(LLVM::Module &LLModule,\n+ LLVM::TargetMachine &TM) noexcept {\n+ spdlog::info(\"optimize start\"sv);\n+ auto Triple = LLModule.getTarget();\n+ auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\n+ if (ErrorMessage) {\n+ spdlog::error(\"getFromTriple failed:{}\"sv, ErrorMessage.string_view());\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ std::string CPUName;\n+#if defined(__riscv) && __riscv_xlen == 64\n+ CPUName = \"generic-rv64\"s;\n+#else\n+ if (!Conf.getCompilerConfigure().isGenericBinary()) {\n+ CPUName = LLVM::getHostCPUName().string_view();\n+ } else {\n+ CPUName = \"generic\"s;\n+ }\n+#endif\n+\n+ // On RISC-V we use generic-rv64 as the CPU, so also use default\n+ // features; host features under QEMU can be inconsistent (e.g.\n+ // zvl*b without v) which LLVM >= 20 rejects.\n+ TM = LLVM::TargetMachine::create(\n+ TheTarget, Triple, CPUName.c_str(),\n+#if defined(__riscv) && __riscv_xlen == 64\n+ \"\",\n+#else\n+ LLVM::getHostCPUFeatures().unwrap(),\n+#endif\n+ toLLVMCodeGenLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n+ LLVMRelocPIC, LLVMCodeModelDefault);\n+\n+#if LLVM_VERSION_MAJOR >= 13\n+ auto PBO = LLVM::PassBuilderOptions::create();\n+ if (auto Error = PBO.runPasses(\n+ LLModule,\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n+ TM)) {\n+ spdlog::error(\"{}\"sv, Error.message().string_view());\n+ }\n+#else\n+ auto FP = LLVM::PassManager::createForModule(LLModule);\n+ auto MP = LLVM::PassManager::create();\n+\n+ TM.addAnalysisPasses(MP);\n+ TM.addAnalysisPasses(FP);\n+ {\n+ auto PMB = LLVM::PassManagerBuilder::create();\n+ auto [OptLevel, SizeLevel] =\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\n+ PMB.setOptLevel(OptLevel);\n+ PMB.setSizeLevel(SizeLevel);\n+ PMB.populateFunctionPassManager(FP);\n+ PMB.populateModulePassManager(MP);\n+ }\n+ switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\n+ case CompilerConfigure::OptimizationLevel::O0:\n+ case CompilerConfigure::OptimizationLevel::O1:\n+ FP.addTailCallEliminationPass();\n+ break;\n+ default:\n+ break;\n+ }\n+\n+ FP.initializeFunctionPassManager();\n+ for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\n+ FP.runFunctionPassManager(Fn);\n+ }\n+ FP.finalizeFunctionPassManager();\n+ MP.runPassManager(LLModule);\n+#endif\n+\n+ spdlog::info(\"optimize done\"sv);\n+ return {};\n+}\n+\n Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n // Check that the module is validated.\n if (unlikely(!Module.getIsValidated())) {\n@@ -5913,15 +6124,7 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n \n CompileContext NewContext(LLContext, LLModule,\n Conf.getCompilerConfigure().isGenericBinary());\n- struct RAIICleanup {\n- RAIICleanup(CompileContext *&Context, CompileContext &NewContext)\n- : Context(Context) {\n- Context = &NewContext;\n- }\n- ~RAIICleanup() { Context = nullptr; }\n- CompileContext *&Context;\n- };\n- RAIICleanup Cleanup(Context, NewContext);\n+ RAIICleanup Cleanup(Context, &NewContext);\n \n // Compile Function Types\n compile(Module.getTypeSection());\n@@ -5942,81 +6145,8 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n spdlog::info(\"verify start\"sv);\n LLModule.verify(LLVMPrintMessageAction);\n \n- spdlog::info(\"optimize start\"sv);\n auto &TM = D.extract().TM;\n- {\n- auto Triple = LLModule.getTarget();\n- auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\n- if (ErrorMessage) {\n- spdlog::error(\"getFromTriple failed:{}\"sv, ErrorMessage.string_view());\n- return Unexpect(ErrCode::Value::IllegalPath);\n- } else {\n- std::string CPUName;\n-#if defined(__riscv) && __riscv_xlen == 64\n- CPUName = \"generic-rv64\"s;\n-#else\n- if (!Conf.getCompilerConfigure().isGenericBinary()) {\n- CPUName = LLVM::getHostCPUName().string_view();\n- } else {\n- CPUName = \"generic\"s;\n- }\n-#endif\n-\n- // On RISC-V we use generic-rv64 as the CPU, so also use default\n- // features; host features under QEMU can be inconsistent (e.g.\n- // zvl*b without v) which LLVM >= 20 rejects.\n- TM = LLVM::TargetMachine::create(\n- TheTarget, Triple, CPUName.c_str(),\n-#if defined(__riscv) && __riscv_xlen == 64\n- \"\",\n-#else\n- LLVM::getHostCPUFeatures().unwrap(),\n-#endif\n- toLLVMCodeGenLevel(\n- Conf.getCompilerConfigure().getOptimizationLevel()),\n- LLVMRelocPIC, LLVMCodeModelDefault);\n- }\n-\n-#if LLVM_VERSION_MAJOR >= 13\n- auto PBO = LLVM::PassBuilderOptions::create();\n- if (auto Error = PBO.runPasses(\n- LLModule,\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\n- TM)) {\n- spdlog::error(\"{}\"sv, Error.message().string_view());\n- }\n-#else\n- auto FP = LLVM::PassManager::createForModule(LLModule);\n- auto MP = LLVM::PassManager::create();\n-\n- TM.addAnalysisPasses(MP);\n- TM.addAnalysisPasses(FP);\n- {\n- auto PMB = LLVM::PassManagerBuilder::create();\n- auto [OptLevel, SizeLevel] =\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\n- PMB.setOptLevel(OptLevel);\n- PMB.setSizeLevel(SizeLevel);\n- PMB.populateFunctionPassManager(FP);\n- PMB.populateModulePassManager(MP);\n- }\n- switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\n- case CompilerConfigure::OptimizationLevel::O0:\n- case CompilerConfigure::OptimizationLevel::O1:\n- FP.addTailCallEliminationPass();\n- break;\n- default:\n- break;\n- }\n-\n- FP.initializeFunctionPassManager();\n- for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\n- FP.runFunctionPassManager(Fn);\n- }\n- FP.finalizeFunctionPassManager();\n- MP.runPassManager(LLModule);\n-#endif\n- }\n+ EXPECTED_TRY(optimize(LLModule, TM));\n \n // Set initializer for constant value\n if (auto IntrinsicsTable = LLModule.getNamedGlobal(\"intrinsics\")) {\n@@ -6031,12 +6161,11 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\n IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n LLVM::Value::getConstNull(IntrinsicsTableTy), \"intrinsics\");\n }\n-\n- spdlog::info(\"optimize done\"sv);\n return Expect<Data>{std::move(D)};\n }\n \n-void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n+void Compiler::compile(const AST::TypeSection &TypeSec,\n+ bool DeclarationsOnly) noexcept {\n auto WrapperTy =\n LLVM::Type::getFunctionType(Context->VoidTy,\n {Context->ExecCtxPtrTy, Context->Int8PtrTy,\n@@ -6050,10 +6179,25 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n Context->CompositeTypes.reserve(Size);\n Context->FunctionWrappers.reserve(Size);\n \n+ auto SetFuncAttributes = [&](auto FDecl) {\n+ FDecl.setVisibility(LLVMProtectedVisibility);\n+ FDecl.setDSOLocal(true);\n+ FDecl.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ FDecl.addFnAttr(Context->NoStackArgProbe);\n+ FDecl.addFnAttr(Context->StrictFP);\n+ FDecl.addFnAttr(Context->UWTable);\n+ FDecl.addParamAttr(0, Context->ReadOnly);\n+ FDecl.addParamAttr(0, Context->NoAlias);\n+ FDecl.addParamAttr(1, Context->NoAlias);\n+ FDecl.addParamAttr(2, Context->NoAlias);\n+ FDecl.addParamAttr(3, Context->NoAlias);\n+ };\n+\n // Iterate and compile types.\n for (size_t I = 0; I < Size; ++I) {\n const auto &CompType = SubTypes[I].getCompositeType();\n- const auto Name = fmt::format(\"t{}\"sv, Context->CompositeTypes.size());\n+ const auto Name =\n+ fmt::format(\"{}t{}\"sv, Context->Prefix, Context->CompositeTypes.size());\n if (CompType.isFunc()) {\n // Check that the function type is unique.\n {\n@@ -6065,13 +6209,21 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n if (OldFuncType == CompType.getFuncType()) {\n Unique = false;\n Context->CompositeTypes.push_back(Context->CompositeTypes[J]);\n- auto F = Context->FunctionWrappers[J];\n- Context->FunctionWrappers.push_back(F);\n- auto A = Context->LLModule.addAlias(WrapperTy, F, Name.c_str());\n- A.setLinkage(LLVMExternalLinkage);\n- A.setVisibility(LLVMProtectedVisibility);\n- A.setDSOLocal(true);\n- A.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ if (DeclarationsOnly) {\n+ auto FDecl = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n+ SetFuncAttributes(FDecl);\n+ Context->FunctionWrappers.push_back(FDecl);\n+ } else {\n+ auto F = Context->FunctionWrappers[J];\n+ Context->FunctionWrappers.push_back(F);\n+ auto A = Context->LLModule.get().addAlias(WrapperTy, F,\n+ Name.c_str());\n+ A.setLinkage(LLVMExternalLinkage);\n+ A.setVisibility(LLVMProtectedVisibility);\n+ A.setDSOLocal(true);\n+ A.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ }\n break;\n }\n }\n@@ -6082,81 +6234,66 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\n }\n \n // Create Wrapper\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\n- Name.c_str());\n+ auto F = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n {\n- F.setVisibility(LLVMProtectedVisibility);\n- F.setDSOLocal(true);\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\n- F.addFnAttr(Context->NoStackArgProbe);\n- F.addFnAttr(Context->StrictFP);\n- F.addFnAttr(Context->UWTable);\n- F.addParamAttr(0, Context->ReadOnly);\n- F.addParamAttr(0, Context->NoAlias);\n- F.addParamAttr(1, Context->NoAlias);\n- F.addParamAttr(2, Context->NoAlias);\n- F.addParamAttr(3, Context->NoAlias);\n-\n- LLVM::Builder Builder(Context->LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n-\n- auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\n- CompType.getFuncType());\n- auto RTy = FTy.getReturnType();\n- std::vector<LLVM::Type> FPTy(FTy.getNumParams());\n- FTy.getParamTypes(FPTy);\n-\n- const size_t ArgCount = FPTy.size() - 1;\n- auto ExecCtxPtr = F.getFirstParam();\n- auto RawFunc = LLVM::FunctionCallee{\n- FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\n- FTy.getPointerTo())};\n- auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\n- auto RawRets = RawArgs.getNextParam();\n-\n- std::vector<LLVM::Value> Args;\n- Args.reserve(FTy.getNumParams());\n- Args.push_back(ExecCtxPtr);\n- for (size_t J = 0; J < ArgCount; ++J) {\n- Args.push_back(Builder.createValuePtrLoad(\n- FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\n- }\n+ SetFuncAttributes(F);\n+\n+ if (!DeclarationsOnly) {\n+ LLVM::Builder Builder(Context->LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n+\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\n+ CompType.getFuncType());\n+ auto RTy = FTy.getReturnType();\n+ std::vector<LLVM::Type> FPTy(FTy.getNumParams());\n+ FTy.getParamTypes(FPTy);\n+\n+ const size_t ArgCount = FPTy.size() - 1;\n+ auto ExecCtxPtr = F.getFirstParam();\n+ auto RawFunc = LLVM::FunctionCallee{\n+ FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\n+ FTy.getPointerTo())};\n+ auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\n+ auto RawRets = RawArgs.getNextParam();\n+\n+ std::vector<LLVM::Value> Args;\n+ Args.reserve(FTy.getNumParams());\n+ Args.push_back(ExecCtxPtr);\n+ for (size_t J = 0; J < ArgCount; ++J) {\n+ Args.push_back(Builder.createValuePtrLoad(\n+ FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\n+ }\n \n- auto Ret = Builder.createCall(RawFunc, Args);\n- if (RTy.isVoidTy()) {\n- // nothing to do\n- } else if (RTy.isStructTy()) {\n- auto Rets = unpackStruct(Builder, Ret);\n- Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty, kValSize);\n- } else {\n- Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\n+ auto Ret = Builder.createCall(RawFunc, Args);\n+ if (RTy.isVoidTy()) {\n+ // nothing to do\n+ } else if (RTy.isStructTy()) {\n+ auto Rets = unpackStruct(Builder, Ret);\n+ Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty,\n+ kValSize);\n+ } else {\n+ Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\n+ }\n+ Builder.createRetVoid();\n }\n- Builder.createRetVoid();\n }\n // Copy wrapper, param and return lists to module instance.\n Context->FunctionWrappers.push_back(F);\n } else {\n // Non function type case. Create empty wrapper.\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\n- Name.c_str());\n+ auto F = Context->LLModule.get().addFunction(\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\n {\n- F.setVisibility(LLVMProtectedVisibility);\n- F.setDSOLocal(true);\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\n- F.addFnAttr(Context->NoStackArgProbe);\n- F.addFnAttr(Context->StrictFP);\n- F.addFnAttr(Context->UWTable);\n- F.addParamAttr(0, Context->ReadOnly);\n- F.addParamAttr(0, Context->NoAlias);\n- F.addParamAttr(1, Context->NoAlias);\n- F.addParamAttr(2, Context->NoAlias);\n- F.addParamAttr(3, Context->NoAlias);\n-\n- LLVM::Builder Builder(Context->LLContext);\n- Builder.positionAtEnd(\n- LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n- Builder.createRetVoid();\n+ SetFuncAttributes(F);\n+\n+ if (!DeclarationsOnly) {\n+ LLVM::Builder Builder(Context->LLContext);\n+ Builder.positionAtEnd(\n+ LLVM::BasicBlock::create(Context->LLContext, F, \"entry\"));\n+ Builder.createRetVoid();\n+ }\n }\n Context->FunctionWrappers.push_back(F);\n }\n@@ -6184,9 +6321,9 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\n toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n auto RTy = FTy.getReturnType();\n auto F = LLVM::FunctionCallee{\n- FTy,\n- Context->LLModule.addFunction(FTy, LLVMInternalLinkage,\n- fmt::format(\"f{}\"sv, FuncID).c_str())};\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMInternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n F.Fn.setDSOLocal(true);\n F.Fn.addFnAttr(Context->NoStackArgProbe);\n F.Fn.addFnAttr(Context->StrictFP);\n@@ -6231,6 +6368,7 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\n }\n \n Context->Functions.emplace_back(TypeIdx, F, nullptr);\n+ Context->ImportCount++;\n break;\n }\n case ExternalType::Table: // Table type\n@@ -6313,9 +6451,10 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n const auto FuncID = Context->Functions.size();\n auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n- LLVM::FunctionCallee F = {FTy, Context->LLModule.addFunction(\n- FTy, LLVMExternalLinkage,\n- fmt::format(\"f{}\"sv, FuncID).c_str())};\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n F.Fn.setVisibility(LLVMProtectedVisibility);\n F.Fn.setDSOLocal(true);\n F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n@@ -6339,10 +6478,11 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n Locals.push_back(Local.second);\n }\n }\n- FunctionCompiler FC(*Context, F, Locals,\n- Conf.getCompilerConfigure().isInterruptible(),\n- Conf.getStatisticsConfigure().isInstructionCounting(),\n- Conf.getStatisticsConfigure().isCostMeasuring());\n+ FunctionCompiler FC(\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\n auto Type = Context->resolveBlockType(T);\n EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n F.Fn.eliminateUnreachableBlocks();\n@@ -6350,5 +6490,235 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n return {};\n }\n \n+void Compiler::compileFunctionDeclarations(\n+ const AST::FunctionSection &FunctionSec,\n+ const AST::CodeSection &CodeSec) noexcept {\n+ const auto &TypeIdxs = FunctionSec.getContent();\n+ const auto &CodeSegs = CodeSec.getContent();\n+ assuming(TypeIdxs.size() == CodeSegs.size());\n+\n+ for (size_t I = 0; I < CodeSegs.size(); ++I) {\n+ const auto &TypeIdx = TypeIdxs[I];\n+ const auto &Code = CodeSegs[I];\n+ assuming(TypeIdx < Context->CompositeTypes.size());\n+ assuming(Context->CompositeTypes[TypeIdx]->isFunc());\n+ const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\n+ const auto FuncID = Context->Functions.size();\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\n+ LLVM::FunctionCallee F = {\n+ FTy, Context->LLModule.get().addFunction(\n+ FTy, LLVMExternalLinkage,\n+ fmt::format(\"{}f{}\"sv, Context->Prefix, FuncID).c_str())};\n+ F.Fn.setVisibility(LLVMProtectedVisibility);\n+ F.Fn.setDSOLocal(true);\n+ F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\n+ F.Fn.addFnAttr(Context->NoStackArgProbe);\n+ F.Fn.addFnAttr(Context->StrictFP);\n+ F.Fn.addFnAttr(Context->UWTable);\n+ F.Fn.addParamAttr(0, Context->ReadOnly);\n+ F.Fn.addParamAttr(0, Context->NoAlias);\n+\n+ Context->Functions.emplace_back(TypeIdx, F, &Code);\n+ }\n+}\n+\n+Expect<void> Compiler::compileFunctionBody(uint32_t LocalFuncIndex) noexcept {\n+ // Find the function in the Functions list\n+ // LocalFuncIndex is relative to the defined functions (not imports)\n+ uint32_t GlobalFuncIndex = Context->ImportCount + LocalFuncIndex;\n+ if (GlobalFuncIndex >= Context->Functions.size()) {\n+ spdlog::error(\"[lazy-jit]: function index {} out of range\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ auto &[T, F, Code] = Context->Functions[GlobalFuncIndex];\n+ if (!Code) {\n+ spdlog::error(\"[lazy-jit]: cannot compile import function {}\"sv,\n+ LocalFuncIndex);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ // Check if already compiled (function has basic blocks)\n+ if (F.Fn.countBasicBlocks() > 0) {\n+ spdlog::debug(\"[lazy-jit]: function {} already compiled\"sv, LocalFuncIndex);\n+ return {};\n+ }\n+\n+ spdlog::debug(\"[lazy-jit]: compiling function {}\"sv, LocalFuncIndex);\n+\n+ std::vector<ValType> Locals;\n+ for (const auto &Local : Code->getLocals()) {\n+ for (unsigned I = 0; I < Local.first; ++I) {\n+ Locals.push_back(Local.second);\n+ }\n+ }\n+\n+ FunctionCompiler FC(\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\n+ auto Type = Context->resolveBlockType(T);\n+ EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\n+ F.Fn.eliminateUnreachableBlocks();\n+\n+ return {};\n+}\n+\n+Expect<std::pair<LLVM::Data,\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\n+ LLVM::Compiler::CompileContextDeleter>>>\n+LLVM::Compiler::compileInfrastructure(const AST::Module &Module,\n+ std::string Prefix) noexcept {\n+ Data D;\n+ D.setPrefix(Prefix);\n+ // Check the module is validated.\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ spdlog::info(\"[lazy-jit]: compile infrastructure start\"sv);\n+\n+ auto LLContext = D.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = D.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ std::unique_ptr<CompileContext, CompileContextDeleter> NewContext(\n+ new CompileContext(LLContext, LLModule,\n+ Conf.getCompilerConfigure().isGenericBinary(),\n+ D.getPrefix()));\n+ RAIICleanup Cleanup(this->Context, NewContext.get());\n+\n+ // Compile Function Types\n+ compile(Module.getTypeSection());\n+ // Compile ImportSection\n+ compile(Module.getImportSection());\n+ // Compile GlobalSection\n+ compile(Module.getGlobalSection());\n+ // Compile MemorySection (MemorySec, DataSec)\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ // Compile TableSection (TableSec, ElemSec)\n+ compile(Module.getTableSection(), Module.getElementSection());\n+ // Create function declarations without compiling bodies\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+ // Compile ExportSection\n+ compile(Module.getExportSection());\n+\n+ // Set initializer for constant value\n+ auto IntrinsicsName = fmt::format(\"{}intrinsics\"sv, D.getPrefix());\n+ if (auto IntrinsicsTable = LLModule.getNamedGlobal(IntrinsicsName.c_str())) {\n+ IntrinsicsTable.setInitializer(\n+ LLVM::Value::getConstNull(IntrinsicsTable.getType()));\n+ IntrinsicsTable.setGlobalConstant(false);\n+ } else {\n+ auto IntrinsicsTableTy = LLVM::Type::getArrayType(\n+ LLContext.getInt8Ty().getPointerTo(),\n+ static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax));\n+ LLModule.addGlobal(\n+ IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\n+ LLVM::Value::getConstNull(IntrinsicsTableTy), IntrinsicsName.c_str());\n+ }\n+ LLModule.verify(LLVMPrintMessageAction);\n+\n+ spdlog::info(\"[lazy-jit]: infrastructure compilation done\"sv);\n+\n+ return Expect<\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>>{\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>{\n+ std::move(D), std::move(NewContext)}};\n+}\n+\n+Expect<LLVM::Data>\n+Compiler::compileFunctions(Data &&LLData, CompileContext *NewContext,\n+ const AST::Module &Module,\n+ Span<const uint32_t> LocalFuncIndices) noexcept {\n+ if (unlikely(!Module.getIsValidated())) {\n+ spdlog::error(ErrCode::Value::NotValidated);\n+ return Unexpect(ErrCode::Value::NotValidated);\n+ }\n+ if (unlikely(LocalFuncIndices.empty())) {\n+ spdlog::error(\"[lazy-jit]: compileFunctions with empty index list\"sv);\n+ return Unexpect(ErrCode::Value::IllegalPath);\n+ }\n+\n+ std::unique_lock Lock(Mutex);\n+ std::vector<uint32_t> Sorted(LocalFuncIndices.begin(),\n+ LocalFuncIndices.end());\n+ std::sort(Sorted.begin(), Sorted.end());\n+ Sorted.erase(std::unique(Sorted.begin(), Sorted.end()), Sorted.end());\n+\n+ spdlog::debug(\"[lazy-jit]: compile functions batch ({}) start\"sv,\n+ Sorted.size());\n+\n+ auto LLContext = LLData.extract().getLLContext();\n+ LLVM::Core::init(LLContext.unwrap());\n+ auto &LLModule = LLData.extract().LLModule;\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \"PIC Level\"sv, 2);\n+\n+ RAIICleanup Cleanup(this->Context, NewContext);\n+ Context->LLModule = LLModule;\n+\n+ Context->CompositeTypes.clear();\n+ Context->FunctionWrappers.clear();\n+ Context->Functions.clear();\n+ Context->LazyJITCacheVars.clear();\n+ Context->ImportCount = 0;\n+ Context->MemoryAddrTypes.clear();\n+ Context->TableAddrTypes.clear();\n+ Context->Globals.clear();\n+\n+ Context->IntrinsicsTable = LLModule.addGlobal(\n+ Context->IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\n+ fmt::format(\"{}intrinsics\"sv, Context->Prefix).c_str());\n+ Context->IntrinsicsTable.setInitializer(LLVM::Value());\n+ Context->Trap.Ty =\n+ LLVM::Type::getFunctionType(Context->VoidTy, {Context->Int32Ty});\n+ Context->Trap.Fn =\n+ LLModule.addFunction(Context->Trap.Ty, LLVMPrivateLinkage, \"trap\");\n+ Context->Trap.Fn.setDSOLocal(true);\n+ Context->Trap.Fn.addFnAttr(Context->NoStackArgProbe);\n+ Context->Trap.Fn.addFnAttr(Context->StrictFP);\n+ Context->Trap.Fn.addFnAttr(Context->UWTable);\n+ Context->Trap.Fn.addFnAttr(Context->NoReturn);\n+ Context->Trap.Fn.addFnAttr(Context->Cold);\n+ Context->Trap.Fn.addFnAttr(Context->NoInline);\n+ Context->compileTrap();\n+\n+ compile(Module.getTypeSection(), true);\n+ compile(Module.getImportSection());\n+ compile(Module.getGlobalSection());\n+ compile(Module.getMemorySection(), Module.getDataSection());\n+ compile(Module.getTableSection(), Module.getElementSection());\n+\n+ compileFunctionDeclarations(Module.getFunctionSection(),\n+ Module.getCodeSection());\n+\n+ for (uint32_t FuncIndex : Sorted) {\n+ EXPECTED_TRY(compileFunctionBody(FuncIndex));\n+ }\n+\n+ spdlog::info(\"[lazy-jit]: verify batch ({} funcs) start\"sv, Sorted.size());\n+ LLModule.verify(LLVMPrintMessageAction);\n+ spdlog::info(\"[lazy-jit]: verify batch ({} funcs) done\"sv, Sorted.size());\n+\n+ auto &TM = LLData.extract().TM;\n+ EXPECTED_TRY(optimize(LLModule, TM));\n+\n+ spdlog::debug(\"[lazy-jit]: compile functions batch ({}) done\"sv,\n+ Sorted.size());\n+ return Expect<Data>{std::move(LLData)};\n+}\n+\n+void LLVM::Compiler::CompileContextDeleter::operator()(\n+ CompileContext *Context) const noexcept {\n+ delete Context;\n+}\n } // namespace LLVM\n } // namespace WasmEdge\n"}],"string":"[\n {\n \"comment\": \"It seems like you don't call the `LLModule.verify()` inside `compileInfrastructure`?\",\n \"path\": \"lib/llvm/compiler.cpp\",\n \"hunk\": \"@@ -6342,13 +6498,255 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\\n FunctionCompiler FC(*Context, F, Locals,\\n Conf.getCompilerConfigure().isInterruptible(),\\n Conf.getStatisticsConfigure().isInstructionCounting(),\\n- Conf.getStatisticsConfigure().isCostMeasuring());\\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\\n+ Conf.getRuntimeConfigure().isEnableLazyJIT());\\n auto Type = Context->resolveBlockType(T);\\n EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\\n F.Fn.eliminateUnreachableBlocks();\\n }\\n return {};\\n }\\n \\n+void Compiler::compileFunctionDeclarations(\\n+ const AST::FunctionSection &FunctionSec,\\n+ const AST::CodeSection &CodeSec) noexcept {\\n+ const auto &TypeIdxs = FunctionSec.getContent();\\n+ const auto &CodeSegs = CodeSec.getContent();\\n+ assuming(TypeIdxs.size() == CodeSegs.size());\\n+\\n+ for (size_t I = 0; I < CodeSegs.size(); ++I) {\\n+ const auto &TypeIdx = TypeIdxs[I];\\n+ const auto &Code = CodeSegs[I];\\n+ assuming(TypeIdx < Context->CompositeTypes.size());\\n+ assuming(Context->CompositeTypes[TypeIdx]->isFunc());\\n+ const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\\n+ const auto FuncID = Context->Functions.size();\\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\\n+ LLVM::FunctionCallee F = {\\n+ FTy, Context->LLModule.get().addFunction(\\n+ FTy, LLVMExternalLinkage,\\n+ fmt::format(\\\"{}f{}\\\"sv, Context->Prefix, FuncID).c_str())};\\n+ F.Fn.setVisibility(LLVMProtectedVisibility);\\n+ F.Fn.setDSOLocal(true);\\n+ F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ F.Fn.addFnAttr(Context->NoStackArgProbe);\\n+ F.Fn.addFnAttr(Context->StrictFP);\\n+ F.Fn.addFnAttr(Context->UWTable);\\n+ F.Fn.addParamAttr(0, Context->ReadOnly);\\n+ F.Fn.addParamAttr(0, Context->NoAlias);\\n+\\n+ Context->Functions.emplace_back(TypeIdx, F, &Code);\\n+ }\\n+}\\n+\\n+Expect<void> Compiler::compileFunctionBody(uint32_t LocalFuncIndex) noexcept {\\n+ // Find the function in the Functions list\\n+ // LocalFuncIndex is relative to the defined functions (not imports)\\n+ uint32_t ImportCount = 0;\\n+ for (const auto &[T, F, Code] : Context->Functions) {\\n+ if (!Code) {\\n+ ImportCount++;\\n+ }\\n+ }\\n+\\n+ uint32_t GlobalFuncIndex = ImportCount + LocalFuncIndex;\\n+ if (GlobalFuncIndex >= Context->Functions.size()) {\\n+ spdlog::error(\\\"[lazy-jit]: function index {} out of range\\\"sv,\\n+ LocalFuncIndex);\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ auto &[T, F, Code] = Context->Functions[GlobalFuncIndex];\\n+ if (!Code) {\\n+ spdlog::error(\\\"[lazy-jit]: cannot compile import function {}\\\"sv,\\n+ LocalFuncIndex);\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ // Check if already compiled (function has basic blocks)\\n+ if (F.Fn.countBasicBlocks() > 0) {\\n+ spdlog::debug(\\\"[lazy-jit]: function {} already compiled\\\"sv, LocalFuncIndex);\\n+ return {};\\n+ }\\n+\\n+ spdlog::debug(\\\"[lazy-jit]: compiling function {}\\\"sv, LocalFuncIndex);\\n+\\n+ std::vector<ValType> Locals;\\n+ for (const auto &Local : Code->getLocals()) {\\n+ for (unsigned I = 0; I < Local.first; ++I) {\\n+ Locals.push_back(Local.second);\\n+ }\\n+ }\\n+\\n+ FunctionCompiler FC(*Context, F, Locals,\\n+ Conf.getCompilerConfigure().isInterruptible(),\\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\\n+ Conf.getRuntimeConfigure().isEnableLazyJIT());\\n+ auto Type = Context->resolveBlockType(T);\\n+ EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\\n+ F.Fn.eliminateUnreachableBlocks();\\n+\\n+ return {};\\n+}\\n+\\n+Expect<std::pair<LLVM::Data,\\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\\n+ LLVM::Compiler::CompileContextDeleter>>>\\n+LLVM::Compiler::compileInfrastructure(const AST::Module &Module,\\n+ std::string Prefix) noexcept {\\n+ Data D;\\n+ D.setPrefix(Prefix);\\n+ // Check the module is validated.\\n+ if (unlikely(!Module.getIsValidated())) {\\n+ spdlog::error(ErrCode::Value::NotValidated);\\n+ return Unexpect(ErrCode::Value::NotValidated);\\n+ }\\n+\\n+ std::unique_lock Lock(Mutex);\\n+ spdlog::info(\\\"[lazyjit]: compile infrastructure start\\\"sv);\\n+\\n+ auto LLContext = D.extract().getLLContext();\\n+ LLVM::Core::init(LLContext.unwrap());\\n+ auto &LLModule = D.extract().LLModule;\\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \\\"PIC Level\\\"sv, 2);\\n+\\n+ std::unique_ptr<CompileContext, CompileContextDeleter> NewContext(\\n+ new CompileContext(LLContext, LLModule,\\n+ Conf.getCompilerConfigure().isGenericBinary(),\\n+ D.getPrefix()));\\n+ this->Context = NewContext.get();\\n+\\n+ // Compile Function Types\\n+ compile(Module.getTypeSection());\\n+ // Compile ImportSection\\n+ compile(Module.getImportSection());\\n+ // Compile GlobalSection\\n+ compile(Module.getGlobalSection());\\n+ // Compile MemorySection (MemorySec, DataSec)\\n+ compile(Module.getMemorySection(), Module.getDataSection());\\n+ // Compile TableSection (TableSec, ElemSec)\\n+ compile(Module.getTableSection(), Module.getElementSection());\\n+ // Create function declarations without compiling bodies\\n+ compileFunctionDeclarations(Module.getFunctionSection(),\\n+ Module.getCodeSection());\\n+ // Compile ExportSection\\n+ compile(Module.getExportSection());\\n+\\n+ // Set initializer for constant value\\n+ auto IntrinsicsName = fmt::format(\\\"{}intrinsics\\\"sv, D.getPrefix());\\n+ if (auto IntrinsicsTable = LLModule.getNamedGlobal(IntrinsicsName.c_str())) {\\n+ IntrinsicsTable.setInitializer(\\n+ LLVM::Value::getConstNull(IntrinsicsTable.getType()));\\n+ IntrinsicsTable.setGlobalConstant(false);\\n+ } else {\\n+ auto IntrinsicsTableTy = LLVM::Type::getArrayType(\\n+ LLContext.getInt8Ty().getPointerTo(),\\n+ static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax));\\n+ LLModule.addGlobal(\\n+ IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\\n+ LLVM::Value::getConstNull(IntrinsicsTableTy), IntrinsicsName.c_str());\\n+ }\\n+\\n+ spdlog::info(\\\"[lazyjit]: infrastructure compilation done\\\"sv);\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp\\nindex 39da94d9a9ac..330e245f51c3 100644\\n--- a/lib/llvm/compiler.cpp\\n+++ b/lib/llvm/compiler.cpp\\n@@ -9,6 +9,7 @@\\n #include \\\"common/spdlog.h\\\"\\n #include \\\"data.h\\\"\\n #include \\\"llvm.h\\\"\\n+#include \\\"spdlog/spdlog.h\\\"\\n #include \\\"system/allocator.h\\\"\\n \\n #include <algorithm>\\n@@ -16,6 +17,7 @@\\n #include <cinttypes>\\n #include <cstdint>\\n #include <cstdlib>\\n+#include <functional>\\n #include <limits>\\n #include <memory>\\n #include <numeric>\\n@@ -28,6 +30,16 @@ using namespace std::literals;\\n \\n namespace {\\n \\n+struct RAIICleanup {\\n+ RAIICleanup(LLVM::Compiler::CompileContext *&Context,\\n+ LLVM::Compiler::CompileContext *NewContext)\\n+ : Context(Context) {\\n+ Context = NewContext;\\n+ }\\n+ ~RAIICleanup() { Context = nullptr; }\\n+ LLVM::Compiler::CompileContext *&Context;\\n+};\\n+\\n static bool\\n isVoidReturn(WasmEdge::Span<const WasmEdge::ValType> ValTypes) noexcept;\\n static LLVM::Type toLLVMType(LLVM::Context LLContext,\\n@@ -128,7 +140,7 @@ static inline LLVMCodeGenOptLevel toLLVMCodeGenLevel(\\n \\n struct LLVM::Compiler::CompileContext {\\n LLVM::Context LLContext;\\n- LLVM::Module &LLModule;\\n+ std::reference_wrapper<LLVM::Module> LLModule;\\n LLVM::Attribute Cold;\\n LLVM::Attribute NoAlias;\\n LLVM::Attribute NoInline;\\n@@ -202,13 +214,16 @@ struct LLVM::Compiler::CompileContext {\\n std::vector<std::tuple<uint32_t, LLVM::FunctionCallee,\\n const WasmEdge::AST::CodeSegment *>>\\n Functions;\\n+ std::vector<LLVM::Value> LazyJITCacheVars;\\n+ uint32_t ImportCount = 0;\\n std::vector<LLVM::Type> MemoryAddrTypes;\\n std::vector<LLVM::Type> TableAddrTypes;\\n std::vector<LLVM::Type> Globals;\\n+ std::string Prefix;\\n LLVM::Value IntrinsicsTable;\\n LLVM::FunctionCallee Trap;\\n- CompileContext(LLVM::Context C, LLVM::Module &M,\\n- bool IsGenericBinary) noexcept\\n+ CompileContext(LLVM::Context C, LLVM::Module &M, bool IsGenericBinary,\\n+ std::string_view P = \\\"\\\"sv) noexcept\\n : LLContext(C), LLModule(M),\\n Cold(LLVM::Attribute::createEnum(C, LLVM::Core::Cold, 0)),\\n NoAlias(LLVM::Attribute::createEnum(C, LLVM::Core::NoAlias, 0)),\\n@@ -256,14 +271,14 @@ struct LLVM::Compiler::CompileContext {\\n })),\\n ExecCtxPtrTy(ExecCtxTy.getPointerTo()),\\n IntrinsicsTableTy(LLVM::Type::getArrayType(\\n- Int8PtrTy,\\n+ Int8Ty.getPointerTo(),\\n static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax))),\\n- IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()),\\n- IntrinsicsTable(LLModule.addGlobal(IntrinsicsTablePtrTy, true,\\n- LLVMExternalLinkage, LLVM::Value(),\\n- \\\"intrinsics\\\")) {\\n+ IntrinsicsTablePtrTy(IntrinsicsTableTy.getPointerTo()), Prefix(P),\\n+ IntrinsicsTable(LLModule.get().addGlobal(\\n+ IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\\n+ fmt::format(\\\"{}intrinsics\\\"sv, Prefix).c_str())) {\\n Trap.Ty = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\\n- Trap.Fn = LLModule.addFunction(Trap.Ty, LLVMPrivateLinkage, \\\"trap\\\");\\n+ Trap.Fn = LLModule.get().addFunction(Trap.Ty, LLVMPrivateLinkage, \\\"trap\\\");\\n Trap.Fn.setDSOLocal(true);\\n Trap.Fn.addFnAttr(NoStackArgProbe);\\n Trap.Fn.addFnAttr(StrictFP);\\n@@ -272,9 +287,10 @@ struct LLVM::Compiler::CompileContext {\\n Trap.Fn.addFnAttr(Cold);\\n Trap.Fn.addFnAttr(NoInline);\\n \\n- LLModule.addGlobal(Int32Ty, true, LLVMExternalLinkage,\\n- LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\\n- \\\"version\\\");\\n+ LLModule.get().addGlobal(\\n+ Int32Ty, true, LLVMExternalLinkage,\\n+ LLVM::Value::getConstInt(Int32Ty, AOT::kBinaryVersion),\\n+ fmt::format(\\\"{}version\\\"sv, Prefix).c_str());\\n \\n if (!IsGenericBinary) {\\n SubtargetFeatures = LLVM::getHostCPUFeatures();\\n@@ -313,18 +329,7 @@ struct LLVM::Compiler::CompileContext {\\n }\\n }\\n \\n- {\\n- // create trap\\n- LLVM::Builder Builder(LLContext);\\n- Builder.positionAtEnd(\\n- LLVM::BasicBlock::create(LLContext, Trap.Fn, \\\"entry\\\"));\\n- auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\\n- auto CallTrap = Builder.createCall(\\n- getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\\n- {Trap.Fn.getFirstParam()});\\n- CallTrap.addCallSiteAttribute(NoReturn);\\n- Builder.createUnreachable();\\n- }\\n+ compileTrap();\\n }\\n LLVM::Value getMemory(LLVM::Builder &Builder, LLVM::Value ExecCtx,\\n uint32_t Index) noexcept {\\n@@ -394,6 +399,17 @@ struct LLVM::Compiler::CompileContext {\\n auto Ptr = Builder.createBitCast(VPtr, PtrPtrTy);\\n return {Ty, Builder.createLoad(PtrTy, Ptr)};\\n }\\n+ void compileTrap() noexcept {\\n+ LLVM::Builder Builder(LLContext);\\n+ Builder.positionAtEnd(\\n+ LLVM::BasicBlock::create(LLContext, Trap.Fn, \\\"entry\\\"));\\n+ auto FnTy = LLVM::Type::getFunctionType(VoidTy, {Int32Ty});\\n+ auto CallTrap = Builder.createCall(\\n+ getIntrinsic(Builder, Executable::Intrinsics::kTrap, FnTy),\\n+ {Trap.Fn.getFirstParam()});\\n+ CallTrap.addCallSiteAttribute(NoReturn);\\n+ Builder.createUnreachable();\\n+ }\\n std::pair<std::vector<ValType>, std::vector<ValType>>\\n resolveBlockType(const BlockType &BType) const noexcept {\\n using VecT = std::vector<ValType>;\\n@@ -544,9 +560,10 @@ class FunctionCompiler {\\n FunctionCompiler(LLVM::Compiler::CompileContext &Context,\\n LLVM::FunctionCallee F, Span<const ValType> Locals,\\n bool Interruptible, bool InstructionCounting,\\n- bool GasMeasuring) noexcept\\n+ bool GasMeasuring, bool IsLazyJIT) noexcept\\n : Context(Context), LLContext(Context.LLContext),\\n- Interruptible(Interruptible), F(F), Builder(LLContext) {\\n+ Interruptible(Interruptible), IsLazyJIT(IsLazyJIT), F(F),\\n+ Builder(LLContext) {\\n if (F.Fn) {\\n Builder.positionAtEnd(LLVM::BasicBlock::create(LLContext, F.Fn, \\\"entry\\\"));\\n ExecCtx = Builder.createLoad(Context.ExecCtxTy, F.Fn.getFirstParam());\\n@@ -4267,7 +4284,63 @@ class FunctionCompiler {\\n Args[J + 1] = stackPop();\\n }\\n \\n- auto Ret = Builder.createCall(Function, Args);\\n+ LLVM::Value Ret;\\n+ if (IsLazyJIT) {\\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\\n+ if (IsImport) {\\n+ Ret = Builder.createCall(Function, Args);\\n+ } else {\\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\\n+\\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\\n+ }\\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\\n+ if (!CacheVar) {\\n+ CacheVar = Context.LLModule.get().addGlobal(\\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \\\"\\\");\\n+ }\\n+\\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \\\"ic.check\\\");\\n+ auto ResolveBB =\\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \\\"ic.resolve\\\");\\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \\\"ic.call\\\");\\n+\\n+ Builder.createBr(CheckBB);\\n+ Builder.positionAtEnd(CheckBB);\\n+\\n+ auto CachedPtr =\\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\\n+ CachedPtr.setAlignment(8);\\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\\n+ auto IsNull = Builder.createIsNull(CachedPtr);\\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\\n+\\n+ Builder.positionAtEnd(ResolveBB);\\n+ auto FPtr = Builder.createCall(\\n+ Context.getIntrinsic(\\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\\n+ {Context.Int32Ty}, false)),\\n+ {LLContext.getInt32(FuncIndex)});\\n+ auto Store = Builder.createStore(FPtr, CacheVar);\\n+ Store.setAlignment(8);\\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\\n+ Builder.createBr(CallBB);\\n+\\n+ Builder.positionAtEnd(CallBB);\\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\\n+\\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\\n+ }\\n+ } else {\\n+ Ret = Builder.createCall(Function, Args);\\n+ }\\n+\\n auto Ty = Ret.getType();\\n if (Ty.isVoidTy()) {\\n // nothing to do\\n@@ -4387,7 +4460,64 @@ class FunctionCompiler {\\n Args[J + 1] = stackPop();\\n }\\n \\n- auto Ret = Builder.createCall(Function, Args);\\n+ LLVM::Value Ret;\\n+ if (IsLazyJIT) {\\n+ bool IsImport = std::get<2>(Context.Functions[FuncIndex]) == nullptr;\\n+ if (IsImport) {\\n+ Ret = Builder.createCall(Function, Args);\\n+ } else {\\n+ auto FTy = toLLVMType(LLContext, Context.ExecCtxPtrTy, FuncType);\\n+\\n+ if (Context.LazyJITCacheVars.size() <= FuncIndex) {\\n+ Context.LazyJITCacheVars.resize(Context.Functions.size());\\n+ }\\n+ auto &CacheVar = Context.LazyJITCacheVars[FuncIndex];\\n+ if (!CacheVar) {\\n+ CacheVar = Context.LLModule.get().addGlobal(\\n+ FTy.getPointerTo(), false, LLVMPrivateLinkage,\\n+ LLVM::Value::getConstNull(FTy.getPointerTo()), \\\"\\\");\\n+ }\\n+\\n+ auto CheckBB = LLVM::BasicBlock::create(LLContext, F.Fn, \\\"rc.check\\\");\\n+ auto ResolveBB =\\n+ LLVM::BasicBlock::create(LLContext, F.Fn, \\\"rc.resolve\\\");\\n+ auto CallBB = LLVM::BasicBlock::create(LLContext, F.Fn, \\\"rc.call\\\");\\n+\\n+ Builder.createBr(CheckBB);\\n+ Builder.positionAtEnd(CheckBB);\\n+\\n+ auto CachedPtr =\\n+ Builder.createLoad(FTy.getPointerTo(), CacheVar, false);\\n+ CachedPtr.setAlignment(8);\\n+ CachedPtr.setOrdering(LLVMAtomicOrderingAcquire);\\n+ auto IsNull = Builder.createIsNull(CachedPtr);\\n+ auto IsNotNull = Builder.createLikely(Builder.createNot(IsNull));\\n+ Builder.createCondBr(IsNotNull, CallBB, ResolveBB);\\n+\\n+ Builder.positionAtEnd(ResolveBB);\\n+ auto FPtr = Builder.createCall(\\n+ Context.getIntrinsic(\\n+ Builder, Executable::Intrinsics::kFuncGetFuncSymbol,\\n+ LLVM::Type::getFunctionType(FTy.getPointerTo(),\\n+ {Context.Int32Ty}, false)),\\n+ {LLContext.getInt32(FuncIndex)});\\n+ auto Store = Builder.createStore(FPtr, CacheVar);\\n+ Store.setAlignment(8);\\n+ Store.setOrdering(LLVMAtomicOrderingRelease);\\n+ Builder.createBr(CallBB);\\n+\\n+ Builder.positionAtEnd(CallBB);\\n+ auto FinalPtr = Builder.createPHI(FTy.getPointerTo());\\n+ FinalPtr.addIncoming(CachedPtr, CheckBB);\\n+ FinalPtr.addIncoming(FPtr, ResolveBB);\\n+\\n+ Ret = Builder.createCall(LLVM::FunctionCallee(FTy, FinalPtr), Args);\\n+ }\\n+ } else {\\n+ Ret = Builder.createCall(Function, Args);\\n+ }\\n+\\n+ Ret.setMustTailCall();\\n auto Ty = Ret.getType();\\n if (Ty.isVoidTy()) {\\n Builder.createRetVoid();\\n@@ -4432,6 +4562,7 @@ class FunctionCompiler {\\n \\n auto FPtrRet =\\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\\n+ FPtrRet.setMustTailCall();\\n if (RetSize == 0) {\\n Builder.createRetVoid();\\n } else {\\n@@ -4608,6 +4739,7 @@ class FunctionCompiler {\\n \\n auto FPtrRet =\\n Builder.createCall(LLVM::FunctionCallee(FTy, FPtr), ArgsVec);\\n+ FPtrRet.setMustTailCall();\\n if (RetSize == 0) {\\n Builder.createRetVoid();\\n } else {\\n@@ -5854,6 +5986,7 @@ class FunctionCompiler {\\n Control &operator=(const Control &) = default;\\n Control &operator=(Control &&) = default;\\n };\\n+ bool IsLazyJIT;\\n std::vector<Control> ControlStack;\\n LLVM::FunctionCallee F;\\n LLVM::Value ExecCtx;\\n@@ -5894,6 +6027,84 @@ Expect<void> Compiler::checkConfigure() noexcept {\\n return {};\\n }\\n \\n+Expect<void> Compiler::optimize(LLVM::Module &LLModule,\\n+ LLVM::TargetMachine &TM) noexcept {\\n+ spdlog::info(\\\"optimize start\\\"sv);\\n+ auto Triple = LLModule.getTarget();\\n+ auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\\n+ if (ErrorMessage) {\\n+ spdlog::error(\\\"getFromTriple failed:{}\\\"sv, ErrorMessage.string_view());\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ std::string CPUName;\\n+#if defined(__riscv) && __riscv_xlen == 64\\n+ CPUName = \\\"generic-rv64\\\"s;\\n+#else\\n+ if (!Conf.getCompilerConfigure().isGenericBinary()) {\\n+ CPUName = LLVM::getHostCPUName().string_view();\\n+ } else {\\n+ CPUName = \\\"generic\\\"s;\\n+ }\\n+#endif\\n+\\n+ // On RISC-V we use generic-rv64 as the CPU, so also use default\\n+ // features; host features under QEMU can be inconsistent (e.g.\\n+ // zvl*b without v) which LLVM >= 20 rejects.\\n+ TM = LLVM::TargetMachine::create(\\n+ TheTarget, Triple, CPUName.c_str(),\\n+#if defined(__riscv) && __riscv_xlen == 64\\n+ \\\"\\\",\\n+#else\\n+ LLVM::getHostCPUFeatures().unwrap(),\\n+#endif\\n+ toLLVMCodeGenLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\\n+ LLVMRelocPIC, LLVMCodeModelDefault);\\n+\\n+#if LLVM_VERSION_MAJOR >= 13\\n+ auto PBO = LLVM::PassBuilderOptions::create();\\n+ if (auto Error = PBO.runPasses(\\n+ LLModule,\\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\\n+ TM)) {\\n+ spdlog::error(\\\"{}\\\"sv, Error.message().string_view());\\n+ }\\n+#else\\n+ auto FP = LLVM::PassManager::createForModule(LLModule);\\n+ auto MP = LLVM::PassManager::create();\\n+\\n+ TM.addAnalysisPasses(MP);\\n+ TM.addAnalysisPasses(FP);\\n+ {\\n+ auto PMB = LLVM::PassManagerBuilder::create();\\n+ auto [OptLevel, SizeLevel] =\\n+ toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\\n+ PMB.setOptLevel(OptLevel);\\n+ PMB.setSizeLevel(SizeLevel);\\n+ PMB.populateFunctionPassManager(FP);\\n+ PMB.populateModulePassManager(MP);\\n+ }\\n+ switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\\n+ case CompilerConfigure::OptimizationLevel::O0:\\n+ case CompilerConfigure::OptimizationLevel::O1:\\n+ FP.addTailCallEliminationPass();\\n+ break;\\n+ default:\\n+ break;\\n+ }\\n+\\n+ FP.initializeFunctionPassManager();\\n+ for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\\n+ FP.runFunctionPassManager(Fn);\\n+ }\\n+ FP.finalizeFunctionPassManager();\\n+ MP.runPassManager(LLModule);\\n+#endif\\n+\\n+ spdlog::info(\\\"optimize done\\\"sv);\\n+ return {};\\n+}\\n+\\n Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\\n // Check that the module is validated.\\n if (unlikely(!Module.getIsValidated())) {\\n@@ -5913,15 +6124,7 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\\n \\n CompileContext NewContext(LLContext, LLModule,\\n Conf.getCompilerConfigure().isGenericBinary());\\n- struct RAIICleanup {\\n- RAIICleanup(CompileContext *&Context, CompileContext &NewContext)\\n- : Context(Context) {\\n- Context = &NewContext;\\n- }\\n- ~RAIICleanup() { Context = nullptr; }\\n- CompileContext *&Context;\\n- };\\n- RAIICleanup Cleanup(Context, NewContext);\\n+ RAIICleanup Cleanup(Context, &NewContext);\\n \\n // Compile Function Types\\n compile(Module.getTypeSection());\\n@@ -5942,81 +6145,8 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\\n spdlog::info(\\\"verify start\\\"sv);\\n LLModule.verify(LLVMPrintMessageAction);\\n \\n- spdlog::info(\\\"optimize start\\\"sv);\\n auto &TM = D.extract().TM;\\n- {\\n- auto Triple = LLModule.getTarget();\\n- auto [TheTarget, ErrorMessage] = LLVM::Target::getFromTriple(Triple);\\n- if (ErrorMessage) {\\n- spdlog::error(\\\"getFromTriple failed:{}\\\"sv, ErrorMessage.string_view());\\n- return Unexpect(ErrCode::Value::IllegalPath);\\n- } else {\\n- std::string CPUName;\\n-#if defined(__riscv) && __riscv_xlen == 64\\n- CPUName = \\\"generic-rv64\\\"s;\\n-#else\\n- if (!Conf.getCompilerConfigure().isGenericBinary()) {\\n- CPUName = LLVM::getHostCPUName().string_view();\\n- } else {\\n- CPUName = \\\"generic\\\"s;\\n- }\\n-#endif\\n-\\n- // On RISC-V we use generic-rv64 as the CPU, so also use default\\n- // features; host features under QEMU can be inconsistent (e.g.\\n- // zvl*b without v) which LLVM >= 20 rejects.\\n- TM = LLVM::TargetMachine::create(\\n- TheTarget, Triple, CPUName.c_str(),\\n-#if defined(__riscv) && __riscv_xlen == 64\\n- \\\"\\\",\\n-#else\\n- LLVM::getHostCPUFeatures().unwrap(),\\n-#endif\\n- toLLVMCodeGenLevel(\\n- Conf.getCompilerConfigure().getOptimizationLevel()),\\n- LLVMRelocPIC, LLVMCodeModelDefault);\\n- }\\n-\\n-#if LLVM_VERSION_MAJOR >= 13\\n- auto PBO = LLVM::PassBuilderOptions::create();\\n- if (auto Error = PBO.runPasses(\\n- LLModule,\\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel()),\\n- TM)) {\\n- spdlog::error(\\\"{}\\\"sv, Error.message().string_view());\\n- }\\n-#else\\n- auto FP = LLVM::PassManager::createForModule(LLModule);\\n- auto MP = LLVM::PassManager::create();\\n-\\n- TM.addAnalysisPasses(MP);\\n- TM.addAnalysisPasses(FP);\\n- {\\n- auto PMB = LLVM::PassManagerBuilder::create();\\n- auto [OptLevel, SizeLevel] =\\n- toLLVMLevel(Conf.getCompilerConfigure().getOptimizationLevel());\\n- PMB.setOptLevel(OptLevel);\\n- PMB.setSizeLevel(SizeLevel);\\n- PMB.populateFunctionPassManager(FP);\\n- PMB.populateModulePassManager(MP);\\n- }\\n- switch (Conf.getCompilerConfigure().getOptimizationLevel()) {\\n- case CompilerConfigure::OptimizationLevel::O0:\\n- case CompilerConfigure::OptimizationLevel::O1:\\n- FP.addTailCallEliminationPass();\\n- break;\\n- default:\\n- break;\\n- }\\n-\\n- FP.initializeFunctionPassManager();\\n- for (auto Fn = LLModule.getFirstFunction(); Fn; Fn = Fn.getNextFunction()) {\\n- FP.runFunctionPassManager(Fn);\\n- }\\n- FP.finalizeFunctionPassManager();\\n- MP.runPassManager(LLModule);\\n-#endif\\n- }\\n+ EXPECTED_TRY(optimize(LLModule, TM));\\n \\n // Set initializer for constant value\\n if (auto IntrinsicsTable = LLModule.getNamedGlobal(\\\"intrinsics\\\")) {\\n@@ -6031,12 +6161,11 @@ Expect<Data> Compiler::compile(const AST::Module &Module) noexcept {\\n IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\\n LLVM::Value::getConstNull(IntrinsicsTableTy), \\\"intrinsics\\\");\\n }\\n-\\n- spdlog::info(\\\"optimize done\\\"sv);\\n return Expect<Data>{std::move(D)};\\n }\\n \\n-void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\\n+void Compiler::compile(const AST::TypeSection &TypeSec,\\n+ bool DeclarationsOnly) noexcept {\\n auto WrapperTy =\\n LLVM::Type::getFunctionType(Context->VoidTy,\\n {Context->ExecCtxPtrTy, Context->Int8PtrTy,\\n@@ -6050,10 +6179,25 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\\n Context->CompositeTypes.reserve(Size);\\n Context->FunctionWrappers.reserve(Size);\\n \\n+ auto SetFuncAttributes = [&](auto FDecl) {\\n+ FDecl.setVisibility(LLVMProtectedVisibility);\\n+ FDecl.setDSOLocal(true);\\n+ FDecl.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ FDecl.addFnAttr(Context->NoStackArgProbe);\\n+ FDecl.addFnAttr(Context->StrictFP);\\n+ FDecl.addFnAttr(Context->UWTable);\\n+ FDecl.addParamAttr(0, Context->ReadOnly);\\n+ FDecl.addParamAttr(0, Context->NoAlias);\\n+ FDecl.addParamAttr(1, Context->NoAlias);\\n+ FDecl.addParamAttr(2, Context->NoAlias);\\n+ FDecl.addParamAttr(3, Context->NoAlias);\\n+ };\\n+\\n // Iterate and compile types.\\n for (size_t I = 0; I < Size; ++I) {\\n const auto &CompType = SubTypes[I].getCompositeType();\\n- const auto Name = fmt::format(\\\"t{}\\\"sv, Context->CompositeTypes.size());\\n+ const auto Name =\\n+ fmt::format(\\\"{}t{}\\\"sv, Context->Prefix, Context->CompositeTypes.size());\\n if (CompType.isFunc()) {\\n // Check that the function type is unique.\\n {\\n@@ -6065,13 +6209,21 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\\n if (OldFuncType == CompType.getFuncType()) {\\n Unique = false;\\n Context->CompositeTypes.push_back(Context->CompositeTypes[J]);\\n- auto F = Context->FunctionWrappers[J];\\n- Context->FunctionWrappers.push_back(F);\\n- auto A = Context->LLModule.addAlias(WrapperTy, F, Name.c_str());\\n- A.setLinkage(LLVMExternalLinkage);\\n- A.setVisibility(LLVMProtectedVisibility);\\n- A.setDSOLocal(true);\\n- A.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ if (DeclarationsOnly) {\\n+ auto FDecl = Context->LLModule.get().addFunction(\\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\\n+ SetFuncAttributes(FDecl);\\n+ Context->FunctionWrappers.push_back(FDecl);\\n+ } else {\\n+ auto F = Context->FunctionWrappers[J];\\n+ Context->FunctionWrappers.push_back(F);\\n+ auto A = Context->LLModule.get().addAlias(WrapperTy, F,\\n+ Name.c_str());\\n+ A.setLinkage(LLVMExternalLinkage);\\n+ A.setVisibility(LLVMProtectedVisibility);\\n+ A.setDSOLocal(true);\\n+ A.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ }\\n break;\\n }\\n }\\n@@ -6082,81 +6234,66 @@ void Compiler::compile(const AST::TypeSection &TypeSec) noexcept {\\n }\\n \\n // Create Wrapper\\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\\n- Name.c_str());\\n+ auto F = Context->LLModule.get().addFunction(\\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\\n {\\n- F.setVisibility(LLVMProtectedVisibility);\\n- F.setDSOLocal(true);\\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\\n- F.addFnAttr(Context->NoStackArgProbe);\\n- F.addFnAttr(Context->StrictFP);\\n- F.addFnAttr(Context->UWTable);\\n- F.addParamAttr(0, Context->ReadOnly);\\n- F.addParamAttr(0, Context->NoAlias);\\n- F.addParamAttr(1, Context->NoAlias);\\n- F.addParamAttr(2, Context->NoAlias);\\n- F.addParamAttr(3, Context->NoAlias);\\n-\\n- LLVM::Builder Builder(Context->LLContext);\\n- Builder.positionAtEnd(\\n- LLVM::BasicBlock::create(Context->LLContext, F, \\\"entry\\\"));\\n-\\n- auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\\n- CompType.getFuncType());\\n- auto RTy = FTy.getReturnType();\\n- std::vector<LLVM::Type> FPTy(FTy.getNumParams());\\n- FTy.getParamTypes(FPTy);\\n-\\n- const size_t ArgCount = FPTy.size() - 1;\\n- auto ExecCtxPtr = F.getFirstParam();\\n- auto RawFunc = LLVM::FunctionCallee{\\n- FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\\n- FTy.getPointerTo())};\\n- auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\\n- auto RawRets = RawArgs.getNextParam();\\n-\\n- std::vector<LLVM::Value> Args;\\n- Args.reserve(FTy.getNumParams());\\n- Args.push_back(ExecCtxPtr);\\n- for (size_t J = 0; J < ArgCount; ++J) {\\n- Args.push_back(Builder.createValuePtrLoad(\\n- FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\\n- }\\n+ SetFuncAttributes(F);\\n+\\n+ if (!DeclarationsOnly) {\\n+ LLVM::Builder Builder(Context->LLContext);\\n+ Builder.positionAtEnd(\\n+ LLVM::BasicBlock::create(Context->LLContext, F, \\\"entry\\\"));\\n+\\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy,\\n+ CompType.getFuncType());\\n+ auto RTy = FTy.getReturnType();\\n+ std::vector<LLVM::Type> FPTy(FTy.getNumParams());\\n+ FTy.getParamTypes(FPTy);\\n+\\n+ const size_t ArgCount = FPTy.size() - 1;\\n+ auto ExecCtxPtr = F.getFirstParam();\\n+ auto RawFunc = LLVM::FunctionCallee{\\n+ FTy, Builder.createBitCast(ExecCtxPtr.getNextParam(),\\n+ FTy.getPointerTo())};\\n+ auto RawArgs = ExecCtxPtr.getNextParam().getNextParam();\\n+ auto RawRets = RawArgs.getNextParam();\\n+\\n+ std::vector<LLVM::Value> Args;\\n+ Args.reserve(FTy.getNumParams());\\n+ Args.push_back(ExecCtxPtr);\\n+ for (size_t J = 0; J < ArgCount; ++J) {\\n+ Args.push_back(Builder.createValuePtrLoad(\\n+ FPTy[J + 1], RawArgs, Context->Int8Ty, J * kValSize));\\n+ }\\n \\n- auto Ret = Builder.createCall(RawFunc, Args);\\n- if (RTy.isVoidTy()) {\\n- // nothing to do\\n- } else if (RTy.isStructTy()) {\\n- auto Rets = unpackStruct(Builder, Ret);\\n- Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty, kValSize);\\n- } else {\\n- Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\\n+ auto Ret = Builder.createCall(RawFunc, Args);\\n+ if (RTy.isVoidTy()) {\\n+ // nothing to do\\n+ } else if (RTy.isStructTy()) {\\n+ auto Rets = unpackStruct(Builder, Ret);\\n+ Builder.createArrayPtrStore(Rets, RawRets, Context->Int8Ty,\\n+ kValSize);\\n+ } else {\\n+ Builder.createValuePtrStore(Ret, RawRets, Context->Int8Ty);\\n+ }\\n+ Builder.createRetVoid();\\n }\\n- Builder.createRetVoid();\\n }\\n // Copy wrapper, param and return lists to module instance.\\n Context->FunctionWrappers.push_back(F);\\n } else {\\n // Non function type case. Create empty wrapper.\\n- auto F = Context->LLModule.addFunction(WrapperTy, LLVMExternalLinkage,\\n- Name.c_str());\\n+ auto F = Context->LLModule.get().addFunction(\\n+ WrapperTy, LLVMExternalLinkage, Name.c_str());\\n {\\n- F.setVisibility(LLVMProtectedVisibility);\\n- F.setDSOLocal(true);\\n- F.setDLLStorageClass(LLVMDLLExportStorageClass);\\n- F.addFnAttr(Context->NoStackArgProbe);\\n- F.addFnAttr(Context->StrictFP);\\n- F.addFnAttr(Context->UWTable);\\n- F.addParamAttr(0, Context->ReadOnly);\\n- F.addParamAttr(0, Context->NoAlias);\\n- F.addParamAttr(1, Context->NoAlias);\\n- F.addParamAttr(2, Context->NoAlias);\\n- F.addParamAttr(3, Context->NoAlias);\\n-\\n- LLVM::Builder Builder(Context->LLContext);\\n- Builder.positionAtEnd(\\n- LLVM::BasicBlock::create(Context->LLContext, F, \\\"entry\\\"));\\n- Builder.createRetVoid();\\n+ SetFuncAttributes(F);\\n+\\n+ if (!DeclarationsOnly) {\\n+ LLVM::Builder Builder(Context->LLContext);\\n+ Builder.positionAtEnd(\\n+ LLVM::BasicBlock::create(Context->LLContext, F, \\\"entry\\\"));\\n+ Builder.createRetVoid();\\n+ }\\n }\\n Context->FunctionWrappers.push_back(F);\\n }\\n@@ -6184,9 +6321,9 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\\n toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\\n auto RTy = FTy.getReturnType();\\n auto F = LLVM::FunctionCallee{\\n- FTy,\\n- Context->LLModule.addFunction(FTy, LLVMInternalLinkage,\\n- fmt::format(\\\"f{}\\\"sv, FuncID).c_str())};\\n+ FTy, Context->LLModule.get().addFunction(\\n+ FTy, LLVMInternalLinkage,\\n+ fmt::format(\\\"{}f{}\\\"sv, Context->Prefix, FuncID).c_str())};\\n F.Fn.setDSOLocal(true);\\n F.Fn.addFnAttr(Context->NoStackArgProbe);\\n F.Fn.addFnAttr(Context->StrictFP);\\n@@ -6231,6 +6368,7 @@ void Compiler::compile(const AST::ImportSection &ImportSec) noexcept {\\n }\\n \\n Context->Functions.emplace_back(TypeIdx, F, nullptr);\\n+ Context->ImportCount++;\\n break;\\n }\\n case ExternalType::Table: // Table type\\n@@ -6313,9 +6451,10 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\\n const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\\n const auto FuncID = Context->Functions.size();\\n auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\\n- LLVM::FunctionCallee F = {FTy, Context->LLModule.addFunction(\\n- FTy, LLVMExternalLinkage,\\n- fmt::format(\\\"f{}\\\"sv, FuncID).c_str())};\\n+ LLVM::FunctionCallee F = {\\n+ FTy, Context->LLModule.get().addFunction(\\n+ FTy, LLVMExternalLinkage,\\n+ fmt::format(\\\"{}f{}\\\"sv, Context->Prefix, FuncID).c_str())};\\n F.Fn.setVisibility(LLVMProtectedVisibility);\\n F.Fn.setDSOLocal(true);\\n F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\\n@@ -6339,10 +6478,11 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\\n Locals.push_back(Local.second);\\n }\\n }\\n- FunctionCompiler FC(*Context, F, Locals,\\n- Conf.getCompilerConfigure().isInterruptible(),\\n- Conf.getStatisticsConfigure().isInstructionCounting(),\\n- Conf.getStatisticsConfigure().isCostMeasuring());\\n+ FunctionCompiler FC(\\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\\n auto Type = Context->resolveBlockType(T);\\n EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\\n F.Fn.eliminateUnreachableBlocks();\\n@@ -6350,5 +6490,235 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\\n return {};\\n }\\n \\n+void Compiler::compileFunctionDeclarations(\\n+ const AST::FunctionSection &FunctionSec,\\n+ const AST::CodeSection &CodeSec) noexcept {\\n+ const auto &TypeIdxs = FunctionSec.getContent();\\n+ const auto &CodeSegs = CodeSec.getContent();\\n+ assuming(TypeIdxs.size() == CodeSegs.size());\\n+\\n+ for (size_t I = 0; I < CodeSegs.size(); ++I) {\\n+ const auto &TypeIdx = TypeIdxs[I];\\n+ const auto &Code = CodeSegs[I];\\n+ assuming(TypeIdx < Context->CompositeTypes.size());\\n+ assuming(Context->CompositeTypes[TypeIdx]->isFunc());\\n+ const auto &FuncType = Context->CompositeTypes[TypeIdx]->getFuncType();\\n+ const auto FuncID = Context->Functions.size();\\n+ auto FTy = toLLVMType(Context->LLContext, Context->ExecCtxPtrTy, FuncType);\\n+ LLVM::FunctionCallee F = {\\n+ FTy, Context->LLModule.get().addFunction(\\n+ FTy, LLVMExternalLinkage,\\n+ fmt::format(\\\"{}f{}\\\"sv, Context->Prefix, FuncID).c_str())};\\n+ F.Fn.setVisibility(LLVMProtectedVisibility);\\n+ F.Fn.setDSOLocal(true);\\n+ F.Fn.setDLLStorageClass(LLVMDLLExportStorageClass);\\n+ F.Fn.addFnAttr(Context->NoStackArgProbe);\\n+ F.Fn.addFnAttr(Context->StrictFP);\\n+ F.Fn.addFnAttr(Context->UWTable);\\n+ F.Fn.addParamAttr(0, Context->ReadOnly);\\n+ F.Fn.addParamAttr(0, Context->NoAlias);\\n+\\n+ Context->Functions.emplace_back(TypeIdx, F, &Code);\\n+ }\\n+}\\n+\\n+Expect<void> Compiler::compileFunctionBody(uint32_t LocalFuncIndex) noexcept {\\n+ // Find the function in the Functions list\\n+ // LocalFuncIndex is relative to the defined functions (not imports)\\n+ uint32_t GlobalFuncIndex = Context->ImportCount + LocalFuncIndex;\\n+ if (GlobalFuncIndex >= Context->Functions.size()) {\\n+ spdlog::error(\\\"[lazy-jit]: function index {} out of range\\\"sv,\\n+ LocalFuncIndex);\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ auto &[T, F, Code] = Context->Functions[GlobalFuncIndex];\\n+ if (!Code) {\\n+ spdlog::error(\\\"[lazy-jit]: cannot compile import function {}\\\"sv,\\n+ LocalFuncIndex);\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ // Check if already compiled (function has basic blocks)\\n+ if (F.Fn.countBasicBlocks() > 0) {\\n+ spdlog::debug(\\\"[lazy-jit]: function {} already compiled\\\"sv, LocalFuncIndex);\\n+ return {};\\n+ }\\n+\\n+ spdlog::debug(\\\"[lazy-jit]: compiling function {}\\\"sv, LocalFuncIndex);\\n+\\n+ std::vector<ValType> Locals;\\n+ for (const auto &Local : Code->getLocals()) {\\n+ for (unsigned I = 0; I < Local.first; ++I) {\\n+ Locals.push_back(Local.second);\\n+ }\\n+ }\\n+\\n+ FunctionCompiler FC(\\n+ *Context, F, Locals, Conf.getCompilerConfigure().isInterruptible(),\\n+ Conf.getStatisticsConfigure().isInstructionCounting(),\\n+ Conf.getStatisticsConfigure().isCostMeasuring(),\\n+ Conf.getRuntimeConfigure().getRunMode() == RunMode::LazyJIT);\\n+ auto Type = Context->resolveBlockType(T);\\n+ EXPECTED_TRY(FC.compile(*Code, std::move(Type)));\\n+ F.Fn.eliminateUnreachableBlocks();\\n+\\n+ return {};\\n+}\\n+\\n+Expect<std::pair<LLVM::Data,\\n+ std::unique_ptr<LLVM::Compiler::CompileContext,\\n+ LLVM::Compiler::CompileContextDeleter>>>\\n+LLVM::Compiler::compileInfrastructure(const AST::Module &Module,\\n+ std::string Prefix) noexcept {\\n+ Data D;\\n+ D.setPrefix(Prefix);\\n+ // Check the module is validated.\\n+ if (unlikely(!Module.getIsValidated())) {\\n+ spdlog::error(ErrCode::Value::NotValidated);\\n+ return Unexpect(ErrCode::Value::NotValidated);\\n+ }\\n+\\n+ std::unique_lock Lock(Mutex);\\n+ spdlog::info(\\\"[lazy-jit]: compile infrastructure start\\\"sv);\\n+\\n+ auto LLContext = D.extract().getLLContext();\\n+ LLVM::Core::init(LLContext.unwrap());\\n+ auto &LLModule = D.extract().LLModule;\\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \\\"PIC Level\\\"sv, 2);\\n+\\n+ std::unique_ptr<CompileContext, CompileContextDeleter> NewContext(\\n+ new CompileContext(LLContext, LLModule,\\n+ Conf.getCompilerConfigure().isGenericBinary(),\\n+ D.getPrefix()));\\n+ RAIICleanup Cleanup(this->Context, NewContext.get());\\n+\\n+ // Compile Function Types\\n+ compile(Module.getTypeSection());\\n+ // Compile ImportSection\\n+ compile(Module.getImportSection());\\n+ // Compile GlobalSection\\n+ compile(Module.getGlobalSection());\\n+ // Compile MemorySection (MemorySec, DataSec)\\n+ compile(Module.getMemorySection(), Module.getDataSection());\\n+ // Compile TableSection (TableSec, ElemSec)\\n+ compile(Module.getTableSection(), Module.getElementSection());\\n+ // Create function declarations without compiling bodies\\n+ compileFunctionDeclarations(Module.getFunctionSection(),\\n+ Module.getCodeSection());\\n+ // Compile ExportSection\\n+ compile(Module.getExportSection());\\n+\\n+ // Set initializer for constant value\\n+ auto IntrinsicsName = fmt::format(\\\"{}intrinsics\\\"sv, D.getPrefix());\\n+ if (auto IntrinsicsTable = LLModule.getNamedGlobal(IntrinsicsName.c_str())) {\\n+ IntrinsicsTable.setInitializer(\\n+ LLVM::Value::getConstNull(IntrinsicsTable.getType()));\\n+ IntrinsicsTable.setGlobalConstant(false);\\n+ } else {\\n+ auto IntrinsicsTableTy = LLVM::Type::getArrayType(\\n+ LLContext.getInt8Ty().getPointerTo(),\\n+ static_cast<uint32_t>(Executable::Intrinsics::kIntrinsicMax));\\n+ LLModule.addGlobal(\\n+ IntrinsicsTableTy.getPointerTo(), false, LLVMExternalLinkage,\\n+ LLVM::Value::getConstNull(IntrinsicsTableTy), IntrinsicsName.c_str());\\n+ }\\n+ LLModule.verify(LLVMPrintMessageAction);\\n+\\n+ spdlog::info(\\\"[lazy-jit]: infrastructure compilation done\\\"sv);\\n+\\n+ return Expect<\\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>>{\\n+ std::pair<Data, std::unique_ptr<CompileContext, CompileContextDeleter>>{\\n+ std::move(D), std::move(NewContext)}};\\n+}\\n+\\n+Expect<LLVM::Data>\\n+Compiler::compileFunctions(Data &&LLData, CompileContext *NewContext,\\n+ const AST::Module &Module,\\n+ Span<const uint32_t> LocalFuncIndices) noexcept {\\n+ if (unlikely(!Module.getIsValidated())) {\\n+ spdlog::error(ErrCode::Value::NotValidated);\\n+ return Unexpect(ErrCode::Value::NotValidated);\\n+ }\\n+ if (unlikely(LocalFuncIndices.empty())) {\\n+ spdlog::error(\\\"[lazy-jit]: compileFunctions with empty index list\\\"sv);\\n+ return Unexpect(ErrCode::Value::IllegalPath);\\n+ }\\n+\\n+ std::unique_lock Lock(Mutex);\\n+ std::vector<uint32_t> Sorted(LocalFuncIndices.begin(),\\n+ LocalFuncIndices.end());\\n+ std::sort(Sorted.begin(), Sorted.end());\\n+ Sorted.erase(std::unique(Sorted.begin(), Sorted.end()), Sorted.end());\\n+\\n+ spdlog::debug(\\\"[lazy-jit]: compile functions batch ({}) start\\\"sv,\\n+ Sorted.size());\\n+\\n+ auto LLContext = LLData.extract().getLLContext();\\n+ LLVM::Core::init(LLContext.unwrap());\\n+ auto &LLModule = LLData.extract().LLModule;\\n+ LLModule.setTarget(LLVM::getDefaultTargetTriple().unwrap());\\n+ LLModule.addFlag(LLVMModuleFlagBehaviorError, \\\"PIC Level\\\"sv, 2);\\n+\\n+ RAIICleanup Cleanup(this->Context, NewContext);\\n+ Context->LLModule = LLModule;\\n+\\n+ Context->CompositeTypes.clear();\\n+ Context->FunctionWrappers.clear();\\n+ Context->Functions.clear();\\n+ Context->LazyJITCacheVars.clear();\\n+ Context->ImportCount = 0;\\n+ Context->MemoryAddrTypes.clear();\\n+ Context->TableAddrTypes.clear();\\n+ Context->Globals.clear();\\n+\\n+ Context->IntrinsicsTable = LLModule.addGlobal(\\n+ Context->IntrinsicsTablePtrTy, true, LLVMExternalLinkage, LLVM::Value(),\\n+ fmt::format(\\\"{}intrinsics\\\"sv, Context->Prefix).c_str());\\n+ Context->IntrinsicsTable.setInitializer(LLVM::Value());\\n+ Context->Trap.Ty =\\n+ LLVM::Type::getFunctionType(Context->VoidTy, {Context->Int32Ty});\\n+ Context->Trap.Fn =\\n+ LLModule.addFunction(Context->Trap.Ty, LLVMPrivateLinkage, \\\"trap\\\");\\n+ Context->Trap.Fn.setDSOLocal(true);\\n+ Context->Trap.Fn.addFnAttr(Context->NoStackArgProbe);\\n+ Context->Trap.Fn.addFnAttr(Context->StrictFP);\\n+ Context->Trap.Fn.addFnAttr(Context->UWTable);\\n+ Context->Trap.Fn.addFnAttr(Context->NoReturn);\\n+ Context->Trap.Fn.addFnAttr(Context->Cold);\\n+ Context->Trap.Fn.addFnAttr(Context->NoInline);\\n+ Context->compileTrap();\\n+\\n+ compile(Module.getTypeSection(), true);\\n+ compile(Module.getImportSection());\\n+ compile(Module.getGlobalSection());\\n+ compile(Module.getMemorySection(), Module.getDataSection());\\n+ compile(Module.getTableSection(), Module.getElementSection());\\n+\\n+ compileFunctionDeclarations(Module.getFunctionSection(),\\n+ Module.getCodeSection());\\n+\\n+ for (uint32_t FuncIndex : Sorted) {\\n+ EXPECTED_TRY(compileFunctionBody(FuncIndex));\\n+ }\\n+\\n+ spdlog::info(\\\"[lazy-jit]: verify batch ({} funcs) start\\\"sv, Sorted.size());\\n+ LLModule.verify(LLVMPrintMessageAction);\\n+ spdlog::info(\\\"[lazy-jit]: verify batch ({} funcs) done\\\"sv, Sorted.size());\\n+\\n+ auto &TM = LLData.extract().TM;\\n+ EXPECTED_TRY(optimize(LLModule, TM));\\n+\\n+ spdlog::debug(\\\"[lazy-jit]: compile functions batch ({}) done\\\"sv,\\n+ Sorted.size());\\n+ return Expect<Data>{std::move(LLData)};\\n+}\\n+\\n+void LLVM::Compiler::CompileContextDeleter::operator()(\\n+ CompileContext *Context) const noexcept {\\n+ delete Context;\\n+}\\n } // namespace LLVM\\n } // namespace WasmEdge\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13297,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"You forgot the `#ifdef WASMEDGE_USE_LLVM`."},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/include/vm/vm.h b/include/vm/vm.h\nindex 543a4c19712e..afa401415a0f 100644\n--- a/include/vm/vm.h\n+++ b/include/vm/vm.h\n@@ -26,12 +26,20 @@\n #include \"runtime/instance/module.h\"\n #include \"runtime/storemgr.h\"\n \n+#ifdef WASMEDGE_USE_LLVM\n+#include \"llvm/compiler.h\"\n+#include \"llvm/data.h\"\n+#include \"llvm/jit.h\"\n+#endif\n+\n #include <cstdint>\n #include <memory>\n+#include <mutex>\n #include <shared_mutex>\n #include <string>\n #include <string_view>\n #include <unordered_map>\n+#include <unordered_set>\n #include <utility>\n #include <vector>\n \n@@ -281,6 +289,17 @@ class VM {\n /// Getter for statistics.\n Statistics::Statistics &getStatistics() noexcept { return Stat; }\n \n+#ifdef WASMEDGE_USE_LLVM\n+ uint32_t getLazyCompiledFuncCount() const noexcept {\n+ std::shared_lock Lock(LazyJITMutex);\n+ uint32_t Count = 0;\n+ for (const auto &Pair : LazyJITStates) {\n+ Count += static_cast<uint32_t>(Pair.second.LazyCompiledFuncs.size());\n+ }\n+ return Count;\n+ }\n+#endif\n+\n private:\n Expect<void> unsafeRegisterModule(std::string_view Name,\n const std::filesystem::path &Path);\n@@ -375,6 +394,7 @@ class VM {\n Statistics::Statistics Stat;\n VMStage Stage;\n mutable std::shared_mutex Mutex;\n+ mutable std::shared_mutex LazyJITMutex;\n /// @}\n \n /// \\name VM components.\n@@ -392,8 +412,12 @@ class VM {\n /// Active module instance.\n std::unique_ptr<Runtime::Instance::ModuleInstance> ActiveModInst;\n std::unique_ptr<Runtime::Instance::ComponentInstance> ActiveCompInst;\n+ /// Registered AST modules.\n+ std::vector<std::shared_ptr<const AST::Module>> RegASTModules;\n /// Registered module instances by user.\n std::vector<std::unique_ptr<Runtime::Instance::ModuleInstance>> RegModInsts;\n+ /// Map from ID to the index in RegASTModules and RegModInsts.\n+ std::unordered_map<std::string, std::array<size_t, 2>> RegModMap;\n /// Built-in module instances mapped to the configurations. For WASI.\n std::unordered_map<HostRegistration,\n std::unique_ptr<Runtime::Instance::ModuleInstance>>\n@@ -408,6 +432,22 @@ class VM {\n /// Reference to the store.\n Runtime::StoreManager &StoreRef;\n /// @}\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ /// \\name Lazy JIT.\n+ /// @{\n+ /// Prepare Lazy JIT infrastructure for a module.\n+ Expect<WasmEdge::LLVM::LazyJITState> prepareLazyJIT(AST::Module &Module);\n+\n+ /// Lazy compile a function if lazy JIT mode is enabled and function not yet\n+ /// compiled.\n+ Expect<void> lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx);\n+\n+ /// Map from module ID to its lazy JIT state\n+ std::unordered_map<std::string, WasmEdge::LLVM::LazyJITState> LazyJITStates;\n+\n+ /// @}\n+#endif\n };\n \n } // namespace VM\n"},"changed_files":{"kind":"list like","value":["include/vm/vm.h"],"string":"[\n \"include/vm/vm.h\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"You forgot the `#ifdef WASMEDGE_USE_LLVM`.","path":"include/vm/vm.h","hunk":"@@ -25,16 +25,25 @@\n \n #include \"runtime/instance/module.h\"\n #include \"runtime/storemgr.h\"\n+#include \"llvm/compiler.h\"\n+#include \"llvm/data.h\"\n+#include \"llvm/jit.h\"","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/include/vm/vm.h b/include/vm/vm.h\nindex 543a4c19712e..afa401415a0f 100644\n--- a/include/vm/vm.h\n+++ b/include/vm/vm.h\n@@ -26,12 +26,20 @@\n #include \"runtime/instance/module.h\"\n #include \"runtime/storemgr.h\"\n \n+#ifdef WASMEDGE_USE_LLVM\n+#include \"llvm/compiler.h\"\n+#include \"llvm/data.h\"\n+#include \"llvm/jit.h\"\n+#endif\n+\n #include <cstdint>\n #include <memory>\n+#include <mutex>\n #include <shared_mutex>\n #include <string>\n #include <string_view>\n #include <unordered_map>\n+#include <unordered_set>\n #include <utility>\n #include <vector>\n \n@@ -281,6 +289,17 @@ class VM {\n /// Getter for statistics.\n Statistics::Statistics &getStatistics() noexcept { return Stat; }\n \n+#ifdef WASMEDGE_USE_LLVM\n+ uint32_t getLazyCompiledFuncCount() const noexcept {\n+ std::shared_lock Lock(LazyJITMutex);\n+ uint32_t Count = 0;\n+ for (const auto &Pair : LazyJITStates) {\n+ Count += static_cast<uint32_t>(Pair.second.LazyCompiledFuncs.size());\n+ }\n+ return Count;\n+ }\n+#endif\n+\n private:\n Expect<void> unsafeRegisterModule(std::string_view Name,\n const std::filesystem::path &Path);\n@@ -375,6 +394,7 @@ class VM {\n Statistics::Statistics Stat;\n VMStage Stage;\n mutable std::shared_mutex Mutex;\n+ mutable std::shared_mutex LazyJITMutex;\n /// @}\n \n /// \\name VM components.\n@@ -392,8 +412,12 @@ class VM {\n /// Active module instance.\n std::unique_ptr<Runtime::Instance::ModuleInstance> ActiveModInst;\n std::unique_ptr<Runtime::Instance::ComponentInstance> ActiveCompInst;\n+ /// Registered AST modules.\n+ std::vector<std::shared_ptr<const AST::Module>> RegASTModules;\n /// Registered module instances by user.\n std::vector<std::unique_ptr<Runtime::Instance::ModuleInstance>> RegModInsts;\n+ /// Map from ID to the index in RegASTModules and RegModInsts.\n+ std::unordered_map<std::string, std::array<size_t, 2>> RegModMap;\n /// Built-in module instances mapped to the configurations. For WASI.\n std::unordered_map<HostRegistration,\n std::unique_ptr<Runtime::Instance::ModuleInstance>>\n@@ -408,6 +432,22 @@ class VM {\n /// Reference to the store.\n Runtime::StoreManager &StoreRef;\n /// @}\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ /// \\name Lazy JIT.\n+ /// @{\n+ /// Prepare Lazy JIT infrastructure for a module.\n+ Expect<WasmEdge::LLVM::LazyJITState> prepareLazyJIT(AST::Module &Module);\n+\n+ /// Lazy compile a function if lazy JIT mode is enabled and function not yet\n+ /// compiled.\n+ Expect<void> lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx);\n+\n+ /// Map from module ID to its lazy JIT state\n+ std::unordered_map<std::string, WasmEdge::LLVM::LazyJITState> LazyJITStates;\n+\n+ /// @}\n+#endif\n };\n \n } // namespace VM\n"}],"string":"[\n {\n \"comment\": \"You forgot the `#ifdef WASMEDGE_USE_LLVM`.\",\n \"path\": \"include/vm/vm.h\",\n \"hunk\": \"@@ -25,16 +25,25 @@\\n \\n #include \\\"runtime/instance/module.h\\\"\\n #include \\\"runtime/storemgr.h\\\"\\n+#include \\\"llvm/compiler.h\\\"\\n+#include \\\"llvm/data.h\\\"\\n+#include \\\"llvm/jit.h\\\"\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/include/vm/vm.h b/include/vm/vm.h\\nindex 543a4c19712e..afa401415a0f 100644\\n--- a/include/vm/vm.h\\n+++ b/include/vm/vm.h\\n@@ -26,12 +26,20 @@\\n #include \\\"runtime/instance/module.h\\\"\\n #include \\\"runtime/storemgr.h\\\"\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+#include \\\"llvm/compiler.h\\\"\\n+#include \\\"llvm/data.h\\\"\\n+#include \\\"llvm/jit.h\\\"\\n+#endif\\n+\\n #include <cstdint>\\n #include <memory>\\n+#include <mutex>\\n #include <shared_mutex>\\n #include <string>\\n #include <string_view>\\n #include <unordered_map>\\n+#include <unordered_set>\\n #include <utility>\\n #include <vector>\\n \\n@@ -281,6 +289,17 @@ class VM {\\n /// Getter for statistics.\\n Statistics::Statistics &getStatistics() noexcept { return Stat; }\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+ uint32_t getLazyCompiledFuncCount() const noexcept {\\n+ std::shared_lock Lock(LazyJITMutex);\\n+ uint32_t Count = 0;\\n+ for (const auto &Pair : LazyJITStates) {\\n+ Count += static_cast<uint32_t>(Pair.second.LazyCompiledFuncs.size());\\n+ }\\n+ return Count;\\n+ }\\n+#endif\\n+\\n private:\\n Expect<void> unsafeRegisterModule(std::string_view Name,\\n const std::filesystem::path &Path);\\n@@ -375,6 +394,7 @@ class VM {\\n Statistics::Statistics Stat;\\n VMStage Stage;\\n mutable std::shared_mutex Mutex;\\n+ mutable std::shared_mutex LazyJITMutex;\\n /// @}\\n \\n /// \\\\name VM components.\\n@@ -392,8 +412,12 @@ class VM {\\n /// Active module instance.\\n std::unique_ptr<Runtime::Instance::ModuleInstance> ActiveModInst;\\n std::unique_ptr<Runtime::Instance::ComponentInstance> ActiveCompInst;\\n+ /// Registered AST modules.\\n+ std::vector<std::shared_ptr<const AST::Module>> RegASTModules;\\n /// Registered module instances by user.\\n std::vector<std::unique_ptr<Runtime::Instance::ModuleInstance>> RegModInsts;\\n+ /// Map from ID to the index in RegASTModules and RegModInsts.\\n+ std::unordered_map<std::string, std::array<size_t, 2>> RegModMap;\\n /// Built-in module instances mapped to the configurations. For WASI.\\n std::unordered_map<HostRegistration,\\n std::unique_ptr<Runtime::Instance::ModuleInstance>>\\n@@ -408,6 +432,22 @@ class VM {\\n /// Reference to the store.\\n Runtime::StoreManager &StoreRef;\\n /// @}\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ /// \\\\name Lazy JIT.\\n+ /// @{\\n+ /// Prepare Lazy JIT infrastructure for a module.\\n+ Expect<WasmEdge::LLVM::LazyJITState> prepareLazyJIT(AST::Module &Module);\\n+\\n+ /// Lazy compile a function if lazy JIT mode is enabled and function not yet\\n+ /// compiled.\\n+ Expect<void> lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx);\\n+\\n+ /// Map from module ID to its lazy JIT state\\n+ std::unordered_map<std::string, WasmEdge::LLVM::LazyJITState> LazyJITStates;\\n+\\n+ /// @}\\n+#endif\\n };\\n \\n } // namespace VM\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13298,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"Could you please explain why we need to use `recursive_mutex` instead of `mutex`? \nCould you compile with `-fsanitize=thread -fno-omit-frame-pointer` and provide a test case where `mutex` must not work?"},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/include/vm/vm.h b/include/vm/vm.h\nindex 543a4c19712e..afa401415a0f 100644\n--- a/include/vm/vm.h\n+++ b/include/vm/vm.h\n@@ -26,12 +26,20 @@\n #include \"runtime/instance/module.h\"\n #include \"runtime/storemgr.h\"\n \n+#ifdef WASMEDGE_USE_LLVM\n+#include \"llvm/compiler.h\"\n+#include \"llvm/data.h\"\n+#include \"llvm/jit.h\"\n+#endif\n+\n #include <cstdint>\n #include <memory>\n+#include <mutex>\n #include <shared_mutex>\n #include <string>\n #include <string_view>\n #include <unordered_map>\n+#include <unordered_set>\n #include <utility>\n #include <vector>\n \n@@ -281,6 +289,17 @@ class VM {\n /// Getter for statistics.\n Statistics::Statistics &getStatistics() noexcept { return Stat; }\n \n+#ifdef WASMEDGE_USE_LLVM\n+ uint32_t getLazyCompiledFuncCount() const noexcept {\n+ std::shared_lock Lock(LazyJITMutex);\n+ uint32_t Count = 0;\n+ for (const auto &Pair : LazyJITStates) {\n+ Count += static_cast<uint32_t>(Pair.second.LazyCompiledFuncs.size());\n+ }\n+ return Count;\n+ }\n+#endif\n+\n private:\n Expect<void> unsafeRegisterModule(std::string_view Name,\n const std::filesystem::path &Path);\n@@ -375,6 +394,7 @@ class VM {\n Statistics::Statistics Stat;\n VMStage Stage;\n mutable std::shared_mutex Mutex;\n+ mutable std::shared_mutex LazyJITMutex;\n /// @}\n \n /// \\name VM components.\n@@ -392,8 +412,12 @@ class VM {\n /// Active module instance.\n std::unique_ptr<Runtime::Instance::ModuleInstance> ActiveModInst;\n std::unique_ptr<Runtime::Instance::ComponentInstance> ActiveCompInst;\n+ /// Registered AST modules.\n+ std::vector<std::shared_ptr<const AST::Module>> RegASTModules;\n /// Registered module instances by user.\n std::vector<std::unique_ptr<Runtime::Instance::ModuleInstance>> RegModInsts;\n+ /// Map from ID to the index in RegASTModules and RegModInsts.\n+ std::unordered_map<std::string, std::array<size_t, 2>> RegModMap;\n /// Built-in module instances mapped to the configurations. For WASI.\n std::unordered_map<HostRegistration,\n std::unique_ptr<Runtime::Instance::ModuleInstance>>\n@@ -408,6 +432,22 @@ class VM {\n /// Reference to the store.\n Runtime::StoreManager &StoreRef;\n /// @}\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ /// \\name Lazy JIT.\n+ /// @{\n+ /// Prepare Lazy JIT infrastructure for a module.\n+ Expect<WasmEdge::LLVM::LazyJITState> prepareLazyJIT(AST::Module &Module);\n+\n+ /// Lazy compile a function if lazy JIT mode is enabled and function not yet\n+ /// compiled.\n+ Expect<void> lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx);\n+\n+ /// Map from module ID to its lazy JIT state\n+ std::unordered_map<std::string, WasmEdge::LLVM::LazyJITState> LazyJITStates;\n+\n+ /// @}\n+#endif\n };\n \n } // namespace VM\n"},"changed_files":{"kind":"list like","value":["include/vm/vm.h"],"string":"[\n \"include/vm/vm.h\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"Could you please explain why we need to use `recursive_mutex` instead of `mutex`? \nCould you compile with `-fsanitize=thread -fno-omit-frame-pointer` and provide a test case where `mutex` must not work?","path":"include/vm/vm.h","hunk":"@@ -373,6 +382,7 @@ class VM {\n Statistics::Statistics Stat;\n VMStage Stage;\n mutable std::shared_mutex Mutex;\n+ mutable std::recursive_mutex LazyMutex;","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/include/vm/vm.h b/include/vm/vm.h\nindex 543a4c19712e..afa401415a0f 100644\n--- a/include/vm/vm.h\n+++ b/include/vm/vm.h\n@@ -26,12 +26,20 @@\n #include \"runtime/instance/module.h\"\n #include \"runtime/storemgr.h\"\n \n+#ifdef WASMEDGE_USE_LLVM\n+#include \"llvm/compiler.h\"\n+#include \"llvm/data.h\"\n+#include \"llvm/jit.h\"\n+#endif\n+\n #include <cstdint>\n #include <memory>\n+#include <mutex>\n #include <shared_mutex>\n #include <string>\n #include <string_view>\n #include <unordered_map>\n+#include <unordered_set>\n #include <utility>\n #include <vector>\n \n@@ -281,6 +289,17 @@ class VM {\n /// Getter for statistics.\n Statistics::Statistics &getStatistics() noexcept { return Stat; }\n \n+#ifdef WASMEDGE_USE_LLVM\n+ uint32_t getLazyCompiledFuncCount() const noexcept {\n+ std::shared_lock Lock(LazyJITMutex);\n+ uint32_t Count = 0;\n+ for (const auto &Pair : LazyJITStates) {\n+ Count += static_cast<uint32_t>(Pair.second.LazyCompiledFuncs.size());\n+ }\n+ return Count;\n+ }\n+#endif\n+\n private:\n Expect<void> unsafeRegisterModule(std::string_view Name,\n const std::filesystem::path &Path);\n@@ -375,6 +394,7 @@ class VM {\n Statistics::Statistics Stat;\n VMStage Stage;\n mutable std::shared_mutex Mutex;\n+ mutable std::shared_mutex LazyJITMutex;\n /// @}\n \n /// \\name VM components.\n@@ -392,8 +412,12 @@ class VM {\n /// Active module instance.\n std::unique_ptr<Runtime::Instance::ModuleInstance> ActiveModInst;\n std::unique_ptr<Runtime::Instance::ComponentInstance> ActiveCompInst;\n+ /// Registered AST modules.\n+ std::vector<std::shared_ptr<const AST::Module>> RegASTModules;\n /// Registered module instances by user.\n std::vector<std::unique_ptr<Runtime::Instance::ModuleInstance>> RegModInsts;\n+ /// Map from ID to the index in RegASTModules and RegModInsts.\n+ std::unordered_map<std::string, std::array<size_t, 2>> RegModMap;\n /// Built-in module instances mapped to the configurations. For WASI.\n std::unordered_map<HostRegistration,\n std::unique_ptr<Runtime::Instance::ModuleInstance>>\n@@ -408,6 +432,22 @@ class VM {\n /// Reference to the store.\n Runtime::StoreManager &StoreRef;\n /// @}\n+\n+#ifdef WASMEDGE_USE_LLVM\n+ /// \\name Lazy JIT.\n+ /// @{\n+ /// Prepare Lazy JIT infrastructure for a module.\n+ Expect<WasmEdge::LLVM::LazyJITState> prepareLazyJIT(AST::Module &Module);\n+\n+ /// Lazy compile a function if lazy JIT mode is enabled and function not yet\n+ /// compiled.\n+ Expect<void> lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx);\n+\n+ /// Map from module ID to its lazy JIT state\n+ std::unordered_map<std::string, WasmEdge::LLVM::LazyJITState> LazyJITStates;\n+\n+ /// @}\n+#endif\n };\n \n } // namespace VM\n"}],"string":"[\n {\n \"comment\": \"Could you please explain why we need to use `recursive_mutex` instead of `mutex`? \\nCould you compile with `-fsanitize=thread -fno-omit-frame-pointer` and provide a test case where `mutex` must not work?\",\n \"path\": \"include/vm/vm.h\",\n \"hunk\": \"@@ -373,6 +382,7 @@ class VM {\\n Statistics::Statistics Stat;\\n VMStage Stage;\\n mutable std::shared_mutex Mutex;\\n+ mutable std::recursive_mutex LazyMutex;\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/include/vm/vm.h b/include/vm/vm.h\\nindex 543a4c19712e..afa401415a0f 100644\\n--- a/include/vm/vm.h\\n+++ b/include/vm/vm.h\\n@@ -26,12 +26,20 @@\\n #include \\\"runtime/instance/module.h\\\"\\n #include \\\"runtime/storemgr.h\\\"\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+#include \\\"llvm/compiler.h\\\"\\n+#include \\\"llvm/data.h\\\"\\n+#include \\\"llvm/jit.h\\\"\\n+#endif\\n+\\n #include <cstdint>\\n #include <memory>\\n+#include <mutex>\\n #include <shared_mutex>\\n #include <string>\\n #include <string_view>\\n #include <unordered_map>\\n+#include <unordered_set>\\n #include <utility>\\n #include <vector>\\n \\n@@ -281,6 +289,17 @@ class VM {\\n /// Getter for statistics.\\n Statistics::Statistics &getStatistics() noexcept { return Stat; }\\n \\n+#ifdef WASMEDGE_USE_LLVM\\n+ uint32_t getLazyCompiledFuncCount() const noexcept {\\n+ std::shared_lock Lock(LazyJITMutex);\\n+ uint32_t Count = 0;\\n+ for (const auto &Pair : LazyJITStates) {\\n+ Count += static_cast<uint32_t>(Pair.second.LazyCompiledFuncs.size());\\n+ }\\n+ return Count;\\n+ }\\n+#endif\\n+\\n private:\\n Expect<void> unsafeRegisterModule(std::string_view Name,\\n const std::filesystem::path &Path);\\n@@ -375,6 +394,7 @@ class VM {\\n Statistics::Statistics Stat;\\n VMStage Stage;\\n mutable std::shared_mutex Mutex;\\n+ mutable std::shared_mutex LazyJITMutex;\\n /// @}\\n \\n /// \\\\name VM components.\\n@@ -392,8 +412,12 @@ class VM {\\n /// Active module instance.\\n std::unique_ptr<Runtime::Instance::ModuleInstance> ActiveModInst;\\n std::unique_ptr<Runtime::Instance::ComponentInstance> ActiveCompInst;\\n+ /// Registered AST modules.\\n+ std::vector<std::shared_ptr<const AST::Module>> RegASTModules;\\n /// Registered module instances by user.\\n std::vector<std::unique_ptr<Runtime::Instance::ModuleInstance>> RegModInsts;\\n+ /// Map from ID to the index in RegASTModules and RegModInsts.\\n+ std::unordered_map<std::string, std::array<size_t, 2>> RegModMap;\\n /// Built-in module instances mapped to the configurations. For WASI.\\n std::unordered_map<HostRegistration,\\n std::unique_ptr<Runtime::Instance::ModuleInstance>>\\n@@ -408,6 +432,22 @@ class VM {\\n /// Reference to the store.\\n Runtime::StoreManager &StoreRef;\\n /// @}\\n+\\n+#ifdef WASMEDGE_USE_LLVM\\n+ /// \\\\name Lazy JIT.\\n+ /// @{\\n+ /// Prepare Lazy JIT infrastructure for a module.\\n+ Expect<WasmEdge::LLVM::LazyJITState> prepareLazyJIT(AST::Module &Module);\\n+\\n+ /// Lazy compile a function if lazy JIT mode is enabled and function not yet\\n+ /// compiled.\\n+ Expect<void> lazyCompileFunctions(const std::string &ID, uint32_t FuncIdx);\\n+\\n+ /// Map from module ID to its lazy JIT state\\n+ std::unordered_map<std::string, WasmEdge::LLVM::LazyJITState> LazyJITStates;\\n+\\n+ /// @}\\n+#endif\\n };\\n \\n } // namespace VM\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":13299,"cells":{"repo":{"kind":"string","value":"WasmEdge/WasmEdge"},"pr_number":{"kind":"number","value":4723,"string":"4,723"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"feat: implement per function compilation in jit"},"pr_body":{"kind":"string","value":"You only verified the results, which means we don't know if it's lazy or eager. We should also rely on some real metrics for the verification."},"base_sha":{"kind":"string","value":"9d431499ab32e01ac19e61738eafa310f700d31e"},"head_sha":{"kind":"string","value":"67f93b5a08e799af47f68e08dba299c6a6dbc88d"},"gold_diff":{"kind":"string","value":"diff --git a/test/llvm/LazyJITTest.cpp b/test/llvm/LazyJITTest.cpp\nnew file mode 100644\nindex 000000000000..2d36b436039c\n--- /dev/null\n+++ b/test/llvm/LazyJITTest.cpp\n@@ -0,0 +1,784 @@\n+// SPDX-License-Identifier: Apache-2.0\n+// SPDX-FileCopyrightText: 2019-2026 Second State INC\n+\n+//===-- test/llvm/LazyJITTest.cpp - Lazy JIT compilation tests ------------===//\n+//\n+// Part of the WasmEdge Project.\n+//\n+//===----------------------------------------------------------------------===//\n+///\n+/// \\file\n+/// This file contains tests for the lazy JIT (per-function) compilation\n+/// feature. It verifies that:\n+/// 1. Lazy JIT mode can be enabled via configuration\n+/// 2. Functions are compiled on-demand rather than upfront\n+/// 3. The behavior is correct compared to eager compilation\n+///\n+//===----------------------------------------------------------------------===//\n+\n+#include \"common/configure.h\"\n+#include \"common/spdlog.h\"\n+#include \"common/types.h\"\n+#include \"runtime/callingframe.h\"\n+#include \"runtime/instance/module.h\"\n+#include \"vm/vm.h\"\n+#include \"llvm/jit.h\"\n+#include <gtest/gtest.h>\n+#include <thread>\n+\n+namespace {\n+\n+using namespace std::literals;\n+using namespace WasmEdge;\n+\n+// Module with 6 functions: add, mul, sub, const42, unused1, unused2\n+std::vector<uint8_t> SimpleWasm = {\n+ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x17, 0x04, 0x60,\n+ 0x02, 0x7f, 0x7f, 0x01, 0x7f, 0x60, 0x00, 0x01, 0x7f, 0x60, 0x01, 0x7f,\n+ 0x01, 0x7f, 0x60, 0x03, 0x7f, 0x7f, 0x7f, 0x01, 0x7f, 0x03, 0x07, 0x06,\n+ 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x07, 0x31, 0x06, 0x03, 0x61, 0x64,\n+ 0x64, 0x00, 0x00, 0x03, 0x6d, 0x75, 0x6c, 0x00, 0x01, 0x03, 0x73, 0x75,\n+ 0x62, 0x00, 0x02, 0x07, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x34, 0x32, 0x00,\n+ 0x03, 0x07, 0x75, 0x6e, 0x75, 0x73, 0x65, 0x64, 0x31, 0x00, 0x04, 0x07,\n+ 0x75, 0x6e, 0x75, 0x73, 0x65, 0x64, 0x32, 0x00, 0x05, 0x0a, 0x32, 0x06,\n+ 0x07, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6a, 0x0b, 0x07, 0x00, 0x20, 0x00,\n+ 0x20, 0x01, 0x6c, 0x0b, 0x07, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6b, 0x0b,\n+ 0x04, 0x00, 0x41, 0x2a, 0x0b, 0x08, 0x00, 0x20, 0x00, 0x41, 0xe4, 0x00,\n+ 0x6a, 0x0b, 0x0a, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6a, 0x20, 0x02, 0x6c,\n+ 0x0b};\n+\n+std::vector<uint8_t> FibonacciWasm = {\n+ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x06, 0x01,\n+ 0x60, 0x01, 0x7f, 0x01, 0x7f, 0x03, 0x02, 0x01, 0x00, 0x07, 0x07,\n+ 0x01, 0x03, 0x66, 0x69, 0x62, 0x00, 0x00, 0x0a, 0x1e, 0x01, 0x1c,\n+ 0x00, 0x20, 0x00, 0x41, 0x02, 0x48, 0x04, 0x7f, 0x41, 0x01, 0x05,\n+ 0x20, 0x00, 0x41, 0x02, 0x6b, 0x10, 0x00, 0x20, 0x00, 0x41, 0x01,\n+ 0x6b, 0x10, 0x00, 0x6a, 0x0b, 0x0b};\n+\n+// Module with 1 imported function and 3 local functions:\n+// import \"env\" \"host_add\" (func (param i32 i32) (result i32))\n+// export \"call_host\" -> calls host_add\n+// export \"double_add\" -> calls host_add twice, adds results\n+// export \"local_mul\" -> pure local i32.mul\n+std::vector<uint8_t> ImportWasm = {\n+ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x07, 0x01, 0x60,\n+ 0x02, 0x7f, 0x7f, 0x01, 0x7f, 0x02, 0x10, 0x01, 0x03, 0x65, 0x6e, 0x76,\n+ 0x08, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x61, 0x64, 0x64, 0x00, 0x00, 0x03,\n+ 0x04, 0x03, 0x00, 0x00, 0x00, 0x07, 0x26, 0x03, 0x09, 0x63, 0x61, 0x6c,\n+ 0x6c, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x00, 0x01, 0x0a, 0x64, 0x6f, 0x75,\n+ 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x00, 0x02, 0x09, 0x6c, 0x6f,\n+ 0x63, 0x61, 0x6c, 0x5f, 0x6d, 0x75, 0x6c, 0x00, 0x03, 0x0a, 0x22, 0x03,\n+ 0x08, 0x00, 0x20, 0x00, 0x20, 0x01, 0x10, 0x00, 0x0b, 0x0f, 0x00, 0x20,\n+ 0x00, 0x20, 0x01, 0x10, 0x00, 0x20, 0x00, 0x20, 0x01, 0x10, 0x00, 0x6a,\n+ 0x0b, 0x07, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6c, 0x0b};\n+\n+// Library module exporting \"add\" and \"mul\" (i32,i32)->i32\n+std::vector<uint8_t> MathLibWasm = {\n+ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x07, 0x01, 0x60,\n+ 0x02, 0x7f, 0x7f, 0x01, 0x7f, 0x03, 0x03, 0x02, 0x00, 0x00, 0x07, 0x0d,\n+ 0x02, 0x03, 0x61, 0x64, 0x64, 0x00, 0x00, 0x03, 0x6d, 0x75, 0x6c, 0x00,\n+ 0x01, 0x0a, 0x11, 0x02, 0x07, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6a, 0x0b,\n+ 0x07, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6c, 0x0b};\n+\n+// Consumer module importing \"math\".\"add\" and \"math\".\"mul\",\n+// exporting \"add_and_square\" = (a+b)*(a+b) and \"sum_of_squares\" = a*a+b*b\n+std::vector<uint8_t> MathConsumerWasm = {\n+ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x07, 0x01,\n+ 0x60, 0x02, 0x7f, 0x7f, 0x01, 0x7f, 0x02, 0x17, 0x02, 0x04, 0x6d,\n+ 0x61, 0x74, 0x68, 0x03, 0x61, 0x64, 0x64, 0x00, 0x00, 0x04, 0x6d,\n+ 0x61, 0x74, 0x68, 0x03, 0x6d, 0x75, 0x6c, 0x00, 0x00, 0x03, 0x03,\n+ 0x02, 0x00, 0x00, 0x07, 0x23, 0x02, 0x0e, 0x61, 0x64, 0x64, 0x5f,\n+ 0x61, 0x6e, 0x64, 0x5f, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x00,\n+ 0x02, 0x0e, 0x73, 0x75, 0x6d, 0x5f, 0x6f, 0x66, 0x5f, 0x73, 0x71,\n+ 0x75, 0x61, 0x72, 0x65, 0x73, 0x00, 0x03, 0x0a, 0x23, 0x02, 0x10,\n+ 0x00, 0x20, 0x00, 0x20, 0x01, 0x10, 0x00, 0x20, 0x00, 0x20, 0x01,\n+ 0x10, 0x00, 0x10, 0x01, 0x0b, 0x10, 0x00, 0x20, 0x00, 0x20, 0x00,\n+ 0x10, 0x01, 0x20, 0x01, 0x20, 0x01, 0x10, 0x01, 0x10, 0x00, 0x0b};\n+\n+class HostAdd : public Runtime::HostFunction<HostAdd> {\n+public:\n+ Expect<uint32_t> body(const Runtime::CallingFrame &, uint32_t A, uint32_t B) {\n+ return A + B;\n+ }\n+};\n+\n+class TestEnvModule : public Runtime::Instance::ModuleInstance {\n+public:\n+ TestEnvModule() : ModuleInstance(\"env\") {\n+ addHostFunc(\"host_add\", std::make_unique<HostAdd>());\n+ }\n+};\n+\n+class LazyJITTest : public ::testing::Test {\n+protected:\n+ // Helper to create a VM with eager JIT\n+ std::unique_ptr<VM::VM> createEagerJITVM() {\n+ Configure Conf;\n+ Conf.getRuntimeConfigure().setRunMode(RunMode::JIT);\n+ Conf.getCompilerConfigure().setOptimizationLevel(\n+ CompilerConfigure::OptimizationLevel::O1);\n+ return std::make_unique<VM::VM>(Conf);\n+ }\n+\n+ // Helper to create a VM with lazy JIT\n+ std::unique_ptr<VM::VM> createLazyJITVM() {\n+ Configure Conf;\n+ Conf.getRuntimeConfigure().setRunMode(RunMode::LazyJIT);\n+ Conf.getCompilerConfigure().setOptimizationLevel(\n+ CompilerConfigure::OptimizationLevel::O1);\n+ return std::make_unique<VM::VM>(Conf);\n+ }\n+};\n+\n+TEST_F(LazyJITTest, ConfigurationDefaultDisabled) {\n+ Configure Conf;\n+ EXPECT_EQ(Conf.getRuntimeConfigure().getRunMode(), RunMode::Interpreter);\n+}\n+\n+TEST_F(LazyJITTest, ConfigurationEnableDisable) {\n+ Configure Conf;\n+\n+ // Enable lazy JIT\n+ Conf.getRuntimeConfigure().setRunMode(RunMode::LazyJIT);\n+ EXPECT_EQ(Conf.getRuntimeConfigure().getRunMode(), RunMode::LazyJIT);\n+\n+ // Disable lazy JIT (back to interpreter)\n+ Conf.getRuntimeConfigure().setRunMode(RunMode::Interpreter);\n+ EXPECT_NE(Conf.getRuntimeConfigure().getRunMode(), RunMode::LazyJIT);\n+}\n+\n+TEST_F(LazyJITTest, RuntimeConfigureIndependent) {\n+ RuntimeConfigure RConf1;\n+ RuntimeConfigure RConf2;\n+\n+ RConf1.setRunMode(RunMode::LazyJIT);\n+ EXPECT_EQ(RConf1.getRunMode(), RunMode::LazyJIT);\n+ EXPECT_NE(RConf2.getRunMode(), RunMode::LazyJIT);\n+}\n+\n+TEST_F(LazyJITTest, LazyJITCorrectness) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\n+\n+ // Test add function - should trigger lazy compilation\n+ std::vector<ValVariant> AddP = {10U, 5U};\n+ auto AddResult = VM->execute(\"add\", AddP, Types);\n+ ASSERT_TRUE(AddResult);\n+ EXPECT_EQ((*AddResult)[0].first.get<uint32_t>(), 15U);\n+\n+ // Test mul function - should trigger lazy compilation\n+ std::vector<ValVariant> MulP = {7U, 6U};\n+ auto MulResult = VM->execute(\"mul\", MulP, Types);\n+ ASSERT_TRUE(MulResult);\n+ EXPECT_EQ((*MulResult)[0].first.get<uint32_t>(), 42U);\n+\n+ // Test sub function - should trigger lazy compilation\n+ std::vector<ValVariant> SubP = {20U, 8U};\n+ auto SubResult = VM->execute(\"sub\", SubP, Types);\n+ ASSERT_TRUE(SubResult);\n+ EXPECT_EQ((*SubResult)[0].first.get<uint32_t>(), 12U);\n+\n+ // Test const42 function\n+ std::vector<ValVariant> EmptyP = {};\n+ std::vector<ValType> EmptyT = {};\n+ auto ConstResult = VM->execute(\"const42\", EmptyP, EmptyT);\n+ ASSERT_TRUE(ConstResult);\n+ EXPECT_EQ((*ConstResult)[0].first.get<uint32_t>(), 42U);\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITRepeatCalls) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 0U);\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\n+\n+ // First call - triggers lazy compilation\n+ std::vector<ValVariant> P1 = {10U, 5U};\n+ auto Result1 = VM->execute(\"add\", P1, Types);\n+ ASSERT_TRUE(Result1);\n+ EXPECT_EQ((*Result1)[0].first.get<uint32_t>(), 15U);\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 1U);\n+\n+ // Second call - uses cached compiled code\n+ std::vector<ValVariant> P2 = {100U, 200U};\n+ auto Result2 = VM->execute(\"add\", P2, Types);\n+ ASSERT_TRUE(Result2);\n+ EXPECT_EQ((*Result2)[0].first.get<uint32_t>(), 300U);\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 1U);\n+\n+ // Third call - different values\n+ std::vector<ValVariant> P3 = {1U, 1U};\n+ auto Result3 = VM->execute(\"add\", P3, Types);\n+ ASSERT_TRUE(Result3);\n+ EXPECT_EQ((*Result3)[0].first.get<uint32_t>(), 2U);\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 1U);\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITFibonacci) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(FibonacciWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32)};\n+\n+ // Test fibonacci function with various inputs\n+ // fib(0) = 1, fib(1) = 1, fib(2) = 2, fib(3) = 3, fib(4) = 5, fib(5) =8\n+ std::vector<std::pair<uint32_t, uint32_t>> TestCases = {\n+ {0, 1}, {1, 1}, {2, 2}, {3, 3}, {4, 5}, {5, 8}, {10, 89}};\n+\n+ for (const auto &[Input, Expected] : TestCases) {\n+ std::vector<ValVariant> Params = {Input};\n+ auto Result = VM->execute(\"fib\", Params, Types);\n+ ASSERT_TRUE(Result) << \"fib(\" << Input << \") failed\";\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(), Expected)\n+ << \"fib(\" << Input << \") = \" << Expected;\n+ }\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, EagerVsLazyResultsMatch) {\n+ auto EagerVM = createEagerJITVM();\n+ auto LazyVM = createLazyJITVM();\n+\n+ ASSERT_TRUE(EagerVM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(EagerVM->validate());\n+ ASSERT_TRUE(EagerVM->instantiate());\n+\n+ ASSERT_TRUE(LazyVM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(LazyVM->validate());\n+ ASSERT_TRUE(LazyVM->instantiate());\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\n+\n+ // Test with various inputs\n+ std::vector<std::pair<uint32_t, uint32_t>> TestInputs = {\n+ {10, 5}, {0, 0}, {100, 200}, {7, 6}, {0, 100}};\n+\n+ for (const auto &[A, B] : TestInputs) {\n+ std::vector<ValVariant> Params = {A, B};\n+\n+ auto EagerAdd = EagerVM->execute(\"add\", Params, Types);\n+ auto LazyAdd = LazyVM->execute(\"add\", Params, Types);\n+\n+ ASSERT_TRUE(EagerAdd);\n+ ASSERT_TRUE(LazyAdd);\n+ EXPECT_EQ((*EagerAdd)[0].first.get<uint32_t>(),\n+ (*LazyAdd)[0].first.get<uint32_t>())\n+ << \"add(\" << A << \", \" << B << \") mismatch\";\n+\n+ auto EagerMul = EagerVM->execute(\"mul\", Params, Types);\n+ auto LazyMul = LazyVM->execute(\"mul\", Params, Types);\n+\n+ ASSERT_TRUE(EagerMul);\n+ ASSERT_TRUE(LazyMul);\n+ EXPECT_EQ((*EagerMul)[0].first.get<uint32_t>(),\n+ (*LazyMul)[0].first.get<uint32_t>())\n+ << \"mul(\" << A << \", \" << B << \") mismatch\";\n+ }\n+\n+ EagerVM->cleanup();\n+ LazyVM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, EagerVsLazyFibonacciMatch) {\n+ auto EagerVM = createEagerJITVM();\n+ auto LazyVM = createLazyJITVM();\n+\n+ ASSERT_TRUE(EagerVM->loadWasm(FibonacciWasm));\n+ ASSERT_TRUE(EagerVM->validate());\n+ ASSERT_TRUE(EagerVM->instantiate());\n+\n+ ASSERT_TRUE(LazyVM->loadWasm(FibonacciWasm));\n+ ASSERT_TRUE(LazyVM->validate());\n+ ASSERT_TRUE(LazyVM->instantiate());\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32)};\n+\n+ for (uint32_t N = 0; N <= 15; ++N) {\n+ std::vector<ValVariant> Params = {N};\n+ auto EagerResult = EagerVM->execute(\"fib\", Params, Types);\n+ auto LazyResult = LazyVM->execute(\"fib\", Params, Types);\n+\n+ ASSERT_TRUE(EagerResult) << \"Eager fib(\" << N << \") failed\";\n+ ASSERT_TRUE(LazyResult) << \"Lazy fib(\" << N << \") failed\";\n+ EXPECT_EQ((*EagerResult)[0].first.get<uint32_t>(),\n+ (*LazyResult)[0].first.get<uint32_t>())\n+ << \"fib(\" << N << \") mismatch between eager and lazy JIT\";\n+ }\n+\n+ EagerVM->cleanup();\n+ LazyVM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITCallNonExistent) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ // Try to call a non-existent function\n+ std::vector<ValVariant> EmptyP = {};\n+ std::vector<ValType> EmptyT = {};\n+ auto Result = VM->execute(\"nonexistent\", EmptyP, EmptyT);\n+ EXPECT_FALSE(Result);\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITMultipleInstantiations) {\n+ for (int Idx = 0; Idx < 3; ++Idx) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ std::vector<ValVariant> Params = {static_cast<uint32_t>(Idx),\n+ static_cast<uint32_t>(Idx * 10)};\n+ std::vector<ValType> Types = {ValType(TypeCode::I32),\n+ ValType(TypeCode::I32)};\n+ auto Result = VM->execute(\"add\", Params, Types);\n+\n+ ASSERT_TRUE(Result);\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(),\n+ static_cast<uint32_t>(Idx + Idx * 10));\n+\n+ VM->cleanup();\n+ }\n+}\n+\n+TEST_F(LazyJITTest, LazyJITOnlySomeFunctionsCalled) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ auto *AddFunc = VM->getActiveModule()->findFuncExports(\"add\");\n+ auto *MulFunc = VM->getActiveModule()->findFuncExports(\"mul\");\n+ auto *SubFunc = VM->getActiveModule()->findFuncExports(\"sub\");\n+\n+ ASSERT_NE(AddFunc, nullptr);\n+ ASSERT_NE(MulFunc, nullptr);\n+ ASSERT_NE(SubFunc, nullptr);\n+\n+ // Initially none should be compiled\n+ EXPECT_FALSE(AddFunc->isCompiledFunction());\n+ EXPECT_FALSE(MulFunc->isCompiledFunction());\n+ EXPECT_FALSE(SubFunc->isCompiledFunction());\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 0U);\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\n+\n+ // Call 'add' should trigger compilation of function 0\n+ std::vector<ValVariant> AddP = {1U, 2U};\n+ auto AddResult = VM->execute(\"add\", AddP, Types);\n+ ASSERT_TRUE(AddResult);\n+ EXPECT_EQ((*AddResult)[0].first.get<uint32_t>(), 3U);\n+\n+ // Check state: add compiled, others not\n+ EXPECT_TRUE(AddFunc->isCompiledFunction());\n+ EXPECT_FALSE(MulFunc->isCompiledFunction());\n+ EXPECT_FALSE(SubFunc->isCompiledFunction());\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 1U);\n+\n+ // Call 'mul' should trigger compilation of function 1\n+ std::vector<ValVariant> MulP = {3U, 4U};\n+ auto MulResult = VM->execute(\"mul\", MulP, Types);\n+ ASSERT_TRUE(MulResult);\n+ EXPECT_EQ((*MulResult)[0].first.get<uint32_t>(), 12U);\n+\n+ // Check state: add and mul compiled, sub not\n+ EXPECT_TRUE(AddFunc->isCompiledFunction());\n+ EXPECT_TRUE(MulFunc->isCompiledFunction());\n+ EXPECT_FALSE(SubFunc->isCompiledFunction());\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 2U);\n+\n+ // Call 'add' again should NOT increase compiled count (already compiled)\n+ std::vector<ValVariant> AddP2 = {5U, 6U};\n+ auto AddResult2 = VM->execute(\"add\", AddP2, Types);\n+ ASSERT_TRUE(AddResult2);\n+ EXPECT_EQ((*AddResult2)[0].first.get<uint32_t>(), 11U);\n+\n+ // Check state: add and mul compiled, sub not\n+ EXPECT_TRUE(AddFunc->isCompiledFunction());\n+ EXPECT_TRUE(MulFunc->isCompiledFunction());\n+ EXPECT_FALSE(SubFunc->isCompiledFunction());\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 2U);\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITWithImports) {\n+ auto VM = createLazyJITVM();\n+\n+ TestEnvModule HostMod;\n+ ASSERT_TRUE(VM->registerModule(HostMod));\n+\n+ ASSERT_TRUE(VM->loadWasm(ImportWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 0U);\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\n+\n+ // call_host delegates to the imported host_add; only the local wrapper\n+ // should be lazy-compiled, not the import.\n+ std::vector<ValVariant> P1 = {3U, 7U};\n+ auto R1 = VM->execute(\"call_host\", P1, Types);\n+ ASSERT_TRUE(R1);\n+ EXPECT_EQ((*R1)[0].first.get<uint32_t>(), 10U);\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 1U);\n+\n+ // local_mul is a pure local function with no import usage.\n+ std::vector<ValVariant> P2 = {4U, 5U};\n+ auto R2 = VM->execute(\"local_mul\", P2, Types);\n+ ASSERT_TRUE(R2);\n+ EXPECT_EQ((*R2)[0].first.get<uint32_t>(), 20U);\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 2U);\n+\n+ // double_add calls host_add twice and adds the results.\n+ std::vector<ValVariant> P3 = {6U, 8U};\n+ auto R3 = VM->execute(\"double_add\", P3, Types);\n+ ASSERT_TRUE(R3);\n+ EXPECT_EQ((*R3)[0].first.get<uint32_t>(), 28U);\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 3U);\n+\n+ // Repeat call_host – count must not change (cached).\n+ std::vector<ValVariant> P4 = {100U, 200U};\n+ auto R4 = VM->execute(\"call_host\", P4, Types);\n+ ASSERT_TRUE(R4);\n+ EXPECT_EQ((*R4)[0].first.get<uint32_t>(), 300U);\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 3U);\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITWasmImportsWasm) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->registerModule(\"math\", MathLibWasm));\n+\n+ ASSERT_TRUE(VM->loadWasm(MathConsumerWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 0U);\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\n+\n+ std::vector<ValVariant> P1 = {3U, 4U};\n+ auto R1 = VM->execute(\"add_and_square\", P1, Types);\n+ ASSERT_TRUE(R1);\n+ EXPECT_EQ((*R1)[0].first.get<uint32_t>(), 49U);\n+ uint32_t CountAfterFirst = VM->getLazyCompiledFuncCount();\n+ EXPECT_EQ(CountAfterFirst, 3U);\n+\n+ std::vector<ValVariant> P2 = {3U, 4U};\n+ auto R2 = VM->execute(\"sum_of_squares\", P2, Types);\n+ ASSERT_TRUE(R2);\n+ EXPECT_EQ((*R2)[0].first.get<uint32_t>(), 25U);\n+ uint32_t CountAfterSecond = VM->getLazyCompiledFuncCount();\n+ EXPECT_EQ(CountAfterSecond, 4U);\n+\n+ std::vector<ValVariant> P3 = {10U, 20U};\n+ auto R3 = VM->execute(\"add_and_square\", P3, Types);\n+ ASSERT_TRUE(R3);\n+ EXPECT_EQ((*R3)[0].first.get<uint32_t>(), 900U);\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), CountAfterSecond);\n+\n+ std::vector<ValVariant> P4 = {5U, 12U};\n+ auto R4 = VM->execute(\"sum_of_squares\", P4, Types);\n+ ASSERT_TRUE(R4);\n+ EXPECT_EQ((*R4)[0].first.get<uint32_t>(), 169U);\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), CountAfterSecond);\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITReferenceModuleNotReleasedOnCleanup) {\n+ bool Destroyed = false;\n+ auto Deleter = [&Destroyed](AST::Module *M) {\n+ Destroyed = true;\n+ delete M;\n+ };\n+\n+ Configure Conf;\n+ Loader::Loader LoaderEngine(Conf);\n+ auto ModOrErr = LoaderEngine.parseWasmUnit(SimpleWasm);\n+ ASSERT_TRUE(ModOrErr);\n+ auto &RawMod = std::get<std::unique_ptr<AST::Module>>(*ModOrErr);\n+ auto Module = std::shared_ptr<AST::Module>(RawMod.release(), Deleter);\n+\n+ auto VM = createLazyJITVM();\n+ ASSERT_TRUE(VM->registerModule(\"test\", *Module));\n+\n+ VM->cleanup();\n+ EXPECT_FALSE(Destroyed);\n+\n+ Module.reset();\n+ EXPECT_TRUE(Destroyed);\n+}\n+\n+TEST_F(LazyJITTest, LazyJITReferenceModuleNotReleasedOnVMDestruction) {\n+ bool Destroyed = false;\n+ auto Deleter = [&Destroyed](AST::Module *M) {\n+ Destroyed = true;\n+ delete M;\n+ };\n+\n+ Configure Conf;\n+ Loader::Loader LoaderEngine(Conf);\n+ auto ModOrErr = LoaderEngine.parseWasmUnit(SimpleWasm);\n+ ASSERT_TRUE(ModOrErr);\n+ auto &RawMod = std::get<std::unique_ptr<AST::Module>>(*ModOrErr);\n+ auto Module = std::shared_ptr<AST::Module>(RawMod.release(), Deleter);\n+\n+ {\n+ auto VM = createLazyJITVM();\n+ ASSERT_TRUE(VM->registerModule(\"test\", *Module));\n+ }\n+ EXPECT_FALSE(Destroyed);\n+\n+ Module.reset();\n+ EXPECT_TRUE(Destroyed);\n+}\n+\n+TEST_F(LazyJITTest, JITAddLookupFailure) {\n+ Configure Conf;\n+ Conf.getRuntimeConfigure().setRunMode(RunMode::LazyJIT);\n+ Conf.getCompilerConfigure().setOptimizationLevel(\n+ CompilerConfigure::OptimizationLevel::O1);\n+\n+ Loader::Loader LoaderEngine(Conf);\n+ auto ModOrErr = LoaderEngine.parseWasmUnit(SimpleWasm);\n+ ASSERT_TRUE(ModOrErr);\n+ auto &Module = std::get<std::unique_ptr<AST::Module>>(*ModOrErr);\n+\n+ Validator::Validator ValidatorEngine(Conf);\n+ auto ValRes = ValidatorEngine.validate(*Module);\n+ ASSERT_TRUE(ValRes);\n+\n+ LLVM::Compiler Compiler(Conf);\n+ ASSERT_TRUE(Compiler.checkConfigure());\n+\n+ auto Prefix = \"test_prefix_\";\n+ auto CompileRes = Compiler.compileInfrastructure(*Module, Prefix);\n+ ASSERT_TRUE(CompileRes);\n+\n+ auto &LLData = CompileRes->first;\n+ auto &CompileCtx = CompileRes->second;\n+\n+ LLVM::JIT JIT(Conf);\n+ auto ExecRes = JIT.load(LLData, true);\n+ ASSERT_TRUE(ExecRes);\n+\n+ auto JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*ExecRes);\n+\n+ std::vector<uint32_t> CompileLocals = {0};\n+ if (!LLData.hasModule()) {\n+ LLData.resetModule();\n+ }\n+ auto FuncCompileRes = Compiler.compileFunctions(\n+ std::move(LLData), CompileCtx.get(), *Module, CompileLocals);\n+ ASSERT_TRUE(FuncCompileRes);\n+\n+ std::vector<uint32_t> InvalidIndices = {999};\n+\n+ auto AddResult = JIT.add(*JITLib, *FuncCompileRes, InvalidIndices);\n+ EXPECT_FALSE(AddResult);\n+ EXPECT_EQ(AddResult.error(), ErrCode::Value::LazyCompilationError);\n+}\n+\n+TEST_F(LazyJITTest, JITLookupWasmFunctionSymbolsFailure) {\n+ Configure Conf;\n+ Conf.getRuntimeConfigure().setRunMode(RunMode::LazyJIT);\n+ Conf.getCompilerConfigure().setOptimizationLevel(\n+ CompilerConfigure::OptimizationLevel::O1);\n+\n+ Loader::Loader LoaderEngine(Conf);\n+ auto ModOrErr = LoaderEngine.parseWasmUnit(SimpleWasm);\n+ ASSERT_TRUE(ModOrErr);\n+ auto &Module = std::get<std::unique_ptr<AST::Module>>(*ModOrErr);\n+\n+ Validator::Validator ValidatorEngine(Conf);\n+ auto ValRes = ValidatorEngine.validate(*Module);\n+ ASSERT_TRUE(ValRes);\n+\n+ LLVM::Compiler Compiler(Conf);\n+ ASSERT_TRUE(Compiler.checkConfigure());\n+\n+ auto Prefix = \"test_prefix_\";\n+ auto CompileRes = Compiler.compileInfrastructure(*Module, Prefix);\n+ ASSERT_TRUE(CompileRes);\n+\n+ auto &LLData = CompileRes->first;\n+\n+ LLVM::JIT JIT(Conf);\n+ auto ExecRes = JIT.load(LLData, true);\n+ ASSERT_TRUE(ExecRes);\n+\n+ auto JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*ExecRes);\n+\n+ std::vector<uint32_t> InvalidIndices = {999};\n+\n+ auto LookupRes =\n+ JIT.lookupWasmFunctionSymbols(*JITLib, Prefix, InvalidIndices);\n+ EXPECT_FALSE(LookupRes);\n+ EXPECT_EQ(LookupRes.error(), ErrCode::Value::LazyCompilationError);\n+}\n+\n+TEST_F(LazyJITTest, LazyJITConcurrentSameFunction) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\n+ std::vector<std::thread> Threads;\n+ const size_t NumThreads = 8;\n+ Threads.reserve(NumThreads);\n+\n+ for (size_t Idx = 0; Idx < NumThreads; ++Idx) {\n+ Threads.emplace_back([&VM, &Types, Idx]() {\n+ std::vector<ValVariant> Params = {static_cast<uint32_t>(Idx), 10U};\n+ auto Result = VM->execute(\"add\", Params, Types);\n+ EXPECT_TRUE(Result);\n+ if (Result) {\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(),\n+ static_cast<uint32_t>(Idx + 10));\n+ }\n+ });\n+ }\n+\n+ for (auto &T : Threads) {\n+ T.join();\n+ }\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 1U);\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITConcurrentDifferentFunctions) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ std::vector<ValType> Types2 = {ValType(TypeCode::I32),\n+ ValType(TypeCode::I32)};\n+ std::vector<ValType> Types0 = {};\n+\n+ std::vector<std::thread> Threads;\n+ Threads.emplace_back([&VM, &Types2]() {\n+ std::vector<ValVariant> Params = {10U, 20U};\n+ auto Result = VM->execute(\"add\", Params, Types2);\n+ EXPECT_TRUE(Result);\n+ if (Result) {\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(), 30U);\n+ }\n+ });\n+ Threads.emplace_back([&VM, &Types2]() {\n+ std::vector<ValVariant> Params = {5U, 6U};\n+ auto Result = VM->execute(\"mul\", Params, Types2);\n+ EXPECT_TRUE(Result);\n+ if (Result) {\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(), 30U);\n+ }\n+ });\n+ Threads.emplace_back([&VM, &Types2]() {\n+ std::vector<ValVariant> Params = {50U, 20U};\n+ auto Result = VM->execute(\"sub\", Params, Types2);\n+ EXPECT_TRUE(Result);\n+ if (Result) {\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(), 30U);\n+ }\n+ });\n+ Threads.emplace_back([&VM, &Types0]() {\n+ std::vector<ValVariant> Params = {};\n+ auto Result = VM->execute(\"const42\", Params, Types0);\n+ EXPECT_TRUE(Result);\n+ if (Result) {\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(), 42U);\n+ }\n+ });\n+\n+ for (auto &T : Threads) {\n+ T.join();\n+ }\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 4U);\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITConcurrentFibonacci) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(FibonacciWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32)};\n+ std::vector<std::thread> Threads;\n+ const size_t NumThreads = 8;\n+ Threads.reserve(NumThreads);\n+\n+ for (size_t Idx = 0; Idx < NumThreads; ++Idx) {\n+ Threads.emplace_back([&VM, &Types, Idx]() {\n+ std::vector<ValVariant> Params = {static_cast<uint32_t>(Idx)};\n+ auto Result = VM->execute(\"fib\", Params, Types);\n+ EXPECT_TRUE(Result);\n+ if (Result) {\n+ uint32_t Expected = 0;\n+ if (Idx == 0 || Idx == 1) {\n+ Expected = 1;\n+ } else {\n+ uint32_t Prev2 = 1;\n+ uint32_t Prev1 = 1;\n+ for (size_t Jdx = 2; Jdx <= Idx; ++Jdx) {\n+ Expected = Prev2 + Prev1;\n+ Prev2 = Prev1;\n+ Prev1 = Expected;\n+ }\n+ }\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(), Expected);\n+ }\n+ });\n+ }\n+\n+ for (auto &T : Threads) {\n+ T.join();\n+ }\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 1U);\n+\n+ VM->cleanup();\n+}\n+\n+} // namespace\n+\n+GTEST_API_ int main(int argc, char **argv) {\n+ WasmEdge::Log::setErrorLoggingLevel();\n+ testing::InitGoogleTest(&argc, argv);\n+ return RUN_ALL_TESTS();\n+}\n"},"changed_files":{"kind":"list like","value":["test/llvm/LazyJITTest.cpp"],"string":"[\n \"test/llvm/LazyJITTest.cpp\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"You only verified the results, which means we don't know if it's lazy or eager. We should also rely on some real metrics for the verification.","path":"test/llvm/LazyJITTest.cpp","hunk":"@@ -0,0 +1,435 @@\n+// SPDX-License-Identifier: Apache-2.0\n+// SPDX-FileCopyrightText: 2019-2024 Second State INC\n+\n+//===-- test/llvm/LazyJITTest.cpp - Lazy JIT compilation tests ------------===//\n+//\n+// Part of the WasmEdge Project.\n+//\n+//===----------------------------------------------------------------------===//\n+///\n+/// \\file\n+/// This file contains tests for the lazy JIT (per-function) compilation\n+/// feature. It verifies that:\n+/// 1. Lazy JIT mode can be enabled via configuration\n+/// 2. Functions are compiled on-demand rather than upfront\n+/// 3. The behavior is correct compared to eager compilation\n+///\n+//===----------------------------------------------------------------------===//\n+\n+#include \"common/configure.h\"\n+#include \"common/spdlog.h\"\n+#include \"common/types.h\"\n+#include \"vm/vm.h\"\n+#include \"llvm/jit.h\"\n+#include <gtest/gtest.h>\n+\n+namespace {\n+\n+using namespace std::literals;\n+using namespace WasmEdge;\n+\n+// Simple module with 6 functions: add, mul, sub, const42, unused1, unused2\n+// Compiled from:\n+std::vector<uint8_t> SimpleWasm = {\n+ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x17, 0x04, 0x60,\n+ 0x02, 0x7f, 0x7f, 0x01, 0x7f, 0x60, 0x00, 0x01, 0x7f, 0x60, 0x01, 0x7f,\n+ 0x01, 0x7f, 0x60, 0x03, 0x7f, 0x7f, 0x7f, 0x01, 0x7f, 0x03, 0x07, 0x06,\n+ 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x07, 0x31, 0x06, 0x03, 0x61, 0x64,\n+ 0x64, 0x00, 0x00, 0x03, 0x6d, 0x75, 0x6c, 0x00, 0x01, 0x03, 0x73, 0x75,\n+ 0x62, 0x00, 0x02, 0x07, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x34, 0x32, 0x00,\n+ 0x03, 0x07, 0x75, 0x6e, 0x75, 0x73, 0x65, 0x64, 0x31, 0x00, 0x04, 0x07,\n+ 0x75, 0x6e, 0x75, 0x73, 0x65, 0x64, 0x32, 0x00, 0x05, 0x0a, 0x32, 0x06,\n+ 0x07, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6a, 0x0b, 0x07, 0x00, 0x20, 0x00,\n+ 0x20, 0x01, 0x6c, 0x0b, 0x07, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6b, 0x0b,\n+ 0x04, 0x00, 0x41, 0x2a, 0x0b, 0x08, 0x00, 0x20, 0x00, 0x41, 0xe4, 0x00,\n+ 0x6a, 0x0b, 0x0a, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6a, 0x20, 0x02, 0x6c,\n+ 0x0b};\n+\n+std::vector<uint8_t> FibonacciWasm = {\n+ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x06, 0x01,\n+ 0x60, 0x01, 0x7f, 0x01, 0x7f, 0x03, 0x02, 0x01, 0x00, 0x07, 0x07,\n+ 0x01, 0x03, 0x66, 0x69, 0x62, 0x00, 0x00, 0x0a, 0x1e, 0x01, 0x1c,\n+ 0x00, 0x20, 0x00, 0x41, 0x02, 0x48, 0x04, 0x7f, 0x41, 0x01, 0x05,\n+ 0x20, 0x00, 0x41, 0x02, 0x6b, 0x10, 0x00, 0x20, 0x00, 0x41, 0x01,\n+ 0x6b, 0x10, 0x00, 0x6a, 0x0b, 0x0b};\n+\n+class LazyJITTest : public ::testing::Test {\n+protected:\n+ // Helper to create a VM with eager JIT\n+ std::unique_ptr<VM::VM> createEagerJITVM() {\n+ Configure Conf;\n+ Conf.getRuntimeConfigure().setEnableJIT(true);\n+ Conf.getRuntimeConfigure().setEnableLazyJIT(false);\n+ Conf.getCompilerConfigure().setOptimizationLevel(\n+ CompilerConfigure::OptimizationLevel::O0);\n+ return std::make_unique<VM::VM>(Conf);\n+ }\n+\n+ // Helper to create a VM with lazy JIT\n+ std::unique_ptr<VM::VM> createLazyJITVM() {\n+ Configure Conf;\n+ Conf.getRuntimeConfigure().setEnableJIT(true);\n+ Conf.getRuntimeConfigure().setEnableLazyJIT(true);\n+ Conf.getCompilerConfigure().setOptimizationLevel(\n+ CompilerConfigure::OptimizationLevel::O0);\n+ return std::make_unique<VM::VM>(Conf);\n+ }\n+\n+ // Helper to create a VM with interpreter mode\n+ std::unique_ptr<VM::VM> createInterpreterVM() {\n+ Configure Conf;\n+ Conf.getRuntimeConfigure().setEnableJIT(false);\n+ Conf.getRuntimeConfigure().setEnableLazyJIT(false);\n+ return std::make_unique<VM::VM>(Conf);\n+ }\n+};\n+\n+TEST_F(LazyJITTest, ConfigurationDefaultDisabled) {\n+ Configure Conf;\n+ EXPECT_FALSE(Conf.getRuntimeConfigure().isEnableLazyJIT());\n+ EXPECT_FALSE(Conf.getRuntimeConfigure().isEnableJIT());\n+}\n+\n+TEST_F(LazyJITTest, ConfigurationEnableDisable) {\n+ Configure Conf;\n+\n+ // Enable lazy JIT\n+ Conf.getRuntimeConfigure().setEnableLazyJIT(true);\n+ EXPECT_TRUE(Conf.getRuntimeConfigure().isEnableLazyJIT());\n+\n+ // Disable lazy JIT\n+ Conf.getRuntimeConfigure().setEnableLazyJIT(false);\n+ EXPECT_FALSE(Conf.getRuntimeConfigure().isEnableLazyJIT());\n+}\n+\n+TEST_F(LazyJITTest, ConfigurationCopy) {\n+ Configure Conf1;\n+ Conf1.getRuntimeConfigure().setEnableLazyJIT(true);\n+ Conf1.getRuntimeConfigure().setEnableJIT(true);\n+\n+ // Copy constructor\n+ Configure Conf2(Conf1);\n+ EXPECT_TRUE(Conf2.getRuntimeConfigure().isEnableLazyJIT());\n+ EXPECT_TRUE(Conf2.getRuntimeConfigure().isEnableJIT());\n+\n+ // Modify original should not affect copy\n+ Conf1.getRuntimeConfigure().setEnableLazyJIT(false);\n+ EXPECT_TRUE(Conf2.getRuntimeConfigure().isEnableLazyJIT());\n+}\n+\n+TEST_F(LazyJITTest, RuntimeConfigureIndependent) {\n+ RuntimeConfigure RConf1;\n+ RuntimeConfigure RConf2;\n+\n+ RConf1.setEnableLazyJIT(true);\n+ EXPECT_TRUE(RConf1.isEnableLazyJIT());\n+ EXPECT_FALSE(RConf2.isEnableLazyJIT());\n+}\n+\n+TEST_F(LazyJITTest, InterpreterModeBaseline) {\n+ auto VM = createInterpreterVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ // Test add function\n+ std::vector<ValVariant> AddParams = {10U, 5U};\n+ std::vector<ValType> AddTypes = {ValType(TypeCode::I32),\n+ ValType(TypeCode::I32)};\n+ auto AddResult = VM->execute(\"add\", AddParams, AddTypes);\n+ ASSERT_TRUE(AddResult);\n+ ASSERT_EQ((*AddResult).size(), 1U);\n+ EXPECT_EQ((*AddResult)[0].first.get<uint32_t>(), 15U);\n+\n+ // Test mul function\n+ std::vector<ValVariant> MulParams = {7U, 6U};\n+ auto MulResult = VM->execute(\"mul\", MulParams, AddTypes);\n+ ASSERT_TRUE(MulResult);\n+ ASSERT_EQ((*MulResult).size(), 1U);\n+ EXPECT_EQ((*MulResult)[0].first.get<uint32_t>(), 42U);\n+\n+ // Test const42 function\n+ std::vector<ValVariant> ConstParams = {};\n+ std::vector<ValType> ConstTypes = {};\n+ auto ConstResult = VM->execute(\"const42\", ConstParams, ConstTypes);\n+ ASSERT_TRUE(ConstResult);\n+ ASSERT_EQ((*ConstResult).size(), 1U);\n+ EXPECT_EQ((*ConstResult)[0].first.get<uint32_t>(), 42U);\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, EagerJITBaseline) {\n+ auto VM = createEagerJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\n+\n+ // Test add function\n+ std::vector<ValVariant> AddP = {10U, 5U};\n+ auto AddResult = VM->execute(\"add\", AddP, Types);\n+ ASSERT_TRUE(AddResult);\n+ EXPECT_EQ((*AddResult)[0].first.get<uint32_t>(), 15U);\n+\n+ // Test mul function\n+ std::vector<ValVariant> MulP = {7U, 6U};\n+ auto MulResult = VM->execute(\"mul\", MulP, Types);\n+ ASSERT_TRUE(MulResult);\n+ EXPECT_EQ((*MulResult)[0].first.get<uint32_t>(), 42U);\n+\n+ // Test sub function\n+ std::vector<ValVariant> SubP = {20U, 8U};\n+ auto SubResult = VM->execute(\"sub\", SubP, Types);\n+ ASSERT_TRUE(SubResult);\n+ EXPECT_EQ((*SubResult)[0].first.get<uint32_t>(), 12U);\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITCorrectness) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\n+\n+ // Test add function - should trigger lazy compilation\n+ std::vector<ValVariant> AddP = {10U, 5U};\n+ auto AddResult = VM->execute(\"add\", AddP, Types);\n+ ASSERT_TRUE(AddResult);\n+ EXPECT_EQ((*AddResult)[0].first.get<uint32_t>(), 15U);\n+\n+ // Test mul function - should trigger lazy compilation\n+ std::vector<ValVariant> MulP = {7U, 6U};\n+ auto MulResult = VM->execute(\"mul\", MulP, Types);\n+ ASSERT_TRUE(MulResult);\n+ EXPECT_EQ((*MulResult)[0].first.get<uint32_t>(), 42U);\n+\n+ // Test sub function - should trigger lazy compilation\n+ std::vector<ValVariant> SubP = {20U, 8U};\n+ auto SubResult = VM->execute(\"sub\", SubP, Types);\n+ ASSERT_TRUE(SubResult);\n+ EXPECT_EQ((*SubResult)[0].first.get<uint32_t>(), 12U);\n+\n+ // Test const42 function\n+ std::vector<ValVariant> EmptyP = {};\n+ std::vector<ValType> EmptyT = {};\n+ auto ConstResult = VM->execute(\"const42\", EmptyP, EmptyT);\n+ ASSERT_TRUE(ConstResult);\n+ EXPECT_EQ((*ConstResult)[0].first.get<uint32_t>(), 42U);\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITRepeatCalls) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\n+\n+ // First call - triggers lazy compilation\n+ std::vector<ValVariant> P1 = {10U, 5U};\n+ auto Result1 = VM->execute(\"add\", P1, Types);\n+ ASSERT_TRUE(Result1);\n+ EXPECT_EQ((*Result1)[0].first.get<uint32_t>(), 15U);\n+\n+ // Second call - uses cached compiled code\n+ std::vector<ValVariant> P2 = {100U, 200U};\n+ auto Result2 = VM->execute(\"add\", P2, Types);\n+ ASSERT_TRUE(Result2);\n+ EXPECT_EQ((*Result2)[0].first.get<uint32_t>(), 300U);\n+\n+ // Third call - different values\n+ std::vector<ValVariant> P3 = {1U, 1U};\n+ auto Result3 = VM->execute(\"add\", P3, Types);\n+ ASSERT_TRUE(Result3);\n+ EXPECT_EQ((*Result3)[0].first.get<uint32_t>(), 2U);\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITFibonacci) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(FibonacciWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32)};\n+\n+ // Test fibonacci function with various inputs\n+ // fib(0) = 1, fib(1) = 1, fib(2) = 2, fib(3) = 3, fib(4) = 5, fib(5) =8\n+ std::vector<std::pair<uint32_t, uint32_t>> TestCases = {\n+ {0, 1}, {1, 1}, {2, 2}, {3, 3}, {4, 5}, {5, 8}, {10, 89}};\n+\n+ for (const auto &[Input, Expected] : TestCases) {\n+ std::vector<ValVariant> Params = {Input};\n+ auto Result = VM->execute(\"fib\", Params, Types);\n+ ASSERT_TRUE(Result) << \"fib(\" << Input << \") failed\";\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(), Expected)\n+ << \"fib(\" << Input << \") = \" << Expected;\n+ }\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, EagerVsLazyResultsMatch) {\n+ auto EagerVM = createEagerJITVM();\n+ auto LazyVM = createLazyJITVM();\n+\n+ ASSERT_TRUE(EagerVM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(EagerVM->validate());\n+ ASSERT_TRUE(EagerVM->instantiate());\n+\n+ ASSERT_TRUE(LazyVM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(LazyVM->validate());\n+ ASSERT_TRUE(LazyVM->instantiate());\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\n+\n+ // Test with various inputs\n+ std::vector<std::pair<uint32_t, uint32_t>> TestInputs = {\n+ {10, 5}, {0, 0}, {100, 200}, {7, 6}, {0, 100}};\n+\n+ for (const auto &[A, B] : TestInputs) {\n+ std::vector<ValVariant> Params = {A, B};\n+\n+ auto EagerAdd = EagerVM->execute(\"add\", Params, Types);\n+ auto LazyAdd = LazyVM->execute(\"add\", Params, Types);\n+\n+ ASSERT_TRUE(EagerAdd);\n+ ASSERT_TRUE(LazyAdd);\n+ EXPECT_EQ((*EagerAdd)[0].first.get<uint32_t>(),\n+ (*LazyAdd)[0].first.get<uint32_t>())\n+ << \"add(\" << A << \", \" << B << \") mismatch\";\n+\n+ auto EagerMul = EagerVM->execute(\"mul\", Params, Types);\n+ auto LazyMul = LazyVM->execute(\"mul\", Params, Types);\n+\n+ ASSERT_TRUE(EagerMul);\n+ ASSERT_TRUE(LazyMul);\n+ EXPECT_EQ((*EagerMul)[0].first.get<uint32_t>(),\n+ (*LazyMul)[0].first.get<uint32_t>())\n+ << \"mul(\" << A << \", \" << B << \") mismatch\";\n+ }\n+\n+ EagerVM->cleanup();\n+ LazyVM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, EagerVsLazyFibonacciMatch) {\n+ auto EagerVM = createEagerJITVM();\n+ auto LazyVM = createLazyJITVM();\n+\n+ ASSERT_TRUE(EagerVM->loadWasm(FibonacciWasm));\n+ ASSERT_TRUE(EagerVM->validate());\n+ ASSERT_TRUE(EagerVM->instantiate());\n+\n+ ASSERT_TRUE(LazyVM->loadWasm(FibonacciWasm));\n+ ASSERT_TRUE(LazyVM->validate());\n+ ASSERT_TRUE(LazyVM->instantiate());\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32)};\n+\n+ for (uint32_t N = 0; N <= 15; ++N) {\n+ std::vector<ValVariant> Params = {N};\n+ auto EagerResult = EagerVM->execute(\"fib\", Params, Types);\n+ auto LazyResult = LazyVM->execute(\"fib\", Params, Types);\n+\n+ ASSERT_TRUE(EagerResult) << \"Eager fib(\" << N << \") failed\";\n+ ASSERT_TRUE(LazyResult) << \"Lazy fib(\" << N << \") failed\";\n+ EXPECT_EQ((*EagerResult)[0].first.get<uint32_t>(),\n+ (*LazyResult)[0].first.get<uint32_t>())\n+ << \"fib(\" << N << \") mismatch between eager and lazy JIT\";\n+ }\n+\n+ EagerVM->cleanup();\n+ LazyVM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITCallNonExistent) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ // Try to call a non-existent function\n+ std::vector<ValVariant> EmptyP = {};\n+ std::vector<ValType> EmptyT = {};\n+ auto Result = VM->execute(\"nonexistent\", EmptyP, EmptyT);\n+ EXPECT_FALSE(Result);\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITMultipleInstantiations) {\n+ for (int Idx = 0; Idx < 3; ++Idx) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ std::vector<ValVariant> Params = {static_cast<uint32_t>(Idx),\n+ static_cast<uint32_t>(Idx * 10)};\n+ std::vector<ValType> Types = {ValType(TypeCode::I32),\n+ ValType(TypeCode::I32)};\n+ auto Result = VM->execute(\"add\", Params, Types);\n+\n+ ASSERT_TRUE(Result);\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(),\n+ static_cast<uint32_t>(Idx + Idx * 10));\n+\n+ VM->cleanup();\n+ }\n+}\n+\n+TEST_F(LazyJITTest, LazyJITOnlySomeFunctionsCalled) {\n+ // This test verifies that in lazy JIT mode, only called functions are\n+ // compiled\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\n+\n+ // Call 'add' - should trigger compilation of function 0\n+ std::vector<ValVariant> AddP = {1U, 2U};\n+ auto AddResult = VM->execute(\"add\", AddP, Types);\n+ ASSERT_TRUE(AddResult);\n+ EXPECT_EQ((*AddResult)[0].first.get<uint32_t>(), 3U);","resolving_sha":"67f93b5a08e799af47f68e08dba299c6a6dbc88d","resolving_diff":"diff --git a/test/llvm/LazyJITTest.cpp b/test/llvm/LazyJITTest.cpp\nnew file mode 100644\nindex 000000000000..2d36b436039c\n--- /dev/null\n+++ b/test/llvm/LazyJITTest.cpp\n@@ -0,0 +1,784 @@\n+// SPDX-License-Identifier: Apache-2.0\n+// SPDX-FileCopyrightText: 2019-2026 Second State INC\n+\n+//===-- test/llvm/LazyJITTest.cpp - Lazy JIT compilation tests ------------===//\n+//\n+// Part of the WasmEdge Project.\n+//\n+//===----------------------------------------------------------------------===//\n+///\n+/// \\file\n+/// This file contains tests for the lazy JIT (per-function) compilation\n+/// feature. It verifies that:\n+/// 1. Lazy JIT mode can be enabled via configuration\n+/// 2. Functions are compiled on-demand rather than upfront\n+/// 3. The behavior is correct compared to eager compilation\n+///\n+//===----------------------------------------------------------------------===//\n+\n+#include \"common/configure.h\"\n+#include \"common/spdlog.h\"\n+#include \"common/types.h\"\n+#include \"runtime/callingframe.h\"\n+#include \"runtime/instance/module.h\"\n+#include \"vm/vm.h\"\n+#include \"llvm/jit.h\"\n+#include <gtest/gtest.h>\n+#include <thread>\n+\n+namespace {\n+\n+using namespace std::literals;\n+using namespace WasmEdge;\n+\n+// Module with 6 functions: add, mul, sub, const42, unused1, unused2\n+std::vector<uint8_t> SimpleWasm = {\n+ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x17, 0x04, 0x60,\n+ 0x02, 0x7f, 0x7f, 0x01, 0x7f, 0x60, 0x00, 0x01, 0x7f, 0x60, 0x01, 0x7f,\n+ 0x01, 0x7f, 0x60, 0x03, 0x7f, 0x7f, 0x7f, 0x01, 0x7f, 0x03, 0x07, 0x06,\n+ 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x07, 0x31, 0x06, 0x03, 0x61, 0x64,\n+ 0x64, 0x00, 0x00, 0x03, 0x6d, 0x75, 0x6c, 0x00, 0x01, 0x03, 0x73, 0x75,\n+ 0x62, 0x00, 0x02, 0x07, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x34, 0x32, 0x00,\n+ 0x03, 0x07, 0x75, 0x6e, 0x75, 0x73, 0x65, 0x64, 0x31, 0x00, 0x04, 0x07,\n+ 0x75, 0x6e, 0x75, 0x73, 0x65, 0x64, 0x32, 0x00, 0x05, 0x0a, 0x32, 0x06,\n+ 0x07, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6a, 0x0b, 0x07, 0x00, 0x20, 0x00,\n+ 0x20, 0x01, 0x6c, 0x0b, 0x07, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6b, 0x0b,\n+ 0x04, 0x00, 0x41, 0x2a, 0x0b, 0x08, 0x00, 0x20, 0x00, 0x41, 0xe4, 0x00,\n+ 0x6a, 0x0b, 0x0a, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6a, 0x20, 0x02, 0x6c,\n+ 0x0b};\n+\n+std::vector<uint8_t> FibonacciWasm = {\n+ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x06, 0x01,\n+ 0x60, 0x01, 0x7f, 0x01, 0x7f, 0x03, 0x02, 0x01, 0x00, 0x07, 0x07,\n+ 0x01, 0x03, 0x66, 0x69, 0x62, 0x00, 0x00, 0x0a, 0x1e, 0x01, 0x1c,\n+ 0x00, 0x20, 0x00, 0x41, 0x02, 0x48, 0x04, 0x7f, 0x41, 0x01, 0x05,\n+ 0x20, 0x00, 0x41, 0x02, 0x6b, 0x10, 0x00, 0x20, 0x00, 0x41, 0x01,\n+ 0x6b, 0x10, 0x00, 0x6a, 0x0b, 0x0b};\n+\n+// Module with 1 imported function and 3 local functions:\n+// import \"env\" \"host_add\" (func (param i32 i32) (result i32))\n+// export \"call_host\" -> calls host_add\n+// export \"double_add\" -> calls host_add twice, adds results\n+// export \"local_mul\" -> pure local i32.mul\n+std::vector<uint8_t> ImportWasm = {\n+ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x07, 0x01, 0x60,\n+ 0x02, 0x7f, 0x7f, 0x01, 0x7f, 0x02, 0x10, 0x01, 0x03, 0x65, 0x6e, 0x76,\n+ 0x08, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x61, 0x64, 0x64, 0x00, 0x00, 0x03,\n+ 0x04, 0x03, 0x00, 0x00, 0x00, 0x07, 0x26, 0x03, 0x09, 0x63, 0x61, 0x6c,\n+ 0x6c, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x00, 0x01, 0x0a, 0x64, 0x6f, 0x75,\n+ 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x00, 0x02, 0x09, 0x6c, 0x6f,\n+ 0x63, 0x61, 0x6c, 0x5f, 0x6d, 0x75, 0x6c, 0x00, 0x03, 0x0a, 0x22, 0x03,\n+ 0x08, 0x00, 0x20, 0x00, 0x20, 0x01, 0x10, 0x00, 0x0b, 0x0f, 0x00, 0x20,\n+ 0x00, 0x20, 0x01, 0x10, 0x00, 0x20, 0x00, 0x20, 0x01, 0x10, 0x00, 0x6a,\n+ 0x0b, 0x07, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6c, 0x0b};\n+\n+// Library module exporting \"add\" and \"mul\" (i32,i32)->i32\n+std::vector<uint8_t> MathLibWasm = {\n+ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x07, 0x01, 0x60,\n+ 0x02, 0x7f, 0x7f, 0x01, 0x7f, 0x03, 0x03, 0x02, 0x00, 0x00, 0x07, 0x0d,\n+ 0x02, 0x03, 0x61, 0x64, 0x64, 0x00, 0x00, 0x03, 0x6d, 0x75, 0x6c, 0x00,\n+ 0x01, 0x0a, 0x11, 0x02, 0x07, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6a, 0x0b,\n+ 0x07, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6c, 0x0b};\n+\n+// Consumer module importing \"math\".\"add\" and \"math\".\"mul\",\n+// exporting \"add_and_square\" = (a+b)*(a+b) and \"sum_of_squares\" = a*a+b*b\n+std::vector<uint8_t> MathConsumerWasm = {\n+ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x07, 0x01,\n+ 0x60, 0x02, 0x7f, 0x7f, 0x01, 0x7f, 0x02, 0x17, 0x02, 0x04, 0x6d,\n+ 0x61, 0x74, 0x68, 0x03, 0x61, 0x64, 0x64, 0x00, 0x00, 0x04, 0x6d,\n+ 0x61, 0x74, 0x68, 0x03, 0x6d, 0x75, 0x6c, 0x00, 0x00, 0x03, 0x03,\n+ 0x02, 0x00, 0x00, 0x07, 0x23, 0x02, 0x0e, 0x61, 0x64, 0x64, 0x5f,\n+ 0x61, 0x6e, 0x64, 0x5f, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x00,\n+ 0x02, 0x0e, 0x73, 0x75, 0x6d, 0x5f, 0x6f, 0x66, 0x5f, 0x73, 0x71,\n+ 0x75, 0x61, 0x72, 0x65, 0x73, 0x00, 0x03, 0x0a, 0x23, 0x02, 0x10,\n+ 0x00, 0x20, 0x00, 0x20, 0x01, 0x10, 0x00, 0x20, 0x00, 0x20, 0x01,\n+ 0x10, 0x00, 0x10, 0x01, 0x0b, 0x10, 0x00, 0x20, 0x00, 0x20, 0x00,\n+ 0x10, 0x01, 0x20, 0x01, 0x20, 0x01, 0x10, 0x01, 0x10, 0x00, 0x0b};\n+\n+class HostAdd : public Runtime::HostFunction<HostAdd> {\n+public:\n+ Expect<uint32_t> body(const Runtime::CallingFrame &, uint32_t A, uint32_t B) {\n+ return A + B;\n+ }\n+};\n+\n+class TestEnvModule : public Runtime::Instance::ModuleInstance {\n+public:\n+ TestEnvModule() : ModuleInstance(\"env\") {\n+ addHostFunc(\"host_add\", std::make_unique<HostAdd>());\n+ }\n+};\n+\n+class LazyJITTest : public ::testing::Test {\n+protected:\n+ // Helper to create a VM with eager JIT\n+ std::unique_ptr<VM::VM> createEagerJITVM() {\n+ Configure Conf;\n+ Conf.getRuntimeConfigure().setRunMode(RunMode::JIT);\n+ Conf.getCompilerConfigure().setOptimizationLevel(\n+ CompilerConfigure::OptimizationLevel::O1);\n+ return std::make_unique<VM::VM>(Conf);\n+ }\n+\n+ // Helper to create a VM with lazy JIT\n+ std::unique_ptr<VM::VM> createLazyJITVM() {\n+ Configure Conf;\n+ Conf.getRuntimeConfigure().setRunMode(RunMode::LazyJIT);\n+ Conf.getCompilerConfigure().setOptimizationLevel(\n+ CompilerConfigure::OptimizationLevel::O1);\n+ return std::make_unique<VM::VM>(Conf);\n+ }\n+};\n+\n+TEST_F(LazyJITTest, ConfigurationDefaultDisabled) {\n+ Configure Conf;\n+ EXPECT_EQ(Conf.getRuntimeConfigure().getRunMode(), RunMode::Interpreter);\n+}\n+\n+TEST_F(LazyJITTest, ConfigurationEnableDisable) {\n+ Configure Conf;\n+\n+ // Enable lazy JIT\n+ Conf.getRuntimeConfigure().setRunMode(RunMode::LazyJIT);\n+ EXPECT_EQ(Conf.getRuntimeConfigure().getRunMode(), RunMode::LazyJIT);\n+\n+ // Disable lazy JIT (back to interpreter)\n+ Conf.getRuntimeConfigure().setRunMode(RunMode::Interpreter);\n+ EXPECT_NE(Conf.getRuntimeConfigure().getRunMode(), RunMode::LazyJIT);\n+}\n+\n+TEST_F(LazyJITTest, RuntimeConfigureIndependent) {\n+ RuntimeConfigure RConf1;\n+ RuntimeConfigure RConf2;\n+\n+ RConf1.setRunMode(RunMode::LazyJIT);\n+ EXPECT_EQ(RConf1.getRunMode(), RunMode::LazyJIT);\n+ EXPECT_NE(RConf2.getRunMode(), RunMode::LazyJIT);\n+}\n+\n+TEST_F(LazyJITTest, LazyJITCorrectness) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\n+\n+ // Test add function - should trigger lazy compilation\n+ std::vector<ValVariant> AddP = {10U, 5U};\n+ auto AddResult = VM->execute(\"add\", AddP, Types);\n+ ASSERT_TRUE(AddResult);\n+ EXPECT_EQ((*AddResult)[0].first.get<uint32_t>(), 15U);\n+\n+ // Test mul function - should trigger lazy compilation\n+ std::vector<ValVariant> MulP = {7U, 6U};\n+ auto MulResult = VM->execute(\"mul\", MulP, Types);\n+ ASSERT_TRUE(MulResult);\n+ EXPECT_EQ((*MulResult)[0].first.get<uint32_t>(), 42U);\n+\n+ // Test sub function - should trigger lazy compilation\n+ std::vector<ValVariant> SubP = {20U, 8U};\n+ auto SubResult = VM->execute(\"sub\", SubP, Types);\n+ ASSERT_TRUE(SubResult);\n+ EXPECT_EQ((*SubResult)[0].first.get<uint32_t>(), 12U);\n+\n+ // Test const42 function\n+ std::vector<ValVariant> EmptyP = {};\n+ std::vector<ValType> EmptyT = {};\n+ auto ConstResult = VM->execute(\"const42\", EmptyP, EmptyT);\n+ ASSERT_TRUE(ConstResult);\n+ EXPECT_EQ((*ConstResult)[0].first.get<uint32_t>(), 42U);\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITRepeatCalls) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 0U);\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\n+\n+ // First call - triggers lazy compilation\n+ std::vector<ValVariant> P1 = {10U, 5U};\n+ auto Result1 = VM->execute(\"add\", P1, Types);\n+ ASSERT_TRUE(Result1);\n+ EXPECT_EQ((*Result1)[0].first.get<uint32_t>(), 15U);\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 1U);\n+\n+ // Second call - uses cached compiled code\n+ std::vector<ValVariant> P2 = {100U, 200U};\n+ auto Result2 = VM->execute(\"add\", P2, Types);\n+ ASSERT_TRUE(Result2);\n+ EXPECT_EQ((*Result2)[0].first.get<uint32_t>(), 300U);\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 1U);\n+\n+ // Third call - different values\n+ std::vector<ValVariant> P3 = {1U, 1U};\n+ auto Result3 = VM->execute(\"add\", P3, Types);\n+ ASSERT_TRUE(Result3);\n+ EXPECT_EQ((*Result3)[0].first.get<uint32_t>(), 2U);\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 1U);\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITFibonacci) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(FibonacciWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32)};\n+\n+ // Test fibonacci function with various inputs\n+ // fib(0) = 1, fib(1) = 1, fib(2) = 2, fib(3) = 3, fib(4) = 5, fib(5) =8\n+ std::vector<std::pair<uint32_t, uint32_t>> TestCases = {\n+ {0, 1}, {1, 1}, {2, 2}, {3, 3}, {4, 5}, {5, 8}, {10, 89}};\n+\n+ for (const auto &[Input, Expected] : TestCases) {\n+ std::vector<ValVariant> Params = {Input};\n+ auto Result = VM->execute(\"fib\", Params, Types);\n+ ASSERT_TRUE(Result) << \"fib(\" << Input << \") failed\";\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(), Expected)\n+ << \"fib(\" << Input << \") = \" << Expected;\n+ }\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, EagerVsLazyResultsMatch) {\n+ auto EagerVM = createEagerJITVM();\n+ auto LazyVM = createLazyJITVM();\n+\n+ ASSERT_TRUE(EagerVM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(EagerVM->validate());\n+ ASSERT_TRUE(EagerVM->instantiate());\n+\n+ ASSERT_TRUE(LazyVM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(LazyVM->validate());\n+ ASSERT_TRUE(LazyVM->instantiate());\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\n+\n+ // Test with various inputs\n+ std::vector<std::pair<uint32_t, uint32_t>> TestInputs = {\n+ {10, 5}, {0, 0}, {100, 200}, {7, 6}, {0, 100}};\n+\n+ for (const auto &[A, B] : TestInputs) {\n+ std::vector<ValVariant> Params = {A, B};\n+\n+ auto EagerAdd = EagerVM->execute(\"add\", Params, Types);\n+ auto LazyAdd = LazyVM->execute(\"add\", Params, Types);\n+\n+ ASSERT_TRUE(EagerAdd);\n+ ASSERT_TRUE(LazyAdd);\n+ EXPECT_EQ((*EagerAdd)[0].first.get<uint32_t>(),\n+ (*LazyAdd)[0].first.get<uint32_t>())\n+ << \"add(\" << A << \", \" << B << \") mismatch\";\n+\n+ auto EagerMul = EagerVM->execute(\"mul\", Params, Types);\n+ auto LazyMul = LazyVM->execute(\"mul\", Params, Types);\n+\n+ ASSERT_TRUE(EagerMul);\n+ ASSERT_TRUE(LazyMul);\n+ EXPECT_EQ((*EagerMul)[0].first.get<uint32_t>(),\n+ (*LazyMul)[0].first.get<uint32_t>())\n+ << \"mul(\" << A << \", \" << B << \") mismatch\";\n+ }\n+\n+ EagerVM->cleanup();\n+ LazyVM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, EagerVsLazyFibonacciMatch) {\n+ auto EagerVM = createEagerJITVM();\n+ auto LazyVM = createLazyJITVM();\n+\n+ ASSERT_TRUE(EagerVM->loadWasm(FibonacciWasm));\n+ ASSERT_TRUE(EagerVM->validate());\n+ ASSERT_TRUE(EagerVM->instantiate());\n+\n+ ASSERT_TRUE(LazyVM->loadWasm(FibonacciWasm));\n+ ASSERT_TRUE(LazyVM->validate());\n+ ASSERT_TRUE(LazyVM->instantiate());\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32)};\n+\n+ for (uint32_t N = 0; N <= 15; ++N) {\n+ std::vector<ValVariant> Params = {N};\n+ auto EagerResult = EagerVM->execute(\"fib\", Params, Types);\n+ auto LazyResult = LazyVM->execute(\"fib\", Params, Types);\n+\n+ ASSERT_TRUE(EagerResult) << \"Eager fib(\" << N << \") failed\";\n+ ASSERT_TRUE(LazyResult) << \"Lazy fib(\" << N << \") failed\";\n+ EXPECT_EQ((*EagerResult)[0].first.get<uint32_t>(),\n+ (*LazyResult)[0].first.get<uint32_t>())\n+ << \"fib(\" << N << \") mismatch between eager and lazy JIT\";\n+ }\n+\n+ EagerVM->cleanup();\n+ LazyVM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITCallNonExistent) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ // Try to call a non-existent function\n+ std::vector<ValVariant> EmptyP = {};\n+ std::vector<ValType> EmptyT = {};\n+ auto Result = VM->execute(\"nonexistent\", EmptyP, EmptyT);\n+ EXPECT_FALSE(Result);\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITMultipleInstantiations) {\n+ for (int Idx = 0; Idx < 3; ++Idx) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ std::vector<ValVariant> Params = {static_cast<uint32_t>(Idx),\n+ static_cast<uint32_t>(Idx * 10)};\n+ std::vector<ValType> Types = {ValType(TypeCode::I32),\n+ ValType(TypeCode::I32)};\n+ auto Result = VM->execute(\"add\", Params, Types);\n+\n+ ASSERT_TRUE(Result);\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(),\n+ static_cast<uint32_t>(Idx + Idx * 10));\n+\n+ VM->cleanup();\n+ }\n+}\n+\n+TEST_F(LazyJITTest, LazyJITOnlySomeFunctionsCalled) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ auto *AddFunc = VM->getActiveModule()->findFuncExports(\"add\");\n+ auto *MulFunc = VM->getActiveModule()->findFuncExports(\"mul\");\n+ auto *SubFunc = VM->getActiveModule()->findFuncExports(\"sub\");\n+\n+ ASSERT_NE(AddFunc, nullptr);\n+ ASSERT_NE(MulFunc, nullptr);\n+ ASSERT_NE(SubFunc, nullptr);\n+\n+ // Initially none should be compiled\n+ EXPECT_FALSE(AddFunc->isCompiledFunction());\n+ EXPECT_FALSE(MulFunc->isCompiledFunction());\n+ EXPECT_FALSE(SubFunc->isCompiledFunction());\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 0U);\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\n+\n+ // Call 'add' should trigger compilation of function 0\n+ std::vector<ValVariant> AddP = {1U, 2U};\n+ auto AddResult = VM->execute(\"add\", AddP, Types);\n+ ASSERT_TRUE(AddResult);\n+ EXPECT_EQ((*AddResult)[0].first.get<uint32_t>(), 3U);\n+\n+ // Check state: add compiled, others not\n+ EXPECT_TRUE(AddFunc->isCompiledFunction());\n+ EXPECT_FALSE(MulFunc->isCompiledFunction());\n+ EXPECT_FALSE(SubFunc->isCompiledFunction());\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 1U);\n+\n+ // Call 'mul' should trigger compilation of function 1\n+ std::vector<ValVariant> MulP = {3U, 4U};\n+ auto MulResult = VM->execute(\"mul\", MulP, Types);\n+ ASSERT_TRUE(MulResult);\n+ EXPECT_EQ((*MulResult)[0].first.get<uint32_t>(), 12U);\n+\n+ // Check state: add and mul compiled, sub not\n+ EXPECT_TRUE(AddFunc->isCompiledFunction());\n+ EXPECT_TRUE(MulFunc->isCompiledFunction());\n+ EXPECT_FALSE(SubFunc->isCompiledFunction());\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 2U);\n+\n+ // Call 'add' again should NOT increase compiled count (already compiled)\n+ std::vector<ValVariant> AddP2 = {5U, 6U};\n+ auto AddResult2 = VM->execute(\"add\", AddP2, Types);\n+ ASSERT_TRUE(AddResult2);\n+ EXPECT_EQ((*AddResult2)[0].first.get<uint32_t>(), 11U);\n+\n+ // Check state: add and mul compiled, sub not\n+ EXPECT_TRUE(AddFunc->isCompiledFunction());\n+ EXPECT_TRUE(MulFunc->isCompiledFunction());\n+ EXPECT_FALSE(SubFunc->isCompiledFunction());\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 2U);\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITWithImports) {\n+ auto VM = createLazyJITVM();\n+\n+ TestEnvModule HostMod;\n+ ASSERT_TRUE(VM->registerModule(HostMod));\n+\n+ ASSERT_TRUE(VM->loadWasm(ImportWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 0U);\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\n+\n+ // call_host delegates to the imported host_add; only the local wrapper\n+ // should be lazy-compiled, not the import.\n+ std::vector<ValVariant> P1 = {3U, 7U};\n+ auto R1 = VM->execute(\"call_host\", P1, Types);\n+ ASSERT_TRUE(R1);\n+ EXPECT_EQ((*R1)[0].first.get<uint32_t>(), 10U);\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 1U);\n+\n+ // local_mul is a pure local function with no import usage.\n+ std::vector<ValVariant> P2 = {4U, 5U};\n+ auto R2 = VM->execute(\"local_mul\", P2, Types);\n+ ASSERT_TRUE(R2);\n+ EXPECT_EQ((*R2)[0].first.get<uint32_t>(), 20U);\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 2U);\n+\n+ // double_add calls host_add twice and adds the results.\n+ std::vector<ValVariant> P3 = {6U, 8U};\n+ auto R3 = VM->execute(\"double_add\", P3, Types);\n+ ASSERT_TRUE(R3);\n+ EXPECT_EQ((*R3)[0].first.get<uint32_t>(), 28U);\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 3U);\n+\n+ // Repeat call_host – count must not change (cached).\n+ std::vector<ValVariant> P4 = {100U, 200U};\n+ auto R4 = VM->execute(\"call_host\", P4, Types);\n+ ASSERT_TRUE(R4);\n+ EXPECT_EQ((*R4)[0].first.get<uint32_t>(), 300U);\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 3U);\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITWasmImportsWasm) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->registerModule(\"math\", MathLibWasm));\n+\n+ ASSERT_TRUE(VM->loadWasm(MathConsumerWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 0U);\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\n+\n+ std::vector<ValVariant> P1 = {3U, 4U};\n+ auto R1 = VM->execute(\"add_and_square\", P1, Types);\n+ ASSERT_TRUE(R1);\n+ EXPECT_EQ((*R1)[0].first.get<uint32_t>(), 49U);\n+ uint32_t CountAfterFirst = VM->getLazyCompiledFuncCount();\n+ EXPECT_EQ(CountAfterFirst, 3U);\n+\n+ std::vector<ValVariant> P2 = {3U, 4U};\n+ auto R2 = VM->execute(\"sum_of_squares\", P2, Types);\n+ ASSERT_TRUE(R2);\n+ EXPECT_EQ((*R2)[0].first.get<uint32_t>(), 25U);\n+ uint32_t CountAfterSecond = VM->getLazyCompiledFuncCount();\n+ EXPECT_EQ(CountAfterSecond, 4U);\n+\n+ std::vector<ValVariant> P3 = {10U, 20U};\n+ auto R3 = VM->execute(\"add_and_square\", P3, Types);\n+ ASSERT_TRUE(R3);\n+ EXPECT_EQ((*R3)[0].first.get<uint32_t>(), 900U);\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), CountAfterSecond);\n+\n+ std::vector<ValVariant> P4 = {5U, 12U};\n+ auto R4 = VM->execute(\"sum_of_squares\", P4, Types);\n+ ASSERT_TRUE(R4);\n+ EXPECT_EQ((*R4)[0].first.get<uint32_t>(), 169U);\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), CountAfterSecond);\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITReferenceModuleNotReleasedOnCleanup) {\n+ bool Destroyed = false;\n+ auto Deleter = [&Destroyed](AST::Module *M) {\n+ Destroyed = true;\n+ delete M;\n+ };\n+\n+ Configure Conf;\n+ Loader::Loader LoaderEngine(Conf);\n+ auto ModOrErr = LoaderEngine.parseWasmUnit(SimpleWasm);\n+ ASSERT_TRUE(ModOrErr);\n+ auto &RawMod = std::get<std::unique_ptr<AST::Module>>(*ModOrErr);\n+ auto Module = std::shared_ptr<AST::Module>(RawMod.release(), Deleter);\n+\n+ auto VM = createLazyJITVM();\n+ ASSERT_TRUE(VM->registerModule(\"test\", *Module));\n+\n+ VM->cleanup();\n+ EXPECT_FALSE(Destroyed);\n+\n+ Module.reset();\n+ EXPECT_TRUE(Destroyed);\n+}\n+\n+TEST_F(LazyJITTest, LazyJITReferenceModuleNotReleasedOnVMDestruction) {\n+ bool Destroyed = false;\n+ auto Deleter = [&Destroyed](AST::Module *M) {\n+ Destroyed = true;\n+ delete M;\n+ };\n+\n+ Configure Conf;\n+ Loader::Loader LoaderEngine(Conf);\n+ auto ModOrErr = LoaderEngine.parseWasmUnit(SimpleWasm);\n+ ASSERT_TRUE(ModOrErr);\n+ auto &RawMod = std::get<std::unique_ptr<AST::Module>>(*ModOrErr);\n+ auto Module = std::shared_ptr<AST::Module>(RawMod.release(), Deleter);\n+\n+ {\n+ auto VM = createLazyJITVM();\n+ ASSERT_TRUE(VM->registerModule(\"test\", *Module));\n+ }\n+ EXPECT_FALSE(Destroyed);\n+\n+ Module.reset();\n+ EXPECT_TRUE(Destroyed);\n+}\n+\n+TEST_F(LazyJITTest, JITAddLookupFailure) {\n+ Configure Conf;\n+ Conf.getRuntimeConfigure().setRunMode(RunMode::LazyJIT);\n+ Conf.getCompilerConfigure().setOptimizationLevel(\n+ CompilerConfigure::OptimizationLevel::O1);\n+\n+ Loader::Loader LoaderEngine(Conf);\n+ auto ModOrErr = LoaderEngine.parseWasmUnit(SimpleWasm);\n+ ASSERT_TRUE(ModOrErr);\n+ auto &Module = std::get<std::unique_ptr<AST::Module>>(*ModOrErr);\n+\n+ Validator::Validator ValidatorEngine(Conf);\n+ auto ValRes = ValidatorEngine.validate(*Module);\n+ ASSERT_TRUE(ValRes);\n+\n+ LLVM::Compiler Compiler(Conf);\n+ ASSERT_TRUE(Compiler.checkConfigure());\n+\n+ auto Prefix = \"test_prefix_\";\n+ auto CompileRes = Compiler.compileInfrastructure(*Module, Prefix);\n+ ASSERT_TRUE(CompileRes);\n+\n+ auto &LLData = CompileRes->first;\n+ auto &CompileCtx = CompileRes->second;\n+\n+ LLVM::JIT JIT(Conf);\n+ auto ExecRes = JIT.load(LLData, true);\n+ ASSERT_TRUE(ExecRes);\n+\n+ auto JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*ExecRes);\n+\n+ std::vector<uint32_t> CompileLocals = {0};\n+ if (!LLData.hasModule()) {\n+ LLData.resetModule();\n+ }\n+ auto FuncCompileRes = Compiler.compileFunctions(\n+ std::move(LLData), CompileCtx.get(), *Module, CompileLocals);\n+ ASSERT_TRUE(FuncCompileRes);\n+\n+ std::vector<uint32_t> InvalidIndices = {999};\n+\n+ auto AddResult = JIT.add(*JITLib, *FuncCompileRes, InvalidIndices);\n+ EXPECT_FALSE(AddResult);\n+ EXPECT_EQ(AddResult.error(), ErrCode::Value::LazyCompilationError);\n+}\n+\n+TEST_F(LazyJITTest, JITLookupWasmFunctionSymbolsFailure) {\n+ Configure Conf;\n+ Conf.getRuntimeConfigure().setRunMode(RunMode::LazyJIT);\n+ Conf.getCompilerConfigure().setOptimizationLevel(\n+ CompilerConfigure::OptimizationLevel::O1);\n+\n+ Loader::Loader LoaderEngine(Conf);\n+ auto ModOrErr = LoaderEngine.parseWasmUnit(SimpleWasm);\n+ ASSERT_TRUE(ModOrErr);\n+ auto &Module = std::get<std::unique_ptr<AST::Module>>(*ModOrErr);\n+\n+ Validator::Validator ValidatorEngine(Conf);\n+ auto ValRes = ValidatorEngine.validate(*Module);\n+ ASSERT_TRUE(ValRes);\n+\n+ LLVM::Compiler Compiler(Conf);\n+ ASSERT_TRUE(Compiler.checkConfigure());\n+\n+ auto Prefix = \"test_prefix_\";\n+ auto CompileRes = Compiler.compileInfrastructure(*Module, Prefix);\n+ ASSERT_TRUE(CompileRes);\n+\n+ auto &LLData = CompileRes->first;\n+\n+ LLVM::JIT JIT(Conf);\n+ auto ExecRes = JIT.load(LLData, true);\n+ ASSERT_TRUE(ExecRes);\n+\n+ auto JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*ExecRes);\n+\n+ std::vector<uint32_t> InvalidIndices = {999};\n+\n+ auto LookupRes =\n+ JIT.lookupWasmFunctionSymbols(*JITLib, Prefix, InvalidIndices);\n+ EXPECT_FALSE(LookupRes);\n+ EXPECT_EQ(LookupRes.error(), ErrCode::Value::LazyCompilationError);\n+}\n+\n+TEST_F(LazyJITTest, LazyJITConcurrentSameFunction) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\n+ std::vector<std::thread> Threads;\n+ const size_t NumThreads = 8;\n+ Threads.reserve(NumThreads);\n+\n+ for (size_t Idx = 0; Idx < NumThreads; ++Idx) {\n+ Threads.emplace_back([&VM, &Types, Idx]() {\n+ std::vector<ValVariant> Params = {static_cast<uint32_t>(Idx), 10U};\n+ auto Result = VM->execute(\"add\", Params, Types);\n+ EXPECT_TRUE(Result);\n+ if (Result) {\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(),\n+ static_cast<uint32_t>(Idx + 10));\n+ }\n+ });\n+ }\n+\n+ for (auto &T : Threads) {\n+ T.join();\n+ }\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 1U);\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITConcurrentDifferentFunctions) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ std::vector<ValType> Types2 = {ValType(TypeCode::I32),\n+ ValType(TypeCode::I32)};\n+ std::vector<ValType> Types0 = {};\n+\n+ std::vector<std::thread> Threads;\n+ Threads.emplace_back([&VM, &Types2]() {\n+ std::vector<ValVariant> Params = {10U, 20U};\n+ auto Result = VM->execute(\"add\", Params, Types2);\n+ EXPECT_TRUE(Result);\n+ if (Result) {\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(), 30U);\n+ }\n+ });\n+ Threads.emplace_back([&VM, &Types2]() {\n+ std::vector<ValVariant> Params = {5U, 6U};\n+ auto Result = VM->execute(\"mul\", Params, Types2);\n+ EXPECT_TRUE(Result);\n+ if (Result) {\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(), 30U);\n+ }\n+ });\n+ Threads.emplace_back([&VM, &Types2]() {\n+ std::vector<ValVariant> Params = {50U, 20U};\n+ auto Result = VM->execute(\"sub\", Params, Types2);\n+ EXPECT_TRUE(Result);\n+ if (Result) {\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(), 30U);\n+ }\n+ });\n+ Threads.emplace_back([&VM, &Types0]() {\n+ std::vector<ValVariant> Params = {};\n+ auto Result = VM->execute(\"const42\", Params, Types0);\n+ EXPECT_TRUE(Result);\n+ if (Result) {\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(), 42U);\n+ }\n+ });\n+\n+ for (auto &T : Threads) {\n+ T.join();\n+ }\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 4U);\n+\n+ VM->cleanup();\n+}\n+\n+TEST_F(LazyJITTest, LazyJITConcurrentFibonacci) {\n+ auto VM = createLazyJITVM();\n+\n+ ASSERT_TRUE(VM->loadWasm(FibonacciWasm));\n+ ASSERT_TRUE(VM->validate());\n+ ASSERT_TRUE(VM->instantiate());\n+\n+ std::vector<ValType> Types = {ValType(TypeCode::I32)};\n+ std::vector<std::thread> Threads;\n+ const size_t NumThreads = 8;\n+ Threads.reserve(NumThreads);\n+\n+ for (size_t Idx = 0; Idx < NumThreads; ++Idx) {\n+ Threads.emplace_back([&VM, &Types, Idx]() {\n+ std::vector<ValVariant> Params = {static_cast<uint32_t>(Idx)};\n+ auto Result = VM->execute(\"fib\", Params, Types);\n+ EXPECT_TRUE(Result);\n+ if (Result) {\n+ uint32_t Expected = 0;\n+ if (Idx == 0 || Idx == 1) {\n+ Expected = 1;\n+ } else {\n+ uint32_t Prev2 = 1;\n+ uint32_t Prev1 = 1;\n+ for (size_t Jdx = 2; Jdx <= Idx; ++Jdx) {\n+ Expected = Prev2 + Prev1;\n+ Prev2 = Prev1;\n+ Prev1 = Expected;\n+ }\n+ }\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(), Expected);\n+ }\n+ });\n+ }\n+\n+ for (auto &T : Threads) {\n+ T.join();\n+ }\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 1U);\n+\n+ VM->cleanup();\n+}\n+\n+} // namespace\n+\n+GTEST_API_ int main(int argc, char **argv) {\n+ WasmEdge::Log::setErrorLoggingLevel();\n+ testing::InitGoogleTest(&argc, argv);\n+ return RUN_ALL_TESTS();\n+}\n"}],"string":"[\n {\n \"comment\": \"You only verified the results, which means we don't know if it's lazy or eager. We should also rely on some real metrics for the verification.\",\n \"path\": \"test/llvm/LazyJITTest.cpp\",\n \"hunk\": \"@@ -0,0 +1,435 @@\\n+// SPDX-License-Identifier: Apache-2.0\\n+// SPDX-FileCopyrightText: 2019-2024 Second State INC\\n+\\n+//===-- test/llvm/LazyJITTest.cpp - Lazy JIT compilation tests ------------===//\\n+//\\n+// Part of the WasmEdge Project.\\n+//\\n+//===----------------------------------------------------------------------===//\\n+///\\n+/// \\\\file\\n+/// This file contains tests for the lazy JIT (per-function) compilation\\n+/// feature. It verifies that:\\n+/// 1. Lazy JIT mode can be enabled via configuration\\n+/// 2. Functions are compiled on-demand rather than upfront\\n+/// 3. The behavior is correct compared to eager compilation\\n+///\\n+//===----------------------------------------------------------------------===//\\n+\\n+#include \\\"common/configure.h\\\"\\n+#include \\\"common/spdlog.h\\\"\\n+#include \\\"common/types.h\\\"\\n+#include \\\"vm/vm.h\\\"\\n+#include \\\"llvm/jit.h\\\"\\n+#include <gtest/gtest.h>\\n+\\n+namespace {\\n+\\n+using namespace std::literals;\\n+using namespace WasmEdge;\\n+\\n+// Simple module with 6 functions: add, mul, sub, const42, unused1, unused2\\n+// Compiled from:\\n+std::vector<uint8_t> SimpleWasm = {\\n+ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x17, 0x04, 0x60,\\n+ 0x02, 0x7f, 0x7f, 0x01, 0x7f, 0x60, 0x00, 0x01, 0x7f, 0x60, 0x01, 0x7f,\\n+ 0x01, 0x7f, 0x60, 0x03, 0x7f, 0x7f, 0x7f, 0x01, 0x7f, 0x03, 0x07, 0x06,\\n+ 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x07, 0x31, 0x06, 0x03, 0x61, 0x64,\\n+ 0x64, 0x00, 0x00, 0x03, 0x6d, 0x75, 0x6c, 0x00, 0x01, 0x03, 0x73, 0x75,\\n+ 0x62, 0x00, 0x02, 0x07, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x34, 0x32, 0x00,\\n+ 0x03, 0x07, 0x75, 0x6e, 0x75, 0x73, 0x65, 0x64, 0x31, 0x00, 0x04, 0x07,\\n+ 0x75, 0x6e, 0x75, 0x73, 0x65, 0x64, 0x32, 0x00, 0x05, 0x0a, 0x32, 0x06,\\n+ 0x07, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6a, 0x0b, 0x07, 0x00, 0x20, 0x00,\\n+ 0x20, 0x01, 0x6c, 0x0b, 0x07, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6b, 0x0b,\\n+ 0x04, 0x00, 0x41, 0x2a, 0x0b, 0x08, 0x00, 0x20, 0x00, 0x41, 0xe4, 0x00,\\n+ 0x6a, 0x0b, 0x0a, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6a, 0x20, 0x02, 0x6c,\\n+ 0x0b};\\n+\\n+std::vector<uint8_t> FibonacciWasm = {\\n+ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x06, 0x01,\\n+ 0x60, 0x01, 0x7f, 0x01, 0x7f, 0x03, 0x02, 0x01, 0x00, 0x07, 0x07,\\n+ 0x01, 0x03, 0x66, 0x69, 0x62, 0x00, 0x00, 0x0a, 0x1e, 0x01, 0x1c,\\n+ 0x00, 0x20, 0x00, 0x41, 0x02, 0x48, 0x04, 0x7f, 0x41, 0x01, 0x05,\\n+ 0x20, 0x00, 0x41, 0x02, 0x6b, 0x10, 0x00, 0x20, 0x00, 0x41, 0x01,\\n+ 0x6b, 0x10, 0x00, 0x6a, 0x0b, 0x0b};\\n+\\n+class LazyJITTest : public ::testing::Test {\\n+protected:\\n+ // Helper to create a VM with eager JIT\\n+ std::unique_ptr<VM::VM> createEagerJITVM() {\\n+ Configure Conf;\\n+ Conf.getRuntimeConfigure().setEnableJIT(true);\\n+ Conf.getRuntimeConfigure().setEnableLazyJIT(false);\\n+ Conf.getCompilerConfigure().setOptimizationLevel(\\n+ CompilerConfigure::OptimizationLevel::O0);\\n+ return std::make_unique<VM::VM>(Conf);\\n+ }\\n+\\n+ // Helper to create a VM with lazy JIT\\n+ std::unique_ptr<VM::VM> createLazyJITVM() {\\n+ Configure Conf;\\n+ Conf.getRuntimeConfigure().setEnableJIT(true);\\n+ Conf.getRuntimeConfigure().setEnableLazyJIT(true);\\n+ Conf.getCompilerConfigure().setOptimizationLevel(\\n+ CompilerConfigure::OptimizationLevel::O0);\\n+ return std::make_unique<VM::VM>(Conf);\\n+ }\\n+\\n+ // Helper to create a VM with interpreter mode\\n+ std::unique_ptr<VM::VM> createInterpreterVM() {\\n+ Configure Conf;\\n+ Conf.getRuntimeConfigure().setEnableJIT(false);\\n+ Conf.getRuntimeConfigure().setEnableLazyJIT(false);\\n+ return std::make_unique<VM::VM>(Conf);\\n+ }\\n+};\\n+\\n+TEST_F(LazyJITTest, ConfigurationDefaultDisabled) {\\n+ Configure Conf;\\n+ EXPECT_FALSE(Conf.getRuntimeConfigure().isEnableLazyJIT());\\n+ EXPECT_FALSE(Conf.getRuntimeConfigure().isEnableJIT());\\n+}\\n+\\n+TEST_F(LazyJITTest, ConfigurationEnableDisable) {\\n+ Configure Conf;\\n+\\n+ // Enable lazy JIT\\n+ Conf.getRuntimeConfigure().setEnableLazyJIT(true);\\n+ EXPECT_TRUE(Conf.getRuntimeConfigure().isEnableLazyJIT());\\n+\\n+ // Disable lazy JIT\\n+ Conf.getRuntimeConfigure().setEnableLazyJIT(false);\\n+ EXPECT_FALSE(Conf.getRuntimeConfigure().isEnableLazyJIT());\\n+}\\n+\\n+TEST_F(LazyJITTest, ConfigurationCopy) {\\n+ Configure Conf1;\\n+ Conf1.getRuntimeConfigure().setEnableLazyJIT(true);\\n+ Conf1.getRuntimeConfigure().setEnableJIT(true);\\n+\\n+ // Copy constructor\\n+ Configure Conf2(Conf1);\\n+ EXPECT_TRUE(Conf2.getRuntimeConfigure().isEnableLazyJIT());\\n+ EXPECT_TRUE(Conf2.getRuntimeConfigure().isEnableJIT());\\n+\\n+ // Modify original should not affect copy\\n+ Conf1.getRuntimeConfigure().setEnableLazyJIT(false);\\n+ EXPECT_TRUE(Conf2.getRuntimeConfigure().isEnableLazyJIT());\\n+}\\n+\\n+TEST_F(LazyJITTest, RuntimeConfigureIndependent) {\\n+ RuntimeConfigure RConf1;\\n+ RuntimeConfigure RConf2;\\n+\\n+ RConf1.setEnableLazyJIT(true);\\n+ EXPECT_TRUE(RConf1.isEnableLazyJIT());\\n+ EXPECT_FALSE(RConf2.isEnableLazyJIT());\\n+}\\n+\\n+TEST_F(LazyJITTest, InterpreterModeBaseline) {\\n+ auto VM = createInterpreterVM();\\n+\\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\\n+ ASSERT_TRUE(VM->validate());\\n+ ASSERT_TRUE(VM->instantiate());\\n+\\n+ // Test add function\\n+ std::vector<ValVariant> AddParams = {10U, 5U};\\n+ std::vector<ValType> AddTypes = {ValType(TypeCode::I32),\\n+ ValType(TypeCode::I32)};\\n+ auto AddResult = VM->execute(\\\"add\\\", AddParams, AddTypes);\\n+ ASSERT_TRUE(AddResult);\\n+ ASSERT_EQ((*AddResult).size(), 1U);\\n+ EXPECT_EQ((*AddResult)[0].first.get<uint32_t>(), 15U);\\n+\\n+ // Test mul function\\n+ std::vector<ValVariant> MulParams = {7U, 6U};\\n+ auto MulResult = VM->execute(\\\"mul\\\", MulParams, AddTypes);\\n+ ASSERT_TRUE(MulResult);\\n+ ASSERT_EQ((*MulResult).size(), 1U);\\n+ EXPECT_EQ((*MulResult)[0].first.get<uint32_t>(), 42U);\\n+\\n+ // Test const42 function\\n+ std::vector<ValVariant> ConstParams = {};\\n+ std::vector<ValType> ConstTypes = {};\\n+ auto ConstResult = VM->execute(\\\"const42\\\", ConstParams, ConstTypes);\\n+ ASSERT_TRUE(ConstResult);\\n+ ASSERT_EQ((*ConstResult).size(), 1U);\\n+ EXPECT_EQ((*ConstResult)[0].first.get<uint32_t>(), 42U);\\n+\\n+ VM->cleanup();\\n+}\\n+\\n+TEST_F(LazyJITTest, EagerJITBaseline) {\\n+ auto VM = createEagerJITVM();\\n+\\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\\n+ ASSERT_TRUE(VM->validate());\\n+ ASSERT_TRUE(VM->instantiate());\\n+\\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\\n+\\n+ // Test add function\\n+ std::vector<ValVariant> AddP = {10U, 5U};\\n+ auto AddResult = VM->execute(\\\"add\\\", AddP, Types);\\n+ ASSERT_TRUE(AddResult);\\n+ EXPECT_EQ((*AddResult)[0].first.get<uint32_t>(), 15U);\\n+\\n+ // Test mul function\\n+ std::vector<ValVariant> MulP = {7U, 6U};\\n+ auto MulResult = VM->execute(\\\"mul\\\", MulP, Types);\\n+ ASSERT_TRUE(MulResult);\\n+ EXPECT_EQ((*MulResult)[0].first.get<uint32_t>(), 42U);\\n+\\n+ // Test sub function\\n+ std::vector<ValVariant> SubP = {20U, 8U};\\n+ auto SubResult = VM->execute(\\\"sub\\\", SubP, Types);\\n+ ASSERT_TRUE(SubResult);\\n+ EXPECT_EQ((*SubResult)[0].first.get<uint32_t>(), 12U);\\n+\\n+ VM->cleanup();\\n+}\\n+\\n+TEST_F(LazyJITTest, LazyJITCorrectness) {\\n+ auto VM = createLazyJITVM();\\n+\\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\\n+ ASSERT_TRUE(VM->validate());\\n+ ASSERT_TRUE(VM->instantiate());\\n+\\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\\n+\\n+ // Test add function - should trigger lazy compilation\\n+ std::vector<ValVariant> AddP = {10U, 5U};\\n+ auto AddResult = VM->execute(\\\"add\\\", AddP, Types);\\n+ ASSERT_TRUE(AddResult);\\n+ EXPECT_EQ((*AddResult)[0].first.get<uint32_t>(), 15U);\\n+\\n+ // Test mul function - should trigger lazy compilation\\n+ std::vector<ValVariant> MulP = {7U, 6U};\\n+ auto MulResult = VM->execute(\\\"mul\\\", MulP, Types);\\n+ ASSERT_TRUE(MulResult);\\n+ EXPECT_EQ((*MulResult)[0].first.get<uint32_t>(), 42U);\\n+\\n+ // Test sub function - should trigger lazy compilation\\n+ std::vector<ValVariant> SubP = {20U, 8U};\\n+ auto SubResult = VM->execute(\\\"sub\\\", SubP, Types);\\n+ ASSERT_TRUE(SubResult);\\n+ EXPECT_EQ((*SubResult)[0].first.get<uint32_t>(), 12U);\\n+\\n+ // Test const42 function\\n+ std::vector<ValVariant> EmptyP = {};\\n+ std::vector<ValType> EmptyT = {};\\n+ auto ConstResult = VM->execute(\\\"const42\\\", EmptyP, EmptyT);\\n+ ASSERT_TRUE(ConstResult);\\n+ EXPECT_EQ((*ConstResult)[0].first.get<uint32_t>(), 42U);\\n+\\n+ VM->cleanup();\\n+}\\n+\\n+TEST_F(LazyJITTest, LazyJITRepeatCalls) {\\n+ auto VM = createLazyJITVM();\\n+\\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\\n+ ASSERT_TRUE(VM->validate());\\n+ ASSERT_TRUE(VM->instantiate());\\n+\\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\\n+\\n+ // First call - triggers lazy compilation\\n+ std::vector<ValVariant> P1 = {10U, 5U};\\n+ auto Result1 = VM->execute(\\\"add\\\", P1, Types);\\n+ ASSERT_TRUE(Result1);\\n+ EXPECT_EQ((*Result1)[0].first.get<uint32_t>(), 15U);\\n+\\n+ // Second call - uses cached compiled code\\n+ std::vector<ValVariant> P2 = {100U, 200U};\\n+ auto Result2 = VM->execute(\\\"add\\\", P2, Types);\\n+ ASSERT_TRUE(Result2);\\n+ EXPECT_EQ((*Result2)[0].first.get<uint32_t>(), 300U);\\n+\\n+ // Third call - different values\\n+ std::vector<ValVariant> P3 = {1U, 1U};\\n+ auto Result3 = VM->execute(\\\"add\\\", P3, Types);\\n+ ASSERT_TRUE(Result3);\\n+ EXPECT_EQ((*Result3)[0].first.get<uint32_t>(), 2U);\\n+\\n+ VM->cleanup();\\n+}\\n+\\n+TEST_F(LazyJITTest, LazyJITFibonacci) {\\n+ auto VM = createLazyJITVM();\\n+\\n+ ASSERT_TRUE(VM->loadWasm(FibonacciWasm));\\n+ ASSERT_TRUE(VM->validate());\\n+ ASSERT_TRUE(VM->instantiate());\\n+\\n+ std::vector<ValType> Types = {ValType(TypeCode::I32)};\\n+\\n+ // Test fibonacci function with various inputs\\n+ // fib(0) = 1, fib(1) = 1, fib(2) = 2, fib(3) = 3, fib(4) = 5, fib(5) =8\\n+ std::vector<std::pair<uint32_t, uint32_t>> TestCases = {\\n+ {0, 1}, {1, 1}, {2, 2}, {3, 3}, {4, 5}, {5, 8}, {10, 89}};\\n+\\n+ for (const auto &[Input, Expected] : TestCases) {\\n+ std::vector<ValVariant> Params = {Input};\\n+ auto Result = VM->execute(\\\"fib\\\", Params, Types);\\n+ ASSERT_TRUE(Result) << \\\"fib(\\\" << Input << \\\") failed\\\";\\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(), Expected)\\n+ << \\\"fib(\\\" << Input << \\\") = \\\" << Expected;\\n+ }\\n+\\n+ VM->cleanup();\\n+}\\n+\\n+TEST_F(LazyJITTest, EagerVsLazyResultsMatch) {\\n+ auto EagerVM = createEagerJITVM();\\n+ auto LazyVM = createLazyJITVM();\\n+\\n+ ASSERT_TRUE(EagerVM->loadWasm(SimpleWasm));\\n+ ASSERT_TRUE(EagerVM->validate());\\n+ ASSERT_TRUE(EagerVM->instantiate());\\n+\\n+ ASSERT_TRUE(LazyVM->loadWasm(SimpleWasm));\\n+ ASSERT_TRUE(LazyVM->validate());\\n+ ASSERT_TRUE(LazyVM->instantiate());\\n+\\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\\n+\\n+ // Test with various inputs\\n+ std::vector<std::pair<uint32_t, uint32_t>> TestInputs = {\\n+ {10, 5}, {0, 0}, {100, 200}, {7, 6}, {0, 100}};\\n+\\n+ for (const auto &[A, B] : TestInputs) {\\n+ std::vector<ValVariant> Params = {A, B};\\n+\\n+ auto EagerAdd = EagerVM->execute(\\\"add\\\", Params, Types);\\n+ auto LazyAdd = LazyVM->execute(\\\"add\\\", Params, Types);\\n+\\n+ ASSERT_TRUE(EagerAdd);\\n+ ASSERT_TRUE(LazyAdd);\\n+ EXPECT_EQ((*EagerAdd)[0].first.get<uint32_t>(),\\n+ (*LazyAdd)[0].first.get<uint32_t>())\\n+ << \\\"add(\\\" << A << \\\", \\\" << B << \\\") mismatch\\\";\\n+\\n+ auto EagerMul = EagerVM->execute(\\\"mul\\\", Params, Types);\\n+ auto LazyMul = LazyVM->execute(\\\"mul\\\", Params, Types);\\n+\\n+ ASSERT_TRUE(EagerMul);\\n+ ASSERT_TRUE(LazyMul);\\n+ EXPECT_EQ((*EagerMul)[0].first.get<uint32_t>(),\\n+ (*LazyMul)[0].first.get<uint32_t>())\\n+ << \\\"mul(\\\" << A << \\\", \\\" << B << \\\") mismatch\\\";\\n+ }\\n+\\n+ EagerVM->cleanup();\\n+ LazyVM->cleanup();\\n+}\\n+\\n+TEST_F(LazyJITTest, EagerVsLazyFibonacciMatch) {\\n+ auto EagerVM = createEagerJITVM();\\n+ auto LazyVM = createLazyJITVM();\\n+\\n+ ASSERT_TRUE(EagerVM->loadWasm(FibonacciWasm));\\n+ ASSERT_TRUE(EagerVM->validate());\\n+ ASSERT_TRUE(EagerVM->instantiate());\\n+\\n+ ASSERT_TRUE(LazyVM->loadWasm(FibonacciWasm));\\n+ ASSERT_TRUE(LazyVM->validate());\\n+ ASSERT_TRUE(LazyVM->instantiate());\\n+\\n+ std::vector<ValType> Types = {ValType(TypeCode::I32)};\\n+\\n+ for (uint32_t N = 0; N <= 15; ++N) {\\n+ std::vector<ValVariant> Params = {N};\\n+ auto EagerResult = EagerVM->execute(\\\"fib\\\", Params, Types);\\n+ auto LazyResult = LazyVM->execute(\\\"fib\\\", Params, Types);\\n+\\n+ ASSERT_TRUE(EagerResult) << \\\"Eager fib(\\\" << N << \\\") failed\\\";\\n+ ASSERT_TRUE(LazyResult) << \\\"Lazy fib(\\\" << N << \\\") failed\\\";\\n+ EXPECT_EQ((*EagerResult)[0].first.get<uint32_t>(),\\n+ (*LazyResult)[0].first.get<uint32_t>())\\n+ << \\\"fib(\\\" << N << \\\") mismatch between eager and lazy JIT\\\";\\n+ }\\n+\\n+ EagerVM->cleanup();\\n+ LazyVM->cleanup();\\n+}\\n+\\n+TEST_F(LazyJITTest, LazyJITCallNonExistent) {\\n+ auto VM = createLazyJITVM();\\n+\\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\\n+ ASSERT_TRUE(VM->validate());\\n+ ASSERT_TRUE(VM->instantiate());\\n+\\n+ // Try to call a non-existent function\\n+ std::vector<ValVariant> EmptyP = {};\\n+ std::vector<ValType> EmptyT = {};\\n+ auto Result = VM->execute(\\\"nonexistent\\\", EmptyP, EmptyT);\\n+ EXPECT_FALSE(Result);\\n+\\n+ VM->cleanup();\\n+}\\n+\\n+TEST_F(LazyJITTest, LazyJITMultipleInstantiations) {\\n+ for (int Idx = 0; Idx < 3; ++Idx) {\\n+ auto VM = createLazyJITVM();\\n+\\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\\n+ ASSERT_TRUE(VM->validate());\\n+ ASSERT_TRUE(VM->instantiate());\\n+\\n+ std::vector<ValVariant> Params = {static_cast<uint32_t>(Idx),\\n+ static_cast<uint32_t>(Idx * 10)};\\n+ std::vector<ValType> Types = {ValType(TypeCode::I32),\\n+ ValType(TypeCode::I32)};\\n+ auto Result = VM->execute(\\\"add\\\", Params, Types);\\n+\\n+ ASSERT_TRUE(Result);\\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(),\\n+ static_cast<uint32_t>(Idx + Idx * 10));\\n+\\n+ VM->cleanup();\\n+ }\\n+}\\n+\\n+TEST_F(LazyJITTest, LazyJITOnlySomeFunctionsCalled) {\\n+ // This test verifies that in lazy JIT mode, only called functions are\\n+ // compiled\\n+ auto VM = createLazyJITVM();\\n+\\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\\n+ ASSERT_TRUE(VM->validate());\\n+ ASSERT_TRUE(VM->instantiate());\\n+\\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\\n+\\n+ // Call 'add' - should trigger compilation of function 0\\n+ std::vector<ValVariant> AddP = {1U, 2U};\\n+ auto AddResult = VM->execute(\\\"add\\\", AddP, Types);\\n+ ASSERT_TRUE(AddResult);\\n+ EXPECT_EQ((*AddResult)[0].first.get<uint32_t>(), 3U);\",\n \"resolving_sha\": \"67f93b5a08e799af47f68e08dba299c6a6dbc88d\",\n \"resolving_diff\": \"diff --git a/test/llvm/LazyJITTest.cpp b/test/llvm/LazyJITTest.cpp\\nnew file mode 100644\\nindex 000000000000..2d36b436039c\\n--- /dev/null\\n+++ b/test/llvm/LazyJITTest.cpp\\n@@ -0,0 +1,784 @@\\n+// SPDX-License-Identifier: Apache-2.0\\n+// SPDX-FileCopyrightText: 2019-2026 Second State INC\\n+\\n+//===-- test/llvm/LazyJITTest.cpp - Lazy JIT compilation tests ------------===//\\n+//\\n+// Part of the WasmEdge Project.\\n+//\\n+//===----------------------------------------------------------------------===//\\n+///\\n+/// \\\\file\\n+/// This file contains tests for the lazy JIT (per-function) compilation\\n+/// feature. It verifies that:\\n+/// 1. Lazy JIT mode can be enabled via configuration\\n+/// 2. Functions are compiled on-demand rather than upfront\\n+/// 3. The behavior is correct compared to eager compilation\\n+///\\n+//===----------------------------------------------------------------------===//\\n+\\n+#include \\\"common/configure.h\\\"\\n+#include \\\"common/spdlog.h\\\"\\n+#include \\\"common/types.h\\\"\\n+#include \\\"runtime/callingframe.h\\\"\\n+#include \\\"runtime/instance/module.h\\\"\\n+#include \\\"vm/vm.h\\\"\\n+#include \\\"llvm/jit.h\\\"\\n+#include <gtest/gtest.h>\\n+#include <thread>\\n+\\n+namespace {\\n+\\n+using namespace std::literals;\\n+using namespace WasmEdge;\\n+\\n+// Module with 6 functions: add, mul, sub, const42, unused1, unused2\\n+std::vector<uint8_t> SimpleWasm = {\\n+ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x17, 0x04, 0x60,\\n+ 0x02, 0x7f, 0x7f, 0x01, 0x7f, 0x60, 0x00, 0x01, 0x7f, 0x60, 0x01, 0x7f,\\n+ 0x01, 0x7f, 0x60, 0x03, 0x7f, 0x7f, 0x7f, 0x01, 0x7f, 0x03, 0x07, 0x06,\\n+ 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x07, 0x31, 0x06, 0x03, 0x61, 0x64,\\n+ 0x64, 0x00, 0x00, 0x03, 0x6d, 0x75, 0x6c, 0x00, 0x01, 0x03, 0x73, 0x75,\\n+ 0x62, 0x00, 0x02, 0x07, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x34, 0x32, 0x00,\\n+ 0x03, 0x07, 0x75, 0x6e, 0x75, 0x73, 0x65, 0x64, 0x31, 0x00, 0x04, 0x07,\\n+ 0x75, 0x6e, 0x75, 0x73, 0x65, 0x64, 0x32, 0x00, 0x05, 0x0a, 0x32, 0x06,\\n+ 0x07, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6a, 0x0b, 0x07, 0x00, 0x20, 0x00,\\n+ 0x20, 0x01, 0x6c, 0x0b, 0x07, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6b, 0x0b,\\n+ 0x04, 0x00, 0x41, 0x2a, 0x0b, 0x08, 0x00, 0x20, 0x00, 0x41, 0xe4, 0x00,\\n+ 0x6a, 0x0b, 0x0a, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6a, 0x20, 0x02, 0x6c,\\n+ 0x0b};\\n+\\n+std::vector<uint8_t> FibonacciWasm = {\\n+ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x06, 0x01,\\n+ 0x60, 0x01, 0x7f, 0x01, 0x7f, 0x03, 0x02, 0x01, 0x00, 0x07, 0x07,\\n+ 0x01, 0x03, 0x66, 0x69, 0x62, 0x00, 0x00, 0x0a, 0x1e, 0x01, 0x1c,\\n+ 0x00, 0x20, 0x00, 0x41, 0x02, 0x48, 0x04, 0x7f, 0x41, 0x01, 0x05,\\n+ 0x20, 0x00, 0x41, 0x02, 0x6b, 0x10, 0x00, 0x20, 0x00, 0x41, 0x01,\\n+ 0x6b, 0x10, 0x00, 0x6a, 0x0b, 0x0b};\\n+\\n+// Module with 1 imported function and 3 local functions:\\n+// import \\\"env\\\" \\\"host_add\\\" (func (param i32 i32) (result i32))\\n+// export \\\"call_host\\\" -> calls host_add\\n+// export \\\"double_add\\\" -> calls host_add twice, adds results\\n+// export \\\"local_mul\\\" -> pure local i32.mul\\n+std::vector<uint8_t> ImportWasm = {\\n+ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x07, 0x01, 0x60,\\n+ 0x02, 0x7f, 0x7f, 0x01, 0x7f, 0x02, 0x10, 0x01, 0x03, 0x65, 0x6e, 0x76,\\n+ 0x08, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x61, 0x64, 0x64, 0x00, 0x00, 0x03,\\n+ 0x04, 0x03, 0x00, 0x00, 0x00, 0x07, 0x26, 0x03, 0x09, 0x63, 0x61, 0x6c,\\n+ 0x6c, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x00, 0x01, 0x0a, 0x64, 0x6f, 0x75,\\n+ 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x00, 0x02, 0x09, 0x6c, 0x6f,\\n+ 0x63, 0x61, 0x6c, 0x5f, 0x6d, 0x75, 0x6c, 0x00, 0x03, 0x0a, 0x22, 0x03,\\n+ 0x08, 0x00, 0x20, 0x00, 0x20, 0x01, 0x10, 0x00, 0x0b, 0x0f, 0x00, 0x20,\\n+ 0x00, 0x20, 0x01, 0x10, 0x00, 0x20, 0x00, 0x20, 0x01, 0x10, 0x00, 0x6a,\\n+ 0x0b, 0x07, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6c, 0x0b};\\n+\\n+// Library module exporting \\\"add\\\" and \\\"mul\\\" (i32,i32)->i32\\n+std::vector<uint8_t> MathLibWasm = {\\n+ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x07, 0x01, 0x60,\\n+ 0x02, 0x7f, 0x7f, 0x01, 0x7f, 0x03, 0x03, 0x02, 0x00, 0x00, 0x07, 0x0d,\\n+ 0x02, 0x03, 0x61, 0x64, 0x64, 0x00, 0x00, 0x03, 0x6d, 0x75, 0x6c, 0x00,\\n+ 0x01, 0x0a, 0x11, 0x02, 0x07, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6a, 0x0b,\\n+ 0x07, 0x00, 0x20, 0x00, 0x20, 0x01, 0x6c, 0x0b};\\n+\\n+// Consumer module importing \\\"math\\\".\\\"add\\\" and \\\"math\\\".\\\"mul\\\",\\n+// exporting \\\"add_and_square\\\" = (a+b)*(a+b) and \\\"sum_of_squares\\\" = a*a+b*b\\n+std::vector<uint8_t> MathConsumerWasm = {\\n+ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x07, 0x01,\\n+ 0x60, 0x02, 0x7f, 0x7f, 0x01, 0x7f, 0x02, 0x17, 0x02, 0x04, 0x6d,\\n+ 0x61, 0x74, 0x68, 0x03, 0x61, 0x64, 0x64, 0x00, 0x00, 0x04, 0x6d,\\n+ 0x61, 0x74, 0x68, 0x03, 0x6d, 0x75, 0x6c, 0x00, 0x00, 0x03, 0x03,\\n+ 0x02, 0x00, 0x00, 0x07, 0x23, 0x02, 0x0e, 0x61, 0x64, 0x64, 0x5f,\\n+ 0x61, 0x6e, 0x64, 0x5f, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x00,\\n+ 0x02, 0x0e, 0x73, 0x75, 0x6d, 0x5f, 0x6f, 0x66, 0x5f, 0x73, 0x71,\\n+ 0x75, 0x61, 0x72, 0x65, 0x73, 0x00, 0x03, 0x0a, 0x23, 0x02, 0x10,\\n+ 0x00, 0x20, 0x00, 0x20, 0x01, 0x10, 0x00, 0x20, 0x00, 0x20, 0x01,\\n+ 0x10, 0x00, 0x10, 0x01, 0x0b, 0x10, 0x00, 0x20, 0x00, 0x20, 0x00,\\n+ 0x10, 0x01, 0x20, 0x01, 0x20, 0x01, 0x10, 0x01, 0x10, 0x00, 0x0b};\\n+\\n+class HostAdd : public Runtime::HostFunction<HostAdd> {\\n+public:\\n+ Expect<uint32_t> body(const Runtime::CallingFrame &, uint32_t A, uint32_t B) {\\n+ return A + B;\\n+ }\\n+};\\n+\\n+class TestEnvModule : public Runtime::Instance::ModuleInstance {\\n+public:\\n+ TestEnvModule() : ModuleInstance(\\\"env\\\") {\\n+ addHostFunc(\\\"host_add\\\", std::make_unique<HostAdd>());\\n+ }\\n+};\\n+\\n+class LazyJITTest : public ::testing::Test {\\n+protected:\\n+ // Helper to create a VM with eager JIT\\n+ std::unique_ptr<VM::VM> createEagerJITVM() {\\n+ Configure Conf;\\n+ Conf.getRuntimeConfigure().setRunMode(RunMode::JIT);\\n+ Conf.getCompilerConfigure().setOptimizationLevel(\\n+ CompilerConfigure::OptimizationLevel::O1);\\n+ return std::make_unique<VM::VM>(Conf);\\n+ }\\n+\\n+ // Helper to create a VM with lazy JIT\\n+ std::unique_ptr<VM::VM> createLazyJITVM() {\\n+ Configure Conf;\\n+ Conf.getRuntimeConfigure().setRunMode(RunMode::LazyJIT);\\n+ Conf.getCompilerConfigure().setOptimizationLevel(\\n+ CompilerConfigure::OptimizationLevel::O1);\\n+ return std::make_unique<VM::VM>(Conf);\\n+ }\\n+};\\n+\\n+TEST_F(LazyJITTest, ConfigurationDefaultDisabled) {\\n+ Configure Conf;\\n+ EXPECT_EQ(Conf.getRuntimeConfigure().getRunMode(), RunMode::Interpreter);\\n+}\\n+\\n+TEST_F(LazyJITTest, ConfigurationEnableDisable) {\\n+ Configure Conf;\\n+\\n+ // Enable lazy JIT\\n+ Conf.getRuntimeConfigure().setRunMode(RunMode::LazyJIT);\\n+ EXPECT_EQ(Conf.getRuntimeConfigure().getRunMode(), RunMode::LazyJIT);\\n+\\n+ // Disable lazy JIT (back to interpreter)\\n+ Conf.getRuntimeConfigure().setRunMode(RunMode::Interpreter);\\n+ EXPECT_NE(Conf.getRuntimeConfigure().getRunMode(), RunMode::LazyJIT);\\n+}\\n+\\n+TEST_F(LazyJITTest, RuntimeConfigureIndependent) {\\n+ RuntimeConfigure RConf1;\\n+ RuntimeConfigure RConf2;\\n+\\n+ RConf1.setRunMode(RunMode::LazyJIT);\\n+ EXPECT_EQ(RConf1.getRunMode(), RunMode::LazyJIT);\\n+ EXPECT_NE(RConf2.getRunMode(), RunMode::LazyJIT);\\n+}\\n+\\n+TEST_F(LazyJITTest, LazyJITCorrectness) {\\n+ auto VM = createLazyJITVM();\\n+\\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\\n+ ASSERT_TRUE(VM->validate());\\n+ ASSERT_TRUE(VM->instantiate());\\n+\\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\\n+\\n+ // Test add function - should trigger lazy compilation\\n+ std::vector<ValVariant> AddP = {10U, 5U};\\n+ auto AddResult = VM->execute(\\\"add\\\", AddP, Types);\\n+ ASSERT_TRUE(AddResult);\\n+ EXPECT_EQ((*AddResult)[0].first.get<uint32_t>(), 15U);\\n+\\n+ // Test mul function - should trigger lazy compilation\\n+ std::vector<ValVariant> MulP = {7U, 6U};\\n+ auto MulResult = VM->execute(\\\"mul\\\", MulP, Types);\\n+ ASSERT_TRUE(MulResult);\\n+ EXPECT_EQ((*MulResult)[0].first.get<uint32_t>(), 42U);\\n+\\n+ // Test sub function - should trigger lazy compilation\\n+ std::vector<ValVariant> SubP = {20U, 8U};\\n+ auto SubResult = VM->execute(\\\"sub\\\", SubP, Types);\\n+ ASSERT_TRUE(SubResult);\\n+ EXPECT_EQ((*SubResult)[0].first.get<uint32_t>(), 12U);\\n+\\n+ // Test const42 function\\n+ std::vector<ValVariant> EmptyP = {};\\n+ std::vector<ValType> EmptyT = {};\\n+ auto ConstResult = VM->execute(\\\"const42\\\", EmptyP, EmptyT);\\n+ ASSERT_TRUE(ConstResult);\\n+ EXPECT_EQ((*ConstResult)[0].first.get<uint32_t>(), 42U);\\n+\\n+ VM->cleanup();\\n+}\\n+\\n+TEST_F(LazyJITTest, LazyJITRepeatCalls) {\\n+ auto VM = createLazyJITVM();\\n+\\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\\n+ ASSERT_TRUE(VM->validate());\\n+ ASSERT_TRUE(VM->instantiate());\\n+\\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 0U);\\n+\\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\\n+\\n+ // First call - triggers lazy compilation\\n+ std::vector<ValVariant> P1 = {10U, 5U};\\n+ auto Result1 = VM->execute(\\\"add\\\", P1, Types);\\n+ ASSERT_TRUE(Result1);\\n+ EXPECT_EQ((*Result1)[0].first.get<uint32_t>(), 15U);\\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 1U);\\n+\\n+ // Second call - uses cached compiled code\\n+ std::vector<ValVariant> P2 = {100U, 200U};\\n+ auto Result2 = VM->execute(\\\"add\\\", P2, Types);\\n+ ASSERT_TRUE(Result2);\\n+ EXPECT_EQ((*Result2)[0].first.get<uint32_t>(), 300U);\\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 1U);\\n+\\n+ // Third call - different values\\n+ std::vector<ValVariant> P3 = {1U, 1U};\\n+ auto Result3 = VM->execute(\\\"add\\\", P3, Types);\\n+ ASSERT_TRUE(Result3);\\n+ EXPECT_EQ((*Result3)[0].first.get<uint32_t>(), 2U);\\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 1U);\\n+\\n+ VM->cleanup();\\n+}\\n+\\n+TEST_F(LazyJITTest, LazyJITFibonacci) {\\n+ auto VM = createLazyJITVM();\\n+\\n+ ASSERT_TRUE(VM->loadWasm(FibonacciWasm));\\n+ ASSERT_TRUE(VM->validate());\\n+ ASSERT_TRUE(VM->instantiate());\\n+\\n+ std::vector<ValType> Types = {ValType(TypeCode::I32)};\\n+\\n+ // Test fibonacci function with various inputs\\n+ // fib(0) = 1, fib(1) = 1, fib(2) = 2, fib(3) = 3, fib(4) = 5, fib(5) =8\\n+ std::vector<std::pair<uint32_t, uint32_t>> TestCases = {\\n+ {0, 1}, {1, 1}, {2, 2}, {3, 3}, {4, 5}, {5, 8}, {10, 89}};\\n+\\n+ for (const auto &[Input, Expected] : TestCases) {\\n+ std::vector<ValVariant> Params = {Input};\\n+ auto Result = VM->execute(\\\"fib\\\", Params, Types);\\n+ ASSERT_TRUE(Result) << \\\"fib(\\\" << Input << \\\") failed\\\";\\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(), Expected)\\n+ << \\\"fib(\\\" << Input << \\\") = \\\" << Expected;\\n+ }\\n+\\n+ VM->cleanup();\\n+}\\n+\\n+TEST_F(LazyJITTest, EagerVsLazyResultsMatch) {\\n+ auto EagerVM = createEagerJITVM();\\n+ auto LazyVM = createLazyJITVM();\\n+\\n+ ASSERT_TRUE(EagerVM->loadWasm(SimpleWasm));\\n+ ASSERT_TRUE(EagerVM->validate());\\n+ ASSERT_TRUE(EagerVM->instantiate());\\n+\\n+ ASSERT_TRUE(LazyVM->loadWasm(SimpleWasm));\\n+ ASSERT_TRUE(LazyVM->validate());\\n+ ASSERT_TRUE(LazyVM->instantiate());\\n+\\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\\n+\\n+ // Test with various inputs\\n+ std::vector<std::pair<uint32_t, uint32_t>> TestInputs = {\\n+ {10, 5}, {0, 0}, {100, 200}, {7, 6}, {0, 100}};\\n+\\n+ for (const auto &[A, B] : TestInputs) {\\n+ std::vector<ValVariant> Params = {A, B};\\n+\\n+ auto EagerAdd = EagerVM->execute(\\\"add\\\", Params, Types);\\n+ auto LazyAdd = LazyVM->execute(\\\"add\\\", Params, Types);\\n+\\n+ ASSERT_TRUE(EagerAdd);\\n+ ASSERT_TRUE(LazyAdd);\\n+ EXPECT_EQ((*EagerAdd)[0].first.get<uint32_t>(),\\n+ (*LazyAdd)[0].first.get<uint32_t>())\\n+ << \\\"add(\\\" << A << \\\", \\\" << B << \\\") mismatch\\\";\\n+\\n+ auto EagerMul = EagerVM->execute(\\\"mul\\\", Params, Types);\\n+ auto LazyMul = LazyVM->execute(\\\"mul\\\", Params, Types);\\n+\\n+ ASSERT_TRUE(EagerMul);\\n+ ASSERT_TRUE(LazyMul);\\n+ EXPECT_EQ((*EagerMul)[0].first.get<uint32_t>(),\\n+ (*LazyMul)[0].first.get<uint32_t>())\\n+ << \\\"mul(\\\" << A << \\\", \\\" << B << \\\") mismatch\\\";\\n+ }\\n+\\n+ EagerVM->cleanup();\\n+ LazyVM->cleanup();\\n+}\\n+\\n+TEST_F(LazyJITTest, EagerVsLazyFibonacciMatch) {\\n+ auto EagerVM = createEagerJITVM();\\n+ auto LazyVM = createLazyJITVM();\\n+\\n+ ASSERT_TRUE(EagerVM->loadWasm(FibonacciWasm));\\n+ ASSERT_TRUE(EagerVM->validate());\\n+ ASSERT_TRUE(EagerVM->instantiate());\\n+\\n+ ASSERT_TRUE(LazyVM->loadWasm(FibonacciWasm));\\n+ ASSERT_TRUE(LazyVM->validate());\\n+ ASSERT_TRUE(LazyVM->instantiate());\\n+\\n+ std::vector<ValType> Types = {ValType(TypeCode::I32)};\\n+\\n+ for (uint32_t N = 0; N <= 15; ++N) {\\n+ std::vector<ValVariant> Params = {N};\\n+ auto EagerResult = EagerVM->execute(\\\"fib\\\", Params, Types);\\n+ auto LazyResult = LazyVM->execute(\\\"fib\\\", Params, Types);\\n+\\n+ ASSERT_TRUE(EagerResult) << \\\"Eager fib(\\\" << N << \\\") failed\\\";\\n+ ASSERT_TRUE(LazyResult) << \\\"Lazy fib(\\\" << N << \\\") failed\\\";\\n+ EXPECT_EQ((*EagerResult)[0].first.get<uint32_t>(),\\n+ (*LazyResult)[0].first.get<uint32_t>())\\n+ << \\\"fib(\\\" << N << \\\") mismatch between eager and lazy JIT\\\";\\n+ }\\n+\\n+ EagerVM->cleanup();\\n+ LazyVM->cleanup();\\n+}\\n+\\n+TEST_F(LazyJITTest, LazyJITCallNonExistent) {\\n+ auto VM = createLazyJITVM();\\n+\\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\\n+ ASSERT_TRUE(VM->validate());\\n+ ASSERT_TRUE(VM->instantiate());\\n+\\n+ // Try to call a non-existent function\\n+ std::vector<ValVariant> EmptyP = {};\\n+ std::vector<ValType> EmptyT = {};\\n+ auto Result = VM->execute(\\\"nonexistent\\\", EmptyP, EmptyT);\\n+ EXPECT_FALSE(Result);\\n+\\n+ VM->cleanup();\\n+}\\n+\\n+TEST_F(LazyJITTest, LazyJITMultipleInstantiations) {\\n+ for (int Idx = 0; Idx < 3; ++Idx) {\\n+ auto VM = createLazyJITVM();\\n+\\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\\n+ ASSERT_TRUE(VM->validate());\\n+ ASSERT_TRUE(VM->instantiate());\\n+\\n+ std::vector<ValVariant> Params = {static_cast<uint32_t>(Idx),\\n+ static_cast<uint32_t>(Idx * 10)};\\n+ std::vector<ValType> Types = {ValType(TypeCode::I32),\\n+ ValType(TypeCode::I32)};\\n+ auto Result = VM->execute(\\\"add\\\", Params, Types);\\n+\\n+ ASSERT_TRUE(Result);\\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(),\\n+ static_cast<uint32_t>(Idx + Idx * 10));\\n+\\n+ VM->cleanup();\\n+ }\\n+}\\n+\\n+TEST_F(LazyJITTest, LazyJITOnlySomeFunctionsCalled) {\\n+ auto VM = createLazyJITVM();\\n+\\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\\n+ ASSERT_TRUE(VM->validate());\\n+ ASSERT_TRUE(VM->instantiate());\\n+\\n+ auto *AddFunc = VM->getActiveModule()->findFuncExports(\\\"add\\\");\\n+ auto *MulFunc = VM->getActiveModule()->findFuncExports(\\\"mul\\\");\\n+ auto *SubFunc = VM->getActiveModule()->findFuncExports(\\\"sub\\\");\\n+\\n+ ASSERT_NE(AddFunc, nullptr);\\n+ ASSERT_NE(MulFunc, nullptr);\\n+ ASSERT_NE(SubFunc, nullptr);\\n+\\n+ // Initially none should be compiled\\n+ EXPECT_FALSE(AddFunc->isCompiledFunction());\\n+ EXPECT_FALSE(MulFunc->isCompiledFunction());\\n+ EXPECT_FALSE(SubFunc->isCompiledFunction());\\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 0U);\\n+\\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\\n+\\n+ // Call 'add' should trigger compilation of function 0\\n+ std::vector<ValVariant> AddP = {1U, 2U};\\n+ auto AddResult = VM->execute(\\\"add\\\", AddP, Types);\\n+ ASSERT_TRUE(AddResult);\\n+ EXPECT_EQ((*AddResult)[0].first.get<uint32_t>(), 3U);\\n+\\n+ // Check state: add compiled, others not\\n+ EXPECT_TRUE(AddFunc->isCompiledFunction());\\n+ EXPECT_FALSE(MulFunc->isCompiledFunction());\\n+ EXPECT_FALSE(SubFunc->isCompiledFunction());\\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 1U);\\n+\\n+ // Call 'mul' should trigger compilation of function 1\\n+ std::vector<ValVariant> MulP = {3U, 4U};\\n+ auto MulResult = VM->execute(\\\"mul\\\", MulP, Types);\\n+ ASSERT_TRUE(MulResult);\\n+ EXPECT_EQ((*MulResult)[0].first.get<uint32_t>(), 12U);\\n+\\n+ // Check state: add and mul compiled, sub not\\n+ EXPECT_TRUE(AddFunc->isCompiledFunction());\\n+ EXPECT_TRUE(MulFunc->isCompiledFunction());\\n+ EXPECT_FALSE(SubFunc->isCompiledFunction());\\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 2U);\\n+\\n+ // Call 'add' again should NOT increase compiled count (already compiled)\\n+ std::vector<ValVariant> AddP2 = {5U, 6U};\\n+ auto AddResult2 = VM->execute(\\\"add\\\", AddP2, Types);\\n+ ASSERT_TRUE(AddResult2);\\n+ EXPECT_EQ((*AddResult2)[0].first.get<uint32_t>(), 11U);\\n+\\n+ // Check state: add and mul compiled, sub not\\n+ EXPECT_TRUE(AddFunc->isCompiledFunction());\\n+ EXPECT_TRUE(MulFunc->isCompiledFunction());\\n+ EXPECT_FALSE(SubFunc->isCompiledFunction());\\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 2U);\\n+\\n+ VM->cleanup();\\n+}\\n+\\n+TEST_F(LazyJITTest, LazyJITWithImports) {\\n+ auto VM = createLazyJITVM();\\n+\\n+ TestEnvModule HostMod;\\n+ ASSERT_TRUE(VM->registerModule(HostMod));\\n+\\n+ ASSERT_TRUE(VM->loadWasm(ImportWasm));\\n+ ASSERT_TRUE(VM->validate());\\n+ ASSERT_TRUE(VM->instantiate());\\n+\\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 0U);\\n+\\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\\n+\\n+ // call_host delegates to the imported host_add; only the local wrapper\\n+ // should be lazy-compiled, not the import.\\n+ std::vector<ValVariant> P1 = {3U, 7U};\\n+ auto R1 = VM->execute(\\\"call_host\\\", P1, Types);\\n+ ASSERT_TRUE(R1);\\n+ EXPECT_EQ((*R1)[0].first.get<uint32_t>(), 10U);\\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 1U);\\n+\\n+ // local_mul is a pure local function with no import usage.\\n+ std::vector<ValVariant> P2 = {4U, 5U};\\n+ auto R2 = VM->execute(\\\"local_mul\\\", P2, Types);\\n+ ASSERT_TRUE(R2);\\n+ EXPECT_EQ((*R2)[0].first.get<uint32_t>(), 20U);\\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 2U);\\n+\\n+ // double_add calls host_add twice and adds the results.\\n+ std::vector<ValVariant> P3 = {6U, 8U};\\n+ auto R3 = VM->execute(\\\"double_add\\\", P3, Types);\\n+ ASSERT_TRUE(R3);\\n+ EXPECT_EQ((*R3)[0].first.get<uint32_t>(), 28U);\\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 3U);\\n+\\n+ // Repeat call_host – count must not change (cached).\\n+ std::vector<ValVariant> P4 = {100U, 200U};\\n+ auto R4 = VM->execute(\\\"call_host\\\", P4, Types);\\n+ ASSERT_TRUE(R4);\\n+ EXPECT_EQ((*R4)[0].first.get<uint32_t>(), 300U);\\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 3U);\\n+\\n+ VM->cleanup();\\n+}\\n+\\n+TEST_F(LazyJITTest, LazyJITWasmImportsWasm) {\\n+ auto VM = createLazyJITVM();\\n+\\n+ ASSERT_TRUE(VM->registerModule(\\\"math\\\", MathLibWasm));\\n+\\n+ ASSERT_TRUE(VM->loadWasm(MathConsumerWasm));\\n+ ASSERT_TRUE(VM->validate());\\n+ ASSERT_TRUE(VM->instantiate());\\n+\\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 0U);\\n+\\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\\n+\\n+ std::vector<ValVariant> P1 = {3U, 4U};\\n+ auto R1 = VM->execute(\\\"add_and_square\\\", P1, Types);\\n+ ASSERT_TRUE(R1);\\n+ EXPECT_EQ((*R1)[0].first.get<uint32_t>(), 49U);\\n+ uint32_t CountAfterFirst = VM->getLazyCompiledFuncCount();\\n+ EXPECT_EQ(CountAfterFirst, 3U);\\n+\\n+ std::vector<ValVariant> P2 = {3U, 4U};\\n+ auto R2 = VM->execute(\\\"sum_of_squares\\\", P2, Types);\\n+ ASSERT_TRUE(R2);\\n+ EXPECT_EQ((*R2)[0].first.get<uint32_t>(), 25U);\\n+ uint32_t CountAfterSecond = VM->getLazyCompiledFuncCount();\\n+ EXPECT_EQ(CountAfterSecond, 4U);\\n+\\n+ std::vector<ValVariant> P3 = {10U, 20U};\\n+ auto R3 = VM->execute(\\\"add_and_square\\\", P3, Types);\\n+ ASSERT_TRUE(R3);\\n+ EXPECT_EQ((*R3)[0].first.get<uint32_t>(), 900U);\\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), CountAfterSecond);\\n+\\n+ std::vector<ValVariant> P4 = {5U, 12U};\\n+ auto R4 = VM->execute(\\\"sum_of_squares\\\", P4, Types);\\n+ ASSERT_TRUE(R4);\\n+ EXPECT_EQ((*R4)[0].first.get<uint32_t>(), 169U);\\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), CountAfterSecond);\\n+\\n+ VM->cleanup();\\n+}\\n+\\n+TEST_F(LazyJITTest, LazyJITReferenceModuleNotReleasedOnCleanup) {\\n+ bool Destroyed = false;\\n+ auto Deleter = [&Destroyed](AST::Module *M) {\\n+ Destroyed = true;\\n+ delete M;\\n+ };\\n+\\n+ Configure Conf;\\n+ Loader::Loader LoaderEngine(Conf);\\n+ auto ModOrErr = LoaderEngine.parseWasmUnit(SimpleWasm);\\n+ ASSERT_TRUE(ModOrErr);\\n+ auto &RawMod = std::get<std::unique_ptr<AST::Module>>(*ModOrErr);\\n+ auto Module = std::shared_ptr<AST::Module>(RawMod.release(), Deleter);\\n+\\n+ auto VM = createLazyJITVM();\\n+ ASSERT_TRUE(VM->registerModule(\\\"test\\\", *Module));\\n+\\n+ VM->cleanup();\\n+ EXPECT_FALSE(Destroyed);\\n+\\n+ Module.reset();\\n+ EXPECT_TRUE(Destroyed);\\n+}\\n+\\n+TEST_F(LazyJITTest, LazyJITReferenceModuleNotReleasedOnVMDestruction) {\\n+ bool Destroyed = false;\\n+ auto Deleter = [&Destroyed](AST::Module *M) {\\n+ Destroyed = true;\\n+ delete M;\\n+ };\\n+\\n+ Configure Conf;\\n+ Loader::Loader LoaderEngine(Conf);\\n+ auto ModOrErr = LoaderEngine.parseWasmUnit(SimpleWasm);\\n+ ASSERT_TRUE(ModOrErr);\\n+ auto &RawMod = std::get<std::unique_ptr<AST::Module>>(*ModOrErr);\\n+ auto Module = std::shared_ptr<AST::Module>(RawMod.release(), Deleter);\\n+\\n+ {\\n+ auto VM = createLazyJITVM();\\n+ ASSERT_TRUE(VM->registerModule(\\\"test\\\", *Module));\\n+ }\\n+ EXPECT_FALSE(Destroyed);\\n+\\n+ Module.reset();\\n+ EXPECT_TRUE(Destroyed);\\n+}\\n+\\n+TEST_F(LazyJITTest, JITAddLookupFailure) {\\n+ Configure Conf;\\n+ Conf.getRuntimeConfigure().setRunMode(RunMode::LazyJIT);\\n+ Conf.getCompilerConfigure().setOptimizationLevel(\\n+ CompilerConfigure::OptimizationLevel::O1);\\n+\\n+ Loader::Loader LoaderEngine(Conf);\\n+ auto ModOrErr = LoaderEngine.parseWasmUnit(SimpleWasm);\\n+ ASSERT_TRUE(ModOrErr);\\n+ auto &Module = std::get<std::unique_ptr<AST::Module>>(*ModOrErr);\\n+\\n+ Validator::Validator ValidatorEngine(Conf);\\n+ auto ValRes = ValidatorEngine.validate(*Module);\\n+ ASSERT_TRUE(ValRes);\\n+\\n+ LLVM::Compiler Compiler(Conf);\\n+ ASSERT_TRUE(Compiler.checkConfigure());\\n+\\n+ auto Prefix = \\\"test_prefix_\\\";\\n+ auto CompileRes = Compiler.compileInfrastructure(*Module, Prefix);\\n+ ASSERT_TRUE(CompileRes);\\n+\\n+ auto &LLData = CompileRes->first;\\n+ auto &CompileCtx = CompileRes->second;\\n+\\n+ LLVM::JIT JIT(Conf);\\n+ auto ExecRes = JIT.load(LLData, true);\\n+ ASSERT_TRUE(ExecRes);\\n+\\n+ auto JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*ExecRes);\\n+\\n+ std::vector<uint32_t> CompileLocals = {0};\\n+ if (!LLData.hasModule()) {\\n+ LLData.resetModule();\\n+ }\\n+ auto FuncCompileRes = Compiler.compileFunctions(\\n+ std::move(LLData), CompileCtx.get(), *Module, CompileLocals);\\n+ ASSERT_TRUE(FuncCompileRes);\\n+\\n+ std::vector<uint32_t> InvalidIndices = {999};\\n+\\n+ auto AddResult = JIT.add(*JITLib, *FuncCompileRes, InvalidIndices);\\n+ EXPECT_FALSE(AddResult);\\n+ EXPECT_EQ(AddResult.error(), ErrCode::Value::LazyCompilationError);\\n+}\\n+\\n+TEST_F(LazyJITTest, JITLookupWasmFunctionSymbolsFailure) {\\n+ Configure Conf;\\n+ Conf.getRuntimeConfigure().setRunMode(RunMode::LazyJIT);\\n+ Conf.getCompilerConfigure().setOptimizationLevel(\\n+ CompilerConfigure::OptimizationLevel::O1);\\n+\\n+ Loader::Loader LoaderEngine(Conf);\\n+ auto ModOrErr = LoaderEngine.parseWasmUnit(SimpleWasm);\\n+ ASSERT_TRUE(ModOrErr);\\n+ auto &Module = std::get<std::unique_ptr<AST::Module>>(*ModOrErr);\\n+\\n+ Validator::Validator ValidatorEngine(Conf);\\n+ auto ValRes = ValidatorEngine.validate(*Module);\\n+ ASSERT_TRUE(ValRes);\\n+\\n+ LLVM::Compiler Compiler(Conf);\\n+ ASSERT_TRUE(Compiler.checkConfigure());\\n+\\n+ auto Prefix = \\\"test_prefix_\\\";\\n+ auto CompileRes = Compiler.compileInfrastructure(*Module, Prefix);\\n+ ASSERT_TRUE(CompileRes);\\n+\\n+ auto &LLData = CompileRes->first;\\n+\\n+ LLVM::JIT JIT(Conf);\\n+ auto ExecRes = JIT.load(LLData, true);\\n+ ASSERT_TRUE(ExecRes);\\n+\\n+ auto JITLib = std::static_pointer_cast<LLVM::JITLibrary>(*ExecRes);\\n+\\n+ std::vector<uint32_t> InvalidIndices = {999};\\n+\\n+ auto LookupRes =\\n+ JIT.lookupWasmFunctionSymbols(*JITLib, Prefix, InvalidIndices);\\n+ EXPECT_FALSE(LookupRes);\\n+ EXPECT_EQ(LookupRes.error(), ErrCode::Value::LazyCompilationError);\\n+}\\n+\\n+TEST_F(LazyJITTest, LazyJITConcurrentSameFunction) {\\n+ auto VM = createLazyJITVM();\\n+\\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\\n+ ASSERT_TRUE(VM->validate());\\n+ ASSERT_TRUE(VM->instantiate());\\n+\\n+ std::vector<ValType> Types = {ValType(TypeCode::I32), ValType(TypeCode::I32)};\\n+ std::vector<std::thread> Threads;\\n+ const size_t NumThreads = 8;\\n+ Threads.reserve(NumThreads);\\n+\\n+ for (size_t Idx = 0; Idx < NumThreads; ++Idx) {\\n+ Threads.emplace_back([&VM, &Types, Idx]() {\\n+ std::vector<ValVariant> Params = {static_cast<uint32_t>(Idx), 10U};\\n+ auto Result = VM->execute(\\\"add\\\", Params, Types);\\n+ EXPECT_TRUE(Result);\\n+ if (Result) {\\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(),\\n+ static_cast<uint32_t>(Idx + 10));\\n+ }\\n+ });\\n+ }\\n+\\n+ for (auto &T : Threads) {\\n+ T.join();\\n+ }\\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 1U);\\n+\\n+ VM->cleanup();\\n+}\\n+\\n+TEST_F(LazyJITTest, LazyJITConcurrentDifferentFunctions) {\\n+ auto VM = createLazyJITVM();\\n+\\n+ ASSERT_TRUE(VM->loadWasm(SimpleWasm));\\n+ ASSERT_TRUE(VM->validate());\\n+ ASSERT_TRUE(VM->instantiate());\\n+\\n+ std::vector<ValType> Types2 = {ValType(TypeCode::I32),\\n+ ValType(TypeCode::I32)};\\n+ std::vector<ValType> Types0 = {};\\n+\\n+ std::vector<std::thread> Threads;\\n+ Threads.emplace_back([&VM, &Types2]() {\\n+ std::vector<ValVariant> Params = {10U, 20U};\\n+ auto Result = VM->execute(\\\"add\\\", Params, Types2);\\n+ EXPECT_TRUE(Result);\\n+ if (Result) {\\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(), 30U);\\n+ }\\n+ });\\n+ Threads.emplace_back([&VM, &Types2]() {\\n+ std::vector<ValVariant> Params = {5U, 6U};\\n+ auto Result = VM->execute(\\\"mul\\\", Params, Types2);\\n+ EXPECT_TRUE(Result);\\n+ if (Result) {\\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(), 30U);\\n+ }\\n+ });\\n+ Threads.emplace_back([&VM, &Types2]() {\\n+ std::vector<ValVariant> Params = {50U, 20U};\\n+ auto Result = VM->execute(\\\"sub\\\", Params, Types2);\\n+ EXPECT_TRUE(Result);\\n+ if (Result) {\\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(), 30U);\\n+ }\\n+ });\\n+ Threads.emplace_back([&VM, &Types0]() {\\n+ std::vector<ValVariant> Params = {};\\n+ auto Result = VM->execute(\\\"const42\\\", Params, Types0);\\n+ EXPECT_TRUE(Result);\\n+ if (Result) {\\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(), 42U);\\n+ }\\n+ });\\n+\\n+ for (auto &T : Threads) {\\n+ T.join();\\n+ }\\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 4U);\\n+\\n+ VM->cleanup();\\n+}\\n+\\n+TEST_F(LazyJITTest, LazyJITConcurrentFibonacci) {\\n+ auto VM = createLazyJITVM();\\n+\\n+ ASSERT_TRUE(VM->loadWasm(FibonacciWasm));\\n+ ASSERT_TRUE(VM->validate());\\n+ ASSERT_TRUE(VM->instantiate());\\n+\\n+ std::vector<ValType> Types = {ValType(TypeCode::I32)};\\n+ std::vector<std::thread> Threads;\\n+ const size_t NumThreads = 8;\\n+ Threads.reserve(NumThreads);\\n+\\n+ for (size_t Idx = 0; Idx < NumThreads; ++Idx) {\\n+ Threads.emplace_back([&VM, &Types, Idx]() {\\n+ std::vector<ValVariant> Params = {static_cast<uint32_t>(Idx)};\\n+ auto Result = VM->execute(\\\"fib\\\", Params, Types);\\n+ EXPECT_TRUE(Result);\\n+ if (Result) {\\n+ uint32_t Expected = 0;\\n+ if (Idx == 0 || Idx == 1) {\\n+ Expected = 1;\\n+ } else {\\n+ uint32_t Prev2 = 1;\\n+ uint32_t Prev1 = 1;\\n+ for (size_t Jdx = 2; Jdx <= Idx; ++Jdx) {\\n+ Expected = Prev2 + Prev1;\\n+ Prev2 = Prev1;\\n+ Prev1 = Expected;\\n+ }\\n+ }\\n+ EXPECT_EQ((*Result)[0].first.get<uint32_t>(), Expected);\\n+ }\\n+ });\\n+ }\\n+\\n+ for (auto &T : Threads) {\\n+ T.join();\\n+ }\\n+ EXPECT_EQ(VM->getLazyCompiledFuncCount(), 1U);\\n+\\n+ VM->cleanup();\\n+}\\n+\\n+} // namespace\\n+\\n+GTEST_API_ int main(int argc, char **argv) {\\n+ WasmEdge::Log::setErrorLoggingLevel();\\n+ testing::InitGoogleTest(&argc, argv);\\n+ return RUN_ALL_TESTS();\\n+}\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}}],"truncated":false,"partial":false},"paginationData":{"pageIndex":132,"numItemsPerPage":100,"numTotalItems":87912,"offset":13200,"length":100}},"jwt":"eyJhbGciOiJFZERTQSIsImtpZCI6IjVHZDBvd0g5MTM2eDZjc1FvbE1zcktNWUZoRVFoUm5PVVVybEpjOUhaUEEifQ.eyJyZWFkIjp0cnVlLCJwZXJtaXNzaW9ucyI6eyJyZXBvLmNvbnRlbnQucmVhZCI6dHJ1ZX0sImlhdCI6MTc4ODE5MDM2NSwianRpIjoiNTUwOTdiYzQtMzhkNy00ZmU3LWFjMTQtZDRlY2JkYWNhZmJkIiwic3ViIjoiL2RhdGFzZXRzL1BvdGF0b0hEL2dpdGh1Yi1wci1yZXNvbHZlIiwiZXhwIjoxNzg4MTkzOTY1LCJpc3MiOiJodHRwczovL2h1Z2dpbmdmYWNlLmNvIn0.Hev00STiqXjACR0hBVPe_PBpdRuxm4dxjtBzyye4w4ymvmm33k98O9xcQo0vhtM-kKOD3vg790zLh_YH_yyRCw","displayUrls":true,"splitSizeSummaries":[{"config":"default","split":"train","numRows":87912,"numBytesParquet":1412740926}]},"discussionsStats":{"closed":0,"open":0,"total":0},"fullWidth":true,"hasGatedAccess":true,"hasFullAccess":true,"isEmbedded":false,"savedQueries":{"community":[],"user":[]}}">
repo stringlengths 5 53 | pr_number int32 1 321k | task_type stringclasses 2
values | issue_text stringlengths 0 81.2k | pr_title stringlengths 1 319 | pr_body stringlengths 0 105k | base_sha stringlengths 40 40 | head_sha stringlengths 40 40 | gold_diff stringlengths 0 202M | changed_files listlengths 0 100 | review_threads listlengths 0 100 | test_patch stringlengths 0 23.4M | merged bool 1
class |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
WasmEdge/WasmEdge | 4,938 | issue_to_patch | fix(wasi): reject symlink targets that resolve outside the preopen root | `path_symlink` rejected absolute targets but accepted relative targets containing `..` that ascend above the preopen root, storing them verbatim. This aligns symlink-target handling with the RESOLVE_BENEATH path resolution WASI enforces: a target that would resolve outside the base (preopened) directory is rejected.
-... | 41a01b6b4f40defbac0dd551663c542cdcf9ae76 | 4a69d8872ad2116b5c946aa4c429d9b60f0ab843 | diff --git a/include/host/wasi/environ.h b/include/host/wasi/environ.h
index 823a140beabf..ea4ca4c77437 100644
--- a/include/host/wasi/environ.h
+++ b/include/host/wasi/environ.h
@@ -846,10 +846,13 @@ class Environ : public PollerContext {
if (!VINode::isPathValid(NewPath)) {
return WasiUnexpect(__WASI_ERRN... | [
"include/host/wasi/environ.h",
"include/host/wasi/vinode.h",
"lib/host/wasi/vinode.cpp",
"test/host/wasi/wasi.cpp"
] | [
{
"comment": "VINode::pathSymlink resolves the destination path with __WASI_LOOKUPFLAGS_SYMLINK_FOLLOW. If the destination already exists as a symlink, resolvePath will follow it and may end up creating the new symlink at the symlink target instead of returning __WASI_ERRNO_EXIST for the original destination pa... | diff --git a/test/host/wasi/wasi.cpp b/test/host/wasi/wasi.cpp
index c7d4aa948e7c..a39b07c3e25b 100644
--- a/test/host/wasi/wasi.cpp
+++ b/test/host/wasi/wasi.cpp
@@ -4003,6 +4003,9 @@ TEST(WasiTest, SymbolicLink) {
WasmEdge::Host::WasiPathSymlink WasiPathSymlink(Env);
WasmEdge::Host::WasiPathUnlinkFile WasiPathU... | true | |
WasmEdge/WasmEdge | 4,938 | comment_to_fix | fix(wasi): reject symlink targets that resolve outside the preopen root | VINode::pathSymlink resolves the destination path with __WASI_LOOKUPFLAGS_SYMLINK_FOLLOW. If the destination already exists as a symlink, resolvePath will follow it and may end up creating the new symlink at the symlink target instead of returning __WASI_ERRNO_EXIST for the original destination path. For creation APIs ... | 41a01b6b4f40defbac0dd551663c542cdcf9ae76 | 4a69d8872ad2116b5c946aa4c429d9b60f0ab843 | diff --git a/lib/host/wasi/vinode.cpp b/lib/host/wasi/vinode.cpp
index 4179920a755b..b8fcd0757cb5 100644
--- a/lib/host/wasi/vinode.cpp
+++ b/lib/host/wasi/vinode.cpp
@@ -256,8 +256,19 @@ WasiExpect<void> VINode::pathSymlink(std::string_view OldPath,
if (!New->can(__WASI_RIGHTS_PATH_SYMLINK)) {
return WasiUnexp... | [
"lib/host/wasi/vinode.cpp"
] | [
{
"comment": "VINode::pathSymlink resolves the destination path with __WASI_LOOKUPFLAGS_SYMLINK_FOLLOW. If the destination already exists as a symlink, resolvePath will follow it and may end up creating the new symlink at the symlink target instead of returning __WASI_ERRNO_EXIST for the original destination pa... | true | ||
WasmEdge/WasmEdge | 4,938 | comment_to_fix | fix(wasi): reject symlink targets that resolve outside the preopen root | The removeSymlink helper doesn't assert that the unlink succeeded (it only checks that the hostcall returned true). If unlink fails, the symlink can be left behind and cause cascading failures or flaky behavior in later test sections. | 41a01b6b4f40defbac0dd551663c542cdcf9ae76 | 4a69d8872ad2116b5c946aa4c429d9b60f0ab843 | diff --git a/test/host/wasi/wasi.cpp b/test/host/wasi/wasi.cpp
index c7d4aa948e7c..a39b07c3e25b 100644
--- a/test/host/wasi/wasi.cpp
+++ b/test/host/wasi/wasi.cpp
@@ -4003,6 +4003,9 @@ TEST(WasiTest, SymbolicLink) {
WasmEdge::Host::WasiPathSymlink WasiPathSymlink(Env);
WasmEdge::Host::WasiPathUnlinkFile WasiPathU... | [
"test/host/wasi/wasi.cpp"
] | [
{
"comment": "The removeSymlink helper doesn't assert that the unlink succeeded (it only checks that the hostcall returned true). If unlink fails, the symlink can be left behind and cause cascading failures or flaky behavior in later test sections.",
"path": "test/host/wasi/wasi.cpp",
"hunk": "@@ -4128,... | true | ||
WasmEdge/WasmEdge | 4,938 | comment_to_fix | fix(wasi): reject symlink targets that resolve outside the preopen root | After calling WasiPathRemoveDirectory, the test doesn't assert Errno is __WASI_ERRNO_SUCCESS. If directory removal fails (e.g., because the directory isn't empty), the failure will be silently ignored and can affect later test cases when run in the same working directory. | 41a01b6b4f40defbac0dd551663c542cdcf9ae76 | 4a69d8872ad2116b5c946aa4c429d9b60f0ab843 | diff --git a/test/host/wasi/wasi.cpp b/test/host/wasi/wasi.cpp
index c7d4aa948e7c..a39b07c3e25b 100644
--- a/test/host/wasi/wasi.cpp
+++ b/test/host/wasi/wasi.cpp
@@ -4003,6 +4003,9 @@ TEST(WasiTest, SymbolicLink) {
WasmEdge::Host::WasiPathSymlink WasiPathSymlink(Env);
WasmEdge::Host::WasiPathUnlinkFile WasiPathU... | [
"test/host/wasi/wasi.cpp"
] | [
{
"comment": "After calling WasiPathRemoveDirectory, the test doesn't assert Errno is __WASI_ERRNO_SUCCESS. If directory removal fails (e.g., because the directory isn't empty), the failure will be silently ignored and can affect later test cases when run in the same working directory.",
"path": "test/host/... | true | ||
WasmEdge/WasmEdge | 4,938 | comment_to_fix | fix(wasi): reject symlink targets that resolve outside the preopen root | `resolvePath` now has a `ResolvedDepth` out-param, but it is not set on all successful return paths. In particular, the early returns for trailing `.` and `..` currently return `Buffer` without updating `ResolvedDepth`, which violates the header contract (“set …; left untouched on error paths”) and can yield an incorre... | 41a01b6b4f40defbac0dd551663c542cdcf9ae76 | 4a69d8872ad2116b5c946aa4c429d9b60f0ab843 | diff --git a/lib/host/wasi/vinode.cpp b/lib/host/wasi/vinode.cpp
index 4179920a755b..b8fcd0757cb5 100644
--- a/lib/host/wasi/vinode.cpp
+++ b/lib/host/wasi/vinode.cpp
@@ -256,8 +256,19 @@ WasiExpect<void> VINode::pathSymlink(std::string_view OldPath,
if (!New->can(__WASI_RIGHTS_PATH_SYMLINK)) {
return WasiUnexp... | [
"lib/host/wasi/vinode.cpp"
] | [
{
"comment": "`resolvePath` now has a `ResolvedDepth` out-param, but it is not set on all successful return paths. In particular, the early returns for trailing `.` and `..` currently return `Buffer` without updating `ResolvedDepth`, which violates the header contract (“set …; left untouched on error paths”) an... | true | ||
WasmEdge/WasmEdge | 4,936 | issue_to_patch | fix(common): resolve Clang compilation error in uint128_fallback subtraction | ## Description
This PR fixes a compilation failure encountered when building WasmEdge with developer tests enabled on arm64 macOS using a standard LLVM/Clang toolchain.
The custom `uint128_fallback` structure lacks a native unary bitwise NOT (`~`) operator, which causes modern strict compilers to fail with an `i... | cb21baa4c300477ad6d0c627e397271804f9fd69 | 667c30df0d8b8cc58129914bade9470d68137451 | diff --git a/include/common/int128.h b/include/common/int128.h
index 40f49e7270e8..168f488050dd 100644
--- a/include/common/int128.h
+++ b/include/common/int128.h
@@ -581,8 +581,8 @@ operator+(detail::uint128_fallback LHS, unsigned int RHS) {
inline constexpr detail::uint128_fallback
operator-(unsigned int LHS, det... | [
"include/common/int128.h"
] | [] | true | ||
WasmEdge/WasmEdge | 4,874 | issue_to_patch | test: add unit tests for common/spdlog.cpp logging API | ## Description
Add comprehensive unit tests for the WasmEdge logging API in
`lib/common/spdlog.cpp`, which previously had zero test coverage.
**Functions tested:**
- `setLoggingLevelFromString` — all 9 valid level strings (`trace`, `debug`,
`info`, `warn`, `warning`, `error`, `critical`, `fatal`, `off`) plus... | 1cd04e4b35ebc86c937527f0146c2ec56fd701b3 | b2caac9e218b8eb26cb4f599328cb55248ee084b | [
"test/common/CMakeLists.txt",
"test/common/spdlogTest.cpp"
] | [] | diff --git a/test/common/CMakeLists.txt b/test/common/CMakeLists.txt
index 030358670238..e3d009ad0b3b 100644
--- a/test/common/CMakeLists.txt
+++ b/test/common/CMakeLists.txt
@@ -4,6 +4,7 @@
wasmedge_add_executable(wasmedgeCommonTests
int128Test.cpp
hashTest.cpp
+ spdlogTest.cpp
)
add_test(wasmedgeCommonTes... | true | ||
WasmEdge/WasmEdge | 4,929 | issue_to_patch | docs: sync Japanese README | ## Description
This PR updates README-ja.md to sync it with the latest English README.md.
The scope is intentionally limited to the Japanese README only. It does not modify README.md, README-zh.md, or README-zh-TW.md.
Related issue: Part of #4228
## Changes
- Synced outdated or missing sections in README-ja.... | 9595a74d5d1535130b73ff1def563499c9a6e552 | b8562b10a499373cc6c533920b0386c2f3e9abb1 | diff --git a/README-ja.md b/README-ja.md
index 248067ceadc9..b82e60043861 100644
--- a/README-ja.md
+++ b/README-ja.md
@@ -8,9 +8,11 @@
-# [🤩 WasmEdge は、ご自身のデバイスで LLM を実行する最も簡単で早い方法です。 🤩](https://www.secondstate.io/articles/wasm-runtime-agi/)
+# [🤩 WasmEdge は、手元... | [
"README-ja.md"
] | [] | true | ||
WasmEdge/WasmEdge | 4,928 | issue_to_patch | ci(linter): bump to clang-format-20 | ## Description
Ensure that the CI uses a pinned clang-format version, 20.
## Checklist
Before submitting this PR, please ensure the following:
- [x] **DCO Signed-off**: All commits are signed-off (`git commit -s`). CI workflows will only be approved if DCO check is passed.
- [x] **Commit Messages**: Run `c... | bf4a593681e8b19f63c580da7d8f99678a4a79d2 | 74a2d2acc518687ea42a53281d0f0e0dd5a6d16f | diff --git a/.github/workflows/reusable-call-linter.yml b/.github/workflows/reusable-call-linter.yml
index 75596266b5e7..493999b228e8 100644
--- a/.github/workflows/reusable-call-linter.yml
+++ b/.github/workflows/reusable-call-linter.yml
@@ -24,7 +24,7 @@ jobs:
- name: Install clang-format
run: |
... | [
".github/workflows/reusable-call-linter.yml",
"lib/system/fault.cpp",
"plugins/wasi_crypto/asymmetric_common/keypair.cpp",
"plugins/wasi_crypto/symmetric/ctx.cpp",
"plugins/wasi_crypto/symmetric/state.cpp"
] | [] | true | ||
WasmEdge/WasmEdge | 4,863 | issue_to_patch | feat(component,validator): resource, start, externdesc, tag validation | ## Description
Tag in core-export alias and inline-export
- validate(Alias) core-export branch maps CoreSortType::Tag to ExternalType::Tag instead of falling into the unsupported default.
- validate(CoreInstance) inline-export switch picks up Tag, so an inline-exported tag is registered as Tag rather than rejected... | 59514b7c785b974eaf766dbc416a561392af57f4 | d3eb7205052ad970d45dde8fe2718026e9986105 | diff --git a/include/common/enum.inc b/include/common/enum.inc
index fdde6715bb76..94a8626955b8 100644
--- a/include/common/enum.inc
+++ b/include/common/enum.inc
@@ -1118,6 +1118,8 @@ E(InstanceMissingExpectedExport, 0x02B2, "missing expected export")
E(InvalidExportName, 0x02B3, "not a valid export name")
// Extern... | [
"include/common/enum.inc",
"include/validator/component_context.h",
"include/validator/validator.h",
"lib/validator/component_validator.cpp",
"lib/validator/validator.cpp",
"test/component/ComponentValidatorTest.cpp",
"test/spec/spectest.cpp"
] | [
{
"comment": "Why are we create this instance at the point? This means if someone create another constructor for `Validator` then\r\n\r\n1. one could set `CoreFuncType_I32_I32` to something else\r\n2. or one forgot to configure it",
"path": "lib/validator/validator.cpp",
"hunk": "@@ -65,6 +80,12 @@ chec... | diff --git a/test/component/ComponentValidatorTest.cpp b/test/component/ComponentValidatorTest.cpp
index a58cbdd9c425..4d3766f08fe4 100644
--- a/test/component/ComponentValidatorTest.cpp
+++ b/test/component/ComponentValidatorTest.cpp
@@ -659,8 +659,9 @@ TEST(ComponentValidatorTest, InstanceTypeExportCaseFoldConflict) ... | true | |
WasmEdge/WasmEdge | 4,863 | comment_to_fix | feat(component,validator): resource, start, externdesc, tag validation | Why are we create this instance at the point? This means if someone create another constructor for `Validator` then
1. one could set `CoreFuncType_I32_I32` to something else
2. or one forgot to configure it | 59514b7c785b974eaf766dbc416a561392af57f4 | d3eb7205052ad970d45dde8fe2718026e9986105 | diff --git a/lib/validator/validator.cpp b/lib/validator/validator.cpp
index c0695aa5c04b..84cf8ea41ec4 100644
--- a/lib/validator/validator.cpp
+++ b/lib/validator/validator.cpp
@@ -18,6 +18,21 @@ namespace Validator {
namespace {
+// One-shot builder for the pre-defined core function SubTypes.
+AST::SubType make... | [
"lib/validator/validator.cpp"
] | [
{
"comment": "Why are we create this instance at the point? This means if someone create another constructor for `Validator` then\r\n\r\n1. one could set `CoreFuncType_I32_I32` to something else\r\n2. or one forgot to configure it",
"path": "lib/validator/validator.cpp",
"hunk": "@@ -65,6 +80,12 @@ chec... | true | ||
WasmEdge/WasmEdge | 4,924 | issue_to_patch | ci(dependabot): bump github/codeql-action from 4.36.0 to 4.36.1 | Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.36.0 to 4.36.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/github/codeql-action/releases">github/codeql-action's releases</a>.</em></p>
<blockquote>
<h2>v4.36.1</h2>
<p>No user facing changes.</p... | 1cf5d532d796d81d200a3069672ecdbaa2c7b7d3 | 785fa4f78e764b1603ddb14a83076225b96a82bf | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 1e9967ac6f83..13fe7810abda 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -81,7 +81,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize C... | [
".github/workflows/codeql-analysis.yml"
] | [] | true | ||
WasmEdge/WasmEdge | 4,925 | issue_to_patch | ci(dependabot): bump actions/checkout from 6.0.2 to 6.0.3 | Bumps [actions/checkout](https://github.com/actions/checkout) from 6.0.2 to 6.0.3.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/actions/checkout/releases">actions/checkout's releases</a>.</em></p>
<blockquote>
<h2>v6.0.3</h2>
<h2>What's Changed</h2>
<ul>
<li>Update changelo... | fcbea0b6d591e23e264f59fc359ac490e2cf07ed | 89ef93456791ce80419c82fea53c0cce0f151a3f | diff --git a/.github/workflows/IWYU_scan.yml b/.github/workflows/IWYU_scan.yml
index 2fbccd1a070e..1c09f09380ac 100644
--- a/.github/workflows/IWYU_scan.yml
+++ b/.github/workflows/IWYU_scan.yml
@@ -48,7 +48,7 @@ jobs:
with:
egress-policy: audit
- - uses: actions/checkout@de0fac2e4500dabe0009e67214... | [
".github/workflows/IWYU_scan.yml",
".github/workflows/build-extensions.yml",
".github/workflows/build.yml",
".github/workflows/build_for_nix.yml",
".github/workflows/build_for_openwrt.yml",
".github/workflows/build_for_riscv.yml",
".github/workflows/build_for_s390x.yml",
".github/workflows/codeql-anal... | [] | true | ||
WasmEdge/WasmEdge | 4,915 | issue_to_patch | feat(validator/component): enumerate exports of imported/aliased modules | Component instance definitions could not resolve an alias-export into an instance produced by instantiating an imported, declared, or outer-aliased core module / component. The validator only derived instance exports from a locally-defined module/component's inline AST, so every other case got an empty export table and... | f8698d157b1c1f63a9c1671e9eee5cfd0c0f3f6e | 428090e44d478134cfac8a45a3e547c9693d781b | diff --git a/include/validator/component_context.h b/include/validator/component_context.h
index 7011d7b18a99..ad82ac737fca 100644
--- a/include/validator/component_context.h
+++ b/include/validator/component_context.h
@@ -12,6 +12,7 @@
#include <string>
#include <unordered_map>
#include <unordered_set>
+#include <v... | [
"include/validator/component_context.h",
"lib/validator/component_context.cpp",
"lib/validator/component_validator.cpp",
"test/spec/spectest.cpp"
] | [] | diff --git a/test/spec/spectest.cpp b/test/spec/spectest.cpp
index ef4622fa28e6..fecf7fdca54c 100644
--- a/test/spec/spectest.cpp
+++ b/test/spec/spectest.cpp
@@ -318,7 +318,7 @@ std::map<std::string, ComponentModelSupport> ComponentModelFolders = {
// Test table: the testing status of load, validate, instantiate,... | true | |
WasmEdge/WasmEdge | 4,921 | issue_to_patch | fix(driver): register the --run-mode CLI flag | ## Description
--run-mode is declared, constructed, and consumed by the runtime tool, and the --enable-jit / --force-interpreter deprecation warnings tell users to switch to it, but the parser registration was dropped in a refactor, so --run-mode=<mode> was rejected as an unknown option. Restore the add_option call ... | e1ffd9c8d02e46da22daf845d3f3797a00ad6ad9 | 024129a7605f6ec5f781e1679b465f1a9b9592b9 | diff --git a/include/driver/tool.h b/include/driver/tool.h
index ae582fb77d25..7a75ca86bb54 100644
--- a/include/driver/tool.h
+++ b/include/driver/tool.h
@@ -15,6 +15,7 @@
#include "driver/options.h"
#include "plugin/plugin.h"
#include "po/argument_parser.h"
+#include <optional>
#include <string_view>
namespace... | [
"include/driver/tool.h",
"lib/driver/runtimeTool.cpp",
"test/driver/driverToolTest.cpp"
] | [
{
"comment": "**<sub><sub></sub></sub> Remove change-explaining test comments**\n\nThe repo instructions in `AGENTS.md` say not to add inline comments explaining the change. This new regression note describes why the test was added and why it is par... | diff --git a/test/driver/driverToolTest.cpp b/test/driver/driverToolTest.cpp
index 66eba83edef3..6d951d62bff6 100644
--- a/test/driver/driverToolTest.cpp
+++ b/test/driver/driverToolTest.cpp
@@ -2,7 +2,9 @@
// SPDX-FileCopyrightText: 2019-2024 Second State INC
#include "common/defines.h"
+#include "driver/tool.h"
... | true | |
WasmEdge/WasmEdge | 4,921 | comment_to_fix | fix(driver): register the --run-mode CLI flag | **<sub><sub></sub></sub> Remove change-explaining test comments**
The repo instructions in `AGENTS.md` say not to add inline comments explaining the change. This new regression note describes why the test was added and why it is parse-only rather than docu... | e1ffd9c8d02e46da22daf845d3f3797a00ad6ad9 | 024129a7605f6ec5f781e1679b465f1a9b9592b9 | diff --git a/test/driver/driverToolTest.cpp b/test/driver/driverToolTest.cpp
index 66eba83edef3..6d951d62bff6 100644
--- a/test/driver/driverToolTest.cpp
+++ b/test/driver/driverToolTest.cpp
@@ -2,7 +2,9 @@
// SPDX-FileCopyrightText: 2019-2024 Second State INC
#include "common/defines.h"
+#include "driver/tool.h"
... | [
"test/driver/driverToolTest.cpp"
] | [
{
"comment": "**<sub><sub></sub></sub> Remove change-explaining test comments**\n\nThe repo instructions in `AGENTS.md` say not to add inline comments explaining the change. This new regression note describes why the test was added and why it is par... | true | ||
WasmEdge/WasmEdge | 4,921 | comment_to_fix | fix(driver): register the --run-mode CLI flag | **<sub><sub></sub></sub> Reject invalid run-mode values**
Registering `--run-mode` as an unconstrained string makes typos such as `--run-mode=jti` parse successfully; `Tool()` then calls `parseRunModeArg()`, whose fall-through returns `RunMode::Interpreter... | e1ffd9c8d02e46da22daf845d3f3797a00ad6ad9 | 024129a7605f6ec5f781e1679b465f1a9b9592b9 | diff --git a/include/driver/tool.h b/include/driver/tool.h
index ae582fb77d25..7a75ca86bb54 100644
--- a/include/driver/tool.h
+++ b/include/driver/tool.h
@@ -15,6 +15,7 @@
#include "driver/options.h"
#include "plugin/plugin.h"
#include "po/argument_parser.h"
+#include <optional>
#include <string_view>
namespace... | [
"include/driver/tool.h"
] | [
{
"comment": "**<sub><sub></sub></sub> Reject invalid run-mode values**\n\nRegistering `--run-mode` as an unconstrained string makes typos such as `--run-mode=jti` parse successfully; `Tool()` then calls `parseRunModeArg()`, whose fall-through retur... | true | ||
WasmEdge/WasmEdge | 4,920 | issue_to_patch | fix: reject non-funcref tables/refs in call_indirect and call_ref | ## Description
A table whose element type is a concrete non-funcref reference (e.g. `(ref null $s)` for a struct type) passed validation because the checks used `ValType::isFuncRefType()`, which treats any concrete type index as a funcref. Such a module would then reinterpret the struct reference as a `FunctionInsta... | b2bab2a0362825ef260a7c460aac3e86574e26fd | d8e960504dd48ece15046476fc30f91ef3a3c04e | diff --git a/include/common/types.h b/include/common/types.h
index de5d23764ee3..6a3ba6e9d3c8 100644
--- a/include/common/types.h
+++ b/include/common/types.h
@@ -689,6 +689,9 @@ inline ValVariant ValueFromType(ValType Type) noexcept {
inline const Runtime::Instance::FunctionInstance *
retrieveFuncRef(const RefVari... | [
"include/common/types.h",
"lib/executor/engine/controlInstr.cpp",
"lib/validator/formchecker.cpp",
"test/executor/ExecutorRegressionTest.cpp"
] | [
{
"comment": "What if we report \"this is not a function\"?",
"path": "include/common/types.h",
"hunk": "@@ -689,6 +689,9 @@ inline ValVariant ValueFromType(ValType Type) noexcept {\n \n inline const Runtime::Instance::FunctionInstance *\n retrieveFuncRef(const RefVariant &Val) {\n+ if (!Val.getType().... | diff --git a/test/executor/ExecutorRegressionTest.cpp b/test/executor/ExecutorRegressionTest.cpp
index 1b8bad5cc0c8..d131b0629b3c 100644
--- a/test/executor/ExecutorRegressionTest.cpp
+++ b/test/executor/ExecutorRegressionTest.cpp
@@ -482,6 +482,39 @@ std::array<WasmEdge::Byte, 134> ThrowRefMultiParamWasm{
0x00, 0... | true | |
WasmEdge/WasmEdge | 4,920 | comment_to_fix | fix: reject non-funcref tables/refs in call_indirect and call_ref | What if we report "this is not a function"? | b2bab2a0362825ef260a7c460aac3e86574e26fd | d8e960504dd48ece15046476fc30f91ef3a3c04e | diff --git a/include/common/types.h b/include/common/types.h
index de5d23764ee3..6a3ba6e9d3c8 100644
--- a/include/common/types.h
+++ b/include/common/types.h
@@ -689,6 +689,9 @@ inline ValVariant ValueFromType(ValType Type) noexcept {
inline const Runtime::Instance::FunctionInstance *
retrieveFuncRef(const RefVari... | [
"include/common/types.h"
] | [
{
"comment": "What if we report \"this is not a function\"?",
"path": "include/common/types.h",
"hunk": "@@ -689,6 +689,9 @@ inline ValVariant ValueFromType(ValType Type) noexcept {\n \n inline const Runtime::Instance::FunctionInstance *\n retrieveFuncRef(const RefVariant &Val) {\n+ if (!Val.getType().... | true | ||
WasmEdge/WasmEdge | 4,922 | issue_to_patch | fix(test/llvm): drop redundant libs from wasmedgeLazyJITTests | wasmedgeVM already PUBLIC-links wasmedgeCommon, wasmedgeLoader and wasmedgeValidator, so listing them again on wasmedgeLazyJITTests put each archive on the link line twice and produced the macOS linker warning "ld: warning: ignoring duplicate libraries". Link wasmedgeVM alone, matching every other wasmedgeVM-consuming ... | d8c45f15de5ae3bff12c48e59ce24d0603dba7f7 | b79fcc938b9076d5829d8261b96cd180dd5fd521 | [
"test/llvm/CMakeLists.txt"
] | [] | diff --git a/test/llvm/CMakeLists.txt b/test/llvm/CMakeLists.txt
index 5ea30c71314d..d71ea8411577 100644
--- a/test/llvm/CMakeLists.txt
+++ b/test/llvm/CMakeLists.txt
@@ -21,9 +21,6 @@ add_test(wasmedgeLazyJITTests wasmedgeLazyJITTests)
target_link_libraries(wasmedgeLazyJITTests
PRIVATE
- wasmedgeCommon
- wasme... | true | ||
WasmEdge/WasmEdge | 4,913 | issue_to_patch | fix(test/plugins/zlib): remove concrete types to fix devirtualization | ## Description
<!-- Describe your changes here -->
Similar to #4910, tests for the Zlib plugin were breaking the build. Here are the failing build logs before this change:
```
build $ cmake -DWASMEDGE_BUILD_TESTS=ON -DWASMEDGE_PLUGIN_ZLIB=ON .. && make -j 2
/usr/bin/ld: /tmp/ccEhMzob.ltrans0.ltrans.o: in function ... | 9091ce4f3c89a11efa5a2b84e5a0e8cc44ddebe1 | 950ef897f78905d32292d9a9744fa006b06005cd | [
"test/plugins/wasmedge_zlib/wasmedge_zlib.cpp"
] | [] | diff --git a/test/plugins/wasmedge_zlib/wasmedge_zlib.cpp b/test/plugins/wasmedge_zlib/wasmedge_zlib.cpp
index b777abf2bb63..cb6ce197ad1d 100644
--- a/test/plugins/wasmedge_zlib/wasmedge_zlib.cpp
+++ b/test/plugins/wasmedge_zlib/wasmedge_zlib.cpp
@@ -84,38 +84,32 @@ TEST(WasmEdgeZlibTest, DeflateInflateCycle) {
auto... | true | ||
WasmEdge/WasmEdge | 4,911 | issue_to_patch | chore: add community meeting issue template | Assisted-by: Claude (Anthropic)
## Checklist
Before submitting this PR, please ensure the following:
- [x] **DCO Signed-off**: All commits are signed-off (`git commit -s`). CI workflows will only be approved if DCO check is passed.
- [x] **Commit Messages**: Run `commitlint` on your commit messages to ensure ... | d3cbc241ac51f9781a9756aef2c0ef1fee4f3a61 | 9774c747d2fd9b954a347f008f13f1c0342ce1da | diff --git a/.github/ISSUE_TEMPLATE/community_meeting.yml b/.github/ISSUE_TEMPLATE/community_meeting.yml
new file mode 100644
index 000000000000..a9955406663a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/community_meeting.yml
@@ -0,0 +1,40 @@
+name: "Community Meeting"
+description: Propose and discuss topics for the mon... | [
".github/ISSUE_TEMPLATE/community_meeting.yml"
] | [] | true | ||
WasmEdge/WasmEdge | 4,910 | issue_to_patch | fix(test/plugins/image): remove concrete types to fix devirtualization | ## Description
This was breaking the build because of undefined references to LoadJPG::body, LoadPNG::body, LoadImage::body. I have removed `dynamic_cast<concrete_type>` and the inclusion of the concrete Load* types from `image_func.h`
This fixes the build as can be seen here:
```
build $ cmake -DWASMEDGE_BUILD_... | b9ea291328e0ab1edaf59283522067c57da785a1 | 85cbb921b36f91b08e11e23eddce916f685e8afe | [
"test/plugins/wasmedge_image/wasmedge_image.cpp"
] | [
{
"comment": "Remove this line.",
"path": "test/plugins/wasmedge_image/wasmedge_image.cpp",
"hunk": "@@ -179,8 +179,8 @@ TEST(WasmEdgeImageTest, LoadJPG) {\n auto *FuncInst = ImgMod->findFuncExports(\"load_jpg\");\n EXPECT_NE(FuncInst, nullptr);\n EXPECT_TRUE(FuncInst->isHostFunction());\n- auto ... | diff --git a/test/plugins/wasmedge_image/wasmedge_image.cpp b/test/plugins/wasmedge_image/wasmedge_image.cpp
index 4f449727ff42..479afbd07cd6 100644
--- a/test/plugins/wasmedge_image/wasmedge_image.cpp
+++ b/test/plugins/wasmedge_image/wasmedge_image.cpp
@@ -2,8 +2,8 @@
// SPDX-FileCopyrightText: 2019-2024 Second Stat... | true | ||
WasmEdge/WasmEdge | 4,910 | comment_to_fix | fix(test/plugins/image): remove concrete types to fix devirtualization | Remove this line. | b9ea291328e0ab1edaf59283522067c57da785a1 | 85cbb921b36f91b08e11e23eddce916f685e8afe | diff --git a/test/plugins/wasmedge_image/wasmedge_image.cpp b/test/plugins/wasmedge_image/wasmedge_image.cpp
index 4f449727ff42..479afbd07cd6 100644
--- a/test/plugins/wasmedge_image/wasmedge_image.cpp
+++ b/test/plugins/wasmedge_image/wasmedge_image.cpp
@@ -2,8 +2,8 @@
// SPDX-FileCopyrightText: 2019-2024 Second Stat... | [
"test/plugins/wasmedge_image/wasmedge_image.cpp"
] | [
{
"comment": "Remove this line.",
"path": "test/plugins/wasmedge_image/wasmedge_image.cpp",
"hunk": "@@ -179,8 +179,8 @@ TEST(WasmEdgeImageTest, LoadJPG) {\n auto *FuncInst = ImgMod->findFuncExports(\"load_jpg\");\n EXPECT_NE(FuncInst, nullptr);\n EXPECT_TRUE(FuncInst->isHostFunction());\n- auto ... | true | ||
WasmEdge/WasmEdge | 4,910 | comment_to_fix | fix(test/plugins/image): remove concrete types to fix devirtualization | Ditto | b9ea291328e0ab1edaf59283522067c57da785a1 | 85cbb921b36f91b08e11e23eddce916f685e8afe | diff --git a/test/plugins/wasmedge_image/wasmedge_image.cpp b/test/plugins/wasmedge_image/wasmedge_image.cpp
index 4f449727ff42..479afbd07cd6 100644
--- a/test/plugins/wasmedge_image/wasmedge_image.cpp
+++ b/test/plugins/wasmedge_image/wasmedge_image.cpp
@@ -2,8 +2,8 @@
// SPDX-FileCopyrightText: 2019-2024 Second Stat... | [
"test/plugins/wasmedge_image/wasmedge_image.cpp"
] | [
{
"comment": "Ditto",
"path": "test/plugins/wasmedge_image/wasmedge_image.cpp",
"hunk": "@@ -320,8 +320,8 @@ TEST(WasmEdgeImageTest, LoadPNG) {\n auto *FuncInst = ImgMod->findFuncExports(\"load_png\");\n EXPECT_NE(FuncInst, nullptr);\n EXPECT_TRUE(FuncInst->isHostFunction());\n- auto &HostFuncIns... | true | ||
WasmEdge/WasmEdge | 4,910 | comment_to_fix | fix(test/plugins/image): remove concrete types to fix devirtualization | Ditto | b9ea291328e0ab1edaf59283522067c57da785a1 | 85cbb921b36f91b08e11e23eddce916f685e8afe | diff --git a/test/plugins/wasmedge_image/wasmedge_image.cpp b/test/plugins/wasmedge_image/wasmedge_image.cpp
index 4f449727ff42..479afbd07cd6 100644
--- a/test/plugins/wasmedge_image/wasmedge_image.cpp
+++ b/test/plugins/wasmedge_image/wasmedge_image.cpp
@@ -2,8 +2,8 @@
// SPDX-FileCopyrightText: 2019-2024 Second Stat... | [
"test/plugins/wasmedge_image/wasmedge_image.cpp"
] | [
{
"comment": "Ditto",
"path": "test/plugins/wasmedge_image/wasmedge_image.cpp",
"hunk": "@@ -459,8 +459,8 @@ TEST(WasmEdgeImageTest, LoadImage) {\n auto *FuncInst = ImgMod->findFuncExports(\"load_image\");\n EXPECT_NE(FuncInst, nullptr);\n EXPECT_TRUE(FuncInst->isHostFunction());\n- auto &HostFun... | true | ||
WasmEdge/WasmEdge | 4,897 | issue_to_patch | bug: StoreManager::reset leaves component registrations intact
### Summary
StoreManager::reset() clears NamedMod but does not clear NamedComp. After reset(),
findComponent() can still return a previously registered component name.
### Current State
In include/runtime/storemgr.h, reset() only unlinks and clears Name... | fix: storemanager::reset clears namedcomp | ## Description
<!-- Describe your changes here -->
fixed #4896
## Checklist
Before submitting this PR, please ensure the following:
- [x] **DCO Signed-off**: All commits are signed-off (`git commit -s`). CI workflows will only be approved if DCO check is passed.
- [x] **Commit Messages**: Run `commitlint` on... | 7fb4cd621b7b9858c64b711c7150377f03f58c83 | ea1aeeab61c0f814615cd85442c3d3231d76f6b1 | diff --git a/include/runtime/storemgr.h b/include/runtime/storemgr.h
index 7504895a499f..95af2fe04f76 100644
--- a/include/runtime/storemgr.h
+++ b/include/runtime/storemgr.h
@@ -76,6 +76,7 @@ class StoreManager {
->unlinkStore(this, Name);
}
NamedMod.clear();
+ NamedComp.clear();
}
/// ... | [
"include/runtime/storemgr.h"
] | [] | true | |
WasmEdge/WasmEdge | 4,802 | issue_to_patch | refactor(executor): extract SIMD superinstruction primitives into header | ## Summary
- Introduces `include/executor/engine/simd_ops.h` — a single set of inline, free-function SIMD op templates (arithmetic, min/max, fmin/fmax, neg/abs/sqrt, ceil/floor/trunc/nearest, popcnt, v128 bitwise, narrow/widen conversions).
- Converts the `Executor::runVector*` member functions in `binary_numeric_vect... | f1d20116e4c3c00f5572a6801e450d84fe6b0e6b | 9a2e6cc2ab0ff6c8af4e3369dfc1430f16b80e25 | diff --git a/include/executor/engine/binary_numeric_vector.ipp b/include/executor/engine/binary_numeric_vector.ipp
index d87f8bbdebb4..83ac43ffeac4 100644
--- a/include/executor/engine/binary_numeric_vector.ipp
+++ b/include/executor/engine/binary_numeric_vector.ipp
@@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2... | [
"include/executor/engine/binary_numeric_vector.ipp",
"include/executor/engine/simd_ops.h",
"include/executor/engine/unary_numeric_vector.ipp"
] | [
{
"comment": "This function is not used in ipp.",
"path": "include/executor/engine/simd_ops.h",
"hunk": "@@ -0,0 +1,279 @@\n+// SPDX-License-Identifier: Apache-2.0\n+// SPDX-FileCopyrightText: 2019-2024 Second State INC\n+\n+//===-- wasmedge/executor/engine/simd_ops.h - SIMD op free templates ------===/... | true | ||
WasmEdge/WasmEdge | 4,802 | comment_to_fix | refactor(executor): extract SIMD superinstruction primitives into header | This function is not used in ipp. | f1d20116e4c3c00f5572a6801e450d84fe6b0e6b | 9a2e6cc2ab0ff6c8af4e3369dfc1430f16b80e25 | diff --git a/include/executor/engine/simd_ops.h b/include/executor/engine/simd_ops.h
new file mode 100644
index 000000000000..db1abeb67939
--- /dev/null
+++ b/include/executor/engine/simd_ops.h
@@ -0,0 +1,237 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2019-2024 Second State INC
+
+//===-- wa... | [
"include/executor/engine/simd_ops.h"
] | [
{
"comment": "This function is not used in ipp.",
"path": "include/executor/engine/simd_ops.h",
"hunk": "@@ -0,0 +1,279 @@\n+// SPDX-License-Identifier: Apache-2.0\n+// SPDX-FileCopyrightText: 2019-2024 Second State INC\n+\n+//===-- wasmedge/executor/engine/simd_ops.h - SIMD op free templates ------===/... | true | ||
WasmEdge/WasmEdge | 4,802 | comment_to_fix | refactor(executor): extract SIMD superinstruction primitives into header | The `v128` series of functions is not used in the executor. | f1d20116e4c3c00f5572a6801e450d84fe6b0e6b | 9a2e6cc2ab0ff6c8af4e3369dfc1430f16b80e25 | diff --git a/include/executor/engine/simd_ops.h b/include/executor/engine/simd_ops.h
new file mode 100644
index 000000000000..db1abeb67939
--- /dev/null
+++ b/include/executor/engine/simd_ops.h
@@ -0,0 +1,237 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2019-2024 Second State INC
+
+//===-- wa... | [
"include/executor/engine/simd_ops.h"
] | [
{
"comment": "The `v128` series of functions is not used in the executor.",
"path": "include/executor/engine/simd_ops.h",
"hunk": "@@ -0,0 +1,279 @@\n+// SPDX-License-Identifier: Apache-2.0\n+// SPDX-FileCopyrightText: 2019-2024 Second State INC\n+\n+//===-- wasmedge/executor/engine/simd_ops.h - SIMD op... | true | ||
WasmEdge/WasmEdge | 4,802 | comment_to_fix | refactor(executor): extract SIMD superinstruction primitives into header | I found that in the original implementation, there will have a check like this:
```cpp
else if constexpr (sizeof(T) == 8)
```
What's the reason to remove all of them? | f1d20116e4c3c00f5572a6801e450d84fe6b0e6b | 9a2e6cc2ab0ff6c8af4e3369dfc1430f16b80e25 | diff --git a/include/executor/engine/simd_ops.h b/include/executor/engine/simd_ops.h
new file mode 100644
index 000000000000..db1abeb67939
--- /dev/null
+++ b/include/executor/engine/simd_ops.h
@@ -0,0 +1,237 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2019-2024 Second State INC
+
+//===-- wa... | [
"include/executor/engine/simd_ops.h"
] | [
{
"comment": "I found that in the original implementation, there will have a check like this:\n\n```cpp\nelse if constexpr (sizeof(T) == 8)\n```\n\nWhat's the reason to remove all of them?",
"path": "include/executor/engine/simd_ops.h",
"hunk": "@@ -0,0 +1,237 @@\n+// SPDX-License-Identifier: Apache-2.0... | true | ||
WasmEdge/WasmEdge | 4,905 | issue_to_patch | fix: fix lookup error while vm unregister module | ## Description
This PR fixes a key mismatch bug in `unsafeUnregisterModule` where it incorrectly attempts to look up `RegModMap` using the registered module `Name` (alias) instead of its internal `Module.getID()`.
During module registration, `RegModMap` is populated using `Module.getID()` as the key. However, `un... | 874c575eea013312e8c6563104d68400a6fe3250 | 3132936e67dde5775212df7a028152d37e5619b7 | diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp
index 229d1b32ccb9..074be9d96e93 100644
--- a/lib/vm/vm.cpp
+++ b/lib/vm/vm.cpp
@@ -345,19 +345,19 @@ VM::unsafeRegisterModule(std::string_view Name,
}
Expect<void> VM::unsafeUnregisterModule(std::string_view Name) {
- auto RegMapIt = RegModMap.find(std::string(Name));
- ... | [
"lib/vm/vm.cpp"
] | [] | true | ||
WasmEdge/WasmEdge | 4,726 | issue_to_patch | LFX Workspace: Implement module instance dependency tree in WASM store
### Project Title
Implement module instance dependency tree in WASM store
### Motivation
In the current WasmEdge implementation, multiple WebAssembly modules can be loaded, linked, and registered into the `Store`. However, there is a lack of a s... | feat: implement module instance dependency tree in WASM store | ## Description
<!-- Describe your changes here -->
## Checklist
Before submitting this PR, please ensure the following:
- [x] **DCO Signed-off**: All commits are signed-off (`git commit -s`). CI workflows will only be approved if DCO check is passed.
- [x] **Commit Messages**: Run `commitlint` on your commit... | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/.github/scripts/whitelist.symbols b/.github/scripts/whitelist.symbols
index 74f8260662e9..0057ffe0fd8b 100644
--- a/.github/scripts/whitelist.symbols
+++ b/.github/scripts/whitelist.symbols
@@ -226,6 +226,7 @@ WasmEdge_VMAsyncRunWasmFromFile
WasmEdge_VMCleanup
WasmEdge_VMCreate
WasmEdge_VMDelete
+WasmEd... | [
".github/scripts/whitelist.symbols",
"include/api/wasmedge/wasmedge_deprecated.h",
"include/api/wasmedge/wasmedge_vm.h",
"include/runtime/instance/module.h",
"include/runtime/storemgr.h",
"include/vm/vm.h",
"lib/api/wasmedge.cpp",
"lib/executor/instantiate/module.cpp",
"lib/vm/CMakeLists.txt",
"li... | [
{
"comment": "Don't just delete the API.\nYou should move the old API to the deprecated header and make sure that still works.",
"path": "include/api/wasmedge/wasmedge_vm.h",
"hunk": "@@ -603,18 +603,19 @@ WasmEdge_VMGetFunctionList(const WasmEdge_VMContext *Cxt,\n const WasmE... | diff --git a/test/api/APIUnitTest.cpp b/test/api/APIUnitTest.cpp
index a9ecec756528..fceae8b76a10 100644
--- a/test/api/APIUnitTest.cpp
+++ b/test/api/APIUnitTest.cpp
@@ -223,6 +223,59 @@ char *Preopens[] = {&PreopensVec[0], &PreopensVec[12], &PreopensVec[21],
&PreopensVec[32], &PreopensVec[49]};
... | true |
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | Don't just delete the API.
You should move the old API to the deprecated header and make sure that still works. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/include/api/wasmedge/wasmedge_vm.h b/include/api/wasmedge/wasmedge_vm.h
index 36c9471ac50a..12bdf4521e1c 100644
--- a/include/api/wasmedge/wasmedge_vm.h
+++ b/include/api/wasmedge/wasmedge_vm.h
@@ -604,18 +604,15 @@ WasmEdge_VMGetFunctionList(const WasmEdge_VMContext *Cxt,
const... | [
"include/api/wasmedge/wasmedge_vm.h"
] | [
{
"comment": "Don't just delete the API.\nYou should move the old API to the deprecated header and make sure that still works.",
"path": "include/api/wasmedge/wasmedge_vm.h",
"hunk": "@@ -603,18 +603,19 @@ WasmEdge_VMGetFunctionList(const WasmEdge_VMContext *Cxt,\n const WasmE... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | As mentioned. And redirect the old API to the new one. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/lib/api/wasmedge.cpp b/lib/api/wasmedge.cpp
index e1cee5d131ec..45d041447fa7 100644
--- a/lib/api/wasmedge.cpp
+++ b/lib/api/wasmedge.cpp
@@ -2665,7 +2665,10 @@ WASMEDGE_CAPI_EXPORT void WasmEdge_ModuleInstanceAddGlobal(
WASMEDGE_CAPI_EXPORT void
WasmEdge_ModuleInstanceDelete(WasmEdge_ModuleInstanceCon... | [
"lib/api/wasmedge.cpp"
] | [
{
"comment": "As mentioned. And redirect the old API to the new one.",
"path": "lib/api/wasmedge.cpp",
"hunk": "@@ -3508,7 +3508,7 @@ WASMEDGE_CAPI_EXPORT void WasmEdge_VMCleanup(WasmEdge_VMContext *Cxt) noexcept {\n }\n }\n \n-void WasmEdge_VMForceDeleteRegisteredModule(\n+void WasmEdge_VMDeleteRegis... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | When unregister module, I don't think we need to return the module instance to caller. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp
index cf594a8be374..229d1b32ccb9 100644
--- a/lib/vm/vm.cpp
+++ b/lib/vm/vm.cpp
@@ -159,7 +159,7 @@ void VM::unsafeInitVM() {
void VM::unsafeLoadBuiltInHosts() {
// Load the built-in host modules from configuration.
// TODO: This will be extended for versioned WASI in t... | [
"lib/vm/vm.cpp"
] | [
{
"comment": "When unregister module, I don't think we need to return the module instance to caller.",
"path": "lib/vm/vm.cpp",
"hunk": "@@ -235,6 +235,21 @@ VM::unsafeRegisterModule(const Runtime::Instance::ModuleInstance &ModInst,\n return ExecutorEngine.registerModule(StoreRef, ModInst, Name);\n }\... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | Link the anonymous module to store is not necessary. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp
index cf594a8be374..229d1b32ccb9 100644
--- a/lib/vm/vm.cpp
+++ b/lib/vm/vm.cpp
@@ -159,7 +159,7 @@ void VM::unsafeInitVM() {
void VM::unsafeLoadBuiltInHosts() {
// Load the built-in host modules from configuration.
// TODO: This will be extended for versioned WASI in t... | [
"lib/vm/vm.cpp"
] | [
{
"comment": "Link the anonymous module to store is not necessary.",
"path": "lib/vm/vm.cpp",
"hunk": "@@ -309,6 +324,7 @@ VM::unsafeRunWasmFile(const AST::Module &Module, std::string_view Func,\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n EXPECTED_TRY(ActiveModInst,\n Executor... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | Ditto. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp
index cf594a8be374..229d1b32ccb9 100644
--- a/lib/vm/vm.cpp
+++ b/lib/vm/vm.cpp
@@ -159,7 +159,7 @@ void VM::unsafeInitVM() {
void VM::unsafeLoadBuiltInHosts() {
// Load the built-in host modules from configuration.
// TODO: This will be extended for versioned WASI in t... | [
"lib/vm/vm.cpp"
] | [
{
"comment": "Ditto.",
"path": "lib/vm/vm.cpp",
"hunk": "@@ -486,6 +502,7 @@ Expect<void> VM::unsafeInstantiate() {\n \n EXPECTED_TRY(ActiveModInst,\n ExecutorEngine.instantiateModule(StoreRef, *Mod));\n+ StoreRef.linkAnonymousModule(ActiveModInst.get());",
"resolving_sha": "... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | In the explaination of header, it's not necessary to describe the degree system about the implmentation. You only need to explain that the module would be safely deleted when there's no dependency on it. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/include/api/wasmedge/wasmedge_vm.h b/include/api/wasmedge/wasmedge_vm.h
index 36c9471ac50a..12bdf4521e1c 100644
--- a/include/api/wasmedge/wasmedge_vm.h
+++ b/include/api/wasmedge/wasmedge_vm.h
@@ -604,18 +604,15 @@ WasmEdge_VMGetFunctionList(const WasmEdge_VMContext *Cxt,
const... | [
"include/api/wasmedge/wasmedge_vm.h"
] | [
{
"comment": "In the explaination of header, it's not necessary to describe the degree system about the implmentation. You only need to explain that the module would be safely deleted when there's no dependency on it.",
"path": "include/api/wasmedge/wasmedge_vm.h",
"hunk": "@@ -603,18 +603,18 @@ WasmEdg... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | Should notify the modules to reset self-degree.
Also should consider the case about the imported modules not owned by this VM. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp
index cf594a8be374..229d1b32ccb9 100644
--- a/lib/vm/vm.cpp
+++ b/lib/vm/vm.cpp
@@ -159,7 +159,7 @@ void VM::unsafeInitVM() {
void VM::unsafeLoadBuiltInHosts() {
// Load the built-in host modules from configuration.
// TODO: This will be extended for versioned WASI in t... | [
"lib/vm/vm.cpp"
] | [
{
"comment": "Should notify the modules to reset self-degree.\nAlso should consider the case about the imported modules not owned by this VM.",
"path": "lib/vm/vm.cpp",
"hunk": "@@ -235,6 +235,18 @@ VM::unsafeRegisterModule(const Runtime::Instance::ModuleInstance &ModInst,\n return ExecutorEngine.regi... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | Since already moved the store linking procedure to the timing of reseting the self-degree, I don't think the unlinking is needed here. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/include/runtime/instance/module.h b/include/runtime/instance/module.h
index b36298df538a..0e705abae6f5 100644
--- a/include/runtime/instance/module.h
+++ b/include/runtime/instance/module.h
@@ -78,17 +78,22 @@ class ModuleInstance {
std::function<void(void *)> Finalizer = nullptr)
... | [
"include/runtime/instance/module.h"
] | [
{
"comment": "Since already moved the store linking procedure to the timing of reseting the self-degree, I don't think the unlinking is needed here.",
"path": "include/runtime/instance/module.h",
"hunk": "@@ -76,15 +76,20 @@ class ModuleInstance {\n std::function<void(void *)> Finalizer... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | Why don't you call `tryToDelete` in `resetSelfDegree` and `decrementInDegree`? | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/include/runtime/instance/module.h b/include/runtime/instance/module.h
index b36298df538a..0e705abae6f5 100644
--- a/include/runtime/instance/module.h
+++ b/include/runtime/instance/module.h
@@ -78,17 +78,22 @@ class ModuleInstance {
std::function<void(void *)> Finalizer = nullptr)
... | [
"include/runtime/instance/module.h"
] | [
{
"comment": "Why don't you call `tryToDelete` in `resetSelfDegree` and `decrementInDegree`?",
"path": "include/runtime/instance/module.h",
"hunk": "@@ -76,15 +76,20 @@ class ModuleInstance {\n std::function<void(void *)> Finalizer = nullptr)\n : ModName(Name), HostData(Data), Hos... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | Remove `this->`. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/include/runtime/instance/module.h b/include/runtime/instance/module.h
index b36298df538a..0e705abae6f5 100644
--- a/include/runtime/instance/module.h
+++ b/include/runtime/instance/module.h
@@ -78,17 +78,22 @@ class ModuleInstance {
std::function<void(void *)> Finalizer = nullptr)
... | [
"include/runtime/instance/module.h"
] | [
{
"comment": "Remove `this->`.",
"path": "include/runtime/instance/module.h",
"hunk": "@@ -76,17 +76,19 @@ class ModuleInstance {\n std::function<void(void *)> Finalizer = nullptr)\n : ModName(Name), HostData(Data), HostDataFinalizer(Finalizer) {}\n virtual ~ModuleInstance() noe... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | Is it redundant?
If the map is empty, I think the for loop below would do nothing. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/include/runtime/instance/module.h b/include/runtime/instance/module.h
index b36298df538a..0e705abae6f5 100644
--- a/include/runtime/instance/module.h
+++ b/include/runtime/instance/module.h
@@ -78,17 +78,22 @@ class ModuleInstance {
std::function<void(void *)> Finalizer = nullptr)
... | [
"include/runtime/instance/module.h"
] | [
{
"comment": "Is it redundant?\nIf the map is empty, I think the for loop below would do nothing.",
"path": "include/runtime/instance/module.h",
"hunk": "@@ -530,6 +532,53 @@ class ModuleInstance {\n LinkedStore.erase(LinkedStoreKey{Store, std::string(Name)});\n }\n \n+ void unlinkAllStores() noe... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | Follow the format of defining WASM binary above (like `FibonacciWasm`). | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/test/api/APIUnitTest.cpp b/test/api/APIUnitTest.cpp
index a9ecec756528..fceae8b76a10 100644
--- a/test/api/APIUnitTest.cpp
+++ b/test/api/APIUnitTest.cpp
@@ -223,6 +223,59 @@ char *Preopens[] = {&PreopensVec[0], &PreopensVec[12], &PreopensVec[21],
&PreopensVec[32], &PreopensVec[49]};
... | [
"test/api/APIUnitTest.cpp"
] | [
{
"comment": "Follow the format of defining WASM binary above (like `FibonacciWasm`).",
"path": "test/api/APIUnitTest.cpp",
"hunk": "@@ -223,6 +223,62 @@ char *Preopens[] = {&PreopensVec[0], &PreopensVec[12], &PreopensVec[21],\n &PreopensVec[32], &PreopensVec[49]};\n char TPath[] = \... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | For the VMs/Loaders/etc. you didn't modify the configuration, the `Conf` is not needed. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/test/api/APIUnitTest.cpp b/test/api/APIUnitTest.cpp
index a9ecec756528..fceae8b76a10 100644
--- a/test/api/APIUnitTest.cpp
+++ b/test/api/APIUnitTest.cpp
@@ -223,6 +223,59 @@ char *Preopens[] = {&PreopensVec[0], &PreopensVec[12], &PreopensVec[21],
&PreopensVec[32], &PreopensVec[49]};
... | [
"test/api/APIUnitTest.cpp"
] | [
{
"comment": "For the VMs/Loaders/etc. you didn't modify the configuration, the `Conf` is not needed.",
"path": "test/api/APIUnitTest.cpp",
"hunk": "@@ -3911,6 +3967,594 @@ TEST(APICoreTest, VM) {\n WasmEdge_VMDelete(VM);\n }\n \n+TEST(APICoreTest, VMDeleteRegistered) {\n+ WasmEdge_ConfigureContext *... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | Use `[](void *, const WasmEdge_CallingFrameContext *, ...` | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/test/api/APIUnitTest.cpp b/test/api/APIUnitTest.cpp
index a9ecec756528..fceae8b76a10 100644
--- a/test/api/APIUnitTest.cpp
+++ b/test/api/APIUnitTest.cpp
@@ -223,6 +223,59 @@ char *Preopens[] = {&PreopensVec[0], &PreopensVec[12], &PreopensVec[21],
&PreopensVec[32], &PreopensVec[49]};
... | [
"test/api/APIUnitTest.cpp"
] | [
{
"comment": "Use `[](void *, const WasmEdge_CallingFrameContext *, ...`",
"path": "test/api/APIUnitTest.cpp",
"hunk": "@@ -3911,6 +3967,594 @@ TEST(APICoreTest, VM) {\n WasmEdge_VMDelete(VM);\n }\n \n+TEST(APICoreTest, VMDeleteRegistered) {\n+ WasmEdge_ConfigureContext *Conf = WasmEdge_ConfigureCrea... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | fix the naming style. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/test/api/APIUnitTest.cpp b/test/api/APIUnitTest.cpp
index a9ecec756528..fceae8b76a10 100644
--- a/test/api/APIUnitTest.cpp
+++ b/test/api/APIUnitTest.cpp
@@ -223,6 +223,59 @@ char *Preopens[] = {&PreopensVec[0], &PreopensVec[12], &PreopensVec[21],
&PreopensVec[32], &PreopensVec[49]};
... | [
"test/api/APIUnitTest.cpp"
] | [
{
"comment": "fix the naming style.",
"path": "test/api/APIUnitTest.cpp",
"hunk": "@@ -3911,6 +3967,594 @@ TEST(APICoreTest, VM) {\n WasmEdge_VMDelete(VM);\n }\n \n+TEST(APICoreTest, VMDeleteRegistered) {\n+ WasmEdge_ConfigureContext *Conf = WasmEdge_ConfigureCreate();\n+ WasmEdge_ExecutorContext *E... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | `PFuncName` is better. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/test/api/APIUnitTest.cpp b/test/api/APIUnitTest.cpp
index a9ecec756528..fceae8b76a10 100644
--- a/test/api/APIUnitTest.cpp
+++ b/test/api/APIUnitTest.cpp
@@ -223,6 +223,59 @@ char *Preopens[] = {&PreopensVec[0], &PreopensVec[12], &PreopensVec[21],
&PreopensVec[32], &PreopensVec[49]};
... | [
"test/api/APIUnitTest.cpp"
] | [
{
"comment": "`PFuncName` is better.",
"path": "test/api/APIUnitTest.cpp",
"hunk": "@@ -3911,6 +3967,594 @@ TEST(APICoreTest, VM) {\n WasmEdge_VMDelete(VM);\n }\n \n+TEST(APICoreTest, VMDeleteRegistered) {\n+ WasmEdge_ConfigureContext *Conf = WasmEdge_ConfigureCreate();\n+ WasmEdge_ExecutorContext *... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | Remove the redundant line | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/test/api/APIUnitTest.cpp b/test/api/APIUnitTest.cpp
index a9ecec756528..fceae8b76a10 100644
--- a/test/api/APIUnitTest.cpp
+++ b/test/api/APIUnitTest.cpp
@@ -223,6 +223,59 @@ char *Preopens[] = {&PreopensVec[0], &PreopensVec[12], &PreopensVec[21],
&PreopensVec[32], &PreopensVec[49]};
... | [
"test/api/APIUnitTest.cpp"
] | [
{
"comment": "Remove the redundant line",
"path": "test/api/APIUnitTest.cpp",
"hunk": "@@ -3911,6 +3967,594 @@ TEST(APICoreTest, VM) {\n WasmEdge_VMDelete(VM);\n }\n \n+TEST(APICoreTest, VMDeleteRegistered) {\n+ WasmEdge_ConfigureContext *Conf = WasmEdge_ConfigureCreate();\n+ WasmEdge_ExecutorContex... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | You should call VMDelete before the end of this scope. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/test/api/APIUnitTest.cpp b/test/api/APIUnitTest.cpp
index a9ecec756528..fceae8b76a10 100644
--- a/test/api/APIUnitTest.cpp
+++ b/test/api/APIUnitTest.cpp
@@ -223,6 +223,59 @@ char *Preopens[] = {&PreopensVec[0], &PreopensVec[12], &PreopensVec[21],
&PreopensVec[32], &PreopensVec[49]};
... | [
"test/api/APIUnitTest.cpp"
] | [
{
"comment": "You should call VMDelete before the end of this scope.",
"path": "test/api/APIUnitTest.cpp",
"hunk": "@@ -3911,6 +3967,594 @@ TEST(APICoreTest, VM) {\n WasmEdge_VMDelete(VM);\n }\n \n+TEST(APICoreTest, VMDeleteRegistered) {\n+ WasmEdge_ConfigureContext *Conf = WasmEdge_ConfigureCreate()... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | You should call VMDelete before the end of this scope. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/test/api/APIUnitTest.cpp b/test/api/APIUnitTest.cpp
index a9ecec756528..fceae8b76a10 100644
--- a/test/api/APIUnitTest.cpp
+++ b/test/api/APIUnitTest.cpp
@@ -223,6 +223,59 @@ char *Preopens[] = {&PreopensVec[0], &PreopensVec[12], &PreopensVec[21],
&PreopensVec[32], &PreopensVec[49]};
... | [
"test/api/APIUnitTest.cpp"
] | [
{
"comment": "You should call VMDelete before the end of this scope.",
"path": "test/api/APIUnitTest.cpp",
"hunk": "@@ -3911,6 +3967,594 @@ TEST(APICoreTest, VM) {\n WasmEdge_VMDelete(VM);\n }\n \n+TEST(APICoreTest, VMDeleteRegistered) {\n+ WasmEdge_ConfigureContext *Conf = WasmEdge_ConfigureCreate()... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | You should call VMDelete and StoreDelete before the end of this scope. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/test/api/APIUnitTest.cpp b/test/api/APIUnitTest.cpp
index a9ecec756528..fceae8b76a10 100644
--- a/test/api/APIUnitTest.cpp
+++ b/test/api/APIUnitTest.cpp
@@ -223,6 +223,59 @@ char *Preopens[] = {&PreopensVec[0], &PreopensVec[12], &PreopensVec[21],
&PreopensVec[32], &PreopensVec[49]};
... | [
"test/api/APIUnitTest.cpp"
] | [
{
"comment": "You should call VMDelete and StoreDelete before the end of this scope.",
"path": "test/api/APIUnitTest.cpp",
"hunk": "@@ -3911,6 +3967,594 @@ TEST(APICoreTest, VM) {\n WasmEdge_VMDelete(VM);\n }\n \n+TEST(APICoreTest, VMDeleteRegistered) {\n+ WasmEdge_ConfigureContext *Conf = WasmEdge_C... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | You should call VMDelete and StoreDelete before the end of this scope. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/test/api/APIUnitTest.cpp b/test/api/APIUnitTest.cpp
index a9ecec756528..fceae8b76a10 100644
--- a/test/api/APIUnitTest.cpp
+++ b/test/api/APIUnitTest.cpp
@@ -223,6 +223,59 @@ char *Preopens[] = {&PreopensVec[0], &PreopensVec[12], &PreopensVec[21],
&PreopensVec[32], &PreopensVec[49]};
... | [
"test/api/APIUnitTest.cpp"
] | [
{
"comment": "You should call VMDelete and StoreDelete before the end of this scope.",
"path": "test/api/APIUnitTest.cpp",
"hunk": "@@ -3911,6 +3967,594 @@ TEST(APICoreTest, VM) {\n WasmEdge_VMDelete(VM);\n }\n \n+TEST(APICoreTest, VMDeleteRegistered) {\n+ WasmEdge_ConfigureContext *Conf = WasmEdge_C... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | You should call VMDelete and StoreDelete before the end of this scope. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/test/api/APIUnitTest.cpp b/test/api/APIUnitTest.cpp
index a9ecec756528..fceae8b76a10 100644
--- a/test/api/APIUnitTest.cpp
+++ b/test/api/APIUnitTest.cpp
@@ -223,6 +223,59 @@ char *Preopens[] = {&PreopensVec[0], &PreopensVec[12], &PreopensVec[21],
&PreopensVec[32], &PreopensVec[49]};
... | [
"test/api/APIUnitTest.cpp"
] | [
{
"comment": "You should call VMDelete and StoreDelete before the end of this scope.",
"path": "test/api/APIUnitTest.cpp",
"hunk": "@@ -3911,6 +3967,594 @@ TEST(APICoreTest, VM) {\n WasmEdge_VMDelete(VM);\n }\n \n+TEST(APICoreTest, VMDeleteRegistered) {\n+ WasmEdge_ConfigureContext *Conf = WasmEdge_C... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | You should call VMDelete and StoreDelete before the end of this scope. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/test/api/APIUnitTest.cpp b/test/api/APIUnitTest.cpp
index a9ecec756528..fceae8b76a10 100644
--- a/test/api/APIUnitTest.cpp
+++ b/test/api/APIUnitTest.cpp
@@ -223,6 +223,59 @@ char *Preopens[] = {&PreopensVec[0], &PreopensVec[12], &PreopensVec[21],
&PreopensVec[32], &PreopensVec[49]};
... | [
"test/api/APIUnitTest.cpp"
] | [
{
"comment": "You should call VMDelete and StoreDelete before the end of this scope.",
"path": "test/api/APIUnitTest.cpp",
"hunk": "@@ -3911,6 +3967,594 @@ TEST(APICoreTest, VM) {\n WasmEdge_VMDelete(VM);\n }\n \n+TEST(APICoreTest, VMDeleteRegistered) {\n+ WasmEdge_ConfigureContext *Conf = WasmEdge_C... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | Host function allocation should not be here.
Please refer to the explaination of `WasmEdge_ModuleInstanceAddFunction` API. This API will move the ownership of host function object to the callee. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/test/api/APIUnitTest.cpp b/test/api/APIUnitTest.cpp
index a9ecec756528..fceae8b76a10 100644
--- a/test/api/APIUnitTest.cpp
+++ b/test/api/APIUnitTest.cpp
@@ -223,6 +223,59 @@ char *Preopens[] = {&PreopensVec[0], &PreopensVec[12], &PreopensVec[21],
&PreopensVec[32], &PreopensVec[49]};
... | [
"test/api/APIUnitTest.cpp"
] | [
{
"comment": "Host function allocation should not be here.\nPlease refer to the explaination of `WasmEdge_ModuleInstanceAddFunction` API. This API will move the ownership of host function object to the callee.",
"path": "test/api/APIUnitTest.cpp",
"hunk": "@@ -3911,6 +3967,594 @@ TEST(APICoreTest, VM) {... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | Host function allocation should not be here.
Please refer to the explaination of WasmEdge_ModuleInstanceAddFunction API. This API will move the ownership of host function object to the callee. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/test/api/APIUnitTest.cpp b/test/api/APIUnitTest.cpp
index a9ecec756528..fceae8b76a10 100644
--- a/test/api/APIUnitTest.cpp
+++ b/test/api/APIUnitTest.cpp
@@ -223,6 +223,59 @@ char *Preopens[] = {&PreopensVec[0], &PreopensVec[12], &PreopensVec[21],
&PreopensVec[32], &PreopensVec[49]};
... | [
"test/api/APIUnitTest.cpp"
] | [
{
"comment": "Host function allocation should not be here.\nPlease refer to the explaination of WasmEdge_ModuleInstanceAddFunction API. This API will move the ownership of host function object to the callee.",
"path": "test/api/APIUnitTest.cpp",
"hunk": "@@ -3911,6 +3967,594 @@ TEST(APICoreTest, VM) {\n... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | As above. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/test/api/APIUnitTest.cpp b/test/api/APIUnitTest.cpp
index a9ecec756528..fceae8b76a10 100644
--- a/test/api/APIUnitTest.cpp
+++ b/test/api/APIUnitTest.cpp
@@ -223,6 +223,59 @@ char *Preopens[] = {&PreopensVec[0], &PreopensVec[12], &PreopensVec[21],
&PreopensVec[32], &PreopensVec[49]};
... | [
"test/api/APIUnitTest.cpp"
] | [
{
"comment": "As above.",
"path": "test/api/APIUnitTest.cpp",
"hunk": "@@ -3911,6 +3967,594 @@ TEST(APICoreTest, VM) {\n WasmEdge_VMDelete(VM);\n }\n \n+TEST(APICoreTest, VMDeleteRegistered) {\n+ WasmEdge_ConfigureContext *Conf = WasmEdge_ConfigureCreate();\n+ WasmEdge_ExecutorContext *Exec = WasmEd... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | I think the TEST() here is for the module deletion API. Why below uses VM? | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/test/api/APIUnitTest.cpp b/test/api/APIUnitTest.cpp
index a9ecec756528..fceae8b76a10 100644
--- a/test/api/APIUnitTest.cpp
+++ b/test/api/APIUnitTest.cpp
@@ -223,6 +223,59 @@ char *Preopens[] = {&PreopensVec[0], &PreopensVec[12], &PreopensVec[21],
&PreopensVec[32], &PreopensVec[49]};
... | [
"test/api/APIUnitTest.cpp"
] | [
{
"comment": "I think the TEST() here is for the module deletion API. Why below uses VM?",
"path": "test/api/APIUnitTest.cpp",
"hunk": "@@ -3911,6 +3967,594 @@ TEST(APICoreTest, VM) {\n WasmEdge_VMDelete(VM);\n }\n \n+TEST(APICoreTest, VMDeleteRegistered) {\n+ WasmEdge_ConfigureContext *Conf = WasmEd... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | You've checked the `Cxt` not nullptr here, therefore can use `fromModCxt(Cxt)->terminate()` directly. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/lib/api/wasmedge.cpp b/lib/api/wasmedge.cpp
index e1cee5d131ec..45d041447fa7 100644
--- a/lib/api/wasmedge.cpp
+++ b/lib/api/wasmedge.cpp
@@ -2665,7 +2665,10 @@ WASMEDGE_CAPI_EXPORT void WasmEdge_ModuleInstanceAddGlobal(
WASMEDGE_CAPI_EXPORT void
WasmEdge_ModuleInstanceDelete(WasmEdge_ModuleInstanceCon... | [
"lib/api/wasmedge.cpp"
] | [
{
"comment": "You've checked the `Cxt` not nullptr here, therefore can use `fromModCxt(Cxt)->terminate()` directly.",
"path": "lib/api/wasmedge.cpp",
"hunk": "@@ -2665,7 +2665,12 @@ WASMEDGE_CAPI_EXPORT void WasmEdge_ModuleInstanceAddGlobal(\n \n WASMEDGE_CAPI_EXPORT void\n WasmEdge_ModuleInstanceDelete... | true | ||
WasmEdge/WasmEdge | 4,726 | comment_to_fix | feat: implement module instance dependency tree in WASM store | `auto &StoreMgr`. The getter returns reference already, don't convert to pointer again. | 01832097cb0b108ee280d0d0bcd2ee04459c644e | d43add2ef2038d516fbd29ee2d3c5722f63d9b2b | diff --git a/lib/api/wasmedge.cpp b/lib/api/wasmedge.cpp
index e1cee5d131ec..45d041447fa7 100644
--- a/lib/api/wasmedge.cpp
+++ b/lib/api/wasmedge.cpp
@@ -2665,7 +2665,10 @@ WASMEDGE_CAPI_EXPORT void WasmEdge_ModuleInstanceAddGlobal(
WASMEDGE_CAPI_EXPORT void
WasmEdge_ModuleInstanceDelete(WasmEdge_ModuleInstanceCon... | [
"lib/api/wasmedge.cpp"
] | [
{
"comment": "`auto &StoreMgr`. The getter returns reference already, don't convert to pointer again.",
"path": "lib/api/wasmedge.cpp",
"hunk": "@@ -3532,28 +3535,31 @@ WASMEDGE_CAPI_EXPORT void WasmEdge_VMCleanup(WasmEdge_VMContext *Cxt) noexcept {\n }\n }\n \n-void WasmEdge_VMForceDeleteRegisteredMo... | true | ||
WasmEdge/WasmEdge | 4,899 | issue_to_patch | ci(dependabot): bump step-security/harden-runner from 2.19.3 to 2.19.4 | Bumps [step-security/harden-runner](https://github.com/step-security/harden-runner) from 2.19.3 to 2.19.4.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/step-security/harden-runner/releases">step-security/harden-runner's releases</a>.</em></p>
<blockquote>
<h2>v2.19.4</h2>
<... | 8a248a6dfc037be81c307cb635c9374344249ba2 | bbbb2317d39bda8270694cae34c3a9bc102c92a0 | diff --git a/.github/workflows/IWYU_scan.yml b/.github/workflows/IWYU_scan.yml
index 07b154249926..2fbccd1a070e 100644
--- a/.github/workflows/IWYU_scan.yml
+++ b/.github/workflows/IWYU_scan.yml
@@ -44,7 +44,7 @@ jobs:
version: ${{ steps.prep.outputs.version }}
steps:
- name: Harden the runner (Audit a... | [
".github/workflows/IWYU_scan.yml",
".github/workflows/build-extensions.yml",
".github/workflows/build.yml",
".github/workflows/build_for_nix.yml",
".github/workflows/build_for_openwrt.yml",
".github/workflows/build_for_riscv.yml",
".github/workflows/build_for_s390x.yml",
".github/workflows/codeql-anal... | [] | true | ||
WasmEdge/WasmEdge | 4,723 | issue_to_patch | LFX Workspace: Enable JIT mode support for per-function compilation
### Project Title
Enable JIT mode support for per-function compilation
### Motivation
WasmEdge’s JIT mode improves execution speed by compiling WebAssembly modules into native code before runtime. However, it compiles the entire module upfront, inc... | feat: implement per function compilation in jit | ## Description
Implemented the plan defined in https://github.com/WasmEdge/WasmEdge/issues/4693.
- [x] Write more tests verifying robustness. (Added spec tests)
## Checklist
Before submitting this PR, please ensure the following:
- [x] **DCO Signed-off**: All commits are signed-off (`git commit -s`). CI w... | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/cmake/Helper.cmake b/cmake/Helper.cmake
index cf2df52c54eb..26c6e8fb6f3d 100644
--- a/cmake/Helper.cmake
+++ b/cmake/Helper.cmake
@@ -33,6 +33,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
/wd4819 # file contains a character not in current code page
/wd4127 # conditional expression is constant
... | [
"cmake/Helper.cmake",
"include/ast/module.h",
"include/common/enum.inc",
"include/common/executable.h",
"include/driver/tool.h",
"include/executor/executor.h",
"include/llvm/compiler.h",
"include/llvm/data.h",
"include/llvm/jit.h",
"include/runtime/instance/function.h",
"include/runtime/instance... | [
{
"comment": "It seems you are using the `printf` debugging method; that's fine. However, I suggest adding a prefix to these messages, which will make it easier to clean up the debug messages when your PR is ready.",
"path": "lib/llvm/compiler.cpp",
"hunk": "@@ -3981,12 +3986,15 @@ class FunctionCompile... | diff --git a/test/llvm/CMakeLists.txt b/test/llvm/CMakeLists.txt
index e9ec0b847de1..5ea30c71314d 100644
--- a/test/llvm/CMakeLists.txt
+++ b/test/llvm/CMakeLists.txt
@@ -12,3 +12,18 @@ target_link_libraries(wasmedgeLLVMCoreTests
wasmedgeTestSpec
wasmedgeVM
)
+
+wasmedge_add_executable(wasmedgeLazyJITTests
+ La... | true |
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | It seems you are using the `printf` debugging method; that's fine. However, I suggest adding a prefix to these messages, which will make it easier to clean up the debug messages when your PR is ready. | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp
index 39da94d9a9ac..330e245f51c3 100644
--- a/lib/llvm/compiler.cpp
+++ b/lib/llvm/compiler.cpp
@@ -9,6 +9,7 @@
#include "common/spdlog.h"
#include "data.h"
#include "llvm.h"
+#include "spdlog/spdlog.h"
#include "system/allocator.h"
#include <algorithm>
... | [
"lib/llvm/compiler.cpp"
] | [
{
"comment": "It seems you are using the `printf` debugging method; that's fine. However, I suggest adding a prefix to these messages, which will make it easier to clean up the debug messages when your PR is ready.",
"path": "lib/llvm/compiler.cpp",
"hunk": "@@ -3981,12 +3986,15 @@ class FunctionCompile... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | Since you are updating some important elements, this does not seem to be a thread-safe method. You should follow the same naming style for the function name to indicate this. | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp
index 680d35094656..cf594a8be374 100644
--- a/lib/vm/vm.cpp
+++ b/lib/vm/vm.cpp
@@ -3,7 +3,9 @@
#include "vm/vm.h"
+#include "ast/instruction.h"
#include "ast/module.h"
+#include "common/enum_errcode.hpp"
#include "common/errcode.h"
#include "common/types.h"
#include ... | [
"lib/vm/vm.cpp"
] | [
{
"comment": "Since you are updating some important elements, this does not seem to be a thread-safe method. You should follow the same naming style for the function name to indicate this.",
"path": "lib/vm/vm.cpp",
"hunk": "@@ -703,5 +943,146 @@ const Runtime::Instance::ModuleInstance *VM::unsafeGetAct... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | What's the reason for using the `void *` type here? | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/include/llvm/jit.h b/include/llvm/jit.h
index 480fa4e2a745..c15eb4a8dc82 100644
--- a/include/llvm/jit.h
+++ b/include/llvm/jit.h
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-// SPDX-FileCopyrightText: 2019-2024 Second State INC
+// SPDX-FileCopyrightText: 2019-2026 Second State INC
//===-- ... | [
"include/llvm/jit.h"
] | [
{
"comment": "What's the reason for using the `void *` type here?",
"path": "include/llvm/jit.h",
"hunk": "@@ -33,18 +36,41 @@ class JITLibrary : public Executable {\n \n std::vector<Symbol<void>> getCodes(size_t Offset,\n size_t Size) noexcept override;\n+ bool i... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | I am wondering if we can use `std::unique_ptr` or `std::shared_ptr<CompileContext>` instead of raw pointers in these places. | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp
index 39da94d9a9ac..330e245f51c3 100644
--- a/lib/llvm/compiler.cpp
+++ b/lib/llvm/compiler.cpp
@@ -9,6 +9,7 @@
#include "common/spdlog.h"
#include "data.h"
#include "llvm.h"
+#include "spdlog/spdlog.h"
#include "system/allocator.h"
#include <algorithm>
... | [
"lib/llvm/compiler.cpp"
] | [
{
"comment": "I am wondering if we can use `std::unique_ptr` or `std::shared_ptr<CompileContext>` instead of raw pointers in these places.",
"path": "lib/llvm/compiler.cpp",
"hunk": "@@ -6325,13 +6383,319 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n FunctionCompiler FC(*C... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | Why use `static_cast` instead of `dynamic_cast` here? | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/llvm/jit.cpp b/lib/llvm/jit.cpp
index 4bf3cc80386a..f0afb693f598 100644
--- a/lib/llvm/jit.cpp
+++ b/lib/llvm/jit.cpp
@@ -2,29 +2,96 @@
// SPDX-FileCopyrightText: 2019-2024 Second State INC
#include "llvm/jit.h"
-#include "common/spdlog.h"
#include "data.h"
#include "llvm.h"
+#include "spdlog/s... | [
"lib/llvm/jit.cpp"
] | [
{
"comment": "Why use `static_cast` instead of `dynamic_cast` here?",
"path": "lib/llvm/jit.cpp",
"hunk": "@@ -51,43 +52,65 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n std::vector<Symbol<void>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size; ++I) {\n- const... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | What is the reason for changing the `private:` section and adding `friend class` here? | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/include/llvm/jit.h b/include/llvm/jit.h
index 480fa4e2a745..c15eb4a8dc82 100644
--- a/include/llvm/jit.h
+++ b/include/llvm/jit.h
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-// SPDX-FileCopyrightText: 2019-2024 Second State INC
+// SPDX-FileCopyrightText: 2019-2026 Second State INC
//===-- ... | [
"include/llvm/jit.h"
] | [
{
"comment": "What is the reason for changing the `private:` section and adding `friend class` here?",
"path": "include/llvm/jit.h",
"hunk": "@@ -33,18 +36,41 @@ class JITLibrary : public Executable {\n \n std::vector<Symbol<void>> getCodes(size_t Offset,\n size_t ... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | It seems you copied and pasted these sections multiple times across functions. Why? | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/executor/engine/proxy.cpp b/lib/executor/engine/proxy.cpp
index 8fba0a4f08db..819b78494515 100644
--- a/lib/executor/engine/proxy.cpp
+++ b/lib/executor/engine/proxy.cpp
@@ -107,6 +107,7 @@ const Executable::IntrinsicsTable Executor::Intrinsics = {
ENTRY(kMemAtomicWait, proxyMemAtomicWait),
E... | [
"lib/executor/engine/proxy.cpp"
] | [
{
"comment": "It seems you copied and pasted these sections multiple times across functions. Why?",
"path": "lib/executor/engine/proxy.cpp",
"hunk": "@@ -123,6 +123,15 @@ Expect<void> Executor::proxyCall(Runtime::StackManager &StackMgr,\n const uint32_t FuncIdx, const Va... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | What's the maximum possible value of `FuncInsts.size()` here?
If this number is large, an O(n) algorithm will never be acceptable. | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/include/runtime/instance/module.h b/include/runtime/instance/module.h
index f35a34c20842..b36298df538a 100644
--- a/include/runtime/instance/module.h
+++ b/include/runtime/instance/module.h
@@ -37,6 +37,7 @@
#include <shared_mutex>
#include <string>
#include <type_traits>
+#include <unordered_map>
#inc... | [
"include/runtime/instance/module.h"
] | [
{
"comment": "What's the maximum possible value of `FuncInsts.size()` here? \nIf this number is large, an O(n) algorithm will never be acceptable.",
"path": "include/runtime/instance/module.h",
"hunk": "@@ -228,6 +228,24 @@ class ModuleInstance {\n return std::forward<CallbackT>(CallBack)(ExpGlobal... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | I don't think it's a good idea to have members with the `Pending` prefix. We should package them into a structure or class and create the corresponding member functions to handle the setters and getters. | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/include/vm/vm.h b/include/vm/vm.h
index 543a4c19712e..afa401415a0f 100644
--- a/include/vm/vm.h
+++ b/include/vm/vm.h
@@ -26,12 +26,20 @@
#include "runtime/instance/module.h"
#include "runtime/storemgr.h"
+#ifdef WASMEDGE_USE_LLVM
+#include "llvm/compiler.h"
+#include "llvm/data.h"
+#include "llvm/jit.... | [
"include/vm/vm.h"
] | [
{
"comment": "I don't think it's a good idea to have members with the `Pending` prefix. We should package them into a structure or class and create the corresponding member functions to handle the setters and getters.",
"path": "include/vm/vm.h",
"hunk": "@@ -400,6 +403,35 @@ class VM {\n /// Referenc... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | What is the reason for changing this definition? | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp
index 39da94d9a9ac..330e245f51c3 100644
--- a/lib/llvm/compiler.cpp
+++ b/lib/llvm/compiler.cpp
@@ -9,6 +9,7 @@
#include "common/spdlog.h"
#include "data.h"
#include "llvm.h"
+#include "spdlog/spdlog.h"
#include "system/allocator.h"
#include <algorithm>
... | [
"lib/llvm/compiler.cpp"
] | [
{
"comment": "What is the reason for changing this definition?",
"path": "lib/llvm/compiler.cpp",
"hunk": "@@ -127,7 +129,7 @@ static inline LLVMCodeGenOptLevel toLLVMCodeGenLevel(\n \n struct LLVM::Compiler::CompileContext {\n LLVM::Context LLContext;\n- LLVM::Module &LLModule;\n+ std::reference_wr... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | Can you explain the mechanism you used for the `Prefix`? | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp
index 39da94d9a9ac..330e245f51c3 100644
--- a/lib/llvm/compiler.cpp
+++ b/lib/llvm/compiler.cpp
@@ -9,6 +9,7 @@
#include "common/spdlog.h"
#include "data.h"
#include "llvm.h"
+#include "spdlog/spdlog.h"
#include "system/allocator.h"
#include <algorithm>
... | [
"lib/llvm/compiler.cpp"
] | [
{
"comment": "Can you explain the mechanism you used for the `Prefix`?",
"path": "lib/llvm/compiler.cpp",
"hunk": "@@ -204,10 +206,11 @@ struct LLVM::Compiler::CompileContext {\n std::vector<LLVM::Type> MemoryAddrTypes;\n std::vector<LLVM::Type> TableAddrTypes;\n std::vector<LLVM::Type> Globals;\n... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | I don't think this is correct.
Here is the case: Lazy mode JIT is enabled, but the symbol doesn't exist before or after the compilation. | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/llvm/jit.cpp b/lib/llvm/jit.cpp
index 4bf3cc80386a..f0afb693f598 100644
--- a/lib/llvm/jit.cpp
+++ b/lib/llvm/jit.cpp
@@ -2,29 +2,96 @@
// SPDX-FileCopyrightText: 2019-2024 Second State INC
#include "llvm/jit.h"
-#include "common/spdlog.h"
#include "data.h"
#include "llvm.h"
+#include "spdlog/s... | [
"lib/llvm/jit.cpp"
] | [
{
"comment": "I don't think this is correct. \nHere is the case: Lazy mode JIT is enabled, but the symbol doesn't exist before or after the compilation.",
"path": "lib/llvm/jit.cpp",
"hunk": "@@ -51,43 +52,65 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n std::vector<Symbol<void>>... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | These sections should be static after the first compilation. What is the reason that we have to recompile all of them each time? | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp
index 39da94d9a9ac..330e245f51c3 100644
--- a/lib/llvm/compiler.cpp
+++ b/lib/llvm/compiler.cpp
@@ -9,6 +9,7 @@
#include "common/spdlog.h"
#include "data.h"
#include "llvm.h"
+#include "spdlog/spdlog.h"
#include "system/allocator.h"
#include <algorithm>
... | [
"lib/llvm/compiler.cpp"
] | [
{
"comment": "These sections should be static after the first compilation. What is the reason that we have to recompile all of them each time?",
"path": "lib/llvm/compiler.cpp",
"hunk": "@@ -6325,13 +6383,310 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n FunctionCompiler F... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | You will call this `checkLazyCompilation` somewhere, and your `LazyCompilationHandler` is using an `unsafe` function, `unsafeLazyCompileFunction`. How do you ensure the state is correctly managed during a multi-threading execution model? | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/include/executor/executor.h b/include/executor/executor.h
index c68eb2d8d81f..0002cff2f68c 100644
--- a/include/executor/executor.h
+++ b/include/executor/executor.h
@@ -202,6 +202,13 @@ class Executor {
Expect<void> registerPostHostFunction(void *HostData,
std::... | [
"include/executor/executor.h"
] | [
{
"comment": "You will call this `checkLazyCompilation` somewhere, and your `LazyCompilationHandler` is using an `unsafe` function, `unsafeLazyCompileFunction`. How do you ensure the state is correctly managed during a multi-threading execution model?",
"path": "include/executor/executor.h",
"hunk": "@@... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | Please explain why we will have a non-owning module and a series of owned modules. | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/include/llvm/jit.h b/include/llvm/jit.h
index 480fa4e2a745..c15eb4a8dc82 100644
--- a/include/llvm/jit.h
+++ b/include/llvm/jit.h
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-// SPDX-FileCopyrightText: 2019-2024 Second State INC
+// SPDX-FileCopyrightText: 2019-2026 Second State INC
//===-- ... | [
"include/llvm/jit.h"
] | [
{
"comment": "Please explain why we will have a non-owning module and a series of owned modules.",
"path": "include/llvm/jit.h",
"hunk": "@@ -33,18 +37,44 @@ class JITLibrary : public Executable {\n \n std::vector<Symbol<void>> getCodes(size_t Offset,\n size_t Size... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | Could you explain the design and logic inside the `unsafeLazyCompileFunction` function?
It's strange that we check whether `ModuleInstance` is `nullptr` or `ModInst`, and then we set `ModuleInstance` to `ModInst` directly. | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp
index 680d35094656..cf594a8be374 100644
--- a/lib/vm/vm.cpp
+++ b/lib/vm/vm.cpp
@@ -3,7 +3,9 @@
#include "vm/vm.h"
+#include "ast/instruction.h"
#include "ast/module.h"
+#include "common/enum_errcode.hpp"
#include "common/errcode.h"
#include "common/types.h"
#include ... | [
"lib/vm/vm.cpp"
] | [
{
"comment": "Could you explain the design and logic inside the `unsafeLazyCompileFunction` function? \nIt's strange that we check whether `ModuleInstance` is `nullptr` or `ModInst`, and then we set `ModuleInstance` to `ModInst` directly.",
"path": "lib/vm/vm.cpp",
"hunk": "@@ -714,5 +949,150 @@ const ... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | Why is the `const_cast` required? | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp
index 680d35094656..cf594a8be374 100644
--- a/lib/vm/vm.cpp
+++ b/lib/vm/vm.cpp
@@ -3,7 +3,9 @@
#include "vm/vm.h"
+#include "ast/instruction.h"
#include "ast/module.h"
+#include "common/enum_errcode.hpp"
#include "common/errcode.h"
#include "common/types.h"
#include ... | [
"lib/vm/vm.cpp"
] | [
{
"comment": "Why is the `const_cast` required?",
"path": "lib/vm/vm.cpp",
"hunk": "@@ -207,10 +243,101 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+ spdlog::info(\"Module validated: {}\"sv, Module.ge... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | I don't think this is valid; if the pointer returned by `Mod.get()` changes and some other module uses the same address, this `Prefix` will no longer be `unique`. | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp
index 680d35094656..cf594a8be374 100644
--- a/lib/vm/vm.cpp
+++ b/lib/vm/vm.cpp
@@ -3,7 +3,9 @@
#include "vm/vm.h"
+#include "ast/instruction.h"
#include "ast/module.h"
+#include "common/enum_errcode.hpp"
#include "common/errcode.h"
#include "common/types.h"
#include ... | [
"lib/vm/vm.cpp"
] | [
{
"comment": "I don't think this is valid; if the pointer returned by `Mod.get()` changes and some other module uses the same address, this `Prefix` will no longer be `unique`.",
"path": "lib/vm/vm.cpp",
"hunk": "@@ -433,59 +560,147 @@ Expect<void> VM::unsafeInstantiate() {\n spdlog::error(ErrCode::... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | This proxy of `return_call` eliminates the benefits of tail calls, which avoid growing the program stack. | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/executor/engine/proxy.cpp b/lib/executor/engine/proxy.cpp
index 8fba0a4f08db..819b78494515 100644
--- a/lib/executor/engine/proxy.cpp
+++ b/lib/executor/engine/proxy.cpp
@@ -107,6 +107,7 @@ const Executable::IntrinsicsTable Executor::Intrinsics = {
ENTRY(kMemAtomicWait, proxyMemAtomicWait),
E... | [
"lib/executor/engine/proxy.cpp"
] | [
{
"comment": "This proxy of `return_call` eliminates the benefits of tail calls, which avoid growing the program stack.",
"path": "lib/executor/engine/proxy.cpp",
"hunk": "@@ -143,6 +148,128 @@ Expect<void> Executor::proxyCall(Runtime::StackManager &StackMgr,\n return {};\n }\n \n+Expect<void> Executo... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | Why do we need this? | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/cmake/Helper.cmake b/cmake/Helper.cmake
index cf2df52c54eb..26c6e8fb6f3d 100644
--- a/cmake/Helper.cmake
+++ b/cmake/Helper.cmake
@@ -33,6 +33,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
/wd4819 # file contains a character not in current code page
/wd4127 # conditional expression is constant
... | [
"cmake/Helper.cmake"
] | [
{
"comment": "Why do we need this?",
"path": "cmake/Helper.cmake",
"hunk": "@@ -33,6 +33,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES \"MSVC\")\n /wd4819 # file contains a character not in current code page\n /wd4127 # conditional expression is constant\n /wd4611 # interaction between '_setjmp' and... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | This appears to be debug information. Remove it if it is no longer needed. | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp
index 39da94d9a9ac..330e245f51c3 100644
--- a/lib/llvm/compiler.cpp
+++ b/lib/llvm/compiler.cpp
@@ -9,6 +9,7 @@
#include "common/spdlog.h"
#include "data.h"
#include "llvm.h"
+#include "spdlog/spdlog.h"
#include "system/allocator.h"
#include <algorithm>
... | [
"lib/llvm/compiler.cpp"
] | [
{
"comment": "This appears to be debug information. Remove it if it is no longer needed.",
"path": "lib/llvm/compiler.cpp",
"hunk": "@@ -3998,12 +4003,15 @@ class FunctionCompiler {\n }\n void compileAtomicWait(unsigned MemoryIndex, uint64_t MemoryOffset,\n LLVM::Type Target... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | This appears to be debug information. Remove it if it is no longer needed. | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp
index 39da94d9a9ac..330e245f51c3 100644
--- a/lib/llvm/compiler.cpp
+++ b/lib/llvm/compiler.cpp
@@ -9,6 +9,7 @@
#include "common/spdlog.h"
#include "data.h"
#include "llvm.h"
+#include "spdlog/spdlog.h"
#include "system/allocator.h"
#include <algorithm>
... | [
"lib/llvm/compiler.cpp"
] | [
{
"comment": "This appears to be debug information. Remove it if it is no longer needed.",
"path": "lib/llvm/compiler.cpp",
"hunk": "@@ -3998,12 +4003,15 @@ class FunctionCompiler {\n }\n void compileAtomicWait(unsigned MemoryIndex, uint64_t MemoryOffset,\n LLVM::Type Target... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | Your error message may not contain enough information to identify the issue location; please follow the same procedure to handle the log. | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/llvm/jit.cpp b/lib/llvm/jit.cpp
index 4bf3cc80386a..f0afb693f598 100644
--- a/lib/llvm/jit.cpp
+++ b/lib/llvm/jit.cpp
@@ -2,29 +2,96 @@
// SPDX-FileCopyrightText: 2019-2024 Second State INC
#include "llvm/jit.h"
-#include "common/spdlog.h"
#include "data.h"
#include "llvm.h"
+#include "spdlog/s... | [
"lib/llvm/jit.cpp"
] | [
{
"comment": "Your error message may not contain enough information to identify the issue location; please follow the same procedure to handle the log.",
"path": "lib/llvm/jit.cpp",
"hunk": "@@ -51,43 +125,144 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n std::vector<Symbol<void>>... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | I just want to confirm if the `Exec` must be `JITLibrary`. Using `static_cast` here is really strange. | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/llvm/jit.cpp b/lib/llvm/jit.cpp
index 4bf3cc80386a..f0afb693f598 100644
--- a/lib/llvm/jit.cpp
+++ b/lib/llvm/jit.cpp
@@ -2,29 +2,96 @@
// SPDX-FileCopyrightText: 2019-2024 Second State INC
#include "llvm/jit.h"
-#include "common/spdlog.h"
#include "data.h"
#include "llvm.h"
+#include "spdlog/s... | [
"lib/llvm/jit.cpp"
] | [
{
"comment": "I just want to confirm if the `Exec` must be `JITLibrary`. Using `static_cast` here is really strange.",
"path": "lib/llvm/jit.cpp",
"hunk": "@@ -51,43 +125,144 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n std::vector<Symbol<void>> Result;\n Result.reserve(Size);\... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | Please confirm if this is the intended usage of the same `static_cast`. | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/llvm/jit.cpp b/lib/llvm/jit.cpp
index 4bf3cc80386a..f0afb693f598 100644
--- a/lib/llvm/jit.cpp
+++ b/lib/llvm/jit.cpp
@@ -2,29 +2,96 @@
// SPDX-FileCopyrightText: 2019-2024 Second State INC
#include "llvm/jit.h"
-#include "common/spdlog.h"
#include "data.h"
#include "llvm.h"
+#include "spdlog/s... | [
"lib/llvm/jit.cpp"
] | [
{
"comment": "Please confirm if this is the intended usage of the same `static_cast`.",
"path": "lib/llvm/jit.cpp",
"hunk": "@@ -51,43 +125,144 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n std::vector<Symbol<void>> Result;\n Result.reserve(Size);\n for (size_t I = 0; I < Size... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | Once you use `static_cast`, this check will always be true, which means it does nothing. | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/llvm/jit.cpp b/lib/llvm/jit.cpp
index 4bf3cc80386a..f0afb693f598 100644
--- a/lib/llvm/jit.cpp
+++ b/lib/llvm/jit.cpp
@@ -2,29 +2,96 @@
// SPDX-FileCopyrightText: 2019-2024 Second State INC
#include "llvm/jit.h"
-#include "common/spdlog.h"
#include "data.h"
#include "llvm.h"
+#include "spdlog/s... | [
"lib/llvm/jit.cpp"
] | [
{
"comment": "Once you use `static_cast`, this check will always be true, which means it does nothing.",
"path": "lib/llvm/jit.cpp",
"hunk": "@@ -51,43 +125,144 @@ std::vector<Symbol<void>> JITLibrary::getCodes(size_t Offset,\n std::vector<Symbol<void>> Result;\n Result.reserve(Size);\n for (size_... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | This branch seems to be eager JIT.
What's the reason that we need the LazyMutex and update the `Pending`? | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp
index 680d35094656..cf594a8be374 100644
--- a/lib/vm/vm.cpp
+++ b/lib/vm/vm.cpp
@@ -3,7 +3,9 @@
#include "vm/vm.h"
+#include "ast/instruction.h"
#include "ast/module.h"
+#include "common/enum_errcode.hpp"
#include "common/errcode.h"
#include "common/types.h"
#include ... | [
"lib/vm/vm.cpp"
] | [
{
"comment": "This branch seems to be eager JIT.\nWhat's the reason that we need the LazyMutex and update the `Pending`?",
"path": "lib/vm/vm.cpp",
"hunk": "@@ -423,59 +607,150 @@ Expect<void> VM::unsafeInstantiate() {\n spdlog::error(ErrCode::Value::WrongVMWorkflow);\n return Unexpect(ErrCode::... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | I am thinking about this chain.
Since you are trying to have it in multiple places, it would be better to extract.
How about creating a private struct and the helper functions like this?
```cpp
struct LazyJITArtifacts {
LLVM::Data LLData;
std::unique_ptr<LLVM::Compiler::CompileContext,
LLVM::Comp... | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp
index 680d35094656..cf594a8be374 100644
--- a/lib/vm/vm.cpp
+++ b/lib/vm/vm.cpp
@@ -3,7 +3,9 @@
#include "vm/vm.h"
+#include "ast/instruction.h"
#include "ast/module.h"
+#include "common/enum_errcode.hpp"
#include "common/errcode.h"
#include "common/types.h"
#include ... | [
"lib/vm/vm.cpp"
] | [
{
"comment": "I am thinking about this chain.\nSince you are trying to have it in multiple places, it would be better to extract.\nHow about creating a private struct and the helper functions like this?\n\n```cpp\nstruct LazyJITArtifacts {\n LLVM::Data LLData;\n std::unique_ptr<LLVM::Compiler::CompileContext,... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | If we introduce the above `LazyJITArtifacts`, we no longer need a global `Pending`. We can use the `LazyJITArtifacts` as a local variable to transit these data.
Like this:
```cpp
LazyJITArtifacts Artifacts;
bool HasLazyArtifacts = false;
if (lazy mode) {
EXPECTED_TRY(Artifacts, runLazyJITPipeline(M... | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp
index 680d35094656..cf594a8be374 100644
--- a/lib/vm/vm.cpp
+++ b/lib/vm/vm.cpp
@@ -3,7 +3,9 @@
#include "vm/vm.h"
+#include "ast/instruction.h"
#include "ast/module.h"
+#include "common/enum_errcode.hpp"
#include "common/errcode.h"
#include "common/types.h"
#include ... | [
"lib/vm/vm.cpp"
] | [
{
"comment": "If we introduce the above `LazyJITArtifacts`, we no longer need a global `Pending`. We can use the `LazyJITArtifacts` as a local variable to transit these data.\n\nLike this:\n\n```cpp\n LazyJITArtifacts Artifacts;\n bool HasLazyArtifacts = false;\n\n if (lazy mode) {\n EXPECTED_TRY(... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | Why do we need to change this part? | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp
index 680d35094656..cf594a8be374 100644
--- a/lib/vm/vm.cpp
+++ b/lib/vm/vm.cpp
@@ -3,7 +3,9 @@
#include "vm/vm.h"
+#include "ast/instruction.h"
#include "ast/module.h"
+#include "common/enum_errcode.hpp"
#include "common/errcode.h"
#include "common/types.h"
#include ... | [
"lib/vm/vm.cpp"
] | [
{
"comment": "Why do we need to change this part?",
"path": "lib/vm/vm.cpp",
"hunk": "@@ -207,10 +302,99 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+ spdlog::info(\"Module validated: {}\"sv, Module.g... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | The `RegModInsts` will never be empty due to the above line. | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/vm/vm.cpp b/lib/vm/vm.cpp
index 680d35094656..cf594a8be374 100644
--- a/lib/vm/vm.cpp
+++ b/lib/vm/vm.cpp
@@ -3,7 +3,9 @@
#include "vm/vm.h"
+#include "ast/instruction.h"
#include "ast/module.h"
+#include "common/enum_errcode.hpp"
#include "common/errcode.h"
#include "common/types.h"
#include ... | [
"lib/vm/vm.cpp"
] | [
{
"comment": "The `RegModInsts` will never be empty due to the above line.",
"path": "lib/vm/vm.cpp",
"hunk": "@@ -207,10 +302,99 @@ Expect<void> VM::unsafeRegisterModule(std::string_view Name,\n }\n // Validate module.\n EXPECTED_TRY(ValidatorEngine.validate(Module));\n+ spdlog::info(\"Module va... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | I am thinking about the cleanup because we have a class called `RAIICleanup` in the `compile()` function for the entire module. Could we handle all related cleanup together with a unified function to ensure that the cleanup actually occurs? | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp
index 39da94d9a9ac..330e245f51c3 100644
--- a/lib/llvm/compiler.cpp
+++ b/lib/llvm/compiler.cpp
@@ -9,6 +9,7 @@
#include "common/spdlog.h"
#include "data.h"
#include "llvm.h"
+#include "spdlog/spdlog.h"
#include "system/allocator.h"
#include <algorithm>
... | [
"lib/llvm/compiler.cpp"
] | [
{
"comment": "I am thinking about the cleanup because we have a class called `RAIICleanup` in the `compile()` function for the entire module. Could we handle all related cleanup together with a unified function to ensure that the cleanup actually occurs?",
"path": "lib/llvm/compiler.cpp",
"hunk": "@@ -6... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | It seems like you don't call the `LLModule.verify()` inside `compileInfrastructure`? | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/lib/llvm/compiler.cpp b/lib/llvm/compiler.cpp
index 39da94d9a9ac..330e245f51c3 100644
--- a/lib/llvm/compiler.cpp
+++ b/lib/llvm/compiler.cpp
@@ -9,6 +9,7 @@
#include "common/spdlog.h"
#include "data.h"
#include "llvm.h"
+#include "spdlog/spdlog.h"
#include "system/allocator.h"
#include <algorithm>
... | [
"lib/llvm/compiler.cpp"
] | [
{
"comment": "It seems like you don't call the `LLModule.verify()` inside `compileInfrastructure`?",
"path": "lib/llvm/compiler.cpp",
"hunk": "@@ -6342,13 +6498,255 @@ Expect<void> Compiler::compile(const AST::FunctionSection &FuncSec,\n FunctionCompiler FC(*Context, F, Locals,\n ... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | You forgot the `#ifdef WASMEDGE_USE_LLVM`. | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/include/vm/vm.h b/include/vm/vm.h
index 543a4c19712e..afa401415a0f 100644
--- a/include/vm/vm.h
+++ b/include/vm/vm.h
@@ -26,12 +26,20 @@
#include "runtime/instance/module.h"
#include "runtime/storemgr.h"
+#ifdef WASMEDGE_USE_LLVM
+#include "llvm/compiler.h"
+#include "llvm/data.h"
+#include "llvm/jit.... | [
"include/vm/vm.h"
] | [
{
"comment": "You forgot the `#ifdef WASMEDGE_USE_LLVM`.",
"path": "include/vm/vm.h",
"hunk": "@@ -25,16 +25,25 @@\n \n #include \"runtime/instance/module.h\"\n #include \"runtime/storemgr.h\"\n+#include \"llvm/compiler.h\"\n+#include \"llvm/data.h\"\n+#include \"llvm/jit.h\"",
"resolving_sha": "67f... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | Could you please explain why we need to use `recursive_mutex` instead of `mutex`?
Could you compile with `-fsanitize=thread -fno-omit-frame-pointer` and provide a test case where `mutex` must not work? | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/include/vm/vm.h b/include/vm/vm.h
index 543a4c19712e..afa401415a0f 100644
--- a/include/vm/vm.h
+++ b/include/vm/vm.h
@@ -26,12 +26,20 @@
#include "runtime/instance/module.h"
#include "runtime/storemgr.h"
+#ifdef WASMEDGE_USE_LLVM
+#include "llvm/compiler.h"
+#include "llvm/data.h"
+#include "llvm/jit.... | [
"include/vm/vm.h"
] | [
{
"comment": "Could you please explain why we need to use `recursive_mutex` instead of `mutex`? \nCould you compile with `-fsanitize=thread -fno-omit-frame-pointer` and provide a test case where `mutex` must not work?",
"path": "include/vm/vm.h",
"hunk": "@@ -373,6 +382,7 @@ class VM {\n Statistics::... | true | ||
WasmEdge/WasmEdge | 4,723 | comment_to_fix | feat: implement per function compilation in jit | You only verified the results, which means we don't know if it's lazy or eager. We should also rely on some real metrics for the verification. | 9d431499ab32e01ac19e61738eafa310f700d31e | 67f93b5a08e799af47f68e08dba299c6a6dbc88d | diff --git a/test/llvm/LazyJITTest.cpp b/test/llvm/LazyJITTest.cpp
new file mode 100644
index 000000000000..2d36b436039c
--- /dev/null
+++ b/test/llvm/LazyJITTest.cpp
@@ -0,0 +1,784 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2019-2026 Second State INC
+
+//===-- test/llvm/LazyJITTest.cpp - L... | [
"test/llvm/LazyJITTest.cpp"
] | [
{
"comment": "You only verified the results, which means we don't know if it's lazy or eager. We should also rely on some real metrics for the verification.",
"path": "test/llvm/LazyJITTest.cpp",
"hunk": "@@ -0,0 +1,435 @@\n+// SPDX-License-Identifier: Apache-2.0\n+// SPDX-FileCopyrightText: 2019-2024 S... | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.