Remove T1C JIT cache invocation

Author: vacantron

src/jit.c

@@ -2038,15 +2038,11 @@ void jit_cache_exit(struct jit_cache *cache)
     free(cache);
 }
 
-void jit_cache_update(struct jit_cache *cache,
-                      uint32_t pc,
-                      uint32_t from,
-                      void *entry)
+void jit_cache_update(struct jit_cache *cache, uint32_t pc, void *entry)
 {
     uint32_t pos = pc & (MAX_JIT_CACHE_TABLE_ENTRIES - 1);
 
     cache[pos].pc = pc;
-    cache[pos].from = from;
     cache[pos].entry = entry;
 }
 

src/jit.h

@@ -59,18 +59,12 @@ typedef void (*exec_t2c_func_t)(riscv_t *);
 #define MAX_JIT_CACHE_TABLE_ENTRIES (1 << 12)
 
 struct jit_cache {
-    uint32_t pc __ALIGNED(4);   /* program counter of ELF */
-    uint32_t from __ALIGNED(4); /* from whether t1c or t2c, ensure the correct
-                                   alignment for accessing member in LLVM IR
-                                 */
-    void *entry;                /* entry of JIT-ed code */
+    uint64_t pc; /* program counter, easy to build LLVM IR with 64-bit width */
+    void *entry; /* entry of JIT-ed code */
 };
 
 struct jit_cache *jit_cache_init();
 void jit_cache_exit(struct jit_cache *cache);
-void jit_cache_update(struct jit_cache *cache,
-                      uint32_t pc,
-                      uint32_t from,
-                      void *entry);
+void jit_cache_update(struct jit_cache *cache, uint32_t pc, void *entry);
 void jit_cache_clear(struct jit_cache *cache);
 #endif

src/t2c.c

@@ -135,10 +135,7 @@ FORCE_INLINE void t2c_gen_call_io_func(LLVMValueRef start,
                    &io_param, 1, "");
 }
 
-static bool t2c_jit_cache_triggered;
-static LLVMTypeRef t2c_t1c_cache_func_proto;
-static LLVMValueRef t2c_t1c_cache_func;
-static LLVMTypeRef t2c_t2c_cache_func_proto;
+static LLVMTypeRef t2c_cache_func_proto;
 static LLVMTypeRef jit_cache_ty;
 
 #include "t2c_template.c"
