replica
/
hanchenye-Polygeist
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix format

This commit is contained in:
William S. Moses 2021-07-08 20:30:52 -04:00 committed by William Moses
parent 777d981276
commit 52e9d19c45
8 changed files with 411 additions and 334 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -53,8 +53,8 @@ jobs:
run: |
cd build
ls ../mlir-build/lib/cmake/clang
CYMBL=OFF cmake ../src/ -GNinja -DMLIR_DIR=`pwd`/../mlir-build/lib/cmake/mlir -DLLVM_EXTERNAL_LIT=`pwd`/../mlir-build/bin/llvm-lit -DClang_DIR=`pwd`/../mlir-build/lib/cmake/clang -DCMAKE_BUILD_TYPE=${{ matrix.build }} -DCMAKE_C_COMPILER=/bin/clang -DCMAKE_CXX_COMPILER=/bin/clang++ -DCMAKE_ASM_COMPILER=/bin/clang -DCMAKE_CXX_FLAGS="-Wno-c++11-narrowing"
cmake ../src/ -GNinja -DMLIR_DIR=`pwd`/../mlir-build/lib/cmake/mlir -DLLVM_EXTERNAL_LIT=`pwd`/../mlir-build/bin/llvm-lit -DClang_DIR=`pwd`/../mlir-build/lib/cmake/clang -DCMAKE_BUILD_TYPE=${{ matrix.build }}
- name: test mlir-clang
run: |
cd build
ninja -j125 check-mlir-clang
ninja check-mlir-clang

11
lib/polygeist/Ops.cpp
View File

