updated COAT to get source line support when profiling AsmJit

Author: tetzank

.gitmodules

@@ -1,11 +1,14 @@
 [submodule "external/asmjit"]
 path = external/asmjit
-url = https://github.com/tetzank/asmjit
-branch = mywip
+url = https://github.com/asmjit/asmjit
+branch = master
 [submodule "external/llvm"]
 path = external/llvm
 url = https://github.com/llvm/llvm-project
 branch = release/7.x
 [submodule "external/coat"]
 path = external/coat
 url = https://github.com/tetzank/coat.git
+[submodule "external/asmjit-utilities"]
+path = external/asmjit-utilities
+url = https://github.com/tetzank/asmjit-utilities

CMakeLists.txt

@@ -31,6 +31,18 @@ find_library(ASMJIT_LIBRARIES
 )
 include_directories(${ASMJIT_INCLUDE_DIR})
 
+# find asmjit_perf
+find_path(ASMJIT_PERF_INCLUDE_DIR
+asmjit-utilities/perf/jitdump.h
+HINTS external/
+)
+find_library(ASMJIT_PERF_LIBRARIES
+asmjit_perf
+HINTS external/asmjit-utilities
+PATH_SUFFIXES perf/build
+)
+include_directories(${ASMJIT_PERF_INCLUDE_DIR})
+
 # find llvm, quick&dirty
 find_path(LLVM_INCLUDE_DIR
 llvm/IR/IRBuilder.h
@@ -93,7 +105,8 @@ if(MEASURE_TIME)
 endif()
 option(PROFILING "enable perf profiling support" OFF)
 if(PROFILING)
-target_compile_definitions(sig18 PRIVATE "PROFILING")
+target_compile_definitions(sig18 PRIVATE "PROFILING" PRIVATE "PROFILING_SOURCE")
+target_link_libraries(sig18 ${ASMJIT_PERF_LIBRARIES})
 endif()
 
 # debugging options

buildDependencies.sh

@@ -7,7 +7,14 @@ git submodule update --init
 pushd external/asmjit
 mkdir -p build
 cd build
-cmake -DCMAKE_BUILD_TYPE=Release -DASMJIT_BUILD_STATIC=TRUE ..
+cmake -DCMAKE_BUILD_TYPE=Release ..
+make $@
+popd
+
+pushd external/asmjit-utilities
+mkdir -p perf/build
+cd perf/build
+ASMJIT_ROOT=../../../external/asmjit cmake -DCMAKE_BUILD_TYPE=Release ..
 make $@
 popd
 

external/asmjit

@@ -61,10 +61,18 @@ struct CodegenContext {
 
 CodegenContext(Fn &fn, size_t numberOfRelations, size_t numberOfProjections)
 : arguments(fn.getArguments("lower", "upper", "proj_addr"))
-, rowids(numberOfRelations, coat::Value<CC,uint64_t>(fn))
-, results(numberOfProjections, coat::Value<CC,uint64_t>(fn, 0UL))
 , amount(fn, 0UL, "amount")
-{}
+{
+// emplace_back() in a loop to avoid copies
+rowids.reserve(numberOfRelations);
+for(size_t i=0; i<numberOfRelations; ++i){
+rowids.emplace_back(fn);
+}
+results.reserve(numberOfProjections);
+for(size_t i=0; i<numberOfProjections; ++i){
+results.emplace_back(fn);
+}
+}
 };
 
 

external/asmjit-utilities

@@ -280,21 +280,21 @@ void codegenAsmjit(
 #ifdef MEASURE_TIME
 auto t_start = std::chrono::high_resolution_clock::now();
 #endif
+#ifdef PROFILING
+char buf[8]={};
+snprintf(buf, sizeof(buf), "q%lu", query);
+coat::Function<coat::runtimeasmjit,codegen_func_type> fn(*asmrt, buf);
+#else
 coat::Function<coat::runtimeasmjit,codegen_func_type> fn(*asmrt);
+#endif
 {
 CodegenContext ctx(fn, q.relationIds.size(), q.selections.size());
 scan->codegen(fn, ctx);
 proj->codegen_save(fn, ctx);
 coat::ret(fn, ctx.amount);
 }
 // finalize function
-#ifdef PROFILING
-char buf[8]={};
-snprintf(buf, sizeof(buf), "q%lu", query);
-codegen_func_type fnptr = fn.finalize(buf);
-#else
 codegen_func_type fnptr = fn.finalize();
-#endif
 #ifdef MEASURE_TIME
 auto t_compile = std::chrono::high_resolution_clock::now();
 #endif