feat(compiler): Allow concat with only one operand

zama-ai · Apr 26, 2024 · 9beaeac · 9beaeac
1 parent 51b5b42
commit 9beaeac
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/...lers/concrete-compiler/compiler/include/concretelang/Dialect/FHELinalg/IR/FHELinalgOps.td b/...lers/concrete-compiler/compiler/include/concretelang/Dialect/FHELinalg/IR/FHELinalgOps.td
@@ -1168,6 +1168,7 @@ def FHELinalg_ConcatOp : FHELinalg_Op<"concat", [Pure]> {
     );
 
     let hasVerifier = 1;
+    let hasFolder = 1;
 }
 
 def FHELinalg_Conv2dOp : FHELinalg_Op<"conv2d", [Pure, BinaryEintInt, DeclareOpInterfaceMethods<Binary, ["sqMANP"]>]> {

diff --git a/compilers/concrete-compiler/compiler/lib/Dialect/FHELinalg/IR/FHELinalgOps.cpp b/compilers/concrete-compiler/compiler/lib/Dialect/FHELinalg/IR/FHELinalgOps.cpp
@@ -573,10 +573,17 @@ static bool sameShapeExceptAxis(llvm::ArrayRef<int64_t> shape1,
   return true;
 }
 
+OpFoldResult ConcatOp::fold(FoldAdaptor operands) {
+  if (this->getNumOperands() == 1) {
+    return this->getOperand(0);
+  }
+  return nullptr;
+}
+
 mlir::LogicalResult ConcatOp::verify() {
   unsigned numOperands = this->getNumOperands();
-  if (numOperands < 2) {
-    this->emitOpError() << "should have at least 2 inputs";
+  if (numOperands < 1) {
+    this->emitOpError() << "should have at least 1 input";
     return mlir::failure();
   }
 

diff --git a/compilers/concrete-compiler/compiler/tests/check_tests/Dialect/FHELinalg/concat.invalid.mlir b/compilers/concrete-compiler/compiler/tests/check_tests/Dialect/FHELinalg/concat.invalid.mlir
@@ -3,21 +3,13 @@
 // -----
 
 func.func @main() -> tensor<0x!FHE.eint<7>> {
-  // expected-error @+1 {{'FHELinalg.concat' op should have at least 2 inputs}}
+  // expected-error @+1 {{'FHELinalg.concat' op should have at least 1 input}}
   %0 = "FHELinalg.concat"() : () -> tensor<0x!FHE.eint<7>>
   return %0 : tensor<0x!FHE.eint<7>>
 }
 
 // -----
 
-func.func @main(%x: tensor<4x!FHE.eint<7>>) -> tensor<4x!FHE.eint<7>> {
-  // expected-error @+1 {{'FHELinalg.concat' op should have at least 2 inputs}}
-  %0 = "FHELinalg.concat"(%x) : (tensor<4x!FHE.eint<7>>) -> tensor<4x!FHE.eint<7>>
-  return %0 : tensor<4x!FHE.eint<7>>
-}
-
-// -----
-
 func.func @main(%x: tensor<4x!FHE.eint<7>>, %y: tensor<3x!FHE.eint<7>>) -> tensor<7x!FHE.eint<6>> {
   // expected-error @+1 {{'FHELinalg.concat' op should have the width of encrypted inputs and result equal}}
   %0 = "FHELinalg.concat"(%x, %y) : (tensor<4x!FHE.eint<7>>, tensor<3x!FHE.eint<7>>) -> tensor<7x!FHE.eint<6>>

diff --git a/compilers/concrete-compiler/compiler/tests/check_tests/Dialect/FHELinalg/folding.mlir b/compilers/concrete-compiler/compiler/tests/check_tests/Dialect/FHELinalg/folding.mlir
@@ -160,3 +160,10 @@ func.func @to_unsigned_zero() -> tensor<4x!FHE.eint<7>> {
   %1 = "FHELinalg.to_unsigned"(%0) : (tensor<4x!FHE.esint<7>>) -> tensor<4x!FHE.eint<7>>
   return %1 : tensor<4x!FHE.eint<7>>
 }
+
+// CHECK: func.func @concat_1_operand(%[[a0:.*]]: tensor<4x!FHE.eint<7>>) -> tensor<4x!FHE.eint<7>> {
+// CHECK-NEXT: return %[[a0]]
+func.func @concat_1_operand(%x: tensor<4x!FHE.eint<7>>) -> tensor<4x!FHE.eint<7>> {
+  %0 = "FHELinalg.concat"(%x) : (tensor<4x!FHE.eint<7>>) -> tensor<4x!FHE.eint<7>>
+  return %0 : tensor<4x!FHE.eint<7>>
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -1168,6 +1168,7 @@ def FHELinalg_ConcatOp : FHELinalg_Op<"concat", [Pure]> { @@
         );
         let hasVerifier = 1;
+        let hasFolder = 1;
     }
     def FHELinalg_Conv2dOp : FHELinalg_Op<"conv2d", [Pure, BinaryEintInt, DeclareOpInterfaceMethods<Binary, ["sqMANP"]>]> {
@@ Expand Down @@