improve remod bind method.

drswinghead · drswinghead · commit bf25961022a8 · 2015-04-08T20:10:24.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -74,6 +74,7 @@ set(handby_lib_SRCS
     clvm.cpp
     clvm_letacy.cpp
     ivm/clvmjitlistener.cpp
+    ivm/misc.cpp
     namelookup.cpp
     callargument.cpp
     invokestorage.cpp
diff --git a/compilerengine.cpp b/compilerengine.cpp
@@ -1119,6 +1119,27 @@ llvm::Module* CompilerEngine::conv_function2(clang::ASTUnit *unit, clang::Functi
     return cu->mmod;
 }
 
+llvm::Module*
+CompilerEngine::conv_dargs(clang::ASTUnit *unit, clang::FunctionDecl *fd, QVector<QVariant> &dargs)
+{
+    auto cu = this->createCompilerUnit(unit, fd);
+
+    int cnter = -1;
+    for (auto &v: dargs) {
+        cnter ++;
+        // qDebug()<<v<<v.type()<<(int)v.type()<<v.userType();
+        int t = (int)v.type();
+        if (v.type() != QMetaType::User) continue;
+        if (v.userType() != EvalType::id) continue;
+        this->gen_darg(cu->mmod, v, cnter, fd);
+        EvalType r = v.value<EvalType>();
+        qDebug()<<v<<r.ve<<r.vv;
+    }
+    
+
+    return cu->mmod;
+}
+
 bool CompilerEngine::gen_ctor(CompilerUnit *cu, clang::CXXConstructorDecl *yactor)
 {
     // 转换到需要的参数类型
@@ -1245,7 +1266,7 @@ bool CompilerEngine::gen_dtor(CompilerUnit *cu, clang::CXXDestructorDecl *yadtor
 bool CompilerEngine::gen_darg(llvm::Module *mod, QVariant &darg, int idx, clang::FunctionDecl *fd)
 {
     CompilerUnit *cu = mcus.value(mod);
-    
+
     /*
     for (auto &v: cu->mdargs) {
         if (v.type() != EvalType::id) continue;
@@ -2045,6 +2066,9 @@ CompilerEngine::createCompilerUnit(clang::ASTUnit *unit, clang::NamedDecl *decl)
     cu->mbdecl = this->get_decl_with_body(llvm::cast<clang::CXXMethodDecl>(decl));
     qDebug()<<cu->mdecl<<cu->mbdecl<<(cu->mdecl == cu->mbdecl)<<cu->mcgm;
 
+    // 
+    mcus.insert(cu->mmod, cu);
+    
     return cu;
 }
 
diff --git a/compilerengine.h b/compilerengine.h
@@ -68,6 +68,7 @@ class CompilerEngine
     llvm::Module* conv_dtor(clang::ASTUnit *unit, clang::CXXDestructorDecl *dtor);
     llvm::Module* conv_method2(clang::ASTUnit *unit, clang::CXXMethodDecl *mth);
     llvm::Module* conv_function2(clang::ASTUnit *unit, clang::FunctionDecl *mth);
+    llvm::Module* conv_dargs(clang::ASTUnit *unit, clang::FunctionDecl *fd, QVector<QVariant> &dargs);
 
     bool gen_ctor(CompilerUnit *cu, clang::CXXConstructorDecl *yactor = NULL);
     bool gen_dtor(CompilerUnit *cu, clang::CXXDestructorDecl *yadtor = NULL);
@@ -121,6 +122,8 @@ class CompilerUnit
     QVector<QString> mUndefSymbols;
     QHash<QString, bool> mNoinlineSymbols;
     QVector<QVariant> mdargs;
+
+    llvm::Module *mremod = NULL;
 };
 
 #endif /* COMPILERENGINE_H */
diff --git a/ctrlengine.cpp b/ctrlengine.cpp
@@ -33,7 +33,6 @@ CtrlEngine::~CtrlEngine()
 {
 }
 
-
 void *CtrlEngine::vm_new(QString klass, QVector<QVariant> uargs)
 {
     // 处理流程，
@@ -68,7 +67,7 @@ void *CtrlEngine::vm_new(QString klass, QVector<QVariant> uargs)
     QString modname = QString("qtmod%1").arg(mce->mangle_symbol(mfe->getASTContext(), ctor_decl));
     llvm::Module *qtmod = NULL;
 
-    if (mman->contains(modname)) {
+    if (mman->has(modname)) {
         qtmod = mman->get(modname);
     } else {
         // auto mod = mce->conv_ctor(mfe->getASTContext(), ctor_decl);
@@ -122,10 +121,14 @@ void *CtrlEngine::vm_new(QString klass, QVector<QVariant> uargs)
     // QString lamsym = oe.bind(mod, "_ZN7QStringC2Ev", kthis, uargs, dargs);
     QString lamsym = oe.bind(qtmod, symname, klass, uargs, dargs, mtdargs, false, kthis);
     // qDebug()<<lamsym;
+
+    llvm::Module *remod = this->process_dargs(dargs);
+    DUMP_IR(remod);
     
-    llvm::Module *remod = oe.bind(qtmod, klass, uargs, dargs, mtdargs, false, kthis);
+    oe.bind(qtmod, remod, klass, uargs, dargs, mtdargs, false, kthis);
     TEMP_DEBUG();    
-    DUMP_IR(remod);    
+    DUMP_IR(remod);
+    
     CodeUnit *cu = new CodeUnit(qtmod, remod);
     // QString lamsym = QString::fromStdString(remod->getName().str());
     
@@ -146,6 +149,36 @@ void *CtrlEngine::vm_new(QString klass, QVector<QVariant> uargs)
     return kthis;
 }
 
+llvm::Module* CtrlEngine::process_dargs(QVector<QVariant> &dargs)
+{
+    // 默认参数编译成IR    
+    clang::FunctionDecl *jmt_decl = mfe->find_free_function("__jit_main_tmpl");
+    qDebug()<<jmt_decl;
+    // jmt_decl->dumpColor();
+    DUMP_COLOR(jmt_decl);
+
+    if (true) {
+        llvm::Module *remod = mce->conv_dargs(mfe->getASTUnit(), jmt_decl, dargs);
+        // DUMP_IR(remod);
+        return remod;
+        
+        /*
+        int cnter = -1;        
+        for (auto &v: dargs) {
+            cnter ++;
+            // qDebug()<<v<<v.type()<<(int)v.type()<<v.userType();
+            int t = (int)v.type();
+            if (v.type() != QMetaType::User) continue;
+            if (v.userType() != EvalType::id) continue;
+            mce->gen_darg(mod, v, cnter, jmt_decl);
+            EvalType r = v.value<EvalType>();
+            qDebug()<<v<<r.ve<<r.vv;
+        }
+        */
+    }
+    return NULL;
+}
+
 bool CtrlEngine::vm_delete(void *kthis, QString klass)
 {
     // 处理流程，
@@ -167,7 +200,7 @@ bool CtrlEngine::vm_delete(void *kthis, QString klass)
     QString modname = QString("qtmod%1").arg(mce->mangle_symbol(mfe->getASTContext(), dtor_decl));
     llvm::Module *qtmod = NULL;
 
-    if (mman->contains(modname)) {
+    if (mman->has(modname)) {
         qtmod = mman->get(modname);
     } else {
         auto mod = mce->conv_dtor(mfe->getASTUnit(), dtor_decl);
@@ -358,7 +391,7 @@ QVariant CtrlEngine::vm_call(void *kthis, QString klass, QString method, QVector
     QString modname = QString("qtmod%1").arg(mce->mangle_symbol(mfe->getASTContext(), mth_decl));
     llvm::Module *qtmod = NULL;
 
-    if (mman->contains(modname)) {
+    if (mman->has(modname)) {
         qtmod = mman->get(modname);
     } else {
         // auto mod = mce->conv_method(mfe->getASTContext(), mth_decl);
@@ -401,7 +434,7 @@ QVariant CtrlEngine::vm_call(void *kthis, QString klass, QString method, QVector
     QString lamsym = oe.bind(qtmod, symname, klass, uargs, dargs, mtdargs, mth_decl->isStatic(), kthis);
     qDebug()<<lamsym;
 
-    llvm::Module *remod = oe.bind(qtmod, klass, uargs, dargs, mtdargs, mth_decl->isStatic(), kthis);
+    llvm::Module *remod = NULL;//oe.bind(qtmod, klass, uargs, dargs, mtdargs, mth_decl->isStatic(), kthis);
     DUMP_IR(remod);
     CodeUnit *cu = new CodeUnit(qtmod, remod);
     
@@ -439,7 +472,7 @@ QVariant CtrlEngine::vm_static_call(QString klass, QString method, QVector<QVari
     QString modname = QString("qtmod%1").arg(mce->mangle_symbol(mfe->getASTContext(), mth_decl));
     llvm::Module *qtmod = NULL;
 
-    if (mman->contains(modname)) {
+    if (mman->has(modname)) {
         qtmod = mman->get(modname);
     } else {
         // auto mod = mce->conv_method(mfe->getASTContext(), mth_decl);
@@ -456,7 +489,7 @@ QVariant CtrlEngine::vm_static_call(QString klass, QString method, QVector<QVari
     QString lamsym = oe.bind(qtmod, symname, klass, uargs, dargs, mtdargs, mth_decl->isStatic(), NULL);
     qDebug()<<lamsym;
 
-    llvm::Module *remod = oe.bind(qtmod, klass, uargs, dargs, mtdargs, mth_decl->isStatic(), NULL);
+    llvm::Module *remod = NULL;// oe.bind(qtmod, klass, uargs, dargs, mtdargs, mth_decl->isStatic(), NULL);
     DUMP_IR(remod);
     CodeUnit *cu = new CodeUnit(qtmod, remod);
 
@@ -527,7 +560,7 @@ QString CtrlEngine::vm_qdebug(void *kthis, QString klass)
         QString modname = QString("qtmod%1").arg(mce->mangle_symbol(mfe->getASTContext(), fun_decl));
         llvm::Module *qtmod = NULL;
 
-        if (mman->contains(modname)) {
+        if (mman->has(modname)) {
             qtmod = mman->get(modname);
         } else {
             auto mod = mce->conv_function2(mfe->getASTUnit(), fun_decl);
@@ -542,7 +575,7 @@ QString CtrlEngine::vm_qdebug(void *kthis, QString klass)
         QString lamsym = oe.bind(qtmod, symname, klass, uargs, dargs, mtdargs, false, NULL);
         qDebug()<<lamsym;
 
-        llvm::Module *remod = oe.bind(qtmod, klass, uargs, dargs, mtdargs, false, NULL);
+        llvm::Module *remod = NULL; // oe.bind(qtmod, klass, uargs, dargs, mtdargs, false, NULL);
         DUMP_IR(remod);
         CodeUnit *cu = new CodeUnit(qtmod, remod);
         
diff --git a/ctrlengine.h b/ctrlengine.h
@@ -11,6 +11,10 @@
 #include <QtCore>
 #include <llvm/ExecutionEngine/GenericValue.h>
 
+namespace llvm {
+    class Module;
+};
+
 namespace clang {
     class CompilerInstance;
     class CompilerInvocation;
@@ -42,9 +46,12 @@ class CtrlEngine
     QString vm_qdebug(void *kthis, QString klass);
 
     // improve
-    
+
     // hot fix
     QVariant vm_call_hotfix(void *kthis, QString klass, QString method, QVector<QVariant> uargs);
+
+private:
+    llvm::Module* process_dargs(QVector<QVariant> &dargs);
     
 public:
     // 调度组件可能不需要这些组件，只管理调度问题。
diff --git a/docs/jit-ee-and-ir-reuse-improve.md b/docs/jit-ee-and-ir-reuse-improve.md
@@ -50,6 +50,8 @@
 在实现了两个IR Module按功能拆分后，即可实现qtmod的重用了。
 而remod封装了不同的this对象指针和不同的参数，每次行完后，还是需要销毁的。
 
+TODO remod的一个问题？？？
+是默认参数还没有编译到remod中。
 
 ### <h3>JIT引擎重用</h3>
 
diff --git a/ivm/clvmengine.cpp b/ivm/clvmengine.cpp
@@ -248,6 +248,26 @@ bool ClvmEngine::initExecutionEngine()
     return true;
 }
 
+
+llvm::ExecutionEngine *ClvmEngine::createEE(llvm::Module *mod)
+{
+    // run module
+    std::unique_ptr<llvm::Module> tmod(mod);
+    llvm::EngineBuilder eb(std::move(tmod));
+    
+    std::string errstr;    
+    eb.setErrorStr(&errstr);
+    // eb.setUseMCJIT(true);
+
+    llvm::ExecutionEngine *EE = eb.create();
+
+    // ClvmJitListener *lsner = new ClvmJitListener();
+    if (!mlsner) mlsner = ClvmJitListener::inst();
+    EE->RegisterJITEventListener(mlsner);
+
+    return EE;
+}
+
 // 执行IR代码中的一个入口函数
 llvm::GenericValue 
 ClvmEngine::execute2(llvm::Module *mod, QString func_entry)
@@ -326,21 +346,28 @@ ClvmEngine::execute2(llvm::Module *mod, QString func_entry)
 }
 
 // 使用类变量mee多次执行IR代码。
-llvm::GenericValue ClvmEngine::execute3(llvm::Module *mod, QString func_entry, CodeUnit *cu)
+llvm::GenericValue ClvmEngine::execute3(llvm::Module */*mod*/, QString func_entry, CodeUnit *cu)
 {
-    llvm::ExecutionEngine *EE = mee;
+    // llvm::ExecutionEngine *EE = mee;
     llvm::Module *qtmod = cu->qtmod;
     llvm::Module *remod = cu->remod;
+    QString modname = QString::fromStdString(qtmod->getName().str());
 
-    mman->add(QString::fromStdString(mod->getName().str()), mod);
+    llvm::ExecutionEngine *EE = mman->hasEE(modname) ? mman->getEE(modname) : this->createEE(qtmod);
+    
+    mman->add(QString::fromStdString(qtmod->getName().str()), qtmod);
+    mman->addEE(QString::fromStdString(qtmod->getName().str()), EE);
     // mman->add(QString::fromStdString(remod->getName().str()), remod);
+    std::unique_ptr<llvm::Module> tremod(remod);
+    EE->addModule(std::move(tremod));
+    assert(tremod.get() == NULL);
     
     EE->finalizeObject();
     EE->runStaticConstructorsDestructors(false);
 
     llvm::Function *etyfn = NULL;
     QString mangle_name;
-    llvm::ValueSymbolTable &vst = mod->getValueSymbolTable();
+    llvm::ValueSymbolTable &vst = remod->getValueSymbolTable();
     for (auto sit = vst.begin(); sit != vst.end(); sit++) {
         auto k = sit->first();
         auto v = sit->second;
@@ -352,7 +379,7 @@ llvm::GenericValue ClvmEngine::execute3(llvm::Module *mod, QString func_entry, C
         }
         // if (QString(v->getName().data()).indexOf("jit_main") >= 0) {
         if (QString(v->getName().data()).indexOf(func_entry) >= 0) {
-            etyfn = mod->getFunction(v->getName());
+            etyfn = remod->getFunction(v->getName());
             mangle_name = QString(v->getName().data());
             // break;
         }
@@ -367,14 +394,15 @@ llvm::GenericValue ClvmEngine::execute3(llvm::Module *mod, QString func_entry, C
     qDebug()<<"our fun:"<<func_entry<<mangle_name2<<etyfn2;
     
     std::vector<llvm::GenericValue> args;
-    llvm::GenericValue rgv = EE->runFunction(etyfn, args);
+    llvm::GenericValue rgv = EE->runFunction(etyfn2, args);
     // qDebug()<<"err:"<<errstr.c_str();
     
     EE->runStaticConstructorsDestructors(true);
     // cleanups
     bool bret = false;
     // bret |= mman->remove(QString::fromStdString(remod->getName().str()));
-    bret |= mman->remove(QString::fromStdString(mod->getName().str()));
+    // bret |= mman->remove(QString::fromStdString(mod->getName().str()));
+    EE->removeModule(remod);
     qDebug()<<bret;
 
     qDebug()<<"run code done."<<llvm::GVTOP(rgv)<<rgv.IntVal.getZExtValue();
diff --git a/ivm/clvmengine.h b/ivm/clvmengine.h
@@ -55,6 +55,7 @@ public slots:
     bool init();
     bool initCompiler();
     bool initExecutionEngine();
+    llvm::ExecutionEngine *createEE(llvm::Module *mod); 
     llvm::GenericValue run_module_func(llvm::Module *mod, std::vector<llvm::GenericValue> & args,
                                QString func_entry);
 
diff --git a/ivm/misc.cpp b/ivm/misc.cpp
@@ -0,0 +1,26 @@
+#include "misc.h"
+
+QString qStr(std::string ss)
+{
+    return QString::fromStdString(ss);
+}
+
+QString qStr(llvm::StringRef sr)
+{
+    return QString::fromStdString(sr.str());
+}
+
+const char *cStr(std::string ss)
+{
+    return ss.c_str();
+}
+
+const char *cStr(llvm::StringRef sr)
+{
+    return sr.str().c_str();
+}
+
+const char *cStr(QString qs)
+{
+    return qs.toLatin1().data();
+}
diff --git a/ivm/misc.h b/ivm/misc.h
@@ -0,0 +1,22 @@
+#ifndef MISC_H
+#define MISC_H
+
+// qt llvm std:: string helper
+#include <QString>
+#include <llvm/ADT/StringRef.h>
+
+QString qStr(std::string ss);
+QString qStr(llvm::StringRef sr);
+
+const char *cStr(std::string ss);
+const char *cStr(llvm::StringRef sr);
+const char *cStr(QString qs);
+
+// QString to llvm:StringRef???
+
+const static QString qtmod_prefix = "qtmod_";
+const static QString remod_prefix = "remod_";
+
+
+
+#endif /* MISC_H */
diff --git a/ivm/modulemanager.cpp b/ivm/modulemanager.cpp
diff --git a/ivm/modulemanager.h b/ivm/modulemanager.h
diff --git a/operatorengine.cpp b/operatorengine.cpp
diff --git a/operatorengine.h b/operatorengine.h