@ -7,11 +7,11 @@
//===----------------------------------------------------------------------===//
#include "polygeist/Ops.h"
#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
#include "mlir/Dialect/LLVMIR/LLVMTypes.h"
#include "mlir/IR/Builders.h"
#include "mlir/IR/OpImplementation.h"
#include "polygeist/Dialect.h"
#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
#include "mlir/Dialect/LLVMIR/LLVMTypes.h"
#define GET_OP_CLASSES
#include "polygeist/PolygeistOps.cpp.inc"
@ -279,11 +279,12 @@ public:
if (!src)
return failure();
rewriter.replaceOpWithNewOp<polygeist::Memref2PointerOp>(op, op.getType(), src.source());
rewriter.replaceOpWithNewOp<polygeist::Memref2PointerOp>(op, op.getType(),
src.source());
return success();
}
};
void Memref2PointerOp::getCanonicalizationPatterns(OwningRewritePatternList &results,
MLIRContext *context) {
void Memref2PointerOp::getCanonicalizationPatterns(
OwningRewritePatternList &results, MLIRContext *context) {
results.insert<MemRef2PointerCast>(context);
}

23
lib/polygeist/Passes/CanonicalizeFor.cpp
View File

@ -1428,12 +1428,13 @@ struct ReturnSq : public OpRewritePattern<ReturnOp> {
LogicalResult matchAndRewrite(ReturnOp op,
PatternRewriter &rewriter) const override {
bool changed = false;
SmallVector<Operation*> toErase;
for (auto iter = op->getBlock()->rbegin(); iter != op->getBlock()->rend() && &*iter != op; iter++) {
SmallVector<Operation *> toErase;
for (auto iter = op->getBlock()->rbegin();
iter != op->getBlock()->rend() && &*iter != op; iter++) {
changed = true;
toErase.push_back(&*iter);
}
for(auto op : toErase) {
for (auto op : toErase) {
rewriter.eraseOp(op);
}
return success(changed);
@ -1441,21 +1442,15 @@ struct ReturnSq : public OpRewritePattern<ReturnOp> {
};
void CanonicalizeFor::runOnFunction() {
mlir::RewritePatternSet rpl(getFunction().getContext());
rpl.add<
PropagateInLoopBody, DetectTrivialIndVarInArgs,
rpl.add<PropagateInLoopBody, DetectTrivialIndVarInArgs,
ForOpInductionReplacement, RemoveUnusedArgs, MoveWhileToFor,
MoveWhileDown,
MoveWhileDown2
MoveWhileDown, MoveWhileDown2
, MoveWhileDown3
,
MoveWhileInvariantIfResult, WhileLogicalNegation, SubToAdd
,
WhileCmpOffset, WhileLICM, RemoveUnusedCondVar,
ReturnSq,
MoveSideEffectFreeWhile
>(getFunction().getContext());
MoveWhileDown3, MoveWhileInvariantIfResult, WhileLogicalNegation,
SubToAdd, WhileCmpOffset, WhileLICM, RemoveUnusedCondVar, ReturnSq,
MoveSideEffectFreeWhile>(getFunction().getContext());
GreedyRewriteConfig config;
config.maxIterations = 47;
applyPatternsAndFoldGreedily(getFunction().getOperation(), std::move(rpl),

3
lib/polygeist/Passes/ParallelLower.cpp
View File

@ -250,7 +250,8 @@ void ParallelLower::runOnFunction() {
});
container.walk([&](mlir::memref::AllocaOp alop) {
if (auto ia = alop.getType().getMemorySpace().dyn_cast_or_null<IntegerAttr>())
if (auto ia =
alop.getType().getMemorySpace().dyn_cast_or_null<IntegerAttr>())
if (ia.getValue() == 5) {
mlir::OpBuilder bz(launchOp.getContext());
bz.setInsertionPointToStart(blockB);

5
lib/polygeist/Passes/TrivialUse.cpp
View File

@ -32,9 +32,6 @@ std::unique_ptr<OperationPass<FuncOp>> createRemoveTrivialUsePass() {
} // namespace polygeist
} // namespace mlir
void RemoveTrivialUse::runOnFunction() {
getFunction().walk([&](polygeist::TrivialUseOp bidx) {
bidx.erase();
});
getFunction().walk([&](polygeist::TrivialUseOp bidx) { bidx.erase(); });
}

272
mlir-clang/Lib/clang-mlir.cc
View File

@ -64,11 +64,12 @@ mlir::Value MLIRScanner::createAllocOp(mlir::Type t, VarDecl *name,
auto pshape = shape[0];
if (name)
if (auto var = dyn_cast<VariableArrayType>(name->getType()->getUnqualifiedDesugaredType())) {
if (auto var = dyn_cast<VariableArrayType>(
name->getType()->getUnqualifiedDesugaredType())) {
llvm::errs() << t << "\n";
assert(shape[0] == -1);
mr = mlir::MemRefType::get(shape, mt.getElementType(), mt.getAffineMaps(),
memspace);
mr = mlir::MemRefType::get(shape, mt.getElementType(),
mt.getAffineMaps(), memspace);
auto len = Visit(var->getSizeExpr()).getValue(builder);
len = builder.create<IndexCastOp>(loc, len, builder.getIndexType());
alloc = builder.create<mlir::memref::AllocaOp>(loc, mr, len);
@ -108,7 +109,8 @@ ValueWithOffsets MLIRScanner::VisitDeclStmt(clang::DeclStmt *decl) {
for (auto sub : decl->decls()) {
if (auto vd = dyn_cast<VarDecl>(sub)) {
VisitVarDecl(vd);
} else if (isa<TypeAliasDecl, RecordDecl, StaticAssertDecl, TypedefDecl>(sub)) {
} else if (isa<TypeAliasDecl, RecordDecl, StaticAssertDecl, TypedefDecl>(
sub)) {
} else {
llvm::errs() << " + visiting unknonwn sub decl stmt\n";
sub->dump();
@ -466,7 +468,7 @@ MLIRScanner::VisitCXXFunctionalCastExpr(clang::CXXFunctionalCastExpr *expr) {
builder.create<mlir::TruncateIOp>(loc, scalar, postTy),
/*isReference*/ false);
}
}
}
expr->dump();
assert(0 && "unhandled functional cast type");
}
@ -904,7 +906,8 @@ ValueWithOffsets MLIRScanner::VisitDoStmt(clang::DoStmt *fors) {
return nullptr;
}
ValueWithOffsets MLIRScanner::VisitOMPParallelForDirective(clang::OMPParallelForDirective* fors) {
ValueWithOffsets MLIRScanner::VisitOMPParallelForDirective(
clang::OMPParallelForDirective *fors) {
IfScope scope(*this);
fors->dump();
@ -912,25 +915,35 @@ ValueWithOffsets MLIRScanner::VisitOMPParallelForDirective(clang::OMPParallelFor
SmallVector<mlir::Value> inits;
for (auto f : fors->inits()) {
llvm::errs() << " init: "; f->dump(); llvm::errs() << "\n";
inits.push_back(builder.create<IndexCastOp>(loc, Visit(f).getValue(builder), builder.getIndexType()));
llvm::errs() << " init: ";
f->dump();
llvm::errs() << "\n";
inits.push_back(builder.create<IndexCastOp>(loc, Visit(f).getValue(builder),
builder.getIndexType()));
}
inits.clear();
inits.push_back(getConstantIndex(0));
SmallVector<mlir::Value> finals;
for (auto f : fors->finals()) {
llvm::errs() << " final: "; f->dump(); llvm::errs() << "\n";
finals.push_back(builder.create<IndexCastOp>(loc, Visit(f).getValue(builder), builder.getIndexType()));
llvm::errs() << " final: ";
f->dump();
llvm::errs() << "\n";
finals.push_back(builder.create<IndexCastOp>(
loc, Visit(f).getValue(builder), builder.getIndexType()));
}
finals.clear();
finals.push_back(builder.create<IndexCastOp>(loc, Visit(fors->getNumIterations()).getValue(builder), builder.getIndexType()));
finals.push_back(builder.create<IndexCastOp>(
loc, Visit(fors->getNumIterations()).getValue(builder),
builder.getIndexType()));
SmallVector<mlir::Value> counters;
mlir::Value incs[] = {getConstantIndex(1)};
for (auto m : fors->getInnermostCapturedStmt()->captures()) {
llvm::errs() << " cap: "; m.getCapturedVar()->dump(); llvm::errs() << "\n";
llvm::errs() << " cap: ";
m.getCapturedVar()->dump();
llvm::errs() << "\n";
/*
if (m->getCaptureKind() == LambdaCaptureKind::LCK_ByCopy)
CommonFieldLookup(expr->getCallOperator()->getThisObjectType(),
@ -947,28 +960,56 @@ ValueWithOffsets MLIRScanner::VisitOMPParallelForDirective(clang::OMPParallelFor
}
for (auto f : fors->counters()) {
llvm::errs() << " counter: "; f->dump(); llvm::errs() << "\n";
llvm::errs() << " counter: ";
f->dump();
llvm::errs() << "\n";
cast<DeclRefExpr>(f)->getDecl()->dump();
//counters.push_back(builder.create<IndexCastOp>(loc, Visit(f).getValue(builder), builder.getIndexType()));
// counters.push_back(builder.create<IndexCastOp>(loc,
// Visit(f).getValue(builder), builder.getIndexType()));
}
llvm::errs() << " assoc:"; fors->getAssociatedStmt()->dump(); llvm::errs() << "\n";
llvm::errs() << " sblock:"; fors->getStructuredBlock()->dump(); llvm::errs() << "\n";
llvm::errs() << " assoc:";
fors->getAssociatedStmt()->dump();
llvm::errs() << "\n";
llvm::errs() << " sblock:";
fors->getStructuredBlock()->dump();
llvm::errs() << "\n";
llvm::errs() << " preinit: "; fors->getPreInits()->dump(); llvm::errs() << "\n";
llvm::errs() << " init: "; fors->getInit()->dump(); llvm::errs() << "\n";
llvm::errs() << " lb: "; fors->getLowerBoundVariable()->dump(); llvm::errs() << "\n";
llvm::errs() << " ub: "; fors->getUpperBoundVariable()->dump(); llvm::errs() << "\n";
llvm::errs() << " precond: "; fors->getPreCond()->dump(); llvm::errs() << "\n";
llvm::errs() << " cond: "; fors->getCond()->dump(); llvm::errs() << "\n";
llvm::errs() << " inc: "; fors->getInc()->dump(); llvm::errs() << "\n";
llvm::errs() << " last: "; fors->getLastIteration()->dump(); llvm::errs() << "\n";
llvm::errs() << " stride: "; fors->getStrideVariable()->dump(); llvm::errs() << "\n";
llvm::errs() << " iters: "; fors->getNumIterations()->dump(); llvm::errs() << "\n";
llvm::errs() << " body: "; fors->getBody()->dump(); llvm::errs() << "\n";
llvm::errs() << " preinit: ";
fors->getPreInits()->dump();
llvm::errs() << "\n";
llvm::errs() << " init: ";
fors->getInit()->dump();
llvm::errs() << "\n";
llvm::errs() << " lb: ";
fors->getLowerBoundVariable()->dump();
llvm::errs() << "\n";
llvm::errs() << " ub: ";
fors->getUpperBoundVariable()->dump();
llvm::errs() << "\n";
llvm::errs() << " precond: ";
fors->getPreCond()->dump();
llvm::errs() << "\n";
llvm::errs() << " cond: ";
fors->getCond()->dump();
llvm::errs() << "\n";
llvm::errs() << " inc: ";
fors->getInc()->dump();
llvm::errs() << "\n";
llvm::errs() << " last: ";
fors->getLastIteration()->dump();
llvm::errs() << "\n";
llvm::errs() << " stride: ";
fors->getStrideVariable()->dump();
llvm::errs() << "\n";
llvm::errs() << " iters: ";
fors->getNumIterations()->dump();
llvm::errs() << "\n";
llvm::errs() << " body: ";
fors->getBody()->dump();
llvm::errs() << "\n";
auto affineOp = builder.create<scf::ParallelOp>(
loc, inits, finals, incs);
auto affineOp = builder.create<scf::ParallelOp>(loc, inits, finals, incs);
fors->getIterationVariable()->dump();
@ -985,8 +1026,10 @@ ValueWithOffsets MLIRScanner::VisitOMPParallelForDirective(clang::OMPParallelFor
builder.create<scf::YieldOp>(loc);
builder.setInsertionPointToStart(&er.region().back());
auto idx = builder.create<mlir::IndexCastOp>(loc, inds[0], getMLIRType(fors->getIterationVariable()->getType()));
VarDecl* name = cast<VarDecl>(cast<DeclRefExpr>(fors->counters()[0])->getDecl());
auto idx = builder.create<mlir::IndexCastOp>(
loc, inds[0], getMLIRType(fors->getIterationVariable()->getType()));
VarDecl *name =
cast<VarDecl>(cast<DeclRefExpr>(fors->counters()[0])->getDecl());
assert(params.find(name) == params.end());
params[name] = ValueWithOffsets(idx, false);
@ -1393,7 +1436,8 @@ MLIRScanner::VisitArraySubscriptExpr(clang::ArraySubscriptExpr *expr) {
// Check the RHS has been successfully emitted
assert(rhs);
auto idx = castToIndex(getMLIRLocation(expr->getRBracketLoc()), rhs);
if (isa<clang::VectorType>(expr->getLHS()->getType()->getUnqualifiedDesugaredType())) {
if (isa<clang::VectorType>(
expr->getLHS()->getType()->getUnqualifiedDesugaredType())) {
assert(moo.isReference);
moo.isReference = false;
auto mt = moo.val.getType().cast<MemRefType>();
@ -1657,14 +1701,12 @@ ValueWithOffsets MLIRScanner::VisitCallExpr(clang::CallExpr *expr) {
}
if (auto ic = dyn_cast<ImplicitCastExpr>(expr->getCallee()))
if (auto sr = dyn_cast<DeclRefExpr>(ic->getSubExpr())) {
if (sr->getDecl()->getIdentifier() &&
sr->getDecl()->getName() == "log") {
if (sr->getDecl()->getIdentifier() && sr->getDecl()->getName() == "log") {
std::vector<mlir::Value> args;
for (auto a : expr->arguments()) {
args.push_back(Visit(a).getValue(builder));
}
return ValueWithOffsets(
builder.create<mlir::math::LogOp>(loc, args[0]),
return ValueWithOffsets(builder.create<mlir::math::LogOp>(loc, args[0]),
/*isReference*/ false);
}
}
@ -1811,7 +1853,8 @@ ValueWithOffsets MLIRScanner::VisitCallExpr(clang::CallExpr *expr) {
}
auto val = sub.getValue(builder);
if (auto mt = val.getType().dyn_cast<MemRefType>()) {
val = builder.create<polygeist::Memref2PointerOp>(loc, LLVM::LLVMPointerType::get(mt.getElementType()), val);
val = builder.create<polygeist::Memref2PointerOp>(
loc, LLVM::LLVMPointerType::get(mt.getElementType()), val);
}
return val;
};
@ -1872,9 +1915,8 @@ ValueWithOffsets MLIRScanner::VisitCallExpr(clang::CallExpr *expr) {
sr->getDecl()->getName() == "cudaFreeHost") {
auto ty = getMLIRType(expr->getType());
auto op = builder.create<mlir::ConstantOp>(
loc, ty,
builder.getIntegerAttr(ty, /*cudaSuccess*/0));
return ValueWithOffsets(op, /*isReference*/false);
loc, ty, builder.getIntegerAttr(ty, /*cudaSuccess*/ 0));
return ValueWithOffsets(op, /*isReference*/ false);
}
return nullptr;
}
@ -1926,9 +1968,10 @@ ValueWithOffsets MLIRScanner::VisitCallExpr(clang::CallExpr *expr) {
auto mt = omt.getElementType().dyn_cast<MemRefType>();
auto shape = std::vector<int64_t>(mt.getShape());
auto elemSize = getTypeSize(
auto elemSize =
getTypeSize(cast<clang::PointerType>(
cast<clang::PointerType>(
cast<clang::PointerType>(BC->getSubExpr()
BC->getSubExpr()
->getType()
->getUnqualifiedDesugaredType())
->getPointeeType())
@ -1952,17 +1995,18 @@ ValueWithOffsets MLIRScanner::VisitCallExpr(clang::CallExpr *expr) {
.store(builder,
builder.create<mlir::memref::CastOp>(loc, alloc, mt));
return ValueWithOffsets(getConstantIndex(0), /*isReference*/ false);
} }
}
}
if (auto ic = dyn_cast<ImplicitCastExpr>(expr->getCallee()))
if (auto sr = dyn_cast<DeclRefExpr>(ic->getSubExpr()))
if (sr->getDecl()->getIdentifier() &&
(sr->getDecl()->getName() == "cudaMemcpy" || sr->getDecl()->getName() == "memcpy")) {
(sr->getDecl()->getName() == "cudaMemcpy" ||
sr->getDecl()->getName() == "memcpy")) {
if (auto BCdst = dyn_cast<clang::CastExpr>(expr->getArg(0))) {
auto elem =
cast<clang::PointerType>(BCdst->getSubExpr()
->getType()
->getUnqualifiedDesugaredType())
cast<clang::PointerType>(
BCdst->getSubExpr()->getType()->getUnqualifiedDesugaredType())
->getPointeeType();
if (auto BCsrc = dyn_cast<clang::CastExpr>(expr->getArg(1))) {
auto selem =
@ -1979,7 +2023,10 @@ ValueWithOffsets MLIRScanner::VisitCallExpr(clang::CallExpr *expr) {
Glob.getMLIRType(elem, &dstArray);
auto elemSize = getTypeSize(elem);
mlir::Value size = builder.create<mlir::IndexCastOp>(
loc, Visit(expr->getArg( sr->getDecl()->getName() == "cudaMemcpy" ? 2 : 1)).getValue(builder),
loc,
Visit(expr->getArg(
sr->getDecl()->getName() == "cudaMemcpy" ? 2 : 1))
.getValue(builder),
mlir::IndexType::get(builder.getContext()));
size = builder.create<mlir::UnsignedDivIOp>(
loc, size,
@ -1996,12 +2043,13 @@ ValueWithOffsets MLIRScanner::VisitCallExpr(clang::CallExpr *expr) {
std::vector<mlir::Value> args = {affineOp.getInductionVar()};
builder.setInsertionPointToStart(&affineOp.getLoopBody().front());
builder.setInsertionPointToStart(
&affineOp.getLoopBody().front());
if (dstArray) {
std::vector<mlir::Value> start = {getConstantIndex(0)};
auto mt =
Glob.getMLIRType(Glob.CGM.getContext().getPointerType(elem))
auto mt = Glob.getMLIRType(
Glob.CGM.getContext().getPointerType(elem))
.cast<MemRefType>();
auto shape = std::vector<int64_t>(mt.getShape());
std::vector<mlir::Value> sizes = {getConstantIndex(shape[1])};
@ -2009,27 +2057,38 @@ ValueWithOffsets MLIRScanner::VisitCallExpr(clang::CallExpr *expr) {
auto affineOp =
builder.create<AffineForOp>(loc, start, map, sizes, map);
args.push_back(affineOp.getInductionVar());
builder.setInsertionPointToStart(&affineOp.getLoopBody().front());
builder.setInsertionPointToStart(
&affineOp.getLoopBody().front());
}
builder.create<AffineStoreOp>(
loc, builder.create<AffineLoadOp>(loc, src, args), dst, args);
loc, builder.create<AffineLoadOp>(loc, src, args), dst,
args);
// TODO: set the value of the iteration value to the final bound at
// the end of the loop.
// TODO: set the value of the iteration value to the final bound
// at the end of the loop.
builder.setInsertionPoint(oldblock, oldpoint);
return ValueWithOffsets(getConstantIndex(0), /*isReference*/ false);
} } } }
return ValueWithOffsets(getConstantIndex(0),
/*isReference*/ false);
}
}
}
}
}
auto callee = EmitCallee(expr->getCallee());
std::set<std::string> funcs = {"strcmp", "sprintf", "fputs", "puts",
"memcpy", "cudaMalloc",
std::set<std::string> funcs = {"strcmp",
"sprintf",
"fputs",
"puts",
"memcpy",
"cudaMalloc",
"open",
"fopen",
"memset", "cudaMemset",
"memset",
"cudaMemset",
"strcpy",
"close",
"fclose",
@ -2090,7 +2149,6 @@ ValueWithOffsets MLIRScanner::VisitCallExpr(clang::CallExpr *expr) {
expr->isXValue());
}
if (auto ic = dyn_cast<ImplicitCastExpr>(expr->getCallee()))
if (auto sr = dyn_cast<DeclRefExpr>(ic->getSubExpr())) {
if (sr->getDecl()->getIdentifier() &&
@ -2466,7 +2524,8 @@ ValueWithOffsets MLIRScanner::VisitUnaryOperator(clang::UnaryOperator *U) {
val.dump();
}
auto ty = val.getType().cast<mlir::IntegerType>();
auto c1 = builder.create<mlir::ConstantOp>(loc, ty,
auto c1 = builder.create<mlir::ConstantOp>(
loc, ty,
builder.getIntegerAttr(ty, APInt::getAllOnesValue(ty.getWidth())));
return ValueWithOffsets(builder.create<mlir::XOrOp>(loc, val, c1),
/*isReference*/ false);
@ -2490,14 +2549,14 @@ ValueWithOffsets MLIRScanner::VisitUnaryOperator(clang::UnaryOperator *U) {
shape[0] = -1;
} else {
shape.insert(shape.begin(), -1);
}
auto mt0 = mlir::MemRefType::get(shape, mt.getElementType(),
mt.getAffineMaps(), mt.getMemorySpace());
if (!isArray)
res = builder.create<memref::CastOp>(loc, sub.val, mt0);
else
res = builder.create<polygeist::SubIndexOp>(loc, mt0, sub.val, getConstantIndex(-1));
res = builder.create<polygeist::SubIndexOp>(loc, mt0, sub.val,
getConstantIndex(-1));
return ValueWithOffsets(res,
/*isReference*/ false);
}
@ -3138,8 +3197,8 @@ ValueWithOffsets MLIRScanner::VisitBinaryOperator(clang::BinaryOperator *BO) {
if (auto postTy = prev.getType().dyn_cast<mlir::FloatType>()) {
mlir::Value rhsV = rhs.getValue(builder);
auto prevTy = rhsV.getType().cast<mlir::FloatType>();
if (prevTy == postTy) {}
else if (prevTy.getWidth() < postTy.getWidth()) {
if (prevTy == postTy) {
} else if (prevTy.getWidth() < postTy.getWidth()) {
rhsV = builder.create<mlir::FPExtOp>(loc, rhsV, postTy);
} else {
rhsV = builder.create<mlir::FPTruncOp>(loc, rhsV, postTy);
@ -3299,7 +3358,9 @@ ValueWithOffsets MLIRScanner::CommonFieldLookup(clang::QualType CT,
size_t fnum = 0;
auto CXRD = dyn_cast<CXXRecordDecl>(rd);
if ((CXRD && (!CXRD->hasDefinition() || CXRD->isPolymorphic() || CXRD->getNumBases() > 0)) || rd->isUnion()) {
if ((CXRD && (!CXRD->hasDefinition() || CXRD->isPolymorphic() ||
CXRD->getNumBases() > 0)) ||
rd->isUnion()) {
auto &layout = Glob.CGM.getTypes().getCGRecordLayout(rd);
fnum = layout.getLLVMFieldNo(FD);
} else {
@ -3503,7 +3564,8 @@ ValueWithOffsets MLIRScanner::VisitMemberExpr(MemberExpr *ME) {
ME->dump();
}
base = base.dereference(builder);
OT = cast<clang::PointerType>(OT->getUnqualifiedDesugaredType())->getPointeeType();
OT = cast<clang::PointerType>(OT->getUnqualifiedDesugaredType())
->getPointeeType();
}
if (!base.isReference) {
EmittingFunctionDecl->dump();
@ -3746,8 +3808,10 @@ ValueWithOffsets MLIRScanner::VisitCastExpr(CastExpr *E) {
builder.create<mlir::LLVM::PtrToIntOp>(loc, postTy, scalar),
/*isReference*/ false);
}
if (scalar.getType().isa<mlir::IndexType>() || postTy.isa<mlir::IndexType>()) {
return ValueWithOffsets(builder.create<IndexCastOp>(loc, scalar, postTy), false);
if (scalar.getType().isa<mlir::IndexType>() ||
postTy.isa<mlir::IndexType>()) {
return ValueWithOffsets(builder.create<IndexCastOp>(loc, scalar, postTy),
false);
}
if (!scalar.getType().isa<mlir::IntegerType>()) {
E->dump();
@ -3845,7 +3909,8 @@ ValueWithOffsets MLIRScanner::VisitCastExpr(CastExpr *E) {
case clang::CastKind::CK_PointerToBoolean: {
auto scalar = Visit(E->getSubExpr()).getValue(builder);
if (auto mt = scalar.getType().dyn_cast<mlir::MemRefType>()) {
scalar = builder.create<polygeist::Memref2PointerOp>(loc, LLVM::LLVMPointerType::get(mt.getElementType()), scalar);
scalar = builder.create<polygeist::Memref2PointerOp>(
loc, LLVM::LLVMPointerType::get(mt.getElementType()), scalar);
}
if (auto LT = scalar.getType().dyn_cast<mlir::LLVM::LLVMPointerType>()) {
auto nullptr_llvm = builder.create<mlir::LLVM::NullOp>(loc, LT);
@ -3864,7 +3929,8 @@ ValueWithOffsets MLIRScanner::VisitCastExpr(CastExpr *E) {
case clang::CastKind::CK_PointerToIntegral: {
auto scalar = Visit(E->getSubExpr()).getValue(builder);
if (auto mt = scalar.getType().dyn_cast<mlir::MemRefType>()) {
scalar = builder.create<polygeist::Memref2PointerOp>(loc, LLVM::LLVMPointerType::get(mt.getElementType()), scalar);
scalar = builder.create<polygeist::Memref2PointerOp>(
loc, LLVM::LLVMPointerType::get(mt.getElementType()), scalar);
}
if (auto LT = scalar.getType().dyn_cast<mlir::LLVM::LLVMPointerType>()) {
auto mlirType = getMLIRType(E->getType());
@ -3956,18 +4022,21 @@ ValueWithOffsets MLIRScanner::VisitSwitchStmt(clang::SwitchStmt *stmt) {
builder.setInsertionPointToStart(&exitB);
builder.create<scf::YieldOp>(loc);
SmallVector<Block*> blocks;
SmallVector<Block *> blocks;
bool inCase = false;
for(auto cse : stmt->getBody()->children()) {
for (auto cse : stmt->getBody()->children()) {
if (auto cses = dyn_cast<CaseStmt>(cse)) {
auto &condB = *(new Block());
caseVals.push_back((int32_t)Visit(cses->getLHS()).getValue(builder).getDefiningOp<ConstantIntOp>().getValue());
caseVals.push_back((int32_t)Visit(cses->getLHS())
.getValue(builder)
.getDefiningOp<ConstantIntOp>()
.getValue());
if (inCase) {
auto noBreak = builder.create<mlir::memref::LoadOp>(loc, loops.back().noBreak);
auto noBreak =
builder.create<mlir::memref::LoadOp>(loc, loops.back().noBreak);
builder.create<mlir::CondBranchOp>(loc, noBreak, &condB, &exitB);
loops.pop_back();
}
@ -3984,14 +4053,16 @@ ValueWithOffsets MLIRScanner::VisitSwitchStmt(clang::SwitchStmt *stmt) {
(LoopContext){builder.create<mlir::memref::AllocaOp>(loc, type),
builder.create<mlir::memref::AllocaOp>(loc, type)});
builder.create<mlir::memref::StoreOp>(loc, truev, loops.back().noBreak);
builder.create<mlir::memref::StoreOp>(loc, truev, loops.back().keepRunning);
builder.create<mlir::memref::StoreOp>(loc, truev,
loops.back().keepRunning);
Visit(cses->getSubStmt());
} else {
Visit(cse);
}
}
if (inCase) loops.pop_back();
if (inCase)
loops.pop_back();
builder.create<mlir::BranchOp>(loc, &exitB);
er.region().getBlocks().push_back(&exitB);
@ -4002,7 +4073,9 @@ ValueWithOffsets MLIRScanner::VisitSwitchStmt(clang::SwitchStmt *stmt) {
caseValuesAttr = DenseIntElementsAttr::get(caseValueType, caseVals);
builder.setInsertionPointToStart(&er.region().front());
builder.create<mlir::SwitchOp>(loc, cond, &exitB, ArrayRef<mlir::Value>(), caseValuesAttr, blocks, SmallVector<mlir::ValueRange>(caseVals.size(), ArrayRef<mlir::Value>()));
builder.create<mlir::SwitchOp>(
loc, cond, &exitB, ArrayRef<mlir::Value>(), caseValuesAttr, blocks,
SmallVector<mlir::ValueRange>(caseVals.size(), ArrayRef<mlir::Value>()));
builder.setInsertionPoint(oldblock2, oldpoint2);
return nullptr;
}
@ -4040,7 +4113,8 @@ MLIRScanner::VisitConditionalOperator(clang::ConditionalOperator *E) {
if (isReference) {
assert(trueExpr.isReference);
truev = trueExpr.val;
} else truev = trueExpr.getValue(builder);
} else
truev = trueExpr.getValue(builder);
assert(truev != nullptr);
truearray.push_back(truev);
}
@ -4055,7 +4129,8 @@ MLIRScanner::VisitConditionalOperator(clang::ConditionalOperator *E) {
if (isReference) {
assert(falseExpr.isReference);
falsev = falseExpr.val;
} else falsev = falseExpr.getValue(builder);
} else
falsev = falseExpr.getValue(builder);
assert(falsev != nullptr);
falsearray.push_back(falsev);
}
@ -4149,7 +4224,8 @@ ValueWithOffsets MLIRScanner::VisitReturnStmt(clang::ReturnStmt *stmt) {
assert(rv.isReference);
builder.create<mlir::memref::StoreOp>(loc, rv.val, returnVal);
} else {
builder.create<mlir::memref::StoreOp>(loc, rv.getValue(builder), returnVal);
builder.create<mlir::memref::StoreOp>(loc, rv.getValue(builder),
returnVal);
}
}
}
@ -4443,7 +4519,8 @@ mlir::FuncOp MLIRASTConsumer::GetOrCreateMLIRFunction(const FunctionDecl *FD) {
functions[name] = function;
module.push_back(function);
const FunctionDecl *Def = nullptr;
if (FD->isDefined(Def, /*checkforfriend*/ true) && Def->getTemplatedKind() != FunctionDecl::TK_FunctionTemplate)
if (FD->isDefined(Def, /*checkforfriend*/ true) &&
Def->getTemplatedKind() != FunctionDecl::TK_FunctionTemplate)
functionsToEmit.push_back(Def);
else if (FD->getIdentifier())
emitIfFound.insert(FD->getName().str());
@ -4461,7 +4538,7 @@ void MLIRASTConsumer::run() {
while (functionsToEmit.size()) {
const FunctionDecl *FD = functionsToEmit.front();
functionsToEmit.pop_front();
assert (FD->getTemplatedKind() != FunctionDecl::TK_FunctionTemplate);
assert(FD->getTemplatedKind() != FunctionDecl::TK_FunctionTemplate);
std::string name;
if (auto CC = dyn_cast<CXXConstructorDecl>(FD))
@ -4491,7 +4568,9 @@ void MLIRASTConsumer::HandleDeclContext(DeclContext *DC) {
continue;
if (fd->getIdentifier() == nullptr)
continue;
if ((emitIfFound.count("*") && fd->getName() != "fpclassify" && !fd->isStatic())|| emitIfFound.count(fd->getName().str())) {
if ((emitIfFound.count("*") && fd->getName() != "fpclassify" &&
!fd->isStatic()) ||
emitIfFound.count(fd->getName().str())) {
if (fd->getTemplatedKind() != FunctionDecl::TK_FunctionTemplate)
functionsToEmit.push_back(fd);
} else {
@ -4517,7 +4596,9 @@ bool MLIRASTConsumer::HandleTopLevelDecl(DeclGroupRef dg) {
continue;
if (fd->getIdentifier() == nullptr)
continue;
if ((emitIfFound.count("*") && fd->getName() != "fpclassify" && !fd->isStatic())|| emitIfFound.count(fd->getName().str())) {
if ((emitIfFound.count("*") && fd->getName() != "fpclassify" &&
!fd->isStatic()) ||
emitIfFound.count(fd->getName().str())) {
if (fd->getTemplatedKind() != FunctionDecl::TK_FunctionTemplate)
functionsToEmit.push_back(fd);
} else {
@ -4603,7 +4684,9 @@ mlir::Type MLIRASTConsumer::getMLIRType(clang::QualType qt, bool *implicitRef,
}
auto CXRD = dyn_cast<CXXRecordDecl>(RT->getDecl());
if (RT->getDecl()->isUnion() || (CXRD && (!CXRD->hasDefinition() || CXRD->isPolymorphic() || CXRD->getDefinition()->getNumBases() > 0)) ||
if (RT->getDecl()->isUnion() ||
(CXRD && (!CXRD->hasDefinition() || CXRD->isPolymorphic() ||
CXRD->getDefinition()->getNumBases() > 0)) ||
ST->getNumElements() == 0 || recursive ||
(!ST->isLiteral() && (ST->getName().contains("SmallVector") ||
ST->getName() == "struct._IO_FILE" ||
@ -4657,9 +4740,9 @@ mlir::Type MLIRASTConsumer::getMLIRType(clang::QualType qt, bool *implicitRef,
return builder.getNoneType();
}
//if (auto AT = dyn_cast<clang::VariableArrayType>(t)) {
// if (auto AT = dyn_cast<clang::VariableArrayType>(t)) {
// return getMLIRType(AT->getElementType(), implicitRef, allowMerge);
//}
// }
if (auto AT = dyn_cast<clang::ArrayType>(t)) {
bool subRef = false;
@ -4939,10 +5022,10 @@ public:
}
std::unique_ptr<clang::ASTConsumer>
CreateASTConsumer(CompilerInstance &CI, StringRef InFile) override {
return std::unique_ptr<clang::ASTConsumer>(
new MLIRASTConsumer(emitIfFound, done, llvmStringGlobals, globals,
functions, llvmGlobals, llvmFunctions, CI.getPreprocessor(),
CI.getASTContext(), module, CI.getSourceManager()));
return std::unique_ptr<clang::ASTConsumer>(new MLIRASTConsumer(
emitIfFound, done, llvmStringGlobals, globals, functions, llvmGlobals,
llvmFunctions, CI.getPreprocessor(), CI.getASTContext(), module,
CI.getSourceManager()));
}
};
@ -5162,4 +5245,3 @@ static bool parseMLIR(const char *Argv0, std::vector<std::string> filenames,
}
return true;
}

29
mlir-clang/Lib/clang-mlir.h
View File

@ -223,9 +223,11 @@ struct ValueWithOffsets {
if (auto PT = val.getType().dyn_cast<mlir::LLVM::LLVMPointerType>()) {
if (toStore.getType() != PT.getElementType()) {
if (auto mt = toStore.getType().dyn_cast<MemRefType>()) {
if (auto spt = PT.getElementType().dyn_cast<mlir::LLVM::LLVMPointerType>()) {
if (auto spt =
PT.getElementType().dyn_cast<mlir::LLVM::LLVMPointerType>()) {
if (mt.getElementType() == spt.getElementType()) {
toStore = builder.create<polygeist::Memref2PointerOp>(loc, spt, toStore);
toStore = builder.create<polygeist::Memref2PointerOp>(loc, spt,
toStore);
}
}
}
@ -424,9 +426,10 @@ struct MLIRASTConsumer : public ASTConsumer {
clang::SourceManager &SM)
: emitIfFound(emitIfFound), done(done),
llvmStringGlobals(llvmStringGlobals), globals(globals),
functions(functions), llvmGlobals(llvmGlobals), llvmFunctions(llvmFunctions), PP(PP),
astContext(astContext), module(module), SM(SM), lcontext(),
llvmMod("tmp", lcontext), codegenops(),
functions(functions), llvmGlobals(llvmGlobals),
llvmFunctions(llvmFunctions), PP(PP), astContext(astContext),
module(module), SM(SM), lcontext(), llvmMod("tmp", lcontext),
codegenops(),
CGM(astContext, PP.getHeaderSearchInfo().getHeaderSearchOpts(),
PP.getPreprocessorOpts(), codegenops, llvmMod, PP.getDiagnostics()),
error(false), typeTranslator(*module.getContext()),
@ -666,16 +669,17 @@ public:
builder.create<mlir::memref::StoreOp>(loc, truev, loops.back().noBreak);
builder.create<mlir::memref::StoreOp>(loc, truev, loops.back().keepRunning);
if (function.getType().getResults().size()) {
auto type = mlir::MemRefType::get({}, function.getType().getResult(0), {}, 0);
auto type =
mlir::MemRefType::get({}, function.getType().getResult(0), {}, 0);
returnVal = builder.create<mlir::memref::AllocaOp>(loc, type);
}
Visit(stmt);
if (function.getType().getResults().size()) {
mlir::Value vals[1] = {builder.create<mlir::memref::LoadOp>(loc, returnVal)};
builder.create<mlir::ReturnOp>(loc,vals);
}
else
mlir::Value vals[1] = {
builder.create<mlir::memref::LoadOp>(loc, returnVal)};
builder.create<mlir::ReturnOp>(loc, vals);
} else
builder.create<mlir::ReturnOp>(loc);
// function.dump();
}
@ -701,7 +705,8 @@ public:
ValueWithOffsets VisitVarDecl(clang::VarDecl *decl);
ValueWithOffsets VisitForStmt(clang::ForStmt *fors);
ValueWithOffsets VisitOMPParallelForDirective(clang::OMPParallelForDirective *fors);
ValueWithOffsets
VisitOMPParallelForDirective(clang::OMPParallelForDirective *fors);
ValueWithOffsets VisitWhileStmt(clang::WhileStmt *fors);
ValueWithOffsets VisitDoStmt(clang::DoStmt *fors);
@ -713,7 +718,7 @@ public:
ValueWithOffsets VisitCXXConstructExpr(clang::CXXConstructExpr *expr);
ValueWithOffsets VisitConstructCommon(clang::CXXConstructExpr *expr,
VarDecl *name, unsigned space,
mlir::Value mem=nullptr);
mlir::Value mem = nullptr);
ValueWithOffsets VisitMSPropertyRefExpr(MSPropertyRefExpr *expr);

12
mlir-clang/mlir-clang.cc
View File

@ -1,17 +1,17 @@
#include "mlir/Conversion/AffineToStandard/AffineToStandard.h"
#include "mlir/Conversion/SCFToOpenMP/SCFToOpenMP.h"
#include "mlir/Conversion/OpenMPToLLVM/ConvertOpenMPToLLVM.h"
#include "mlir/Conversion/LLVMCommon/LoweringOptions.h"
#include "mlir/Conversion/OpenMPToLLVM/ConvertOpenMPToLLVM.h"
#include "mlir/Conversion/SCFToOpenMP/SCFToOpenMP.h"
#include "mlir/Dialect/Affine/Passes.h"
#include "mlir/Dialect/GPU/GPUDialect.h"
#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
#include "mlir/Dialect/SCF/Passes.h"
#include "mlir/Dialect/SCF/SCF.h"
#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
#include "mlir/IR/BuiltinTypes.h"
#include "mlir/IR/MLIRContext.h"
#include "mlir/IR/Verifier.h"
#include "mlir/Target/LLVMIR/Export.h"
#include "mlir/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.h"
#include "mlir/Target/LLVMIR/Export.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/InitLLVM.h"
#include <fstream>
@ -209,7 +209,6 @@ int main(int argc, char **argv) {
optPM.addPass(mlir::createCanonicalizerPass());
pm.addPass(mlir::createSymbolDCEPass());
if (CudaLower) {
optPM.addPass(polygeist::createParallelLowerPass());
optPM.addPass(polygeist::replaceAffineCFGPass());
@ -231,10 +230,8 @@ int main(int argc, char **argv) {
}
if (ToCPU)
optPM.addPass(polygeist::createCPUifyPass());
}
if (EmitLLVM) {
pm.addPass(mlir::createLowerAffinePass());
if (mlir::failed(pm.run(module))) {
@ -267,7 +264,6 @@ int main(int argc, char **argv) {
module.dump();
return 4;
}
}
// module.dump();
if (mlir::failed(mlir::verify(module))) {