Serene/serene
Serene
/
serene
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Save the progress before introducing the semantic analysis

This commit is contained in:
Sameer Rahmani 2021-04-04 23:08:57 +01:00
parent 53ec0c240a
commit 9ff707c726
8 changed files with 172 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/serene/list.hpp
View File

@ -28,6 +28,7 @@
#include "serene/expr.hpp"
#include "serene/llvm/IR/Value.h"
#include "serene/reader/location.hpp"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/Optional.h"
#include <list>
#include <string>
@ -54,6 +55,8 @@ public:
std::vector<ast_node>::const_iterator begin();
std::vector<ast_node>::const_iterator end();
llvm::ArrayRef<ast_node> asArrayRef();
static bool classof(const AExpr *);
};

18
include/serene/namespace.hpp
View File

@ -26,11 +26,11 @@
#define NAMESPACE_H
#include "mlir/IR/BuiltinOps.h"
#include "mlir/IR/Value.h"
#include "serene/expr.hpp"
#include "serene/llvm/IR/Value.h"
#include "serene/logger.hpp"
#include "llvm/ADT/ScopedHashTable.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/DenseMap.h"
#include <llvm/IR/Module.h>
#include <string>
@ -40,6 +40,9 @@
#define NAMESPACE_LOG(...) ;
#endif
using ScopeMap = llvm::DenseMap<llvm::StringRef, mlir::Value>;
using PairT = std::pair<llvm::StringRef, mlir::Value>;
namespace serene {
class AExpr;
@ -47,19 +50,20 @@ class Namespace {
private:
ast_tree tree{};
bool initialized = false;
llvm::ScopedHashTable<mlir::StringRef, mlir::Value> scope;
ScopeMap rootScope;
public:
llvm::Optional<llvm::StringRef> filename;
mlir::StringRef name;
Namespace(mlir::StringRef ns_name, llvm::Optional<llvm::StringRef> filename)
: filename(filename), name(ns_name){};
Namespace(llvm::StringRef ns_name, llvm::Optional<llvm::StringRef> filename);
ast_tree &Tree();
mlir::LogicalResult setTree(ast_tree);
mlir::Value lookup(mlir::StringRef name);
mlir::LogicalResult insert_symbol(mlir::StringRef name, mlir::Value v);
// TODO: Fix it to return llvm::Optional<mlir::Value> instead
llvm::Optional<mlir::Value> lookup(llvm::StringRef name);
mlir::LogicalResult insert_symbol(llvm::StringRef name, mlir::Value v);
void print_scope();
~Namespace();

20
include/serene/sir/dialect.td
View File

@ -78,7 +78,27 @@ def ValueOp: Serene_Op<"value"> {
// Build from fix 64 bit int
build(odsBuilder, odsState, odsBuilder.getI64Type(), (uint64_t) value);
}]>,
];
}
def FnIdOp: Serene_Op<"fn_id"> {
let summary = "This operation is just a place holder for an anonymouse function";
let description = [{
A place holder for an anonymous function. For example consider an expression
like `(def a (fn (x) x))`, in this case we don't immediately create an anonymous
function since we need to set the name and create the function later.
}];
let arguments = (ins StrAttr:$name);
let results = (outs NoneType);
let builders = [
OpBuilder<(ins "std::string":$name), [{
// Build from fix 64 bit int
build(odsBuilder, odsState, odsBuilder.getNoneType(), odsBuilder.getStringAttr(name));
}]>,
];
}
#endif // SERENE_DIALECT

18
include/serene/sir/generator.hpp
View File