@@ -245,8 +242,6 @@ static void t2c_trace_ebb(LLVMBuilderRef *builder,
 
 void t2c_compile(riscv_t *rv, block_t *block)
 {
-    t2c_jit_cache_triggered = false;
-
     LLVMModuleRef module = LLVMModuleCreateWithName("my_module");
     LLVMTypeRef io_members[] = {
         LLVMPointerType(LLVMVoidType(), 0), LLVMPointerType(LLVMVoidType(), 0),
@@ -264,20 +259,13 @@ void t2c_compile(riscv_t *rv, block_t *block)
     LLVMValueRef start = LLVMAddFunction(
         module, "start", LLVMFunctionType(LLVMVoidType(), param_types, 1, 0));
 
-    LLVMTypeRef t1c_args[2] = {LLVMInt64Type(), LLVMInt64Type()};
-    t2c_t1c_cache_func_proto =
-        LLVMFunctionType(LLVMVoidType(), t1c_args, 2, false);
-    t2c_t1c_cache_func =
-        LLVMAddFunction(module, "t2c_invoke_cache", t2c_t1c_cache_func_proto);
-
     LLVMTypeRef t2c_args[1] = {LLVMInt64Type()};
-    t2c_t2c_cache_func_proto =
-        LLVMFunctionType(LLVMVoidType(), t2c_args, 1, false);
+    t2c_cache_func_proto = LLVMFunctionType(LLVMVoidType(), t2c_args, 1, false);
 
     /* Notice to the alignment */
-    LLVMTypeRef jit_cache_memb[3] = {LLVMInt32Type(), LLVMInt32Type(),
+    LLVMTypeRef jit_cache_memb[2] = {LLVMInt64Type(),
                                      LLVMPointerType(LLVMVoidType(), 0)};
-    jit_cache_ty = LLVMStructType(jit_cache_memb, 3, false);
+    jit_cache_ty = LLVMStructType(jit_cache_memb, 2, false);
 
     LLVMBasicBlockRef first_block = LLVMAppendBasicBlock(start, "first_block");
     LLVMBuilderRef first_builder = LLVMCreateBuilder();
@@ -321,13 +309,8 @@ void t2c_compile(riscv_t *rv, block_t *block)
         abort();
     }
 
-    if (t2c_jit_cache_triggered) {
-        LLVMAddGlobalMapping(engine, t2c_t1c_cache_func,
-                             ((struct jit_state *) rv->jit_state)->buf);
-    }
-
     /* Return the function pointer of T2C generated machine code */
     block->func = (exec_t2c_func_t) LLVMGetPointerToGlobal(engine, start);
-    jit_cache_update(rv->jit_cache, block->pc_start, 2, block->func);
+    jit_cache_update(rv->jit_cache, block->pc_start, block->func);
     block->hot2 = true;
 }

src/t2c_template.c

@@ -38,8 +38,6 @@ FORCE_INLINE void t2c_jit_cache_helper(LLVMBuilderRef *builder,
                                        riscv_t *rv,
                                        rv_insn_t *ir)
 {
-    t2c_jit_cache_triggered = true;
-
     LLVMBasicBlockRef true_path = LLVMAppendBasicBlock(start, "");
     LLVMBuilderRef true_builder = LLVMCreateBuilder();
     LLVMPositionBuilderAtEnd(true_builder, true_path);
@@ -75,45 +73,16 @@ FORCE_INLINE void t2c_jit_cache_helper(LLVMBuilderRef *builder,
 
     /* get jit_cache_t::entry */
     LLVMValueRef entry_ptr =
-        LLVMBuildStructGEP2(true_builder, jit_cache_ty, element_ptr, 2, "");
-
-    /* get jit_cache_t::from */
-    LLVMValueRef from_prt =
         LLVMBuildStructGEP2(true_builder, jit_cache_ty, element_ptr, 1, "");
-    LLVMValueRef from =
-        LLVMBuildLoad2(true_builder, LLVMInt32Type(), from_prt, "");
-
-    LLVMBasicBlockRef _true_path = LLVMAppendBasicBlock(start, "");
-    LLVMBuilderRef _true_builder = LLVMCreateBuilder();
-    LLVMPositionBuilderAtEnd(_true_builder, _true_path);
-
-    LLVMBasicBlockRef _false_path = LLVMAppendBasicBlock(start, "");
-    LLVMBuilderRef _false_builder = LLVMCreateBuilder();
-    LLVMPositionBuilderAtEnd(_false_builder, _false_path);
-
-    LLVMValueRef _cmp =
-        LLVMBuildICmp(true_builder, LLVMIntEQ, from,
-                      LLVMConstInt(LLVMInt32Type(), 1, false), "");
-    LLVMBuildCondBr(true_builder, _cmp, _true_path, _false_path);
-
-    /* invoke T1C JIT-ed code */
-    LLVMValueRef t1c_args[2] = {
-        LLVMConstInt(LLVMInt64Type(), (long) rv, false),
-        LLVMBuildLoad2(_true_builder, LLVMInt64Type(), entry_ptr, "")};
-
-    LLVMBuildCall2(_true_builder, t2c_t1c_cache_func_proto, t2c_t1c_cache_func,
-                   t1c_args, 2, "");
-    LLVMBuildRetVoid(_true_builder);
 
     /* invoke T2C JIT-ed code */
     LLVMValueRef t2c_args[1] = {
         LLVMConstInt(LLVMInt64Type(), (long) rv, false)};
 
-    LLVMBuildCall2(
-        _false_builder, t2c_t2c_cache_func_proto,
-        LLVMBuildLoad2(_false_builder, LLVMInt64Type(), entry_ptr, ""),
-        t2c_args, 1, "");
-    LLVMBuildRetVoid(_false_builder);
+    LLVMBuildCall2(true_builder, t2c_cache_func_proto,
+                   LLVMBuildLoad2(true_builder, LLVMInt64Type(), entry_ptr, ""),
+                   t2c_args, 1, "");
+    LLVMBuildRetVoid(true_builder);
 
     /* return to interpreter if cache-miss */
     LLVMBuildStore(false_builder, addr,