github/concrete
1
1
Fork 0
mirror of https://github.com/zama-ai/concrete.git synced 2026-02-08 11:35:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor(compiler): Use FoldAdaptor for FHE and FHELinalg folders

Browse Source 
As per
https://discourse.llvm.org/t/psa-new-improved-fold-method-signature-has-landed-please-update-your-downstream-projects/67618,
attribute-based folders are now deprecated and their use generates a
warning during compilation.

This patch replaces the raw attribute-based folders with folders using
`FoldAdaptor`.
This commit is contained in:
Andi Drebes
2023-03-07 16:03:00 +01:00
committed by Quentin Bourgerie
parent d975421c50
commit 3b00274a02
4 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
compilers/concrete-compiler/compiler/include/concretelang/Dialect/FHE/IR/FHEDialect.td
View File

@@ -19,7 +19,6 @@ def FHE_Dialect : Dialect {
}];
let cppNamespace = "::mlir::concretelang::FHE";
let useDefaultTypePrinterParser = 1;
let useFoldAPI = kEmitRawAttributesFolder;
}
#endif

1
compilers/concrete-compiler/compiler/include/concretelang/Dialect/FHELinalg/IR/FHELinalgDialect.td
View File

@@ -10,7 +10,6 @@ def FHELinalg_Dialect : Dialect {
A dialect for representation of high level linalg operations on fully homomorphic ciphertexts.
}];
let cppNamespace = "::mlir::concretelang::FHELinalg";
let useFoldAPI = kEmitRawAttributesFolder;
}
#endif

15
compilers/concrete-compiler/compiler/lib/Dialect/FHE/IR/FHEOps.cpp
View File

@@ -300,9 +300,8 @@ mlir::LogicalResult RoundEintOp::verify() {
}
/// Avoid addition with constant 0
OpFoldResult AddEintIntOp::fold(ArrayRef<Attribute> operands) {
assert(operands.size() == 2);
auto toAdd = operands[1].dyn_cast_or_null<mlir::IntegerAttr>();
OpFoldResult AddEintIntOp::fold(FoldAdaptor operands) {
auto toAdd = operands.getB().dyn_cast_or_null<mlir::IntegerAttr>();
if (toAdd != nullptr) {
auto intToAdd = toAdd.getInt();
if (intToAdd == 0) {
@@ -313,9 +312,8 @@ OpFoldResult AddEintIntOp::fold(ArrayRef<Attribute> operands) {
}
/// Avoid subtraction with constant 0
OpFoldResult SubEintIntOp::fold(ArrayRef<Attribute> operands) {
assert(operands.size() == 2);
auto toSub = operands[1].dyn_cast_or_null<mlir::IntegerAttr>();
OpFoldResult SubEintIntOp::fold(FoldAdaptor operands) {
auto toSub = operands.getB().dyn_cast_or_null<mlir::IntegerAttr>();
if (toSub != nullptr) {
auto intToSub = toSub.getInt();
if (intToSub == 0) {
@@ -326,9 +324,8 @@ OpFoldResult SubEintIntOp::fold(ArrayRef<Attribute> operands) {
}
/// Avoid multiplication with constant 1
OpFoldResult MulEintIntOp::fold(ArrayRef<Attribute> operands) {
assert(operands.size() == 2);
auto toMul = operands[1].dyn_cast_or_null<mlir::IntegerAttr>();
OpFoldResult MulEintIntOp::fold(FoldAdaptor operands) {
auto toMul = operands.getB().dyn_cast_or_null<mlir::IntegerAttr>();
if (toMul != nullptr) {
auto intToMul = toMul.getInt();
if (intToMul == 1) {

15
compilers/concrete-compiler/compiler/lib/Dialect/FHELinalg/IR/FHELinalgOps.cpp
View File

@@ -1356,9 +1356,8 @@ mlir::LogicalResult ToUnsignedOp::verify() {
}
/// Avoid addition with constant tensor of 0s
OpFoldResult AddEintIntOp::fold(ArrayRef<Attribute> operands) {
assert(operands.size() == 2);
auto toAdd = operands[1].dyn_cast_or_null<mlir::DenseIntElementsAttr>();
OpFoldResult AddEintIntOp::fold(FoldAdaptor operands) {
auto toAdd = operands.getRhs().dyn_cast_or_null<mlir::DenseIntElementsAttr>();
if (toAdd == nullptr)
return nullptr;
for (auto it = toAdd.begin(); it != toAdd.end(); it++) {
@@ -1370,9 +1369,8 @@ OpFoldResult AddEintIntOp::fold(ArrayRef<Attribute> operands) {
}
/// Avoid subtraction with constant tensor of 0s
OpFoldResult SubEintIntOp::fold(ArrayRef<Attribute> operands) {
assert(operands.size() == 2);
auto toSub = operands[1].dyn_cast_or_null<mlir::DenseIntElementsAttr>();
OpFoldResult SubEintIntOp::fold(FoldAdaptor operands) {
auto toSub = operands.getRhs().dyn_cast_or_null<mlir::DenseIntElementsAttr>();
if (toSub == nullptr)
return nullptr;
for (auto it = toSub.begin(); it != toSub.end(); it++) {
@@ -1384,9 +1382,8 @@ OpFoldResult SubEintIntOp::fold(ArrayRef<Attribute> operands) {
}
/// Avoid multiplication with constant tensor of 1s
OpFoldResult MulEintIntOp::fold(ArrayRef<Attribute> operands) {
assert(operands.size() == 2);
auto toMul = operands[1].dyn_cast_or_null<mlir::DenseIntElementsAttr>();
OpFoldResult MulEintIntOp::fold(FoldAdaptor operands) {
auto toMul = operands.getRhs().dyn_cast_or_null<mlir::DenseIntElementsAttr>();
if (toMul == nullptr)
return nullptr;
for (auto it = toMul.begin(); it != toMul.end(); it++) {