Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions clang/lib/CIR/CodeGen/CIRGenDeclOpenACC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,21 @@ struct OpenACCDeclareCleanup final : EHScopeStack::Cleanup {

template <typename OutTy, typename InTy>
void createOutOp(CIRGenFunction &cgf, InTy inOp) {
auto outOp =
OutTy::create(cgf.getBuilder(), inOp.getLoc(), inOp, inOp.getVarPtr(),
inOp.getStructured(), inOp.getImplicit(),
llvm::Twine(inOp.getNameAttr()), inOp.getBounds());
outOp.setDataClause(inOp.getDataClause());
outOp.setModifiers(inOp.getModifiers());
if constexpr (std::is_same_v<OutTy, mlir::acc::DeleteOp>) {
auto outOp =
OutTy::create(cgf.getBuilder(), inOp.getLoc(), inOp,
inOp.getStructured(), inOp.getImplicit(),
llvm::Twine(inOp.getNameAttr()), inOp.getBounds());
outOp.setDataClause(inOp.getDataClause());
outOp.setModifiers(inOp.getModifiers());
} else {
auto outOp =
OutTy::create(cgf.getBuilder(), inOp.getLoc(), inOp, inOp.getVarPtr(),
inOp.getStructured(), inOp.getImplicit(),
llvm::Twine(inOp.getNameAttr()), inOp.getBounds());
outOp.setDataClause(inOp.getDataClause());
outOp.setModifiers(inOp.getModifiers());
}
}

void emit(CIRGenFunction &cgf) override {
Expand All @@ -52,6 +61,9 @@ struct OpenACCDeclareCleanup final : EHScopeStack::Cleanup {
case mlir::acc::DataClause::acc_copy:
createOutOp<mlir::acc::CopyoutOp>(cgf, copyin);
break;
case mlir::acc::DataClause::acc_copyin:
createOutOp<mlir::acc::DeleteOp>(cgf, copyin);
break;
}
} else if (val.getDefiningOp<mlir::acc::DeclareLinkOp>()) {
// Link has no exit clauses, and shouldn't be copied.
Expand Down
10 changes: 7 additions & 3 deletions clang/lib/CIR/CodeGen/CIRGenOpenACCClause.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -826,12 +826,16 @@ class OpenACCClauseCIREmitter final
addDataOperand<mlir::acc::CopyinOp>(
var, mlir::acc::DataClause::acc_copyin, clause.getModifierList(),
/*structured=*/false, /*implicit=*/false);
} else if constexpr (isOneOfTypes<OpTy, mlir::acc::DeclareEnterOp>) {
for (const Expr *var : clause.getVarList())
addDataOperand<mlir::acc::CopyinOp>(
var, mlir::acc::DataClause::acc_copyin, clause.getModifierList(),
/*structured=*/true,
/*implicit=*/false);
} else if constexpr (isCombinedType<OpTy>) {
applyToComputeOp(clause);
} else {
// TODO: When we've implemented this for everything, switch this to an
// unreachable. declare construct remains.
return clauseNotImplemented(clause);
llvm_unreachable("Unknown construct kind in VisitCopyInClause");
}
}

Expand Down
Loading
Loading