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-12-06 12:11:25 -05:00 committed by William Moses
parent b9fc07c22d
commit 4d825a0a7f
3 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mlir-clang/Lib/ValueCategory.cc
View File

@ -170,8 +170,11 @@ void ValueCategory::store(mlir::OpBuilder &builder, ValueCategory toStore,
if (auto at = pt.getElementType().dyn_cast<LLVM::LLVMArrayType>()) {
elty = at.getElementType();
if (smt.getShape().back() != at.getNumElements()) {
llvm::errs() << " pt: " << pt << " smt: " << smt << "\n";
llvm::errs() << " val: " << val << " val.isRef: " << isReference << " ts: " << toStore.val << " ts.isRef: " << toStore.isReference << " isArray: " << isArray << "\n";
llvm::errs() << " pt: " << pt << " smt: " << smt << "\n";
llvm::errs() << " val: " << val << " val.isRef: " << isReference
<< " ts: " << toStore.val
<< " ts.isRef: " << toStore.isReference
<< " isArray: " << isArray << "\n";
}
assert(smt.getShape().back() == at.getNumElements());
} else {
@ -180,9 +183,14 @@ void ValueCategory::store(mlir::OpBuilder &builder, ValueCategory toStore,
assert(smt.getShape().back() == (ssize_t)st.getBody().size());
}
if (elty != smt.getElementType()) {
llvm::errs() << " pt: " << pt << " smt: " << smt << "\n";
llvm::errs() << " elty: " << elty << " smt.getElementType(): " << smt.getElementType() << "\n";
llvm::errs() << " val: " << val << " val.isRef: " << isReference << " ts: " << toStore.val << " ts.isRef: " << toStore.isReference << " isArray: " << isArray << "\n";
llvm::errs() << " pt: " << pt << " smt: " << smt << "\n";
llvm::errs() << " elty: " << elty
<< " smt.getElementType(): " << smt.getElementType()
<< "\n";
llvm::errs() << " val: " << val << " val.isRef: " << isReference
<< " ts: " << toStore.val
<< " ts.isRef: " << toStore.isReference
<< " isArray: " << isArray << "\n";
}
assert(elty == smt.getElementType());
elty = LLVM::LLVMPointerType::get(elty, pt.getAddressSpace());

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

@ -253,10 +253,11 @@ MLIRScanner::MLIRScanner(MLIRASTConsumer &Glob, mlir::FuncOp function,
continue;
}
if (auto cons = dyn_cast<CXXConstructExpr>(expr->getInit())) {
VisitConstructCommon(cons, /*name*/nullptr, /*space*/0,
CommonFieldLookup(CC->getThisObjectType(), field,
ThisVal.val, /*isLValue*/ false).val);
continue;
VisitConstructCommon(cons, /*name*/ nullptr, /*space*/ 0,
CommonFieldLookup(CC->getThisObjectType(), field,
ThisVal.val, /*isLValue*/ false)
.val);
continue;
}
auto initexpr = Visit(expr->getInit());
if (!initexpr.val) {
@ -748,8 +749,9 @@ ValueCategory MLIRScanner::VisitArrayInitLoop(clang::ArrayInitLoopExpr *expr,
arrayinit.push_back(affineOp.getInductionVar());
auto alu = CommonArrayLookup(CommonArrayToPointer(tostore),
affineOp.getInductionVar(), /*isImplicitRef*/false);
auto alu =
CommonArrayLookup(CommonArrayToPointer(tostore),
affineOp.getInductionVar(), /*isImplicitRef*/ false);
if (auto AILE = dyn_cast<ArrayInitLoopExpr>(expr->getSubExpr())) {
VisitArrayInitLoop(AILE, alu);
@ -1290,7 +1292,8 @@ ValueCategory MLIRScanner::CommonArrayToPointer(ValueCategory scalar) {
}
ValueCategory MLIRScanner::CommonArrayLookup(ValueCategory array,
mlir::Value idx, bool isImplicitRefResult) {
mlir::Value idx,
bool isImplicitRefResult) {
mlir::Value val = array.getValue(builder);
assert(val);
@ -1328,7 +1331,7 @@ ValueCategory MLIRScanner::CommonArrayLookup(ValueCategory array,
auto mt = dref.val.getType().cast<MemRefType>();
auto shape = std::vector<int64_t>(mt.getShape());
if (shape.size() > 1) {
// if (shape.size() > 2 || (shape.size() > 1 && !isImplicitRefResult)) {
// if (shape.size() > 2 || (shape.size() > 1 && !isImplicitRefResult)) {
shape.erase(shape.begin());
} else {
shape[0] = -1;
@ -2433,16 +2436,17 @@ ValueCategory MLIRScanner::VisitCallExpr(clang::CallExpr *expr) {
builder.setInsertionPoint(oldblock, oldpoint);
auto retTy = getMLIRType(expr->getType());
if (sr->getDecl()->getName() == "__builtin_memcpy" || retTy.isa<LLVM::LLVMPointerType>()) {
if (sr->getDecl()->getName() == "__builtin_memcpy" ||
retTy.isa<LLVM::LLVMPointerType>()) {
if (dst.getType().isa<MemRefType>())
dst = builder.create<polygeist::Memref2PointerOp>(loc, retTy, dst);
dst = builder.create<polygeist::Memref2PointerOp>(loc, retTy,
dst);
assert(dst.getType() == retTy);
return ValueCategory(dst, /*isReference*/ false);
}
else {
} else {
if (!retTy.isa<mlir::IntegerType>()) {
expr->dump();
llvm::errs() << " retTy: " << retTy << "\n";
expr->dump();
llvm::errs() << " retTy: " << retTy << "\n";
}
return ValueCategory(builder.create<ConstantIntOp>(loc, 0, retTy),
/*isReference*/ false);
@ -4552,7 +4556,7 @@ ValueCategory MLIRScanner::VisitCastExpr(CastExpr *E) {
signedType = true;
}
auto Zero = builder.create<ConstantFloatOp>(
loc, APFloat::getZero(prevTy.getFloatSemantics()), prevTy);
loc, APFloat::getZero(prevTy.getFloatSemantics()), prevTy);
res = builder.create<arith::CmpFOp>(loc, CmpFPredicate::UNE, res, Zero);
if (1 < postTy.getWidth()) {
if (signedType) {
@ -5469,10 +5473,12 @@ mlir::Type MLIRASTConsumer::getMLIRType(clang::QualType qt, bool *implicitRef,
RT->dump();
llvm::errs() << "ST: " << *ST << "\n";
llvm::errs() << "fields\n";
for (auto f : RT->getDecl()->fields()) {
llvm::errs() << " +++ "; f->getType()->dump();
llvm::errs() << " @@@ " << *CGM.getTypes().ConvertType(f->getType()) << "\n";
}
for (auto f : RT->getDecl()->fields()) {
llvm::errs() << " +++ ";
f->getType()->dump();
llvm::errs() << " @@@ " << *CGM.getTypes().ConvertType(f->getType())
<< "\n";
}
llvm::errs() << "types\n";
for (auto t : types)
llvm::errs() << " --- " << t << "\n";

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

@ -226,7 +226,7 @@ public:
ValueCategory VisitConstantExpr(clang::ConstantExpr *expr);
ValueCategory VisitTypeTraitExpr(clang::TypeTraitExpr *expr);
ValueCategory VisitIntegerLiteral(clang::IntegerLiteral *expr);
ValueCategory VisitCharacterLiteral(clang::CharacterLiteral *expr);
@ -345,7 +345,8 @@ public:
ValueCategory CommonFieldLookup(clang::QualType OT, const FieldDecl *FD,
mlir::Value val, bool isLValue);
ValueCategory CommonArrayLookup(ValueCategory val, mlir::Value idx, bool isImplicitRefResult);
ValueCategory CommonArrayLookup(ValueCategory val, mlir::Value idx,
bool isImplicitRefResult);
ValueCategory CommonArrayToPointer(ValueCategory val);
};