@ -26,36 +26,48 @@
#include "mlir/IR/Builders.h"
#include "mlir/IR/BuiltinOps.h"
#include "mlir/IR/Identifier.h"
#include "mlir/IR/MLIRContext.h"
#include "serene/expr.hpp"
#include "serene/list.hpp"
#include "serene/namespace.hpp"
#include "serene/number.hpp"
#include "serene/symbol.hpp"
#include "llvm/ADT/ScopedHashTable.h"
#include <atomic>
#include <memory>
#include <utility>
namespace serene {
namespace sir {
using FnIdPair = std::pair<mlir::Identifier, mlir::FuncOp>;
class Generator {
private:
::mlir::OpBuilder builder;
std::unique_ptr<::serene::Namespace> ns;
::mlir::ModuleOp module;
std::unique_ptr<::serene::Namespace> ns;
std::atomic_int anonymousFnCounter{1};
llvm::DenseMap<mlir::Identifier, mlir::FuncOp> anonymousFunctions;
llvm::ScopedHashTable<llvm::StringRef, mlir::Value> symbolTable;
// TODO: Should we use builder here? maybe there is a better option
::mlir::Location toMLIRLocation(serene::reader::Location *);
mlir::FuncOp generateFn(serene::reader::Location, std::string, List *,
List *);
public:
Generator(mlir::MLIRContext &context, ::serene::Namespace *ns)
: builder(&context),
module(mlir::ModuleOp::create(builder.getUnknownLoc())) {
module(mlir::ModuleOp::create(builder.getUnknownLoc(), ns->name)) {
this->ns.reset(ns);
}
mlir::Operation *generate(Number *);
mlir::Operation *generate(AExpr *);
mlir::Operation *generate(List *);
mlir::Value generate(List *);
mlir::ModuleOp generate();
~Generator();
};

7
src/list.cpp
View File

@ -26,6 +26,7 @@
#include "serene/expr.hpp"
#include "serene/llvm/IR/Value.h"
#include "serene/symbol.hpp"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/Optional.h"
#include <bits/c++config.h>
#include <fmt/core.h>
@ -102,14 +103,16 @@ std::unique_ptr<List> List::from(uint begin) {
std::vector<ast_node>::const_iterator first = this->nodes_.begin() + begin;
std::vector<ast_node>::const_iterator last = this->nodes_.end();
fmt::print("#### {} {} \n", this->nodes_.size(), this->nodes_.max_size());
fmt::print("MM {}\n", this->string_repr());
std::vector<ast_node> newCopy(first, last);
return std::make_unique<List>(newCopy);
};
llvm::ArrayRef<ast_node> List::asArrayRef() {
return llvm::makeArrayRef<ast_node>(this->nodes_);
}
size_t List::count() const { return nodes_.size(); }
/**

19
src/namespace.cpp
View File

@ -25,6 +25,7 @@
#include "serene/namespace.hpp"
#include "serene/expr.hpp"
#include "serene/llvm/IR/Value.h"
#include "llvm/ADT/StringRef.h"
#include <fmt/core.h>
#include <string>
@ -33,14 +34,21 @@ using namespace llvm;
namespace serene {
Namespace::Namespace(llvm::StringRef ns_name,
llvm::Optional<llvm::StringRef> filename) {
this->filename = filename;
this->name = ns_name;
};
ast_tree &Namespace::Tree() { return this->tree; }
mlir::Value Namespace::lookup(mlir::StringRef name) {
if (auto value = scope.lookup(name)) {
llvm::Optional<mlir::Value> Namespace::lookup(llvm::StringRef name) {
if (auto value = rootScope.lookup(name)) {
return value;
}
return nullptr;
return llvm::None;
};
mlir::LogicalResult Namespace::setTree(ast_tree t) {
@ -54,11 +62,8 @@ mlir::LogicalResult Namespace::setTree(ast_tree t) {
mlir::LogicalResult Namespace::insert_symbol(mlir::StringRef name,
mlir::Value v) {
if (scope.count(name)) {
return mlir::failure();
}
scope.insert(name, v);
rootScope.insert(PairT(name, v));
return mlir::success();
}

140
src/sir/generator.cpp
View File

@ -25,9 +25,13 @@
#include "serene/sir/generator.hpp"
#include "mlir/IR/Builders.h"
#include "mlir/IR/BuiltinOps.h"
#include "mlir/IR/Identifier.h"
#include "mlir/IR/MLIRContext.h"
#include "mlir/IR/Value.h"
#include "serene/expr.hpp"
#include "serene/sir/dialect.hpp"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/ScopedHashTable.h"
#include "llvm/Support/Casting.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h"
@ -37,7 +41,8 @@ namespace sir {
mlir::ModuleOp Generator::generate() {
for (auto x : ns->Tree()) {
module.push_back(generate(x.get()));
auto _ = generate(x.get());
UNUSED(_);
}
return module;
@ -50,7 +55,8 @@ mlir::Operation *Generator::generate(AExpr *x) {
}
case SereneType::List: {
return generate(llvm::cast<List>(x));
generate(llvm::cast<List>(x));
return nullptr;
}
default: {
@ -59,54 +65,116 @@ mlir::Operation *Generator::generate(AExpr *x) {
}
};
mlir::Operation *Generator::generate(List *l) {
// auto first = l->at(0);
mlir::Value Generator::generate(List *l) {
auto first = l->at(0);
// if (!first) {
// // Empty list.
// // TODO: Return Nil or empty list.
if (!first) {
// Empty list.
// TODO: Return Nil or empty list.
// // Just for now.
// return builder.create<ValueOp>(builder.getUnknownLoc(), (uint64_t)0);
// }
// Just for now.
return builder.create<ValueOp>(builder.getUnknownLoc(), (uint64_t)0);
}
// if (first->get()->getType() == SereneType::Symbol) {
// auto fnNameSymbol = llvm::dyn_cast<Symbol>(first->get());
if (first->get()->getType() == SereneType::Symbol) {
auto fnNameSymbol = llvm::dyn_cast<Symbol>(first->get());
// switch (fnNameSymbol->getName()) {
// case "def": {
// if (l->count() != 3) {
// llvm_unreachable("'def' form needs exactly 2 arguments.");
// }
if (fnNameSymbol->getName() == "fn") {
if (l->count() <= 3) {
module.emitError("'fn' form needs exactly 2 arguments.");
}
// auto nameSymbol = llvm::dyn_cast<Symbol>(l->at(1).getValue().get());
auto args = llvm::dyn_cast<List>(l->at(1).getValue().get());
auto body = llvm::dyn_cast<List>(l->from(2).get());
// if (!nameSymbol) {
// llvm_unreachable("The first element of 'def' has to be a symbol.");
// }
// auto value = l->at(2).getValue().get();
// auto fn = generate(value);
// auto loc(value->location->start);
// // Define a function
if (!args) {
module.emitError("The first element of 'def' has to be a symbol.");
}
// ns.insert_symbol(nameSymbol->getName(), llvm::cast<llvm::Value>(fn));
// // This is a generic function, the return type will be inferred later.
// // Arguments type are uniformly unranked tensors.
// break;
// }
// default: {
// }
// }
// }
// Create a new anonymous function and push it to the anonymous functions
// map, later on we
auto loc(fnNameSymbol->location->start);
auto anonymousName = fmt::format("__fn_{}__", anonymousFnCounter);
anonymousFnCounter++;
auto fn = generateFn(loc, anonymousName, args, body);
mlir::Identifier fnid = builder.getIdentifier(anonymousName);
anonymousFunctions.insert({fnid, fn});
return builder.create<FnIdOp>(builder.getUnknownLoc(), fnid.str());
}
}
// auto rest = l->from(1);
// auto loc = toMLIRLocation(&first->get()->location->start);
// for (auto x : *rest) {
// generate(x.get());
// }
return builder.create<ValueOp>(builder.getUnknownLoc(), (uint64_t)0);
return builder.create<ValueOp>(builder.getUnknownLoc(), (uint64_t)100);
};
mlir::FuncOp Generator::generateFn(serene::reader::Location loc,
std::string name, List *args, List *body) {
auto location = toMLIRLocation(&loc);
llvm::SmallVector<mlir::Type, 4> arg_types(args->count(),
builder.getI64Type());
auto func_type = builder.getFunctionType(arg_types, builder.getI64Type());
auto proto = mlir::FuncOp::create(location, name, func_type);
mlir::FuncOp fn(proto);
if (!fn) {
module.emitError("Can not create the function.");
}
auto &entryBlock = *fn.addEntryBlock();
llvm::ScopedHashTableScope<llvm::StringRef, mlir::Value> scope(symbolTable);
// Declare all the function arguments in the symbol table.
for (const auto arg :
llvm::zip(args->asArrayRef(), entryBlock.getArguments())) {
auto argSymbol = llvm::dyn_cast<Symbol>(std::get<0>(arg).get());
if (!argSymbol) {
module.emitError("Function parameters must be symbols");
}
if (symbolTable.count(argSymbol->getName())) {
return nullptr;
}
symbolTable.insert(argSymbol->getName(), std::get<1>(arg));
}
// Set the insertion point in the builder to the beginning of the function
// body, it will be used throughout the codegen to create operations in this
// function.
builder.setInsertionPointToStart(&entryBlock);
// Emit the body of the function.
if (!generate(body)) {
fn.erase();
return nullptr;
}
// // Implicitly return void if no return statement was emitted.
// // FIXME: we may fix the parser instead to always return the last
// expression
// // (this would possibly help the REPL case later)
// ReturnOp returnOp;
// if (!entryBlock.empty())
// returnOp = dyn_cast<ReturnOp>(entryBlock.back());
// if (!returnOp) {
// builder.create<ReturnOp>(loc(funcAST.getProto()->loc()));
// } else if (returnOp.hasOperand()) {
// // Otherwise, if this return operation has an operand then add a result
// to
// // the function.
// function.setType(builder.getFunctionType(function.getType().getInputs(),
// getType(VarType{})));
// }
return fn;
}
mlir::Operation *Generator::generate(Number *x) {
return builder.create<ValueOp>(builder.getUnknownLoc(), x->toI64());
};

2
src/sir/value_op.cpp
View File

@ -24,8 +24,10 @@
#include "mlir/IR/Builders.h"
#include "mlir/IR/MLIRContext.h"
#include "mlir/IR/Value.h"
#include "serene/sir/dialect.hpp"
#include "serene/sir/sir.hpp"
#include "llvm/Support/Casting.h"
namespace serene {
namespace sir {} // namespace sir