Remove CompilerOptions from codegen

include/jitmap/query/compiler.h

@@ -15,9 +15,11 @@
 #pragma once
 
 #include <memory>
+#include <string>
+#include <tuple>
 
-#include <jitmap/query/query.h>
 #include <jitmap/size.h>
+#include <jitmap/util/exception.h>
 
 namespace llvm {
 class LLVMContext;
@@ -48,12 +50,14 @@ struct CompilerOptions {
  std::string cpu = "";
 };
 
+class Query;
+
 // The QueryIRCodeGen class generates LLVM IR for query expression on dense
 // bitmaps. The QueryIRCodeGen is backed by a single llvm::Module where each
 // Query object is represented by a single llvm::Function.
 class QueryIRCodeGen {
  public:
- QueryIRCodeGen(const std::string& module_name, CompilerOptions options = {});
+ QueryIRCodeGen(const std::string& module_name);
  QueryIRCodeGen(QueryIRCodeGen&&);
  ~QueryIRCodeGen();
 

include/jitmap/query/query.h

@@ -16,25 +16,13 @@
 
 #include <memory>
 #include <string>
+#include <vector>
 
-#include <jitmap/jitmap.h>
-#include <jitmap/query/expr.h>
-#include <jitmap/query/parser.h>
+#include <jitmap/query/type_fwd.h>
 
 namespace jitmap {
 namespace query {
 
-// Attach a unique name to a bitmap. Used to bind name in the query with a
-// physical bitmap.
-template <typename T>
-struct NamedData {
- std::string name;
- T bitmap;
-};
-
-using NamedBitmap = NamedData<Bitmap*>;
-using NamedDenseBitset = NamedData<DenseBitset>;
-
 class Query : public std::enable_shared_from_this<Query> {
  public:
  // Create a new query object based on an expression.

src/jitmap/jitmap.cc

@@ -14,7 +14,4 @@
 
 #include <jitmap/jitmap.h>
 
-namespace jitmap {
-
-
-}
+namespace jitmap {}

src/jitmap/query/compiler.cc

@@ -26,6 +26,7 @@
 #include <llvm/Support/raw_ostream.h>
 
 #include "jitmap/query/compiler.h"
+#include "jitmap/query/expr.h"
 #include "jitmap/query/query.h"
 #include "jitmap/query/type_traits.h"
 
@@ -85,11 +86,10 @@ struct ExprCodeGenVisitor {
 
 class QueryIRCodeGen::Impl {
  public:
- Impl(const std::string& module_name, CompilerOptions options)
+ Impl(const std::string& module_name)
  : ctx_(std::make_unique<llvm::LLVMContext>()),
  module_(std::make_unique<llvm::Module>(module_name, *ctx_)),
- builder_(*ctx_),
- options_(std::move(options)) {}
+ builder_(*ctx_) {}
 
  void Compile(const Query& query) { FunctionDeclForQuery(query); }
 
@@ -243,11 +243,10 @@ class QueryIRCodeGen::Impl {
  std::unique_ptr<llvm::LLVMContext> ctx_;
  std::unique_ptr<llvm::Module> module_;
  llvm::IRBuilder<> builder_;
- CompilerOptions options_;
 };
 
-QueryIRCodeGen::QueryIRCodeGen(const std::string& module_name, CompilerOptions options)
- : impl_(std::make_unique<QueryIRCodeGen::Impl>(module_name, std::move(options))) {}
+QueryIRCodeGen::QueryIRCodeGen(const std::string& module_name)
+ : impl_(std::make_unique<QueryIRCodeGen::Impl>(module_name)) {}
 QueryIRCodeGen::QueryIRCodeGen(QueryIRCodeGen&& other) { std::swap(impl_, other.impl_); }
 QueryIRCodeGen::~QueryIRCodeGen() {}
 

tests/jitmap_benchmark.cc

@@ -20,6 +20,7 @@
 #include <jitmap/jitmap.h>
 #include <jitmap/query/compiler.h>
 #include <jitmap/query/jit.h>
+#include <jitmap/query/query.h>
 #include <jitmap/size.h>
 
 namespace jitmap {

tools/jitmap_ir.cc

@@ -38,7 +38,7 @@ int main(int argc, char** argv) {
 
  try {
  auto query = Query::Make("query", argv[1]);
- auto compiler = QueryIRCodeGen("jitmap-ir-module", {});
+ auto compiler = QueryIRCodeGen("jitmap-ir-module");
  compiler.Compile(*query);
  auto [module, ctx] = std::move(compiler).Finish();
  std::cout << DumpIR(*module) << "\n";