Skip to content

Cleanup #1306 #1324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Jan 28, 2025
Merged

Cleanup #1306 #1324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 7 additions & 16 deletions lib/Dialect/LWE/Conversions/LWEToOpenfhe/LWEToOpenfhe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,23 +92,14 @@ struct AddCryptoContextArg : public OpConversionPattern<func::FuncOp> {
}

auto cryptoContextType = openfhe::CryptoContextType::get(getContext());
FunctionType originalType = op.getFunctionType();
llvm::SmallVector<Type, 4> newTypes;
newTypes.reserve(originalType.getNumInputs() + 1);
newTypes.push_back(cryptoContextType);
for (auto t : originalType.getInputs()) {
newTypes.push_back(t);
}
auto newFuncType =
FunctionType::get(getContext(), newTypes, originalType.getResults());
rewriter.modifyOpInPlace(op, [&] {
op.setType(newFuncType);

// guard against private FuncOp (i.e. declaration)
if (op.getVisibility() != SymbolTable::Visibility::Private) {
Block &block = op.getBody().getBlocks().front();
block.insertArgument(&block.getArguments().front(), cryptoContextType,
op.getLoc());
if (op.isDeclaration()) {
auto newFuncType = op.getTypeWithArgsAndResults(
ArrayRef<unsigned int>{0}, ArrayRef<Type>{cryptoContextType}, {},
{});
op.setType(newFuncType);
} else {
op.insertArgument(0, cryptoContextType, nullptr, op.getLoc());
}
});

Expand Down
6 changes: 3 additions & 3 deletions lib/Target/OpenFhePke/OpenFhePkeEmitter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ LogicalResult OpenFhePkeEmitter::printOperation(func::FuncOp funcOp) {
}
}

if (funcOp.getVisibility() == SymbolTable::Visibility::Private) {
if (funcOp.isDeclaration()) {
// function declaration
os << commaSeparatedTypes(funcOp.getArgumentTypes(), [&](Type type) {
return convertType(type, funcOp->getLoc()).value();
Expand All @@ -186,7 +186,7 @@ LogicalResult OpenFhePkeEmitter::printOperation(func::FuncOp funcOp) {
os << ")";

// function declaration
if (funcOp.getVisibility() == SymbolTable::Visibility::Private) {
if (funcOp.isDeclaration()) {
os << ";\n";
return success();
}
Expand All @@ -213,7 +213,7 @@ LogicalResult OpenFhePkeEmitter::printOperation(func::CallOp op) {
}

if (op.getNumResults() != 0) {
os << variableNames->getNameForValue(op.getResult(0)) << " = ";
emitAutoAssignPrefix(op.getResult(0));
}

os << canonicalizeDebugPort(op.getCallee()) << "(";
Expand Down
Loading